From 60545a557b301dbd2dd5b06e2b97773da212179d Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 8 Sep 2015 05:13:29 +0000 Subject: [PATCH] Go back to grave quoting in source-code docstrings etc. This reverts almost all my recent changes to use curved quotes in docstrings and/or strings used for error diagnostics. * gnus-faq.texi (FAQ 5-13, FAQ 6-2): * gnus.texi (Score Decays, SpamAssassin): * nnmairix.el (nnmairix-widget-create-query): * time-date.el (format-seconds): Prefer grave quoting in source-code strings used to generate help and diagnostics. --- lisp/ChangeLog | 6 ++++++ lisp/nnmairix.el | 4 +++- lisp/time-date.el | 4 ++-- texi/ChangeLog | 6 ++++++ texi/gnus-faq.texi | 8 ++++---- texi/gnus.texi | 6 +++--- 6 files changed, 24 insertions(+), 10 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index bbbd27553..e3af83524 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2015-09-08 Paul Eggert + + * nnmairix.el (nnmairix-widget-create-query): + * time-date.el (format-seconds): Prefer grave quoting in source-code + strings used to generate help and diagnostics. + 2015-09-07 Thomas Fitzsimmons * ntlm.el: Bump version to 2.00. New maintainer. Add comm keyword. diff --git a/lisp/nnmairix.el b/lisp/nnmairix.el index e34b708a2..ccfc5996e 100644 --- a/lisp/nnmairix.el +++ b/lisp/nnmairix.el @@ -1943,7 +1943,9 @@ Fill in VALUES if based on an article." (kill-all-local-variables) (erase-buffer) (widget-insert "Specify your query for Mairix (check boxes for activating fields):\n\n") - (widget-insert "(Whitespaces will be converted to ‘,’ (i.e. AND). Use ‘/’ for OR.)\n\n") + (widget-insert + (substitute-command-keys + "(Whitespaces will be converted to `,' (i.e. AND). Use `/' for OR.)\n\n")) ; (make-local-variable 'nnmairix-widgets) (setq nnmairix-widgets (nnmairix-widget-build-editable-fields values)) (when (member 'flags nnmairix-widget-other) diff --git a/lisp/time-date.el b/lisp/time-date.el index c13ef97c6..bb7e97ea7 100644 --- a/lisp/time-date.el +++ b/lisp/time-date.el @@ -377,9 +377,9 @@ This function does not work for SECONDS greater than `most-positive-fixnum'." spec (match-string 1 string)) (unless (string-equal spec "%") (or (setq match (assoc (downcase spec) units)) - (error "Bad format specifier: ‘%s’" spec)) + (error "Bad format specifier: `%s'" spec)) (if (assoc (downcase spec) usedunits) - (error "Multiple instances of specifier: ‘%s’" spec)) + (error "Multiple instances of specifier: `%s'" spec)) (if (string-equal (car match) "z") (setq zeroflag t) (unless larger diff --git a/texi/ChangeLog b/texi/ChangeLog index eb26578a8..1b170dc10 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,3 +1,9 @@ +2015-09-08 Paul Eggert + + * gnus-faq.texi (FAQ 5-13, FAQ 6-2): + * gnus.texi (Score Decays, SpamAssassin): Prefer grave quoting in + source-code strings used to generate help and diagnostics. + 2015-09-04 Paul Eggert * gnus-faq.texi (FAQ 4-8, FAQ 4-12, FAQ 4-14): diff --git a/texi/gnus-faq.texi b/texi/gnus-faq.texi index 5ab34a0f7..19c78bf56 100644 --- a/texi/gnus-faq.texi +++ b/texi/gnus-faq.texi @@ -1671,7 +1671,7 @@ instead (works for newer versions as well): (setq message-user-fqdn fqdn) (gnus-message 1 "Redefining `message-make-fqdn'.") (defun message-make-fqdn () - "Return user’s fully qualified domain name." + "Return user's fully qualified domain name." fqdn)))) @end example @noindent @@ -1765,9 +1765,9 @@ snippet by Frank Haun in @example (defun my-archive-article (&optional n) - "Copies one or more article(s) to a corresponding ‘nnml:’ group, e.g., -‘gnus.ding’ goes to ‘nnml:1.gnus.ding’. And ‘nnml:List-gnus.ding’ goes -to ‘nnml:1.List-gnus-ding’. + "Copies one or more article(s) to a corresponding `nnml:' group, e.g., +`gnus.ding' goes to `nnml:1.gnus.ding'. And `nnml:List-gnus.ding' goes +to `nnml:1.List-gnus-ding'. Use process marks or mark a region in the summary buffer to archive more then one article." diff --git a/texi/gnus.texi b/texi/gnus.texi index b520679c6..8b41015cb 100644 --- a/texi/gnus.texi +++ b/texi/gnus.texi @@ -21034,8 +21034,8 @@ function: @lisp (defun gnus-decay-score (score) - "Decay SCORE according to ‘gnus-score-decay-constant’ -and ‘gnus-score-decay-scale’." + "Decay SCORE according to `gnus-score-decay-constant' +and `gnus-score-decay-scale'." (let ((n (- score (* (if (< score 0) -1 1) (min (abs score) @@ -24081,7 +24081,7 @@ spam. And here is the nifty function: @lisp (defun my-gnus-raze-spam () - "Submit SPAM to Vipul’s Razor, then mark it as expirable." + "Submit SPAM to Vipul's Razor, then mark it as expirable." (interactive) (gnus-summary-save-in-pipe "razor-report -f -d" t) (gnus-summary-mark-as-expirable 1)) -- 2.25.1