aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorMichael Heerdegen2018-10-27 01:48:35 +0200
committerMichael Heerdegen2018-10-30 16:17:45 +0100
commit049bd5d267bc0d66cc0ba3b70c8773fed95694da (patch)
tree80978595066509f385dab41664e7eb319e2330b0 /admin
parent607cc2901bab0be64d08aff0394a4676a81da40b (diff)
downloademacs-049bd5d267bc0d66cc0ba3b70c8773fed95694da.tar.gz
emacs-049bd5d267bc0d66cc0ba3b70c8773fed95694da.zip
Don't quote self-quoting pcase patterns
* admin/bzrmerge.el: * lisp/char-fold.el: * lisp/dired.el: * lisp/emacs-lisp/derived.el: * lisp/emacs-lisp/easy-mmode.el: * lisp/emacs-lisp/easymenu.el: * lisp/emacs-lisp/eieio-core.el: * lisp/emacs-lisp/package.el: * lisp/emacs-lisp/smie.el: * lisp/faces.el: * lisp/filesets.el: * lisp/progmodes/modula2.el: * lisp/progmodes/octave.el: * lisp/progmodes/opascal.el: * lisp/progmodes/perl-mode.el: * lisp/progmodes/prolog.el: * lisp/progmodes/ruby-mode.el: * lisp/progmodes/sh-script.el: * lisp/server.el: * lisp/subr.el: * lisp/textmodes/css-mode.el: * test/lisp/emacs-lisp/pcase-tests.el: Don't quote self-quoting 'pcase' patterns.
Diffstat (limited to 'admin')
-rw-r--r--admin/bzrmerge.el6
1 files changed, 3 insertions, 3 deletions
diff --git a/admin/bzrmerge.el b/admin/bzrmerge.el
index cedb625fb0d..d54ba330f96 100644
--- a/admin/bzrmerge.el
+++ b/admin/bzrmerge.el
@@ -150,12 +150,12 @@ Type `y' to skip this revision,
150 (format "%s: Skip (y/n/N/q/%s)? " str 150 (format "%s: Skip (y/n/N/q/%s)? " str
151 (key-description (vector help-char))) 151 (key-description (vector help-char)))
152 '(?y ?n ?N ?q))) 152 '(?y ?n ?N ?q)))
153 (`?y (setq skip t)) 153 (?y (setq skip t))
154 (`?q (keyboard-quit)) 154 (?q (keyboard-quit))
155 ;; A single log entry can match skip-regexp multiple 155 ;; A single log entry can match skip-regexp multiple
156 ;; times. If you are sure you don't want to skip it, 156 ;; times. If you are sure you don't want to skip it,
157 ;; you don't want to be asked multiple times. 157 ;; you don't want to be asked multiple times.
158 (`?N (setq skip 'no)))))) 158 (?N (setq skip 'no))))))
159 (if (eq skip t) 159 (if (eq skip t)
160 (push revno skipped) 160 (push revno skipped)
161 (push revno revnos))))) 161 (push revno revnos)))))