From 38bb9ff0f4b92836199d8b3a0ee3903428bb7851 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 21 Jun 2015 12:34:11 -0700 Subject: [PATCH] =?utf8?q?Fix=20some=20=E2=80=9Cnested=E2=80=9D=20quoting?= =?utf8?q?=20confusion=20in=20doc=20strings?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit * 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. --- lisp/emacs-lisp/advice.el | 10 +++++----- lisp/kermit.el | 2 +- lisp/mh-e/mh-comp.el | 2 +- src/keyboard.c | 8 ++++---- 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." ;; The mapping should work for any two argument lists. (defun ad-map-arglists (source-arglist target-arglist) - "Make `funcall/apply' form to map SOURCE-ARGLIST to TARGET-ARGLIST. + "Make ‘funcall/apply’ form to map SOURCE-ARGLIST to TARGET-ARGLIST. The arguments supplied to TARGET-ARGLIST will be taken from SOURCE-ARGLIST just as if they had been supplied to a function with TARGET-ARGLIST directly. Excess source arguments will be neglected, missing source arguments will be -supplied as nil. Returns a `funcall' or `apply' form with the second element -being `function' which has to be replaced by an actual function argument. -Example: `(ad-map-arglists '(a &rest args) '(w x y z))' will return - `(funcall ad--addoit-function a (car args) (car (cdr args)) (nth 2 args))'." +supplied as nil. Returns a ‘funcall’ or ‘apply’ form with the second element +being ‘function’ which has to be replaced by an actual function argument. +Example: ‘(ad-map-arglists '(a &rest args) '(w x y z))’ will return + ‘(funcall ad--addoit-function a (car args) (car (cdr args)) (nth 2 args))’." (let* ((parsed-source-arglist (ad-parse-arglist source-arglist)) (source-reqopt-args (append (nth 0 parsed-source-arglist) (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." (defun kermit-clean-on () "Delete all null characters and ^M's from the kermit output. Note that another (perhaps better) way to do this is to use the -command `kermit | tr -d '\\015''." +command ‘kermit | tr -d '\\015'’." (interactive) (set-process-filter (get-buffer-process (current-buffer)) '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.") Default is \"replgroupcomps\". This file is used to form replies to the sender and all recipients of -a message. Only used if `(mh-variant-p 'nmh)' is non-nil. +a message. Only used if ‘(mh-variant-p 'nmh)’ is non-nil. If not an absolute file name, the file is searched for first in the user's MH directory, then in the system MH lib directory.") 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) DEFUN ("recursive-edit", Frecursive_edit, Srecursive_edit, 0, 0, "", doc: /* Invoke the editor command loop recursively. -To get out of the recursive edit, a command can throw to `exit' -- for -instance `(throw 'exit nil)'. -If you throw a value other than t, `recursive-edit' returns normally +To get out of the recursive edit, a command can throw to ‘exit’ -- for +instance ‘(throw 'exit nil)’. +If you throw a value other than t, ‘recursive-edit’ returns normally to the function that called it. Throwing a t value causes -`recursive-edit' to quit, so that control returns to the command loop +‘recursive-edit’ to quit, so that control returns to the command loop one level up. This function is called by the editor initialization to begin editing. */) -- 2.39.2