Control: tags -1 + patch On 15-Mar-2015, Ben Finney wrote: > The file mentioned (and one other in the package) contains the term > “shit” to refer vaguely to some thing, which is puerile and > unhelpful to the purpose. It is unwelcoming because it uses > vulgarity merely as emphasis. It can easily be improved by choosing > a more descriptive, emotionally neutral term instead.
Attached is a patch which, as originally requested, removes the parts of the code which meet the above description. -- \ “Faith, n. Belief without evidence in what is told by one who | `\ speaks without knowledge, of things without parallel.” —Ambrose | _o__) Bierce, _The Devil's Dictionary_, 1906 | Ben Finney <b...@benfinney.id.au>
=== modified file 'debian/changelog' --- old/debian/changelog revid:ben+deb...@benfinney.id.au-20150315033931-fu4edqyat9nbw44r +++ new/debian/changelog 2015-03-15 04:49:04 +0000 @@ -1,3 +1,12 @@ +yasnippet (0.6.1c-2) UNRELEASED; urgency=low + + [ Ben Finney ] + + * Remove unhelpful and puerile terms from snippets and comments. + (Closes: bug#592645) + + -- + yasnippet (0.6.1c-1) unstable; urgency=low * New upstream release === added file 'debian/patches/remove-nonstandard-element-snippet' --- old/debian/patches/remove-nonstandard-element-snippet 1970-01-01 00:00:00 +0000 +++ new/debian/patches/remove-nonstandard-element-snippet 2015-03-15 04:46:14 +0000 @@ -0,0 +1,22 @@ +Author: Ben Finney <ben+deb...@benfinney.id.au> +Description: Remove an unhelpful snippet for a non-standard element. + This snippet is not part of the HTML standard. Moreover, it makes use + of the puerile term “shit” in an unhelpful way. Remove the snippet. +Bug: https://bugs.debian.org/592645 +=================================================================== +=== removed file 'snippets/text-mode/html-mode/dov' +--- old/snippets/text-mode/html-mode/dov revid:ben+deb...@benfinney.id.au-20150315033931-fu4edqyat9nbw44r ++++ new/snippets/text-mode/html-mode/dov 1970-01-01 00:00:00 +0000 +@@ -1,11 +0,0 @@ +-#name : <dov...>...</dov> +-# -- +-a mirror up here $3 +- +- +-<dov ${1:id="${2:some_id and here comes another nested field: ${3:nested_shit}}"}> +- $0 +-</dov> +-<dov $1> +- actually some other shit and $3 +-</dov> + === added file 'debian/patches/remove-unhelpful-comment' --- old/debian/patches/remove-unhelpful-comment 1970-01-01 00:00:00 +0000 +++ new/debian/patches/remove-unhelpful-comment 2015-03-15 04:47:11 +0000 @@ -0,0 +1,26 @@ +Author: Ben Finney <ben+deb...@benfinney.id.au> +Description: Remove an unhelpful comment with puerile language. + This comment makes use of the puerile term “shit” in an unhelpful + way. Remove the comment. +Bug: https://bugs.debian.org/592645 +=================================================================== +=== modified file 'yasnippet.el' +--- old/yasnippet.el revid:ben+deb...@benfinney.id.au-20150315033931-fu4edqyat9nbw44r ++++ new/yasnippet.el 2015-03-15 04:42:40 +0000 +@@ -3470,15 +3470,6 @@ + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + ;; Debug functions. Use (or change) at will whenever needed. + ;; +-;; some useful debug code for looking up snippet tables +-;; +-;; (insert (pp +-;; (let ((shit)) +-;; (maphash #'(lambda (k v) +-;; (push k shit)) +-;; (yas/snippet-table-hash (gethash 'ruby-mode yas/snippet-tables))) +-;; shit))) +-;; + + (defun yas/debug-tables () + (interactive) + === modified file 'debian/patches/series' --- old/debian/patches/series revid:ben+deb...@benfinney.id.au-20150315033931-fu4edqyat9nbw44r +++ new/debian/patches/series 2015-03-15 04:44:04 +0000 @@ -1,1 +1,4 @@ add-missing-css-files +remove-nonstandard-element-snippet +remove-unhelpful-comment +
signature.asc
Description: Digital signature