Fix some ineffective backslashes in string literals

Deal with lone backslashes that have no effect in string literals,
but indicate that something is amiss.

* lisp/auth-source-pass.el (auth-source-pass-entries):
* lisp/textmodes/artist.el (artist-figlet-get-font-list-windows):
* lisp/org/ob-abc.el (org-babel-expand-body:abc, org-babel-execute:abc):
* lisp/org/ob-forth.el (org-babel-forth-session-execute):
* lisp/vc/vc-git.el (vc-git--program-version):
Add backslash in regexp for correctness.

* lisp/gnus/nnmail.el (nnmail-split-abbrev-alist):
Replace `\||' with `\\|' to follow the obvious regexp intent.

* lisp/org/org-list.el (org-plain-list-ordered-item-terminator):
Add backslash in doc comment so that it appears as intended.

* lisp/progmodes/cc-engine.el (c-forward-decl-or-cast-1, c-end-of-decl-1):
* lisp/progmodes/f90.el (f90-font-lock-keywords-2):
* lisp/progmodes/etags.el (etags-tags-completion-table):
* lisp/progmodes/ruby-mode.el (ruby-syntax-propertize):
* test/lisp/emacs-lisp/cl-print-tests.el (cl-print-tests-1):
Remove superfluous backslashes from regexp.

* test/lisp/emacs-lisp/rx-tests.el (rx-char-any):
Remove superfluous backslash from doc comment.

diff --git a/lisp/auth-source-pass.el b/lisp/auth-source-pass.el
index e37cadb07c16cb49f7c64ff8394728a5c8c5051c..deb805a6e1a073cde1516f100991e0f2e9560da4 100644 (file)
--- a/lisp/auth-source-pass.el
+++ b/lisp/auth-source-pass.el
@@ -189,7 +189,7 @@ often."
   (let ((store-dir (expand-file-name "~/.password-store/")))
     (mapcar
      (lambda (file) (file-name-sans-extension (file-relative-name file store-dir)))
-     (directory-files-recursively store-dir "\.gpg$"))))
+     (directory-files-recursively store-dir "\\.gpg$"))))
 
 (defun auth-source-pass--find-all-by-entry-name (entryname user)
   "Search the store for all entries either matching ENTRYNAME/USER or ENTRYNAME.

diff --git a/lisp/gnus/nnmail.el b/lisp/gnus/nnmail.el
index f6d752529301861d652705bbd94f3e71f00f9973..a95cdb4a4f8c6550247084a22b2c5c4d722da186 100644 (file)
--- a/lisp/gnus/nnmail.el
+++ b/lisp/gnus/nnmail.el
@@ -489,7 +489,7 @@ Example:
     (from . "from\\|sender\\|resent-from")
     (nato . "to\\|cc\\|resent-to\\|resent-cc")
     (naany . "from\\|to\\|cc\\|sender\\|resent-from\\|resent-to\\|resent-cc")
-    (list . "list-id\\|list-post\\|x-mailing-list\||x-beenthere\\|x-loop"))
+    (list . "list-id\\|list-post\\|x-mailing-list\\|x-beenthere\\|x-loop"))
   "Alist of abbreviations allowed in `nnmail-split-fancy'."
   :group 'nnmail-split
   :type '(repeat (cons :format "%v" symbol regexp)))

diff --git a/lisp/org/ob-abc.el b/lisp/org/ob-abc.el
index cefbe716e151ea7c7a1343c87bcece0af3dfa758..43ee1d9921bd487f02be6e9b2a0c18c458f25d8e 100644 (file)
--- a/lisp/org/ob-abc.el
+++ b/lisp/org/ob-abc.el
@@ -47,7 +47,7 @@
             (value (cdr pair)))
         (setq body
               (replace-regexp-in-string
-               (concat "\$" (regexp-quote name))
+               (concat "\\$" (regexp-quote name))
                (if (stringp value) value (format "%S" value))
                body))))
      vars)
@@ -59,7 +59,7 @@
   (message "executing Abc source code block")
   (let* ((cmdline (cdr (assq :cmdline params)))
         (out-file (let ((file (cdr (assq :file params))))
-                    (if file (replace-regexp-in-string "\.pdf$" ".ps" file)
+                    (if file (replace-regexp-in-string "\\.pdf$" ".ps" file)
                       (error "abc code block requires :file header argument"))))
         (in-file (org-babel-temp-file "abc-"))
         (render (concat "abcm2ps" " " cmdline

diff --git a/lisp/org/ob-forth.el b/lisp/org/ob-forth.el
index 8ca292656a2dc71840901f27ef1fa12225fab17f..88ed964fd77d7cecdd601d5a8eb3c73e34dfc2ca 100644 (file)
--- a/lisp/org/ob-forth.el
+++ b/lisp/org/ob-forth.el
@@ -53,7 +53,7 @@ This function is called by `org-babel-execute-src-block'"
 (defun org-babel-forth-session-execute (body params)
   (require 'forth-mode)
   (let ((proc (forth-proc))
-       (rx " \\(\n:\\|compiled\n\\\|ok\n\\)")
+       (rx " \\(\n:\\|compiled\n\\|ok\n\\)")
        (result-start))
     (with-current-buffer (process-buffer (forth-proc))
       (mapcar (lambda (line)

diff --git a/lisp/org/org-list.el b/lisp/org/org-list.el
index ef85b402f083c4edc22a660e0a064f4cf5f3dce5..22692d224a8bd72a7f2362237c06364477a3739c 100644 (file)
--- a/lisp/org/org-list.el
+++ b/lisp/org/org-list.el
@@ -236,7 +236,7 @@ into
 
 (defcustom org-plain-list-ordered-item-terminator t
   "The character that makes a line with leading number an ordered list item.
-Valid values are ?. and ?\).  To get both terminators, use t.
+Valid values are ?. and ?\\).  To get both terminators, use t.
 
 This variable needs to be set before org.el is loaded.  If you
 need to make a change while Emacs is running, use the customize

diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index fd669280994bc5d566843bd64b1174490a9a3543..cc3753a7ebda8d6522faa0310d69c99519f33aeb 100644 (file)
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -8968,7 +8968,7 @@ This function might do hidden buffer changes."
 
         (setq at-decl-end
               (looking-at (cond ((eq context '<>) "[,>]")
-                                ((not (memq context '(nil top))) "[,\)]")
+                                ((not (memq context '(nil top))) "[,)]")
                                 (t "[,;]"))))
 
         ;; Now we've collected info about various characteristics of
@@ -10321,7 +10321,7 @@ comment at the start of cc-engine.el for more info."
                          ;; Check for `c-opt-block-decls-with-vars-key'
                          ;; before the first paren.
                          (c-syntactic-re-search-forward
-                          (concat "[;=\(\[{]\\|\\("
+                          (concat "[;=([{]\\|\\("
                                   c-opt-block-decls-with-vars-key
                                   "\\)")
                           lim t t t)
@@ -10329,7 +10329,7 @@ comment at the start of cc-engine.el for more info."
                          (not (eq (char-before) ?_))
                          ;; Check that the first following paren is
                          ;; the block.
-                         (c-syntactic-re-search-forward "[;=\(\[{]"
+                         (c-syntactic-re-search-forward "[;=([{]"
                                                         lim t t t)
                          (eq (char-before) ?{))))))
            ;; The declaration doesn't have any of the

diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el
index c2715be53702dfa11cf1ea92f514921c49ae23ef..910c320ab8fe3ae7502cd16cfe12761f8adc4d59 100644 (file)
--- a/lisp/progmodes/etags.el
+++ b/lisp/progmodes/etags.el
@@ -1281,7 +1281,7 @@ buffer-local values of tags table format variables."
       ;; This regexp matches an explicit tag name or the place where
       ;; it would start.
       (while (re-search-forward
-              "[\f\t\n\r()=,; ]?\177\\\(?:\\([^\n\001]+\\)\001\\)?"
+              "[\f\t\n\r()=,; ]?\177\\(?:\\([^\n\001]+\\)\001\\)?"
              nil t)
        (push   (prog1 (if (match-beginning 1)
                           ;; There is an explicit tag name.

diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el
index 3ec145b547ecd04c7af09c87704618bacc275fc3..9de80635e9f85c6c25664da66aab4b07af99cde3 100644 (file)
--- a/lisp/progmodes/f90.el
+++ b/lisp/progmodes/f90.el
@@ -648,7 +648,7 @@ forall\\|block\\|critical\\)\\)\\_>"
 \\|enumerator\\|procedure\\|\
 logical\\|double[ \t]*precision\\|type[ \t]*(\\(?:\\sw\\|\\s_\\)+)\\|none\\)[ \t]*"
       (1 font-lock-keyword-face) (2 font-lock-type-face))
-    '("\\_<\\(namelist\\|common\\)[ \t]*/\\(\\(?:\\sw\\|\\s_\\)+\\)?\/"
+    '("\\_<\\(namelist\\|common\\)[ \t]*/\\(\\(?:\\sw\\|\\s_\\)+\\)?/"
       (1 font-lock-keyword-face) (2 font-lock-constant-face nil t))
     "\\_<else\\([ \t]*if\\|where\\)?\\_>"
     '("\\(&\\)[ \t]*\\(!\\|$\\)"  (1 font-lock-keyword-face))

diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index 707875d130d26485493af999d71c927401e92593..5998ac8e39555527f86203187cc4f70a74b520d9 100644 (file)
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -1867,7 +1867,7 @@ It will be properly highlighted even when the call omits parens.")
       ("^[ \t]*def +\\(`\\)" (1 "_"))
       ;; Ternary operator colon followed by opening paren or bracket
       ;; (semi-important for indentation).
-      ("\\(:\\)\\(?:[\({]\\|\\[[^]]\\)"
+      ("\\(:\\)\\(?:[({]\\|\\[[^]]\\)"
        (1 (string-to-syntax ".")))
       ;; Regular expressions.  Start with matching unescaped slash.
       ("\\(?:\\=\\|[^\\]\\)\\(?:\\\\\\\\\\)*\\(/\\)"

diff --git a/lisp/textmodes/artist.el b/lisp/textmodes/artist.el
index d75a1ca2f9247d3c3b2324dc7b42de39a67a434e..e9b17795a920926948822e9e5ea21ccef7c4f6a9 100644 (file)
--- a/lisp/textmodes/artist.el
+++ b/lisp/textmodes/artist.el
@@ -2895,7 +2895,7 @@ Returns a list of strings."
        dir-list)
       (mapcar
        (lambda (file)
-         (replace-regexp-in-string "\.flf\\'" "" file))
+         (replace-regexp-in-string "\\.flf\\'" "" file))
        result))))
 
 (defun artist-figlet-choose-font ()

diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index c6806ba5cd48165e224182207f59ef339c82a134..c990b0659d2ed6d5eef7a15575d991d827861467 100644 (file)
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -253,7 +253,7 @@ The following place holders should be present in the string:
                        ;; Git for Windows appends ".windows.N" to the
                        ;; numerical version reported by Git.
                        (string-match
-                        "git version \\([0-9.]+\\)\\(\.windows.[0-9]+\\)?$"
+                        "git version \\([0-9.]+\\)\\(\\.windows.[0-9]+\\)?$"
                         version-string))
                   (match-string 1 version-string)
                 "0")))))

diff --git a/test/lisp/emacs-lisp/cl-print-tests.el b/test/lisp/emacs-lisp/cl-print-tests.el
index e163fb8a8dd2786a91aca0ca7232d20f50b1613e..406c528dce555b95a803f634f1f2462d592fbf85 100644 (file)
--- a/test/lisp/emacs-lisp/cl-print-tests.el
+++ b/test/lisp/emacs-lisp/cl-print-tests.el
@@ -34,7 +34,7 @@
     (let ((print-circle t))
       (should (equal (cl-prin1-to-string `((x . ,x) (y . ,x)))
                      "((x . #1=#s(cl-print--test :a 1 :b 2)) (y . #1#))")))
-    (should (string-match "\\`#f(compiled-function (x) \"[^\"]+\" [^\)]*)\\'"
+    (should (string-match "\\`#f(compiled-function (x) \"[^\"]+\" [^)]*)\\'"
                           (cl-prin1-to-string (symbol-function #'caar))))))
 
 (ert-deftest cl-print-tests-2 ()

diff --git a/test/lisp/emacs-lisp/rx-tests.el b/test/lisp/emacs-lisp/rx-tests.el
index fa3d9b0d5ea62b667f44dbb4db19f15c58743e19..7dd5e3b8de9fab407ff6f2ed602b1f94e6635dcb 100644 (file)
--- a/test/lisp/emacs-lisp/rx-tests.el
+++ b/test/lisp/emacs-lisp/rx-tests.el
@@ -25,7 +25,7 @@
 ;;; Code:
 
 (ert-deftest rx-char-any ()
-  "Test character alternatives with `\]' and `-' (Bug#25123)."
+  "Test character alternatives with `]' and `-' (Bug#25123)."
   (should (string-match
            (rx string-start (1+ (char (?\] . ?\{) (?< . ?\]) (?- . ?:)))
                string-end)