[Emacs-diffs] master f15f6b5 17/18: Merge from origin/emacs-25

[Paul Eggert]

branch: master
commit f15f6b53078ac2176f8d2c05d99d3d9b4d32986b
Merge: fe6131b eeecac7
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    Merge from origin/emacs-25
    
    eeecac7 Fix minor quoting problems in doc strings
---
 lisp/cedet/semantic/format.el |    2 +-
 lisp/cus-edit.el              |    2 +-
 lisp/emulation/viper-util.el  |    2 +-
 lisp/gnus/gnus-kill.el        |    2 +-
 lisp/gnus/gnus-score.el       |    2 +-
 lisp/htmlfontify.el           |    4 ++--
 lisp/net/starttls.el          |    2 +-
 lisp/obsolete/mailpost.el     |    2 +-
 lisp/org/org-table.el         |    2 +-
 lisp/org/ox-latex.el          |    6 +++---
 lisp/org/ox-man.el            |    2 +-
 lisp/org/ox-odt.el            |    2 +-
 lisp/time.el                  |    4 ++--
 13 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/lisp/cedet/semantic/format.el b/lisp/cedet/semantic/format.el
index 0a984eb..b83cce5 100644
--- a/lisp/cedet/semantic/format.el
+++ b/lisp/cedet/semantic/format.el
@@ -603,7 +603,7 @@ UML attribute strings are things like {abstract} or {leaf}."
     (private . "-")
     )
   "Association list of the form (SYMBOL . \"STRING\") for protection symbols.
-This associates a symbol, such as 'public with the st ring \"+\".")
+For example, it might associate the symbol `public' with the string \"+\".")
 
 (define-overloadable-function semantic-format-tag-uml-protection-to-string 
(protection-symbol color)
   "Convert PROTECTION-SYMBOL to a string for UML.
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 601445a..f15161a 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -4362,7 +4362,7 @@ option itself, into the file you specify, overwriting any
 `custom-set-variables' and `custom-set-faces' forms already
 present in that file.  It will not delete any customizations from
 the old custom file.  You should do that manually if that is what you
-want.  You also have to put something like `(load \"CUSTOM-FILE\")
+want.  You also have to put something like (load \"CUSTOM-FILE\")
 in your init file, where CUSTOM-FILE is the actual name of the
 file.  Otherwise, Emacs will not load the file when it starts up,
 and hence will not set `custom-file' to that file either."
diff --git a/lisp/emulation/viper-util.el b/lisp/emulation/viper-util.el
index 1254923..6850036 100644
--- a/lisp/emulation/viper-util.el
+++ b/lisp/emulation/viper-util.el
@@ -1332,7 +1332,7 @@ Works best when set in the hooks to various major modes.
 `reformed-vi' means Viper words are like Emacs words \(as determined using
 Emacs syntax tables, which are different for different major modes) with two
 exceptions: the symbol `_' is always part of a word and typical Vi non-word
-symbols, such as `,',:,\",),{, etc., are excluded.
+symbols like `\\=`', `\\='', `:', `\"', `)', and `{' are excluded.
 This behaves very close to `strict-vi', but also works well with non-ASCII
 characters from various alphabets.
 
diff --git a/lisp/gnus/gnus-kill.el b/lisp/gnus/gnus-kill.el
index b4b74c9..e65d46b 100644
--- a/lisp/gnus/gnus-kill.el
+++ b/lisp/gnus/gnus-kill.el
@@ -118,7 +118,7 @@ the header field or an empty string.  If FIELD is an empty 
string, the
 entire article body is searched for.  REGEXP is a string which is
 compared with FIELD value.  COMMAND is a string representing a valid
 key sequence in Summary mode or Lisp expression.  COMMAND defaults to
-'(gnus-summary-mark-as-read nil \"X\").  Make sure that COMMAND is
+\(gnus-summary-mark-as-read nil \"X\").  Make sure that COMMAND is
 executed in the Summary buffer.  If the second optional argument ALL
 is non-nil, the COMMAND is applied to articles which are already
 marked as read or unread.  Articles which are marked are skipped over
diff --git a/lisp/gnus/gnus-score.el b/lisp/gnus/gnus-score.el
index 22c12af..b7360a0 100644
--- a/lisp/gnus/gnus-score.el
+++ b/lisp/gnus/gnus-score.el
@@ -47,7 +47,7 @@ Say you want to use the single score file
 score files in the \"/ftp.some-where:/pub/score\" directory.
 
  (setq gnus-global-score-files
-       '(\"/ftp.gnus.org:/pub/larsi/ding/score/soc.motss.SCORE\"
+       \\='(\"/ftp.gnus.org:/pub/larsi/ding/score/soc.motss.SCORE\"
         \"/ftp.some-where:/pub/score\"))"
   :group 'gnus-score-files
   :type '(repeat file))
diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el
index 5ffbb6d..19a57ba 100644
--- a/lisp/htmlfontify.el
+++ b/lisp/htmlfontify.el
@@ -524,8 +524,8 @@ Some examples:\n
 
 (defvar hfy-sheet-assoc 'please-ignore-this-line
   "An assoc with elements of the form (face-name style-name . style-string):\n
-'((default               \"default\" . \"{background: black; color: white}\")
-  (font-lock-string-face \"string\"  . \"{color: rgb(64,224,208)}\"))" )
+\((default               \"default\" . \"{background: black; color: white}\")
+ (font-lock-string-face \"string\"  . \"{color: rgb(64,224,208)}\"))" )
 
 (defvar hfy-facemap-assoc 'please-ignore-this-line
   "An assoc of (point . FACE-SYMBOL) or (point . DEFFACE-LIST)
diff --git a/lisp/net/starttls.el b/lisp/net/starttls.el
index 1ab7dc0..b925590 100644
--- a/lisp/net/starttls.el
+++ b/lisp/net/starttls.el
@@ -153,7 +153,7 @@ These apply when the `starttls' command is used, i.e. when
 These apply when GnuTLS is used, i.e. when `starttls-use-gnutls' is non-nil.
 
 For example, non-TLS compliant servers may require
-'(\"--protocols\" \"ssl3\").  Invoke \"gnutls-cli --help\" to
+\(\"--protocols\" \"ssl3\").  Invoke \"gnutls-cli --help\" to
 find out which parameters are available."
   :version "22.1"
   :type '(repeat string)
diff --git a/lisp/obsolete/mailpost.el b/lisp/obsolete/mailpost.el
index bcd468c..eebaa34 100644
--- a/lisp/obsolete/mailpost.el
+++ b/lisp/obsolete/mailpost.el
@@ -26,7 +26,7 @@
 
 (defun post-mail-send-it ()
   "The MH -post interface for `rmail-mail' to call.
-To use it, include \"(setq send-mail-function 'post-mail-send-it)\" in
+To use it, include \"(setq send-mail-function \\='post-mail-send-it)\" in
 site-init."
   (let ((errbuf (if mail-interactive
                    (generate-new-buffer " post-mail errors")
diff --git a/lisp/org/org-table.el b/lisp/org/org-table.el
index 20334f3..3292590 100644
--- a/lisp/org/org-table.el
+++ b/lisp/org/org-table.el
@@ -303,7 +303,7 @@ The car of each element is a name of a constant, without 
the `$' before it.
 The cdr is the value as a string.  For example, if you'd like to use the
 speed of light in a formula, you would configure
 
-  (setq org-table-formula-constants '((\"c\" . \"299792458.\")))
+  (setq org-table-formula-constants \\='((\"c\" . \"299792458.\")))
 
 and then use it in an equation like `$1*$c'.
 
diff --git a/lisp/org/ox-latex.el b/lisp/org/ox-latex.el
index 2734f90..db4075e 100644
--- a/lisp/org/ox-latex.el
+++ b/lisp/org/ox-latex.el
@@ -690,7 +690,7 @@ a list containing two strings: the name of the option, and 
the
 value.  For example,
 
   (setq org-latex-listings-options
-    '((\"basicstyle\" \"\\\\small\")
+    \\='((\"basicstyle\" \"\\\\small\")
       (\"keywordstyle\" \"\\\\color{black}\\\\bfseries\\\\underbar\")))
 
 will typeset the code in a small size font with underlined, bold
@@ -737,7 +737,7 @@ be a list containing two strings: the name of the option, 
and the
 value.  For example,
 
   (setq org-latex-minted-options
-    '((\"bgcolor\" \"bg\") (\"frame\" \"lines\")))
+    \\='((\"bgcolor\" \"bg\") (\"frame\" \"lines\")))
 
 will result in src blocks being exported with
 
@@ -758,7 +758,7 @@ It is used during export of src blocks by the listings and 
minted
 latex packages.  For example,
 
   (setq org-latex-custom-lang-environments
-     '((python \"pythoncode\")))
+     \\='((python \"pythoncode\")))
 
 would have the effect that if org encounters begin_src python
 during latex export it will output
diff --git a/lisp/org/ox-man.el b/lisp/org/ox-man.el
index 4d9dae5..1408e14 100644
--- a/lisp/org/ox-man.el
+++ b/lisp/org/ox-man.el
@@ -207,7 +207,7 @@ It is used during export of src blocks by the listings and
 man packages.  For example,
 
   (setq org-man-custom-lang-environments
-     '((python \"pythoncode\")))
+     \\='((python \"pythoncode\")))
 
 would have the effect that if org encounters begin_src python
 during man export."
diff --git a/lisp/org/ox-odt.el b/lisp/org/ox-odt.el
index f2b0c91..944437b 100644
--- a/lisp/org/ox-odt.el
+++ b/lisp/org/ox-odt.el
@@ -852,7 +852,7 @@ ON-OR-OFF                 := t | nil
 For example, with the following configuration
 
 \(setq org-odt-table-styles
-      '((\"TableWithHeaderRowsAndColumns\" \"Custom\"
+      \\='((\"TableWithHeaderRowsAndColumns\" \"Custom\"
          ((use-first-row-styles . t)
           (use-first-column-styles . t)))
         (\"TableWithHeaderColumns\" \"Custom\"
diff --git a/lisp/time.el b/lisp/time.el
index a0419c9..b507fe9 100644
--- a/lisp/time.el
+++ b/lisp/time.el
@@ -306,9 +306,9 @@ This expression is a list of expressions that can involve 
the keywords
 `seconds', all numbers in string form, and `monthname', `dayname', `am-pm',
 and `time-zone' all alphabetic strings, and `mail' a true/nil value.
 
-For example, the form
+For example:
 
-  '((substring year -2) \"/\" month \"/\" day
+   ((substring year -2) \"/\" month \"/\" day
     \" \" 24-hours \":\" minutes \":\" seconds
     (if time-zone \" (\") time-zone (if time-zone \")\")
     (if mail \" Mail\" \"\"))