procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace insignificant backquotes

Browse source 
Replace most insignificant occurrences of '`' with a straight quote,
sharp quote or nothing.  This includes backquotes in 'pcase' patterns.

* admin/admin.el:
* lisp/apropos.el:
* lisp/arc-mode.el:
* lisp/auth-source.el:
* lisp/avoid.el:
* lisp/bindings.el:
* lisp/bs.el:
* lisp/calculator.el:
* lisp/calendar/todo-mode.el:
* lisp/cedet/semantic.el:
* lisp/cedet/semantic/analyze/debug.el:
* lisp/cedet/semantic/bovine.el:
* lisp/cedet/semantic/dep.el:
* lisp/cedet/semantic/grammar.el:
* lisp/cedet/semantic/wisent/comp.el:
* lisp/cedet/semantic/wisent/grammar.el:
* lisp/cedet/srecode/mode.el:
* lisp/cus-edit.el:
* lisp/doc-view.el:
* lisp/elec-pair.el:
* lisp/electric.el:
* lisp/emacs-lisp/autoload.el:
* lisp/emacs-lisp/benchmark.el:
* lisp/emacs-lisp/byte-opt.el:
* lisp/emacs-lisp/bytecomp.el:
* lisp/emacs-lisp/cconv.el:
* lisp/emacs-lisp/cl-extra.el:
* lisp/emacs-lisp/cl-generic.el:
* lisp/emacs-lisp/cl-macs.el:
* lisp/emacs-lisp/copyright.el:
* lisp/emacs-lisp/debug.el:
* lisp/emacs-lisp/eieio-compat.el:
* lisp/emacs-lisp/ert.el:
* lisp/emacs-lisp/generator.el:
* lisp/emacs-lisp/inline.el:
* lisp/emacs-lisp/macroexp.el:
* lisp/emacs-lisp/map.el:
* lisp/emacs-lisp/package-x.el:
* lisp/emacs-lisp/package.el:
* lisp/emacs-lisp/radix-tree.el:
* lisp/emacs-lisp/smie.el:
* lisp/epa.el:
* lisp/erc/erc-dcc.el:
* lisp/erc/erc-track.el:
* lisp/erc/erc.el:
* lisp/eshell/em-ls.el:
* lisp/eshell/esh-cmd.el:
* lisp/files.el:
* lisp/filesets.el:
* lisp/font-lock.el:
* lisp/frameset.el:
* lisp/gnus/gnus-agent.el:
* lisp/gnus/gnus-art.el:
* lisp/gnus/gnus-cite.el:
* lisp/gnus/gnus-group.el:
* lisp/gnus/gnus-msg.el:
* lisp/gnus/gnus-salt.el:
* lisp/gnus/gnus-srvr.el:
* lisp/gnus/gnus-sum.el:
* lisp/gnus/gnus-topic.el:
* lisp/gnus/gnus-util.el:
* lisp/gnus/gnus.el:
* lisp/gnus/message.el:
* lisp/gnus/mm-util.el:
* lisp/gnus/mml.el:
* lisp/gnus/nnheader.el:
* lisp/gnus/nnimap.el:
* lisp/gnus/nnmairix.el:
* lisp/gnus/spam.el:
* lisp/hexl.el:
* lisp/hi-lock.el:
* lisp/ibuf-ext.el:
* lisp/ibuffer.el:
* lisp/ido.el:
* lisp/info.el:
* lisp/international/mule-cmds.el:
* lisp/international/mule-util.el:
* lisp/json.el:
* lisp/jsonrpc.el:
* lisp/language/cyrillic.el:
* lisp/language/european.el:
* lisp/language/georgian.el:
* lisp/language/tibetan.el:
* lisp/language/utf-8-lang.el:
* lisp/language/vietnamese.el:
* lisp/ldefs-boot.el:
* lisp/mail/mail-extr.el:
* lisp/man.el:
* lisp/menu-bar.el:
* lisp/mh-e/mh-acros.el:
* lisp/mh-e/mh-folder.el:
* lisp/mh-e/mh-mime.el:
* lisp/mh-e/mh-show.el:
* lisp/mh-e/mh-speed.el:
* lisp/minibuffer.el:
* lisp/mpc.el:
* lisp/net/ange-ftp.el:
* lisp/net/hmac-def.el:
* lisp/net/newst-backend.el:
* lisp/net/quickurl.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-compat.el:
* lisp/notifications.el:
* lisp/obsolete/pgg-parse.el:
* lisp/obsolete/vc-arch.el:
* lisp/obsolete/xesam.el:
* lisp/org/ob-C.el:
* lisp/org/ob-core.el:
* lisp/org/ob-exp.el:
* lisp/org/ob-groovy.el:
* lisp/org/ob-haskell.el:
* lisp/org/ob-io.el:
* lisp/org/ob-lisp.el:
* lisp/org/ob-lob.el:
* lisp/org/ob-lua.el:
* lisp/org/ob-octave.el:
* lisp/org/ob-perl.el:
* lisp/org/ob-python.el:
* lisp/org/ob-ref.el:
* lisp/org/ob-ruby.el:
* lisp/org/ob-sql.el:
* lisp/org/org-agenda.el:
* lisp/org/org-capture.el:
* lisp/org/org-clock.el:
* lisp/org/org-colview.el:
* lisp/org/org-duration.el:
* lisp/org/org-element.el:
* lisp/org/org-entities.el:
* lisp/org/org-gnus.el:
* lisp/org/org-indent.el:
* lisp/org/org-info.el:
* lisp/org/org-inlinetask.el:
* lisp/org/org-lint.el:
* lisp/org/org-list.el:
* lisp/org/org-mouse.el:
* lisp/org/org-plot.el:
* lisp/org/org-src.el:
* lisp/org/org-table.el:
* lisp/org/org.el:
* lisp/org/ox-ascii.el:
* lisp/org/ox-html.el:
* lisp/org/ox-latex.el:
* lisp/org/ox-man.el:
* lisp/org/ox-md.el:
* lisp/org/ox-org.el:
* lisp/org/ox-publish.el:
* lisp/org/ox-texinfo.el:
* lisp/org/ox.el:
* lisp/play/bubbles.el:
* lisp/play/gamegrid.el:
* lisp/progmodes/autoconf.el:
* lisp/progmodes/cc-defs.el:
* lisp/progmodes/cc-engine.el:
* lisp/progmodes/cc-fonts.el:
* lisp/progmodes/cc-langs.el:
* lisp/progmodes/cperl-mode.el:
* lisp/progmodes/ebrowse.el:
* lisp/progmodes/elisp-mode.el:
* lisp/progmodes/flymake-cc.el:
* lisp/progmodes/flymake.el:
* lisp/progmodes/fortran.el:
* lisp/progmodes/grep.el:
* lisp/progmodes/gud.el:
* lisp/progmodes/idlwave.el:
* lisp/progmodes/js.el:
* lisp/progmodes/m4-mode.el:
* lisp/progmodes/make-mode.el:
* lisp/progmodes/mixal-mode.el:
* lisp/progmodes/modula2.el:
* lisp/progmodes/octave.el:
* lisp/progmodes/opascal.el:
* lisp/progmodes/prolog.el:
* lisp/progmodes/ps-mode.el:
* lisp/progmodes/python.el:
* lisp/progmodes/ruby-mode.el:
* lisp/progmodes/sh-script.el:
* lisp/progmodes/sql.el:
* lisp/progmodes/verilog-mode.el:
* lisp/ps-mule.el:
* lisp/rtree.el:
* lisp/ruler-mode.el:
* lisp/ses.el:
* lisp/simple.el:
* lisp/startup.el:
* lisp/subr.el:
* lisp/term/ns-win.el:
* lisp/textmodes/bibtex.el:
* lisp/textmodes/conf-mode.el:
* lisp/textmodes/css-mode.el:
* lisp/textmodes/refill.el:
* lisp/textmodes/sgml-mode.el:
* lisp/textmodes/tex-mode.el:
* lisp/tutorial.el:
* lisp/url/url-dav.el:
* lisp/url/url-gw.el:
* lisp/url/url-http.el:
* lisp/url/url-methods.el:
* lisp/url/url-privacy.el:
* lisp/vc/cvs-status.el:
* lisp/vc/diff-mode.el:
* lisp/vc/ediff-init.el:
* lisp/vc/ediff-ptch.el:
* lisp/vc/log-edit.el:
* lisp/vc/log-view.el:
* lisp/vc/pcvs-info.el:
* lisp/vc/pcvs.el:
* lisp/vc/smerge-mode.el:
* lisp/vc/vc-git.el:
* lisp/vc/vc-hg.el:
* lisp/vc/vc-mtn.el:
* lisp/vc/vc-rcs.el:
* lisp/whitespace.el:
* lisp/window.el:
* test/lisp/electric-tests.el:
* test/lisp/emacs-lisp/cl-lib-tests.el:
* test/lisp/emacs-lisp/ert-tests.el:
* test/lisp/epg-tests.el:
* test/lisp/jsonrpc-tests.el:
* test/src/data-tests.el:
* test/src/json-tests.el: Replace most insignificant backquotes.
This commit is contained in:
Michael Heerdegen 2018-11-05 01:22:15 +01:00
parent 3826ecc795
commit 1808d254a5
220 changed files with 1340 additions and 1349 deletions
Download patch file Download diff file Expand all files Collapse all files

2
admin/admin.el
View file

@ -657,7 +657,7 @@ style=\"text-align:left\">")
(defconst make-manuals-dist-output-variables (defconst make-manuals-dist-output-variables
`(("@\\(top_\\)?srcdir@" . ".") ; top_srcdir is wrong, but not used '(("@\\(top_\\)?srcdir@" . ".") ; top_srcdir is wrong, but not used
("^\\(\\(?:texinfo\\|buildinfo\\|emacs\\)dir *=\\).*" . "\\1 .") ("^\\(\\(?:texinfo\\|buildinfo\\|emacs\\)dir *=\\).*" . "\\1 .")
("^\\(clean:.*\\)" . "\\1 infoclean") ("^\\(clean:.*\\)" . "\\1 infoclean")
("@MAKEINFO@" . "makeinfo") ("@MAKEINFO@" . "makeinfo")

8
lisp/apropos.el
View file

@ -688,12 +688,12 @@ the output includes key-bindings of commands."
(dolist (x (cdr lh-entry)) (dolist (x (cdr lh-entry))
(pcase (car-safe x) (pcase (car-safe x)
;; (autoload (push (cdr x) autoloads)) ;; (autoload (push (cdr x) autoloads))
(`require (push (cdr x) requires)) ('require (push (cdr x) requires))
(`provide (push (cdr x) provides)) ('provide (push (cdr x) provides))
(`t nil) ; Skip "was an autoload" entries. ('t nil) ; Skip "was an autoload" entries.
;; FIXME: Print information about each individual method: both ;; FIXME: Print information about each individual method: both
;; its docstring and specializers (bug#21422). ;; its docstring and specializers (bug#21422).
(`cl-defmethod (push (cadr x) provides)) ('cl-defmethod (push (cadr x) provides))
(_ (push (or (cdr-safe x) x) symbols)))) (_ (push (or (cdr-safe x) x) symbols))))
(let ((apropos-pattern "")) ;Dummy binding for apropos-symbols-internal. (let ((apropos-pattern "")) ;Dummy binding for apropos-symbols-internal.
(apropos-symbols-internal (apropos-symbols-internal

2
lisp/arc-mode.el
View file

@ -2066,7 +2066,7 @@ This doesn't recover lost files, it just undoes changes in the buffer itself."
;; The code below assumes the name is relative and may do undesirable ;; The code below assumes the name is relative and may do undesirable
;; things otherwise. ;; things otherwise.
(error "Can't extract files with non-relative names") (error "Can't extract files with non-relative names")
(archive-extract-by-file archive name `("unar" "-no-directory" "-o") "Successfully extracted"))) (archive-extract-by-file archive name '("unar" "-no-directory" "-o") "Successfully extracted")))
;;; Section: Rar self-extracting .exe archives. ;;; Section: Rar self-extracting .exe archives.

6
lisp/auth-source.el
View file

@ -167,7 +167,7 @@ let-binding."
(defcustom auth-source-save-behavior 'ask (defcustom auth-source-save-behavior 'ask
"If set, auth-source will respect it for save behavior." "If set, auth-source will respect it for save behavior."
:version "23.2" ;; No Gnus :version "23.2" ;; No Gnus
:type `(choice :type '(choice
:tag "auth-source new token save behavior" :tag "auth-source new token save behavior"
(const :tag "Always save" t) (const :tag "Always save" t)
(const :tag "Never save" nil) (const :tag "Never save" nil)
@ -200,7 +200,7 @@ Note that if EPA/EPG is not available, this should NOT be used."
(defcustom auth-source-do-cache t (defcustom auth-source-do-cache t
"Whether auth-source should cache information with `password-cache'." "Whether auth-source should cache information with `password-cache'."
:version "23.2" ;; No Gnus :version "23.2" ;; No Gnus
:type `boolean) :type 'boolean)
(defcustom auth-source-debug nil (defcustom auth-source-debug nil
"Whether auth-source should log debug messages. "Whether auth-source should log debug messages.
@ -214,7 +214,7 @@ for passwords).
If the value is a function, debug messages are logged by calling If the value is a function, debug messages are logged by calling
that function using the same arguments as `message'." that function using the same arguments as `message'."
:version "23.2" ;; No Gnus :version "23.2" ;; No Gnus
:type `(choice :type '(choice
:tag "auth-source debugging mode" :tag "auth-source debugging mode"
(const :tag "Log using `message' to the *Messages* buffer" t) (const :tag "Log using `message' to the *Messages* buffer" t)
(const :tag "Log all trivia with `message' to the *Messages* buffer" (const :tag "Log all trivia with `message' to the *Messages* buffer"

12
lisp/avoid.el
View file

@ -205,8 +205,8 @@ If you want the mouse banished to a different corner set
'frame-or-window 'frame-or-window
mouse-avoidance-banish-position 'eq)) mouse-avoidance-banish-position 'eq))
(list-values (pcase fra-or-win (list-values (pcase fra-or-win
(`frame (list 0 0 (frame-width) (frame-height))) ('frame (list 0 0 (frame-width) (frame-height)))
(`window (window-edges)))) ('window (window-edges))))
(alist (cl-loop for v in list-values (alist (cl-loop for v in list-values
for k in '(left top right bottom) for k in '(left top right bottom)
collect (cons k v))) collect (cons k v)))
@ -223,11 +223,11 @@ If you want the mouse banished to a different corner set
'top-or-bottom-pos 'top-or-bottom-pos
mouse-avoidance-banish-position #'eq)) mouse-avoidance-banish-position #'eq))
(side-fn (pcase side (side-fn (pcase side
(`left '+) ('left '+)
(`right '-))) ('right '-)))
(top-or-bottom-fn (pcase top-or-bottom (top-or-bottom-fn (pcase top-or-bottom
(`top '+) ('top '+)
(`bottom '-)))) ('bottom '-))))
(cons (funcall side-fn ; -/+ (cons (funcall side-fn ; -/+
(assoc-default side alist 'eq) ; right or left (assoc-default side alist 'eq) ; right or left
side-dist) ; distance from side side-dist) ; distance from side

12
lisp/bindings.el
View file

@ -417,7 +417,7 @@ zero, otherwise they start from one."
This option specifies both the field width and the type of offset This option specifies both the field width and the type of offset
displayed in `mode-line-position', a component of the default displayed in `mode-line-position', a component of the default
`mode-line-format'." `mode-line-format'."
:type `(radio :type '(radio
(const :tag "nil: No offset is displayed" nil) (const :tag "nil: No offset is displayed" nil)
(const :tag "\"%o\": Proportion of \"travel\" of the window through the buffer" (const :tag "\"%o\": Proportion of \"travel\" of the window through the buffer"
(-3 "%o")) (-3 "%o"))
@ -724,11 +724,11 @@ okay. See `mode-line-format'.")
;; FIXME: Maybe beginning-of-line, beginning-of-buffer, end-of-line, ;; FIXME: Maybe beginning-of-line, beginning-of-buffer, end-of-line,
;; end-of-buffer, end-of-file, buffer-read-only, and ;; end-of-buffer, end-of-file, buffer-read-only, and
;; file-supersession should all be user-errors! ;; file-supersession should all be user-errors!
`(beginning-of-line beginning-of-buffer end-of-line '(beginning-of-line beginning-of-buffer end-of-line
end-of-buffer end-of-file buffer-read-only end-of-buffer end-of-file buffer-read-only
file-supersession mark-inactive file-supersession mark-inactive
user-error ;; That's the main one! user-error ;; That's the main one!
)) ))
(make-variable-buffer-local 'indent-tabs-mode) (make-variable-buffer-local 'indent-tabs-mode)

4
lisp/bs.el
View file

@ -828,8 +828,8 @@ See `visit-tags-table'."
(let ((res (let ((res
(with-current-buffer (bs--current-buffer) (with-current-buffer (bs--current-buffer)
(setq bs-buffer-show-mark (pcase bs-buffer-show-mark (setq bs-buffer-show-mark (pcase bs-buffer-show-mark
(`nil 'never) ('nil 'never)
(`never 'always) ('never 'always)
(_ nil)))))) (_ nil))))))
(bs--update-current-line) (bs--update-current-line)
(bs--set-window-height) (bs--set-window-height)

4
lisp/calculator.el
View file

@ -1184,7 +1184,7 @@ arguments."
(DX (if (and X calculator-deg) (degrees-to-radians X) X)) (DX (if (and X calculator-deg) (degrees-to-radians X) X))
(L calculator-saved-list) (L calculator-saved-list)
(fF `(calculator-funcall ',f x y)) (fF `(calculator-funcall ',f x y))
(fD `(if calculator-deg (radians-to-degrees x) x))) (fD '(if calculator-deg (radians-to-degrees x) x)))
(eval `(cl-flet ((F (&optional x y) ,fF) (D (x) ,fD)) (eval `(cl-flet ((F (&optional x y) ,fF) (D (x) ,fD))
(let ((X ,X) (Y ,Y) (DX ,DX) (TX ,TX) (TY ,TY) (L ',L)) (let ((X ,X) (Y ,Y) (DX ,DX) (TX ,TX) (TY ,TY) (L ',L))
,f)) ,f))
@ -1226,7 +1226,7 @@ OP is the operator (if any) that caused this call."
(when (and (or calculator-display-fragile (when (and (or calculator-display-fragile
(not (numberp (car calculator-stack)))) (not (numberp (car calculator-stack))))
(<= inp (pcase calculator-input-radix (<= inp (pcase calculator-input-radix
(`nil ?9) (`bin ?1) (`oct ?7) (_ 999)))) ('nil ?9) ('bin ?1) ('oct ?7) (_ 999))))
(calculator-clear-fragile) (calculator-clear-fragile)
(setq calculator-curnum (setq calculator-curnum
(concat (if (equal calculator-curnum "0") "" (concat (if (equal calculator-curnum "0") ""

24
lisp/calendar/todo-mode.el
View file

@ -6389,8 +6389,7 @@ Filtered Items mode following todo (not done) items."
;; ----------------------------------------------------------------------------- ;; -----------------------------------------------------------------------------
(defvar todo-key-bindings-t (defvar todo-key-bindings-t
`( '(("Af" todo-find-archive)
("Af" todo-find-archive)
("Ac" todo-choose-archive) ("Ac" todo-choose-archive)
("Ad" todo-archive-done-item) ("Ad" todo-archive-done-item)
("Cv" todo-toggle-view-done-items) ("Cv" todo-toggle-view-done-items)
@ -6421,13 +6420,11 @@ Filtered Items mode following todo (not done) items."
("k" todo-delete-item) ("k" todo-delete-item)
("m" todo-move-item) ("m" todo-move-item)
("u" todo-item-undone) ("u" todo-item-undone)
([remap newline] newline-and-indent) ([remap newline] newline-and-indent))
)
"List of key bindings for Todo mode only.") "List of key bindings for Todo mode only.")
(defvar todo-key-bindings-t+a+f (defvar todo-key-bindings-t+a+f
`( '(("C*" todo-mark-category)
("C*" todo-mark-category)
("Cu" todo-unmark-category) ("Cu" todo-unmark-category)
("Fh" todo-toggle-item-header) ("Fh" todo-toggle-item-header)
("h" todo-toggle-item-header) ("h" todo-toggle-item-header)
@ -6444,27 +6441,22 @@ Filtered Items mode following todo (not done) items."
("p" todo-previous-item) ("p" todo-previous-item)
("q" todo-quit) ("q" todo-quit)
("s" todo-save) ("s" todo-save)
("t" todo-show) ("t" todo-show))
)
"List of key bindings for Todo, Archive, and Filtered Items modes.") "List of key bindings for Todo, Archive, and Filtered Items modes.")
(defvar todo-key-bindings-t+a (defvar todo-key-bindings-t+a
`( '(("Fc" todo-show-categories-table)
("Fc" todo-show-categories-table)
("S" todo-search) ("S" todo-search)
("X" todo-clear-matches) ("X" todo-clear-matches)
("b" todo-backward-category) ("b" todo-backward-category)
("f" todo-forward-category) ("f" todo-forward-category)
("*" todo-toggle-mark-item) ("*" todo-toggle-mark-item))
)
"List of key bindings for Todo and Todo Archive modes.") "List of key bindings for Todo and Todo Archive modes.")
(defvar todo-key-bindings-t+f (defvar todo-key-bindings-t+f
`( '(("l" todo-lower-item-priority)
("l" todo-lower-item-priority)
("r" todo-raise-item-priority) ("r" todo-raise-item-priority)
("#" todo-set-item-priority) ("#" todo-set-item-priority))
)
"List of key bindings for Todo and Todo Filtered Items modes.") "List of key bindings for Todo and Todo Filtered Items modes.")
(defvar todo-mode-map (defvar todo-mode-map

16
lisp/cedet/semantic.el
View file

@ -225,37 +225,37 @@ during a flush when the cache is given a new value of nil.")
"Indicate that the current buffer is unparseable. "Indicate that the current buffer is unparseable.
It is also true that the parse tree will need either updating or It is also true that the parse tree will need either updating or
a rebuild. This state will be changed when the user edits the buffer." a rebuild. This state will be changed when the user edits the buffer."
`(setq semantic-parse-tree-state 'unparseable)) '(setq semantic-parse-tree-state 'unparseable))
(defmacro semantic-parse-tree-unparseable-p () (defmacro semantic-parse-tree-unparseable-p ()
"Return non-nil if the current buffer has been marked unparseable." "Return non-nil if the current buffer has been marked unparseable."
`(eq semantic-parse-tree-state 'unparseable)) '(eq semantic-parse-tree-state 'unparseable))
(defmacro semantic-parse-tree-set-needs-update () (defmacro semantic-parse-tree-set-needs-update ()
"Indicate that the current parse tree needs to be updated. "Indicate that the current parse tree needs to be updated.
The parse tree can be updated by `semantic-parse-changes'." The parse tree can be updated by `semantic-parse-changes'."
`(setq semantic-parse-tree-state 'needs-update)) '(setq semantic-parse-tree-state 'needs-update))
(defmacro semantic-parse-tree-needs-update-p () (defmacro semantic-parse-tree-needs-update-p ()
"Return non-nil if the current parse tree needs to be updated." "Return non-nil if the current parse tree needs to be updated."
`(eq semantic-parse-tree-state 'needs-update)) '(eq semantic-parse-tree-state 'needs-update))
(defmacro semantic-parse-tree-set-needs-rebuild () (defmacro semantic-parse-tree-set-needs-rebuild ()
"Indicate that the current parse tree needs to be rebuilt. "Indicate that the current parse tree needs to be rebuilt.
The parse tree must be rebuilt by `semantic-parse-region'." The parse tree must be rebuilt by `semantic-parse-region'."
`(setq semantic-parse-tree-state 'needs-rebuild)) '(setq semantic-parse-tree-state 'needs-rebuild))
(defmacro semantic-parse-tree-needs-rebuild-p () (defmacro semantic-parse-tree-needs-rebuild-p ()
"Return non-nil if the current parse tree needs to be rebuilt." "Return non-nil if the current parse tree needs to be rebuilt."
`(eq semantic-parse-tree-state 'needs-rebuild)) '(eq semantic-parse-tree-state 'needs-rebuild))
(defmacro semantic-parse-tree-set-up-to-date () (defmacro semantic-parse-tree-set-up-to-date ()
"Indicate that the current parse tree is up to date." "Indicate that the current parse tree is up to date."
`(setq semantic-parse-tree-state nil)) '(setq semantic-parse-tree-state nil))
(defmacro semantic-parse-tree-up-to-date-p () (defmacro semantic-parse-tree-up-to-date-p ()
"Return non-nil if the current parse tree is up to date." "Return non-nil if the current parse tree is up to date."
`(null semantic-parse-tree-state)) '(null semantic-parse-tree-state))
;;; Interfacing with the system ;;; Interfacing with the system
;; ;;

26
lisp/cedet/semantic/analyze/debug.el
View file

@ -558,19 +558,19 @@ PARENT is a possible parent (by nesting) tag."
'mouse-face 'custom-button-pressed-face 'mouse-face 'custom-button-pressed-face
'tag tag 'tag tag
'action 'action
`(lambda (button) (lambda (button)
(let ((buff nil) (let ((buff nil)
(pnt nil)) (pnt nil))
(save-excursion (save-excursion
(semantic-go-to-tag (semantic-go-to-tag
(button-get button 'tag)) (button-get button 'tag))
(setq buff (current-buffer)) (setq buff (current-buffer))
(setq pnt (point))) (setq pnt (point)))
(if (get-buffer-window buff) (if (get-buffer-window buff)
(select-window (get-buffer-window buff)) (select-window (get-buffer-window buff))
(pop-to-buffer buff t)) (pop-to-buffer buff t))
(goto-char pnt) (goto-char pnt)
(pulse-line-hook-function))) (pulse-line-hook-function)))
)) ))
(princ "\"") (princ "\"")
(princ str) (princ str)

2
lisp/cedet/semantic/bovine.el
View file

@ -72,7 +72,7 @@ The return list is a lambda expression to be used in a bovine table."
"Return the current nonterminal symbol. "Return the current nonterminal symbol.
Part of the grammar source debugger. Depends on the existing Part of the grammar source debugger. Depends on the existing
environment of `semantic-bovinate-stream'." environment of `semantic-bovinate-stream'."
`(if nt-stack '(if nt-stack
(car (aref (car nt-stack) 2)) (car (aref (car nt-stack) 2))
nonterminal)) nonterminal))

4
lisp/cedet/semantic/dep.el
View file

@ -56,7 +56,7 @@ reparsed, the cache will be reset.
TODO: use ffap.el to locate such items? TODO: use ffap.el to locate such items?
NOTE: Obsolete this, or use as special user") NOTE: Obsolete this, or use as special user")
(make-variable-buffer-local `semantic-dependency-include-path) (make-variable-buffer-local 'semantic-dependency-include-path)
(defvar semantic-dependency-system-include-path nil (defvar semantic-dependency-system-include-path nil
"Defines the system include path. "Defines the system include path.
@ -71,7 +71,7 @@ When searching for a file associated with a name found in a tag of
class include, this path will be inspected for includes of type class include, this path will be inspected for includes of type
`system'. Some include tags are agnostic to this setting and will `system'. Some include tags are agnostic to this setting and will
check both the project and system directories.") check both the project and system directories.")
(make-variable-buffer-local `semantic-dependency-system-include-path) (make-variable-buffer-local 'semantic-dependency-system-include-path)
(defmacro defcustom-mode-local-semantic-dependency-system-include-path (defmacro defcustom-mode-local-semantic-dependency-system-include-path
(mode name value &optional docstring) (mode name value &optional docstring)

2
lisp/cedet/semantic/grammar.el
View file

@ -1611,7 +1611,7 @@ Select the buffer containing the tag's definition, and move point there."
;; ;;
(defvar semantic-grammar-syntax-help (defvar semantic-grammar-syntax-help
`( '(
;; Lexical Symbols ;; Lexical Symbols
("symbol" . "Syntax: A symbol of alpha numeric and symbol characters") ("symbol" . "Syntax: A symbol of alpha numeric and symbol characters")
("number" . "Syntax: Numeric characters.") ("number" . "Syntax: Numeric characters.")

4
lisp/cedet/semantic/wisent/comp.el
View file

@ -196,11 +196,11 @@ If optional LEFT is non-nil insert spaces on left."
(defmacro wisent-log-buffer () (defmacro wisent-log-buffer ()
"Return the log buffer. "Return the log buffer.
Its name is defined in constant `wisent-log-buffer-name'." Its name is defined in constant `wisent-log-buffer-name'."
`(get-buffer-create wisent-log-buffer-name)) '(get-buffer-create wisent-log-buffer-name))
(defmacro wisent-clear-log () (defmacro wisent-clear-log ()
"Delete the entire contents of the log buffer." "Delete the entire contents of the log buffer."
`(with-current-buffer (wisent-log-buffer) '(with-current-buffer (wisent-log-buffer)
(erase-buffer))) (erase-buffer)))
(defvar byte-compile-current-file) (defvar byte-compile-current-file)

2
lisp/cedet/semantic/wisent/grammar.el
View file

@ -194,7 +194,7 @@ See also the function `wisent-skip-block'."
"Expand call to SKIP-TOKEN grammar macro. "Expand call to SKIP-TOKEN grammar macro.
Return the form to skip the lookahead token. Return the form to skip the lookahead token.
See also the function `wisent-skip-token'." See also the function `wisent-skip-token'."
`(wisent-skip-token)) '(wisent-skip-token))
(defun wisent-grammar-assocs () (defun wisent-grammar-assocs ()
"Return associativity and precedence level definitions." "Return associativity and precedence level definitions."

14
lisp/cedet/srecode/mode.el
View file

@ -89,14 +89,14 @@
]) ])
"---" "---"
'( "Insert ..." :filter srecode-minor-mode-templates-menu ) '( "Insert ..." :filter srecode-minor-mode-templates-menu )
`( "Generate ..." :filter srecode-minor-mode-generate-menu ) '( "Generate ..." :filter srecode-minor-mode-generate-menu )
"---" "---"
(semantic-menu-item (semantic-menu-item
["Customize..." ["Customize..."
(customize-group "srecode") (customize-group "srecode")
:active t :active t
:help "Customize SRecode options" :help "Customize SRecode options"
]) ])
(list (list
"Debugging Tools..." "Debugging Tools..."
(semantic-menu-item (semantic-menu-item

4
lisp/cus-edit.el
View file

@ -2444,7 +2444,7 @@ If INITIAL-STRING is non-nil, use that rather than \"Parent groups:\"."
:group 'custom-faces) :group 'custom-faces)
(defface custom-variable-tag (defface custom-variable-tag
`((((class color) (background dark)) '((((class color) (background dark))
:foreground "light blue" :weight bold) :foreground "light blue" :weight bold)
(((min-colors 88) (class color) (background light)) (((min-colors 88) (class color) (background light))
:foreground "blue1" :weight bold) :foreground "blue1" :weight bold)
@ -3920,7 +3920,7 @@ restoring it to the state of a face that has never been customized."
(defun custom-hook-convert-widget (widget) (defun custom-hook-convert-widget (widget)
;; Handle `:options'. ;; Handle `:options'.
(let* ((options (widget-get widget :options)) (let* ((options (widget-get widget :options))
(other `(editable-list :inline t (other '(editable-list :inline t
:entry-format "%i %d%v" :entry-format "%i %d%v"
(function :format " %v"))) (function :format " %v")))
(args (if options (args (if options

36
lisp/doc-view.el
View file

@ -494,10 +494,10 @@ Typically \"page-%s.png\".")
(defmacro doc-view-current-page (&optional win) (defmacro doc-view-current-page (&optional win)
`(image-mode-window-get 'page ,win)) `(image-mode-window-get 'page ,win))
(defmacro doc-view-current-info () `(image-mode-window-get 'info)) (defmacro doc-view-current-info () '(image-mode-window-get 'info))
(defmacro doc-view-current-overlay () `(image-mode-window-get 'overlay)) (defmacro doc-view-current-overlay () '(image-mode-window-get 'overlay))
(defmacro doc-view-current-image () `(image-mode-window-get 'image)) (defmacro doc-view-current-image () '(image-mode-window-get 'image))
(defmacro doc-view-current-slice () `(image-mode-window-get 'slice)) (defmacro doc-view-current-slice () '(image-mode-window-get 'slice))
(defun doc-view-last-page-number () (defun doc-view-last-page-number ()
(length doc-view--current-files)) (length doc-view--current-files))
@ -1004,8 +1004,8 @@ is named like ODF with the extension turned to pdf."
"Convert PDF-PS to PNG asynchronously." "Convert PDF-PS to PNG asynchronously."
(funcall (funcall
(pcase doc-view-doc-type (pcase doc-view-doc-type
(`pdf doc-view-pdf->png-converter-function) ('pdf doc-view-pdf->png-converter-function)
(`djvu #'doc-view-djvu->tiff-converter-ddjvu) ('djvu #'doc-view-djvu->tiff-converter-ddjvu)
(_ #'doc-view-ps->png-converter-ghostscript)) (_ #'doc-view-ps->png-converter-ghostscript))
pdf-ps png nil pdf-ps png nil
(let ((resolution doc-view-resolution)) (let ((resolution doc-view-resolution))
@ -1074,20 +1074,20 @@ Start by converting PAGES, and then the rest."
"Convert the current document to text and call CALLBACK when done." "Convert the current document to text and call CALLBACK when done."
(make-directory (doc-view--current-cache-dir) t) (make-directory (doc-view--current-cache-dir) t)
(pcase doc-view-doc-type (pcase doc-view-doc-type
(`pdf ('pdf
;; Doc is a PDF, so convert it to TXT ;; Doc is a PDF, so convert it to TXT
(doc-view-pdf->txt doc-view--buffer-file-name txt callback)) (doc-view-pdf->txt doc-view--buffer-file-name txt callback))
(`ps ('ps
;; Doc is a PS, so convert it to PDF (which will be converted to ;; Doc is a PS, so convert it to PDF (which will be converted to
;; TXT thereafter). ;; TXT thereafter).
(let ((pdf (doc-view-current-cache-doc-pdf))) (let ((pdf (doc-view-current-cache-doc-pdf)))
(doc-view-ps->pdf doc-view--buffer-file-name pdf (doc-view-ps->pdf doc-view--buffer-file-name pdf
(lambda () (doc-view-pdf->txt pdf txt callback))))) (lambda () (doc-view-pdf->txt pdf txt callback)))))
(`dvi ('dvi
;; Doc is a DVI. This means that a doc.pdf already exists in its ;; Doc is a DVI. This means that a doc.pdf already exists in its
;; cache subdirectory. ;; cache subdirectory.
(doc-view-pdf->txt (doc-view-current-cache-doc-pdf) txt callback)) (doc-view-pdf->txt (doc-view-current-cache-doc-pdf) txt callback))
(`odf ('odf
;; Doc is some ODF (or MS Office) doc. This means that a doc.pdf ;; Doc is some ODF (or MS Office) doc. This means that a doc.pdf
;; already exists in its cache subdirectory. ;; already exists in its cache subdirectory.
(doc-view-pdf->txt (doc-view-current-cache-doc-pdf) txt callback)) (doc-view-pdf->txt (doc-view-current-cache-doc-pdf) txt callback))
@ -1128,13 +1128,13 @@ Those files are saved in the directory given by the function
(doc-view--current-cache-dir)))) (doc-view--current-cache-dir))))
(make-directory (doc-view--current-cache-dir) t) (make-directory (doc-view--current-cache-dir) t)
(pcase doc-view-doc-type (pcase doc-view-doc-type
(`dvi ('dvi
;; DVI files have to be converted to PDF before Ghostscript can process ;; DVI files have to be converted to PDF before Ghostscript can process
;; it. ;; it.
(let ((pdf (doc-view-current-cache-doc-pdf))) (let ((pdf (doc-view-current-cache-doc-pdf)))
(doc-view-dvi->pdf doc-view--buffer-file-name pdf (doc-view-dvi->pdf doc-view--buffer-file-name pdf
(lambda () (doc-view-pdf/ps->png pdf png-file))))) (lambda () (doc-view-pdf/ps->png pdf png-file)))))
(`odf ('odf
;; ODF files have to be converted to PDF before Ghostscript can ;; ODF files have to be converted to PDF before Ghostscript can
;; process it. ;; process it.
(let ((pdf (doc-view-current-cache-doc-pdf)) (let ((pdf (doc-view-current-cache-doc-pdf))
@ -1147,11 +1147,11 @@ Those files are saved in the directory given by the function
;; file name. It's named like the input file with the ;; file name. It's named like the input file with the
;; extension replaced by pdf. ;; extension replaced by pdf.
(funcall doc-view-odf->pdf-converter-function doc-view--buffer-file-name (funcall doc-view-odf->pdf-converter-function doc-view--buffer-file-name
(lambda () (lambda ()
;; Rename to doc.pdf ;; Rename to doc.pdf
(rename-file opdf pdf) (rename-file opdf pdf)
(doc-view-pdf/ps->png pdf png-file))))) (doc-view-pdf/ps->png pdf png-file)))))
((or `pdf `djvu) ((or 'pdf 'djvu)
(let ((pages (doc-view-active-pages))) (let ((pages (doc-view-active-pages)))
;; Convert doc to bitmap images starting with the active pages. ;; Convert doc to bitmap images starting with the active pages.
(doc-view-document->bitmap doc-view--buffer-file-name png-file pages))) (doc-view-document->bitmap doc-view--buffer-file-name png-file pages)))
@ -1695,7 +1695,7 @@ If BACKWARD is non-nil, jump to the previous match."
"Find the right single-page converter for the current document type" "Find the right single-page converter for the current document type"
(pcase-let ((`(,conv-function ,type ,extension) (pcase-let ((`(,conv-function ,type ,extension)
(pcase doc-view-doc-type (pcase doc-view-doc-type
(`djvu (list #'doc-view-djvu->tiff-converter-ddjvu 'tiff "tif")) ('djvu (list #'doc-view-djvu->tiff-converter-ddjvu 'tiff "tif"))
(_ (list doc-view-pdf->png-converter-function 'png "png"))))) (_ (list doc-view-pdf->png-converter-function 'png "png")))))
(setq-local doc-view-single-page-converter-function conv-function) (setq-local doc-view-single-page-converter-function conv-function)
(setq-local doc-view--image-type type) (setq-local doc-view--image-type type)

2
lisp/elec-pair.el
View file

@ -522,7 +522,7 @@ happened."
pos)) pos))
(forward-char)) (forward-char))
;; Insert matching pair. ;; Insert matching pair.
((and (memq syntax `(?\( ?\" ?\$)) ((and (memq syntax '(?\( ?\" ?\$))
(not overwrite-mode) (not overwrite-mode)
(or unconditional (or unconditional
(not (funcall electric-pair-inhibit-predicate (not (funcall electric-pair-inhibit-predicate

8
lisp/electric.el
View file

@ -391,13 +391,13 @@ newline after CHAR but stay in the same place.")
;; multiple times), but I'm not sure it's what we want. ;; multiple times), but I'm not sure it's what we want.
;; ;;
;; FIXME: check eolp before inserting \n? ;; FIXME: check eolp before inserting \n?
(`before (goto-char (1- pos)) (skip-chars-backward " \t") ('before (goto-char (1- pos)) (skip-chars-backward " \t")
(unless (bolp) (insert "\n"))) (unless (bolp) (insert "\n")))
(`after (insert "\n")) ('after (insert "\n"))
(`after-stay (save-excursion ('after-stay (save-excursion
(let ((electric-layout-rules nil)) (let ((electric-layout-rules nil))
(newline 1 t)))) (newline 1 t))))
(`around (save-excursion ('around (save-excursion
(goto-char (1- pos)) (skip-chars-backward " \t") (goto-char (1- pos)) (skip-chars-backward " \t")
(unless (bolp) (insert "\n"))) (unless (bolp) (insert "\n")))
(insert "\n"))) ; FIXME: check eolp before inserting \n? (insert "\n"))) ; FIXME: check eolp before inserting \n?

12
lisp/emacs-lisp/autoload.el
View file

@ -182,13 +182,13 @@ expression, in which case we want to handle forms differently."
(let* ((macrop (memq car '(defmacro cl-defmacro defmacro*))) (let* ((macrop (memq car '(defmacro cl-defmacro defmacro*)))
(name (nth 1 form)) (name (nth 1 form))
(args (pcase car (args (pcase car
((or `defun `defmacro ((or 'defun 'defmacro
`defun* `defmacro* `cl-defun `cl-defmacro 'defun* 'defmacro* 'cl-defun 'cl-defmacro
`define-overloadable-function) 'define-overloadable-function)
(nth 2 form)) (nth 2 form))
(`define-skeleton '(&optional str arg)) ('define-skeleton '(&optional str arg))
((or `define-generic-mode `define-derived-mode ((or 'define-generic-mode 'define-derived-mode
`define-compilation-mode) 'define-compilation-mode)
nil) nil)
(_ t))) (_ t)))
(body (nthcdr (or (function-get car 'doc-string-elt) 3) form)) (body (nthcdr (or (function-get car 'doc-string-elt) 3) form))

2
lisp/emacs-lisp/benchmark.el
View file

@ -81,7 +81,7 @@ result. The overhead of the `lambda's is accounted for."
(gcs (make-symbol "gcs")) (gcs (make-symbol "gcs"))
(gc (make-symbol "gc")) (gc (make-symbol "gc"))
(code (byte-compile `(lambda () ,@forms))) (code (byte-compile `(lambda () ,@forms)))
(lambda-code (byte-compile `(lambda ())))) (lambda-code (byte-compile '(lambda ()))))
`(let ((,gc gc-elapsed) `(let ((,gc gc-elapsed)
(,gcs gcs-done)) (,gcs gcs-done))
(list ,(if (or (symbolp repetitions) (> repetitions 1)) (list ,(if (or (symbolp repetitions) (> repetitions 1))

6
lisp/emacs-lisp/byte-opt.el
View file

@ -255,7 +255,7 @@
(setq fn (or (symbol-function name) (setq fn (or (symbol-function name)
(cdr (assq name byte-compile-function-environment))))) (cdr (assq name byte-compile-function-environment)))))
(pcase fn (pcase fn
(`nil ('nil
(byte-compile-warn "attempt to inline `%s' before it was defined" (byte-compile-warn "attempt to inline `%s' before it was defined"
name) name)
form) form)
@ -635,7 +635,7 @@
(setq form (car (last (cdr form))))) (setq form (car (last (cdr form)))))
(cond ((consp form) (cond ((consp form)
(pcase (car form) (pcase (car form)
(`quote (cadr form)) ('quote (cadr form))
;; Can't use recursion in a defsubst. ;; Can't use recursion in a defsubst.
;; (`progn (byte-compile-trueconstp (car (last (cdr form))))) ;; (`progn (byte-compile-trueconstp (car (last (cdr form)))))
)) ))
@ -649,7 +649,7 @@
(setq form (car (last (cdr form))))) (setq form (car (last (cdr form)))))
(cond ((consp form) (cond ((consp form)
(pcase (car form) (pcase (car form)
(`quote (null (cadr form))) ('quote (null (cadr form)))
;; Can't use recursion in a defsubst. ;; Can't use recursion in a defsubst.
;; (`progn (byte-compile-nilconstp (car (last (cdr form))))) ;; (`progn (byte-compile-nilconstp (car (last (cdr form)))))
)) ))

32
lisp/emacs-lisp/bytecomp.el
View file

@ -1730,8 +1730,8 @@ that already has a `.elc' file."
(file-name-nondirectory source)))) (file-name-nondirectory source))))
(progn (cl-incf (progn (cl-incf
(pcase (byte-recompile-file source force arg) (pcase (byte-recompile-file source force arg)
(`no-byte-compile skip-count) ('no-byte-compile skip-count)
(`t file-count) ('t file-count)
(_ fail-count))) (_ fail-count)))
(or noninteractive (or noninteractive
(message "Checking %s..." directory)) (message "Checking %s..." directory))
@ -3277,8 +3277,8 @@ for symbols generated by the byte compiler itself."
(cl-assert (listp fargs)) (cl-assert (listp fargs))
(while fargs (while fargs
(pcase (car fargs) (pcase (car fargs)
(`&optional (setq fargs (cdr fargs))) ('&optional (setq fargs (cdr fargs)))
(`&rest (setq fmax2 (+ (* 2 (length dynbinds)) 1)) ('&rest (setq fmax2 (+ (* 2 (length dynbinds)) 1))
(push (cadr fargs) dynbinds) (push (cadr fargs) dynbinds)
(setq fargs nil)) (setq fargs nil))
(_ (push (pop fargs) dynbinds)))) (_ (push (pop fargs) dynbinds))))
@ -3325,8 +3325,8 @@ for symbols generated by the byte compiler itself."
(not (memq var byte-compile-not-obsolete-vars)) (not (memq var byte-compile-not-obsolete-vars))
(not (memq var byte-compile-global-not-obsolete-vars)) (not (memq var byte-compile-global-not-obsolete-vars))
(or (pcase (nth 1 od) (or (pcase (nth 1 od)
(`set (not (eq access-type 'reference))) ('set (not (eq access-type 'reference)))
(`get (eq access-type 'reference)) ('get (eq access-type 'reference))
(_ t))))) (_ t)))))
(byte-compile-warn-obsolete var)))) (byte-compile-warn-obsolete var))))
@ -4731,7 +4731,7 @@ binding slots have been popped."
arg) arg)
;; `lam' is the lambda expression in `fun' (or nil if not ;; `lam' is the lambda expression in `fun' (or nil if not
;; recognized). ;; recognized).
((or `(,(or `quote `function) ,lam) (let lam nil)) ((or `(,(or 'quote 'function) ,lam) (let lam nil))
fun) fun)
;; `arglist' is the list of arguments (or t if not recognized). ;; `arglist' is the list of arguments (or t if not recognized).
;; `body' is the body of `lam' (or t if not recognized). ;; `body' is the body of `lam' (or t if not recognized).
@ -4918,18 +4918,18 @@ invoked interactively."
(setq byte-compile-call-tree (setq byte-compile-call-tree
(sort byte-compile-call-tree (sort byte-compile-call-tree
(pcase byte-compile-call-tree-sort (pcase byte-compile-call-tree-sort
(`callers ('callers
(lambda (x y) (< (length (nth 1 x)) (lambda (x y) (< (length (nth 1 x))
(length (nth 1 y))))) (length (nth 1 y)))))
(`calls ('calls
(lambda (x y) (< (length (nth 2 x)) (lambda (x y) (< (length (nth 2 x))
(length (nth 2 y))))) (length (nth 2 y)))))
(`calls+callers ('calls+callers
(lambda (x y) (< (+ (length (nth 1 x)) (lambda (x y) (< (+ (length (nth 1 x))
(length (nth 2 x))) (length (nth 2 x)))
(+ (length (nth 1 y)) (+ (length (nth 1 y))
(length (nth 2 y)))))) (length (nth 2 y))))))
(`name ('name
(lambda (x y) (string< (car x) (car y)))) (lambda (x y) (string< (car x) (car y))))
(_ (error "`byte-compile-call-tree-sort': `%s' - unknown sort mode" (_ (error "`byte-compile-call-tree-sort': `%s' - unknown sort mode"
byte-compile-call-tree-sort)))))) byte-compile-call-tree-sort))))))

20
lisp/emacs-lisp/cconv.el
View file

@ -322,7 +322,7 @@ places where they originally did not directly appear."
;; so we never touch it(unless we enter to the other closure). ;; so we never touch it(unless we enter to the other closure).
;;(if (listp form) (print (car form)) form) ;;(if (listp form) (print (car form)) form)
(pcase form (pcase form
(`(,(and letsym (or `let* `let)) ,binders . ,body) (`(,(and letsym (or 'let* 'let)) ,binders . ,body)
; let and let* special forms ; let and let* special forms
(let ((binders-new '()) (let ((binders-new '())
@ -454,7 +454,7 @@ places where they originally did not directly appear."
(`(function . ,_) form) (`(function . ,_) form)
;defconst, defvar ;defconst, defvar
(`(,(and sym (or `defconst `defvar)) ,definedsymbol . ,forms) (`(,(and sym (or 'defconst 'defvar)) ,definedsymbol . ,forms)
`(,sym ,definedsymbol `(,sym ,definedsymbol
. ,(when (consp forms) . ,(when (consp forms)
(cons (cconv-convert (car forms) env extend) (cons (cconv-convert (car forms) env extend)
@ -496,8 +496,8 @@ places where they originally did not directly appear."
`((let ((,var (list ,var))) ,@body)))))) `((let ((,var (list ,var))) ,@body))))))
handlers)))) handlers))))
(`(,(and head (or (and `catch (guard byte-compile--use-old-handlers)) (`(,(and head (or (and 'catch (guard byte-compile--use-old-handlers))
`unwind-protect)) 'unwind-protect))
,form . ,body) ,form . ,body)
`(,head ,(cconv-convert form env extend) `(,head ,(cconv-convert form env extend)
:fun-body ,(cconv--convert-function () body env form))) :fun-body ,(cconv--convert-function () body env form)))
@ -526,7 +526,7 @@ places where they originally did not directly appear."
`(progn . ,(nreverse prognlist)) `(progn . ,(nreverse prognlist))
(car prognlist))))) (car prognlist)))))
(`(,(and (or `funcall `apply) callsym) ,fun . ,args) (`(,(and (or 'funcall 'apply) callsym) ,fun . ,args)
;; These are not special forms but we treat them separately for the needs ;; These are not special forms but we treat them separately for the needs
;; of lambda lifting. ;; of lambda lifting.
(let ((mapping (cdr (assq fun env)))) (let ((mapping (cdr (assq fun env))))
@ -655,7 +655,7 @@ This function does not return anything but instead fills the
and updates the data stored in ENV." and updates the data stored in ENV."
(pcase form (pcase form
; let special form ; let special form
(`(,(and (or `let* `let) letsym) ,binders . ,body-forms) (`(,(and (or 'let* 'let) letsym) ,binders . ,body-forms)
(let ((orig-env env) (let ((orig-env env)
(newvars nil) (newvars nil)
@ -739,18 +739,18 @@ and updates the data stored in ENV."
form "variable")))) form "variable"))))
;; FIXME: The bytecode for unwind-protect forces us to wrap the unwind. ;; FIXME: The bytecode for unwind-protect forces us to wrap the unwind.
(`(,(or (and `catch (guard byte-compile--use-old-handlers)) (`(,(or (and 'catch (guard byte-compile--use-old-handlers))
`unwind-protect) 'unwind-protect)
,form . ,body) ,form . ,body)
(cconv-analyze-form form env) (cconv-analyze-form form env)
(cconv--analyze-function () body env form)) (cconv--analyze-function () body env form))
(`(defvar ,var) (push var byte-compile-bound-variables)) (`(defvar ,var) (push var byte-compile-bound-variables))
(`(,(or `defconst `defvar) ,var ,value . ,_) (`(,(or 'defconst 'defvar) ,var ,value . ,_)
(push var byte-compile-bound-variables) (push var byte-compile-bound-variables)
(cconv-analyze-form value env)) (cconv-analyze-form value env))
(`(,(or `funcall `apply) ,fun . ,args) (`(,(or 'funcall 'apply) ,fun . ,args)
;; Here we ignore fun because funcall and apply are the only two ;; Here we ignore fun because funcall and apply are the only two
;; functions where we can pass a candidate for lambda lifting as ;; functions where we can pass a candidate for lambda lifting as
;; argument. So, if we see fun elsewhere, we'll delete it from ;; argument. So, if we see fun elsewhere, we'll delete it from

8
lisp/emacs-lisp/cl-extra.el
View file

@ -576,9 +576,9 @@ too large if positive or too small if negative)."
"Concatenate, into a sequence of type TYPE, the argument SEQUENCEs. "Concatenate, into a sequence of type TYPE, the argument SEQUENCEs.
\n(fn TYPE SEQUENCE...)" \n(fn TYPE SEQUENCE...)"
(pcase type (pcase type
(`vector (apply #'vconcat sequences)) ('vector (apply #'vconcat sequences))
(`string (apply #'concat sequences)) ('string (apply #'concat sequences))
(`list (apply #'append (append sequences '(nil)))) ('list (apply #'append (append sequences '(nil))))
(_ (error "Not a sequence type name: %S" type)))) (_ (error "Not a sequence type name: %S" type))))
;;; List functions. ;;; List functions.
@ -742,7 +742,7 @@ including `cl-block' and `cl-eval-when'."
(with-eval-after-load 'find-func (with-eval-after-load 'find-func
(defvar find-function-regexp-alist) (defvar find-function-regexp-alist)
(add-to-list 'find-function-regexp-alist (add-to-list 'find-function-regexp-alist
`(define-type . cl--typedef-regexp))) '(define-type . cl--typedef-regexp)))
(define-button-type 'cl-help-type (define-button-type 'cl-help-type
:supertype 'help-function-def :supertype 'help-function-def

2
lisp/emacs-lisp/cl-generic.el
View file

@ -938,7 +938,7 @@ MET-NAME is as returned by `cl--generic-load-hist-format'."
(add-to-list 'find-function-regexp-alist (add-to-list 'find-function-regexp-alist
`(cl-defmethod . ,#'cl--generic-search-method)) `(cl-defmethod . ,#'cl--generic-search-method))
(add-to-list 'find-function-regexp-alist (add-to-list 'find-function-regexp-alist
`(cl-defgeneric . cl--generic-find-defgeneric-regexp))) '(cl-defgeneric . cl--generic-find-defgeneric-regexp)))
(defun cl--generic-method-info (method) (defun cl--generic-method-info (method)
(let* ((specializers (cl--generic-method-specializers method)) (let* ((specializers (cl--generic-method-specializers method))

8
lisp/emacs-lisp/cl-macs.el
View file

@ -1902,7 +1902,7 @@ Labels have lexical scope and dynamic extent."
(push (nreverse block) blocks) (push (nreverse block) blocks)
(setq block (list label-or-stmt)))) (setq block (list label-or-stmt))))
(unless (eq 'go (car-safe (car-safe block))) (unless (eq 'go (car-safe (car-safe block)))
(push `(go cl--exit) block)) (push '(go cl--exit) block))
(push (nreverse block) blocks)) (push (nreverse block) blocks))
(let ((catch-tag (make-symbol "cl--tagbody-tag")) (let ((catch-tag (make-symbol "cl--tagbody-tag"))
(cl--tagbody-alist cl--tagbody-alist)) (cl--tagbody-alist cl--tagbody-alist))
@ -2185,7 +2185,7 @@ of `cl-symbol-macrolet' to additionally expand symbol macros."
;; The behavior of CL made sense in a dynamically scoped ;; The behavior of CL made sense in a dynamically scoped
;; language, but nowadays, lexical scoping semantics is more often ;; language, but nowadays, lexical scoping semantics is more often
;; expected. ;; expected.
(`(,(or `let `let*) . ,(or `(,bindings . ,body) dontcare)) (`(,(or 'let 'let*) . ,(or `(,bindings . ,body) dontcare))
(let ((nbs ()) (found nil)) (let ((nbs ()) (found nil))
(dolist (binding bindings) (dolist (binding bindings)
(let* ((var (if (symbolp binding) binding (car binding))) (let* ((var (if (symbolp binding) binding (car binding)))
@ -3021,7 +3021,7 @@ the form NAME which is a shorthand for (NAME NAME)."
(defun cl--defstruct-predicate (type) (defun cl--defstruct-predicate (type)
(let ((cons (assq (cl-struct-sequence-type type) (let ((cons (assq (cl-struct-sequence-type type)
`((list . consp) '((list . consp)
(vector . vectorp) (vector . vectorp)
(nil . recordp))))) (nil . recordp)))))
(if cons (if cons
@ -3355,7 +3355,7 @@ The type name can then be used in `cl-typecase', `cl-check-type', etc."
(put ',name 'cl-deftype-handler (put ',name 'cl-deftype-handler
(cl-function (lambda (&cl-defs ('*) ,@arglist) ,@body))))) (cl-function (lambda (&cl-defs ('*) ,@arglist) ,@body)))))
(cl-deftype extended-char () `(and character (not base-char))) (cl-deftype extended-char () '(and character (not base-char)))
;;; Additional functions that we can now define because we've defined ;;; Additional functions that we can now define because we've defined
;;; `cl-defsubst' and `cl-typep'. ;;; `cl-defsubst' and `cl-typep'.

2
lisp/emacs-lisp/copyright.el
View file

@ -347,7 +347,7 @@ independently replaces consecutive years with a range."
"Insert a copyright by $ORGANIZATION notice at cursor." "Insert a copyright by $ORGANIZATION notice at cursor."
"Company: " "Company: "
comment-start comment-start
"Copyright (C) " `(format-time-string "%Y") " by " "Copyright (C) " '(format-time-string "%Y") " by "
(or (getenv "ORGANIZATION") (or (getenv "ORGANIZATION")
str) str)
'(if (copyright-offset-too-large-p) '(if (copyright-offset-too-large-p)

14
lisp/emacs-lisp/debug.el
View file

@ -354,26 +354,26 @@ Include the reason for debugger entry from ARGS."
(pcase (car args) (pcase (car args)
;; lambda is for debug-on-call when a function call is next. ;; lambda is for debug-on-call when a function call is next.
;; debug is for debug-on-entry function called. ;; debug is for debug-on-entry function called.
((or `lambda `debug) ((or 'lambda 'debug)
(insert "--entering a function:\n")) (insert "--entering a function:\n"))
;; Exiting a function. ;; Exiting a function.
(`exit ('exit
(insert "--returning value: ") (insert "--returning value: ")
(insert (backtrace-print-to-string debugger-value)) (insert (backtrace-print-to-string debugger-value))
(insert ?\n)) (insert ?\n))
;; Watchpoint triggered. ;; Watchpoint triggered.
((and `watchpoint (let `(,symbol ,newval . ,details) (cdr args))) ((and 'watchpoint (let `(,symbol ,newval . ,details) (cdr args)))
(insert (insert
"--" "--"
(pcase details (pcase details
(`(makunbound nil) (format "making %s void" symbol)) ('(makunbound nil) (format "making %s void" symbol))
(`(makunbound ,buffer) (format "killing local value of %s in buffer %s" (`(makunbound ,buffer) (format "killing local value of %s in buffer %s"
symbol buffer)) symbol buffer))
(`(defvaralias ,_) (format "aliasing %s to %s" symbol newval)) (`(defvaralias ,_) (format "aliasing %s to %s" symbol newval))
(`(let ,_) (format "let-binding %s to %s" symbol (`(let ,_) (format "let-binding %s to %s" symbol
(backtrace-print-to-string newval))) (backtrace-print-to-string newval)))
(`(unlet ,_) (format "ending let-binding of %s" symbol)) (`(unlet ,_) (format "ending let-binding of %s" symbol))
(`(set nil) (format "setting %s to %s" symbol ('(set nil) (format "setting %s to %s" symbol
(backtrace-print-to-string newval))) (backtrace-print-to-string newval)))
(`(set ,buffer) (format "setting %s in buffer %s to %s" (`(set ,buffer) (format "setting %s in buffer %s to %s"
symbol buffer symbol buffer
@ -382,12 +382,12 @@ Include the reason for debugger entry from ARGS."
": ") ": ")
(insert ?\n)) (insert ?\n))
;; Debugger entered for an error. ;; Debugger entered for an error.
(`error ('error
(insert "--Lisp error: ") (insert "--Lisp error: ")
(insert (backtrace-print-to-string (nth 1 args))) (insert (backtrace-print-to-string (nth 1 args)))
(insert ?\n)) (insert ?\n))
;; debug-on-call, when the next thing is an eval. ;; debug-on-call, when the next thing is an eval.
(`t ('t
(insert "--beginning evaluation of function call form:\n")) (insert "--beginning evaluation of function call form:\n"))
;; User calls debug directly. ;; User calls debug directly.
(_ (_

4
lisp/emacs-lisp/eieio-compat.el
View file

@ -182,11 +182,11 @@ Summary:
;; `no-applicable-method', which have slightly different calling ;; `no-applicable-method', which have slightly different calling
;; convention than their cl-generic counterpart. ;; convention than their cl-generic counterpart.
(pcase method (pcase method
(`no-next-method ('no-next-method
(setq method 'cl-no-next-method) (setq method 'cl-no-next-method)
(setq specializers `(generic method ,@specializers)) (setq specializers `(generic method ,@specializers))
(lambda (_generic _method &rest args) (apply code args))) (lambda (_generic _method &rest args) (apply code args)))
(`no-applicable-method ('no-applicable-method
(setq method 'cl-no-applicable-method) (setq method 'cl-no-applicable-method)
(setq specializers `(generic ,@specializers)) (setq specializers `(generic ,@specializers))
(lambda (generic arg &rest args) (lambda (generic arg &rest args)

2
lisp/emacs-lisp/ert.el
View file

@ -971,7 +971,7 @@ contained in UNIVERSE."
test test
(ert-test-most-recent-result test)))) (ert-test-most-recent-result test))))
universe)) universe))
(:unexpected (ert-select-tests `(not :expected) universe)) (:unexpected (ert-select-tests '(not :expected) universe))
((pred stringp) ((pred stringp)
(pcase-exhaustive universe (pcase-exhaustive universe
(`t (mapcar #'ert-get-test (`t (mapcar #'ert-get-test

24
lisp/emacs-lisp/generator.el
View file

@ -213,8 +213,8 @@ don't yield.")
;; Process `and'. ;; Process `and'.
(`(and) ; (and) -> t ('(and) ; (and) -> t
(cps--transform-1 t next-state)) (cps--transform-1 t next-state))
(`(and ,condition) ; (and CONDITION) -> CONDITION (`(and ,condition) ; (and CONDITION) -> CONDITION
(cps--transform-1 condition next-state)) (cps--transform-1 condition next-state))
(`(and ,condition . ,rest) (`(and ,condition . ,rest)
@ -246,8 +246,8 @@ don't yield.")
;; Process `cond': transform into `if' or `or' depending on the ;; Process `cond': transform into `if' or `or' depending on the
;; precise kind of the condition we're looking at. ;; precise kind of the condition we're looking at.
(`(cond) ; (cond) -> nil ('(cond) ; (cond) -> nil
(cps--transform-1 nil next-state)) (cps--transform-1 nil next-state))
(`(cond (,condition) . ,rest) (`(cond (,condition) . ,rest)
(cps--transform-1 `(or ,condition (cond ,@rest)) (cps--transform-1 `(or ,condition (cond ,@rest))
next-state)) next-state))
@ -281,14 +281,14 @@ don't yield.")
;; Process `progn' and `inline': they are identical except for the ;; Process `progn' and `inline': they are identical except for the
;; name, which has some significance to the byte compiler. ;; name, which has some significance to the byte compiler.
(`(inline) (cps--transform-1 nil next-state)) ('(inline) (cps--transform-1 nil next-state))
(`(inline ,form) (cps--transform-1 form next-state)) (`(inline ,form) (cps--transform-1 form next-state))
(`(inline ,form . ,rest) (`(inline ,form . ,rest)
(cps--transform-1 form (cps--transform-1 form
(cps--transform-1 `(inline ,@rest) (cps--transform-1 `(inline ,@rest)
next-state))) next-state)))
(`(progn) (cps--transform-1 nil next-state)) ('(progn) (cps--transform-1 nil next-state))
(`(progn ,form) (cps--transform-1 form next-state)) (`(progn ,form) (cps--transform-1 form next-state))
(`(progn ,form . ,rest) (`(progn ,form . ,rest)
(cps--transform-1 form (cps--transform-1 form
@ -345,7 +345,7 @@ don't yield.")
;; Process `or'. ;; Process `or'.
(`(or) (cps--transform-1 nil next-state)) ('(or) (cps--transform-1 nil next-state))
(`(or ,condition) (cps--transform-1 condition next-state)) (`(or ,condition) (cps--transform-1 condition next-state))
(`(or ,condition . ,rest) (`(or ,condition . ,rest)
(cps--transform-1 (cps--transform-1
@ -646,11 +646,11 @@ modified copy."
,(cps--make-close-iterator-form terminal-state))))) ,(cps--make-close-iterator-form terminal-state)))))
(t (error "unknown iterator operation %S" op)))))) (t (error "unknown iterator operation %S" op))))))
,(when finalizer-symbol ,(when finalizer-symbol
`(funcall iterator '(funcall iterator
:stash-finalizer :stash-finalizer
(make-finalizer (make-finalizer
(lambda () (lambda ()
(iter-close iterator))))) (iter-close iterator)))))
iterator)))) iterator))))
(defun iter-yield (value) (defun iter-yield (value)

2
lisp/emacs-lisp/inline.el
View file

@ -259,7 +259,7 @@ See Info node `(elisp)Defining Functions' for more details."
`(error ,@args)) `(error ,@args))
(defun inline--warning (&rest _args) (defun inline--warning (&rest _args)
`(throw 'inline--just-use '(throw 'inline--just-use
;; FIXME: This would inf-loop by calling us right back when ;; FIXME: This would inf-loop by calling us right back when
;; macroexpand-all recurses to expand inline--form. ;; macroexpand-all recurses to expand inline--form.
;; (macroexp--warn-and-return (format ,@args) ;; (macroexp--warn-and-return (format ,@args)

12
lisp/emacs-lisp/macroexp.el
View file

@ -222,15 +222,15 @@ Assumes the caller has bound `macroexpand-all-environment'."
(cddr form)) (cddr form))
(cdr form)) (cdr form))
form)) form))
(`(,(or `defvar `defconst) . ,_) (macroexp--all-forms form 2)) (`(,(or 'defvar 'defconst) . ,_) (macroexp--all-forms form 2))
(`(function ,(and f `(lambda . ,_))) (`(function ,(and f `(lambda . ,_)))
(macroexp--cons 'function (macroexp--cons 'function
(macroexp--cons (macroexp--all-forms f 2) (macroexp--cons (macroexp--all-forms f 2)
nil nil
(cdr form)) (cdr form))
form)) form))
(`(,(or `function `quote) . ,_) form) (`(,(or 'function 'quote) . ,_) form)
(`(,(and fun (or `let `let*)) . ,(or `(,bindings . ,body) dontcare)) (`(,(and fun (or 'let 'let*)) . ,(or `(,bindings . ,body) dontcare))
(macroexp--cons fun (macroexp--cons fun
(macroexp--cons (macroexp--all-clauses bindings 1) (macroexp--cons (macroexp--all-clauses bindings 1)
(macroexp--all-forms body) (macroexp--all-forms body)
@ -249,14 +249,14 @@ Assumes the caller has bound `macroexpand-all-environment'."
;; here, so that any code that cares about the difference will ;; here, so that any code that cares about the difference will
;; see the same transformation. ;; see the same transformation.
;; First arg is a function: ;; First arg is a function:
(`(,(and fun (or `funcall `apply `mapcar `mapatoms `mapconcat `mapc)) (`(,(and fun (or 'funcall 'apply 'mapcar 'mapatoms 'mapconcat 'mapc))
',(and f `(lambda . ,_)) . ,args) ',(and f `(lambda . ,_)) . ,args)
(macroexp--warn-and-return (macroexp--warn-and-return
(format "%s quoted with ' rather than with #'" (format "%s quoted with ' rather than with #'"
(list 'lambda (nth 1 f) '...)) (list 'lambda (nth 1 f) '...))
(macroexp--expand-all `(,fun ,f . ,args)))) (macroexp--expand-all `(,fun ,f . ,args))))
;; Second arg is a function: ;; Second arg is a function:
(`(,(and fun (or `sort)) ,arg1 ',(and f `(lambda . ,_)) . ,args) (`(,(and fun (or 'sort)) ,arg1 ',(and f `(lambda . ,_)) . ,args)
(macroexp--warn-and-return (macroexp--warn-and-return
(format "%s quoted with ' rather than with #'" (format "%s quoted with ' rather than with #'"
(list 'lambda (nth 1 f) '...)) (list 'lambda (nth 1 f) '...))
@ -406,7 +406,7 @@ cases where EXP is a constant."
"Bind each binding in BINDINGS as `macroexp-let2' does." "Bind each binding in BINDINGS as `macroexp-let2' does."
(declare (indent 2) (debug (sexp (&rest (sexp form)) body))) (declare (indent 2) (debug (sexp (&rest (sexp form)) body)))
(pcase-exhaustive bindings (pcase-exhaustive bindings
(`nil (macroexp-progn body)) ('nil (macroexp-progn body))
(`((,var ,exp) . ,tl) (`((,var ,exp) . ,tl)
`(macroexp-let2 ,test ,var ,exp `(macroexp-let2 ,test ,var ,exp
(macroexp-let2* ,test ,tl ,@body))))) (macroexp-let2* ,test ,tl ,@body)))))

4
lisp/emacs-lisp/map.el
View file

@ -331,8 +331,8 @@ MAP can be a list, hash-table or array."
TYPE can be one of the following symbols: list or hash-table. TYPE can be one of the following symbols: list or hash-table.
MAP can be a list, hash-table or array." MAP can be a list, hash-table or array."
(pcase type (pcase type
(`list (map-pairs map)) ('list (map-pairs map))
(`hash-table (map--into-hash-table map)) ('hash-table (map--into-hash-table map))
(_ (error "Not a map type name: %S" type)))) (_ (error "Not a map type name: %S" type))))
(defun map--put (map key v) (defun map--put (map key v)

4
lisp/emacs-lisp/package-x.el
View file

@ -202,8 +202,8 @@ if it exists."
(split-version (package-desc-version pkg-desc)) (split-version (package-desc-version pkg-desc))
(commentary (commentary
(pcase file-type (pcase file-type
(`single (lm-commentary)) ('single (lm-commentary))
(`tar nil))) ;; FIXME: Get it from the README file. ('tar nil))) ;; FIXME: Get it from the README file.
(extras (package-desc-extras pkg-desc)) (extras (package-desc-extras pkg-desc))
(pkg-version (package-version-join split-version)) (pkg-version (package-version-join split-version))
(pkg-buffer (current-buffer))) (pkg-buffer (current-buffer)))

14
lisp/emacs-lisp/package.el
View file

@ -496,9 +496,9 @@ This is, approximately, the inverse of `version-to-list'.
(defun package-desc-suffix (pkg-desc) (defun package-desc-suffix (pkg-desc)
(pcase (package-desc-kind pkg-desc) (pcase (package-desc-kind pkg-desc)
(`single ".el") ('single ".el")
(`tar ".tar") ('tar ".tar")
(`dir "") ('dir "")
(kind (error "Unknown package kind: %s" kind)))) (kind (error "Unknown package kind: %s" kind))))
(defun package-desc--keywords (pkg-desc) (defun package-desc--keywords (pkg-desc)
@ -846,7 +846,7 @@ untar into a directory named DIR; otherwise, signal an error."
(dirname (package-desc-full-name pkg-desc)) (dirname (package-desc-full-name pkg-desc))
(pkg-dir (expand-file-name dirname package-user-dir))) (pkg-dir (expand-file-name dirname package-user-dir)))
(pcase (package-desc-kind pkg-desc) (pcase (package-desc-kind pkg-desc)
(`dir ('dir
(make-directory pkg-dir t) (make-directory pkg-dir t)
(let ((file-list (let ((file-list
(directory-files (directory-files
@ -860,12 +860,12 @@ untar into a directory named DIR; otherwise, signal an error."
;; things simple by ensuring we're one of them. ;; things simple by ensuring we're one of them.
(setf (package-desc-kind pkg-desc) (setf (package-desc-kind pkg-desc)
(if (> (length file-list) 1) 'tar 'single)))) (if (> (length file-list) 1) 'tar 'single))))
(`tar ('tar
(make-directory package-user-dir t) (make-directory package-user-dir t)
;; FIXME: should we delete PKG-DIR if it exists? ;; FIXME: should we delete PKG-DIR if it exists?
(let* ((default-directory (file-name-as-directory package-user-dir))) (let* ((default-directory (file-name-as-directory package-user-dir)))
(package-untar-buffer dirname))) (package-untar-buffer dirname)))
(`single ('single
(let ((el-file (expand-file-name (format "%s.el" name) pkg-dir))) (let ((el-file (expand-file-name (format "%s.el" name) pkg-dir)))
(make-directory pkg-dir t) (make-directory pkg-dir t)
(package--write-file-no-coding el-file))) (package--write-file-no-coding el-file)))
@ -2494,7 +2494,7 @@ Otherwise no newline is inserted."
(easy-menu-define package-menu-mode-menu package-menu-mode-map (easy-menu-define package-menu-mode-menu package-menu-mode-map
"Menu for `package-menu-mode'." "Menu for `package-menu-mode'."
`("Package" '("Package"
["Describe Package" package-menu-describe-package :help "Display information about this package"] ["Describe Package" package-menu-describe-package :help "Display information about this package"]
["Help" package-menu-quick-help :help "Show short key binding help for package-menu-mode"] ["Help" package-menu-quick-help :help "Show short key binding help for package-menu-mode"]
"--" "--"

2
lisp/emacs-lisp/radix-tree.el
View file

@ -74,7 +74,7 @@
(cmp (compare-strings prefix nil nil key i ni))) (cmp (compare-strings prefix nil nil key i ni)))
(if (eq t cmp) (if (eq t cmp)
(pcase (radix-tree--remove ptree key ni) (pcase (radix-tree--remove ptree key ni)
(`nil rtree) ('nil rtree)
(`((,pprefix . ,pptree)) (`((,pprefix . ,pptree))
`((,(concat prefix pprefix) . ,pptree) . ,rtree)) `((,(concat prefix pprefix) . ,pptree) . ,rtree))
(nptree `((,prefix . ,nptree) . ,rtree))) (nptree `((,prefix . ,nptree) . ,rtree)))

10
lisp/emacs-lisp/smie.el
View file

@ -533,9 +533,9 @@ PREC2 is a table as returned by `smie-precs->prec2' or
(setq y (cons nil (cons nil nil))) (setq y (cons nil (cons nil nil)))
(push (cons (cdr k) y) table)) (push (cons (cdr k) y) table))
(pcase v (pcase v
(`= (push (cons x y) eqs)) ('= (push (cons x y) eqs))
(`< (push (cons x y) csts)) ('< (push (cons x y) csts))
(`> (push (cons y x) csts)) ('> (push (cons y x) csts))
(_ (error "SMIE error: prec2 has %S↦%S which ∉ {<,+,>}" (_ (error "SMIE error: prec2 has %S↦%S which ∉ {<,+,>}"
k v)))))) k v))))))
prec2) prec2)
@ -612,8 +612,8 @@ PREC2 is a table as returned by `smie-precs->prec2' or
(dolist (x (gethash :smie-open/close-alist prec2)) (dolist (x (gethash :smie-open/close-alist prec2))
(let* ((token (car x)) (let* ((token (car x))
(cons (pcase (cdr x) (cons (pcase (cdr x)
(`closer (cddr (assoc token table))) ('closer (cddr (assoc token table)))
(`opener (cdr (assoc token table)))))) ('opener (cdr (assoc token table))))))
;; `cons' can be nil for openers/closers which only contain ;; `cons' can be nil for openers/closers which only contain
;; "atomic" elements. ;; "atomic" elements.
(when cons (when cons

12
lisp/epa.el
View file

@ -597,12 +597,12 @@ If SECRET is non-nil, list secret keys instead of public keys."
(erase-buffer) (erase-buffer)
(insert (format (insert (format
(pcase (epg-context-operation context) (pcase (epg-context-operation context)
(`decrypt "Error while decrypting with \"%s\":") ('decrypt "Error while decrypting with \"%s\":")
(`verify "Error while verifying with \"%s\":") ('verify "Error while verifying with \"%s\":")
(`sign "Error while signing with \"%s\":") ('sign "Error while signing with \"%s\":")
(`encrypt "Error while encrypting with \"%s\":") ('encrypt "Error while encrypting with \"%s\":")
(`import-keys "Error while importing keys with \"%s\":") ('import-keys "Error while importing keys with \"%s\":")
(`export-keys "Error while exporting keys with \"%s\":") ('export-keys "Error while exporting keys with \"%s\":")
(_ "Error while executing \"%s\":\n\n")) (_ "Error while executing \"%s\":\n\n"))
(epg-context-program context)) (epg-context-program context))
"\n\n" "\n\n"

14
lisp/erc/erc-dcc.el
View file

@ -422,23 +422,23 @@ where FOO is one of CLOSE, GET, SEND, LIST, CHAT, etc."
(when (fboundp 'make-network-process) '("send")))) (when (fboundp 'make-network-process) '("send"))))
(pcomplete-here (pcomplete-here
(pcase (intern (downcase (pcomplete-arg 1))) (pcase (intern (downcase (pcomplete-arg 1)))
(`chat (mapcar (lambda (elt) (plist-get elt :nick)) ('chat (mapcar (lambda (elt) (plist-get elt :nick))
(erc-remove-if-not (erc-remove-if-not
#'(lambda (elt) #'(lambda (elt)
(eq (plist-get elt :type) 'CHAT)) (eq (plist-get elt :type) 'CHAT))
erc-dcc-list))) erc-dcc-list)))
(`close (erc-delete-dups ('close (erc-delete-dups
(mapcar (lambda (elt) (symbol-name (plist-get elt :type))) (mapcar (lambda (elt) (symbol-name (plist-get elt :type)))
erc-dcc-list))) erc-dcc-list)))
(`get (mapcar #'erc-dcc-nick ('get (mapcar #'erc-dcc-nick
(erc-remove-if-not (erc-remove-if-not
#'(lambda (elt) #'(lambda (elt)
(eq (plist-get elt :type) 'GET)) (eq (plist-get elt :type) 'GET))
erc-dcc-list))) erc-dcc-list)))
(`send (pcomplete-erc-all-nicks)))) ('send (pcomplete-erc-all-nicks))))
(pcomplete-here (pcomplete-here
(pcase (intern (downcase (pcomplete-arg 2))) (pcase (intern (downcase (pcomplete-arg 2)))
(`get (mapcar (lambda (elt) (plist-get elt :file)) ('get (mapcar (lambda (elt) (plist-get elt :file))
(erc-remove-if-not (erc-remove-if-not
#'(lambda (elt) #'(lambda (elt)
(and (eq (plist-get elt :type) 'GET) (and (eq (plist-get elt :type) 'GET)
@ -446,13 +446,13 @@ where FOO is one of CLOSE, GET, SEND, LIST, CHAT, etc."
(plist-get elt :nick)) (plist-get elt :nick))
(pcomplete-arg 1)))) (pcomplete-arg 1))))
erc-dcc-list))) erc-dcc-list)))
(`close (mapcar #'erc-dcc-nick ('close (mapcar #'erc-dcc-nick
(erc-remove-if-not (erc-remove-if-not
#'(lambda (elt) #'(lambda (elt)
(eq (plist-get elt :type) (eq (plist-get elt :type)
(intern (upcase (pcomplete-arg 1))))) (intern (upcase (pcomplete-arg 1)))))
erc-dcc-list))) erc-dcc-list)))
(`send (pcomplete-entries))))) ('send (pcomplete-entries)))))
(defun erc-dcc-do-CHAT-command (proc &optional nick) (defun erc-dcc-do-CHAT-command (proc &optional nick)
(when nick (when nick

12
lisp/erc/erc-track.el
View file

@ -929,14 +929,14 @@ relative to `erc-track-switch-direction'"
offset) offset)
(when (< arg 0) (when (< arg 0)
(setq dir (pcase dir (setq dir (pcase dir
(`oldest 'newest) ('oldest 'newest)
(`newest 'oldest) ('newest 'oldest)
(`mostactive 'leastactive) ('mostactive 'leastactive)
(`leastactive 'mostactive) ('leastactive 'mostactive)
(`importance 'oldest))) ('importance 'oldest)))
(setq arg (- arg))) (setq arg (- arg)))
(setq offset (pcase dir (setq offset (pcase dir
((or `oldest `leastactive) ((or 'oldest 'leastactive)
(- (length erc-modified-channels-alist) arg)) (- (length erc-modified-channels-alist) arg))
(_ (1- arg)))) (_ (1- arg))))
;; normalize out of range user input ;; normalize out of range user input

8
lisp/erc/erc.el
View file

@ -1943,15 +1943,15 @@ removed from the list will be disabled."
(defun erc-setup-buffer (buffer) (defun erc-setup-buffer (buffer)
"Consults `erc-join-buffer' to find out how to display `BUFFER'." "Consults `erc-join-buffer' to find out how to display `BUFFER'."
(pcase erc-join-buffer (pcase erc-join-buffer
(`window ('window
(if (active-minibuffer-window) (if (active-minibuffer-window)
(display-buffer buffer) (display-buffer buffer)
(switch-to-buffer-other-window buffer))) (switch-to-buffer-other-window buffer)))
(`window-noselect ('window-noselect
(display-buffer buffer)) (display-buffer buffer))
(`bury ('bury
nil) nil)
(`frame ('frame
(when (or (not erc-reuse-frames) (when (or (not erc-reuse-frames)
(not (get-buffer-window buffer t))) (not (get-buffer-window buffer t)))
(let ((frame (make-frame (or erc-frame-alist (let ((frame (make-frame (or erc-frame-alist

2
lisp/eshell/em-ls.el
View file

@ -346,7 +346,7 @@ instead."
"ls" (if eshell-ls-initial-args "ls" (if eshell-ls-initial-args
(list eshell-ls-initial-args args) (list eshell-ls-initial-args args)
args) args)
`((?a "all" nil show-all '((?a "all" nil show-all
"do not ignore entries starting with .") "do not ignore entries starting with .")
(?A "almost-all" nil show-almost-all (?A "almost-all" nil show-almost-all
"do not list implied . and ..") "do not list implied . and ..")

2
lisp/eshell/esh-cmd.el
View file

@ -816,7 +816,7 @@ This is used on systems where async subprocesses are not supported."
;; The last process in the pipe should get its handles ;; The last process in the pipe should get its handles
;; redirected as we found them before running the pipe. ;; redirected as we found them before running the pipe.
,(if (null (cdr pipeline)) ,(if (null (cdr pipeline))
`(progn '(progn
(setq eshell-current-handles tail-handles) (setq eshell-current-handles tail-handles)
(setq eshell-in-pipeline-p nil))) (setq eshell-in-pipeline-p nil)))
(let ((result ,(car pipeline))) (let ((result ,(car pipeline)))

18
lisp/files.el
View file

@ -1158,7 +1158,7 @@ consecutive checks. For example:
(file-attributes (file-chase-links file)))))))" (file-attributes (file-chase-links file)))))))"
:group 'files :group 'files
:version "24.1" :version "24.1"
:type `(choice :type '(choice
(const :tag "Do not inhibit file name cache" nil) (const :tag "Do not inhibit file name cache" nil)
(const :tag "Do not use file name cache" t) (const :tag "Do not use file name cache" t)
(integer :tag "Do not use file name cache" (integer :tag "Do not use file name cache"
@ -3837,13 +3837,13 @@ It is dangerous if either of these conditions are met:
If VAR is `mode', call `VAL-mode' as a function unless it's If VAR is `mode', call `VAL-mode' as a function unless it's
already the major mode." already the major mode."
(pcase var (pcase var
(`mode ('mode
(let ((mode (intern (concat (downcase (symbol-name val)) (let ((mode (intern (concat (downcase (symbol-name val))
"-mode")))) "-mode"))))
(unless (eq (indirect-function mode) (unless (eq (indirect-function mode)
(indirect-function major-mode)) (indirect-function major-mode))
(funcall mode)))) (funcall mode))))
(`eval ('eval
(pcase val (pcase val
(`(add-hook ',hook . ,_) (hack-one-local-variable--obsolete hook))) (`(add-hook ',hook . ,_) (hack-one-local-variable--obsolete hook)))
(save-excursion (eval val))) (save-excursion (eval val)))
@ -7168,18 +7168,18 @@ only these files will be asked to be saved."
(setcar pair (file-name-unquote (car pair) t)))) (setcar pair (file-name-unquote (car pair) t))))
(setq file-arg-indices (cdr file-arg-indices)))) (setq file-arg-indices (cdr file-arg-indices))))
(pcase method (pcase method
(`identity (car arguments)) ('identity (car arguments))
(`add (file-name-quote (apply operation arguments) t)) ('add (file-name-quote (apply operation arguments) t))
(`buffer-file-name ('buffer-file-name
(let ((buffer-file-name (file-name-unquote buffer-file-name t))) (let ((buffer-file-name (file-name-unquote buffer-file-name t)))
(apply operation arguments))) (apply operation arguments)))
(`insert-file-contents ('insert-file-contents
(let ((visit (nth 1 arguments))) (let ((visit (nth 1 arguments)))
(unwind-protect (unwind-protect
(apply operation arguments) (apply operation arguments)
(when (and visit buffer-file-name) (when (and visit buffer-file-name)
(setq buffer-file-name (file-name-quote buffer-file-name t)))))) (setq buffer-file-name (file-name-quote buffer-file-name t))))))
(`unquote-then-quote ('unquote-then-quote
;; We can't use `cl-letf' with `(buffer-local-value)' here ;; We can't use `cl-letf' with `(buffer-local-value)' here
;; because it wouldn't work during bootstrapping. ;; because it wouldn't work during bootstrapping.
(let ((buffer (current-buffer))) (let ((buffer (current-buffer)))
@ -7192,7 +7192,7 @@ only these files will be asked to be saved."
;; underlying operation. ;; underlying operation.
(with-current-buffer buffer (with-current-buffer buffer
(apply operation arguments)))))) (apply operation arguments))))))
(`local-copy ('local-copy
(let* ((file-name-handler-alist saved-file-name-handler-alist) (let* ((file-name-handler-alist saved-file-name-handler-alist)
(source (car arguments)) (source (car arguments))
(target (car (cdr arguments))) (target (car (cdr arguments)))

10
lisp/filesets.el
View file

@ -565,7 +565,7 @@ including directory trees to the menu can take a lot of memory."
:group 'filesets) :group 'filesets)
(defcustom filesets-commands (defcustom filesets-commands
`(("Isearch" '(("Isearch"
multi-isearch-files multi-isearch-files
(filesets-cmd-isearch-getargs)) (filesets-cmd-isearch-getargs))
("Isearch (regexp)" ("Isearch (regexp)"
@ -1286,10 +1286,10 @@ on-close-all ... Not used"
(filesets-get-external-viewer filename))))) (filesets-get-external-viewer filename)))))
(filesets-alist-get def (filesets-alist-get def
(pcase event (pcase event
(`on-open-all ':ignore-on-open-all) ('on-open-all ':ignore-on-open-all)
(`on-grep ':ignore-on-read-text) ('on-grep ':ignore-on-read-text)
(`on-cmd nil) ('on-cmd nil)
(`on-close-all nil)) ('on-close-all nil))
nil t))) nil t)))
(defun filesets-filetype-get-prop (property filename &optional entry) (defun filesets-filetype-get-prop (property filename &optional entry)

6
lisp/font-lock.el
View file

@ -926,9 +926,9 @@ The value of this variable is used when Font Lock mode is turned on."
(defun font-lock-turn-on-thing-lock () (defun font-lock-turn-on-thing-lock ()
(pcase (font-lock-value-in-major-mode font-lock-support-mode) (pcase (font-lock-value-in-major-mode font-lock-support-mode)
(`fast-lock-mode (fast-lock-mode t)) ('fast-lock-mode (fast-lock-mode t))
(`lazy-lock-mode (lazy-lock-mode t)) ('lazy-lock-mode (lazy-lock-mode t))
(`jit-lock-mode ('jit-lock-mode
;; Prepare for jit-lock ;; Prepare for jit-lock
(remove-hook 'after-change-functions (remove-hook 'after-change-functions
#'font-lock-after-change-function t) #'font-lock-after-change-function t)

14
lisp/frameset.el
View file

@ -675,7 +675,7 @@ nil while the filtering is done to restore it."
;; of a frameset, so we must copy parameters to avoid inadvertent ;; of a frameset, so we must copy parameters to avoid inadvertent
;; modifications. ;; modifications.
(pcase (cdr (assq (car current) filter-alist)) (pcase (cdr (assq (car current) filter-alist))
(`nil ('nil
(push (if saving current (copy-tree current)) filtered)) (push (if saving current (copy-tree current)) filtered))
(:never (:never
nil) nil)
@ -903,7 +903,7 @@ NOTE: This only works for non-iconified frames."
(< fr-right left) (> fr-right right) (< fr-right left) (> fr-right right)
(< fr-top top) (> fr-top bottom))) (< fr-top top) (> fr-top bottom)))
;; Displaced to the left, right, above or below the screen. ;; Displaced to the left, right, above or below the screen.
(`t (or (> fr-left right) ('t (or (> fr-left right)
(< fr-right left) (< fr-right left)
(> fr-top bottom) (> fr-top bottom)
(< fr-bottom top))) (< fr-bottom top)))
@ -1195,11 +1195,11 @@ All keyword parameters default to nil."
;; will decide which ones can be reused, and how to deal with any leftover. ;; will decide which ones can be reused, and how to deal with any leftover.
(frameset--reuse-list (frameset--reuse-list
(pcase reuse-frames (pcase reuse-frames
(`t ('t
frames) frames)
(`nil ('nil
nil) nil)
(`match ('match
(cl-loop for (state) in (frameset-states frameset) (cl-loop for (state) in (frameset-states frameset)
when (frameset-frame-with-id (frameset-cfg-id state) frames) when (frameset-frame-with-id (frameset-cfg-id state) frames)
collect it)) collect it))
@ -1364,11 +1364,11 @@ Called from `jump-to-register'. Internal use only."
;; iconify frames ;; iconify frames
(lambda (frame action) (lambda (frame action)
(pcase action (pcase action
(`rejected (iconify-frame frame)) ('rejected (iconify-frame frame))
;; In the unexpected case that a frame was a candidate ;; In the unexpected case that a frame was a candidate
;; (matching frame id) and yet not restored, remove it ;; (matching frame id) and yet not restored, remove it
;; because it is in fact a duplicate. ;; because it is in fact a duplicate.
(`ignored (delete-frame frame)))))) ('ignored (delete-frame frame))))))
;; Restore selected frame, buffer and point. ;; Restore selected frame, buffer and point.
(let ((frame (frameset-frame-with-id (aref data 1))) (let ((frame (frameset-frame-with-id (aref data 1)))

4
lisp/gnus/gnus-agent.el
View file

@ -2600,11 +2600,11 @@ General format specifiers can also be used. See Info node
(defvar gnus-tmp-groups) (defvar gnus-tmp-groups)
(defvar gnus-category-line-format-alist (defvar gnus-category-line-format-alist
`((?c gnus-tmp-name ?s) '((?c gnus-tmp-name ?s)
(?g gnus-tmp-groups ?d))) (?g gnus-tmp-groups ?d)))
(defvar gnus-category-mode-line-format-alist (defvar gnus-category-mode-line-format-alist
`((?u user-defined ?s))) '((?u user-defined ?s)))
(defvar gnus-category-line-format-spec nil) (defvar gnus-category-line-format-spec nil)
(defvar gnus-category-mode-line-format-spec nil) (defvar gnus-category-mode-line-format-spec nil)

4
lisp/gnus/gnus-art.el
View file

@ -278,7 +278,7 @@ This can also be a list of the above values."
"String or function to be executed to display an X-Face header. "String or function to be executed to display an X-Face header.
If it is a string, the command will be executed in a sub-shell If it is a string, the command will be executed in a sub-shell
asynchronously. The compressed face will be piped to this command." asynchronously. The compressed face will be piped to this command."
:type `(choice string :type '(choice string
(function-item gnus-display-x-face-in-from) (function-item gnus-display-x-face-in-from)
function) function)
:version "21.1" :version "21.1"
@ -5155,7 +5155,7 @@ Deleting parts may malfunction or destroy the article; continue? "))
"`----\n")) "`----\n"))
(setcdr data (setcdr data
(cdr (mm-make-handle (cdr (mm-make-handle
nil `("text/plain" (charset . gnus-decoded)) nil nil nil '("text/plain" (charset . gnus-decoded)) nil nil
(list "attachment") (list "attachment")
(format "Deleted attachment (%s bytes)" bsize)))))) (format "Deleted attachment (%s bytes)" bsize))))))
;; (set-buffer gnus-summary-buffer) ;; (set-buffer gnus-summary-buffer)

6
lisp/gnus/gnus-cite.el
View file

@ -340,7 +340,7 @@ in a boring face, then the pages will be skipped."
;; TAG: Is a Supercite tag, if any. ;; TAG: Is a Supercite tag, if any.
(defvar gnus-cited-opened-text-button-line-format-alist (defvar gnus-cited-opened-text-button-line-format-alist
`((?b (marker-position beg) ?d) '((?b (marker-position beg) ?d)
(?e (marker-position end) ?d) (?e (marker-position end) ?d)
(?n (count-lines beg end) ?d) (?n (count-lines beg end) ?d)
(?l (- end beg) ?d))) (?l (- end beg) ?d)))
@ -625,7 +625,7 @@ always hide."
(point) (point)
(progn (eval gnus-cited-closed-text-button-line-format-spec) (progn (eval gnus-cited-closed-text-button-line-format-spec)
(point)) (point))
`gnus-article-toggle-cited-text 'gnus-article-toggle-cited-text
(list (cons beg end) start)) (list (cons beg end) start))
(point)) (point))
'article-type 'annotation) 'article-type 'annotation)
@ -675,7 +675,7 @@ means show, nil means toggle."
gnus-cited-opened-text-button-line-format-spec gnus-cited-opened-text-button-line-format-spec
gnus-cited-closed-text-button-line-format-spec)) gnus-cited-closed-text-button-line-format-spec))
(point)) (point))
`gnus-article-toggle-cited-text 'gnus-article-toggle-cited-text
args) args)
(point)) (point))
'article-type 'annotation))))) 'article-type 'annotation)))))

8
lisp/gnus/gnus-group.el
View file

@ -496,7 +496,7 @@ simple manner."
(defvar gnus-tmp-number-of-unread) (defvar gnus-tmp-number-of-unread)
(defvar gnus-group-line-format-alist (defvar gnus-group-line-format-alist
`((?M gnus-tmp-marked-mark ?c) '((?M gnus-tmp-marked-mark ?c)
(?S gnus-tmp-subscribed ?c) (?S gnus-tmp-subscribed ?c)
(?L gnus-tmp-level ?d) (?L gnus-tmp-level ?d)
(?N (cond ((eq number t) "*" ) (?N (cond ((eq number t) "*" )
@ -544,7 +544,7 @@ simple manner."
)) ))
(defvar gnus-group-mode-line-format-alist (defvar gnus-group-mode-line-format-alist
`((?S gnus-tmp-news-server ?s) '((?S gnus-tmp-news-server ?s)
(?M gnus-tmp-news-method ?s) (?M gnus-tmp-news-method ?s)
(?u gnus-tmp-user-defined ?s) (?u gnus-tmp-user-defined ?s)
(?: gnus-tmp-colon ?s))) (?: gnus-tmp-colon ?s)))
@ -780,7 +780,7 @@ simple manner."
(easy-menu-define (easy-menu-define
gnus-group-reading-menu gnus-group-mode-map "" gnus-group-reading-menu gnus-group-mode-map ""
`("Group" '("Group"
["Read" gnus-group-read-group ["Read" gnus-group-read-group
:included (not (gnus-topic-mode-p)) :included (not (gnus-topic-mode-p))
:active (gnus-group-group-name)] :active (gnus-group-group-name)]
@ -947,7 +947,7 @@ simple manner."
(easy-menu-define (easy-menu-define
gnus-group-misc-menu gnus-group-mode-map "" gnus-group-misc-menu gnus-group-mode-map ""
`("Gnus" '("Gnus"
["Send a mail" gnus-group-mail t] ["Send a mail" gnus-group-mail t]
["Send a message (mail or news)" gnus-group-post-news t] ["Send a message (mail or news)" gnus-group-post-news t]
["Create a local message" gnus-group-news t] ["Create a local message" gnus-group-news t]

2
lisp/gnus/gnus-msg.el
View file

@ -1542,7 +1542,7 @@ If YANK is non-nil, include the original article."
(X-Debbugs-Version (X-Debbugs-Version
. ,(format "%s" (gnus-continuum-version)))))) . ,(format "%s" (gnus-continuum-version))))))
(when gnus-bug-create-help-buffer (when gnus-bug-create-help-buffer
(push `(gnus-bug-kill-buffer) message-send-actions)) (push '(gnus-bug-kill-buffer) message-send-actions))
(goto-char (point-min)) (goto-char (point-min))
(message-goto-body) (message-goto-body)
(insert "\n\n\n\n\n") (insert "\n\n\n\n\n")

2
lisp/gnus/gnus-salt.el
View file

@ -406,7 +406,7 @@ Two predefined functions are available:
(defvar gnus-tmp-subject) (defvar gnus-tmp-subject)
(defvar gnus-tree-line-format-alist (defvar gnus-tree-line-format-alist
`((?n gnus-tmp-name ?s) '((?n gnus-tmp-name ?s)
(?f gnus-tmp-from ?s) (?f gnus-tmp-from ?s)
(?N gnus-tmp-number ?d) (?N gnus-tmp-number ?d)
(?\[ gnus-tmp-open-bracket ?c) (?\[ gnus-tmp-open-bracket ?c)

8
lisp/gnus/gnus-srvr.el
View file

@ -87,7 +87,7 @@ If nil, a faster, but more primitive, buffer is used instead."
(defvar gnus-inserted-opened-servers nil) (defvar gnus-inserted-opened-servers nil)
(defvar gnus-server-line-format-alist (defvar gnus-server-line-format-alist
`((?h gnus-tmp-how ?s) '((?h gnus-tmp-how ?s)
(?n gnus-tmp-name ?s) (?n gnus-tmp-name ?s)
(?w gnus-tmp-where ?s) (?w gnus-tmp-where ?s)
(?s gnus-tmp-status ?s) (?s gnus-tmp-status ?s)
@ -95,7 +95,7 @@ If nil, a faster, but more primitive, buffer is used instead."
(?c gnus-tmp-cloud ?s))) (?c gnus-tmp-cloud ?s)))
(defvar gnus-server-mode-line-format-alist (defvar gnus-server-mode-line-format-alist
`((?S gnus-tmp-news-server ?s) '((?S gnus-tmp-news-server ?s)
(?M gnus-tmp-news-method ?s) (?M gnus-tmp-news-method ?s)
(?u gnus-tmp-user-defined ?s))) (?u gnus-tmp-user-defined ?s)))
@ -626,8 +626,8 @@ The following commands are available:
(let ((info (gnus-server-to-method server))) (let ((info (gnus-server-to-method server)))
(gnus-edit-form (gnus-edit-form
info "Showing the server." info "Showing the server."
`(lambda (form) (lambda (form)
(gnus-server-position-point)) (gnus-server-position-point))
'edit-server))) 'edit-server)))
(defun gnus-server-scan-server (server) (defun gnus-server-scan-server (server)

8
lisp/gnus/gnus-sum.el
View file

@ -1430,12 +1430,12 @@ These are paired with what variables they correspond with, along with
the type of the variable (string, integer, character, etc).") the type of the variable (string, integer, character, etc).")
(defvar gnus-summary-dummy-line-format-alist (defvar gnus-summary-dummy-line-format-alist
`((?S gnus-tmp-subject ?s) '((?S gnus-tmp-subject ?s)
(?N gnus-tmp-number ?d) (?N gnus-tmp-number ?d)
(?u gnus-tmp-user-defined ?s))) (?u gnus-tmp-user-defined ?s)))
(defvar gnus-summary-mode-line-format-alist (defvar gnus-summary-mode-line-format-alist
`((?G gnus-tmp-group-name ?s) '((?G gnus-tmp-group-name ?s)
(?g (gnus-short-group-name gnus-tmp-group-name) ?s) (?g (gnus-short-group-name gnus-tmp-group-name) ?s)
(?p (gnus-group-real-name gnus-tmp-group-name) ?s) (?p (gnus-group-real-name gnus-tmp-group-name) ?s)
(?A gnus-tmp-article-number ?d) (?A gnus-tmp-article-number ?d)
@ -2602,7 +2602,7 @@ gnus-summary-show-article-from-menu-as-charset-%s" cs))))
(easy-menu-define (easy-menu-define
gnus-summary-post-menu gnus-summary-mode-map "" gnus-summary-post-menu gnus-summary-mode-map ""
`("Post" '("Post"
["Send a message (mail or news)" gnus-summary-post-news ["Send a message (mail or news)" gnus-summary-post-news
:help "Compose a new message (mail or news)"] :help "Compose a new message (mail or news)"]
["Followup" gnus-summary-followup ["Followup" gnus-summary-followup
@ -2663,7 +2663,7 @@ gnus-summary-show-article-from-menu-as-charset-%s" cs))))
(easy-menu-define (easy-menu-define
gnus-summary-misc-menu gnus-summary-mode-map "" gnus-summary-misc-menu gnus-summary-mode-map ""
`("Gnus" '("Gnus"
("Mark Read" ("Mark Read"
["Mark as read" gnus-summary-mark-as-read-forward t] ["Mark as read" gnus-summary-mark-as-read-forward t]
["Mark same subject and select" ["Mark same subject and select"

2
lisp/gnus/gnus-topic.el
View file

@ -85,7 +85,7 @@ See Info node `(gnus)Formatting Variables'."
(defvar gnus-topic-inhibit-change-level nil) (defvar gnus-topic-inhibit-change-level nil)
(defconst gnus-topic-line-format-alist (defconst gnus-topic-line-format-alist
`((?n name ?s) '((?n name ?s)
(?v visible ?s) (?v visible ?s)
(?i indentation ?s) (?i indentation ?s)
(?g number-of-groups ?d) (?g number-of-groups ?d)

2
lisp/gnus/gnus-util.el
View file

@ -40,7 +40,7 @@
"Function use to do completing read." "Function use to do completing read."
:version "24.1" :version "24.1"
:group 'gnus-meta :group 'gnus-meta
:type `(radio (function-item :type '(radio (function-item
:doc "Use Emacs standard `completing-read' function." :doc "Use Emacs standard `completing-read' function."
gnus-emacs-completing-read) gnus-emacs-completing-read)
(function-item (function-item

2
lisp/gnus/gnus.el
View file

@ -2770,7 +2770,7 @@ See Info node `(gnus)Formatting Variables'."
(defun gnus-suppress-keymap (keymap) (defun gnus-suppress-keymap (keymap)
(suppress-keymap keymap) (suppress-keymap keymap)
(let ((keys `([delete] "\177" "\M-u"))) ;[mouse-2] (let ((keys '([delete] "\177" "\M-u"))) ;[mouse-2]
(while keys (while keys
(define-key keymap (pop keys) 'undefined)))) (define-key keymap (pop keys) 'undefined))))

8
lisp/gnus/message.el
View file

@ -1853,7 +1853,7 @@ You must have the \"hashcash\" binary installed, see `hashcash-path'."
"Alist of header names/filler functions.") "Alist of header names/filler functions.")
(defvar message-header-format-alist (defvar message-header-format-alist
`((From) '((From)
(Newsgroups) (Newsgroups)
(To) (To)
(Cc) (Cc)
@ -2716,7 +2716,7 @@ systematically send encrypted emails when possible."
(easy-menu-define (easy-menu-define
message-mode-menu message-mode-map "Message Menu." message-mode-menu message-mode-map "Message Menu."
`("Message" '("Message"
["Yank Original" message-yank-original message-reply-buffer] ["Yank Original" message-yank-original message-reply-buffer]
["Fill Yanked Message" message-fill-yanked-message t] ["Fill Yanked Message" message-fill-yanked-message t]
["Insert Signature" message-insert-signature t] ["Insert Signature" message-insert-signature t]
@ -2750,7 +2750,7 @@ systematically send encrypted emails when possible."
(easy-menu-define (easy-menu-define
message-mode-field-menu message-mode-map "" message-mode-field-menu message-mode-map ""
`("Field" '("Field"
["To" message-goto-to t] ["To" message-goto-to t]
["From" message-goto-from t] ["From" message-goto-from t]
["Subject" message-goto-subject t] ["Subject" message-goto-subject t]
@ -7459,7 +7459,7 @@ Optional DIGEST will use digest to forward."
;; Consider there is no illegible text. ;; Consider there is no illegible text.
(add-text-properties (add-text-properties
b (point) b (point)
`(no-illegible-text t rear-nonsticky t start-open t)))) '(no-illegible-text t rear-nonsticky t start-open t))))
(defun message-forward-make-body-mml (forward-buffer) (defun message-forward-make-body-mml (forward-buffer)
(insert "\n\n<#mml type=message/rfc822 disposition=inline>\n") (insert "\n\n<#mml type=message/rfc822 disposition=inline>\n")

2
lisp/gnus/mm-util.el
View file

@ -241,7 +241,7 @@ superset of iso-8859-1."
(widget-convert (widget-convert
'list 'list
`(set :inline t :format "%v" ,@(nreverse rest)) `(set :inline t :format "%v" ,@(nreverse rest))
`(repeat :inline t :tag "Other options" '(repeat :inline t :tag "Other options"
(cons :format "%v" (cons :format "%v"
(symbol :size 3 :format "(%v") (symbol :size 3 :format "(%v")
(symbol :size 3 :format " . %v)\n"))))))) (symbol :size 3 :format " . %v)\n")))))))

2
lisp/gnus/mml.el
View file

@ -1152,7 +1152,7 @@ If HANDLES is non-nil, use it instead reparsing the buffer."
(easy-menu-define (easy-menu-define
mml-menu mml-mode-map "" mml-menu mml-mode-map ""
`("Attachments" '("Attachments"
["Attach File..." mml-attach-file :help "Attach a file at point"] ["Attach File..." mml-attach-file :help "Attach a file at point"]
["Attach Buffer..." mml-attach-buffer ["Attach Buffer..." mml-attach-buffer
:help "Attach a buffer to the outgoing message"] :help "Attach a buffer to the outgoing message"]

2
lisp/gnus/nnheader.el
View file

@ -408,7 +408,7 @@ on your system, you could say something like:
`(let ((id (nnheader-nov-field))) `(let ((id (nnheader-nov-field)))
(if (string-match "^<[^>]+>$" id) (if (string-match "^<[^>]+>$" id)
,(if nnheader-uniquify-message-id ,(if nnheader-uniquify-message-id
`(if (string-match "__[^@]+@" id) '(if (string-match "__[^@]+@" id)
(concat (substring id 0 (match-beginning 0)) (concat (substring id 0 (match-beginning 0))
(substring id (1- (match-end 0)))) (substring id (1- (match-end 0))))
id) id)

4
lisp/gnus/nnimap.el
View file

@ -1203,8 +1203,8 @@ If LIMIT, first try to limit the search to the N last articles."
;; We don't really care about the article number, because ;; We don't really care about the article number, because
;; that's determined by the IMAP server later. So just ;; that's determined by the IMAP server later. So just
;; return the group name. ;; return the group name.
`(lambda (group) (lambda (group)
(list (list group))))))) (list (list group)))))))
(setq group (nnimap-decode-gnus-group group)) (setq group (nnimap-decode-gnus-group group))
(when (nnimap-change-group nil server) (when (nnimap-change-group nil server)
(nnmail-check-syntax) (nnmail-check-syntax)

2
lisp/gnus/nnmairix.el
View file

@ -1774,7 +1774,7 @@ If VERSION is a string: must be contained in mairix version output."
(setq versionstring (setq versionstring
(let* ((commandsplit (split-string nnmairix-mairix-command)) (let* ((commandsplit (split-string nnmairix-mairix-command))
(args (append (list (car commandsplit)) (args (append (list (car commandsplit))
`(nil t nil) (cdr commandsplit) '("-V")))) '(nil t nil) (cdr commandsplit) '("-V"))))
(apply 'call-process args) (apply 'call-process args)
(goto-char (point-min)) (goto-char (point-min))
(re-search-forward "mairix.*") (re-search-forward "mairix.*")

8
lisp/gnus/spam.el
View file

@ -2137,7 +2137,7 @@ See `spam-ifile-database'."
(apply 'call-process-region (apply 'call-process-region
(point-min) (point-max) spam-ifile-program (point-min) (point-max) spam-ifile-program
nil temp-buffer-name nil "-c" nil temp-buffer-name nil "-c"
(if db-param `(,db-param "-q") `("-q")))) (if db-param `(,db-param "-q") '("-q"))))
;; check the return now (we're back in the temp buffer) ;; check the return now (we're back in the temp buffer)
(goto-char (point-min)) (goto-char (point-min))
(if (not (eobp)) (if (not (eobp))
@ -2166,7 +2166,7 @@ Uses `gnus-newsgroup-name' if category is nil (for ham registration)."
(point-min) (point-max) spam-ifile-program (point-min) (point-max) spam-ifile-program
nil nil nil nil nil nil
add-or-delete-option category add-or-delete-option category
(if db `(,db "-h") `("-h")))))) (if db `(,db "-h") '("-h"))))))
(defun spam-ifile-register-spam-routine (articles &optional unregister) (defun spam-ifile-register-spam-routine (articles &optional unregister)
(spam-ifile-register-with-ifile articles spam-ifile-spam-category unregister)) (spam-ifile-register-with-ifile articles spam-ifile-spam-category unregister))
@ -2473,7 +2473,7 @@ With a non-nil REMOVE, remove the ADDRESSES."
(point-min) (point-max) (point-min) (point-max)
spam-bogofilter-program spam-bogofilter-program
nil temp-buffer-name nil nil temp-buffer-name nil
(if db `("-d" ,db "-v") `("-v")))) (if db `("-d" ,db "-v") '("-v"))))
(setq return (spam-check-bogofilter-headers score)))) (setq return (spam-check-bogofilter-headers score))))
return) return)
(gnus-error 5 "`spam.el' doesn't support obsolete bogofilter versions"))) (gnus-error 5 "`spam.el' doesn't support obsolete bogofilter versions")))
@ -2501,7 +2501,7 @@ With a non-nil REMOVE, remove the ADDRESSES."
(point-min) (point-max) (point-min) (point-max)
spam-bogofilter-program spam-bogofilter-program
nil nil nil switch nil nil nil switch
(if db `("-d" ,db "-v") `("-v"))))))) (if db `("-d" ,db "-v") '("-v")))))))
(gnus-error 5 "`spam.el' doesn't support obsolete bogofilter versions"))) (gnus-error 5 "`spam.el' doesn't support obsolete bogofilter versions")))
(defun spam-bogofilter-register-spam-routine (articles &optional unregister) (defun spam-bogofilter-register-spam-routine (articles &optional unregister)

2
lisp/hexl.el
View file

@ -1089,7 +1089,7 @@ This function is assumed to be used as callback function for `hl-line-mode'."
;; startup stuff. ;; startup stuff.
(easy-menu-define hexl-menu hexl-mode-map "Hexl Mode menu" (easy-menu-define hexl-menu hexl-mode-map "Hexl Mode menu"
`("Hexl" '("Hexl"
:help "Hexl-specific Features" :help "Hexl-specific Features"
["Backward short" hexl-backward-short ["Backward short" hexl-backward-short

2
lisp/hi-lock.el
View file

@ -559,7 +559,7 @@ then remove all hi-lock highlighting."
(x-popup-menu (x-popup-menu
t t
(cons (cons
`keymap 'keymap
(cons "Select Pattern to Unhighlight" (cons "Select Pattern to Unhighlight"
(mapcar (lambda (pattern) (mapcar (lambda (pattern)
(list (car pattern) (list (car pattern)

18
lisp/ibuf-ext.el
View file

@ -723,7 +723,7 @@ specification, with the same structure as an element of the list
(not (not
(not (not
(pcase (car filter) (pcase (car filter)
(`or ('or
;;; ATTN: Short-circuiting alternative with parallel structure w/`and ;;; ATTN: Short-circuiting alternative with parallel structure w/`and
;;(catch 'has-match ;;(catch 'has-match
;; (dolist (filter-spec (cdr filter) nil) ;; (dolist (filter-spec (cdr filter) nil)
@ -732,12 +732,12 @@ specification, with the same structure as an element of the list
(memq t (mapcar #'(lambda (x) (memq t (mapcar #'(lambda (x)
(ibuffer-included-in-filter-p buf x)) (ibuffer-included-in-filter-p buf x))
(cdr filter)))) (cdr filter))))
(`and ('and
(catch 'no-match (catch 'no-match
(dolist (filter-spec (cdr filter) t) (dolist (filter-spec (cdr filter) t)
(unless (ibuffer-included-in-filter-p buf filter-spec) (unless (ibuffer-included-in-filter-p buf filter-spec)
(throw 'no-match nil))))) (throw 'no-match nil)))))
(`saved ('saved
(let ((data (assoc (cdr filter) ibuffer-saved-filters))) (let ((data (assoc (cdr filter) ibuffer-saved-filters)))
(unless data (unless data
(ibuffer-filter-disable t) (ibuffer-filter-disable t)
@ -1051,14 +1051,14 @@ turned into separate filters, like [name: foo] and [mode: bar-mode]."
(tail (cdr filters)) (tail (cdr filters))
(value (value
(pcase (caar filters) (pcase (caar filters)
((or `or 'and) (nconc head tail)) ((or 'or 'and) (nconc head tail))
(`saved ('saved
(let ((data (assoc head ibuffer-saved-filters))) (let ((data (assoc head ibuffer-saved-filters)))
(unless data (unless data
(ibuffer-filter-disable) (ibuffer-filter-disable)
(error "Unknown saved filter %s" head)) (error "Unknown saved filter %s" head))
(append (cdr data) tail))) (append (cdr data) tail)))
(`not (cons (ibuffer-unary-operand (car filters)) tail)) ('not (cons (ibuffer-unary-operand (car filters)) tail))
(_ (_
(error "Filter type %s is not compound" (caar filters)))))) (error "Filter type %s is not compound" (caar filters))))))
(setq ibuffer-filtering-qualifiers value)) (setq ibuffer-filtering-qualifiers value))
@ -1197,12 +1197,12 @@ Interactively, prompt for NAME, and use the current filters."
(defun ibuffer-format-qualifier-1 (qualifier) (defun ibuffer-format-qualifier-1 (qualifier)
(pcase (car qualifier) (pcase (car qualifier)
(`saved ('saved
(concat " [filter: " (cdr qualifier) "]")) (concat " [filter: " (cdr qualifier) "]"))
(`or ('or
(concat " [OR" (mapconcat #'ibuffer-format-qualifier (concat " [OR" (mapconcat #'ibuffer-format-qualifier
(cdr qualifier) "") "]")) (cdr qualifier) "") "]"))
(`and ('and
(concat " [AND" (mapconcat #'ibuffer-format-qualifier (concat " [AND" (mapconcat #'ibuffer-format-qualifier
(cdr qualifier) "") "]")) (cdr qualifier) "") "]"))
(_ (_

12
lisp/ibuffer.el
View file

@ -150,7 +150,7 @@ elisp byte-compiler."
:group 'ibuffer) :group 'ibuffer)
(defcustom ibuffer-fontification-alist (defcustom ibuffer-fontification-alist
`((10 buffer-read-only font-lock-constant-face) '((10 buffer-read-only font-lock-constant-face)
(15 (and buffer-file-name (15 (and buffer-file-name
(string-match ibuffer-compressed-file-name-regexp (string-match ibuffer-compressed-file-name-regexp
buffer-file-name)) buffer-file-name))
@ -1613,8 +1613,8 @@ If point is on a group name, this function operates on that group."
`(truncate-string-to-width ,strvar ,maxvar nil ?\s))) `(truncate-string-to-width ,strvar ,maxvar nil ?\s)))
(defun ibuffer-compile-make-format-form (strvar widthform alignment) (defun ibuffer-compile-make-format-form (strvar widthform alignment)
(let* ((left `(make-string tmp2 ?\s)) (let* ((left '(make-string tmp2 ?\s))
(right `(make-string (- tmp1 tmp2) ?\s))) (right '(make-string (- tmp1 tmp2) ?\s)))
`(progn `(progn
(setq tmp1 ,widthform (setq tmp1 ,widthform
tmp2 (/ tmp1 2)) tmp2 (/ tmp1 2))
@ -1737,7 +1737,7 @@ If point is on a group name, this function operates on that group."
outforms) outforms)
(push `(setq str ,callform (push `(setq str ,callform
,@(when strlen-used ,@(when strlen-used
`(strlen (string-width str)))) '(strlen (string-width str))))
outforms) outforms)
(setq outforms (setq outforms
(append outforms (append outforms
@ -2205,7 +2205,7 @@ the value of point at the beginning of the line for that buffer."
strname strname
(propertize strname 'mouse-face 'highlight 'keymap hmap))) (propertize strname 'mouse-face 'highlight 'keymap hmap)))
strname))))) strname)))))
(add-text-properties opos (point) `(ibuffer-title-header t)) (add-text-properties opos (point) '(ibuffer-title-header t))
(insert "\n") (insert "\n")
;; Add the underlines ;; Add the underlines
(let ((str (save-excursion (let ((str (save-excursion
@ -2255,7 +2255,7 @@ the value of point at the beginning of the line for that buffer."
align) align)
summary)))))) summary))))))
(point)) (point))
`(ibuffer-summary t))))) '(ibuffer-summary t)))))
(defun ibuffer-redisplay (&optional silent) (defun ibuffer-redisplay (&optional silent)

42
lisp/ido.el
View file

@ -1688,27 +1688,27 @@ is enabled then some keybindings are changed in the keymap."
(when viper-p (when viper-p
(define-key map [remap viper-intercept-ESC-key] 'ignore)) (define-key map [remap viper-intercept-ESC-key] 'ignore))
(pcase ido-cur-item (pcase ido-cur-item
((or `file `dir) ((or 'file 'dir)
(when ido-context-switch-command (when ido-context-switch-command
(define-key map "\C-x\C-b" ido-context-switch-command) (define-key map "\C-x\C-b" ido-context-switch-command)
(define-key map "\C-x\C-d" 'ignore)) (define-key map "\C-x\C-d" 'ignore))
(when viper-p (when viper-p
(define-key map [remap viper-backward-char] (define-key map [remap viper-backward-char]
'ido-delete-backward-updir) 'ido-delete-backward-updir)
(define-key map [remap viper-del-backward-char-in-insert] (define-key map [remap viper-del-backward-char-in-insert]
'ido-delete-backward-updir) 'ido-delete-backward-updir)
(define-key map [remap viper-delete-backward-word] (define-key map [remap viper-delete-backward-word]
'ido-delete-backward-word-updir)) 'ido-delete-backward-word-updir))
(set-keymap-parent map (set-keymap-parent map
(if (eq ido-cur-item 'file) (if (eq ido-cur-item 'file)
ido-file-completion-map ido-file-completion-map
ido-file-dir-completion-map))) ido-file-dir-completion-map)))
(`buffer ('buffer
(when ido-context-switch-command (when ido-context-switch-command
(define-key map "\C-x\C-f" ido-context-switch-command)) (define-key map "\C-x\C-f" ido-context-switch-command))
(set-keymap-parent map ido-buffer-completion-map)) (set-keymap-parent map ido-buffer-completion-map))
(_ (_
(set-keymap-parent map ido-common-completion-map))) (set-keymap-parent map ido-common-completion-map)))
(setq ido-completion-map map))) (setq ido-completion-map map)))
(defun ido-final-slash (dir &optional fix-it) (defun ido-final-slash (dir &optional fix-it)

2
lisp/info.el
View file

@ -2734,7 +2734,7 @@ Because of ambiguities, this should be concatenated with something like
(user-error "No menu in this node")) (user-error "No menu in this node"))
(cond (cond
((eq (car-safe action) 'boundaries) nil) ((eq (car-safe action) 'boundaries) nil)
((eq action 'metadata) `(metadata (category . info-menu))) ((eq action 'metadata) '(metadata (category . info-menu)))
((eq action 'lambda) ((eq action 'lambda)
(re-search-forward (re-search-forward
(concat "\n\\* +" (regexp-quote string) ":") nil t)) (concat "\n\\* +" (regexp-quote string) ":") nil t))

4
lisp/international/mule-cmds.el
View file

@ -1330,7 +1330,7 @@ This is the input method activated automatically by the command
`toggle-input-method' (\\[toggle-input-method])." `toggle-input-method' (\\[toggle-input-method])."
:link '(custom-manual "(emacs)Input Methods") :link '(custom-manual "(emacs)Input Methods")
:group 'mule :group 'mule
:type `(choice (const nil) :type '(choice (const nil)
mule-input-method-string) mule-input-method-string)
:set-after '(current-language-environment)) :set-after '(current-language-environment))
@ -1943,7 +1943,7 @@ See `set-language-info-alist' for use in programs."
(set-language-info-alist (car elt) (cdr elt))) (set-language-info-alist (car elt) (cdr elt)))
;; re-set the environment in case its parameters changed ;; re-set the environment in case its parameters changed
(set-language-environment current-language-environment))) (set-language-environment current-language-environment)))
:type `(alist :type '(alist
:key-type (string :tag "Language environment" :key-type (string :tag "Language environment"
:completions :completions
(lambda (string pred action) (lambda (string pred action)

20
lisp/international/mule-util.el
View file

@ -393,17 +393,17 @@ QUALITY can be:
japanese-cp932 korean-cp949))) japanese-cp932 korean-cp949)))
(setq type 'single-byte)) (setq type 'single-byte))
(pcase type (pcase type
(`utf-8 ('utf-8
(when (coding-system-get coding-system :bom) (when (coding-system-get coding-system :bom)
(setq byte (max 0 (- byte 3)))) (setq byte (max 0 (- byte 3))))
(if (= eol 1) (if (= eol 1)
(filepos-to-bufferpos--dos (+ pm byte) #'byte-to-position) (filepos-to-bufferpos--dos (+ pm byte) #'byte-to-position)
(byte-to-position (+ pm byte)))) (byte-to-position (+ pm byte))))
(`single-byte ('single-byte
(if (= eol 1) (if (= eol 1)
(filepos-to-bufferpos--dos (+ pm byte) #'identity) (filepos-to-bufferpos--dos (+ pm byte) #'identity)
(+ pm byte))) (+ pm byte)))
((and `utf-16 ((and 'utf-16
;; FIXME: For utf-16, we could use the same approach as used for ;; FIXME: For utf-16, we could use the same approach as used for
;; dos EOLs (counting the number of non-BMP chars instead of the ;; dos EOLs (counting the number of non-BMP chars instead of the
;; number of lines). ;; number of lines).
@ -419,8 +419,8 @@ QUALITY can be:
(+ pm byte))) (+ pm byte)))
(_ (_
(pcase quality (pcase quality
(`approximate (byte-to-position (+ pm byte))) ('approximate (byte-to-position (+ pm byte)))
(`exact ('exact
;; Rather than assume that the file exists and still holds the right ;; Rather than assume that the file exists and still holds the right
;; data, we reconstruct it based on the buffer's content. ;; data, we reconstruct it based on the buffer's content.
(let ((buf (current-buffer))) (let ((buf (current-buffer)))
@ -470,7 +470,7 @@ QUALITY can be:
japanese-cp932 korean-cp949))) japanese-cp932 korean-cp949)))
(setq type 'single-byte)) (setq type 'single-byte))
(pcase type (pcase type
(`utf-8 ('utf-8
(setq byte (position-bytes position)) (setq byte (position-bytes position))
(when (null byte) (when (null byte)
(if (<= position 0) (if (<= position 0)
@ -482,9 +482,9 @@ QUALITY can be:
(if (coding-system-get coding-system :bom) 3 0) (if (coding-system-get coding-system :bom) 3 0)
;; Account for CR in CRLF pairs. ;; Account for CR in CRLF pairs.
lineno)) lineno))
(`single-byte ('single-byte
(+ position -1 lineno)) (+ position -1 lineno))
((and `utf-16 ((and 'utf-16
;; FIXME: For utf-16, we could use the same approach as used for ;; FIXME: For utf-16, we could use the same approach as used for
;; dos EOLs (counting the number of non-BMP chars instead of the ;; dos EOLs (counting the number of non-BMP chars instead of the
;; number of lines). ;; number of lines).
@ -498,8 +498,8 @@ QUALITY can be:
lineno)) lineno))
(_ (_
(pcase quality (pcase quality
(`approximate (+ (position-bytes position) -1 lineno)) ('approximate (+ (position-bytes position) -1 lineno))
(`exact ('exact
;; Rather than assume that the file exists and still holds the right ;; Rather than assume that the file exists and still holds the right
;; data, we reconstruct its relevant portion. ;; data, we reconstruct its relevant portion.
(let ((buf (current-buffer))) (let ((buf (current-buffer)))

8
lisp/json.el
View file

@ -523,8 +523,8 @@ Please see the documentation of `json-object-type' and `json-key-type'."
;; Skip over the "}" ;; Skip over the "}"
(json-advance) (json-advance)
(pcase json-object-type (pcase json-object-type
(`alist (nreverse elements)) ('alist (nreverse elements))
(`plist (json--plist-reverse elements)) ('plist (json--plist-reverse elements))
(_ elements)))) (_ elements))))
;; Hash table encoding ;; Hash table encoding
@ -641,8 +641,8 @@ become JSON objects."
;; Skip over the "]" ;; Skip over the "]"
(json-advance) (json-advance)
(pcase json-array-type (pcase json-array-type
(`vector (nreverse (vconcat elements))) ('vector (nreverse (vconcat elements)))
(`list (nreverse elements))))) ('list (nreverse elements)))))
;; Array encoding ;; Array encoding

4
lisp/jsonrpc.el
View file

@ -184,7 +184,7 @@ dispatcher in CONNECTION."
(cdr oops)) (cdr oops))
"Internal error"))))) "Internal error")))))
(error (error
`(:error (:code -32603 :message "Internal error")))))) '(:error (:code -32603 :message "Internal error"))))))
(apply #'jsonrpc--reply connection id reply))) (apply #'jsonrpc--reply connection id reply)))
(;; A remote notification (;; A remote notification
method method
@ -490,7 +490,7 @@ With optional CLEANUP, kill any associated buffers. "
;; Call all outstanding error handlers ;; Call all outstanding error handlers
(maphash (lambda (_id triplet) (maphash (lambda (_id triplet)
(pcase-let ((`(,_success ,error ,_timeout) triplet)) (pcase-let ((`(,_success ,error ,_timeout) triplet))
(funcall error `(:code -1 :message "Server died")))) (funcall error '(:code -1 :message "Server died"))))
(jsonrpc--request-continuations connection)) (jsonrpc--request-continuations connection))
(jsonrpc--message "Server exited with status %s" (process-exit-status proc)) (jsonrpc--message "Server exited with status %s" (process-exit-status proc))
(process-put proc 'jsonrpc-sentinel-done t) (process-put proc 'jsonrpc-sentinel-done t)

14
lisp/language/cyrillic.el
View file

@ -95,7 +95,7 @@
(define-coding-system-alias 'cp878 'cyrillic-koi8) (define-coding-system-alias 'cp878 'cyrillic-koi8)
(set-language-info-alist (set-language-info-alist
"Cyrillic-KOI8" `((charset koi8) "Cyrillic-KOI8" '((charset koi8)
(coding-system cyrillic-koi8) (coding-system cyrillic-koi8)
(coding-priority cyrillic-koi8 cyrillic-iso-8bit) (coding-priority cyrillic-koi8 cyrillic-iso-8bit)
(ctext-non-standard-encodings "koi8-r") (ctext-non-standard-encodings "koi8-r")
@ -131,7 +131,7 @@ Support for Russian using koi8-r and the russian-computer input method.")
:mime-charset 'koi8-u) :mime-charset 'koi8-u)
(set-language-info-alist (set-language-info-alist
"Ukrainian" `((charset koi8-u) "Ukrainian" '((charset koi8-u)
(coding-system koi8-u) (coding-system koi8-u)
(coding-priority koi8-u) (coding-priority koi8-u)
(nonascii-translation . koi8-u) (nonascii-translation . koi8-u)
@ -151,7 +151,7 @@ Support for Russian using koi8-r and the russian-computer input method.")
(define-coding-system-alias 'alternativnyj 'cyrillic-alternativnyj) (define-coding-system-alias 'alternativnyj 'cyrillic-alternativnyj)
(set-language-info-alist (set-language-info-alist
"Cyrillic-ALT" `((charset alternativnyj) "Cyrillic-ALT" '((charset alternativnyj)
(coding-system cyrillic-alternativnyj) (coding-system cyrillic-alternativnyj)
(coding-priority cyrillic-alternativnyj) (coding-priority cyrillic-alternativnyj)
(nonascii-translation . alternativnyj) (nonascii-translation . alternativnyj)
@ -229,7 +229,7 @@ Support for Russian using koi8-r and the russian-computer input method.")
;; '("Cyrillic")) ;; '("Cyrillic"))
(set-language-info-alist (set-language-info-alist
"Tajik" `((coding-system koi8-t) "Tajik" '((coding-system koi8-t)
(coding-priority koi8-t) (coding-priority koi8-t)
(nonascii-translation . cyrillic-koi8-t) (nonascii-translation . cyrillic-koi8-t)
(charset koi8-t) (charset koi8-t)
@ -239,7 +239,7 @@ Support for Russian using koi8-r and the russian-computer input method.")
'("Cyrillic")) '("Cyrillic"))
(set-language-info-alist (set-language-info-alist
"Bulgarian" `((coding-system windows-1251) "Bulgarian" '((coding-system windows-1251)
(coding-priority windows-1251) (coding-priority windows-1251)
(nonascii-translation . windows-1251) (nonascii-translation . windows-1251)
(charset windows-1251) (charset windows-1251)
@ -250,7 +250,7 @@ Support for Russian using koi8-r and the russian-computer input method.")
'("Cyrillic")) '("Cyrillic"))
(set-language-info-alist (set-language-info-alist
"Belarusian" `((coding-system windows-1251) "Belarusian" '((coding-system windows-1251)
(coding-priority windows-1251) (coding-priority windows-1251)
(nonascii-translation . windows-1251) (nonascii-translation . windows-1251)
(charset windows-1251) (charset windows-1251)
@ -262,7 +262,7 @@ Support for Russian using koi8-r and the russian-computer input method.")
'("Cyrillic")) '("Cyrillic"))
(set-language-info-alist (set-language-info-alist
"Ukrainian" `((coding-system koi8-u) "Ukrainian" '((coding-system koi8-u)
(coding-priority koi8-u) (coding-priority koi8-u)
(input-method . "ukrainian-computer") (input-method . "ukrainian-computer")
(documentation (documentation

8
lisp/language/european.el
View file

@ -541,7 +541,7 @@ method and applying Turkish case rules for the characters i, I, ı, İ.")))
'("European")) '("European"))
(set-language-info-alist (set-language-info-alist
"Welsh" `((coding-system utf-8 latin-8) ; the input method is Unicode-based "Welsh" '((coding-system utf-8 latin-8) ; the input method is Unicode-based
(coding-priority utf-8 latin-8) (coding-priority utf-8 latin-8)
(nonascii-translation . iso-8859-14) (nonascii-translation . iso-8859-14)
(input-method . "welsh") (input-method . "welsh")
@ -558,7 +558,7 @@ method and applying Turkish case rules for the characters i, I, ı, İ.")))
'("European")) '("European"))
(set-language-info-alist (set-language-info-alist
"Latin-7" `((coding-system latin-7) "Latin-7" '((coding-system latin-7)
(coding-priority latin-7) (coding-priority latin-7)
(nonascii-translation . iso-8859-13) (nonascii-translation . iso-8859-13)
(input-method . "latin-prefix") (input-method . "latin-prefix")
@ -566,7 +566,7 @@ method and applying Turkish case rules for the characters i, I, ı, İ.")))
'("European")) '("European"))
(set-language-info-alist (set-language-info-alist
"Lithuanian" `((coding-system latin-7 windows-1257) "Lithuanian" '((coding-system latin-7 windows-1257)
(coding-priority latin-7) (coding-priority latin-7)
(nonascii-translation . iso-8859-13) (nonascii-translation . iso-8859-13)
(input-method . "lithuanian-keyboard") (input-method . "lithuanian-keyboard")
@ -574,7 +574,7 @@ method and applying Turkish case rules for the characters i, I, ı, İ.")))
'("European")) '("European"))
(set-language-info-alist (set-language-info-alist
"Latvian" `((coding-system latin-7 windows-1257) "Latvian" '((coding-system latin-7 windows-1257)
(coding-priority latin-7) (coding-priority latin-7)
(nonascii-translation . iso-8859-13) (nonascii-translation . iso-8859-13)
(input-method . "latvian-keyboard") (input-method . "latvian-keyboard")

2
lisp/language/georgian.el
View file

@ -37,7 +37,7 @@
:charset-list '(georgian-academy)) :charset-list '(georgian-academy))
(set-language-info-alist (set-language-info-alist
"Georgian" `((coding-system georgian-ps) "Georgian" '((coding-system georgian-ps)
(coding-priority georgian-ps) (coding-priority georgian-ps)
(input-method . "georgian") (input-method . "georgian")
(nonascii-translation . georgian-ps) (nonascii-translation . georgian-ps)

2
lisp/language/tibetan.el
View file

@ -451,7 +451,7 @@
;;; (includes some punctuation conversion rules) ;;; (includes some punctuation conversion rules)
;;; ;;;
(defconst tibetan-precomposition-rule-alist (defconst tibetan-precomposition-rule-alist
`(("ཕྱྭ" . "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>") '(("ཕྱྭ" . "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>")
("གྲྭ" . "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>") ("གྲྭ" . "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>")
("ཚྭ" . "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>") ("ཚྭ" . "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>")
("རྩྭ" . "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>") ("རྩྭ" . "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>")

32
lisp/language/utf-8-lang.el
View file

@ -25,24 +25,24 @@
;;; Code: ;;; Code:
(set-language-info-alist (set-language-info-alist
"UTF-8" `((coding-system utf-8) "UTF-8" '((coding-system utf-8)
(coding-priority utf-8) (coding-priority utf-8)
(charset unicode-bmp unicode) (charset unicode-bmp unicode)
;; Presumably not relevant now. ;; Presumably not relevant now.
;; (setup-function ;; (setup-function
;; . (lambda () ;; . (lambda ()
;; ;; Use Unicode font under Windows. Jason Rumney fecit. ;; ;; Use Unicode font under Windows. Jason Rumney fecit.
;; (if (and (fboundp 'w32-add-charset-info) ;; (if (and (fboundp 'w32-add-charset-info)
;; (not (boundp 'w32-unicode-charset-defined))) ;; (not (boundp 'w32-unicode-charset-defined)))
;; (w32-add-charset-info "iso10646-1" 'w32-charset-ansi t)))) ;; (w32-add-charset-info "iso10646-1" 'w32-charset-ansi t))))
;; Is this appropriate? ;; Is this appropriate?
;; (exit-function ;; (exit-function
;; . (lambda () ;; . (lambda ()
;; (if (and (fboundp 'w32-add-charset-info) ;; (if (and (fboundp 'w32-add-charset-info)
;; (not (boundp 'w32-unicode-charset-defined))) ;; (not (boundp 'w32-unicode-charset-defined)))
;; (setq w32-charset-info-alist ;; (setq w32-charset-info-alist
;; (delete (assoc "iso10646-1") ;; (delete (assoc "iso10646-1")
;; w32-charset-info-alist))))) ;; w32-charset-info-alist)))))
(input-method . "rfc1345") ; maybe not the best choice (input-method . "rfc1345") ; maybe not the best choice
(documentation . "\ (documentation . "\
This language environment is a generic one for the Unicode character set This language environment is a generic one for the Unicode character set

4
lisp/language/vietnamese.el
View file

@ -72,9 +72,9 @@
(define-coding-system-alias 'viqr 'vietnamese-viqr) (define-coding-system-alias 'viqr 'vietnamese-viqr)
(set-language-info-alist (set-language-info-alist
"Vietnamese" `((charset viscii) "Vietnamese" '((charset viscii)
(coding-system vietnamese-viscii vietnamese-vscii (coding-system vietnamese-viscii vietnamese-vscii
vietnamese-tcvn vietnamese-viqr windows-1258) vietnamese-tcvn vietnamese-viqr windows-1258)
(nonascii-translation . viscii) (nonascii-translation . viscii)
(coding-priority vietnamese-viscii) (coding-priority vietnamese-viscii)
(input-method . "vietnamese-viqr") (input-method . "vietnamese-viqr")

2
lisp/ldefs-boot.el
View file

@ -34793,7 +34793,7 @@ List of suffixes which indicate a compressed file.
It must be supported by libarchive(3).") It must be supported by libarchive(3).")
(defmacro tramp-archive-autoload-file-name-regexp nil "\ (defmacro tramp-archive-autoload-file-name-regexp nil "\
Regular expression matching archive file names." `(concat "\\`" "\\(" ".+" "\\." (regexp-opt tramp-archive-suffixes) "\\(?:" "\\." (regexp-opt tramp-archive-compression-suffixes) "\\)*" "\\)" "\\(" "/" ".*" "\\)" "\\'")) Regular expression matching archive file names." '(concat "\\`" "\\(" ".+" "\\." (regexp-opt tramp-archive-suffixes) "\\(?:" "\\." (regexp-opt tramp-archive-compression-suffixes) "\\)*" "\\)" "\\(" "/" ".*" "\\)" "\\'"))
(defalias 'tramp-archive-autoload-file-name-handler 'tramp-autoload-file-name-handler) (defalias 'tramp-archive-autoload-file-name-handler 'tramp-autoload-file-name-handler)

2
lisp/mail/mail-extr.el
View file

@ -652,7 +652,7 @@ Unless NO-REPLACE is true, at each of the positions in LIST-SYMBOL
(< ch ,beg-symbol)) (< ch ,beg-symbol))
,@(if no-replace ,@(if no-replace
nil nil
`((mail-extr-nuke-char-at ch))) '((mail-extr-nuke-char-at ch)))
(setcar temp nil)) (setcar temp nil))
(setq temp (cdr temp))) (setq temp (cdr temp)))
(setq ,list-symbol (delq nil ,list-symbol)))) (setq ,list-symbol (delq nil ,list-symbol))))

14
lisp/man.el
View file

@ -1146,7 +1146,7 @@ See the variable `Man-notify-method' for the different notification behaviors."
(let ((saved-frame (with-current-buffer man-buffer (let ((saved-frame (with-current-buffer man-buffer
Man-original-frame))) Man-original-frame)))
(pcase Man-notify-method (pcase Man-notify-method
(`newframe ('newframe
;; Since we run asynchronously, perhaps while Emacs is waiting ;; Since we run asynchronously, perhaps while Emacs is waiting
;; for input, we must not leave a different buffer current. We ;; for input, we must not leave a different buffer current. We
;; can't rely on the editor command loop to reselect the ;; can't rely on the editor command loop to reselect the
@ -1157,25 +1157,25 @@ See the variable `Man-notify-method' for the different notification behaviors."
(set-window-dedicated-p (frame-selected-window frame) t) (set-window-dedicated-p (frame-selected-window frame) t)
(or (display-multi-frame-p frame) (or (display-multi-frame-p frame)
(select-frame frame))))) (select-frame frame)))))
(`pushy ('pushy
(switch-to-buffer man-buffer)) (switch-to-buffer man-buffer))
(`bully ('bully
(and (frame-live-p saved-frame) (and (frame-live-p saved-frame)
(select-frame saved-frame)) (select-frame saved-frame))
(pop-to-buffer man-buffer) (pop-to-buffer man-buffer)
(delete-other-windows)) (delete-other-windows))
(`aggressive ('aggressive
(and (frame-live-p saved-frame) (and (frame-live-p saved-frame)
(select-frame saved-frame)) (select-frame saved-frame))
(pop-to-buffer man-buffer)) (pop-to-buffer man-buffer))
(`friendly ('friendly
(and (frame-live-p saved-frame) (and (frame-live-p saved-frame)
(select-frame saved-frame)) (select-frame saved-frame))
(display-buffer man-buffer 'not-this-window)) (display-buffer man-buffer 'not-this-window))
(`polite ('polite
(beep) (beep)
(message "Manual buffer %s is ready" (buffer-name man-buffer))) (message "Manual buffer %s is ready" (buffer-name man-buffer)))
(`quiet ('quiet
(message "Manual buffer %s is ready" (buffer-name man-buffer))) (message "Manual buffer %s is ready" (buffer-name man-buffer)))
(_ ;; meek (_ ;; meek
(message "")) (message ""))

10
lisp/menu-bar.el
View file

@ -423,15 +423,15 @@
(let ((menu (make-sparse-keymap "Edit"))) (let ((menu (make-sparse-keymap "Edit")))
(bindings--define-key menu [props] (bindings--define-key menu [props]
`(menu-item "Text Properties" facemenu-menu)) '(menu-item "Text Properties" facemenu-menu))
;; ns-win.el said: Add spell for platform consistency. ;; ns-win.el said: Add spell for platform consistency.
(if (featurep 'ns) (if (featurep 'ns)
(bindings--define-key menu [spell] (bindings--define-key menu [spell]
`(menu-item "Spell" ispell-menu-map))) '(menu-item "Spell" ispell-menu-map)))
(bindings--define-key menu [fill] (bindings--define-key menu [fill]
`(menu-item "Fill" fill-region '(menu-item "Fill" fill-region
:enable (and mark-active (not buffer-read-only)) :enable (and mark-active (not buffer-read-only))
:help :help
"Fill text in region to fit between left and right margin")) "Fill text in region to fit between left and right margin"))
@ -440,7 +440,7 @@
menu-bar-separator) menu-bar-separator)
(bindings--define-key menu [bookmark] (bindings--define-key menu [bookmark]
`(menu-item "Bookmarks" menu-bar-bookmark-map)) '(menu-item "Bookmarks" menu-bar-bookmark-map))
(bindings--define-key menu [goto] (bindings--define-key menu [goto]
`(menu-item "Go To" ,menu-bar-goto-menu)) `(menu-item "Go To" ,menu-bar-goto-menu))
@ -2421,7 +2421,7 @@ form ((XOFFSET YOFFSET) WINDOW), or nil.
If nil, the current mouse position is used, or nil if there is no mouse." If nil, the current mouse position is used, or nil if there is no mouse."
(pcase position (pcase position
;; nil -> mouse cursor position ;; nil -> mouse cursor position
(`nil ('nil
(let ((mp (mouse-pixel-position))) (let ((mp (mouse-pixel-position)))
(list (list (cadr mp) (cddr mp)) (car mp)))) (list (list (cadr mp) (cddr mp)) (car mp))))
;; Value returned from `event-end' or `posn-at-point'. ;; Value returned from `event-end' or `posn-at-point'.

10
lisp/mh-e/mh-acros.el
View file

@ -61,8 +61,8 @@ particular, the expansion of (setf (gethash ...) ...) used
functions in \"cl\" at run time. This macro recognizes that and functions in \"cl\" at run time. This macro recognizes that and
loads \"cl\" appropriately." loads \"cl\" appropriately."
(if (eq (car (macroexpand '(setf (gethash foo bar) baz))) 'cl-puthash) (if (eq (car (macroexpand '(setf (gethash foo bar) baz))) 'cl-puthash)
`(require 'cl) '(require 'cl)
`(eval-when-compile (require 'cl)))) '(eval-when-compile (require 'cl))))
;;;###mh-autoload ;;;###mh-autoload
(defmacro mh-do-in-gnu-emacs (&rest body) (defmacro mh-do-in-gnu-emacs (&rest body)
@ -128,11 +128,11 @@ XEmacs and versions of GNU Emacs before 21.1 require
In GNU Emacs if CHECK-TRANSIENT-MARK-MODE-FLAG is non-nil then In GNU Emacs if CHECK-TRANSIENT-MARK-MODE-FLAG is non-nil then
check if variable `transient-mark-mode' is active." check if variable `transient-mark-mode' is active."
(cond ((featurep 'xemacs) ;XEmacs (cond ((featurep 'xemacs) ;XEmacs
`(and (boundp 'zmacs-regions) zmacs-regions (region-active-p))) '(and (boundp 'zmacs-regions) zmacs-regions (region-active-p)))
((not check-transient-mark-mode-flag) ;GNU Emacs ((not check-transient-mark-mode-flag) ;GNU Emacs
`(and (boundp 'mark-active) mark-active)) '(and (boundp 'mark-active) mark-active))
(t ;GNU Emacs (t ;GNU Emacs
`(and (boundp 'transient-mark-mode) transient-mark-mode '(and (boundp 'transient-mark-mode) transient-mark-mode
(boundp 'mark-active) mark-active)))) (boundp 'mark-active) mark-active))))
;; Shush compiler. ;; Shush compiler.

2
lisp/mh-e/mh-folder.el
View file

@ -519,7 +519,7 @@ font-lock is done highlighting.")
(defmacro mh-remove-xemacs-horizontal-scrollbar () (defmacro mh-remove-xemacs-horizontal-scrollbar ()
"Get rid of the horizontal scrollbar that XEmacs insists on putting in." "Get rid of the horizontal scrollbar that XEmacs insists on putting in."
(when (featurep 'xemacs) (when (featurep 'xemacs)
`(if (and (featurep 'scrollbar) '(if (and (featurep 'scrollbar)
(fboundp 'set-specifier)) (fboundp 'set-specifier))
(set-specifier horizontal-scrollbar-visible-p nil (set-specifier horizontal-scrollbar-visible-p nil
(cons (current-buffer) nil))))) (cons (current-buffer) nil)))))

2
lisp/mh-e/mh-mime.el
View file

@ -75,7 +75,7 @@
;;;###mh-autoload ;;;###mh-autoload
(defmacro mh-buffer-data () (defmacro mh-buffer-data ()
"Convenience macro to get the MIME data structures of the current buffer." "Convenience macro to get the MIME data structures of the current buffer."
`(gethash (current-buffer) mh-globals-hash)) '(gethash (current-buffer) mh-globals-hash))
;; Structure to keep track of MIME handles on a per buffer basis. ;; Structure to keep track of MIME handles on a per buffer basis.
(mh-defstruct (mh-buffer-data (:conc-name mh-mime-) (mh-defstruct (mh-buffer-data (:conc-name mh-mime-)

4
lisp/mh-e/mh-show.el
View file

@ -375,8 +375,8 @@ still visible.\n")
(cond ((not normal-exit) (cond ((not normal-exit)
(set-window-configuration config)) (set-window-configuration config))
,(if dont-return ,(if dont-return
`(t (setq mh-previous-window-config config)) '(t (setq mh-previous-window-config config))
`((and (get-buffer cur-buffer-name) '((and (get-buffer cur-buffer-name)
(window-live-p (get-buffer-window (window-live-p (get-buffer-window
(get-buffer cur-buffer-name)))) (get-buffer cur-buffer-name))))
(pop-to-buffer (get-buffer cur-buffer-name) nil))))))))) (pop-to-buffer (get-buffer cur-buffer-name) nil)))))))))

6
lisp/mh-e/mh-speed.el
View file

@ -163,7 +163,7 @@ The optional arguments from speedbar are IGNORED."
(speedbar-change-expand-button-char ?-) (speedbar-change-expand-button-char ?-)
(add-text-properties (add-text-properties
(mh-line-beginning-position) (1+ (line-beginning-position)) (mh-line-beginning-position) (1+ (line-beginning-position))
`(mh-expanded t))))))) '(mh-expanded t)))))))
(defun mh-speed-view (&rest ignored) (defun mh-speed-view (&rest ignored)
"Visits the selected folder just as if you had used \\<mh-folder-mode-map>\\[mh-visit-folder]. "Visits the selected folder just as if you had used \\<mh-folder-mode-map>\\[mh-visit-folder].
@ -199,7 +199,7 @@ created."
(1+ (mh-line-beginning-position)))) (1+ (mh-line-beginning-position))))
(add-text-properties (add-text-properties
(mh-line-beginning-position) (1+ (line-beginning-position)) (mh-line-beginning-position) (1+ (line-beginning-position))
`(mh-folder nil mh-expanded nil mh-children-p t mh-level 0)) '(mh-folder nil mh-expanded nil mh-children-p t mh-level 0))
(mh-speed-stealth-update t) (mh-speed-stealth-update t)
(when (> mh-speed-update-interval 0) (when (> mh-speed-update-interval 0)
(mh-speed-flists nil)))) (mh-speed-flists nil))))
@ -568,7 +568,7 @@ The function invalidates the latest ancestor that is present."
(mh-speedbar-change-expand-button-char ?+) (mh-speedbar-change-expand-button-char ?+)
(add-text-properties (add-text-properties
(mh-line-beginning-position) (1+ (mh-line-beginning-position)) (mh-line-beginning-position) (1+ (mh-line-beginning-position))
`(mh-children-p t))) '(mh-children-p t)))
(when (get-text-property (mh-line-beginning-position) 'mh-expanded) (when (get-text-property (mh-line-beginning-position) 'mh-expanded)
(mh-speed-toggle)) (mh-speed-toggle))
(setq mh-speed-refresh-flag t)))) (setq mh-speed-refresh-flag t))))

14
lisp/minibuffer.el
View file

@ -1128,7 +1128,7 @@ when the buffer's text is already an exact match."
;; Show the completion table, if requested. ;; Show the completion table, if requested.
((not exact) ((not exact)
(if (pcase completion-auto-help (if (pcase completion-auto-help
(`lazy (eq this-command last-command)) ('lazy (eq this-command last-command))
(_ completion-auto-help)) (_ completion-auto-help))
(minibuffer-completion-help beg end) (minibuffer-completion-help beg end)
(completion--message "Next char not unique"))) (completion--message "Next char not unique")))
@ -2095,9 +2095,9 @@ a completion function or god knows what else.")
;; like comint-completion-at-point or mh-letter-completion-at-point, which ;; like comint-completion-at-point or mh-letter-completion-at-point, which
;; could be sometimes safe and sometimes misbehaving (and sometimes neither). ;; could be sometimes safe and sometimes misbehaving (and sometimes neither).
(if (pcase which (if (pcase which
(`all t) ('all t)
(`safe (member fun completion--capf-safe-funs)) ('safe (member fun completion--capf-safe-funs))
(`optimist (not (member fun completion--capf-misbehave-funs)))) ('optimist (not (member fun completion--capf-misbehave-funs))))
(let ((res (funcall fun))) (let ((res (funcall fun)))
(cond (cond
((and (consp res) (not (functionp res))) ((and (consp res) (not (functionp res)))
@ -2955,9 +2955,9 @@ or a symbol, see `completion-pcm--merge-completions'."
(setq p (cdr p))) (setq p (cdr p)))
(`(star ,(pred symbolp) . ,rest) (setq p `(star . ,rest))) (`(star ,(pred symbolp) . ,rest) (setq p `(star . ,rest)))
(`(,(pred symbolp) star . ,rest) (setq p `(star . ,rest))) (`(,(pred symbolp) star . ,rest) (setq p `(star . ,rest)))
(`(point ,(or `any `any-delim) . ,rest) (setq p `(point . ,rest))) (`(point ,(or 'any 'any-delim) . ,rest) (setq p `(point . ,rest)))
(`(,(or `any `any-delim) point . ,rest) (setq p `(point . ,rest))) (`(,(or 'any 'any-delim) point . ,rest) (setq p `(point . ,rest)))
(`(any ,(or `any `any-delim) . ,rest) (setq p `(any . ,rest))) (`(any ,(or 'any 'any-delim) . ,rest) (setq p `(any . ,rest)))
(`(,(pred symbolp)) (setq p nil)) ;Implicit terminating `any'. (`(,(pred symbolp)) (setq p nil)) ;Implicit terminating `any'.
(_ (push (pop p) n)))) (_ (push (pop p) n))))
(nreverse n))) (nreverse n)))

4
lisp/mpc.el
View file

@ -1017,7 +1017,7 @@ If PLAYLIST is t or nil or missing, use the main playlist."
(text (text
(if (eq info 'self) (symbol-name tag) (if (eq info 'self) (symbol-name tag)
(pcase tag (pcase tag
((or `Time `Duration) ((or 'Time 'Duration)
(let ((time (cdr (or (assq 'time info) (assq 'Time info))))) (let ((time (cdr (or (assq 'time info) (assq 'Time info)))))
(setq pred (list nil)) ;Just assume it's never eq. (setq pred (list nil)) ;Just assume it's never eq.
(when time (when time
@ -1025,7 +1025,7 @@ If PLAYLIST is t or nil or missing, use the main playlist."
(string-match ":" time)) (string-match ":" time))
(substring time (match-end 0)) (substring time (match-end 0))
time))))) time)))))
(`Cover ('Cover
(let ((dir (file-name-directory (cdr (assq 'file info))))) (let ((dir (file-name-directory (cdr (assq 'file info)))))
;; (debug) ;; (debug)
(push `(equal ',dir (file-name-directory (cdr (assq 'file info)))) pred) (push `(equal ',dir (file-name-directory (cdr (assq 'file info)))) pred)

4
lisp/net/ange-ftp.el
View file

@ -2679,7 +2679,7 @@ The main reason for this alist is to deal with file versions in VMS.")
(defmacro ange-ftp-parse-filename () (defmacro ange-ftp-parse-filename ()
;;Extract the filename from the current line of a dired-like listing. ;;Extract the filename from the current line of a dired-like listing.
`(save-match-data '(save-match-data
(let ((eol (progn (end-of-line) (point)))) (let ((eol (progn (end-of-line) (point))))
(beginning-of-line) (beginning-of-line)
(if (re-search-forward directory-listing-before-filename-regexp eol t) (if (re-search-forward directory-listing-before-filename-regexp eol t)
@ -2761,7 +2761,7 @@ match subdirectories as well.")
(defmacro ange-ftp-dl-parser () (defmacro ange-ftp-dl-parser ()
;; Parse the current buffer, which is assumed to be a descriptive ;; Parse the current buffer, which is assumed to be a descriptive
;; listing, and return a hashtable. ;; listing, and return a hashtable.
`(let ((tbl (make-hash-table :test 'equal))) '(let ((tbl (make-hash-table :test 'equal)))
(while (not (eobp)) (while (not (eobp))
(puthash (puthash
(buffer-substring (point) (buffer-substring (point)

2
lisp/net/hmac-def.el
View file

@ -73,7 +73,7 @@ If BIT is non-nil, truncate output to specified bits."
,(if (and bit (< (/ bit 8) L)) ,(if (and bit (< (/ bit 8) L))
`(substring key-xor-opad 0 ,(/ bit 8)) `(substring key-xor-opad 0 ,(/ bit 8))
;; return a copy of `key-xor-opad'. ;; return a copy of `key-xor-opad'.
`(concat key-xor-opad))) '(concat key-xor-opad)))
;; cleanup. ;; cleanup.
(fillarray key-xor-ipad 0) (fillarray key-xor-ipad 0)
(fillarray key-xor-opad 0))))) (fillarray key-xor-opad 0)))))

2
lisp/net/newst-backend.el
View file

@ -170,7 +170,7 @@ These were mostly extracted from the Radio Community Server at
http://subhonker6.userland.com/rcsPublic/rssHotlist. http://subhonker6.userland.com/rcsPublic/rssHotlist.
You may add other entries in `newsticker-url-list'." You may add other entries in `newsticker-url-list'."
:type `(set ,@(mapcar `newsticker--splicer :type `(set ,@(mapcar #'newsticker--splicer
newsticker--raw-url-list-defaults)) newsticker--raw-url-list-defaults))
:set 'newsticker--set-customvar-retrieval :set 'newsticker--set-customvar-retrieval
:group 'newsticker-retrieval) :group 'newsticker-retrieval)

10
lisp/net/quickurl.el
View file

@ -504,15 +504,15 @@ TYPE dictates what will be inserted, options are:
(with-current-buffer quickurl-list-last-buffer (with-current-buffer quickurl-list-last-buffer
(insert (insert
(pcase type (pcase type
(`url (funcall quickurl-format-function url)) ('url (funcall quickurl-format-function url))
(`naked-url (quickurl-url-url url)) ('naked-url (quickurl-url-url url))
(`with-lookup (format "%s <URL:%s>" ('with-lookup (format "%s <URL:%s>"
(quickurl-url-keyword url) (quickurl-url-keyword url)
(quickurl-url-url url))) (quickurl-url-url url)))
(`with-desc (format "%S <URL:%s>" ('with-desc (format "%S <URL:%s>"
(quickurl-url-description url) (quickurl-url-description url)
(quickurl-url-url url))) (quickurl-url-url url)))
(`lookup (quickurl-url-keyword url))))) ('lookup (quickurl-url-keyword url)))))
(error "No URL details on that line")) (error "No URL details on that line"))
url)) url))

Some files were not shown because too many files have changed in this diff Show more