diff options
| author | Stefan Kangas <stefan@marxist.se> | 2020-11-17 18:42:38 +0100 |
|---|---|---|
| committer | Stefan Kangas <stefan@marxist.se> | 2020-11-17 18:42:38 +0100 |
| commit | 43ad3c175d2e289f42be861eac5da807d6b1e088 (patch) | |
| tree | 5aef5ba62e4867c663be475aa4f96c3939025ca8 /lisp/edmacro.el | |
| parent | 68e57e0046328aa47ffad721718749b0991f6591 (diff) | |
| download | emacs-43ad3c175d2e289f42be861eac5da807d6b1e088.tar.gz emacs-43ad3c175d2e289f42be861eac5da807d6b1e088.tar.bz2 emacs-43ad3c175d2e289f42be861eac5da807d6b1e088.zip | |
Remove redundant 'function's around lambdas
* lisp/allout.el (allout-latex-verb-quote):
* lisp/edmacro.el (edmacro-format-keys):
* lisp/ffap.el (ffap-all-subdirs-loop)
(ffap-kpathsea-expand-path, ffap-menu-rescan):
* lisp/files.el (save-buffers-kill-emacs):
* lisp/find-lisp.el (find-lisp-find-dired-internal)
(find-lisp-insert-directory):
* lisp/gnus/gnus-agent.el (gnus-agent-expire-unagentized-dirs):
* lisp/gnus/nnmairix.el (nnmairix-create-message-line-for-search)
(nnmairix-widget-get-values)
(nnmairix-widget-make-query-from-widgets)
(nnmairix-widget-build-editable-fields):
* lisp/international/mule-cmds.el (sort-coding-systems):
* lisp/international/mule-diag.el (list-character-sets-1):
* lisp/international/quail.el (quail-insert-decode-map):
* lisp/mail/reporter.el (reporter-dump-state):
* lisp/mail/supercite.el (sc-attribs-filter-namelist):
* lisp/pcmpl-gnu.el (pcmpl-gnu-zipped-files)
(pcmpl-gnu-bzipped-files):
* lisp/progmodes/cperl-mode.el (cperl-find-tags)
(cperl-write-tags, cperl-tags-hier-init, cperl-tags-treeify)
(cperl-menu-to-keymap, cperl-pod-spell):
* lisp/progmodes/gdb-mi.el (gdb-parent-mode):
* lisp/progmodes/make-mode.el (makefile-browser-fill):
* lisp/simple.el (transpose-lines):
* lisp/term.el:
* lisp/term/w32-win.el (w32-find-non-USB-fonts):
* lisp/textmodes/table.el (table--generate-source-scan-lines): Remove
redundant 'function's around lambdas.
Diffstat (limited to 'lisp/edmacro.el')
| -rw-r--r-- | lisp/edmacro.el | 51 |
1 files changed, 25 insertions, 26 deletions
diff --git a/lisp/edmacro.el b/lisp/edmacro.el index 1d9b4726b04..44cf5aad387 100644 --- a/lisp/edmacro.el +++ b/lisp/edmacro.el @@ -535,32 +535,31 @@ doubt, use whitespace." (setq bind-len (1+ text))) (t (setq desc (mapconcat - (function - (lambda (ch) - (cond - ((integerp ch) - (concat - (cl-loop for pf across "ACHMsS" - for bit in '(?\A-\^@ ?\C-\^@ ?\H-\^@ - ?\M-\^@ ?\s-\^@ ?\S-\^@) - when (/= (logand ch bit) 0) - concat (format "%c-" pf)) - (let ((ch2 (logand ch (1- (ash 1 18))))) - (cond ((<= ch2 32) - (pcase ch2 - (0 "NUL") (9 "TAB") (10 "LFD") - (13 "RET") (27 "ESC") (32 "SPC") - (_ - (format "C-%c" - (+ (if (<= ch2 26) 96 64) - ch2))))) - ((= ch2 127) "DEL") - ((<= ch2 maxkey) (char-to-string ch2)) - (t (format "\\%o" ch2)))))) - ((symbolp ch) - (format "<%s>" ch)) - (t - (error "Unrecognized item in macro: %s" ch))))) + (lambda (ch) + (cond + ((integerp ch) + (concat + (cl-loop for pf across "ACHMsS" + for bit in '(?\A-\^@ ?\C-\^@ ?\H-\^@ + ?\M-\^@ ?\s-\^@ ?\S-\^@) + when (/= (logand ch bit) 0) + concat (format "%c-" pf)) + (let ((ch2 (logand ch (1- (ash 1 18))))) + (cond ((<= ch2 32) + (pcase ch2 + (0 "NUL") (9 "TAB") (10 "LFD") + (13 "RET") (27 "ESC") (32 "SPC") + (_ + (format "C-%c" + (+ (if (<= ch2 26) 96 64) + ch2))))) + ((= ch2 127) "DEL") + ((<= ch2 maxkey) (char-to-string ch2)) + (t (format "\\%o" ch2)))))) + ((symbolp ch) + (format "<%s>" ch)) + (t + (error "Unrecognized item in macro: %s" ch)))) (or fkey key) " ")))) (if prefix (setq desc (concat (edmacro-sanitize-for-string prefix) desc))) |