From 4c9cd8776a12037707860bb9885869129198425b Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 26 Aug 2015 04:54:05 +0000 Subject: [PATCH] Go back to grave quoting in Gnus * auth-source.el (auth-source-netrc-parse-entries): * gnus-agent.el (gnus-agent-check-overview-buffer) (gnus-agent-fetch-headers): * gnus-int.el (gnus-start-news-server): * gnus-registry.el (gnus-registry--split-fancy-with-parent-internal) (gnus-registry-post-process-groups): * gnus-score.el (gnus-summary-increase-score): * gnus-start.el (gnus-convert-old-newsrc): * gnus-topic.el (gnus-topic-rename): * legacy-gnus-agent.el (gnus-agent-unlist-expire-days): * spam.el (spam-check-blackholes): Stick with grave quoting in diagnostics strings. This is more portable to older Emacs, desirable for Gnus. --- lisp/ChangeLog | 18 ++++++++++++++++++ lisp/auth-source.el | 2 +- lisp/gnus-agent.el | 4 ++-- lisp/gnus-int.el | 2 +- lisp/gnus-registry.el | 10 +++++----- lisp/gnus-score.el | 2 +- lisp/gnus-start.el | 4 ++-- lisp/gnus-topic.el | 2 +- lisp/legacy-gnus-agent.el | 6 +++--- lisp/spam.el | 2 +- 10 files changed, 35 insertions(+), 17 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 992d9357f..66c9f9a95 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,21 @@ +2015-08-26 Paul Eggert + + Go back to grave quoting in Gnus + + * auth-source.el (auth-source-netrc-parse-entries): + * gnus-agent.el (gnus-agent-check-overview-buffer) + (gnus-agent-fetch-headers): + * gnus-int.el (gnus-start-news-server): + * gnus-registry.el (gnus-registry--split-fancy-with-parent-internal) + (gnus-registry-post-process-groups): + * gnus-score.el (gnus-summary-increase-score): + * gnus-start.el (gnus-convert-old-newsrc): + * gnus-topic.el (gnus-topic-rename): + * legacy-gnus-agent.el (gnus-agent-unlist-expire-days): + * spam.el (spam-check-blackholes): + Stick with grave quoting in diagnostics strings. This is more + portable to older Emacs, desirable for Gnus. + 2015-08-25 Paul Eggert Prefer directed to neutral quotes in docstings and diagnostics. diff --git a/lisp/auth-source.el b/lisp/auth-source.el index 78eeb9fc6..31175136c 100644 --- a/lisp/auth-source.el +++ b/lisp/auth-source.el @@ -1107,7 +1107,7 @@ Note that the MAX parameter is used so we can exit the parse early." (if (equal item2 "machine") (progn (gnus-error 1 - "%s: Unexpected ‘machine’ token at line %d" + "%s: Unexpected `machine' token at line %d" "auth-source-netrc-parse-entries" (auth-source-current-line)) (forward-line 1)) diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el index 5f1ffe7a3..7b35de076 100644 --- a/lisp/gnus-agent.el +++ b/lisp/gnus-agent.el @@ -1721,7 +1721,7 @@ and that there are no duplicates." (or backed-up (setq backed-up (gnus-agent-backup-overview-buffer))) (gnus-message 1 - "Overview buffer contains garbage ‘%s’." + "Overview buffer contains garbage `%s'." (buffer-substring p (point-at-eol)))) ((= cur prev-num) @@ -1901,7 +1901,7 @@ article numbers will be returned." (when articles (gnus-message - 10 "gnus-agent-fetch-headers: undownloaded articles are ‘%s’" + 10 "gnus-agent-fetch-headers: undownloaded articles are `%s'" (gnus-compress-sequence articles t))) (with-current-buffer nntp-server-buffer diff --git a/lisp/gnus-int.el b/lisp/gnus-int.el index 1c098fa87..4f8f17f18 100644 --- a/lisp/gnus-int.el +++ b/lisp/gnus-int.el @@ -165,7 +165,7 @@ If CONFIRM is non-nil, the user will be asked for an NNTP server." gnus-batch-mode (gnus-y-or-n-p (gnus-format-message - "%s (%s) open error: ‘%s’. Continue? " + "%s (%s) open error: `%s'. Continue? " (car gnus-select-method) (cadr gnus-select-method) (gnus-status-message gnus-select-method))) (gnus-error 1 "Couldn't open server on %s" diff --git a/lisp/gnus-registry.el b/lisp/gnus-registry.el index e91dd980b..b233ad718 100644 --- a/lisp/gnus-registry.el +++ b/lisp/gnus-registry.el @@ -558,7 +558,7 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details." do (gnus-message ;; warn more if gnus-registry-track-extra (if gnus-registry-track-extra 7 9) - "%s (extra tracking) traced subject ‘%s’ to %s" + "%s (extra tracking) traced subject `%s' to %s" log-agent subject group) and collect group)) ;; filter the found groups and return them @@ -585,7 +585,7 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details." do (gnus-message ;; warn more if gnus-registry-track-extra (if gnus-registry-track-extra 7 9) - "%s (extra tracking) traced sender ‘%s’ to %s" + "%s (extra tracking) traced sender `%s' to %s" log-agent sender group) and collect group))) @@ -615,7 +615,7 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details." do (gnus-message ;; warn more if gnus-registry-track-extra (if gnus-registry-track-extra 7 9) - "%s (extra tracking) traced recipient ‘%s’ to %s" + "%s (extra tracking) traced recipient `%s' to %s" log-agent recp group) and collect group))))) @@ -712,12 +712,12 @@ possible. Uses `gnus-registry-split-strategy'." ((null out) (gnus-message 5 - "%s: no matches for %s ‘%s’." + "%s: no matches for %s `%s'." log-agent mode key) nil) (t (gnus-message 5 - "%s: too many extra matches (%s) for %s ‘%s’. Returning none." + "%s: too many extra matches (%s) for %s `%s'. Returning none." log-agent out mode key) nil)))) diff --git a/lisp/gnus-score.el b/lisp/gnus-score.el index ffd86964f..4840af128 100644 --- a/lisp/gnus-score.el +++ b/lisp/gnus-score.el @@ -626,7 +626,7 @@ current score file." (if mimic (progn (sit-for 1) (message "%c %c-" prefix hchar)) - (message "%s header ‘%s’ with match type (%s?): " + (message "%s header `%s' with match type (%s?): " (if increase "Increase" "Lower") (nth 1 entry) (mapconcat (lambda (s) (char-to-string (car s))) diff --git a/lisp/gnus-start.el b/lisp/gnus-start.el index 4f26db457..82a2c987d 100644 --- a/lisp/gnus-start.el +++ b/lisp/gnus-start.el @@ -2369,7 +2369,7 @@ If FORCE is non-nil, the .newsrc file is read." (while (let (c (cursor-in-echo-area t) (echo-keystrokes 0)) - (message "Convert gnus from version ‘%s’ to ‘%s’? (n/y/?)" + (message "Convert gnus from version `%s' to `%s'? (n/y/?)" gnus-newsrc-file-version gnus-version) (setq c (read-char-exclusive)) @@ -2390,7 +2390,7 @@ If FORCE is non-nil, the .newsrc file is read." (funcall func convert-to))) (gnus-dribble-enter - (gnus-format-message ";Converted gnus from version ‘%s’ to ‘%s’." + (gnus-format-message ";Converted gnus from version `%s' to `%s'." gnus-newsrc-file-version gnus-version))))))) (defun gnus-convert-mark-converter-prompt (converter no-prompt) diff --git a/lisp/gnus-topic.el b/lisp/gnus-topic.el index cde1d976b..9474ca030 100644 --- a/lisp/gnus-topic.el +++ b/lisp/gnus-topic.el @@ -1525,7 +1525,7 @@ If NON-RECURSIVE (which is the prefix) is t, don't unmark its subtopics." (read-string (format "Rename %s to: " topic) topic)))) ;; Check whether the new name exists. (when (gnus-topic-find-topology new-name) - (error "Topic ‘%s’ already exists" new-name)) + (error "Topic `%s' already exists" new-name)) ;; "nil" is an invalid name, for reasons I'd rather not go ;; into here. Trust me. (when (equal new-name "nil") diff --git a/lisp/legacy-gnus-agent.el b/lisp/legacy-gnus-agent.el index 83310774d..ed66fec3a 100644 --- a/lisp/legacy-gnus-agent.el +++ b/lisp/legacy-gnus-agent.el @@ -149,17 +149,17 @@ converted to the compressed format." (insert (gnus-format-message - "\nIn order to use version ‘%s’ of gnus, you will need to set\n" + "\nIn order to use version `%s' of gnus, you will need to set\n" converting-to)) (insert "gnus-agent-expire-days to an integer. If you still wish to set different\n") (insert "expiration days to individual groups, you must instead set the\n") (insert (gnus-format-message - "‘agent-days-until-old’ group and/or topic parameter.\n")) + "`agent-days-until-old' group and/or topic parameter.\n")) (insert "\n") (insert "If you would like, gnus can iterate over every group comparing its name to the\n") (insert "regular expressions that you currently have in gnus-agent-expire-days. When\n") (insert (gnus-format-message - "gnus finds a match, it will update that group's ‘agent-days-until-old’ group\n")) + "gnus finds a match, it will update that group's `agent-days-until-old' group\n")) (insert "parameter to the value associated with the regular expression.\n") (insert "\n") (insert "Whether gnus assigns group parameters, or not, gnus will terminate with an\n") diff --git a/lisp/spam.el b/lisp/spam.el index 93613a84a..4ebd8a9f8 100644 --- a/lisp/spam.el +++ b/lisp/spam.el @@ -2054,7 +2054,7 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details." (if spam-use-dig (let ((query-result (query-dig query-string))) (when query-result - (gnus-message 6 "(DIG): positive blackhole check ‘%s’" + (gnus-message 6 "(DIG): positive blackhole check `%s'" query-result) (push (list ip server query-result) matches))) -- 2.25.1