aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2015-06-21 12:34:11 -0700
committerPaul Eggert2015-06-21 12:38:08 -0700
commit38bb9ff0f4b92836199d8b3a0ee3903428bb7851 (patch)
tree9bd50f9fc54b5996c8d5ef374b58a8f1538b399d
parent8b6d82d3ca86f76ed964063b3941a7c6ab0bf1c6 (diff)
downloademacs-38bb9ff0f4b92836199d8b3a0ee3903428bb7851.tar.gz
emacs-38bb9ff0f4b92836199d8b3a0ee3903428bb7851.zip
Fix some “nested” quoting confusion in doc strings
* lisp/emacs-lisp/advice.el (ad-map-arglists): * lisp/kermit.el (kermit-clean-on): * lisp/mh-e/mh-comp.el (mh-repl-group-formfile): * src/keyboard.c (Frecursive_edit): Use curved quotes when quoting text containing apostrophe, so that the apostrophe isn't curved in the output.
-rw-r--r--lisp/emacs-lisp/advice.el10
-rw-r--r--lisp/kermit.el2
-rw-r--r--lisp/mh-e/mh-comp.el2
-rw-r--r--src/keyboard.c8
4 files changed, 11 insertions, 11 deletions
diff --git a/lisp/emacs-lisp/advice.el b/lisp/emacs-lisp/advice.el
index 907f03bde45..1915d94e97b 100644
--- a/lisp/emacs-lisp/advice.el
+++ b/lisp/emacs-lisp/advice.el
@@ -2412,14 +2412,14 @@ The assignment starts at position INDEX."
2412;; The mapping should work for any two argument lists. 2412;; The mapping should work for any two argument lists.
2413 2413
2414(defun ad-map-arglists (source-arglist target-arglist) 2414(defun ad-map-arglists (source-arglist target-arglist)
2415 "Make `funcall/apply' form to map SOURCE-ARGLIST to TARGET-ARGLIST. 2415 "Make funcall/apply form to map SOURCE-ARGLIST to TARGET-ARGLIST.
2416The arguments supplied to TARGET-ARGLIST will be taken from SOURCE-ARGLIST just 2416The arguments supplied to TARGET-ARGLIST will be taken from SOURCE-ARGLIST just
2417as if they had been supplied to a function with TARGET-ARGLIST directly. 2417as if they had been supplied to a function with TARGET-ARGLIST directly.
2418Excess source arguments will be neglected, missing source arguments will be 2418Excess source arguments will be neglected, missing source arguments will be
2419supplied as nil. Returns a `funcall' or `apply' form with the second element 2419supplied as nil. Returns a funcall or apply form with the second element
2420being `function' which has to be replaced by an actual function argument. 2420being function which has to be replaced by an actual function argument.
2421Example: `(ad-map-arglists '(a &rest args) '(w x y z))' will return 2421Example: (ad-map-arglists '(a &rest args) '(w x y z)) will return
2422 `(funcall ad--addoit-function a (car args) (car (cdr args)) (nth 2 args))'." 2422 (funcall ad--addoit-function a (car args) (car (cdr args)) (nth 2 args))."
2423 (let* ((parsed-source-arglist (ad-parse-arglist source-arglist)) 2423 (let* ((parsed-source-arglist (ad-parse-arglist source-arglist))
2424 (source-reqopt-args (append (nth 0 parsed-source-arglist) 2424 (source-reqopt-args (append (nth 0 parsed-source-arglist)
2425 (nth 1 parsed-source-arglist))) 2425 (nth 1 parsed-source-arglist)))
diff --git a/lisp/kermit.el b/lisp/kermit.el
index e8a4ccddb66..d4a21f42430 100644
--- a/lisp/kermit.el
+++ b/lisp/kermit.el
@@ -135,7 +135,7 @@ In this state, use LFD to send a line and end it with a carriage-return."
135(defun kermit-clean-on () 135(defun kermit-clean-on ()
136 "Delete all null characters and ^M's from the kermit output. 136 "Delete all null characters and ^M's from the kermit output.
137Note that another (perhaps better) way to do this is to use the 137Note that another (perhaps better) way to do this is to use the
138command `kermit | tr -d '\\015''." 138command kermit | tr -d '\\015'."
139 (interactive) 139 (interactive)
140 (set-process-filter (get-buffer-process (current-buffer)) 140 (set-process-filter (get-buffer-process (current-buffer))
141 'kermit-clean-filter)) 141 'kermit-clean-filter))
diff --git a/lisp/mh-e/mh-comp.el b/lisp/mh-e/mh-comp.el
index 5875b418872..a8c5e339908 100644
--- a/lisp/mh-e/mh-comp.el
+++ b/lisp/mh-e/mh-comp.el
@@ -91,7 +91,7 @@ user's MH directory, then in the system MH lib directory.")
91Default is \"replgroupcomps\". 91Default is \"replgroupcomps\".
92 92
93This file is used to form replies to the sender and all recipients of 93This file is used to form replies to the sender and all recipients of
94a message. Only used if `(mh-variant-p 'nmh)' is non-nil. 94a message. Only used if (mh-variant-p 'nmh) is non-nil.
95If not an absolute file name, the file is searched for first in the 95If not an absolute file name, the file is searched for first in the
96user's MH directory, then in the system MH lib directory.") 96user's MH directory, then in the system MH lib directory.")
97 97
diff --git a/src/keyboard.c b/src/keyboard.c
index 23f7ce77143..9f42ad1fb0f 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -758,11 +758,11 @@ force_auto_save_soon (void)
758 758
759DEFUN ("recursive-edit", Frecursive_edit, Srecursive_edit, 0, 0, "", 759DEFUN ("recursive-edit", Frecursive_edit, Srecursive_edit, 0, 0, "",
760 doc: /* Invoke the editor command loop recursively. 760 doc: /* Invoke the editor command loop recursively.
761To get out of the recursive edit, a command can throw to `exit' -- for 761To get out of the recursive edit, a command can throw to exit -- for
762instance `(throw 'exit nil)'. 762instance (throw 'exit nil).
763If you throw a value other than t, `recursive-edit' returns normally 763If you throw a value other than t, recursive-edit returns normally
764to the function that called it. Throwing a t value causes 764to the function that called it. Throwing a t value causes
765`recursive-edit' to quit, so that control returns to the command loop 765recursive-edit to quit, so that control returns to the command loop
766one level up. 766one level up.
767 767
768This function is called by the editor initialization to begin editing. */) 768This function is called by the editor initialization to begin editing. */)