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

8 files changed, 25 insertions, 26 deletions

diff --git a/doc/lispref/control.texi b/doc/lispref/control.texi
index 421f5cc530f..29d1bd588e3 100644
--- a/doc/lispref/control.texi
+++ b/doc/lispref/control.texi
@@ -315,7 +315,7 @@ between a few different constant values:
 @example
 (pcase (get-return-code x)
   (`success       (message "Done!"))
-  (`would-block   (message "Sorry, can't do it now"))
+  (`would-block   (message "Sorry, can’t do it now"))
   (`read-only     (message "The shmliblick is read-only"))
   (`access-denied (message "You do not have the needed rights"))
   (code           (message "Unknown return code %S" code)))
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 36404f4dff9..9d82edc9a98 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -632,13 +632,13 @@ for logging the warning.  By default, it is @file{*Warnings*}.
 @end defun
 
 @defun lwarn type level message &rest args
-This function reports a warning using the value of @code{(format
+This function reports a warning using the value of @code{(format-message
 @var{message} @var{args}...)} as the message in the @file{*Warnings*}
 buffer.  In other respects it is equivalent to @code{display-warning}.
 @end defun
 
 @defun warn message &rest args
-This function reports a warning using the value of @code{(format
+This function reports a warning using the value of @code{(format-message
 @var{message} @var{args}...)} as the message, @code{(emacs)} as the
 type, and @code{:warning} as the severity level.  It exists for
 compatibility only; we recommend not using it, because you should
diff --git a/doc/lispref/functions.texi b/doc/lispref/functions.texi
index a853d2fbab5..20eaf5dee1e 100644
--- a/doc/lispref/functions.texi
+++ b/doc/lispref/functions.texi
@@ -1561,7 +1561,7 @@ Around advice such as:
 
 @example
 (defadvice foo (around foo-around)
-  "Ignore case in `foo'."
+  "Ignore case in ‘foo’."
   (let ((case-fold-search t))
     ad-do-it))
 (ad-activate 'foo)
@@ -1571,7 +1571,7 @@ could translate into:
 
 @example
 (defun foo--foo-around (orig-fun &rest args)
-  "Ignore case in `foo'."
+  "Ignore case in ‘foo’."
   (let ((case-fold-search t))
     (apply orig-fun args)))
 (advice-add 'foo :around #'foo--foo-around)
diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index a8b6bb19c5f..f00e481275f 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -1155,9 +1155,9 @@ Many other modes, such as `mail-mode', `outline-mode' and
   "Major mode for editing text written for humans to read.
 In this mode, paragraphs are delimited only by blank or white lines.
 You can thus get the full benefit of adaptive filling
- (see the variable `adaptive-fill-mode').
+ (see the variable ‘adaptive-fill-mode’).
 \\@{text-mode-map@}
-Turning on Text mode runs the normal hook `text-mode-hook'."
+Turning on Text mode runs the normal hook ‘text-mode-hook’."
 @end group
 @group
   (set (make-local-variable 'text-mode-variant) t)
@@ -1252,7 +1252,7 @@ And here is the code to set up the keymap for Lisp mode:
     @dots{}
     map)
   "Keymap for ordinary Lisp mode.
-All commands in `lisp-mode-shared-map' are inherited by this map.")
+All commands in ‘lisp-mode-shared-map’ are inherited by this map.")
 @end group
 @end smallexample
 
@@ -1268,12 +1268,12 @@ Delete converts tabs to spaces as it moves back.
 Blank lines separate paragraphs.  Semicolons start comments.
 
 \\@{lisp-mode-map@}
-Note that `run-lisp' may be used either to start an inferior Lisp job
+Note that ‘run-lisp’ may be used either to start an inferior Lisp job
 or to switch back to an existing one.
 @end group
 
 @group
-Entry to this mode calls the value of `lisp-mode-hook'
+Entry to this mode calls the value of ‘lisp-mode-hook’
 if that value is non-nil."
   (lisp-mode-variables nil t)
   (set (make-local-variable 'find-tag-default-function)
@@ -1447,7 +1447,7 @@ will load the library that defines the mode.  For example:
 (defcustom msb-mode nil
   "Toggle msb-mode.
 Setting this variable directly does not take effect;
-use either \\[customize] or the function `msb-mode'."
+use either \\[customize] or the function ‘msb-mode’."
   :set 'custom-set-minor-mode
   :initialize 'custom-initialize-default
   :version "20.4"
@@ -1605,7 +1605,7 @@ for this macro.
 Interactively with no argument, this command toggles the mode.
 A positive prefix argument enables the mode, any other prefix
 argument disables it.  From Lisp, argument omitted or nil enables
-the mode, `toggle' toggles the state.
+the mode, ‘toggle’ toggles the state.
 
 When Hungry mode is enabled, the control delete key
 gobbles all preceding whitespace except the last.
diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi
index 4b5a1b4a6ff..64ebb45f23b 100644
--- a/doc/lispref/os.texi
+++ b/doc/lispref/os.texi
@@ -1927,7 +1927,7 @@ idleness.  Here's an example:
 
 @example
 (defvar my-resume-timer nil
-  "Timer for `my-timer-function' to reschedule itself, or nil.")
+  "Timer for ‘my-timer-function’ to reschedule itself, or nil.")
 
 (defun my-timer-function ()
   ;; @r{If the user types a command while @code{my-resume-timer}}
diff --git a/doc/lispref/sequences.texi b/doc/lispref/sequences.texi
index eb152283fbb..12ed881dadb 100644
--- a/doc/lispref/sequences.texi
+++ b/doc/lispref/sequences.texi
@@ -833,10 +833,9 @@ vector or string (@pxref{Iteration} for more information about the
 
 @defmac seq-let arguments sequence body@dots{}
 @cindex sequence destructuring
-  This macro binds the variables in defined in the sequence
-@var{arguments} to the elements of the sequence @var{sequence}.
-@var{arguments} can itself include sequences allowing for nested
-destructuring.
+  This macro binds the variables defined in @var{arguments} to the
+elements of the sequence @var{sequence}.  @var{arguments} can itself
+include sequences allowing for nested destructuring.
 
 The @var{arguments} sequence can also include the @code{&rest} marker
 followed by a variable name to be bound to the rest of
diff --git a/doc/lispref/strings.texi b/doc/lispref/strings.texi
index 08e8e877a9f..d882be485ef 100644
--- a/doc/lispref/strings.texi
+++ b/doc/lispref/strings.texi
@@ -969,12 +969,12 @@ is not truncated.
 
 @example
 @group
-(format "The word '%7s' has %d letters in it."
+(format "The word ‘%7s’ has %d letters in it."
         "foo" (length "foo"))
-     @result{} "The word '    foo' has 3 letters in it."
-(format "The word '%7s' has %d letters in it."
+     @result{} "The word ‘    foo’ has 3 letters in it."
+(format "The word ‘%7s’ has %d letters in it."
         "specification" (length "specification"))
-     @result{} "The word 'specification' has 13 letters in it."
+     @result{} "The word ‘specification’ has 13 letters in it."
 @end group
 @end example
 
@@ -1013,12 +1013,12 @@ ignored.
 (format "%06d is padded on the left with zeros" 123)
      @result{} "000123 is padded on the left with zeros"
 
-(format "'%-6d' is padded on the right" 123)
-     @result{} "'123   ' is padded on the right"
+(format "‘%-6d’ is padded on the right" 123)
+     @result{} "‘123   ’ is padded on the right"
 
-(format "The word '%-7s' actually has %d letters in it."
+(format "The word ‘%-7s’ actually has %d letters in it."
         "foo" (length "foo"))
-     @result{} "The word 'foo    ' actually has 3 letters in it."
+     @result{} "The word ‘foo    ’ actually has 3 letters in it."
 @end group
 @end example
 
diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi
index e63e634db04..245825ada60 100644
--- a/doc/lispref/text.texi
+++ b/doc/lispref/text.texi
@@ -1960,7 +1960,7 @@ Called from a program, there are three arguments:
 @group
 REVERSE (non-nil means reverse order),\
  BEG and END (region to sort).
-The variable `sort-fold-case' determines\
+The variable ‘sort-fold-case’ determines\
  whether alphabetic case affects
 the sort order."
 @end group