diff options
| author | Stefan Kangas | 2021-10-21 23:35:07 +0200 |
|---|---|---|
| committer | Stefan Kangas | 2021-10-21 23:35:07 +0200 |
| commit | 357d273d2e312fca7b187dca45585cbdbf4c6469 (patch) | |
| tree | 781054ab5588885211f9d6f56cf12ef191d102c8 | |
| parent | 6352e0a55587e15fa3bef878a329c1a148749cfe (diff) | |
| download | emacs-357d273d2e312fca7b187dca45585cbdbf4c6469.tar.gz emacs-357d273d2e312fca7b187dca45585cbdbf4c6469.zip | |
Remove redundant #' before lambda
* admin/unidata/unidata-gen.el (unidata-gen-table)
(unidata-gen-table-symbol, unidata-gen-table-integer)
(unidata-gen-table-numeric, unidata-gen-table-word-list)
(unidata-describe-decomposition):
* lisp/apropos.el (apropos-user-option):
* lisp/bookmark.el (bookmark-bmenu-search):
* lisp/composite.el (unicode-category-table):
* lisp/elec-pair.el (electric-pair--balance-info):
* lisp/electric.el (electric-quote-chars):
* lisp/emulation/cua-base.el (cua-rectangle-mark-key):
* lisp/epa-hook.el (epa-file-encrypt-to):
* lisp/faces.el (face-font-selection-order)
(face-font-family-alternatives, face-font-registry-alternatives)
(face-valid-attribute-values, tty-run-terminal-initialization):
* lisp/files.el (recover-file, file-expand-wildcards):
* lisp/frame.el (frames-on-display-list):
* lisp/help-at-pt.el (help-at-pt-display-when-idle):
* lisp/help-fns.el (help-fns--face-attributes):
* lisp/ido.el (ido-mode, ido-unc-hosts):
* lisp/isearch.el (isearch-highlight-regexp)
(isearch-highlight-lines-matching-regexp):
* lisp/language/indian.el (script-regexp-alist):
* lisp/language/lao.el:
* lisp/leim/quail/ipa.el (ipa-x-sampa-prepend-to-keymap-entry):
* lisp/mh-e/mh-folder.el (mh-process-commands):
* lisp/mh-e/mh-mime.el (mh-display-with-external-viewer):
* lisp/ps-mule.el (ps-mule-end-job):
* lisp/ps-print.el (ps-color-scale, ps-background-pages)
(ps-background-text, ps-background-image, ps-background)
(ps-begin-job, ps-print-translation-table):
* lisp/recentf.el (recentf-sort-ascending)
(recentf-sort-descending, recentf-sort-basenames-ascending)
(recentf-sort-basenames-descending)
(recentf-sort-directories-ascending)
(recentf-sort-directories-descending):
* lisp/replace.el (occur-engine-add-prefix):
* lisp/select.el (xselect--encode-string):
* lisp/server.el (server-use-tcp):
* lisp/ses.el (ses-sort-column):
* lisp/sort.el (sort-columns):
* lisp/term/ns-win.el (window-system-initialization):
* lisp/tree-widget.el (tree-widget-image-formats):
* lisp/whitespace.el (whitespace-report-region): Remove redundant #'
before lambda.
| -rw-r--r-- | admin/unidata/unidata-gen.el | 56 | ||||
| -rw-r--r-- | lisp/apropos.el | 6 | ||||
| -rw-r--r-- | lisp/bookmark.el | 8 | ||||
| -rw-r--r-- | lisp/composite.el | 8 | ||||
| -rw-r--r-- | lisp/elec-pair.el | 78 | ||||
| -rw-r--r-- | lisp/electric.el | 10 | ||||
| -rw-r--r-- | lisp/emulation/cua-base.el | 22 | ||||
| -rw-r--r-- | lisp/epa-hook.el | 18 | ||||
| -rw-r--r-- | lisp/faces.el | 60 | ||||
| -rw-r--r-- | lisp/files.el | 22 | ||||
| -rw-r--r-- | lisp/frame.el | 10 | ||||
| -rw-r--r-- | lisp/help-at-pt.el | 10 | ||||
| -rw-r--r-- | lisp/help-fns.el | 2 | ||||
| -rw-r--r-- | lisp/ido.el | 10 | ||||
| -rw-r--r-- | lisp/isearch.el | 8 | ||||
| -rw-r--r-- | lisp/language/indian.el | 12 | ||||
| -rw-r--r-- | lisp/language/lao.el | 10 | ||||
| -rw-r--r-- | lisp/leim/quail/ipa.el | 8 | ||||
| -rw-r--r-- | lisp/mh-e/mh-folder.el | 72 | ||||
| -rw-r--r-- | lisp/mh-e/mh-mime.el | 36 | ||||
| -rw-r--r-- | lisp/ps-mule.el | 4 | ||||
| -rw-r--r-- | lisp/ps-print.el | 146 | ||||
| -rw-r--r-- | lisp/recentf.el | 50 | ||||
| -rw-r--r-- | lisp/replace.el | 10 | ||||
| -rw-r--r-- | lisp/select.el | 14 | ||||
| -rw-r--r-- | lisp/server.el | 12 | ||||
| -rw-r--r-- | lisp/ses.el | 2 | ||||
| -rw-r--r-- | lisp/sort.el | 4 | ||||
| -rw-r--r-- | lisp/term/ns-win.el | 8 | ||||
| -rw-r--r-- | lisp/tree-widget.el | 4 | ||||
| -rw-r--r-- | lisp/whitespace.el | 53 |
31 files changed, 385 insertions, 388 deletions
diff --git a/admin/unidata/unidata-gen.el b/admin/unidata/unidata-gen.el index abd41e34a48..fc397a9a6ca 100644 --- a/admin/unidata/unidata-gen.el +++ b/admin/unidata/unidata-gen.el | |||
| @@ -583,17 +583,17 @@ Property value is a symbol `o' (Open), `c' (Close), or `n' (None)." | |||
| 583 | (aset vec (- range start) val-code)) | 583 | (aset vec (- range start) val-code)) |
| 584 | (setq tail (cdr tail))) | 584 | (setq tail (cdr tail))) |
| 585 | (setq str "\002" val-code -1 count 0) | 585 | (setq str "\002" val-code -1 count 0) |
| 586 | (mapc #'(lambda (x) | 586 | (mapc (lambda (x) |
| 587 | (if (= val-code x) | 587 | (if (= val-code x) |
| 588 | (setq count (1+ count)) | 588 | (setq count (1+ count)) |
| 589 | (if (> count 2) | 589 | (if (> count 2) |
| 590 | (setq str (concat str (string val-code | 590 | (setq str (concat str (string val-code |
| 591 | (+ count 128)))) | 591 | (+ count 128)))) |
| 592 | (if (= count 2) | 592 | (if (= count 2) |
| 593 | (setq str (concat str (string val-code val-code))) | 593 | (setq str (concat str (string val-code val-code))) |
| 594 | (if (= count 1) | 594 | (if (= count 1) |
| 595 | (setq str (concat str (string val-code)))))) | 595 | (setq str (concat str (string val-code)))))) |
| 596 | (setq val-code x count 1))) | 596 | (setq val-code x count 1))) |
| 597 | vec) | 597 | vec) |
| 598 | (if (= count 128) | 598 | (if (= count 128) |
| 599 | (if val | 599 | (if val |
| @@ -613,8 +613,8 @@ Property value is a symbol `o' (Open), `c' (Close), or `n' (None)." | |||
| 613 | 613 | ||
| 614 | (defun unidata-gen-table-symbol (prop index default-value val-list) | 614 | (defun unidata-gen-table-symbol (prop index default-value val-list) |
| 615 | (let ((table (unidata-gen-table prop index | 615 | (let ((table (unidata-gen-table prop index |
| 616 | #'(lambda (x) (and (> (length x) 0) | 616 | (lambda (x) (and (> (length x) 0) |
| 617 | (intern x))) | 617 | (intern x))) |
| 618 | default-value val-list))) | 618 | default-value val-list))) |
| 619 | (set-char-table-extra-slot table 1 0) | 619 | (set-char-table-extra-slot table 1 0) |
| 620 | (set-char-table-extra-slot table 2 1) | 620 | (set-char-table-extra-slot table 2 1) |
| @@ -622,8 +622,8 @@ Property value is a symbol `o' (Open), `c' (Close), or `n' (None)." | |||
| 622 | 622 | ||
| 623 | (defun unidata-gen-table-integer (prop index default-value val-list) | 623 | (defun unidata-gen-table-integer (prop index default-value val-list) |
| 624 | (let ((table (unidata-gen-table prop index | 624 | (let ((table (unidata-gen-table prop index |
| 625 | #'(lambda (x) (and (> (length x) 0) | 625 | (lambda (x) (and (> (length x) 0) |
| 626 | (string-to-number x))) | 626 | (string-to-number x))) |
| 627 | default-value val-list))) | 627 | default-value val-list))) |
| 628 | (set-char-table-extra-slot table 1 0) | 628 | (set-char-table-extra-slot table 1 0) |
| 629 | (set-char-table-extra-slot table 2 1) | 629 | (set-char-table-extra-slot table 2 1) |
| @@ -631,13 +631,13 @@ Property value is a symbol `o' (Open), `c' (Close), or `n' (None)." | |||
| 631 | 631 | ||
| 632 | (defun unidata-gen-table-numeric (prop index default-value val-list) | 632 | (defun unidata-gen-table-numeric (prop index default-value val-list) |
| 633 | (let ((table (unidata-gen-table prop index | 633 | (let ((table (unidata-gen-table prop index |
| 634 | #'(lambda (x) | 634 | (lambda (x) |
| 635 | (if (string-match "/" x) | 635 | (if (string-match "/" x) |
| 636 | (/ (float (string-to-number x)) | 636 | (/ (float (string-to-number x)) |
| 637 | (string-to-number | 637 | (string-to-number |
| 638 | (substring x (match-end 0)))) | 638 | (substring x (match-end 0)))) |
| 639 | (if (> (length x) 0) | 639 | (if (> (length x) 0) |
| 640 | (string-to-number x)))) | 640 | (string-to-number x)))) |
| 641 | default-value val-list))) | 641 | default-value val-list))) |
| 642 | (set-char-table-extra-slot table 1 0) | 642 | (set-char-table-extra-slot table 1 0) |
| 643 | (set-char-table-extra-slot table 2 2) | 643 | (set-char-table-extra-slot table 2 2) |
| @@ -1000,7 +1000,7 @@ Property value is a symbol `o' (Open), `c' (Close), or `n' (None)." | |||
| 1000 | (cl-incf (alist-get elt (cdr word-list) 0))))) | 1000 | (cl-incf (alist-get elt (cdr word-list) 0))))) |
| 1001 | (set-char-table-range table (cons start limit) vec)))))) | 1001 | (set-char-table-range table (cons start limit) vec)))))) |
| 1002 | (setq word-list (sort (cdr word-list) | 1002 | (setq word-list (sort (cdr word-list) |
| 1003 | #'(lambda (x y) (> (cdr x) (cdr y))))) | 1003 | (lambda (x y) (> (cdr x) (cdr y))))) |
| 1004 | (setq tail word-list idx 0) | 1004 | (setq tail word-list idx 0) |
| 1005 | (while tail | 1005 | (while tail |
| 1006 | (setcdr (car tail) (unidata-encode-word idx)) | 1006 | (setcdr (car tail) (unidata-encode-word idx)) |
| @@ -1266,11 +1266,11 @@ Property value is a symbol `o' (Open), `c' (Close), or `n' (None)." | |||
| 1266 | 1266 | ||
| 1267 | (defun unidata-describe-decomposition (val) | 1267 | (defun unidata-describe-decomposition (val) |
| 1268 | (mapconcat | 1268 | (mapconcat |
| 1269 | #'(lambda (x) | 1269 | (lambda (x) |
| 1270 | (if (symbolp x) (symbol-name x) | 1270 | (if (symbolp x) (symbol-name x) |
| 1271 | (concat (string ?') | 1271 | (concat (string ?') |
| 1272 | (compose-string (string x) 0 1 (string ?\t x ?\t)) | 1272 | (compose-string (string x) 0 1 (string ?\t x ?\t)) |
| 1273 | (string ?')))) | 1273 | (string ?')))) |
| 1274 | val " ")) | 1274 | val " ")) |
| 1275 | 1275 | ||
| 1276 | (defun unidata-describe-bidi-bracket-type (val) | 1276 | (defun unidata-describe-bidi-bracket-type (val) |
diff --git a/lisp/apropos.el b/lisp/apropos.el index fc15cd3e011..00919ed91b1 100644 --- a/lisp/apropos.el +++ b/lisp/apropos.el | |||
| @@ -515,9 +515,9 @@ variables, not just user options." | |||
| 515 | current-prefix-arg)) | 515 | current-prefix-arg)) |
| 516 | (apropos-command pattern nil | 516 | (apropos-command pattern nil |
| 517 | (if (or do-all apropos-do-all) | 517 | (if (or do-all apropos-do-all) |
| 518 | #'(lambda (symbol) | 518 | (lambda (symbol) |
| 519 | (and (boundp symbol) | 519 | (and (boundp symbol) |
| 520 | (get symbol 'variable-documentation))) | 520 | (get symbol 'variable-documentation))) |
| 521 | #'custom-variable-p))) | 521 | #'custom-variable-p))) |
| 522 | 522 | ||
| 523 | ;;;###autoload | 523 | ;;;###autoload |
diff --git a/lisp/bookmark.el b/lisp/bookmark.el index 22520ebb7af..a4c28e751ca 100644 --- a/lisp/bookmark.el +++ b/lisp/bookmark.el | |||
| @@ -2314,10 +2314,10 @@ Prompt with completion for the new path." | |||
| 2314 | (lambda () | 2314 | (lambda () |
| 2315 | (setq timer (run-with-idle-timer | 2315 | (setq timer (run-with-idle-timer |
| 2316 | bookmark-search-delay 'repeat | 2316 | bookmark-search-delay 'repeat |
| 2317 | #'(lambda (buf) | 2317 | (lambda (buf) |
| 2318 | (with-current-buffer buf | 2318 | (with-current-buffer buf |
| 2319 | (bookmark-bmenu-filter-alist-by-regexp | 2319 | (bookmark-bmenu-filter-alist-by-regexp |
| 2320 | (minibuffer-contents)))) | 2320 | (minibuffer-contents)))) |
| 2321 | (current-buffer)))) | 2321 | (current-buffer)))) |
| 2322 | (read-string "Pattern: ") | 2322 | (read-string "Pattern: ") |
| 2323 | (when timer (cancel-timer timer) (setq timer nil))) | 2323 | (when timer (cancel-timer timer) (setq timer nil))) |
diff --git a/lisp/composite.el b/lisp/composite.el index 99f528a0779..b5072de5a40 100644 --- a/lisp/composite.el +++ b/lisp/composite.el | |||
| @@ -739,9 +739,9 @@ All non-spacing characters have this function in | |||
| 739 | (let ((elt `([,(purecopy "\\c.\\c^+") 1 compose-gstring-for-graphic] | 739 | (let ((elt `([,(purecopy "\\c.\\c^+") 1 compose-gstring-for-graphic] |
| 740 | [nil 0 compose-gstring-for-graphic]))) | 740 | [nil 0 compose-gstring-for-graphic]))) |
| 741 | (map-char-table | 741 | (map-char-table |
| 742 | #'(lambda (key val) | 742 | (lambda (key val) |
| 743 | (if (memq val '(Mn Mc Me)) | 743 | (if (memq val '(Mn Mc Me)) |
| 744 | (set-char-table-range composition-function-table key elt))) | 744 | (set-char-table-range composition-function-table key elt))) |
| 745 | unicode-category-table)) | 745 | unicode-category-table)) |
| 746 | ;; for dotted-circle | 746 | ;; for dotted-circle |
| 747 | (aset composition-function-table #x25CC | 747 | (aset composition-function-table #x25CC |
| @@ -901,6 +901,4 @@ For more information on Auto Composition mode, see | |||
| 901 | 901 | ||
| 902 | (provide 'composite) | 902 | (provide 'composite) |
| 903 | 903 | ||
| 904 | |||
| 905 | |||
| 906 | ;;; composite.el ends here | 904 | ;;; composite.el ends here |
diff --git a/lisp/elec-pair.el b/lisp/elec-pair.el index ba88c819133..f907bba4c6e 100644 --- a/lisp/elec-pair.el +++ b/lisp/elec-pair.el | |||
| @@ -308,51 +308,51 @@ If point is not enclosed by any lists, return ((t) . (t))." | |||
| 308 | ;; called when `scan-sexps' ran perfectly, when it found | 308 | ;; called when `scan-sexps' ran perfectly, when it found |
| 309 | ;; a parenthesis pointing in the direction of travel. | 309 | ;; a parenthesis pointing in the direction of travel. |
| 310 | ;; Also when travel started inside a comment and exited it. | 310 | ;; Also when travel started inside a comment and exited it. |
| 311 | #'(lambda () | 311 | (lambda () |
| 312 | (setq outermost (list t)) | 312 | (setq outermost (list t)) |
| 313 | (unless innermost | 313 | (unless innermost |
| 314 | (setq innermost (list t))))) | 314 | (setq innermost (list t))))) |
| 315 | (ended-prematurely-fn | 315 | (ended-prematurely-fn |
| 316 | ;; called when `scan-sexps' crashed against a parenthesis | 316 | ;; called when `scan-sexps' crashed against a parenthesis |
| 317 | ;; pointing opposite the direction of travel. After | 317 | ;; pointing opposite the direction of travel. After |
| 318 | ;; traversing that character, the idea is to travel one sexp | 318 | ;; traversing that character, the idea is to travel one sexp |
| 319 | ;; in the opposite direction looking for a matching | 319 | ;; in the opposite direction looking for a matching |
| 320 | ;; delimiter. | 320 | ;; delimiter. |
| 321 | #'(lambda () | 321 | (lambda () |
| 322 | (let* ((pos (point)) | 322 | (let* ((pos (point)) |
| 323 | (matched | 323 | (matched |
| 324 | (save-excursion | 324 | (save-excursion |
| 325 | (cond ((< direction 0) | 325 | (cond ((< direction 0) |
| 326 | (condition-case nil | 326 | (condition-case nil |
| 327 | (eq (char-after pos) | 327 | (eq (char-after pos) |
| 328 | (electric-pair--with-uncached-syntax | 328 | (electric-pair--with-uncached-syntax |
| 329 | (table) | 329 | (table) |
| 330 | (matching-paren | 330 | (matching-paren |
| 331 | (char-before | 331 | (char-before |
| 332 | (scan-sexps (point) 1))))) | 332 | (scan-sexps (point) 1))))) |
| 333 | (scan-error nil))) | 333 | (scan-error nil))) |
| 334 | (t | 334 | (t |
| 335 | ;; In this case, no need to use | 335 | ;; In this case, no need to use |
| 336 | ;; `scan-sexps', we can use some | 336 | ;; `scan-sexps', we can use some |
| 337 | ;; `electric-pair--syntax-ppss' in this | 337 | ;; `electric-pair--syntax-ppss' in this |
| 338 | ;; case (which uses the quicker | 338 | ;; case (which uses the quicker |
| 339 | ;; `syntax-ppss' in some cases) | 339 | ;; `syntax-ppss' in some cases) |
| 340 | (let* ((ppss (electric-pair--syntax-ppss | 340 | (let* ((ppss (electric-pair--syntax-ppss |
| 341 | (1- (point)))) | 341 | (1- (point)))) |
| 342 | (start (car (last (nth 9 ppss)))) | 342 | (start (car (last (nth 9 ppss)))) |
| 343 | (opener (char-after start))) | 343 | (opener (char-after start))) |
| 344 | (and start | 344 | (and start |
| 345 | (eq (char-before pos) | 345 | (eq (char-before pos) |
| 346 | (or (with-syntax-table table | 346 | (or (with-syntax-table table |
| 347 | (matching-paren opener)) | 347 | (matching-paren opener)) |
| 348 | opener)))))))) | 348 | opener)))))))) |
| 349 | (actual-pair (if (> direction 0) | 349 | (actual-pair (if (> direction 0) |
| 350 | (char-before (point)) | 350 | (char-before (point)) |
| 351 | (char-after (point))))) | 351 | (char-after (point))))) |
| 352 | (unless innermost | 352 | (unless innermost |
| 353 | (setq innermost (cons matched actual-pair))) | 353 | (setq innermost (cons matched actual-pair))) |
| 354 | (unless matched | 354 | (unless matched |
| 355 | (setq outermost (cons matched actual-pair))))))) | 355 | (setq outermost (cons matched actual-pair))))))) |
| 356 | (save-excursion | 356 | (save-excursion |
| 357 | (while (not outermost) | 357 | (while (not outermost) |
| 358 | (condition-case err | 358 | (condition-case err |
diff --git a/lisp/electric.el b/lisp/electric.el index 4394fae4366..a2f24ca05c6 100644 --- a/lisp/electric.el +++ b/lisp/electric.el | |||
| @@ -506,11 +506,11 @@ This list's members correspond to left single quote, right single | |||
| 506 | quote, left double quote, and right double quote, respectively." | 506 | quote, left double quote, and right double quote, respectively." |
| 507 | :version "26.1" | 507 | :version "26.1" |
| 508 | :type '(list character character character character) | 508 | :type '(list character character character character) |
| 509 | :safe #'(lambda (x) | 509 | :safe (lambda (x) |
| 510 | (pcase x | 510 | (pcase x |
| 511 | (`(,(pred characterp) ,(pred characterp) | 511 | (`(,(pred characterp) ,(pred characterp) |
| 512 | ,(pred characterp) ,(pred characterp)) | 512 | ,(pred characterp) ,(pred characterp)) |
| 513 | t))) | 513 | t))) |
| 514 | :group 'electricity) | 514 | :group 'electricity) |
| 515 | 515 | ||
| 516 | (defcustom electric-quote-paragraph t | 516 | (defcustom electric-quote-paragraph t |
diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el index a98393fa2e5..befcb423823 100644 --- a/lisp/emulation/cua-base.el +++ b/lisp/emulation/cua-base.el | |||
| @@ -396,17 +396,17 @@ and after the region marked by the rectangle to search." | |||
| 396 | 396 | ||
| 397 | (defcustom cua-rectangle-mark-key [(control return)] | 397 | (defcustom cua-rectangle-mark-key [(control return)] |
| 398 | "Global key used to toggle the cua rectangle mark." | 398 | "Global key used to toggle the cua rectangle mark." |
| 399 | :set #'(lambda (symbol value) | 399 | :set (lambda (symbol value) |
| 400 | (set symbol value) | 400 | (set symbol value) |
| 401 | (when (and (boundp 'cua--keymaps-initialized) | 401 | (when (and (boundp 'cua--keymaps-initialized) |
| 402 | cua--keymaps-initialized) | 402 | cua--keymaps-initialized) |
| 403 | (define-key cua-global-keymap value | 403 | (define-key cua-global-keymap value |
| 404 | #'cua-set-rectangle-mark) | 404 | #'cua-set-rectangle-mark) |
| 405 | (when (boundp 'cua--rectangle-keymap) | 405 | (when (boundp 'cua--rectangle-keymap) |
| 406 | (define-key cua--rectangle-keymap value | 406 | (define-key cua--rectangle-keymap value |
| 407 | #'cua-clear-rectangle-mark) | 407 | #'cua-clear-rectangle-mark) |
| 408 | (define-key cua--region-keymap value | 408 | (define-key cua--region-keymap value |
| 409 | #'cua-toggle-rectangle-mark)))) | 409 | #'cua-toggle-rectangle-mark)))) |
| 410 | :type 'key-sequence) | 410 | :type 'key-sequence) |
| 411 | 411 | ||
| 412 | (defcustom cua-rectangle-modifier-key 'meta | 412 | (defcustom cua-rectangle-modifier-key 'meta |
diff --git a/lisp/epa-hook.el b/lisp/epa-hook.el index aa196851d4d..5b250af6d70 100644 --- a/lisp/epa-hook.el +++ b/lisp/epa-hook.el | |||
| @@ -56,15 +56,15 @@ through Custom does that automatically." | |||
| 56 | May either be a string or a list of strings.") | 56 | May either be a string or a list of strings.") |
| 57 | 57 | ||
| 58 | (put 'epa-file-encrypt-to 'safe-local-variable | 58 | (put 'epa-file-encrypt-to 'safe-local-variable |
| 59 | #'(lambda (val) | 59 | (lambda (val) |
| 60 | (or (stringp val) | 60 | (or (stringp val) |
| 61 | (and (listp val) | 61 | (and (listp val) |
| 62 | (catch 'safe | 62 | (catch 'safe |
| 63 | (mapc (lambda (elt) | 63 | (mapc (lambda (elt) |
| 64 | (unless (stringp elt) | 64 | (unless (stringp elt) |
| 65 | (throw 'safe nil))) | 65 | (throw 'safe nil))) |
| 66 | val) | 66 | val) |
| 67 | t))))) | 67 | t))))) |
| 68 | 68 | ||
| 69 | (put 'epa-file-encrypt-to 'permanent-local t) | 69 | (put 'epa-file-encrypt-to 'permanent-local t) |
| 70 | 70 | ||
diff --git a/lisp/faces.el b/lisp/faces.el index 58c57143d4d..83c6b695320 100644 --- a/lisp/faces.el +++ b/lisp/faces.el | |||
| @@ -88,9 +88,9 @@ a font height that isn't optimal." | |||
| 88 | :tag "Font selection order" | 88 | :tag "Font selection order" |
| 89 | :type '(list symbol symbol symbol symbol) | 89 | :type '(list symbol symbol symbol symbol) |
| 90 | :group 'font-selection | 90 | :group 'font-selection |
| 91 | :set #'(lambda (symbol value) | 91 | :set (lambda (symbol value) |
| 92 | (set-default symbol value) | 92 | (set-default symbol value) |
| 93 | (internal-set-font-selection-order value))) | 93 | (internal-set-font-selection-order value))) |
| 94 | 94 | ||
| 95 | 95 | ||
| 96 | ;; In the absence of Fontconfig support, Monospace and Sans Serif are | 96 | ;; In the absence of Fontconfig support, Monospace and Sans Serif are |
| @@ -140,9 +140,9 @@ ALTERNATIVE2 etc." | |||
| 140 | :tag "Alternative font families to try" | 140 | :tag "Alternative font families to try" |
| 141 | :type '(repeat (repeat string)) | 141 | :type '(repeat (repeat string)) |
| 142 | :group 'font-selection | 142 | :group 'font-selection |
| 143 | :set #'(lambda (symbol value) | 143 | :set (lambda (symbol value) |
| 144 | (set-default symbol value) | 144 | (set-default symbol value) |
| 145 | (internal-set-alternative-font-family-alist value))) | 145 | (internal-set-alternative-font-family-alist value))) |
| 146 | 146 | ||
| 147 | 147 | ||
| 148 | ;; This is defined originally in xfaces.c. | 148 | ;; This is defined originally in xfaces.c. |
| @@ -167,9 +167,9 @@ REGISTRY, ALTERNATIVE1, ALTERNATIVE2, and etc." | |||
| 167 | :type '(repeat (repeat string)) | 167 | :type '(repeat (repeat string)) |
| 168 | :version "21.1" | 168 | :version "21.1" |
| 169 | :group 'font-selection | 169 | :group 'font-selection |
| 170 | :set #'(lambda (symbol value) | 170 | :set (lambda (symbol value) |
| 171 | (set-default symbol value) | 171 | (set-default symbol value) |
| 172 | (internal-set-alternative-font-registry-alist value))) | 172 | (internal-set-alternative-font-registry-alist value))) |
| 173 | 173 | ||
| 174 | 174 | ||
| 175 | ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | 175 | ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
| @@ -1147,27 +1147,27 @@ an integer value." | |||
| 1147 | (:foundry | 1147 | (:foundry |
| 1148 | (list nil)) | 1148 | (list nil)) |
| 1149 | (:width | 1149 | (:width |
| 1150 | (mapcar #'(lambda (x) (cons (symbol-name (aref x 1)) (aref x 1))) | 1150 | (mapcar (lambda (x) (cons (symbol-name (aref x 1)) (aref x 1))) |
| 1151 | font-width-table)) | 1151 | font-width-table)) |
| 1152 | (:weight | 1152 | (:weight |
| 1153 | (mapcar #'(lambda (x) (cons (symbol-name (aref x 1)) (aref x 1))) | 1153 | (mapcar (lambda (x) (cons (symbol-name (aref x 1)) (aref x 1))) |
| 1154 | font-weight-table)) | 1154 | font-weight-table)) |
| 1155 | (:slant | 1155 | (:slant |
| 1156 | (mapcar #'(lambda (x) (cons (symbol-name (aref x 1)) (aref x 1))) | 1156 | (mapcar (lambda (x) (cons (symbol-name (aref x 1)) (aref x 1))) |
| 1157 | font-slant-table)) | 1157 | font-slant-table)) |
| 1158 | ((or :inverse-video :extend) | 1158 | ((or :inverse-video :extend) |
| 1159 | (mapcar #'(lambda (x) (cons (symbol-name x) x)) | 1159 | (mapcar (lambda (x) (cons (symbol-name x) x)) |
| 1160 | (internal-lisp-face-attribute-values attribute))) | 1160 | (internal-lisp-face-attribute-values attribute))) |
| 1161 | ((or :underline :overline :strike-through :box) | 1161 | ((or :underline :overline :strike-through :box) |
| 1162 | (if (window-system frame) | 1162 | (if (window-system frame) |
| 1163 | (nconc (mapcar #'(lambda (x) (cons (symbol-name x) x)) | 1163 | (nconc (mapcar (lambda (x) (cons (symbol-name x) x)) |
| 1164 | (internal-lisp-face-attribute-values attribute)) | 1164 | (internal-lisp-face-attribute-values attribute)) |
| 1165 | (mapcar #'(lambda (c) (cons c c)) | 1165 | (mapcar (lambda (c) (cons c c)) |
| 1166 | (defined-colors frame))) | 1166 | (defined-colors frame))) |
| 1167 | (mapcar #'(lambda (x) (cons (symbol-name x) x)) | 1167 | (mapcar (lambda (x) (cons (symbol-name x) x)) |
| 1168 | (internal-lisp-face-attribute-values attribute)))) | 1168 | (internal-lisp-face-attribute-values attribute)))) |
| 1169 | ((or :foreground :background) | 1169 | ((or :foreground :background) |
| 1170 | (mapcar #'(lambda (c) (cons c c)) | 1170 | (mapcar (lambda (c) (cons c c)) |
| 1171 | (defined-colors frame))) | 1171 | (defined-colors frame))) |
| 1172 | (:height | 1172 | (:height |
| 1173 | 'integerp) | 1173 | 'integerp) |
| @@ -1182,7 +1182,7 @@ an integer value." | |||
| 1182 | x-bitmap-file-path))))) | 1182 | x-bitmap-file-path))))) |
| 1183 | (:inherit | 1183 | (:inherit |
| 1184 | (cons '("none" . nil) | 1184 | (cons '("none" . nil) |
| 1185 | (mapcar #'(lambda (c) (cons (symbol-name c) c)) | 1185 | (mapcar (lambda (c) (cons (symbol-name c) c)) |
| 1186 | (face-list)))) | 1186 | (face-list)))) |
| 1187 | (_ | 1187 | (_ |
| 1188 | (error "Internal error"))))) | 1188 | (error "Internal error"))))) |
| @@ -2286,19 +2286,19 @@ If you set `term-file-prefix' to nil, this function does nothing." | |||
| 2286 | (let* (term-init-func) | 2286 | (let* (term-init-func) |
| 2287 | ;; First, load the terminal initialization file, if it is | 2287 | ;; First, load the terminal initialization file, if it is |
| 2288 | ;; available and it hasn't been loaded already. | 2288 | ;; available and it hasn't been loaded already. |
| 2289 | (tty-find-type #'(lambda (type) | 2289 | (tty-find-type (lambda (type) |
| 2290 | (let ((file (locate-library (concat term-file-prefix type)))) | 2290 | (let ((file (locate-library (concat term-file-prefix type)))) |
| 2291 | (and file | 2291 | (and file |
| 2292 | (or (assoc file load-history) | 2292 | (or (assoc file load-history) |
| 2293 | (load (replace-regexp-in-string | 2293 | (load (replace-regexp-in-string |
| 2294 | "\\.el\\(\\.gz\\)?\\'" "" | 2294 | "\\.el\\(\\.gz\\)?\\'" "" |
| 2295 | file) | 2295 | file) |
| 2296 | t t))))) | 2296 | t t))))) |
| 2297 | type) | 2297 | type) |
| 2298 | ;; Next, try to find a matching initialization function, and call it. | 2298 | ;; Next, try to find a matching initialization function, and call it. |
| 2299 | (tty-find-type #'(lambda (type) | 2299 | (tty-find-type (lambda (type) |
| 2300 | (fboundp (setq term-init-func | 2300 | (fboundp (setq term-init-func |
| 2301 | (intern (concat "terminal-init-" type))))) | 2301 | (intern (concat "terminal-init-" type))))) |
| 2302 | type) | 2302 | type) |
| 2303 | (when (fboundp term-init-func) | 2303 | (when (fboundp term-init-func) |
| 2304 | (funcall term-init-func)) | 2304 | (funcall term-init-func)) |
diff --git a/lisp/files.el b/lisp/files.el index 5a6a33721b3..d498e5b7d2d 100644 --- a/lisp/files.el +++ b/lisp/files.el | |||
| @@ -6682,12 +6682,12 @@ auto-save file, if that is more recent than the visited file." | |||
| 6682 | (abbreviate-file-name file-name))) | 6682 | (abbreviate-file-name file-name))) |
| 6683 | ((with-temp-buffer-window | 6683 | ((with-temp-buffer-window |
| 6684 | "*Directory*" nil | 6684 | "*Directory*" nil |
| 6685 | #'(lambda (window _value) | 6685 | (lambda (window _value) |
| 6686 | (with-selected-window window | 6686 | (with-selected-window window |
| 6687 | (unwind-protect | 6687 | (unwind-protect |
| 6688 | (yes-or-no-p (format "Recover auto save file %s? " file-name)) | 6688 | (yes-or-no-p (format "Recover auto save file %s? " file-name)) |
| 6689 | (when (window-live-p window) | 6689 | (when (window-live-p window) |
| 6690 | (quit-restore-window window 'kill))))) | 6690 | (quit-restore-window window 'kill))))) |
| 6691 | (with-current-buffer standard-output | 6691 | (with-current-buffer standard-output |
| 6692 | (let ((switches dired-listing-switches)) | 6692 | (let ((switches dired-listing-switches)) |
| 6693 | (if (file-symlink-p file) | 6693 | (if (file-symlink-p file) |
| @@ -7130,16 +7130,16 @@ default directory. However, if FULL is non-nil, they are absolute." | |||
| 7130 | (let ((this-dir-contents | 7130 | (let ((this-dir-contents |
| 7131 | ;; Filter out "." and ".." | 7131 | ;; Filter out "." and ".." |
| 7132 | (delq nil | 7132 | (delq nil |
| 7133 | (mapcar #'(lambda (name) | 7133 | (mapcar (lambda (name) |
| 7134 | (unless (string-match "\\`\\.\\.?\\'" | 7134 | (unless (string-match "\\`\\.\\.?\\'" |
| 7135 | (file-name-nondirectory name)) | 7135 | (file-name-nondirectory name)) |
| 7136 | name)) | 7136 | name)) |
| 7137 | (directory-files (or dir ".") full | 7137 | (directory-files (or dir ".") full |
| 7138 | (wildcard-to-regexp nondir)))))) | 7138 | (wildcard-to-regexp nondir)))))) |
| 7139 | (setq contents | 7139 | (setq contents |
| 7140 | (nconc | 7140 | (nconc |
| 7141 | (if (and dir (not full)) | 7141 | (if (and dir (not full)) |
| 7142 | (mapcar #'(lambda (name) (concat dir name)) | 7142 | (mapcar (lambda (name) (concat dir name)) |
| 7143 | this-dir-contents) | 7143 | this-dir-contents) |
| 7144 | this-dir-contents) | 7144 | this-dir-contents) |
| 7145 | contents))))) | 7145 | contents))))) |
diff --git a/lisp/frame.el b/lisp/frame.el index 2c73737a541..dfbd751201f 100644 --- a/lisp/frame.el +++ b/lisp/frame.el | |||
| @@ -987,8 +987,8 @@ HOST:SERVER.SCREEN). | |||
| 987 | If DEVICE is omitted or nil, it defaults to the selected | 987 | If DEVICE is omitted or nil, it defaults to the selected |
| 988 | frame's terminal device." | 988 | frame's terminal device." |
| 989 | (let* ((terminal (get-device-terminal device)) | 989 | (let* ((terminal (get-device-terminal device)) |
| 990 | (func #'(lambda (frame) | 990 | (func (lambda (frame) |
| 991 | (eq (frame-terminal frame) terminal)))) | 991 | (eq (frame-terminal frame) terminal)))) |
| 992 | (filtered-frame-list func))) | 992 | (filtered-frame-list func))) |
| 993 | 993 | ||
| 994 | (defun framep-on-display (&optional terminal) | 994 | (defun framep-on-display (&optional terminal) |
| @@ -1165,9 +1165,9 @@ If you change this without using customize, you should use | |||
| 1165 | `frame-set-background-mode' to update existing frames; | 1165 | `frame-set-background-mode' to update existing frames; |
| 1166 | e.g. (mapc \\='frame-set-background-mode (frame-list))." | 1166 | e.g. (mapc \\='frame-set-background-mode (frame-list))." |
| 1167 | :group 'faces | 1167 | :group 'faces |
| 1168 | :set #'(lambda (var value) | 1168 | :set (lambda (var value) |
| 1169 | (set-default var value) | 1169 | (set-default var value) |
| 1170 | (mapc #'frame-set-background-mode (frame-list))) | 1170 | (mapc #'frame-set-background-mode (frame-list))) |
| 1171 | :initialize #'custom-initialize-changed | 1171 | :initialize #'custom-initialize-changed |
| 1172 | :type '(choice (const dark) | 1172 | :type '(choice (const dark) |
| 1173 | (const light) | 1173 | (const light) |
diff --git a/lisp/help-at-pt.el b/lisp/help-at-pt.el index 233c50504bf..8eb397bc82d 100644 --- a/lisp/help-at-pt.el +++ b/lisp/help-at-pt.el | |||
| @@ -229,11 +229,11 @@ this option, or use \"In certain situations\" and specify no text | |||
| 229 | properties, to enable buffer local values." | 229 | properties, to enable buffer local values." |
| 230 | never)) | 230 | never)) |
| 231 | :initialize 'custom-initialize-default | 231 | :initialize 'custom-initialize-default |
| 232 | :set #'(lambda (variable value) | 232 | :set (lambda (variable value) |
| 233 | (set-default variable value) | 233 | (set-default variable value) |
| 234 | (if (eq value 'never) | 234 | (if (eq value 'never) |
| 235 | (help-at-pt-cancel-timer) | 235 | (help-at-pt-cancel-timer) |
| 236 | (help-at-pt-set-timer))) | 236 | (help-at-pt-set-timer))) |
| 237 | :set-after '(help-at-pt-timer-delay) | 237 | :set-after '(help-at-pt-timer-delay) |
| 238 | :require 'help-at-pt) | 238 | :require 'help-at-pt) |
| 239 | 239 | ||
diff --git a/lisp/help-fns.el b/lisp/help-fns.el index 2b759a5a5c5..17fabe4f63a 100644 --- a/lisp/help-fns.el +++ b/lisp/help-fns.el | |||
| @@ -1561,7 +1561,7 @@ If FRAME is omitted or nil, use the selected frame." | |||
| 1561 | (:fontset . "Fontset") | 1561 | (:fontset . "Fontset") |
| 1562 | (:extend . "Extend") | 1562 | (:extend . "Extend") |
| 1563 | (:inherit . "Inherit"))) | 1563 | (:inherit . "Inherit"))) |
| 1564 | (max-width (apply #'max (mapcar #'(lambda (x) (length (cdr x))) | 1564 | (max-width (apply #'max (mapcar (lambda (x) (length (cdr x))) |
| 1565 | attrs)))) | 1565 | attrs)))) |
| 1566 | (dolist (a attrs) | 1566 | (dolist (a attrs) |
| 1567 | (let ((attr (face-attribute face (car a) frame))) | 1567 | (let ((attr (face-attribute face (car a) frame))) |
diff --git a/lisp/ido.el b/lisp/ido.el index 7c2d2eb0d75..6767d669880 100644 --- a/lisp/ido.el +++ b/lisp/ido.el | |||
| @@ -354,8 +354,8 @@ The following values are possible: | |||
| 354 | 354 | ||
| 355 | Setting this variable directly does not take effect; | 355 | Setting this variable directly does not take effect; |
| 356 | use either \\[customize] or the function `ido-mode'." | 356 | use either \\[customize] or the function `ido-mode'." |
| 357 | :set #'(lambda (_symbol value) | 357 | :set (lambda (_symbol value) |
| 358 | (ido-mode (or value 0))) | 358 | (ido-mode (or value 0))) |
| 359 | :initialize #'custom-initialize-default | 359 | :initialize #'custom-initialize-default |
| 360 | :require 'ido | 360 | :require 'ido |
| 361 | :link '(emacs-commentary-link "ido.el") | 361 | :link '(emacs-commentary-link "ido.el") |
| @@ -620,9 +620,9 @@ hosts on first use of UNC path." | |||
| 620 | (function-item :tag "Use `NET VIEW'" | 620 | (function-item :tag "Use `NET VIEW'" |
| 621 | :value ido-unc-hosts-net-view) | 621 | :value ido-unc-hosts-net-view) |
| 622 | (function :tag "Your own function")) | 622 | (function :tag "Your own function")) |
| 623 | :set #'(lambda (symbol value) | 623 | :set (lambda (symbol value) |
| 624 | (set symbol value) | 624 | (set symbol value) |
| 625 | (setq ido-unc-hosts-cache t))) | 625 | (setq ido-unc-hosts-cache t))) |
| 626 | 626 | ||
| 627 | (defcustom ido-downcase-unc-hosts t | 627 | (defcustom ido-downcase-unc-hosts t |
| 628 | "Non-nil if UNC host names should be downcased." | 628 | "Non-nil if UNC host names should be downcased." |
diff --git a/lisp/isearch.el b/lisp/isearch.el index d9a48cfcf2d..52e4a39ba5a 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el | |||
| @@ -2478,8 +2478,8 @@ The arguments passed to `highlight-regexp' are the regexp from | |||
| 2478 | the last search and the face from `hi-lock-read-face-name'." | 2478 | the last search and the face from `hi-lock-read-face-name'." |
| 2479 | (interactive) | 2479 | (interactive) |
| 2480 | (isearch--highlight-regexp-or-lines | 2480 | (isearch--highlight-regexp-or-lines |
| 2481 | #'(lambda (regexp face lighter) | 2481 | (lambda (regexp face lighter) |
| 2482 | (highlight-regexp regexp face nil lighter)))) | 2482 | (highlight-regexp regexp face nil lighter)))) |
| 2483 | 2483 | ||
| 2484 | (defun isearch-highlight-lines-matching-regexp () | 2484 | (defun isearch-highlight-lines-matching-regexp () |
| 2485 | "Exit Isearch mode and call `highlight-lines-matching-regexp'. | 2485 | "Exit Isearch mode and call `highlight-lines-matching-regexp'. |
| @@ -2487,8 +2487,8 @@ The arguments passed to `highlight-lines-matching-regexp' are the | |||
| 2487 | regexp from the last search and the face from `hi-lock-read-face-name'." | 2487 | regexp from the last search and the face from `hi-lock-read-face-name'." |
| 2488 | (interactive) | 2488 | (interactive) |
| 2489 | (isearch--highlight-regexp-or-lines | 2489 | (isearch--highlight-regexp-or-lines |
| 2490 | #'(lambda (regexp face _lighter) | 2490 | (lambda (regexp face _lighter) |
| 2491 | (highlight-lines-matching-regexp regexp face)))) | 2491 | (highlight-lines-matching-regexp regexp face)))) |
| 2492 | 2492 | ||
| 2493 | 2493 | ||
| 2494 | (defun isearch-delete-char () | 2494 | (defun isearch-delete-char () |
diff --git a/lisp/language/indian.el b/lisp/language/indian.el index 6f9d2703849..d373c82feea 100644 --- a/lisp/language/indian.el +++ b/lisp/language/indian.el | |||
| @@ -376,12 +376,12 @@ South Indian language Malayalam is supported in this language environment.")) | |||
| 376 | (kannada . ,kannada-composable-pattern) | 376 | (kannada . ,kannada-composable-pattern) |
| 377 | (malayalam . ,malayalam-composable-pattern)))) | 377 | (malayalam . ,malayalam-composable-pattern)))) |
| 378 | (map-char-table | 378 | (map-char-table |
| 379 | #'(lambda (key val) | 379 | (lambda (key val) |
| 380 | (let ((slot (assq val script-regexp-alist))) | 380 | (let ((slot (assq val script-regexp-alist))) |
| 381 | (if slot | 381 | (if slot |
| 382 | (set-char-table-range | 382 | (set-char-table-range |
| 383 | composition-function-table key | 383 | composition-function-table key |
| 384 | (list (vector (cdr slot) 0 #'font-shape-gstring)))))) | 384 | (list (vector (cdr slot) 0 #'font-shape-gstring)))))) |
| 385 | char-script-table)) | 385 | char-script-table)) |
| 386 | 386 | ||
| 387 | (provide 'indian) | 387 | (provide 'indian) |
diff --git a/lisp/language/lao.el b/lisp/language/lao.el index c699d57c15a..93849461eae 100644 --- a/lisp/language/lao.el +++ b/lisp/language/lao.el | |||
| @@ -59,11 +59,11 @@ | |||
| 59 | (let* ((chars (car l)) | 59 | (let* ((chars (car l)) |
| 60 | (len (length chars)) | 60 | (len (length chars)) |
| 61 | ;; Replace `c', `t', `v' to consonant, tone, and vowel. | 61 | ;; Replace `c', `t', `v' to consonant, tone, and vowel. |
| 62 | (regexp (mapconcat #'(lambda (c) | 62 | (regexp (mapconcat (lambda (c) |
| 63 | (cond ((= c ?c) consonant) | 63 | (cond ((= c ?c) consonant) |
| 64 | ((= c ?t) tone) | 64 | ((= c ?t) tone) |
| 65 | ((= c ?v) vowel-upper-lower) | 65 | ((= c ?v) vowel-upper-lower) |
| 66 | (t (string c)))) | 66 | (t (string c)))) |
| 67 | (cdr l) "")) | 67 | (cdr l) "")) |
| 68 | ;; Element of composition-function-table. | 68 | ;; Element of composition-function-table. |
| 69 | (elt (list (vector regexp 1 #'lao-composition-function) | 69 | (elt (list (vector regexp 1 #'lao-composition-function) |
diff --git a/lisp/leim/quail/ipa.el b/lisp/leim/quail/ipa.el index c25687574ed..ba6ea938425 100644 --- a/lisp/leim/quail/ipa.el +++ b/lisp/leim/quail/ipa.el | |||
| @@ -278,10 +278,10 @@ string." | |||
| 278 | (list | 278 | (list |
| 279 | (apply #'vector | 279 | (apply #'vector |
| 280 | (mapcar | 280 | (mapcar |
| 281 | #'(lambda (entry) | 281 | (lambda (entry) |
| 282 | (cl-assert (char-or-string-p entry) t) | 282 | (cl-assert (char-or-string-p entry) t) |
| 283 | (format "%s%s" to-prepend | 283 | (format "%s%s" to-prepend |
| 284 | (if (integerp entry) (string entry) entry))) | 284 | (if (integerp entry) (string entry) entry))) |
| 285 | quail-keymap)))) | 285 | quail-keymap)))) |
| 286 | 286 | ||
| 287 | (defun ipa-x-sampa-underscore-implosive (input-string length) | 287 | (defun ipa-x-sampa-underscore-implosive (input-string length) |
diff --git a/lisp/mh-e/mh-folder.el b/lisp/mh-e/mh-folder.el index e6c295764b7..c700b3348df 100644 --- a/lisp/mh-e/mh-folder.el +++ b/lisp/mh-e/mh-folder.el | |||
| @@ -1543,34 +1543,34 @@ after the commands are processed." | |||
| 1543 | (append folders-changed (mh-index-execute-commands)))) | 1543 | (append folders-changed (mh-index-execute-commands)))) |
| 1544 | 1544 | ||
| 1545 | ;; Then refile messages | 1545 | ;; Then refile messages |
| 1546 | (mapc #'(lambda (folder-msg-list) | 1546 | (mapc (lambda (folder-msg-list) |
| 1547 | (let* ((dest-folder (symbol-name (car folder-msg-list))) | 1547 | (let* ((dest-folder (symbol-name (car folder-msg-list))) |
| 1548 | (last (car (mh-translate-range dest-folder "last"))) | 1548 | (last (car (mh-translate-range dest-folder "last"))) |
| 1549 | (msgs (cdr folder-msg-list))) | 1549 | (msgs (cdr folder-msg-list))) |
| 1550 | (push dest-folder folders-changed) | 1550 | (push dest-folder folders-changed) |
| 1551 | (setq redraw-needed-flag t) | 1551 | (setq redraw-needed-flag t) |
| 1552 | (apply #'mh-exec-cmd | 1552 | (apply #'mh-exec-cmd |
| 1553 | "refile" "-src" folder dest-folder | 1553 | "refile" "-src" folder dest-folder |
| 1554 | (mh-coalesce-msg-list msgs)) | 1554 | (mh-coalesce-msg-list msgs)) |
| 1555 | (mh-delete-scan-msgs msgs) | 1555 | (mh-delete-scan-msgs msgs) |
| 1556 | ;; Preserve sequences in destination folder... | 1556 | ;; Preserve sequences in destination folder... |
| 1557 | (when mh-refile-preserves-sequences-flag | 1557 | (when mh-refile-preserves-sequences-flag |
| 1558 | (clrhash dest-map) | 1558 | (clrhash dest-map) |
| 1559 | (cl-loop | 1559 | (cl-loop |
| 1560 | for i from (1+ (or last 0)) | 1560 | for i from (1+ (or last 0)) |
| 1561 | for msg in (sort (copy-sequence msgs) #'<) | 1561 | for msg in (sort (copy-sequence msgs) #'<) |
| 1562 | do (cl-loop for seq-name in (gethash msg seq-map) | 1562 | do (cl-loop for seq-name in (gethash msg seq-map) |
| 1563 | do (push i (gethash seq-name dest-map)))) | 1563 | do (push i (gethash seq-name dest-map)))) |
| 1564 | (maphash | 1564 | (maphash |
| 1565 | #'(lambda (seq msgs) | 1565 | #'(lambda (seq msgs) |
| 1566 | ;; Can't be run in the background, since the | 1566 | ;; Can't be run in the background, since the |
| 1567 | ;; current folder is changed by mark this could | 1567 | ;; current folder is changed by mark this could |
| 1568 | ;; lead to a race condition with the next refile. | 1568 | ;; lead to a race condition with the next refile. |
| 1569 | (apply #'mh-exec-cmd "mark" | 1569 | (apply #'mh-exec-cmd "mark" |
| 1570 | "-sequence" (symbol-name seq) dest-folder | 1570 | "-sequence" (symbol-name seq) dest-folder |
| 1571 | "-add" (mapcar #'(lambda (x) (format "%s" x)) | 1571 | "-add" (mapcar #'(lambda (x) (format "%s" x)) |
| 1572 | (mh-coalesce-msg-list msgs)))) | 1572 | (mh-coalesce-msg-list msgs)))) |
| 1573 | dest-map)))) | 1573 | dest-map)))) |
| 1574 | mh-refile-list) | 1574 | mh-refile-list) |
| 1575 | (setq mh-refile-list ()) | 1575 | (setq mh-refile-list ()) |
| 1576 | 1576 | ||
| @@ -1614,14 +1614,14 @@ after the commands are processed." | |||
| 1614 | do (cl-loop for seq-name in (gethash msg seq-map) | 1614 | do (cl-loop for seq-name in (gethash msg seq-map) |
| 1615 | do (push i (gethash seq-name allow-map)))) | 1615 | do (push i (gethash seq-name allow-map)))) |
| 1616 | (maphash | 1616 | (maphash |
| 1617 | #'(lambda (seq msgs) | 1617 | (lambda (seq msgs) |
| 1618 | ;; Can't be run in background, since the current | 1618 | ;; Can't be run in background, since the current |
| 1619 | ;; folder is changed by mark this could lead to a | 1619 | ;; folder is changed by mark this could lead to a |
| 1620 | ;; race condition with the next refile/allowlist. | 1620 | ;; race condition with the next refile/allowlist. |
| 1621 | (apply #'mh-exec-cmd "mark" | 1621 | (apply #'mh-exec-cmd "mark" |
| 1622 | "-sequence" (symbol-name seq) mh-inbox | 1622 | "-sequence" (symbol-name seq) mh-inbox |
| 1623 | "-add" (mapcar #'(lambda(x) (format "%s" x)) | 1623 | "-add" (mapcar #'(lambda(x) (format "%s" x)) |
| 1624 | (mh-coalesce-msg-list msgs)))) | 1624 | (mh-coalesce-msg-list msgs)))) |
| 1625 | allow-map)) | 1625 | allow-map)) |
| 1626 | (setq mh-allowlist nil))) | 1626 | (setq mh-allowlist nil))) |
| 1627 | 1627 | ||
diff --git a/lisp/mh-e/mh-mime.el b/lisp/mh-e/mh-mime.el index 3d9128c15a7..0b58d7ba1f4 100644 --- a/lisp/mh-e/mh-mime.el +++ b/lisp/mh-e/mh-mime.el | |||
| @@ -238,24 +238,24 @@ usually reads the file \"/etc/mailcap\"." | |||
| 238 | (when (consp part-index) (setq part-index (car part-index))) | 238 | (when (consp part-index) (setq part-index (car part-index))) |
| 239 | (mh-folder-mime-action | 239 | (mh-folder-mime-action |
| 240 | part-index | 240 | part-index |
| 241 | #'(lambda () | 241 | (lambda () |
| 242 | (let* ((part (get-text-property (point) 'mh-data)) | 242 | (let* ((part (get-text-property (point) 'mh-data)) |
| 243 | (type (mm-handle-media-type part)) | 243 | (type (mm-handle-media-type part)) |
| 244 | (methods (mapcar (lambda (x) (list (cdr (assoc 'viewer x)))) | 244 | (methods (mapcar (lambda (x) (list (cdr (assoc 'viewer x)))) |
| 245 | (mailcap-mime-info type 'all))) | 245 | (mailcap-mime-info type 'all))) |
| 246 | (def (caar methods)) | 246 | (def (caar methods)) |
| 247 | (prompt (format-prompt "Viewer" def)) | 247 | (prompt (format-prompt "Viewer" def)) |
| 248 | (method (completing-read prompt methods nil nil nil nil def)) | 248 | (method (completing-read prompt methods nil nil nil nil def)) |
| 249 | (folder mh-show-folder-buffer) | 249 | (folder mh-show-folder-buffer) |
| 250 | (buffer-read-only nil)) | 250 | (buffer-read-only nil)) |
| 251 | (when (string-match "^[^% \t]+$" method) | 251 | (when (string-match "^[^% \t]+$" method) |
| 252 | (setq method (concat method " %s"))) | 252 | (setq method (concat method " %s"))) |
| 253 | (mh-flet | 253 | (mh-flet |
| 254 | ((mm-handle-set-external-undisplayer | 254 | ((mm-handle-set-external-undisplayer |
| 255 | (handle function) | 255 | (handle function) |
| 256 | (mh-handle-set-external-undisplayer folder handle function))) | 256 | (mh-handle-set-external-undisplayer folder handle function))) |
| 257 | (unwind-protect (mm-display-external part method) | 257 | (unwind-protect (mm-display-external part method) |
| 258 | (set-buffer-modified-p nil))))) | 258 | (set-buffer-modified-p nil))))) |
| 259 | nil)) | 259 | nil)) |
| 260 | 260 | ||
| 261 | ;;;###mh-autoload | 261 | ;;;###mh-autoload |
diff --git a/lisp/ps-mule.el b/lisp/ps-mule.el index ab8af40628a..2d1dcd2b686 100644 --- a/lisp/ps-mule.el +++ b/lisp/ps-mule.el | |||
| @@ -1209,8 +1209,8 @@ V%s 0 /%s-latin1 /%s Latin1Encoding put\n" | |||
| 1209 | (ps-output-prologue (format "ETOP%d %d %d put\n" i (car font) index)) | 1209 | (ps-output-prologue (format "ETOP%d %d %d put\n" i (car font) index)) |
| 1210 | (setq index (1+ index)))) | 1210 | (setq index (1+ index)))) |
| 1211 | (ps-output-prologue (format "/VTOP%d [%s] def\n" i | 1211 | (ps-output-prologue (format "/VTOP%d [%s] def\n" i |
| 1212 | (mapconcat #'(lambda (x) | 1212 | (mapconcat (lambda (x) |
| 1213 | (format "F%02X" (cdr x))) | 1213 | (format "F%02X" (cdr x))) |
| 1214 | font-list " "))))) | 1214 | font-list " "))))) |
| 1215 | 1215 | ||
| 1216 | ;; Redefine fonts f0, f1, f2, f3, h0, h1, H0. | 1216 | ;; Redefine fonts f0, f1, f2, f3, h0, h1, H0. |
diff --git a/lisp/ps-print.el b/lisp/ps-print.el index b1d03fda1d4..0fc95546794 100644 --- a/lisp/ps-print.el +++ b/lisp/ps-print.el | |||
| @@ -3855,7 +3855,7 @@ It can be retrieved with `(ps-get ALIST-SYM KEY)'." | |||
| 3855 | 3855 | ||
| 3856 | (defun ps-color-scale (color) | 3856 | (defun ps-color-scale (color) |
| 3857 | ;; Scale 16-bit X-COLOR-VALUE to PostScript color value in [0, 1] interval. | 3857 | ;; Scale 16-bit X-COLOR-VALUE to PostScript color value in [0, 1] interval. |
| 3858 | (mapcar #'(lambda (value) (/ value ps-print-color-scale)) | 3858 | (mapcar (lambda (value) (/ value ps-print-color-scale)) |
| 3859 | (color-values color))) | 3859 | (color-values color))) |
| 3860 | 3860 | ||
| 3861 | 3861 | ||
| @@ -4747,11 +4747,11 @@ page-height == ((floor print-height ((th + ls) * zh)) * ((th + ls) * zh)) - th | |||
| 4747 | (defun ps-background-pages (page-list func) | 4747 | (defun ps-background-pages (page-list func) |
| 4748 | (if page-list | 4748 | (if page-list |
| 4749 | (mapcar | 4749 | (mapcar |
| 4750 | #'(lambda (pages) | 4750 | (lambda (pages) |
| 4751 | (let ((start (if (consp pages) (car pages) pages)) | 4751 | (let ((start (if (consp pages) (car pages) pages)) |
| 4752 | (end (if (consp pages) (cdr pages) pages))) | 4752 | (end (if (consp pages) (cdr pages) pages))) |
| 4753 | (and (integerp start) (integerp end) (<= start end) | 4753 | (and (integerp start) (integerp end) (<= start end) |
| 4754 | (add-to-list 'ps-background-pages (vector start end func))))) | 4754 | (add-to-list 'ps-background-pages (vector start end func))))) |
| 4755 | page-list) | 4755 | page-list) |
| 4756 | (setq ps-background-all-pages (cons func ps-background-all-pages)))) | 4756 | (setq ps-background-all-pages (cons func ps-background-all-pages)))) |
| 4757 | 4757 | ||
| @@ -4789,76 +4789,76 @@ page-height == ((floor print-height ((th + ls) * zh)) * ((th + ls) * zh)) - th | |||
| 4789 | 4789 | ||
| 4790 | (defun ps-background-text () | 4790 | (defun ps-background-text () |
| 4791 | (mapcar | 4791 | (mapcar |
| 4792 | #'(lambda (text) | 4792 | (lambda (text) |
| 4793 | (setq ps-background-text-count (1+ ps-background-text-count)) | 4793 | (setq ps-background-text-count (1+ ps-background-text-count)) |
| 4794 | (ps-output (format "/ShowBackText-%d{\n" ps-background-text-count)) | 4794 | (ps-output (format "/ShowBackText-%d{\n" ps-background-text-count)) |
| 4795 | (ps-output-string (nth 0 text)) ; text | 4795 | (ps-output-string (nth 0 text)) ; text |
| 4796 | (ps-output | 4796 | (ps-output |
| 4797 | "\n" | 4797 | "\n" |
| 4798 | (ps-float-format (nth 4 text) 200.0) ; font size | 4798 | (ps-float-format (nth 4 text) 200.0) ; font size |
| 4799 | (format "/%s " (or (nth 3 text) "Times-Roman")) ; font name | 4799 | (format "/%s " (or (nth 3 text) "Times-Roman")) ; font name |
| 4800 | (ps-float-format (nth 6 text) | 4800 | (ps-float-format (nth 6 text) |
| 4801 | "PrintHeight PrintPageWidth atan") ; rotation | 4801 | "PrintHeight PrintPageWidth atan") ; rotation |
| 4802 | (ps-float-format (nth 5 text) 0.85) ; gray | 4802 | (ps-float-format (nth 5 text) 0.85) ; gray |
| 4803 | (ps-float-format (nth 1 text) "0") ; x position | 4803 | (ps-float-format (nth 1 text) "0") ; x position |
| 4804 | (ps-float-format (nth 2 text) "0") ; y position | 4804 | (ps-float-format (nth 2 text) "0") ; y position |
| 4805 | "\nShowBackText}def\n") | 4805 | "\nShowBackText}def\n") |
| 4806 | (ps-background-pages (nthcdr 7 text) ; page list | 4806 | (ps-background-pages (nthcdr 7 text) ; page list |
| 4807 | (format "ShowBackText-%d\n" | 4807 | (format "ShowBackText-%d\n" |
| 4808 | ps-background-text-count))) | 4808 | ps-background-text-count))) |
| 4809 | ps-print-background-text)) | 4809 | ps-print-background-text)) |
| 4810 | 4810 | ||
| 4811 | 4811 | ||
| 4812 | (defun ps-background-image () | 4812 | (defun ps-background-image () |
| 4813 | (mapcar | 4813 | (mapcar |
| 4814 | #'(lambda (image) | 4814 | (lambda (image) |
| 4815 | (let ((image-file (expand-file-name (nth 0 image)))) | 4815 | (let ((image-file (expand-file-name (nth 0 image)))) |
| 4816 | (when (file-readable-p image-file) | 4816 | (when (file-readable-p image-file) |
| 4817 | (setq ps-background-image-count (1+ ps-background-image-count)) | 4817 | (setq ps-background-image-count (1+ ps-background-image-count)) |
| 4818 | (ps-output | 4818 | (ps-output |
| 4819 | (format "/ShowBackImage-%d{\n--back-- " | 4819 | (format "/ShowBackImage-%d{\n--back-- " |
| 4820 | ps-background-image-count) | 4820 | ps-background-image-count) |
| 4821 | (ps-float-format (nth 5 image) 0.0) ; rotation | 4821 | (ps-float-format (nth 5 image) 0.0) ; rotation |
| 4822 | (ps-float-format (nth 3 image) 1.0) ; x scale | 4822 | (ps-float-format (nth 3 image) 1.0) ; x scale |
| 4823 | (ps-float-format (nth 4 image) 1.0) ; y scale | 4823 | (ps-float-format (nth 4 image) 1.0) ; y scale |
| 4824 | (ps-float-format (nth 1 image) ; x position | 4824 | (ps-float-format (nth 1 image) ; x position |
| 4825 | "PrintPageWidth 2 div") | 4825 | "PrintPageWidth 2 div") |
| 4826 | (ps-float-format (nth 2 image) ; y position | 4826 | (ps-float-format (nth 2 image) ; y position |
| 4827 | "PrintHeight 2 div BottomMargin add") | 4827 | "PrintHeight 2 div BottomMargin add") |
| 4828 | "\nBeginBackImage\n") | 4828 | "\nBeginBackImage\n") |
| 4829 | (ps-insert-file image-file) | 4829 | (ps-insert-file image-file) |
| 4830 | ;; coordinate adjustment to center image | 4830 | ;; coordinate adjustment to center image |
| 4831 | ;; around x and y position | 4831 | ;; around x and y position |
| 4832 | (let ((box (ps-get-boundingbox))) | 4832 | (let ((box (ps-get-boundingbox))) |
| 4833 | (with-current-buffer ps-spool-buffer | 4833 | (with-current-buffer ps-spool-buffer |
| 4834 | (save-excursion | 4834 | (save-excursion |
| 4835 | (if (re-search-backward "^--back--" nil t) | 4835 | (if (re-search-backward "^--back--" nil t) |
| 4836 | (replace-match | 4836 | (replace-match |
| 4837 | (format "%s %s" | 4837 | (format "%s %s" |
| 4838 | (ps-float-format | 4838 | (ps-float-format |
| 4839 | (- (+ (/ (- (aref box 2) (aref box 0)) 2.0) | 4839 | (- (+ (/ (- (aref box 2) (aref box 0)) 2.0) |
| 4840 | (aref box 0)))) | 4840 | (aref box 0)))) |
| 4841 | (ps-float-format | 4841 | (ps-float-format |
| 4842 | (- (+ (/ (- (aref box 3) (aref box 1)) 2.0) | 4842 | (- (+ (/ (- (aref box 3) (aref box 1)) 2.0) |
| 4843 | (aref box 1))))) | 4843 | (aref box 1))))) |
| 4844 | t))))) | 4844 | t))))) |
| 4845 | (ps-output "\nEndBackImage}def\n") | 4845 | (ps-output "\nEndBackImage}def\n") |
| 4846 | (ps-background-pages (nthcdr 6 image) ; page list | 4846 | (ps-background-pages (nthcdr 6 image) ; page list |
| 4847 | (format "ShowBackImage-%d\n" | 4847 | (format "ShowBackImage-%d\n" |
| 4848 | ps-background-image-count))))) | 4848 | ps-background-image-count))))) |
| 4849 | ps-print-background-image)) | 4849 | ps-print-background-image)) |
| 4850 | 4850 | ||
| 4851 | 4851 | ||
| 4852 | (defun ps-background (page-number) | 4852 | (defun ps-background (page-number) |
| 4853 | (let (has-local-background) | 4853 | (let (has-local-background) |
| 4854 | (mapc #'(lambda (range) | 4854 | (mapc (lambda (range) |
| 4855 | (and (<= (aref range 0) page-number) | 4855 | (and (<= (aref range 0) page-number) |
| 4856 | (<= page-number (aref range 1)) | 4856 | (<= page-number (aref range 1)) |
| 4857 | (if has-local-background | 4857 | (if has-local-background |
| 4858 | (ps-output (aref range 2)) | 4858 | (ps-output (aref range 2)) |
| 4859 | (setq has-local-background t) | 4859 | (setq has-local-background t) |
| 4860 | (ps-output "/printLocalBackground{\n" | 4860 | (ps-output "/printLocalBackground{\n" |
| 4861 | (aref range 2))))) | 4861 | (aref range 2))))) |
| 4862 | ps-background-pages) | 4862 | ps-background-pages) |
| 4863 | (and has-local-background (ps-output "}def\n")))) | 4863 | (and has-local-background (ps-output "}def\n")))) |
| 4864 | 4864 | ||
| @@ -5697,8 +5697,8 @@ XSTART YSTART are the relative position for the first page in a sheet.") | |||
| 5697 | (> (car page) 0) | 5697 | (> (car page) 0) |
| 5698 | (<= (car page) (cdr page)) | 5698 | (<= (car page) (cdr page)) |
| 5699 | (setq new (cons page new)))))) | 5699 | (setq new (cons page new)))))) |
| 5700 | (setq ps-selected-pages (sort new #'(lambda (one other) | 5700 | (setq ps-selected-pages (sort new (lambda (one other) |
| 5701 | (< (car one) (car other)))) | 5701 | (< (car one) (car other)))) |
| 5702 | ps-last-selected-pages ps-selected-pages | 5702 | ps-last-selected-pages ps-selected-pages |
| 5703 | ps-first-page nil | 5703 | ps-first-page nil |
| 5704 | ps-last-page nil)) | 5704 | ps-last-page nil)) |
| @@ -5782,8 +5782,8 @@ XSTART YSTART are the relative position for the first page in a sheet.") | |||
| 5782 | "unspecified-fg" | 5782 | "unspecified-fg" |
| 5783 | 0.0) | 5783 | 0.0) |
| 5784 | ps-foreground-list (mapcar | 5784 | ps-foreground-list (mapcar |
| 5785 | #'(lambda (arg) | 5785 | (lambda (arg) |
| 5786 | (ps-rgb-color arg "unspecified-fg" 0.0)) | 5786 | (ps-rgb-color arg "unspecified-fg" 0.0)) |
| 5787 | (append (and (not (member ps-print-color-p | 5787 | (append (and (not (member ps-print-color-p |
| 5788 | '(nil black-white))) | 5788 | '(nil black-white))) |
| 5789 | ps-fg-list) | 5789 | ps-fg-list) |
| @@ -6012,9 +6012,9 @@ XSTART YSTART are the relative position for the first page in a sheet.") | |||
| 6012 | (if (and (boundp 'ucs-mule-8859-to-mule-unicode) | 6012 | (if (and (boundp 'ucs-mule-8859-to-mule-unicode) |
| 6013 | (char-table-p ucs-mule-8859-to-mule-unicode)) | 6013 | (char-table-p ucs-mule-8859-to-mule-unicode)) |
| 6014 | (map-char-table | 6014 | (map-char-table |
| 6015 | #'(lambda (k v) | 6015 | (lambda (k v) |
| 6016 | (if (and v (eq (char-charset v) 'latin-iso8859-1) (/= k v)) | 6016 | (if (and v (eq (char-charset v) 'latin-iso8859-1) (/= k v)) |
| 6017 | (aset tbl k v))) | 6017 | (aset tbl k v))) |
| 6018 | ucs-mule-8859-to-mule-unicode)) | 6018 | ucs-mule-8859-to-mule-unicode)) |
| 6019 | tbl) | 6019 | tbl) |
| 6020 | "Translation table for PostScript printing. | 6020 | "Translation table for PostScript printing. |
diff --git a/lisp/recentf.el b/lisp/recentf.el index 57cbaf0debb..6b5a47c66fd 100644 --- a/lisp/recentf.el +++ b/lisp/recentf.el | |||
| @@ -674,55 +674,55 @@ Return nil if file NAME is not one of the ten more recent." | |||
| 674 | "Sort the list of menu elements L in ascending order. | 674 | "Sort the list of menu elements L in ascending order. |
| 675 | The MENU-ITEM part of each menu element is compared." | 675 | The MENU-ITEM part of each menu element is compared." |
| 676 | (sort (copy-sequence l) | 676 | (sort (copy-sequence l) |
| 677 | #'(lambda (e1 e2) | 677 | (lambda (e1 e2) |
| 678 | (recentf-string-lessp | 678 | (recentf-string-lessp |
| 679 | (recentf-menu-element-item e1) | 679 | (recentf-menu-element-item e1) |
| 680 | (recentf-menu-element-item e2))))) | 680 | (recentf-menu-element-item e2))))) |
| 681 | 681 | ||
| 682 | (defsubst recentf-sort-descending (l) | 682 | (defsubst recentf-sort-descending (l) |
| 683 | "Sort the list of menu elements L in descending order. | 683 | "Sort the list of menu elements L in descending order. |
| 684 | The MENU-ITEM part of each menu element is compared." | 684 | The MENU-ITEM part of each menu element is compared." |
| 685 | (sort (copy-sequence l) | 685 | (sort (copy-sequence l) |
| 686 | #'(lambda (e1 e2) | 686 | (lambda (e1 e2) |
| 687 | (recentf-string-lessp | 687 | (recentf-string-lessp |
| 688 | (recentf-menu-element-item e2) | 688 | (recentf-menu-element-item e2) |
| 689 | (recentf-menu-element-item e1))))) | 689 | (recentf-menu-element-item e1))))) |
| 690 | 690 | ||
| 691 | (defsubst recentf-sort-basenames-ascending (l) | 691 | (defsubst recentf-sort-basenames-ascending (l) |
| 692 | "Sort the list of menu elements L in ascending order. | 692 | "Sort the list of menu elements L in ascending order. |
| 693 | Only filenames sans directory are compared." | 693 | Only filenames sans directory are compared." |
| 694 | (sort (copy-sequence l) | 694 | (sort (copy-sequence l) |
| 695 | #'(lambda (e1 e2) | 695 | (lambda (e1 e2) |
| 696 | (recentf-string-lessp | 696 | (recentf-string-lessp |
| 697 | (file-name-nondirectory (recentf-menu-element-value e1)) | 697 | (file-name-nondirectory (recentf-menu-element-value e1)) |
| 698 | (file-name-nondirectory (recentf-menu-element-value e2)))))) | 698 | (file-name-nondirectory (recentf-menu-element-value e2)))))) |
| 699 | 699 | ||
| 700 | (defsubst recentf-sort-basenames-descending (l) | 700 | (defsubst recentf-sort-basenames-descending (l) |
| 701 | "Sort the list of menu elements L in descending order. | 701 | "Sort the list of menu elements L in descending order. |
| 702 | Only filenames sans directory are compared." | 702 | Only filenames sans directory are compared." |
| 703 | (sort (copy-sequence l) | 703 | (sort (copy-sequence l) |
| 704 | #'(lambda (e1 e2) | 704 | (lambda (e1 e2) |
| 705 | (recentf-string-lessp | 705 | (recentf-string-lessp |
| 706 | (file-name-nondirectory (recentf-menu-element-value e2)) | 706 | (file-name-nondirectory (recentf-menu-element-value e2)) |
| 707 | (file-name-nondirectory (recentf-menu-element-value e1)))))) | 707 | (file-name-nondirectory (recentf-menu-element-value e1)))))) |
| 708 | 708 | ||
| 709 | (defsubst recentf-sort-directories-ascending (l) | 709 | (defsubst recentf-sort-directories-ascending (l) |
| 710 | "Sort the list of menu elements L in ascending order. | 710 | "Sort the list of menu elements L in ascending order. |
| 711 | Compares directories then filenames to order the list." | 711 | Compares directories then filenames to order the list." |
| 712 | (sort (copy-sequence l) | 712 | (sort (copy-sequence l) |
| 713 | #'(lambda (e1 e2) | 713 | (lambda (e1 e2) |
| 714 | (recentf-directory-compare | 714 | (recentf-directory-compare |
| 715 | (recentf-menu-element-value e1) | 715 | (recentf-menu-element-value e1) |
| 716 | (recentf-menu-element-value e2))))) | 716 | (recentf-menu-element-value e2))))) |
| 717 | 717 | ||
| 718 | (defsubst recentf-sort-directories-descending (l) | 718 | (defsubst recentf-sort-directories-descending (l) |
| 719 | "Sort the list of menu elements L in descending order. | 719 | "Sort the list of menu elements L in descending order. |
| 720 | Compares directories then filenames to order the list." | 720 | Compares directories then filenames to order the list." |
| 721 | (sort (copy-sequence l) | 721 | (sort (copy-sequence l) |
| 722 | #'(lambda (e1 e2) | 722 | (lambda (e1 e2) |
| 723 | (recentf-directory-compare | 723 | (recentf-directory-compare |
| 724 | (recentf-menu-element-value e2) | 724 | (recentf-menu-element-value e2) |
| 725 | (recentf-menu-element-value e1))))) | 725 | (recentf-menu-element-value e1))))) |
| 726 | 726 | ||
| 727 | (defun recentf-show-basenames (l &optional no-dir) | 727 | (defun recentf-show-basenames (l &optional no-dir) |
| 728 | "Filter the list of menu elements L to show filenames sans directory. | 728 | "Filter the list of menu elements L to show filenames sans directory. |
| @@ -1382,5 +1382,5 @@ buffers you switch to a lot, you can say something like the following: | |||
| 1382 | (provide 'recentf) | 1382 | (provide 'recentf) |
| 1383 | 1383 | ||
| 1384 | (run-hooks 'recentf-load-hook) | 1384 | (run-hooks 'recentf-load-hook) |
| 1385 | 1385 | ||
| 1386 | ;;; recentf.el ends here | 1386 | ;;; recentf.el ends here |
diff --git a/lisp/replace.el b/lisp/replace.el index 84ec042f455..5287be2c524 100644 --- a/lisp/replace.el +++ b/lisp/replace.el | |||
| @@ -2263,11 +2263,11 @@ See also `multi-occur'." | |||
| 2263 | 2263 | ||
| 2264 | (defun occur-engine-add-prefix (lines &optional prefix-face) | 2264 | (defun occur-engine-add-prefix (lines &optional prefix-face) |
| 2265 | (mapcar | 2265 | (mapcar |
| 2266 | #'(lambda (line) | 2266 | (lambda (line) |
| 2267 | (concat (if prefix-face | 2267 | (concat (if prefix-face |
| 2268 | (propertize " :" 'font-lock-face prefix-face) | 2268 | (propertize " :" 'font-lock-face prefix-face) |
| 2269 | " :") | 2269 | " :") |
| 2270 | line "\n")) | 2270 | line "\n")) |
| 2271 | lines)) | 2271 | lines)) |
| 2272 | 2272 | ||
| 2273 | (defun occur-accumulate-lines (count &optional keep-props pt) | 2273 | (defun occur-accumulate-lines (count &optional keep-props pt) |
diff --git a/lisp/select.el b/lisp/select.el index 15e171c13f9..3c9f961f6db 100644 --- a/lisp/select.el +++ b/lisp/select.el | |||
| @@ -440,13 +440,13 @@ two markers or an overlay. Otherwise, it is nil." | |||
| 440 | (setq type 'C_STRING)) | 440 | (setq type 'C_STRING)) |
| 441 | (t | 441 | (t |
| 442 | (let (non-latin-1 non-unicode eight-bit) | 442 | (let (non-latin-1 non-unicode eight-bit) |
| 443 | (mapc #'(lambda (x) | 443 | (mapc (lambda (x) |
| 444 | (if (>= x #x100) | 444 | (if (>= x #x100) |
| 445 | (if (< x #x110000) | 445 | (if (< x #x110000) |
| 446 | (setq non-latin-1 t) | 446 | (setq non-latin-1 t) |
| 447 | (if (< x #x3FFF80) | 447 | (if (< x #x3FFF80) |
| 448 | (setq non-unicode t) | 448 | (setq non-unicode t) |
| 449 | (setq eight-bit t))))) | 449 | (setq eight-bit t))))) |
| 450 | str) | 450 | str) |
| 451 | (setq type (if (or non-unicode | 451 | (setq type (if (or non-unicode |
| 452 | (and | 452 | (and |
diff --git a/lisp/server.el b/lisp/server.el index 6359a761994..5306a547767 100644 --- a/lisp/server.el +++ b/lisp/server.el | |||
| @@ -90,12 +90,12 @@ | |||
| 90 | 90 | ||
| 91 | (defcustom server-use-tcp nil | 91 | (defcustom server-use-tcp nil |
| 92 | "If non-nil, use TCP sockets instead of local sockets." | 92 | "If non-nil, use TCP sockets instead of local sockets." |
| 93 | :set #'(lambda (sym val) | 93 | :set (lambda (sym val) |
| 94 | (unless (featurep 'make-network-process '(:family local)) | 94 | (unless (featurep 'make-network-process '(:family local)) |
| 95 | (setq val t) | 95 | (setq val t) |
| 96 | (unless load-in-progress | 96 | (unless load-in-progress |
| 97 | (message "Local sockets unsupported, using TCP sockets"))) | 97 | (message "Local sockets unsupported, using TCP sockets"))) |
| 98 | (set-default sym val)) | 98 | (set-default sym val)) |
| 99 | :type 'boolean | 99 | :type 'boolean |
| 100 | :version "22.1") | 100 | :version "22.1") |
| 101 | 101 | ||
diff --git a/lisp/ses.el b/lisp/ses.el index 51843eab032..5e2d254881b 100644 --- a/lisp/ses.el +++ b/lisp/ses.el | |||
| @@ -3554,7 +3554,7 @@ With prefix, sorts in REVERSE order." | |||
| 3554 | (push (cons (buffer-substring-no-properties (point) end) | 3554 | (push (cons (buffer-substring-no-properties (point) end) |
| 3555 | (+ minrow x)) | 3555 | (+ minrow x)) |
| 3556 | keys)) | 3556 | keys)) |
| 3557 | (setq keys (sort keys #'(lambda (x y) (string< (car x) (car y))))) | 3557 | (setq keys (sort keys (lambda (x y) (string< (car x) (car y))))) |
| 3558 | ;;Extract the lines in reverse sorted order | 3558 | ;;Extract the lines in reverse sorted order |
| 3559 | (or reverse | 3559 | (or reverse |
| 3560 | (setq keys (nreverse keys))) | 3560 | (setq keys (nreverse keys))) |
diff --git a/lisp/sort.el b/lisp/sort.el index d6767ed5098..09259805415 100644 --- a/lisp/sort.el +++ b/lisp/sort.el | |||
| @@ -540,8 +540,8 @@ Use \\[untabify] to convert tabs to spaces before sorting." | |||
| 540 | (narrow-to-region beg1 end1) | 540 | (narrow-to-region beg1 end1) |
| 541 | (goto-char beg1) | 541 | (goto-char beg1) |
| 542 | (sort-subr reverse 'forward-line 'end-of-line | 542 | (sort-subr reverse 'forward-line 'end-of-line |
| 543 | #'(lambda () (move-to-column col-start) nil) | 543 | (lambda () (move-to-column col-start) nil) |
| 544 | #'(lambda () (move-to-column col-end) nil)))))))) | 544 | (lambda () (move-to-column col-end) nil)))))))) |
| 545 | 545 | ||
| 546 | ;;;###autoload | 546 | ;;;###autoload |
| 547 | (defun reverse-region (beg end) | 547 | (defun reverse-region (beg end) |
diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el index 1a3811a37c2..67a417c1161 100644 --- a/lisp/term/ns-win.el +++ b/lisp/term/ns-win.el | |||
| @@ -867,10 +867,10 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.") | |||
| 867 | ;; For Darwin nothing except UTF-8 makes sense. | 867 | ;; For Darwin nothing except UTF-8 makes sense. |
| 868 | (when (eq system-type 'darwin) | 868 | (when (eq system-type 'darwin) |
| 869 | (add-hook 'before-init-hook | 869 | (add-hook 'before-init-hook |
| 870 | #'(lambda () | 870 | (lambda () |
| 871 | (setq locale-coding-system 'utf-8-unix) | 871 | (setq locale-coding-system 'utf-8-unix) |
| 872 | (setq default-process-coding-system | 872 | (setq default-process-coding-system |
| 873 | '(utf-8-unix . utf-8-unix))))) | 873 | '(utf-8-unix . utf-8-unix))))) |
| 874 | 874 | ||
| 875 | ;; Mac OS X Lion introduces PressAndHold, which is unsupported by this port. | 875 | ;; Mac OS X Lion introduces PressAndHold, which is unsupported by this port. |
| 876 | ;; See this thread for more details: | 876 | ;; See this thread for more details: |
diff --git a/lisp/tree-widget.el b/lisp/tree-widget.el index d40a628b994..8691f03f86d 100644 --- a/lisp/tree-widget.el +++ b/lisp/tree-widget.el | |||
| @@ -214,8 +214,8 @@ Give the image the specified properties PROPS." | |||
| 214 | See also the option `widget-image-conversion'." | 214 | See also the option `widget-image-conversion'." |
| 215 | (delq nil | 215 | (delq nil |
| 216 | (mapcar | 216 | (mapcar |
| 217 | #'(lambda (fmt) | 217 | (lambda (fmt) |
| 218 | (and (image-type-available-p (car fmt)) fmt)) | 218 | (and (image-type-available-p (car fmt)) fmt)) |
| 219 | widget-image-conversion))) | 219 | widget-image-conversion))) |
| 220 | 220 | ||
| 221 | ;; Buffer local cache of theme data. | 221 | ;; Buffer local cache of theme data. |
diff --git a/lisp/whitespace.el b/lisp/whitespace.el index 017409d6a42..5a482c5253a 100644 --- a/lisp/whitespace.el +++ b/lisp/whitespace.el | |||
| @@ -1687,32 +1687,32 @@ cleaning up these problems." | |||
| 1687 | (or whitespace-active-style whitespace-style))) | 1687 | (or whitespace-active-style whitespace-style))) |
| 1688 | (bogus-list | 1688 | (bogus-list |
| 1689 | (mapcar | 1689 | (mapcar |
| 1690 | #'(lambda (option) | 1690 | (lambda (option) |
| 1691 | (when force | 1691 | (when force |
| 1692 | (push (car option) style)) | 1692 | (push (car option) style)) |
| 1693 | (goto-char rstart) | 1693 | (goto-char rstart) |
| 1694 | (let ((regexp | 1694 | (let ((regexp |
| 1695 | (cond | 1695 | (cond |
| 1696 | ((eq (car option) 'indentation) | 1696 | ((eq (car option) 'indentation) |
| 1697 | (whitespace-indentation-regexp)) | 1697 | (whitespace-indentation-regexp)) |
| 1698 | ((eq (car option) 'indentation::tab) | 1698 | ((eq (car option) 'indentation::tab) |
| 1699 | (whitespace-indentation-regexp 'tab)) | 1699 | (whitespace-indentation-regexp 'tab)) |
| 1700 | ((eq (car option) 'indentation::space) | 1700 | ((eq (car option) 'indentation::space) |
| 1701 | (whitespace-indentation-regexp 'space)) | 1701 | (whitespace-indentation-regexp 'space)) |
| 1702 | ((eq (car option) 'space-after-tab) | 1702 | ((eq (car option) 'space-after-tab) |
| 1703 | (whitespace-space-after-tab-regexp)) | 1703 | (whitespace-space-after-tab-regexp)) |
| 1704 | ((eq (car option) 'space-after-tab::tab) | 1704 | ((eq (car option) 'space-after-tab::tab) |
| 1705 | (whitespace-space-after-tab-regexp 'tab)) | 1705 | (whitespace-space-after-tab-regexp 'tab)) |
| 1706 | ((eq (car option) 'space-after-tab::space) | 1706 | ((eq (car option) 'space-after-tab::space) |
| 1707 | (whitespace-space-after-tab-regexp 'space)) | 1707 | (whitespace-space-after-tab-regexp 'space)) |
| 1708 | ((eq (car option) 'missing-newline-at-eof) | 1708 | ((eq (car option) 'missing-newline-at-eof) |
| 1709 | "[^\n]\\'") | 1709 | "[^\n]\\'") |
| 1710 | (t | 1710 | (t |
| 1711 | (cdr option))))) | 1711 | (cdr option))))) |
| 1712 | (when (re-search-forward regexp rend t) | 1712 | (when (re-search-forward regexp rend t) |
| 1713 | (unless has-bogus | 1713 | (unless has-bogus |
| 1714 | (setq has-bogus (memq (car option) style))) | 1714 | (setq has-bogus (memq (car option) style))) |
| 1715 | t))) | 1715 | t))) |
| 1716 | whitespace-report-list))) | 1716 | whitespace-report-list))) |
| 1717 | (when (pcase report-if-bogus ('nil t) ('never nil) (_ has-bogus)) | 1717 | (when (pcase report-if-bogus ('nil t) ('never nil) (_ has-bogus)) |
| 1718 | (whitespace-kill-buffer whitespace-report-buffer-name) | 1718 | (whitespace-kill-buffer whitespace-report-buffer-name) |
| @@ -2463,5 +2463,4 @@ It should be added buffer-locally to `write-file-functions'." | |||
| 2463 | "use `with-eval-after-load' instead." "28.1") | 2463 | "use `with-eval-after-load' instead." "28.1") |
| 2464 | (run-hooks 'whitespace-load-hook) | 2464 | (run-hooks 'whitespace-load-hook) |
| 2465 | 2465 | ||
| 2466 | |||
| 2467 | ;;; whitespace.el ends here | 2466 | ;;; whitespace.el ends here |