Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

8 files changed, 13 insertions, 13 deletions

diff --git a/lisp/org/ob-core.el b/lisp/org/ob-core.el
index 11cd2530dd7..271a015323c 100644
--- a/lisp/org/ob-core.el
+++ b/lisp/org/ob-core.el
@@ -1402,7 +1402,7 @@ specified in the properties of the current outline entry."
 ALTS is a cons of two character options where each option may be
 either the numeric code of a single character or a list of
 character alternatives.  For example to split on balanced
-instances of \"[ \t]:\" set ALTS to '((32 9) . 58)."
+instances of \"[ \t]:\" set ALTS to ((32 9) . 58)."
   (let* ((matches (lambda (ch spec) (if (listp spec) (member ch spec) (equal spec ch))))
          (matched (lambda (ch last)
                     (if (consp alts)
@@ -1511,7 +1511,7 @@ shown below.
 
 ;; row and column names
 (defun org-babel-del-hlines (table)
-  "Remove all 'hlines from TABLE."
+  "Remove all `hline's from TABLE."
   (remove 'hline table))
 
 (defun org-babel-get-colnames (table)
diff --git a/lisp/org/ob-exp.el b/lisp/org/ob-exp.el
index 92006f81756..58bd1ec7758 100644
--- a/lisp/org/ob-exp.el
+++ b/lisp/org/ob-exp.el
@@ -53,7 +53,7 @@
 (defcustom org-export-babel-evaluate t
   "Switch controlling code evaluation during export.
 When set to nil no code will be evaluated as part of the export
-process.  When set to 'inline-only, only inline code blocks will
+process.  When set to `inline-only', only inline code blocks will
 be executed."
   :group 'org-babel
   :version "24.1"
diff --git a/lisp/org/ob-table.el b/lisp/org/ob-table.el
index 1f381dbe570..47a538cbd99 100644
--- a/lisp/org/ob-table.el
+++ b/lisp/org/ob-table.el
@@ -67,7 +67,7 @@ element list, whose first element is the name of the variable and
 second element is a string of its value.  The following call to
 `org-sbe' would be equivalent to the following source code block.
 
- (org-sbe 'source-block (n $2) (m 3))
+ (org-sbe \\='source-block (n $2) (m 3))
 
 #+begin_src emacs-lisp :var results=source-block(n=val_at_col_2, m=3) :results silent
 results
@@ -84,7 +84,7 @@ the header argument which can then be passed before all variables
 as shown in the example below.
 
 | 1 | 2 | :file nothing.png | nothing.png |
-#+TBLFM: @1$4='(org-sbe test-sbe $3 (x $1) (y $2))"
+#+TBLFM: @1$4=\\='(org-sbe test-sbe $3 (x $1) (y $2))"
   (declare (debug (form form)))
   (let* ((header-args (if (stringp (car variables)) (car variables) ""))
          (variables (if (stringp (car variables)) (cdr variables) variables)))
diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el
index 0b3be562489..4e42004d97d 100644
--- a/lisp/org/org-agenda.el
+++ b/lisp/org/org-agenda.el
@@ -7085,8 +7085,8 @@ their type."
 ;;;###autoload
 (defun org-agenda-set-restriction-lock (&optional type)
   "Set restriction lock for agenda, to current subtree or file.
-Restriction will be the file if TYPE is `file', or if type is the
-universal prefix '(4), or if the cursor is before the first headline
+Restriction will be the file if TYPE is `file', or if TYPE is the
+universal prefix `(4)', or if the cursor is before the first headline
 in the file.  Otherwise, restriction will be to the current subtree."
   (interactive "P")
   (and (equal type '(4)) (setq type 'file))
diff --git a/lisp/org/org-faces.el b/lisp/org/org-faces.el
index 46936f4b66f..1b46b80eb0a 100644
--- a/lisp/org/org-faces.el
+++ b/lisp/org/org-faces.el
@@ -666,7 +666,7 @@ belong to the weekend."
     (0.0 . default))
   "Faces for showing deadlines in the agenda.
 This is a list of cons cells.  The cdr of each cell is a face to be used,
-and it can also just be like '(:foreground \"yellow\").
+and it can also just be like (:foreground \"yellow\").
 Each car is a fraction of the head-warning time that must have passed for
 this the face in the cdr to be used for display.  The numbers must be
 given in descending order.  The head-warning time is normally taken
diff --git a/lisp/org/org-list.el b/lisp/org/org-list.el
index c8266500fe3..12d4db39b65 100644
--- a/lisp/org/org-list.el
+++ b/lisp/org/org-list.el
@@ -174,7 +174,7 @@ to the bullet that should be used when this item is demoted.
 For example,
 
  (setq org-list-demote-modify-bullet
-       '((\"+\" . \"-\") (\"-\" . \"+\") (\"*\" . \"+\")))
+       \\='((\"+\" . \"-\") (\"-\" . \"+\") (\"*\" . \"+\")))
 
 will make
 
diff --git a/lisp/org/org-macs.el b/lisp/org/org-macs.el
index ea8e7b532aa..0b10f55247f 100644
--- a/lisp/org/org-macs.el
+++ b/lisp/org/org-macs.el
@@ -137,7 +137,7 @@ Otherwise return nil."
 
 ;; FIXME: Slated for removal.  Current Org mode does not support Emacs < 22
 (defmacro org-maybe-intangible (props)
-  "Add '(intangible t) to PROPS if Emacs version is earlier than Emacs 22.
+  "Add (intangible t) to PROPS if Emacs version is earlier than Emacs 22.
 In Emacs 21, invisible text is not avoided by the command loop, so the
 intangible property is needed to make sure point skips this text.
 In Emacs 22, this is not necessary.  The intangible text property has
diff --git a/lisp/org/org.el b/lisp/org/org.el
index 7a6d6cc1b3f..957a7d029ec 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -7094,7 +7094,7 @@ open and agenda-wise Org files."
           (org-flag-drawer t))))))
 
 (defun org-cycle-hide-inline-tasks (state)
-  "Re-hide inline tasks when switching to 'contents or 'children
+  "Re-hide inline tasks when switching to `contents' or `children'
 visibility state."
   (case state
     (contents
@@ -7323,8 +7323,8 @@ returns to the original buffer in which the visibility is still
 unchanged.  After RET it will also jump to the location selected
 in the indirect buffer and expose the headline hierarchy above.
 
-With a prefix argument, use the alternative interface: e.g. if
-`org-goto-interface' is 'outline use 'outline-path-completion."
+With a prefix argument, use the alternative interface: e.g., if
+`org-goto-interface' is `outline' use `outline-path-completion'."
   (interactive "P")
   (org-goto-map)
   (let* ((org-refile-targets `((nil . (:maxlevel . ,org-goto-max-level))))