From 2c102003004f4fa3dd5fe1f56c66936f386c4359 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 3 Sep 2015 23:30:45 +0000 Subject: [PATCH] Fix some more docstring etc. quoting problems MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Mostly these fixes prevent the transliteration of apostrophes that should stay apostrophes. Also, prefer curved quotes in Bahá’í proper names, as that’s the preferred Bahá’í style and these names are chock-full of non-ASCII characters anyway. --- lisp/ChangeLog | 22 ++++++++++++++++++++++ lisp/gmm-utils.el | 2 +- lisp/gnus-art.el | 22 +++++++++++----------- lisp/gnus-registry.el | 6 +++--- lisp/gnus-start.el | 2 +- lisp/gnus-sum.el | 2 +- lisp/gnus-uu.el | 2 +- lisp/gnus.el | 4 ++-- lisp/message.el | 2 +- lisp/nnir.el | 20 ++++++++++---------- lisp/nnmail.el | 4 ++-- lisp/nntp.el | 2 +- lisp/tls.el | 2 +- 13 files changed, 57 insertions(+), 35 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b9595381d..98536b04f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,25 @@ +2015-09-03 Paul Eggert + + * gmm-utils.el (gmm-image-load-path-for-library): + * gnus-art.el (gnus-boring-article-headers, gnus-split-methods): + * gnus-registry.el (gnus-registry-split-strategy): + * gnus-start.el (gnus-check-new-newsgroups): + * gnus-sum.el (gnus-select-group-hook): + * gnus-uu.el (gnus-uu-user-archive-rules): + * gnus.el (gnus-message-archive-group, gnus-visual): + * message.el (message-cite-style): + * nnir.el (nnir-swish++-additional-switches) + (nnir-swish-e-additional-switches, nnir-hyrex-additional-switches) + (nnir-namazu-additional-switches, nnir-notmuch-additional-switches): + * nnmail.el (nnmail-split-methods, nnmail-expiry-wait-function): + * nntp.el (nntp-server-action-alist): + * tls.el (tls-checktrust): + Fix some more docstring etc. quoting problems. + Mostly these fixes prevent the transliteration of apostrophes + that should stay apostrophes. Also, prefer curved quotes in + Bahá’í proper names, as that’s the preferred Bahá’í style and + these names are chock-full of non-ASCII characters anyway. + 2015-09-02 Paul Eggert Escape ` and ' in doc diff --git a/lisp/gmm-utils.el b/lisp/gmm-utils.el index 2f24f8c03..dd65b8097 100644 --- a/lisp/gmm-utils.el +++ b/lisp/gmm-utils.el @@ -328,7 +328,7 @@ compatibility with versions of Emacs that lack the variable (let* ((load-path (image-load-path-for-library \"mh-e\" \"mh-logo.xpm\")) (image-load-path (cons (car load-path) - (when (boundp 'image-load-path) + (when (boundp \\='image-load-path) image-load-path)))) (mh-tool-bar-folder-buttons-init))" (unless library (error "No library specified")) diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index 003904922..2821f5f48 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -196,16 +196,16 @@ this list." "Headers that are only to be displayed if they have interesting data. Possible values in this list are: - 'empty Headers with no content. - 'newsgroups Newsgroup identical to Gnus group. - 'to-address To identical to To-address. - 'to-list To identical to To-list. - 'cc-list CC identical to To-list. - 'followup-to Followup-to identical to Newsgroups. - 'reply-to Reply-to identical to From. - 'date Date less than four days old. - 'long-to To and/or Cc longer than 1024 characters. - 'many-to Multiple To and/or Cc." + `empty' Headers with no content. + `newsgroups' Newsgroup identical to Gnus group. + `to-address' To identical to To-address. + `to-list' To identical to To-list. + `cc-list' CC identical to To-list. + `followup-to' Followup-to identical to Newsgroups. + `reply-to' Reply-to identical to From. + `date' Date less than four days old. + `long-to' To and/or Cc longer than 1024 characters. + `many-to' Multiple To and/or Cc." :type '(set (const :tag "Headers with no content." empty) (const :tag "Newsgroups identical to Gnus group." newsgroups) (const :tag "To identical to To-address." to-address) @@ -662,7 +662,7 @@ For instance, if you would like to save articles related to Gnus in the file \"gnus-stuff\", and articles related to VM in \"vm-stuff\", you could set this variable to something like: - '((\"^Subject:.*gnus\\|^Newsgroups:.*gnus\" \"gnus-stuff\") + ((\"^Subject:.*gnus\\|^Newsgroups:.*gnus\" \"gnus-stuff\") (\"^Subject:.*vm\\|^Xref:.*vm\" \"vm-stuff\")) This variable is an alist where the key is the match and the diff --git a/lisp/gnus-registry.el b/lisp/gnus-registry.el index b233ad718..23c79cbdb 100644 --- a/lisp/gnus-registry.el +++ b/lisp/gnus-registry.el @@ -194,17 +194,17 @@ are tracked this way by default." "The splitting strategy applied to the keys in `gnus-registry-track-extra'. Given a set of unique found groups G and counts for each element -of G, and a key K (typically 'sender or 'subject): +of G, and a key K (typically `sender' or `subject'): When nil, if G has only one element, use it. Otherwise give up. This is the fastest but also least useful strategy. -When 'majority, use the majority by count. So if there is a +When `majority', use the majority by count. So if there is a group with the most articles counted by K, use that. Ties are resolved in no particular order, simply the first one found wins. This is the slowest strategy but also the most accurate one. -When 'first, the first element of G wins. This is fast and +When `first', the first element of G wins. This is fast and should be OK if your senders and subjects don't \"bleed\" across groups." :group 'gnus-registry diff --git a/lisp/gnus-start.el b/lisp/gnus-start.el index 82a2c987d..13a333ab5 100644 --- a/lisp/gnus-start.el +++ b/lisp/gnus-start.el @@ -124,7 +124,7 @@ servers. E.g.: (setq gnus-check-new-newsgroups - '((nntp \"some.server\") (nntp \"other.server\"))) + \\='((nntp \"some.server\") (nntp \"other.server\"))) If this variable is nil, then you have to tell Gnus explicitly to check for new newsgroups with \\\\[gnus-find-new-newsgroups]." diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el index 6b90204be..d4ca6555b 100644 --- a/lisp/gnus-sum.el +++ b/lisp/gnus-sum.el @@ -997,7 +997,7 @@ following hook: (mail-header-set-subject header (gnus-simplify-subject - (mail-header-subject header) 're-only))) + (mail-header-subject header) \\='re-only))) gnus-newsgroup-headers)))" :group 'gnus-group-select :type 'hook) diff --git a/lisp/gnus-uu.el b/lisp/gnus-uu.el index 881ff4ee1..f21646655 100644 --- a/lisp/gnus-uu.el +++ b/lisp/gnus-uu.el @@ -143,7 +143,7 @@ details." To use, for instance, `untar' to unpack tar files and `zip -x' to unpack zip files, say the following: (setq gnus-uu-user-archive-rules - '((\"\\\\.tar$\" \"untar\") + \\='((\"\\\\.tar$\" \"untar\") (\"\\\\.zip$\" \"zip -x\")))" :group 'gnus-extract-archive :type '(repeat (group regexp (string :tag "Command")))) diff --git a/lisp/gnus.el b/lisp/gnus.el index 5df7e5d31..771028c2e 100644 --- a/lisp/gnus.el +++ b/lisp/gnus.el @@ -1362,7 +1362,7 @@ If you want to save your mail in one group and the news articles you write in another group, you could say something like: \(setq gnus-message-archive-group - '((if (message-news-p) + \\='((if (message-news-p) \"misc-news\" \"misc-mail\"))) @@ -2396,7 +2396,7 @@ less space and be faster as a result. This variable can also be a list of visual elements to switch on. For instance, to switch off all visual things except menus, you can say: - (setq gnus-visual '(menu)) + (setq gnus-visual \\='(menu)) Valid elements include `summary-highlight', `group-highlight', `article-highlight', `mouse-face', `summary-menu', `group-menu', diff --git a/lisp/message.el b/lisp/message.el index 7a20d11e1..435834c49 100644 --- a/lisp/message.el +++ b/lisp/message.el @@ -1175,7 +1175,7 @@ Presets to impersonate popular mail agents are found in the message-cite-style-* variables. This variable is intended for use in `gnus-posting-styles', such as: - ((posting-from-work-p) (eval (set (make-local-variable 'message-cite-style) message-cite-style-outlook)))" + ((posting-from-work-p) (eval (set (make-local-variable \\='message-cite-style) message-cite-style-outlook)))" :version "24.1" :group 'message-insertion :type '(choice (const :tag "Do not override variables" :value nil) diff --git a/lisp/nnir.el b/lisp/nnir.el index 15ccc4725..9784f1bd8 100644 --- a/lisp/nnir.el +++ b/lisp/nnir.el @@ -350,10 +350,10 @@ result, `gnus-retrieve-headers' will be called instead." (defcustom nnir-swish++-additional-switches '() "*A list of strings, to be given as additional arguments to swish++. -Note that this should be a list. Ie, do NOT use the following: +Note that this should be a list. I.e., do NOT use the following: (setq nnir-swish++-additional-switches \"-i -w\") ; wrong Instead, use this: - (setq nnir-swish++-additional-switches '(\"-i\" \"-w\"))" + (setq nnir-swish++-additional-switches \\='(\"-i\" \"-w\"))" :type '(repeat (string)) :group 'nnir) @@ -399,10 +399,10 @@ This cannot be a server parameter." (defcustom nnir-swish-e-additional-switches '() "*A list of strings, to be given as additional arguments to swish-e. -Note that this should be a list. Ie, do NOT use the following: +Note that this should be a list. I.e., do NOT use the following: (setq nnir-swish-e-additional-switches \"-i -w\") ; wrong Instead, use this: - (setq nnir-swish-e-additional-switches '(\"-i\" \"-w\")) + (setq nnir-swish-e-additional-switches \\='(\"-i\" \"-w\")) This could be a server parameter." :type '(repeat (string)) @@ -429,10 +429,10 @@ This could be a server parameter." (defcustom nnir-hyrex-additional-switches '() "*A list of strings, to be given as additional arguments for nnir-search. -Note that this should be a list. Ie, do NOT use the following: +Note that this should be a list. I.e., do NOT use the following: (setq nnir-hyrex-additional-switches \"-ddl ddl.xml -c nnir\") ; wrong ! Instead, use this: - (setq nnir-hyrex-additional-switches '(\"-ddl\" \"ddl.xml\" \"-c\" \"nnir\"))" + (setq nnir-hyrex-additional-switches \\='(\"-ddl\" \"ddl.xml\" \"-c\" \"nnir\"))" :type '(repeat (string)) :group 'nnir) @@ -471,10 +471,10 @@ arrive at the correct group name, \"mail.misc\"." The switches `-q', `-a', and `-s' are always used, very few other switches make any sense in this context. -Note that this should be a list. Ie, do NOT use the following: +Note that this should be a list. I.e., do NOT use the following: (setq nnir-namazu-additional-switches \"-i -w\") ; wrong Instead, use this: - (setq nnir-namazu-additional-switches '(\"-i\" \"-w\"))" + (setq nnir-namazu-additional-switches \\='(\"-i\" \"-w\"))" :type '(repeat (string)) :group 'nnir) @@ -500,10 +500,10 @@ arrive at the correct group name, \"mail.misc\"." (defcustom nnir-notmuch-additional-switches '() "*A list of strings, to be given as additional arguments to notmuch. -Note that this should be a list. Ie, do NOT use the following: +Note that this should be a list. I.e., do NOT use the following: (setq nnir-notmuch-additional-switches \"-i -w\") ; wrong Instead, use this: - (setq nnir-notmuch-additional-switches '(\"-i\" \"-w\"))" + (setq nnir-notmuch-additional-switches \\='(\"-i\" \"-w\"))" :version "24.1" :type '(repeat (string)) :group 'nnir) diff --git a/lisp/nnmail.el b/lisp/nnmail.el index 681116017..7efb15438 100644 --- a/lisp/nnmail.el +++ b/lisp/nnmail.el @@ -83,7 +83,7 @@ If you'd like, for instance, one mail group for mail from the else, you could do something like this: (setq nnmail-split-methods - '((\"mail.4ad\" \"From:.*4ad\") + \\='((\"mail.4ad\" \"From:.*4ad\") (\"mail.junk\" \"From:.*Lars\\\\|Subject:.*buy\") (\"mail.misc\" \"\"))) @@ -180,7 +180,7 @@ E.g.: (lambda (newsgroup) (cond ((string-match \"private\" newsgroup) 31) ((string-match \"junk\" newsgroup) 1) - ((string-match \"important\" newsgroup) 'never) + ((string-match \"important\" newsgroup) \\='never) (t 7))))" :group 'nnmail-expire :type '(choice (const :tag "nnmail-expiry-wait" nil) diff --git a/lisp/nntp.el b/lisp/nntp.el index 8d09781cd..6c97cecdc 100644 --- a/lisp/nntp.el +++ b/lisp/nntp.el @@ -72,7 +72,7 @@ For instance, if you want Gnus to beep every time you connect to innd, you could say something like: \(setq nntp-server-action-alist - '((\"innd\" (ding)))) + \\='((\"innd\" (ding)))) You probably don't want to do that, though.") diff --git a/lisp/tls.el b/lisp/tls.el index 544aec5cf..48e6a4218 100644 --- a/lisp/tls.el +++ b/lisp/tls.el @@ -137,7 +137,7 @@ the external program knows about the root certificates you consider trustworthy, e.g.: \(setq tls-program - '(\"gnutls-cli --x509cafile /etc/ssl/certs/ca-certificates.crt -p %p %h\" + \\='(\"gnutls-cli --x509cafile /etc/ssl/certs/ca-certificates.crt -p %p %h\" \"gnutls-cli --x509cafile /etc/ssl/certs/ca-certificates.crt -p %p %h --protocols ssl3\" \"openssl s_client -connect %h:%p -CAfile /etc/ssl/certs/ca-certificates.crt -no_ssl2 -ign_eof\"))" :type '(choice (const :tag "Always" t) -- 2.11.4.GIT