aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Berman2016-06-06 09:29:17 -0700
committerPaul Eggert2016-06-06 09:30:22 -0700
commit9d5ccebeba0506f7280662630f0ee85a52c8a327 (patch)
tree2416109c65e45b2f62e6eec7cf124fb0f41fcc12
parent0b33a23ffecdb4ca87806c9fc7568d17c5ca7e98 (diff)
downloademacs-9d5ccebeba0506f7280662630f0ee85a52c8a327.tar.gz
emacs-9d5ccebeba0506f7280662630f0ee85a52c8a327.zip
Fix doc string quoting
* lisp/files.el (shell-quote-wildcard-pattern): * lisp/progmodes/vhdl-mode.el (vhdl-mode): * lisp/subr.el (replace-regexp-in-string): * lisp/view.el (view-mode): * src/nsfns.m (syms_of_nsfns): * src/syntax.c (Fbackward_prefix_chars): Fix quoting problems in doc strings (Bug#23696).
-rw-r--r--lisp/files.el2
-rw-r--r--lisp/progmodes/vhdl-mode.el2
-rw-r--r--lisp/subr.el4
-rw-r--r--lisp/view.el2
-rw-r--r--src/nsfns.m2
-rw-r--r--src/syntax.c2
6 files changed, 7 insertions, 7 deletions
diff --git a/lisp/files.el b/lisp/files.el
index c5cfa8e57f8..1f97fa5f52f 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -6147,7 +6147,7 @@ and `list-directory-verbose-switches'."
6147 6147
6148PATTERN is assumed to represent a file-name wildcard suitable for the 6148PATTERN is assumed to represent a file-name wildcard suitable for the
6149underlying filesystem. For Unix and GNU/Linux, each character from the 6149underlying filesystem. For Unix and GNU/Linux, each character from the
6150set [ \\t\\n;<>&|()`'\"#$] is quoted with a backslash; for DOS/Windows, all 6150set [ \\t\\n;<>&|()\\=`\\='\"#$] is quoted with a backslash; for DOS/Windows, all
6151the parts of the pattern which don't include wildcard characters are 6151the parts of the pattern which don't include wildcard characters are
6152quoted with double quotes. 6152quoted with double quotes.
6153 6153
diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el
index a390494ebf5..0756c790495 100644
--- a/lisp/progmodes/vhdl-mode.el
+++ b/lisp/progmodes/vhdl-mode.el
@@ -4684,7 +4684,7 @@ Usage:
4684 SPECIAL MENUES: 4684 SPECIAL MENUES:
4685 As an alternative to the speedbar, an index menu can be added (set 4685 As an alternative to the speedbar, an index menu can be added (set
4686 option `vhdl-index-menu' to non-nil) or made accessible as a mouse menu 4686 option `vhdl-index-menu' to non-nil) or made accessible as a mouse menu
4687 (e.g. add \"(global-set-key '[S-down-mouse-3] 'imenu)\" to your start-up 4687 (e.g. add \"(global-set-key [S-down-mouse-3] \\='imenu)\" to your start-up
4688 file) for browsing the file contents (is not populated if buffer is 4688 file) for browsing the file contents (is not populated if buffer is
4689 larger than 256000). Also, a source file menu can be 4689 larger than 256000). Also, a source file menu can be
4690 added (set option `vhdl-source-file-menu' to non-nil) for browsing the 4690 added (set option `vhdl-source-file-menu' to non-nil) for browsing the
diff --git a/lisp/subr.el b/lisp/subr.el
index 43660d74377..81570d484b9 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -3760,9 +3760,9 @@ the match data are the result of matching REGEXP against a substring
3760of STRING, the same substring that is the actual text of the match which 3760of STRING, the same substring that is the actual text of the match which
3761is passed to REP as its argument. 3761is passed to REP as its argument.
3762 3762
3763To replace only the first match (if any), make REGEXP match up to \\' 3763To replace only the first match (if any), make REGEXP match up to \\\\='
3764and replace a sub-expression, e.g. 3764and replace a sub-expression, e.g.
3765 (replace-regexp-in-string \"\\\\(foo\\\\).*\\\\'\" \"bar\" \" foo foo\" nil nil 1) 3765 (replace-regexp-in-string \"\\\\(foo\\\\).*\\\\\\='\" \"bar\" \" foo foo\" nil nil 1)
3766 => \" bar foo\"" 3766 => \" bar foo\""
3767 3767
3768 ;; To avoid excessive consing from multiple matches in long strings, 3768 ;; To avoid excessive consing from multiple matches in long strings,
diff --git a/lisp/view.el b/lisp/view.el
index 830073a0639..ff7d2c9deb1 100644
--- a/lisp/view.el
+++ b/lisp/view.el
@@ -429,7 +429,7 @@ x exchanges point and mark.
429 Mark ring is pushed at start of every successful search and when 429 Mark ring is pushed at start of every successful search and when
430 jump to line occurs. The mark is set on jump to buffer start or end. 430 jump to line occurs. The mark is set on jump to buffer start or end.
431\\[point-to-register] save current position in character register. 431\\[point-to-register] save current position in character register.
432' go to position saved in character register. 432\\=' go to position saved in character register.
433s do forward incremental search. 433s do forward incremental search.
434r do reverse incremental search. 434r do reverse incremental search.
435\\[View-search-regexp-forward] searches forward for regular expression, starting after current page. 435\\[View-search-regexp-forward] searches forward for regular expression, starting after current page.
diff --git a/src/nsfns.m b/src/nsfns.m
index ea099081a7f..9bc6c1d3418 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -3125,7 +3125,7 @@ Example: Install an icon Gnus.tiff and execute the following code
3125 3125
3126 (setq ns-icon-type-alist 3126 (setq ns-icon-type-alist
3127 (append ns-icon-type-alist 3127 (append ns-icon-type-alist
3128 '((\"^\\\\*\\\\(Group\\\\*$\\\\|Summary \\\\|Article\\\\*$\\\\)\" 3128 \\='((\"^\\\\*\\\\(Group\\\\*$\\\\|Summary \\\\|Article\\\\*$\\\\)\"
3129 . \"Gnus\")))) 3129 . \"Gnus\"))))
3130 3130
3131When you miniaturize a Group, Summary or Article frame, Gnus.tiff will 3131When you miniaturize a Group, Summary or Article frame, Gnus.tiff will
diff --git a/src/syntax.c b/src/syntax.c
index 8e14bf3fb1d..16b7fabe938 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -3079,7 +3079,7 @@ but before count is used up, nil is returned. */)
3079DEFUN ("backward-prefix-chars", Fbackward_prefix_chars, Sbackward_prefix_chars, 3079DEFUN ("backward-prefix-chars", Fbackward_prefix_chars, Sbackward_prefix_chars,
3080 0, 0, 0, 3080 0, 0, 0,
3081 doc: /* Move point backward over any number of chars with prefix syntax. 3081 doc: /* Move point backward over any number of chars with prefix syntax.
3082This includes chars with expression prefix syntax class (') and those with 3082This includes chars with expression prefix syntax class (\\=') and those with
3083the prefix syntax flag (p). */) 3083the prefix syntax flag (p). */)
3084 (void) 3084 (void)
3085{ 3085{