Merge from origin/emacs-25

eeecac7 Fix minor quoting problems in doc strings

4 files changed, 6 insertions, 6 deletions

diff --git a/lisp/org/org-table.el b/lisp/org/org-table.el
index 20334f30504..3292590e8ed 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 2734f90db06..db4075e6612 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 4d9dae5f765..1408e1476d7 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 f2b0c9198b7..944437b56cf 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\"