emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] emacs-25 9d5cceb: Fix doc string quoting


From: Paul Eggert
Subject: [Emacs-diffs] emacs-25 9d5cceb: Fix doc string quoting
Date: Mon, 6 Jun 2016 16:30:25 +0000 (UTC)

branch: emacs-25
commit 9d5ccebeba0506f7280662630f0ee85a52c8a327
Author: Stephen Berman <address@hidden>
Commit: Paul Eggert <address@hidden>

    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).
---
 lisp/files.el               |    2 +-
 lisp/progmodes/vhdl-mode.el |    2 +-
 lisp/subr.el                |    4 ++--
 lisp/view.el                |    2 +-
 src/nsfns.m                 |    2 +-
 src/syntax.c                |    2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lisp/files.el b/lisp/files.el
index c5cfa8e..1f97fa5 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -6147,7 +6147,7 @@ and `list-directory-verbose-switches'."
 
 PATTERN is assumed to represent a file-name wildcard suitable for the
 underlying filesystem.  For Unix and GNU/Linux, each character from the
-set [ \\t\\n;<>&|()`'\"#$] is quoted with a backslash; for DOS/Windows, all
+set [ \\t\\n;<>&|()\\=`\\='\"#$] is quoted with a backslash; for DOS/Windows, 
all
 the parts of the pattern which don't include wildcard characters are
 quoted with double quotes.
 
diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el
index a390494..0756c79 100644
--- a/lisp/progmodes/vhdl-mode.el
+++ b/lisp/progmodes/vhdl-mode.el
@@ -4684,7 +4684,7 @@ Usage:
   SPECIAL MENUES:
     As an alternative to the speedbar, an index menu can be added (set
     option `vhdl-index-menu' to non-nil) or made accessible as a mouse menu
-    (e.g. add \"(global-set-key '[S-down-mouse-3] 'imenu)\" to your start-up
+    (e.g. add \"(global-set-key [S-down-mouse-3] \\='imenu)\" to your start-up
     file) for browsing the file contents (is not populated if buffer is
     larger than 256000).  Also, a source file menu can be
     added (set option `vhdl-source-file-menu' to non-nil) for browsing the
diff --git a/lisp/subr.el b/lisp/subr.el
index 43660d7..81570d4 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
 of STRING, the same substring that is the actual text of the match which
 is passed to REP as its argument.
 
-To replace only the first match (if any), make REGEXP match up to \\'
+To replace only the first match (if any), make REGEXP match up to \\\\='
 and replace a sub-expression, e.g.
-  (replace-regexp-in-string \"\\\\(foo\\\\).*\\\\'\" \"bar\" \" foo foo\" nil 
nil 1)
+  (replace-regexp-in-string \"\\\\(foo\\\\).*\\\\\\='\" \"bar\" \" foo foo\" 
nil nil 1)
     => \" bar foo\""
 
   ;; To avoid excessive consing from multiple matches in long strings,
diff --git a/lisp/view.el b/lisp/view.el
index 830073a..ff7d2c9 100644
--- a/lisp/view.el
+++ b/lisp/view.el
@@ -429,7 +429,7 @@ x   exchanges point and mark.
          Mark ring is pushed at start of every successful search and when
          jump to line occurs.  The mark is set on jump to buffer start or end.
 \\[point-to-register]  save current position in character register.
-'      go to position saved in character register.
+\\='   go to position saved in character register.
 s      do forward incremental search.
 r      do reverse incremental search.
 \\[View-search-regexp-forward] searches forward for regular expression, 
starting after current page.
diff --git a/src/nsfns.m b/src/nsfns.m
index ea09908..9bc6c1d 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -3125,7 +3125,7 @@ Example: Install an icon Gnus.tiff and execute the 
following code
 
   (setq ns-icon-type-alist
         (append ns-icon-type-alist
-                '((\"^\\\\*\\\\(Group\\\\*$\\\\|Summary 
\\\\|Article\\\\*$\\\\)\"
+                \\='((\"^\\\\*\\\\(Group\\\\*$\\\\|Summary 
\\\\|Article\\\\*$\\\\)\"
                    . \"Gnus\"))))
 
 When you miniaturize a Group, Summary or Article frame, Gnus.tiff will
diff --git a/src/syntax.c b/src/syntax.c
index 8e14bf3..16b7fab 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -3079,7 +3079,7 @@ but before count is used up, nil is returned.  */)
 DEFUN ("backward-prefix-chars", Fbackward_prefix_chars, Sbackward_prefix_chars,
        0, 0, 0,
        doc: /* Move point backward over any number of chars with prefix syntax.
-This includes chars with expression prefix syntax class (') and those with
+This includes chars with expression prefix syntax class (\\=') and those with
 the prefix syntax flag (p).  */)
   (void)
 {



reply via email to

[Prev in Thread] Current Thread [Next in Thread]