[Emacs-diffs] master 3213d77: In strings, prefer plain ` and ' to \` and \'

[Paul Eggert]

branch: master
commit 3213d7707026573ca425ba1c865b7fa1a8b46639
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    In strings, prefer plain ` and ' to \` and \'
    
    * lisp/allout.el (allout-insert-listified):
    * lisp/emacs-lisp/easy-mmode.el (define-globalized-minor-mode):
    * lisp/ls-lisp.el (ls-lisp-UCA-like-collation)
    (ls-lisp-string-lessp):
    * lisp/menu-bar.el (menu-bar-open):
    * lisp/obsolete/otodo-mode.el (todo-top-priorities):
    * lisp/progmodes/compile.el (compile):
    * lisp/progmodes/etags.el (tags-loop-scan):
    * lisp/progmodes/make-mode.el (makefile-browser-insert-continuation):
    * lisp/subr.el (posn-actual-col-row):
    * lisp/term/pc-win.el (x-list-fonts):
    * lisp/textmodes/texinfmt.el (texinfmt-version):
    * lisp/textmodes/texnfo-upd.el (texinfo-master-menu):
    * lisp/time.el (display-time-world-list):
    * lisp/tmm.el (tmm-menubar):
    * src/buffer.c (syms_of_buffer):
    * src/fileio.c (syms_of_fileio):
    Omit unnecessary and confusing backslash before quote.
    * lisp/erc/erc.el (erc-cmd-LASTLOG):
    * lisp/progmodes/flymake.el (flymake-fix-file-name):
    * lisp/progmodes/vhdl-mode.el (vhdl-in-extended-identifier-p):
    Fix string that was intended to escape a backslash and not a quote.
---
 lisp/allout.el                |    4 ++--
 lisp/emacs-lisp/easy-mmode.el |    2 +-
 lisp/erc/erc.el               |    3 +--
 lisp/ls-lisp.el               |    4 ++--
 lisp/menu-bar.el              |    2 +-
 lisp/obsolete/otodo-mode.el   |    2 +-
 lisp/progmodes/compile.el     |    6 +++---
 lisp/progmodes/etags.el       |    2 +-
 lisp/progmodes/flymake.el     |    2 +-
 lisp/progmodes/make-mode.el   |    2 +-
 lisp/progmodes/vhdl-mode.el   |    2 +-
 lisp/subr.el                  |    4 ++--
 lisp/term/pc-win.el           |    2 +-
 lisp/textmodes/texinfmt.el    |    2 +-
 lisp/textmodes/texnfo-upd.el  |    2 +-
 lisp/time.el                  |    2 +-
 lisp/tmm.el                   |    2 +-
 src/buffer.c                  |    2 +-
 src/fileio.c                  |    4 ++--
 19 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/lisp/allout.el b/lisp/allout.el
index dcdd35e..db87cb1 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -5589,9 +5589,9 @@ Defaults:
 
 LISTIFIED is a list representing each topic header and body:
 
- \`(depth prefix text)'
+ `(depth prefix text)'
 
-or \`(depth prefix text bullet-plus)'
+or `(depth prefix text bullet-plus)'
 
 If `bullet-plus' is specified, it is inserted just after the entire prefix."
   (setq listified (cdr listified))
diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el
index ed77ad7..eab22b6 100644
--- a/lisp/emacs-lisp/easy-mmode.el
+++ b/lisp/emacs-lisp/easy-mmode.el
@@ -411,7 +411,7 @@ otherwise, disable it.  If called from Lisp, enable the 
mode if
 ARG is omitted or nil.
 
 %s is enabled in all buffers where
-\`%s' would do it.
+`%s' would do it.
 See `%s' for more information on %s."
                  pretty-name pretty-global-name
                  pretty-name turn-on mode pretty-name)
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 88732cb..460accd 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -1,4 +1,3 @@
-
 ;; erc.el --- An Emacs Internet Relay Chat client  -*- lexical-binding:t -*-
 
 ;; Copyright (C) 1997-2015 Free Software Foundation, Inc.
@@ -3260,7 +3259,7 @@ The lines are shown in a buffer named `*Occur*'.
 It serves as a menu to find any of the occurrences in this buffer.
 \\[describe-mode] in that buffer will explain how.
 
-If LINE contains upper case characters (excluding those preceded by `\'),
+If LINE contains upper case characters (excluding those preceded by ‘\\’),
 the matching is case-sensitive."
   (occur line)
   t)
diff --git a/lisp/ls-lisp.el b/lisp/ls-lisp.el
index d4b8905..70307f6 100644
--- a/lisp/ls-lisp.el
+++ b/lisp/ls-lisp.el
@@ -144,7 +144,7 @@ value to get similar behavior.
 When this option is non-nil, and `ls-lisp-use-string-collate' is also
 non-nil, the collation order produced on MS-Windows will ignore
 punctuation and symbol characters, which will, for example, place
-\`.foo' near `foo'.  See the documentation of `string-collate-lessp'
+`.foo' near `foo'.  See the documentation of `string-collate-lessp'
 and `w32-collate-ignore-punctuation' for more details.
 
 This option is ignored on platforms other than MS-Windows; to
@@ -539,7 +539,7 @@ Responds to the window width as ls should but may not!"
   "Return t if string S1 should sort before string S2.
 Case is significant if `ls-lisp-ignore-case' is nil.
 Uses `string-collate-lessp' if `ls-lisp-use-string-collate' is non-nil,
-\`compare-strings' otherwise.
+`compare-strings' otherwise.
 On GNU/Linux systems, if the locale specifies UTF-8 as the codeset,
 the sorting order will place together file names that differ only
 by punctuation characters, like `.emacs' and `emacs'.  To have a
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 65ed8d5..22a0b8f 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -2283,7 +2283,7 @@ This function decides which method to use to access the 
menu
 depending on FRAME's terminal device.  On X displays, it calls
 `x-menu-bar-open'; on Windows, `w32-menu-bar-open'; otherwise it
 calls either `popup-menu' or `tmm-menubar' depending on whether
-\`tty-menu-open-use-tmm' is nil or not.
+`tty-menu-open-use-tmm' is nil or not.
 
 If FRAME is nil or not given, use the selected frame."
   (interactive)
diff --git a/lisp/obsolete/otodo-mode.el b/lisp/obsolete/otodo-mode.el
index 69364f6..04b8810 100644
--- a/lisp/obsolete/otodo-mode.el
+++ b/lisp/obsolete/otodo-mode.el
@@ -734,7 +734,7 @@ If point is on an empty line, insert the entry there."
 Number of entries for each category is given by NOF-PRIORITIES which
 defaults to `todo-show-priorities'.
 
-If CATEGORY-PR-PAGE is non-nil, a page separator \'^L\' is inserted
+If CATEGORY-PR-PAGE is non-nil, a page separator '^L' is inserted
 between each category.
 INTERACTIVE should be non-nil if this function is called interactively."
 
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index a58e393..37d3fe8 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -255,7 +255,7 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1))
      ;; can be composed of any non-newline char, but it also rules out some
      ;; valid but unlikely cases, such as a trailing space or a space
      ;; followed by a -, or a colon followed by a space.
-     ;; 
+     ;;
      ;; The "in \\|from " exception was added to handle messages from Ruby.
      ,(rx
        bol
@@ -1461,9 +1461,9 @@ Additionally, with universal prefix arg, compilation 
buffer will be in
 comint mode, i.e. interactive.
 
 To run more than one compilation at once, start one then rename
-the \`*compilation*' buffer to some other name with
+the `*compilation*' buffer to some other name with
 \\[rename-buffer].  Then _switch buffers_ and start the new compilation.
-It will create a new \`*compilation*' buffer.
+It will create a new `*compilation*' buffer.
 
 On most systems, termination of the main compilation process
 kills its subprocesses.
diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el
index bf57770..fc986f3 100644
--- a/lisp/progmodes/etags.el
+++ b/lisp/progmodes/etags.el
@@ -1772,7 +1772,7 @@ if the file was newly read in, the value is the filename."
                "No \\[tags-search] or \\[tags-query-replace] in progress"))
   "Form for `tags-loop-continue' to eval to scan one file.
 If it returns non-nil, this file needs processing by evalling
-\`tags-loop-operate'.  Otherwise, move on to the next file.")
+`tags-loop-operate'.  Otherwise, move on to the next file.")
 
 (defun tags-loop-eval (form)
   "Evaluate FORM and return its result.
diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index 696ab52..bb5ac63 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -287,7 +287,7 @@ Return its file name if found, or nil if not found."
             nil)))))
 
 (defun flymake-fix-file-name (name)
-  "Replace all occurrences of '\' with '/'."
+  "Replace all occurrences of ‘\\’ with ‘/’."
   (when name
     (setq name (expand-file-name name))
     (setq name (abbreviate-file-name name))
diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el
index fc0be60..9abbf16 100644
--- a/lisp/progmodes/make-mode.el
+++ b/lisp/progmodes/make-mode.el
@@ -1455,7 +1455,7 @@ Fill comments, backslashed lines, and variable 
definitions specially."
 
 (defun makefile-browser-insert-continuation ()
   "Insert a makefile continuation.
-In the makefile buffer, go to (end-of-line), insert a \'\\\'
+In the makefile buffer, go to (end-of-line), insert a ‘\\’
 character, insert a new blank line, go to that line and indent by one TAB.
 This is most useful in the process of creating continued lines when copying
 large dependencies from the browser to the client buffer.
diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el
index f85f4c4..5ed0ff0 100644
--- a/lisp/progmodes/vhdl-mode.el
+++ b/lisp/progmodes/vhdl-mode.el
@@ -5713,7 +5713,7 @@ the offset is simply returned."
        (t nil)))))
 
 (defun vhdl-in-extended-identifier-p ()
-  "Determine if point is inside extended identifier (delimited by '\')."
+  "Determine if point is inside extended identifier (delimited by ‘\\’)."
   (save-match-data
     (and (save-excursion (re-search-backward "\\\\" (vhdl-point 'bol) t))
         (save-excursion (re-search-forward "\\\\" (vhdl-point 'eol) t)))))
diff --git a/lisp/subr.el b/lisp/subr.el
index 535fa2d..5bd4bb4 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1213,14 +1213,14 @@ and `event-end' functions."
   "Return the window row number in POSITION and character number in that row.
 
 Return nil if POSITION does not contain the actual position; in that case
-\`posn-col-row' can be used to get approximate values.
+`posn-col-row' can be used to get approximate values.
 POSITION should be a list of the form returned by the `event-start'
 and `event-end' functions.
 
 This function does not account for the width on display, like the
 number of visual columns taken by a TAB or image.  If you need
 the coordinates of POSITION in character units, you should use
-\`posn-col-row', not this function."
+`posn-col-row', not this function."
   (nth 6 position))
 
 (defsubst posn-timestamp (position)
diff --git a/lisp/term/pc-win.el b/lisp/term/pc-win.el
index b6c7222..e8aaa1a 100644
--- a/lisp/term/pc-win.el
+++ b/lisp/term/pc-win.el
@@ -177,7 +177,7 @@ contain wildcard characters:
   PATTERN is case-insensitive.
 
 The return value is a list of strings, suitable as arguments to
-\`set-face-font'.
+`set-face-font'.
 
 Fonts Emacs can't use may or may not be excluded
 even if they match PATTERN and FACE.
diff --git a/lisp/textmodes/texinfmt.el b/lisp/textmodes/texinfmt.el
index cab4f77..e1259ff 100644
--- a/lisp/textmodes/texinfmt.el
+++ b/lisp/textmodes/texinfmt.el
@@ -34,7 +34,7 @@
 If optional argument HERE is non-nil, insert info at point."
   (interactive "P")
   (let ((version-string
-         (format "Version of \`texinfmt.el\': %s" texinfmt-version)))
+         (format "Version of `texinfmt.el': %s" texinfmt-version)))
     (if here
         (insert version-string)
       (if (called-interactively-p 'interactive)
diff --git a/lisp/textmodes/texnfo-upd.el b/lisp/textmodes/texnfo-upd.el
index df05b67..eefea1f 100644
--- a/lisp/textmodes/texnfo-upd.el
+++ b/lisp/textmodes/texnfo-upd.el
@@ -893,7 +893,7 @@ first update all existing menus in the buffer (incorporating
 descriptions from pre-existing menus) before it constructs the
 master menu.  If the argument is numeric (e.g., \"C-u 2\"),
 update all existing nodes as well, by calling
-\`texinfo-update-node' on the entire file.  Warning: do NOT
+`texinfo-update-node' on the entire file.  Warning: do NOT
 invoke with a numeric argument if your Texinfo file uses @node
 lines without the `Next', `Previous', `Up' pointers, as the
 result could be an invalid Texinfo file!
diff --git a/lisp/time.el b/lisp/time.el
index 7c1e95e..ae0e598 100644
--- a/lisp/time.el
+++ b/lisp/time.el
@@ -176,7 +176,7 @@ LABEL is a string to display as the label of that 
TIMEZONE's time."
 Each element has the form (TIMEZONE LABEL).
 TIMEZONE should be in a format supported by your system.  See the
 documentation of `zoneinfo-style-world-list' and
-\`legacy-style-world-list' for two widely used formats.  LABEL is
+`legacy-style-world-list' for two widely used formats.  LABEL is
 a string to display as the label of that TIMEZONE's time."
   :group 'display-time
   :type '(repeat (list string string))
diff --git a/lisp/tmm.el b/lisp/tmm.el
index 2ddeeee..5d56cff 100644
--- a/lisp/tmm.el
+++ b/lisp/tmm.el
@@ -54,7 +54,7 @@ we make that menu bar item (the one at that position) the 
default choice.
 
 Note that \\[menu-bar-open] by default drops down TTY menus; if you want it
 to invoke `tmm-menubar' instead, customize the variable
-\`tty-menu-open-use-tmm' to a non-nil value."
+`tty-menu-open-use-tmm' to a non-nil value."
   (interactive)
   (run-hooks 'menu-bar-update-hook)
   ;; Obey menu-bar-final-items; put those items last.
diff --git a/src/buffer.c b/src/buffer.c
index e151e94..bd7c82c 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -5730,7 +5730,7 @@ The values of `right-to-left' and `left-to-right' 
override that.
 Any other value is treated as nil.
 
 This variable has no effect unless the buffer's value of
-\`bidi-display-reordering' is non-nil.  */);
+`bidi-display-reordering' is non-nil.  */);
 
  DEFVAR_PER_BUFFER ("truncate-lines", &BVAR (current_buffer, truncate_lines), 
Qnil,
                     doc: /* Non-nil means do not display continuation lines.
diff --git a/src/fileio.c b/src/fileio.c
index aad0270..905778e 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -5866,7 +5866,7 @@ syms_of_fileio (void)
 If it is nil, `default-file-name-coding-system' (which see) is used.
 
 On MS-Windows, the value of this variable is largely ignored if
-\`w32-unicode-filenames' (which see) is non-nil.  Emacs on Windows
+`w32-unicode-filenames' (which see) is non-nil.  Emacs on Windows
 behaves as if file names were encoded in `utf-8'.  */);
   Vfile_name_coding_system = Qnil;
 
@@ -5881,7 +5881,7 @@ instead use `file-name-coding-system' to get a constant 
encoding
 of file names regardless of the current language environment.
 
 On MS-Windows, the value of this variable is largely ignored if
-\`w32-unicode-filenames' (which see) is non-nil.  Emacs on Windows
+`w32-unicode-filenames' (which see) is non-nil.  Emacs on Windows
 behaves as if file names were encoded in `utf-8'.  */);
   Vdefault_file_name_coding_system = Qnil;