aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2015-06-30 15:06:31 -0700
committerPaul Eggert2015-06-30 15:08:02 -0700
commit3213d7707026573ca425ba1c865b7fa1a8b46639 (patch)
tree594558b482ebdb376605c8f304532e6746df78d5
parent5f9e4b2e11adce9933af2267425b80dc536c4239 (diff)
downloademacs-3213d7707026573ca425ba1c865b7fa1a8b46639.tar.gz
emacs-3213d7707026573ca425ba1c865b7fa1a8b46639.zip
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.
-rw-r--r--lisp/allout.el4
-rw-r--r--lisp/emacs-lisp/easy-mmode.el2
-rw-r--r--lisp/erc/erc.el3
-rw-r--r--lisp/ls-lisp.el4
-rw-r--r--lisp/menu-bar.el2
-rw-r--r--lisp/obsolete/otodo-mode.el2
-rw-r--r--lisp/progmodes/compile.el6
-rw-r--r--lisp/progmodes/etags.el2
-rw-r--r--lisp/progmodes/flymake.el2
-rw-r--r--lisp/progmodes/make-mode.el2
-rw-r--r--lisp/progmodes/vhdl-mode.el2
-rw-r--r--lisp/subr.el4
-rw-r--r--lisp/term/pc-win.el2
-rw-r--r--lisp/textmodes/texinfmt.el2
-rw-r--r--lisp/textmodes/texnfo-upd.el2
-rw-r--r--lisp/time.el2
-rw-r--r--lisp/tmm.el2
-rw-r--r--src/buffer.c2
-rw-r--r--src/fileio.c4
19 files changed, 25 insertions, 26 deletions
diff --git a/lisp/allout.el b/lisp/allout.el
index dcdd35eb488..db87cb1128b 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -5589,9 +5589,9 @@ Defaults:
5589 5589
5590LISTIFIED is a list representing each topic header and body: 5590LISTIFIED is a list representing each topic header and body:
5591 5591
5592 \`(depth prefix text)' 5592 `(depth prefix text)'
5593 5593
5594or \`(depth prefix text bullet-plus)' 5594or `(depth prefix text bullet-plus)'
5595 5595
5596If `bullet-plus' is specified, it is inserted just after the entire prefix." 5596If `bullet-plus' is specified, it is inserted just after the entire prefix."
5597 (setq listified (cdr listified)) 5597 (setq listified (cdr listified))
diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el
index ed77ad7e387..eab22b67cd7 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
411ARG is omitted or nil. 411ARG is omitted or nil.
412 412
413%s is enabled in all buffers where 413%s is enabled in all buffers where
414\`%s' would do it. 414`%s' would do it.
415See `%s' for more information on %s." 415See `%s' for more information on %s."
416 pretty-name pretty-global-name 416 pretty-name pretty-global-name
417 pretty-name turn-on mode pretty-name) 417 pretty-name turn-on mode pretty-name)
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 88732cb7ea6..460accd3be3 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -1,4 +1,3 @@
1
2;; erc.el --- An Emacs Internet Relay Chat client -*- lexical-binding:t -*- 1;; erc.el --- An Emacs Internet Relay Chat client -*- lexical-binding:t -*-
3 2
4;; Copyright (C) 1997-2015 Free Software Foundation, Inc. 3;; Copyright (C) 1997-2015 Free Software Foundation, Inc.
@@ -3260,7 +3259,7 @@ The lines are shown in a buffer named `*Occur*'.
3260It serves as a menu to find any of the occurrences in this buffer. 3259It serves as a menu to find any of the occurrences in this buffer.
3261\\[describe-mode] in that buffer will explain how. 3260\\[describe-mode] in that buffer will explain how.
3262 3261
3263If LINE contains upper case characters (excluding those preceded by `\'), 3262If LINE contains upper case characters (excluding those preceded by \\’),
3264the matching is case-sensitive." 3263the matching is case-sensitive."
3265 (occur line) 3264 (occur line)
3266 t) 3265 t)
diff --git a/lisp/ls-lisp.el b/lisp/ls-lisp.el
index d4b890504aa..70307f6dcac 100644
--- a/lisp/ls-lisp.el
+++ b/lisp/ls-lisp.el
@@ -144,7 +144,7 @@ value to get similar behavior.
144When this option is non-nil, and `ls-lisp-use-string-collate' is also 144When this option is non-nil, and `ls-lisp-use-string-collate' is also
145non-nil, the collation order produced on MS-Windows will ignore 145non-nil, the collation order produced on MS-Windows will ignore
146punctuation and symbol characters, which will, for example, place 146punctuation and symbol characters, which will, for example, place
147\`.foo' near `foo'. See the documentation of `string-collate-lessp' 147`.foo' near `foo'. See the documentation of `string-collate-lessp'
148and `w32-collate-ignore-punctuation' for more details. 148and `w32-collate-ignore-punctuation' for more details.
149 149
150This option is ignored on platforms other than MS-Windows; to 150This 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!"
539 "Return t if string S1 should sort before string S2. 539 "Return t if string S1 should sort before string S2.
540Case is significant if `ls-lisp-ignore-case' is nil. 540Case is significant if `ls-lisp-ignore-case' is nil.
541Uses `string-collate-lessp' if `ls-lisp-use-string-collate' is non-nil, 541Uses `string-collate-lessp' if `ls-lisp-use-string-collate' is non-nil,
542\`compare-strings' otherwise. 542`compare-strings' otherwise.
543On GNU/Linux systems, if the locale specifies UTF-8 as the codeset, 543On GNU/Linux systems, if the locale specifies UTF-8 as the codeset,
544the sorting order will place together file names that differ only 544the sorting order will place together file names that differ only
545by punctuation characters, like `.emacs' and `emacs'. To have a 545by punctuation characters, like `.emacs' and `emacs'. To have a
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 65ed8d5cc65..22a0b8faaba 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
2283depending on FRAME's terminal device. On X displays, it calls 2283depending on FRAME's terminal device. On X displays, it calls
2284`x-menu-bar-open'; on Windows, `w32-menu-bar-open'; otherwise it 2284`x-menu-bar-open'; on Windows, `w32-menu-bar-open'; otherwise it
2285calls either `popup-menu' or `tmm-menubar' depending on whether 2285calls either `popup-menu' or `tmm-menubar' depending on whether
2286\`tty-menu-open-use-tmm' is nil or not. 2286`tty-menu-open-use-tmm' is nil or not.
2287 2287
2288If FRAME is nil or not given, use the selected frame." 2288If FRAME is nil or not given, use the selected frame."
2289 (interactive) 2289 (interactive)
diff --git a/lisp/obsolete/otodo-mode.el b/lisp/obsolete/otodo-mode.el
index 69364f6bc1a..04b881094df 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."
734Number of entries for each category is given by NOF-PRIORITIES which 734Number of entries for each category is given by NOF-PRIORITIES which
735defaults to `todo-show-priorities'. 735defaults to `todo-show-priorities'.
736 736
737If CATEGORY-PR-PAGE is non-nil, a page separator \'^L\' is inserted 737If CATEGORY-PR-PAGE is non-nil, a page separator '^L' is inserted
738between each category. 738between each category.
739INTERACTIVE should be non-nil if this function is called interactively." 739INTERACTIVE should be non-nil if this function is called interactively."
740 740
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index a58e393779a..37d3fe84114 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))
255 ;; can be composed of any non-newline char, but it also rules out some 255 ;; can be composed of any non-newline char, but it also rules out some
256 ;; valid but unlikely cases, such as a trailing space or a space 256 ;; valid but unlikely cases, such as a trailing space or a space
257 ;; followed by a -, or a colon followed by a space. 257 ;; followed by a -, or a colon followed by a space.
258 ;; 258 ;;
259 ;; The "in \\|from " exception was added to handle messages from Ruby. 259 ;; The "in \\|from " exception was added to handle messages from Ruby.
260 ,(rx 260 ,(rx
261 bol 261 bol
@@ -1461,9 +1461,9 @@ Additionally, with universal prefix arg, compilation buffer will be in
1461comint mode, i.e. interactive. 1461comint mode, i.e. interactive.
1462 1462
1463To run more than one compilation at once, start one then rename 1463To run more than one compilation at once, start one then rename
1464the \`*compilation*' buffer to some other name with 1464the `*compilation*' buffer to some other name with
1465\\[rename-buffer]. Then _switch buffers_ and start the new compilation. 1465\\[rename-buffer]. Then _switch buffers_ and start the new compilation.
1466It will create a new \`*compilation*' buffer. 1466It will create a new `*compilation*' buffer.
1467 1467
1468On most systems, termination of the main compilation process 1468On most systems, termination of the main compilation process
1469kills its subprocesses. 1469kills its subprocesses.
diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el
index bf57770a3dd..fc986f34187 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."
1772 "No \\[tags-search] or \\[tags-query-replace] in progress")) 1772 "No \\[tags-search] or \\[tags-query-replace] in progress"))
1773 "Form for `tags-loop-continue' to eval to scan one file. 1773 "Form for `tags-loop-continue' to eval to scan one file.
1774If it returns non-nil, this file needs processing by evalling 1774If it returns non-nil, this file needs processing by evalling
1775\`tags-loop-operate'. Otherwise, move on to the next file.") 1775`tags-loop-operate'. Otherwise, move on to the next file.")
1776 1776
1777(defun tags-loop-eval (form) 1777(defun tags-loop-eval (form)
1778 "Evaluate FORM and return its result. 1778 "Evaluate FORM and return its result.
diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index 696ab5273b7..bb5ac635883 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."
287 nil))))) 287 nil)))))
288 288
289(defun flymake-fix-file-name (name) 289(defun flymake-fix-file-name (name)
290 "Replace all occurrences of '\' with '/'." 290 "Replace all occurrences of \\’ with /."
291 (when name 291 (when name
292 (setq name (expand-file-name name)) 292 (setq name (expand-file-name name))
293 (setq name (abbreviate-file-name name)) 293 (setq name (abbreviate-file-name name))
diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el
index fc0be60fb59..9abbf16ed5d 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."
1455 1455
1456(defun makefile-browser-insert-continuation () 1456(defun makefile-browser-insert-continuation ()
1457 "Insert a makefile continuation. 1457 "Insert a makefile continuation.
1458In the makefile buffer, go to (end-of-line), insert a \'\\\' 1458In the makefile buffer, go to (end-of-line), insert a \\
1459character, insert a new blank line, go to that line and indent by one TAB. 1459character, insert a new blank line, go to that line and indent by one TAB.
1460This is most useful in the process of creating continued lines when copying 1460This is most useful in the process of creating continued lines when copying
1461large dependencies from the browser to the client buffer. 1461large dependencies from the browser to the client buffer.
diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el
index f85f4c4fada..5ed0ff0ebed 100644
--- a/lisp/progmodes/vhdl-mode.el
+++ b/lisp/progmodes/vhdl-mode.el
@@ -5713,7 +5713,7 @@ the offset is simply returned."
5713 (t nil))))) 5713 (t nil)))))
5714 5714
5715(defun vhdl-in-extended-identifier-p () 5715(defun vhdl-in-extended-identifier-p ()
5716 "Determine if point is inside extended identifier (delimited by '\')." 5716 "Determine if point is inside extended identifier (delimited by \\’)."
5717 (save-match-data 5717 (save-match-data
5718 (and (save-excursion (re-search-backward "\\\\" (vhdl-point 'bol) t)) 5718 (and (save-excursion (re-search-backward "\\\\" (vhdl-point 'bol) t))
5719 (save-excursion (re-search-forward "\\\\" (vhdl-point 'eol) t))))) 5719 (save-excursion (re-search-forward "\\\\" (vhdl-point 'eol) t)))))
diff --git a/lisp/subr.el b/lisp/subr.el
index 535fa2d3d0e..5bd4bb40a67 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1213,14 +1213,14 @@ and `event-end' functions."
1213 "Return the window row number in POSITION and character number in that row. 1213 "Return the window row number in POSITION and character number in that row.
1214 1214
1215Return nil if POSITION does not contain the actual position; in that case 1215Return nil if POSITION does not contain the actual position; in that case
1216\`posn-col-row' can be used to get approximate values. 1216`posn-col-row' can be used to get approximate values.
1217POSITION should be a list of the form returned by the `event-start' 1217POSITION should be a list of the form returned by the `event-start'
1218and `event-end' functions. 1218and `event-end' functions.
1219 1219
1220This function does not account for the width on display, like the 1220This function does not account for the width on display, like the
1221number of visual columns taken by a TAB or image. If you need 1221number of visual columns taken by a TAB or image. If you need
1222the coordinates of POSITION in character units, you should use 1222the coordinates of POSITION in character units, you should use
1223\`posn-col-row', not this function." 1223`posn-col-row', not this function."
1224 (nth 6 position)) 1224 (nth 6 position))
1225 1225
1226(defsubst posn-timestamp (position) 1226(defsubst posn-timestamp (position)
diff --git a/lisp/term/pc-win.el b/lisp/term/pc-win.el
index b6c7222cdc8..e8aaa1a6829 100644
--- a/lisp/term/pc-win.el
+++ b/lisp/term/pc-win.el
@@ -177,7 +177,7 @@ contain wildcard characters:
177 PATTERN is case-insensitive. 177 PATTERN is case-insensitive.
178 178
179The return value is a list of strings, suitable as arguments to 179The return value is a list of strings, suitable as arguments to
180\`set-face-font'. 180`set-face-font'.
181 181
182Fonts Emacs can't use may or may not be excluded 182Fonts Emacs can't use may or may not be excluded
183even if they match PATTERN and FACE. 183even if they match PATTERN and FACE.
diff --git a/lisp/textmodes/texinfmt.el b/lisp/textmodes/texinfmt.el
index cab4f770b98..e1259ff94f6 100644
--- a/lisp/textmodes/texinfmt.el
+++ b/lisp/textmodes/texinfmt.el
@@ -34,7 +34,7 @@
34If optional argument HERE is non-nil, insert info at point." 34If optional argument HERE is non-nil, insert info at point."
35 (interactive "P") 35 (interactive "P")
36 (let ((version-string 36 (let ((version-string
37 (format "Version of \`texinfmt.el\': %s" texinfmt-version))) 37 (format "Version of `texinfmt.el': %s" texinfmt-version)))
38 (if here 38 (if here
39 (insert version-string) 39 (insert version-string)
40 (if (called-interactively-p 'interactive) 40 (if (called-interactively-p 'interactive)
diff --git a/lisp/textmodes/texnfo-upd.el b/lisp/textmodes/texnfo-upd.el
index df05b670095..eefea1f8493 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
893descriptions from pre-existing menus) before it constructs the 893descriptions from pre-existing menus) before it constructs the
894master menu. If the argument is numeric (e.g., \"C-u 2\"), 894master menu. If the argument is numeric (e.g., \"C-u 2\"),
895update all existing nodes as well, by calling 895update all existing nodes as well, by calling
896\`texinfo-update-node' on the entire file. Warning: do NOT 896`texinfo-update-node' on the entire file. Warning: do NOT
897invoke with a numeric argument if your Texinfo file uses @node 897invoke with a numeric argument if your Texinfo file uses @node
898lines without the `Next', `Previous', `Up' pointers, as the 898lines without the `Next', `Previous', `Up' pointers, as the
899result could be an invalid Texinfo file! 899result could be an invalid Texinfo file!
diff --git a/lisp/time.el b/lisp/time.el
index 7c1e95e7f7f..ae0e598b64c 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."
176Each element has the form (TIMEZONE LABEL). 176Each element has the form (TIMEZONE LABEL).
177TIMEZONE should be in a format supported by your system. See the 177TIMEZONE should be in a format supported by your system. See the
178documentation of `zoneinfo-style-world-list' and 178documentation of `zoneinfo-style-world-list' and
179\`legacy-style-world-list' for two widely used formats. LABEL is 179`legacy-style-world-list' for two widely used formats. LABEL is
180a string to display as the label of that TIMEZONE's time." 180a string to display as the label of that TIMEZONE's time."
181 :group 'display-time 181 :group 'display-time
182 :type '(repeat (list string string)) 182 :type '(repeat (list string string))
diff --git a/lisp/tmm.el b/lisp/tmm.el
index 2ddeeeeae8e..5d56cffa930 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.
54 54
55Note that \\[menu-bar-open] by default drops down TTY menus; if you want it 55Note that \\[menu-bar-open] by default drops down TTY menus; if you want it
56to invoke `tmm-menubar' instead, customize the variable 56to invoke `tmm-menubar' instead, customize the variable
57\`tty-menu-open-use-tmm' to a non-nil value." 57`tty-menu-open-use-tmm' to a non-nil value."
58 (interactive) 58 (interactive)
59 (run-hooks 'menu-bar-update-hook) 59 (run-hooks 'menu-bar-update-hook)
60 ;; Obey menu-bar-final-items; put those items last. 60 ;; Obey menu-bar-final-items; put those items last.
diff --git a/src/buffer.c b/src/buffer.c
index e151e9451d1..bd7c82c062f 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.
5730Any other value is treated as nil. 5730Any other value is treated as nil.
5731 5731
5732This variable has no effect unless the buffer's value of 5732This variable has no effect unless the buffer's value of
5733\`bidi-display-reordering' is non-nil. */); 5733`bidi-display-reordering' is non-nil. */);
5734 5734
5735 DEFVAR_PER_BUFFER ("truncate-lines", &BVAR (current_buffer, truncate_lines), Qnil, 5735 DEFVAR_PER_BUFFER ("truncate-lines", &BVAR (current_buffer, truncate_lines), Qnil,
5736 doc: /* Non-nil means do not display continuation lines. 5736 doc: /* Non-nil means do not display continuation lines.
diff --git a/src/fileio.c b/src/fileio.c
index aad0270a1d2..905778e9277 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -5866,7 +5866,7 @@ syms_of_fileio (void)
5866If it is nil, `default-file-name-coding-system' (which see) is used. 5866If it is nil, `default-file-name-coding-system' (which see) is used.
5867 5867
5868On MS-Windows, the value of this variable is largely ignored if 5868On MS-Windows, the value of this variable is largely ignored if
5869\`w32-unicode-filenames' (which see) is non-nil. Emacs on Windows 5869`w32-unicode-filenames' (which see) is non-nil. Emacs on Windows
5870behaves as if file names were encoded in `utf-8'. */); 5870behaves as if file names were encoded in `utf-8'. */);
5871 Vfile_name_coding_system = Qnil; 5871 Vfile_name_coding_system = Qnil;
5872 5872
@@ -5881,7 +5881,7 @@ instead use `file-name-coding-system' to get a constant encoding
5881of file names regardless of the current language environment. 5881of file names regardless of the current language environment.
5882 5882
5883On MS-Windows, the value of this variable is largely ignored if 5883On MS-Windows, the value of this variable is largely ignored if
5884\`w32-unicode-filenames' (which see) is non-nil. Emacs on Windows 5884`w32-unicode-filenames' (which see) is non-nil. Emacs on Windows
5885behaves as if file names were encoded in `utf-8'. */); 5885behaves as if file names were encoded in `utf-8'. */);
5886 Vdefault_file_name_coding_system = Qnil; 5886 Vdefault_file_name_coding_system = Qnil;
5887 5887