[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 206dd9d: Don't quote lambdas in several places
|
From: |
Stefan Kangas |
|
Subject: |
master 206dd9d: Don't quote lambdas in several places |
|
Date: |
Thu, 12 Nov 2020 16:37:11 -0500 (EST) |
branch: master
commit 206dd9d5923d5db7b44a1bf67e6ec61c027ab1d2
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>
Don't quote lambdas in several places
* lisp/allout-widgets.el (allout-widgets-adjusting-message)
(allout-widgets-exposure-change-processor)
(allout-widgets-count-buttons-in-region):
* lisp/ansi-color.el (ansi-color-make-color-map):
* lisp/case-table.el (describe-buffer-case-table):
* lisp/emacs-lisp/byte-opt.el (byte-decompile-bytecode-1):
* lisp/gnus/gnus-agent.el (gnus-agent-regenerate-group):
* lisp/gnus/nnir.el (nnir-run-swish++, nnir-run-swish-e)
(nnir-run-hyrex, nnir-run-namazu):
* lisp/hippie-exp.el (make-hippie-expand-function)
(try-complete-lisp-symbol, try-complete-lisp-symbol-partially)
(try-expand-all-abbrevs):
* lisp/international/mule-cmds.el (sort-coding-systems)
(select-safe-coding-system, select-message-coding-system)
(read-language-name, encoded-string-description):
* lisp/international/quail.el (quail-keyseq-translate)
(quail-get-translations, quail-build-decode-map)
(quail-insert-decode-map):
* lisp/jka-compr.el (jka-compr-uninstall):
* lisp/locate.el (locate-in-alternate-database):
* lisp/mail/mailabbrev.el (mail-resolve-all-aliases-1)
(mail-abbrev-make-syntax-table):
* lisp/mh-e/mh-seq.el (mh-read-folder-sequences):
* lisp/net/eudcb-ldap.el (eudc-ldap-simple-query-internal):
* lisp/progmodes/make-mode.el (makefile-query-targets)
(makefile-prompt-for-gmake-funargs):
* lisp/shadowfile.el (shadow-cancel, shadow-shadows-of):
* lisp/sort.el (sort-pages, sort-fields, sort-regexp-fields):
* lisp/subr.el (listify-key-sequence):
* lisp/term/wyse50.el (terminal-init-wyse50):
* lisp/textmodes/ispell.el (ispell-help)
(ispell-begin-tex-skip-regexp):
* lisp/textmodes/page-ext.el (pages-sort-region):
* lisp/textmodes/refer.el (refer-find-entry-in-file):
* lisp/url/url-expand.el (url-expand-file-name): Don't quote lambdas.
---
lisp/allout-widgets.el | 28 +++++++++----------
lisp/ansi-color.el | 26 +++++++++---------
lisp/case-table.el | 40 +++++++++++++--------------
lisp/emacs-lisp/byte-opt.el | 8 +++---
lisp/gnus/gnus-agent.el | 10 +++----
lisp/hippie-exp.el | 28 +++++++++----------
lisp/international/mule-cmds.el | 16 +++++------
lisp/international/quail.el | 28 +++++++++----------
lisp/jka-compr.el | 10 +++----
lisp/locate.el | 10 +++----
lisp/mail/mailabbrev.el | 20 +++++++-------
lisp/mh-e/mh-seq.el | 6 ++---
lisp/net/eudcb-ldap.el | 8 +++---
lisp/obsolete/nnir.el | 30 ++++++++++-----------
lisp/progmodes/make-mode.el | 33 +++++++++++------------
lisp/shadowfile.el | 14 +++++-----
lisp/sort.el | 60 ++++++++++++++++++++---------------------
lisp/subr.el | 8 +++---
lisp/term/wyse50.el | 6 ++---
lisp/textmodes/ispell.el | 28 +++++++++----------
lisp/textmodes/page-ext.el | 21 +++++++--------
lisp/textmodes/refer.el | 6 ++---
lisp/url/url-expand.el | 8 +++---
23 files changed, 225 insertions(+), 227 deletions(-)
diff --git a/lisp/allout-widgets.el b/lisp/allout-widgets.el
index ac49d3b..7e79577 100644
--- a/lisp/allout-widgets.el
+++ b/lisp/allout-widgets.el
@@ -916,15 +916,15 @@ posting threshold criteria."
(let ((min (point-max))
(max 0)
first second)
- (mapc (function (lambda (entry)
- (if (eq :undone-exposure (car entry))
- nil
- (setq first (cadr entry)
- second (caddr entry))
- (if (< (min first second) min)
- (setq min (min first second)))
- (if (> (max first second) max)
- (setq max (max first second))))))
+ (mapc (lambda (entry)
+ (if (eq :undone-exposure (car entry))
+ nil
+ (setq first (cadr entry)
+ second (caddr entry))
+ (if (< (min first second) min)
+ (setq min (min first second)))
+ (if (> (max first second) max)
+ (setq max (max first second)))))
allout-widgets-changes-record)
(> (- max min) allout-widgets-adjust-message-size-threshold)))
(let ((prior (current-message)))
@@ -975,8 +975,8 @@ Records changes in `allout-widgets-changes-record'."
Generally invoked via `allout-exposure-change-functions'."
- (let ((changes (sort changes (function (lambda (this next)
- (< (cadr this) (cadr next))))))
+ (let ((changes (sort changes (lambda (this next)
+ (< (cadr this) (cadr next)))))
;; have to distinguish between concealing and exposing so that, eg,
;; `allout-expose-topic's mix is handled properly.
handled-expose
@@ -2301,9 +2301,9 @@ The elements of LIST are not copied, just the list
structure itself."
end (or end (point-max)))
(if (> start end) (let ((interim start)) (setq start end end interim)))
(let ((button-overlays (delq nil
- (mapcar (function (lambda (o)
- (if (overlay-get o 'button)
- o)))
+ (mapcar (lambda (o)
+ (if (overlay-get o 'button)
+ o))
(overlays-in start end)))))
(length button-overlays)))
diff --git a/lisp/ansi-color.el b/lisp/ansi-color.el
index d20260b..e9cdf03 100644
--- a/lisp/ansi-color.el
+++ b/lisp/ansi-color.el
@@ -572,27 +572,27 @@ The face definitions are based upon the variables
(index 0))
;; miscellaneous attributes
(mapc
- (function (lambda (e)
- (aset map index e)
- (setq index (1+ index)) ))
+ (lambda (e)
+ (aset map index e)
+ (setq index (1+ index)) )
ansi-color-faces-vector)
;; foreground attributes
(setq index 30)
(mapc
- (function (lambda (e)
- (aset map index
- (ansi-color-make-face 'foreground
- (if (consp e) (car e) e)))
- (setq index (1+ index)) ))
+ (lambda (e)
+ (aset map index
+ (ansi-color-make-face 'foreground
+ (if (consp e) (car e) e)))
+ (setq index (1+ index)) )
ansi-color-names-vector)
;; background attributes
(setq index 40)
(mapc
- (function (lambda (e)
- (aset map index
- (ansi-color-make-face 'background
- (if (consp e) (cdr e) e)))
- (setq index (1+ index)) ))
+ (lambda (e)
+ (aset map index
+ (ansi-color-make-face 'background
+ (if (consp e) (cdr e) e)))
+ (setq index (1+ index)) )
ansi-color-names-vector)
map))
diff --git a/lisp/case-table.el b/lisp/case-table.el
index 7379f37..bdfe5c2 100644
--- a/lisp/case-table.el
+++ b/lisp/case-table.el
@@ -38,26 +38,26 @@
(interactive)
(let ((description (make-char-table 'case-table)))
(map-char-table
- (function (lambda (key value)
- (if (not (natnump value))
- (if (consp key)
- (set-char-table-range description key "case-invariant")
- (aset description key "case-invariant"))
- (let (from to)
- (if (consp key)
- (setq from (car key) to (cdr key))
- (setq from (setq to key)))
- (while (<= from to)
- (aset
- description from
- (cond ((/= from (downcase from))
- (concat "uppercase, matches "
- (char-to-string (downcase from))))
- ((/= from (upcase from))
- (concat "lowercase, matches "
- (char-to-string (upcase from))))
- (t "case-invariant")))
- (setq from (1+ from)))))))
+ (lambda (key value)
+ (if (not (natnump value))
+ (if (consp key)
+ (set-char-table-range description key "case-invariant")
+ (aset description key "case-invariant"))
+ (let (from to)
+ (if (consp key)
+ (setq from (car key) to (cdr key))
+ (setq from (setq to key)))
+ (while (<= from to)
+ (aset
+ description from
+ (cond ((/= from (downcase from))
+ (concat "uppercase, matches "
+ (char-to-string (downcase from))))
+ ((/= from (upcase from))
+ (concat "lowercase, matches "
+ (char-to-string (upcase from))))
+ (t "case-invariant")))
+ (setq from (1+ from))))))
(current-case-table))
(save-excursion
(with-output-to-temp-buffer "*Help*"
diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el
index 530a086..469bbe6 100644
--- a/lisp/emacs-lisp/byte-opt.el
+++ b/lisp/emacs-lisp/byte-opt.el
@@ -1459,10 +1459,10 @@
(setq rest (cdr rest))))
(if tags (error "optimizer error: missed tags %s" tags))
;; Remove addrs, lap = ( [ (op . arg) | (TAG tagno) ]* )
- (mapcar (function (lambda (elt)
- (if (numberp elt)
- elt
- (cdr elt))))
+ (mapcar (lambda (elt)
+ (if (numberp elt)
+ elt
+ (cdr elt)))
(nreverse lap))))
diff --git a/lisp/gnus/gnus-agent.el b/lisp/gnus/gnus-agent.el
index 6a7e81b..76c2904 100644
--- a/lisp/gnus/gnus-agent.el
+++ b/lisp/gnus/gnus-agent.el
@@ -4033,11 +4033,11 @@ If REREAD is not nil, downloaded articles are marked as
unread."
(list (list
(if (listp reread)
reread
- (delq nil (mapcar (function (lambda (c)
- (cond ((eq reread t)
- (car c))
- ((cdr c)
- (car c)))))
+ (delq nil (mapcar (lambda (c)
+ (cond ((eq reread t)
+ (car c))
+ ((cdr c)
+ (car c))))
gnus-agent-article-alist)))
'del '(read)))
gnus-command-method)
diff --git a/lisp/hippie-exp.el b/lisp/hippie-exp.el
index ce5fc58..b521dda 100644
--- a/lisp/hippie-exp.el
+++ b/lisp/hippie-exp.el
@@ -411,14 +411,14 @@ undoes the expansion."
"Construct a function similar to `hippie-expand'.
Make it use the expansion functions in TRY-LIST. An optional second
argument VERBOSE non-nil makes the function verbose."
- `(function (lambda (arg)
- ,(concat
- "Try to expand text before point, using the following functions: \n"
- (mapconcat 'prin1-to-string (eval try-list) ", "))
- (interactive "P")
- (let ((hippie-expand-try-functions-list ,try-list)
- (hippie-expand-verbose ,verbose))
- (hippie-expand arg)))))
+ `(lambda (arg)
+ ,(concat
+ "Try to expand text before point, using the following functions: \n"
+ (mapconcat 'prin1-to-string (eval try-list) ", "))
+ (interactive "P")
+ (let ((hippie-expand-try-functions-list ,try-list)
+ (hippie-expand-verbose ,verbose))
+ (hippie-expand arg))))
;;; Here follows the try-functions and their requisites:
@@ -534,10 +534,10 @@ string). It returns t if a new completion is found, nil
otherwise."
(setq he-expand-list
(and (not (equal he-search-string ""))
(sort (all-completions he-search-string obarray
- (function (lambda (sym)
+ (lambda (sym)
(or (boundp sym)
(fboundp sym)
- (symbol-plist sym)))))
+ (symbol-plist sym))))
'string-lessp)))))
(while (and he-expand-list
(he-string-member (car he-expand-list) he-tried-table))
@@ -563,10 +563,10 @@ otherwise."
(if (not (string= he-search-string ""))
(setq expansion
(try-completion he-search-string obarray
- (function (lambda (sym)
+ (lambda (sym)
(or (boundp sym)
(fboundp sym)
- (symbol-plist sym)))))))
+ (symbol-plist sym))))))
(if (or (eq expansion t)
(string= expansion he-search-string)
(he-string-member expansion he-tried-table))
@@ -821,10 +821,10 @@ string). It returns t if a new expansion is found, nil
otherwise."
(he-init-string (he-dabbrev-beg) (point))
(setq he-expand-list
(and (not (equal he-search-string ""))
- (mapcar (function (lambda (sym)
+ (mapcar (lambda (sym)
(if (and (boundp sym) (vectorp (eval sym)))
(abbrev-expansion (downcase he-search-string)
- (eval sym)))))
+ (eval sym))))
(append '(local-abbrev-table
global-abbrev-table)
abbrev-table-name-list))))))
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 439843a..1e6fea8 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -491,8 +491,8 @@ non-nil, it is used to sort CODINGS instead."
0)))
1)
))))))
- (sort codings (function (lambda (x y)
- (> (funcall func x) (funcall func y))))))))
+ (sort codings (lambda (x y)
+ (> (funcall func x) (funcall func y)))))))
(defun find-coding-systems-region (from to)
"Return a list of proper coding systems to encode a text between FROM and TO.
@@ -888,7 +888,7 @@ It is highly recommended to fix it before writing to a
file."
;; Change elements of the list to (coding . base-coding).
(setq default-coding-system
- (mapcar (function (lambda (x) (cons x (coding-system-base x))))
+ (mapcar (lambda (x) (cons x (coding-system-base x)))
default-coding-system))
(if (and auto-cs (not no-other-defaults))
@@ -1082,7 +1082,7 @@ it asks the user to select a proper coding system."
(if (fboundp select-safe-coding-system-function)
(funcall select-safe-coding-system-function
(point-min) (point-max) coding
- (function (lambda (x) (coding-system-get x :mime-charset))))
+ (lambda (x) (coding-system-get x :mime-charset)))
coding)))
;;; Language support stuff.
@@ -1261,7 +1261,7 @@ This returns a language environment name as a string."
(name (completing-read prompt
language-info-alist
(and key
- (function (lambda (elm) (and (listp elm)
(assq key elm)))))
+ (lambda (elm) (and (listp elm) (assq key
elm))))
t nil nil default)))
(if (and (> (length name) 0)
(or (not key)
@@ -2965,9 +2965,9 @@ STR should be a unibyte string."
(mapconcat
(if (and coding-system (eq (coding-system-type coding-system) 'iso-2022))
;; Try to get a pretty description for ISO 2022 escape sequences.
- (function (lambda (x) (or (cdr (assq x iso-2022-control-alist))
- (format "#x%02X" x))))
- (function (lambda (x) (format "#x%02X" x))))
+ (lambda (x) (or (cdr (assq x iso-2022-control-alist))
+ (format "#x%02X" x)))
+ (lambda (x) (format "#x%02X" x)))
str " "))
(defun encode-coding-char (char coding-system &optional charset)
diff --git a/lisp/international/quail.el b/lisp/international/quail.el
index 3299cc5..5abd668 100644
--- a/lisp/international/quail.el
+++ b/lisp/international/quail.el
@@ -787,7 +787,7 @@ you type is correctly handled."
(defun quail-keyseq-translate (keyseq)
(apply 'string
- (mapcar (function (lambda (x) (quail-keyboard-translate x)))
+ (mapcar (lambda (x) (quail-keyboard-translate x))
keyseq)))
(defun quail-insert-kbd-layout (kbd-layout)
@@ -2145,7 +2145,7 @@ minibuffer and the selected frame has no other windows)."
(setq str
(format "%s[%s]"
str
- (concat (sort (mapcar (function (lambda (x) (car x)))
+ (concat (sort (mapcar (lambda (x) (car x))
(cdr map))
'<)))))
;; Show list of translations.
@@ -2349,13 +2349,13 @@ Optional 6th arg IGNORES is a list of translations to
ignore."
((consp translation)
(setq translation (cdr translation))
(let ((multibyte nil))
- (mapc (function (lambda (x)
- ;; Accept only non-ASCII chars not
- ;; listed in IGNORES.
- (if (and (if (integerp x) (> x 127)
- (string-match-p "[^[:ascii:]]" x))
- (not (member x ignores)))
- (setq multibyte t))))
+ (mapc (lambda (x)
+ ;; Accept only non-ASCII chars not
+ ;; listed in IGNORES.
+ (if (and (if (integerp x) (> x 127)
+ (string-match-p "[^[:ascii:]]" x))
+ (not (member x ignores)))
+ (setq multibyte t)))
translation)
(when multibyte
(setcdr decode-map
@@ -2380,11 +2380,11 @@ These are stored in DECODE-MAP using the concise
format. DECODE-MAP
should be made by `quail-build-decode-map' (which see)."
(setq decode-map
(sort (cdr decode-map)
- (function (lambda (x y)
- (setq x (car x) y (car y))
- (or (> (length x) (length y))
- (and (= (length x) (length y))
- (not (string< x y))))))))
+ (lambda (x y)
+ (setq x (car x) y (car y))
+ (or (> (length x) (length y))
+ (and (= (length x) (length y))
+ (not (string< x y)))))))
(let ((window-width (window-width (get-buffer-window
(current-buffer) 'visible)))
(single-trans-width 4)
diff --git a/lisp/jka-compr.el b/lisp/jka-compr.el
index eef3d14..e1a3058 100644
--- a/lisp/jka-compr.el
+++ b/lisp/jka-compr.el
@@ -664,11 +664,11 @@ and `inhibit-local-variables-suffixes' that were added
by `jka-compr-installed'."
;; Delete from inhibit-local-variables-suffixes what jka-compr-install added.
(mapc
- (function (lambda (x)
- (and (jka-compr-info-strip-extension x)
- (setq inhibit-local-variables-suffixes
- (delete (jka-compr-info-regexp x)
- inhibit-local-variables-suffixes)))))
+ (lambda (x)
+ (and (jka-compr-info-strip-extension x)
+ (setq inhibit-local-variables-suffixes
+ (delete (jka-compr-info-regexp x)
+ inhibit-local-variables-suffixes))))
jka-compr-compression-info-list--internal)
(let* ((fnha (cons nil file-name-handler-alist))
diff --git a/lisp/locate.el b/lisp/locate.el
index bc78e06..44a67ab 100644
--- a/lisp/locate.el
+++ b/lisp/locate.el
@@ -668,11 +668,11 @@ the database on the command line."
(or (file-exists-p database)
(error "Database file %s does not exist" database))
(let ((locate-make-command-line
- (function (lambda (string)
- (cons locate-command
- (list (concat "--database="
- (expand-file-name database))
- string))))))
+ (lambda (string)
+ (cons locate-command
+ (list (concat "--database="
+ (expand-file-name database))
+ string)))))
(locate search-string)))
(defun locate-do-redisplay (&optional arg test-for-subdir)
diff --git a/lisp/mail/mailabbrev.el b/lisp/mail/mailabbrev.el
index 09afad7..de4fe25 100644
--- a/lisp/mail/mailabbrev.el
+++ b/lisp/mail/mailabbrev.el
@@ -377,11 +377,11 @@ double-quotes."
(setq result (cons (substring definition start end) result)
start (and end (match-end 0)))))
(setq definition
- (mapconcat (function (lambda (x)
+ (mapconcat (lambda (x)
(or (mail-resolve-all-aliases-1
- (intern-soft (downcase x) mail-abbrevs)
- (cons sym so-far))
- x)))
+ (intern-soft (downcase x) mail-abbrevs)
+ (cons sym so-far))
+ x))
(nreverse result)
mail-alias-separator-string))
(set sym definition))))
@@ -436,12 +436,12 @@ of a mail alias. The value is set up, buffer-local, when
first needed.")
(_ (aref (standard-syntax-table) ?_))
(w (aref (standard-syntax-table) ?w)))
(map-char-table
- (function (lambda (key value)
- (if (null value)
- ;; Fetch the inherited value
- (setq value (aref tab key)))
- (if (equal value _)
- (set-char-table-range tab key w))))
+ (lambda (key value)
+ (if (null value)
+ ;; Fetch the inherited value
+ (setq value (aref tab key)))
+ (if (equal value _)
+ (set-char-table-range tab key w)))
tab)
(modify-syntax-entry ?@ "w" tab)
(modify-syntax-entry ?% "w" tab)
diff --git a/lisp/mh-e/mh-seq.el b/lisp/mh-e/mh-seq.el
index 41c8489..a8fb46d 100644
--- a/lisp/mh-e/mh-seq.el
+++ b/lisp/mh-e/mh-seq.el
@@ -794,9 +794,9 @@ If SAVE-REFILES is non-nil, then keep the sequences
that note messages to be refiled."
(let ((seqs ()))
(cond (save-refiles
- (mh-mapc (function (lambda (seq) ; Save the refiling sequences
- (if (mh-folder-name-p (mh-seq-name seq))
- (setq seqs (cons seq seqs)))))
+ (mh-mapc (lambda (seq) ; Save the refiling sequences
+ (if (mh-folder-name-p (mh-seq-name seq))
+ (setq seqs (cons seq seqs))))
mh-seq-list)))
(save-excursion
(if (eq 0 (mh-exec-cmd-quiet nil "mark" folder "-list"))
diff --git a/lisp/net/eudcb-ldap.el b/lisp/net/eudcb-ldap.el
index 88c58f5..1764f03 100644
--- a/lisp/net/eudcb-ldap.el
+++ b/lisp/net/eudcb-ldap.el
@@ -138,10 +138,10 @@ RETURN-ATTRS is a list of attributes to return,
defaulting to
;; Apply eudc-duplicate-attribute-handling-method
(if (not (eq 'list eudc-duplicate-attribute-handling-method))
(mapc
- (function (lambda (record)
- (setq final-result
- (append (eudc-filter-duplicate-attributes record)
- final-result))))
+ (lambda (record)
+ (setq final-result
+ (append (eudc-filter-duplicate-attributes record)
+ final-result)))
result))
final-result))
diff --git a/lisp/obsolete/nnir.el b/lisp/obsolete/nnir.el
index aec5ed3..6f17854 100644
--- a/lisp/obsolete/nnir.el
+++ b/lisp/obsolete/nnir.el
@@ -874,9 +874,9 @@ Windows NT 4.0."
;; Sort by score
(apply #'vector
(sort artlist
- (function (lambda (x y)
- (> (nnir-artitem-rsv x)
- (nnir-artitem-rsv y)))))))))
+ (lambda (x y)
+ (> (nnir-artitem-rsv x)
+ (nnir-artitem-rsv y))))))))
;; Swish-E interface.
(defun nnir-run-swish-e (query server &optional _group)
@@ -969,9 +969,9 @@ Tested with swish-e-2.0.1 on Windows NT 4.0."
;; Sort by score
(apply #'vector
(sort artlist
- (function (lambda (x y)
- (> (nnir-artitem-rsv x)
- (nnir-artitem-rsv y)))))))))
+ (lambda (x y)
+ (> (nnir-artitem-rsv x)
+ (nnir-artitem-rsv y))))))))
;; HyREX interface
(defun nnir-run-hyrex (query server &optional group)
@@ -1037,12 +1037,12 @@ Tested with swish-e-2.0.1 on Windows NT 4.0."
(message "Massaging hyrex-search output...done.")
(apply #'vector
(sort artlist
- (function (lambda (x y)
- (if (string-lessp (nnir-artitem-group x)
- (nnir-artitem-group y))
- t
- (< (nnir-artitem-number x)
- (nnir-artitem-number y)))))))
+ (lambda (x y)
+ (if (string-lessp (nnir-artitem-group x)
+ (nnir-artitem-group y))
+ t
+ (< (nnir-artitem-number x)
+ (nnir-artitem-number y))))))
)))
;; Namazu interface
@@ -1112,9 +1112,9 @@ Tested with Namazu 2.0.6 on a GNU/Linux system."
;; sort artlist by score
(apply #'vector
(sort artlist
- (function (lambda (x y)
- (> (nnir-artitem-rsv x)
- (nnir-artitem-rsv y)))))))))
+ (lambda (x y)
+ (> (nnir-artitem-rsv x)
+ (nnir-artitem-rsv y))))))))
(defun nnir-run-notmuch (query server &optional groups)
"Run QUERY with GROUPS from SERVER against notmuch.
diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el
index ac3d081..8596d78 100644
--- a/lisp/progmodes/make-mode.el
+++ b/lisp/progmodes/make-mode.el
@@ -1600,20 +1600,19 @@ Checks each target in TARGET-TABLE using
and generates the overview, one line per target name."
(insert
(mapconcat
- (function (lambda (item)
- (let* ((target-name (car item))
- (no-prereqs (not (member target-name prereq-list)))
- (needs-rebuild (or no-prereqs
- (funcall
-
makefile-query-one-target-method-function
- target-name
- filename))))
- (format "\t%s%s"
- target-name
- (cond (no-prereqs " .. has no prerequisites")
- (needs-rebuild " .. NEEDS REBUILD")
- (t " .. is up to date"))))
- ))
+ (lambda (item)
+ (let* ((target-name (car item))
+ (no-prereqs (not (member target-name prereq-list)))
+ (needs-rebuild (or no-prereqs
+ (funcall
+ makefile-query-one-target-method-function
+ target-name
+ filename))))
+ (format "\t%s%s"
+ target-name
+ (cond (no-prereqs " .. has no prerequisites")
+ (needs-rebuild " .. NEEDS REBUILD")
+ (t " .. is up to date")))))
target-table "\n"))
(goto-char (point-min))
(delete-file filename)) ; remove the tmpfile
@@ -1687,9 +1686,9 @@ Then prompts for all required parameters."
(defun makefile-prompt-for-gmake-funargs (function-name prompt-list)
(mapconcat
- (function (lambda (one-prompt)
- (read-string (format "[%s] %s: " function-name one-prompt)
- nil)))
+ (lambda (one-prompt)
+ (read-string (format "[%s] %s: " function-name one-prompt)
+ nil))
prompt-list
","))
diff --git a/lisp/shadowfile.el b/lisp/shadowfile.el
index 6bea5e2..31f3a34 100644
--- a/lisp/shadowfile.el
+++ b/lisp/shadowfile.el
@@ -540,11 +540,11 @@ them again, unless you make more changes to the files.
To cancel a shadow
permanently, remove the group from `shadow-literal-groups' or
`shadow-regexp-groups'."
(interactive)
- (map-y-or-n-p (function (lambda (pair)
- (format "Cancel copying %s to %s? "
- (car pair) (cdr pair))))
- (function (lambda (pair)
- (shadow-remove-from-todo pair)))
+ (map-y-or-n-p (lambda (pair)
+ (format "Cancel copying %s to %s? "
+ (car pair) (cdr pair)))
+ (lambda (pair)
+ (shadow-remove-from-todo pair))
shadow-files-to-copy
'("shadow" "shadows" "cancel copy"))
(message "There are %d shadows to be updated."
@@ -601,8 +601,8 @@ and to are absolute file names."
shadow-homedir))
(canonical-file (shadow-contract-file-name absolute-file))
(shadows
- (mapcar (function (lambda (shadow)
- (cons absolute-file shadow)))
+ (mapcar (lambda (shadow)
+ (cons absolute-file shadow))
(append
(shadow-shadows-of-1
canonical-file shadow-literal-groups nil)
diff --git a/lisp/sort.el b/lisp/sort.el
index f878db2..b9a27a8 100644
--- a/lisp/sort.el
+++ b/lisp/sort.el
@@ -251,7 +251,7 @@ the sort order."
(narrow-to-region beg end)
(goto-char (point-min))
(sort-subr reverse
- (function (lambda () (skip-chars-forward "\n")))
+ (lambda () (skip-chars-forward "\n"))
'forward-page))))
(defvar sort-fields-syntax-table nil)
@@ -316,16 +316,16 @@ FIELD, BEG and END. BEG and END specify region to sort."
;;region to sort."
;; (interactive "p\nr")
;; (sort-fields-1 field beg end
-;; (function (lambda ()
-;; (sort-skip-fields field)
-;; (string-to-number
-;; (buffer-substring
-;; (point)
-;; (save-excursion
-;; (re-search-forward
-;; "[+-]?[0-9]*\\.?[0-9]*\\([eE][+-]?[0-9]+\\)?")
-;; (point))))))
-;; nil))
+;; (lambda ()
+;; (sort-skip-fields field)
+;; (string-to-number
+;; (buffer-substring
+;; (point)
+;; (save-excursion
+;; (re-search-forward
+;; "[+-]?[0-9]*\\.?[0-9]*\\([eE][+-]?[0-9]+\\)?")
+;; (point)))))
+;; nil))
;;;###autoload
(defun sort-fields (field beg end)
@@ -340,10 +340,10 @@ the sort order."
(let ;; To make `end-of-line' and etc. to ignore fields.
((inhibit-field-text-motion t))
(sort-fields-1 field beg end
- (function (lambda ()
- (sort-skip-fields field)
- nil))
- (function (lambda () (skip-chars-forward "^ \t\n"))))))
+ (lambda ()
+ (sort-skip-fields field)
+ nil)
+ (lambda () (skip-chars-forward "^ \t\n")))))
(defun sort-fields-1 (field beg end startkeyfun endkeyfun)
(let ((tbl (syntax-table)))
@@ -457,21 +457,21 @@ sRegexp specifying key within record: \nr")
(goto-char (match-beginning 0))
(sort-subr reverse
'sort-regexp-fields-next-record
- (function (lambda ()
- (goto-char sort-regexp-record-end)))
- (function (lambda ()
- (let ((n 0))
- (cond ((numberp key-regexp)
- (setq n key-regexp))
- ((re-search-forward
- key-regexp sort-regexp-record-end t)
- (setq n 0))
- (t (throw 'key nil)))
- (condition-case ()
- (cons (match-beginning n)
- (match-end n))
- ;; if there was no such register
- (error (throw 'key nil)))))))))))
+ (lambda ()
+ (goto-char sort-regexp-record-end))
+ (lambda ()
+ (let ((n 0))
+ (cond ((numberp key-regexp)
+ (setq n key-regexp))
+ ((re-search-forward
+ key-regexp sort-regexp-record-end t)
+ (setq n 0))
+ (t (throw 'key nil)))
+ (condition-case ()
+ (cons (match-beginning n)
+ (match-end n))
+ ;; if there was no such register
+ (error (throw 'key nil))))))))))
(defvar sort-columns-subprocess t)
diff --git a/lisp/subr.el b/lisp/subr.el
index 04d8132..6e9f66f 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1278,10 +1278,10 @@ The normal global definition of the character C-x
indirects to this keymap.")
"Convert a key sequence to a list of events."
(if (vectorp key)
(append key nil)
- (mapcar (function (lambda (c)
- (if (> c 127)
- (logxor c listify-key-sequence-1)
- c)))
+ (mapcar (lambda (c)
+ (if (> c 127)
+ (logxor c listify-key-sequence-1)
+ c))
key)))
(defun eventp (object)
diff --git a/lisp/term/wyse50.el b/lisp/term/wyse50.el
index 6d72d4a..f06563e 100644
--- a/lisp/term/wyse50.el
+++ b/lisp/term/wyse50.el
@@ -126,9 +126,9 @@
;; On such terminals, Emacs should sacrifice the first and last character of
;; each mode line, rather than a whole screen column!
(add-hook 'kill-emacs-hook
- (function (lambda () (interactive)
- (send-string-to-terminal
- (concat "\ea23R" (1+ (frame-width)) "C\eG0"))))))
+ (lambda () (interactive)
+ (send-string-to-terminal
+ (concat "\ea23R" (1+ (frame-width)) "C\eG0")))))
(defun enable-arrow-keys ()
"To be called by `tty-setup-hook'. Overrides 6 Emacs standard keys
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 3358cf1..31b699c 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -2464,14 +2464,14 @@ SPC: Accept word this time.
(progn
(require 'ehelp)
(with-electric-help
- (function (lambda ()
- ;;This shouldn't be necessary: with-electric-help needs
- ;; an optional argument telling it about the smallest
- ;; acceptable window-height of the help buffer.
- ;;(if (< (window-height) 15)
- ;; (enlarge-window
- ;; (- 15 (ispell-adjusted-window-height))))
- (princ "Selections are:
+ (lambda ()
+ ;;This shouldn't be necessary: with-electric-help needs
+ ;; an optional argument telling it about the smallest
+ ;; acceptable window-height of the help buffer.
+ ;;(if (< (window-height) 15)
+ ;; (enlarge-window
+ ;; (- 15 (ispell-adjusted-window-height))))
+ (princ "Selections are:
DIGIT: Replace the word with a digit offered in the *Choices* buffer.
SPC: Accept word this time.
@@ -2491,7 +2491,7 @@ SPC: Accept word this time.
`C-l': Redraw screen.
`C-r': Recursive edit.
`C-z': Suspend Emacs or iconify frame.")
- nil))))
+ nil)))
(let ((help-1 (concat "[r/R]eplace word; [a/A]ccept for this session; "
@@ -3274,15 +3274,15 @@ otherwise, the current line is skipped."
Generated from `ispell-tex-skip-alists'."
(concat
;; raw tex keys
- (mapconcat (function (lambda (lst) (car lst)))
+ (mapconcat (lambda (lst) (car lst))
(car ispell-tex-skip-alists)
"\\|")
"\\|"
;; keys wrapped in begin{}
- (mapconcat (function (lambda (lst)
- (concat "\\\\begin[ \t\n]*{[ \t\n]*"
- (car lst)
- "[ \t\n]*}")))
+ (mapconcat (lambda (lst)
+ (concat "\\\\begin[ \t\n]*{[ \t\n]*"
+ (car lst)
+ "[ \t\n]*}"))
(car (cdr ispell-tex-skip-alists))
"\\|")))
diff --git a/lisp/textmodes/page-ext.el b/lisp/textmodes/page-ext.el
index c2b7b66..b357bbb 100644
--- a/lisp/textmodes/page-ext.el
+++ b/lisp/textmodes/page-ext.el
@@ -429,20 +429,19 @@ REVERSE (non-nil means reverse order), BEG and END
(region to sort)."
;; NEXTRECFUN is called with point at the end of the
;; previous record. It moves point to the start of the
;; next record.
- (function (lambda ()
- (re-search-forward page-delimiter nil t)
- (skip-chars-forward " \t\n")
- ))
+ (lambda ()
+ (re-search-forward page-delimiter nil t)
+ (skip-chars-forward " \t\n"))
;; ENDRECFUN is called with point within the record.
;; It should move point to the end of the record.
- (function (lambda ()
- (if (re-search-forward
- page-delimiter
- nil
- t)
- (goto-char (match-beginning 0))
- (goto-char (point-max))))))))
+ (lambda ()
+ (if (re-search-forward
+ page-delimiter
+ nil
+ t)
+ (goto-char (match-beginning 0))
+ (goto-char (point-max)))))))
(define-obsolete-function-alias 'sort-pages-buffer #'pages-sort-buffer "27.1")
(defun pages-sort-buffer (&optional reverse)
diff --git a/lisp/textmodes/refer.el b/lisp/textmodes/refer.el
index c8fd0be..888c310 100644
--- a/lisp/textmodes/refer.el
+++ b/lisp/textmodes/refer.el
@@ -249,9 +249,9 @@ found on the last `refer-find-entry' or
`refer-find-next-entry'."
(forward-paragraph 1)
(setq end (point))
(setq found
- (refer-every (function (lambda (keyword)
- (goto-char begin)
- (re-search-forward keyword end t)))
+ (refer-every (lambda (keyword)
+ (goto-char begin)
+ (re-search-forward keyword end t))
keywords-list))
(if (not found)
(progn
diff --git a/lisp/url/url-expand.el b/lisp/url/url-expand.el
index be9b542..9f52f25 100644
--- a/lisp/url/url-expand.el
+++ b/lisp/url/url-expand.el
@@ -65,10 +65,10 @@ path components followed by `..' are removed, along with
the `..' itself."
(if (and url (not (string-match "^#" url)))
;; Need to nuke newlines and spaces in the URL, or we open
;; ourselves up to potential security holes.
- (setq url (mapconcat (function (lambda (x)
- (if (memq x '(? ?\n ?\r))
- ""
- (char-to-string x))))
+ (setq url (mapconcat (lambda (x)
+ (if (memq x '(? ?\n ?\r))
+ ""
+ (char-to-string x)))
url "")))
;; Need to figure out how/where to expand the fragment relative to
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 206dd9d: Don't quote lambdas in several places,
Stefan Kangas <=