diff options
| author | Stefan Monnier | 2011-05-23 14:57:17 -0300 |
|---|---|---|
| committer | Stefan Monnier | 2011-05-23 14:57:17 -0300 |
| commit | 4f91a8160fe71295b7ad4d6e3f90f004caa3546c (patch) | |
| tree | c0f3f767b785559ee0387e7cfb54a2a1aa06bcd5 | |
| parent | 782fc81943849d699d74c3039be80d4068bb3422 (diff) | |
| download | emacs-4f91a8160fe71295b7ad4d6e3f90f004caa3546c.tar.gz emacs-4f91a8160fe71295b7ad4d6e3f90f004caa3546c.zip | |
Don't quote lambda expressions with `quote'.
77 files changed, 470 insertions, 497 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0b6766786b1..cb00357c23e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2011-05-23 Stefan Monnier <monnier@iro.umontreal.ca> | 1 | 2011-05-23 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 2 | ||
| 3 | * <lots-of-files>.el: Don't quote lambda expressions with `quote'. | ||
| 4 | |||
| 3 | * vc/smerge-mode.el (smerge-refine-subst): Don't deactivate the mark | 5 | * vc/smerge-mode.el (smerge-refine-subst): Don't deactivate the mark |
| 4 | (bug#8710). | 6 | (bug#8710). |
| 5 | 7 | ||
diff --git a/lisp/allout-widgets.el b/lisp/allout-widgets.el index a83e5a2a85c..647b609288d 100644 --- a/lisp/allout-widgets.el +++ b/lisp/allout-widgets.el | |||
| @@ -302,7 +302,7 @@ buffers where this is set to enable and disable widget | |||
| 302 | enhancements, directly.") | 302 | enhancements, directly.") |
| 303 | ;;;###autoload | 303 | ;;;###autoload |
| 304 | (put 'allout-widgets-mode-inhibit 'safe-local-variable | 304 | (put 'allout-widgets-mode-inhibit 'safe-local-variable |
| 305 | (if (fboundp 'booleanp) 'booleanp '(lambda (x) (member x '(t nil))))) | 305 | (if (fboundp 'booleanp) 'booleanp (lambda (x) (member x '(t nil))))) |
| 306 | (make-variable-buffer-local 'allout-widgets-mode-inhibit) | 306 | (make-variable-buffer-local 'allout-widgets-mode-inhibit) |
| 307 | ;;;_ = allout-inhibit-body-modification-hook | 307 | ;;;_ = allout-inhibit-body-modification-hook |
| 308 | (defvar allout-inhibit-body-modification-hook nil | 308 | (defvar allout-inhibit-body-modification-hook nil |
diff --git a/lisp/allout.el b/lisp/allout.el index 168ba6edd3d..8cdf24176b0 100644 --- a/lisp/allout.el +++ b/lisp/allout.el | |||
| @@ -416,7 +416,7 @@ where auto-fill occurs." | |||
| 416 | (make-variable-buffer-local 'allout-use-hanging-indents) | 416 | (make-variable-buffer-local 'allout-use-hanging-indents) |
| 417 | ;;;###autoload | 417 | ;;;###autoload |
| 418 | (put 'allout-use-hanging-indents 'safe-local-variable | 418 | (put 'allout-use-hanging-indents 'safe-local-variable |
| 419 | (if (fboundp 'booleanp) 'booleanp '(lambda (x) (member x '(t nil))))) | 419 | (if (fboundp 'booleanp) 'booleanp (lambda (x) (member x '(t nil))))) |
| 420 | ;;;_ = allout-reindent-bodies | 420 | ;;;_ = allout-reindent-bodies |
| 421 | (defcustom allout-reindent-bodies (if allout-use-hanging-indents | 421 | (defcustom allout-reindent-bodies (if allout-use-hanging-indents |
| 422 | 'text) | 422 | 'text) |
| @@ -435,7 +435,7 @@ those that do not have the variable `comment-start' set. A value of | |||
| 435 | (make-variable-buffer-local 'allout-reindent-bodies) | 435 | (make-variable-buffer-local 'allout-reindent-bodies) |
| 436 | ;;;###autoload | 436 | ;;;###autoload |
| 437 | (put 'allout-reindent-bodies 'safe-local-variable | 437 | (put 'allout-reindent-bodies 'safe-local-variable |
| 438 | '(lambda (x) (memq x '(nil t text force)))) | 438 | (lambda (x) (memq x '(nil t text force)))) |
| 439 | 439 | ||
| 440 | ;;;_ = allout-show-bodies | 440 | ;;;_ = allout-show-bodies |
| 441 | (defcustom allout-show-bodies nil | 441 | (defcustom allout-show-bodies nil |
| @@ -446,7 +446,7 @@ just the header." | |||
| 446 | (make-variable-buffer-local 'allout-show-bodies) | 446 | (make-variable-buffer-local 'allout-show-bodies) |
| 447 | ;;;###autoload | 447 | ;;;###autoload |
| 448 | (put 'allout-show-bodies 'safe-local-variable | 448 | (put 'allout-show-bodies 'safe-local-variable |
| 449 | (if (fboundp 'booleanp) 'booleanp '(lambda (x) (member x '(t nil))))) | 449 | (if (fboundp 'booleanp) 'booleanp (lambda (x) (member x '(t nil))))) |
| 450 | 450 | ||
| 451 | ;;;_ = allout-beginning-of-line-cycles | 451 | ;;;_ = allout-beginning-of-line-cycles |
| 452 | (defcustom allout-beginning-of-line-cycles t | 452 | (defcustom allout-beginning-of-line-cycles t |
| @@ -638,7 +638,7 @@ undesired.]" | |||
| 638 | :group 'allout) | 638 | :group 'allout) |
| 639 | ;;;###autoload | 639 | ;;;###autoload |
| 640 | (put 'allout-use-mode-specific-leader 'safe-local-variable | 640 | (put 'allout-use-mode-specific-leader 'safe-local-variable |
| 641 | '(lambda (x) (or (memq x '(t nil allout-mode-leaders comment-start)) | 641 | (lambda (x) (or (memq x '(t nil allout-mode-leaders comment-start)) |
| 642 | (stringp x)))) | 642 | (stringp x)))) |
| 643 | ;;;_ = allout-mode-leaders | 643 | ;;;_ = allout-mode-leaders |
| 644 | (defvar allout-mode-leaders '() | 644 | (defvar allout-mode-leaders '() |
| @@ -668,7 +668,7 @@ are always respected by the topic maneuvering functions." | |||
| 668 | (make-variable-buffer-local 'allout-old-style-prefixes) | 668 | (make-variable-buffer-local 'allout-old-style-prefixes) |
| 669 | ;;;###autoload | 669 | ;;;###autoload |
| 670 | (put 'allout-old-style-prefixes 'safe-local-variable | 670 | (put 'allout-old-style-prefixes 'safe-local-variable |
| 671 | (if (fboundp 'booleanp) 'booleanp '(lambda (x) (member x '(t nil))))) | 671 | (if (fboundp 'booleanp) 'booleanp (lambda (x) (member x '(t nil))))) |
| 672 | ;;;_ = allout-stylish-prefixes -- alternating bullets | 672 | ;;;_ = allout-stylish-prefixes -- alternating bullets |
| 673 | (defcustom allout-stylish-prefixes t | 673 | (defcustom allout-stylish-prefixes t |
| 674 | "Do fancy stuff with topic prefix bullets according to level, etc. | 674 | "Do fancy stuff with topic prefix bullets according to level, etc. |
| @@ -717,7 +717,7 @@ is non-nil." | |||
| 717 | (make-variable-buffer-local 'allout-stylish-prefixes) | 717 | (make-variable-buffer-local 'allout-stylish-prefixes) |
| 718 | ;;;###autoload | 718 | ;;;###autoload |
| 719 | (put 'allout-stylish-prefixes 'safe-local-variable | 719 | (put 'allout-stylish-prefixes 'safe-local-variable |
| 720 | (if (fboundp 'booleanp) 'booleanp '(lambda (x) (member x '(t nil))))) | 720 | (if (fboundp 'booleanp) 'booleanp (lambda (x) (member x '(t nil))))) |
| 721 | 721 | ||
| 722 | ;;;_ = allout-numbered-bullet | 722 | ;;;_ = allout-numbered-bullet |
| 723 | (defcustom allout-numbered-bullet "#" | 723 | (defcustom allout-numbered-bullet "#" |
| @@ -734,7 +734,7 @@ disables numbering maintenance." | |||
| 734 | (put 'allout-numbered-bullet 'safe-local-variable | 734 | (put 'allout-numbered-bullet 'safe-local-variable |
| 735 | (if (fboundp 'string-or-null-p) | 735 | (if (fboundp 'string-or-null-p) |
| 736 | 'string-or-null-p | 736 | 'string-or-null-p |
| 737 | '(lambda (x) (or (stringp x) (null x))))) | 737 | (lambda (x) (or (stringp x) (null x))))) |
| 738 | ;;;_ = allout-file-xref-bullet | 738 | ;;;_ = allout-file-xref-bullet |
| 739 | (defcustom allout-file-xref-bullet "@" | 739 | (defcustom allout-file-xref-bullet "@" |
| 740 | "Bullet signifying file cross-references, for `allout-resolve-xref'. | 740 | "Bullet signifying file cross-references, for `allout-resolve-xref'. |
| @@ -746,7 +746,7 @@ Set this var to the bullet you want to use for file cross-references." | |||
| 746 | (put 'allout-file-xref-bullet 'safe-local-variable | 746 | (put 'allout-file-xref-bullet 'safe-local-variable |
| 747 | (if (fboundp 'string-or-null-p) | 747 | (if (fboundp 'string-or-null-p) |
| 748 | 'string-or-null-p | 748 | 'string-or-null-p |
| 749 | '(lambda (x) (or (stringp x) (null x))))) | 749 | (lambda (x) (or (stringp x) (null x))))) |
| 750 | ;;;_ = allout-presentation-padding | 750 | ;;;_ = allout-presentation-padding |
| 751 | (defcustom allout-presentation-padding 2 | 751 | (defcustom allout-presentation-padding 2 |
| 752 | "Presentation-format white-space padding factor, for greater indent." | 752 | "Presentation-format white-space padding factor, for greater indent." |
| @@ -941,7 +941,7 @@ case the value of `allout-default-layout' is used.") | |||
| 941 | (make-variable-buffer-local 'allout-layout) | 941 | (make-variable-buffer-local 'allout-layout) |
| 942 | ;;;###autoload | 942 | ;;;###autoload |
| 943 | (put 'allout-layout 'safe-local-variable | 943 | (put 'allout-layout 'safe-local-variable |
| 944 | '(lambda (x) (or (numberp x) (listp x) (memq x '(: * + -))))) | 944 | (lambda (x) (or (numberp x) (listp x) (memq x '(: * + -))))) |
| 945 | 945 | ||
| 946 | ;;;_ : Topic header format | 946 | ;;;_ : Topic header format |
| 947 | ;;;_ = allout-regexp | 947 | ;;;_ = allout-regexp |
diff --git a/lisp/calc/calc-alg.el b/lisp/calc/calc-alg.el index 728acf5b0f1..274f399fe6a 100644 --- a/lisp/calc/calc-alg.el +++ b/lisp/calc/calc-alg.el | |||
| @@ -415,17 +415,14 @@ | |||
| 415 | 415 | ||
| 416 | 416 | ||
| 417 | (defmacro math-defsimplify (funcs &rest code) | 417 | (defmacro math-defsimplify (funcs &rest code) |
| 418 | (append '(progn) | 418 | (cons 'progn |
| 419 | (mapcar (function | 419 | (mapcar #'(lambda (func) |
| 420 | (lambda (func) | 420 | `(put ',func 'math-simplify |
| 421 | (list 'put (list 'quote func) ''math-simplify | 421 | (nconc |
| 422 | (list 'nconc | 422 | (get ',func 'math-simplify) |
| 423 | (list 'get (list 'quote func) ''math-simplify) | 423 | (list |
| 424 | (list 'list | 424 | #'(lambda (math-simplify-expr) ,@code))))) |
| 425 | (list 'function | 425 | (if (symbolp funcs) (list funcs) funcs)))) |
| 426 | (append '(lambda (math-simplify-expr)) | ||
| 427 | code))))))) | ||
| 428 | (if (symbolp funcs) (list funcs) funcs)))) | ||
| 429 | (put 'math-defsimplify 'lisp-indent-hook 1) | 426 | (put 'math-defsimplify 'lisp-indent-hook 1) |
| 430 | 427 | ||
| 431 | ;; The function created by math-defsimplify uses the variable | 428 | ;; The function created by math-defsimplify uses the variable |
diff --git a/lisp/calc/calc-ext.el b/lisp/calc/calc-ext.el index 9ea773fbb98..6e05cdb07e5 100644 --- a/lisp/calc/calc-ext.el +++ b/lisp/calc/calc-ext.el | |||
| @@ -2872,33 +2872,25 @@ If X is not an error form, return 1." | |||
| 2872 | 2872 | ||
| 2873 | (defmacro math-defintegral (funcs &rest code) | 2873 | (defmacro math-defintegral (funcs &rest code) |
| 2874 | (setq math-integral-cache nil) | 2874 | (setq math-integral-cache nil) |
| 2875 | (append '(progn) | 2875 | (cons 'progn |
| 2876 | (mapcar (function | 2876 | (mapcar #'(lambda (func) |
| 2877 | (lambda (func) | 2877 | `(put ',func 'math-integral |
| 2878 | (list 'put (list 'quote func) ''math-integral | 2878 | (nconc |
| 2879 | (list 'nconc | 2879 | (get ',func 'math-integral) |
| 2880 | (list 'get (list 'quote func) ''math-integral) | 2880 | (list |
| 2881 | (list 'list | 2881 | #'(lambda (u) ,@code))))) |
| 2882 | (list 'function | 2882 | (if (symbolp funcs) (list funcs) funcs)))) |
| 2883 | (append '(lambda (u)) | ||
| 2884 | code))))))) | ||
| 2885 | (if (symbolp funcs) (list funcs) funcs)))) | ||
| 2886 | (put 'math-defintegral 'lisp-indent-hook 1) | 2883 | (put 'math-defintegral 'lisp-indent-hook 1) |
| 2887 | 2884 | ||
| 2888 | (defmacro math-defintegral-2 (funcs &rest code) | 2885 | (defmacro math-defintegral-2 (funcs &rest code) |
| 2889 | (setq math-integral-cache nil) | 2886 | (setq math-integral-cache nil) |
| 2890 | (append '(progn) | 2887 | (cons 'progn |
| 2891 | (mapcar (function | 2888 | (mapcar #'(lambda (func) |
| 2892 | (lambda (func) | 2889 | `(put ',func 'math-integral-2 |
| 2893 | (list 'put (list 'quote func) ''math-integral-2 | 2890 | `(nconc |
| 2894 | (list 'nconc | 2891 | (get ',func 'math-integral-2) |
| 2895 | (list 'get (list 'quote func) | 2892 | (list #'(lambda (u v) ,@code))))) |
| 2896 | ''math-integral-2) | 2893 | (if (symbolp funcs) (list funcs) funcs)))) |
| 2897 | (list 'list | ||
| 2898 | (list 'function | ||
| 2899 | (append '(lambda (u v)) | ||
| 2900 | code))))))) | ||
| 2901 | (if (symbolp funcs) (list funcs) funcs)))) | ||
| 2902 | (put 'math-defintegral-2 'lisp-indent-hook 1) | 2894 | (put 'math-defintegral-2 'lisp-indent-hook 1) |
| 2903 | 2895 | ||
| 2904 | (defvar var-IntegAfterRules 'calc-IntegAfterRules) | 2896 | (defvar var-IntegAfterRules 'calc-IntegAfterRules) |
diff --git a/lisp/calculator.el b/lisp/calculator.el index 45ed699c4f5..2cc7f5f6569 100644 --- a/lisp/calculator.el +++ b/lisp/calculator.el | |||
| @@ -198,11 +198,11 @@ For example, use this to define the golden ratio number: | |||
| 198 | (setq calculator-user-registers '((?g . 1.61803398875))) | 198 | (setq calculator-user-registers '((?g . 1.61803398875))) |
| 199 | before you load calculator." | 199 | before you load calculator." |
| 200 | :type '(repeat (cons character number)) | 200 | :type '(repeat (cons character number)) |
| 201 | :set '(lambda (_ val) | 201 | :set (lambda (_ val) |
| 202 | (and (boundp 'calculator-registers) | 202 | (and (boundp 'calculator-registers) |
| 203 | (setq calculator-registers | 203 | (setq calculator-registers |
| 204 | (append val calculator-registers))) | 204 | (append val calculator-registers))) |
| 205 | (setq calculator-user-registers val)) | 205 | (setq calculator-user-registers val)) |
| 206 | :group 'calculator) | 206 | :group 'calculator) |
| 207 | 207 | ||
| 208 | (defcustom calculator-user-operators nil | 208 | (defcustom calculator-user-operators nil |
| @@ -482,7 +482,7 @@ Used for repeating operations in calculator-repR/L.") | |||
| 482 | ["Electric mode" | 482 | ["Electric mode" |
| 483 | (progn (calculator-quit) | 483 | (progn (calculator-quit) |
| 484 | (setq calculator-restart-other-mode t) | 484 | (setq calculator-restart-other-mode t) |
| 485 | (run-with-timer 0.1 nil '(lambda () (message nil))) | 485 | (run-with-timer 0.1 nil (lambda () (message nil))) |
| 486 | ;; the message from the menu will be visible, | 486 | ;; the message from the menu will be visible, |
| 487 | ;; couldn't make it go away... | 487 | ;; couldn't make it go away... |
| 488 | (calculator)) | 488 | (calculator)) |
| @@ -706,7 +706,7 @@ See the documentation for `calculator-mode' for more information." | |||
| 706 | (Electric-command-loop | 706 | (Electric-command-loop |
| 707 | 'calculator-done | 707 | 'calculator-done |
| 708 | ;; can't use 'noprompt, bug in electric.el | 708 | ;; can't use 'noprompt, bug in electric.el |
| 709 | '(lambda () 'noprompt) | 709 | (lambda () 'noprompt) |
| 710 | nil | 710 | nil |
| 711 | (lambda (x y) (calculator-update-display)))) | 711 | (lambda (x y) (calculator-update-display)))) |
| 712 | (and calculator-buffer | 712 | (and calculator-buffer |
diff --git a/lisp/dos-w32.el b/lisp/dos-w32.el index 36832df3c67..5dac6d22722 100644 --- a/lisp/dos-w32.el +++ b/lisp/dos-w32.el | |||
| @@ -228,10 +228,10 @@ dealing with untranslated filesystems." | |||
| 228 | ;; directory separators changed to directory-sep-char. | 228 | ;; directory separators changed to directory-sep-char. |
| 229 | (let ((name nil)) | 229 | (let ((name nil)) |
| 230 | (setq name (mapconcat | 230 | (setq name (mapconcat |
| 231 | '(lambda (char) | 231 | (lambda (char) |
| 232 | (if (and (<= ?A char) (<= char ?Z)) | 232 | (if (and (<= ?A char) (<= char ?Z)) |
| 233 | (char-to-string (+ (- char ?A) ?a)) | 233 | (char-to-string (+ (- char ?A) ?a)) |
| 234 | (char-to-string char))) | 234 | (char-to-string char))) |
| 235 | filename nil)) | 235 | filename nil)) |
| 236 | ;; Use expand-file-name to canonicalize directory separators, except | 236 | ;; Use expand-file-name to canonicalize directory separators, except |
| 237 | ;; with bare drive letters (which would have the cwd appended). | 237 | ;; with bare drive letters (which would have the cwd appended). |
diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el index 3fb3d841ed1..c76cdffd62f 100644 --- a/lisp/emacs-lisp/byte-run.el +++ b/lisp/emacs-lisp/byte-run.el | |||
| @@ -72,7 +72,7 @@ The return value of this function is not used." | |||
| 72 | ;; "Cause the named functions to be open-coded when called from compiled code. | 72 | ;; "Cause the named functions to be open-coded when called from compiled code. |
| 73 | ;; They will only be compiled open-coded when byte-compile-optimize is true." | 73 | ;; They will only be compiled open-coded when byte-compile-optimize is true." |
| 74 | ;; (cons 'eval-and-compile | 74 | ;; (cons 'eval-and-compile |
| 75 | ;; (mapcar '(lambda (x) | 75 | ;; (mapcar (lambda (x) |
| 76 | ;; (or (memq (get x 'byte-optimizer) | 76 | ;; (or (memq (get x 'byte-optimizer) |
| 77 | ;; '(nil byte-compile-inline-expand)) | 77 | ;; '(nil byte-compile-inline-expand)) |
| 78 | ;; (error | 78 | ;; (error |
| @@ -85,7 +85,7 @@ The return value of this function is not used." | |||
| 85 | ;; (defmacro proclaim-notinline (&rest fns) | 85 | ;; (defmacro proclaim-notinline (&rest fns) |
| 86 | ;; "Cause the named functions to no longer be open-coded." | 86 | ;; "Cause the named functions to no longer be open-coded." |
| 87 | ;; (cons 'eval-and-compile | 87 | ;; (cons 'eval-and-compile |
| 88 | ;; (mapcar '(lambda (x) | 88 | ;; (mapcar (lambda (x) |
| 89 | ;; (if (eq (get x 'byte-optimizer) 'byte-compile-inline-expand) | 89 | ;; (if (eq (get x 'byte-optimizer) 'byte-compile-inline-expand) |
| 90 | ;; (put x 'byte-optimizer nil)) | 90 | ;; (put x 'byte-optimizer nil)) |
| 91 | ;; (list 'if (list 'eq (list 'get (list 'quote x) ''byte-optimizer) | 91 | ;; (list 'if (list 'eq (list 'get (list 'quote x) ''byte-optimizer) |
diff --git a/lisp/emacs-lisp/chart.el b/lisp/emacs-lisp/chart.el index 01eb1efdc3b..56930a74693 100644 --- a/lisp/emacs-lisp/chart.el +++ b/lisp/emacs-lisp/chart.el | |||
| @@ -639,7 +639,7 @@ SORT-PRED if desired." | |||
| 639 | extlst "File Extensions" | 639 | extlst "File Extensions" |
| 640 | cntlst "# of occurrences" | 640 | cntlst "# of occurrences" |
| 641 | 10 | 641 | 10 |
| 642 | '(lambda (a b) (> (cdr a) (cdr b)))) | 642 | (lambda (a b) (> (cdr a) (cdr b)))) |
| 643 | )) | 643 | )) |
| 644 | 644 | ||
| 645 | (defun chart-space-usage (d) | 645 | (defun chart-space-usage (d) |
| @@ -669,7 +669,7 @@ SORT-PRED if desired." | |||
| 669 | nmlst "File Name" | 669 | nmlst "File Name" |
| 670 | cntlst "File Size" | 670 | cntlst "File Size" |
| 671 | 10 | 671 | 10 |
| 672 | '(lambda (a b) (> (cdr a) (cdr b)))) | 672 | (lambda (a b) (> (cdr a) (cdr b)))) |
| 673 | )) | 673 | )) |
| 674 | 674 | ||
| 675 | (defun chart-emacs-storage () | 675 | (defun chart-emacs-storage () |
| @@ -737,7 +737,7 @@ SORT-PRED if desired." | |||
| 737 | nmlst "User Names" | 737 | nmlst "User Names" |
| 738 | cntlst "# of occurrences" | 738 | cntlst "# of occurrences" |
| 739 | 10 | 739 | 10 |
| 740 | '(lambda (a b) (> (cdr a) (cdr b)))) | 740 | (lambda (a b) (> (cdr a) (cdr b)))) |
| 741 | )) | 741 | )) |
| 742 | 742 | ||
| 743 | 743 | ||
diff --git a/lisp/emacs-lisp/checkdoc.el b/lisp/emacs-lisp/checkdoc.el index aead75668f1..7eb6e6ef765 100644 --- a/lisp/emacs-lisp/checkdoc.el +++ b/lisp/emacs-lisp/checkdoc.el | |||
| @@ -38,8 +38,7 @@ | |||
| 38 | ;; or [menu-bar emacs-lisp eval-buffer]. Additional key-bindings | 38 | ;; or [menu-bar emacs-lisp eval-buffer]. Additional key-bindings |
| 39 | ;; are also provided under C-c ? KEY | 39 | ;; are also provided under C-c ? KEY |
| 40 | ;; (require 'checkdoc) | 40 | ;; (require 'checkdoc) |
| 41 | ;; (add-hook 'emacs-lisp-mode-hook | 41 | ;; (add-hook 'emacs-lisp-mode-hook 'checkdoc-minor-mode) |
| 42 | ;; '(lambda () (checkdoc-minor-mode 1))) | ||
| 43 | ;; | 42 | ;; |
| 44 | ;; Using `checkdoc': | 43 | ;; Using `checkdoc': |
| 45 | ;; | 44 | ;; |
diff --git a/lisp/emacs-lisp/disass.el b/lisp/emacs-lisp/disass.el index 4fd10185c17..2a41e611dc0 100644 --- a/lisp/emacs-lisp/disass.el +++ b/lisp/emacs-lisp/disass.el | |||
| @@ -251,10 +251,10 @@ OBJ should be a call to BYTE-CODE generated by the byte compiler." | |||
| 251 | ((eq (car-safe (car-safe arg)) 'byte-code) | 251 | ((eq (car-safe (car-safe arg)) 'byte-code) |
| 252 | (insert "(<byte code>...)\n") | 252 | (insert "(<byte code>...)\n") |
| 253 | (mapc ;recurse on list of byte-code objects | 253 | (mapc ;recurse on list of byte-code objects |
| 254 | '(lambda (obj) | 254 | (lambda (obj) |
| 255 | (disassemble-1 | 255 | (disassemble-1 |
| 256 | obj | 256 | obj |
| 257 | (+ indent disassemble-recursive-indent))) | 257 | (+ indent disassemble-recursive-indent))) |
| 258 | arg)) | 258 | arg)) |
| 259 | (t | 259 | (t |
| 260 | ;; really just a constant | 260 | ;; really just a constant |
diff --git a/lisp/emacs-lisp/tcover-unsafep.el b/lisp/emacs-lisp/tcover-unsafep.el index 2be026b98eb..cc3e633f098 100644 --- a/lisp/emacs-lisp/tcover-unsafep.el +++ b/lisp/emacs-lisp/tcover-unsafep.el | |||
| @@ -29,13 +29,13 @@ | |||
| 29 | ;;;These forms are all considered safe | 29 | ;;;These forms are all considered safe |
| 30 | (defconst testcover-unsafep-safe | 30 | (defconst testcover-unsafep-safe |
| 31 | '(((lambda (x) (* x 2)) 14) | 31 | '(((lambda (x) (* x 2)) 14) |
| 32 | (apply 'cdr (mapcar '(lambda (x) (car x)) y)) | 32 | (apply 'cdr (mapcar (lambda (x) (car x)) y)) |
| 33 | (cond ((= x 4) 5) (t 27)) | 33 | (cond ((= x 4) 5) (t 27)) |
| 34 | (condition-case x (car y) (error (car x))) | 34 | (condition-case x (car y) (error (car x))) |
| 35 | (dolist (x y) (message "here: %s" x)) | 35 | (dolist (x y) (message "here: %s" x)) |
| 36 | (dotimes (x 14 (* x 2)) (message "here: %d" x)) | 36 | (dotimes (x 14 (* x 2)) (message "here: %d" x)) |
| 37 | (let (x) (dolist (y '(1 2 3) (1+ y)) (push y x))) | 37 | (let (x) (dolist (y '(1 2 3) (1+ y)) (push y x))) |
| 38 | (let (x) (apply '(lambda (x) (* x 2)) 14)) | 38 | (let (x) (apply (lambda (x) (* x 2)) 14)) |
| 39 | (let ((x '(2))) (push 1 x) (pop x) (add-to-list 'x 2)) | 39 | (let ((x '(2))) (push 1 x) (pop x) (add-to-list 'x 2)) |
| 40 | (let ((x 1) (y 2)) (setq x (+ x y))) | 40 | (let ((x 1) (y 2)) (setq x (+ x y))) |
| 41 | (let ((x 1)) (let ((y (+ x 3))) (* x y))) | 41 | (let ((x 1)) (let ((y (+ x 3))) (* x y))) |
| @@ -90,7 +90,7 @@ | |||
| 90 | . (function kill-buffer)) | 90 | . (function kill-buffer)) |
| 91 | ( (mapcar x y) | 91 | ( (mapcar x y) |
| 92 | . (unquoted x)) | 92 | . (unquoted x)) |
| 93 | ( (mapcar '(lambda (x) (rename-file x "x")) '("unsafep.el")) | 93 | ( (mapcar (lambda (x) (rename-file x "x")) '("unsafep.el")) |
| 94 | . (function rename-file)) | 94 | . (function rename-file)) |
| 95 | ( (mapconcat x1 x2 " ") | 95 | ( (mapconcat x1 x2 " ") |
| 96 | . (unquoted x1)) | 96 | . (unquoted x1)) |
diff --git a/lisp/emulation/cua-rect.el b/lisp/emulation/cua-rect.el index 62ae3ffa7d5..5d90ac694a4 100644 --- a/lisp/emulation/cua-rect.el +++ b/lisp/emulation/cua-rect.el | |||
| @@ -609,12 +609,12 @@ If command is repeated at same position, delete the rectangle." | |||
| 609 | (let ((lines 0)) | 609 | (let ((lines 0)) |
| 610 | (if (not (cua--rectangle-virtual-edges)) | 610 | (if (not (cua--rectangle-virtual-edges)) |
| 611 | (cua--rectangle-operation nil nil t 2 t | 611 | (cua--rectangle-operation nil nil t 2 t |
| 612 | '(lambda (s e l r v) | 612 | (lambda (s e l r v) |
| 613 | (setq lines (1+ lines)) | 613 | (setq lines (1+ lines)) |
| 614 | (if (and (> e s) (<= e (point-max))) | 614 | (if (and (> e s) (<= e (point-max))) |
| 615 | (delete-region s e)))) | 615 | (delete-region s e)))) |
| 616 | (cua--rectangle-operation nil 1 t nil t | 616 | (cua--rectangle-operation nil 1 t nil t |
| 617 | '(lambda (s e l r v) | 617 | (lambda (s e l r v) |
| 618 | (setq lines (1+ lines)) | 618 | (setq lines (1+ lines)) |
| 619 | (when (and (> e s) (<= e (point-max))) | 619 | (when (and (> e s) (<= e (point-max))) |
| 620 | (delete-region s e))))) | 620 | (delete-region s e))))) |
| @@ -624,10 +624,10 @@ If command is repeated at same position, delete the rectangle." | |||
| 624 | (let (rect) | 624 | (let (rect) |
| 625 | (if (not (cua--rectangle-virtual-edges)) | 625 | (if (not (cua--rectangle-virtual-edges)) |
| 626 | (cua--rectangle-operation nil nil nil nil nil ; do not tabify | 626 | (cua--rectangle-operation nil nil nil nil nil ; do not tabify |
| 627 | '(lambda (s e l r) | 627 | (lambda (s e l r) |
| 628 | (setq rect (cons (cua--filter-buffer-noprops s e) rect)))) | 628 | (setq rect (cons (cua--filter-buffer-noprops s e) rect)))) |
| 629 | (cua--rectangle-operation nil 1 nil nil nil ; do not tabify | 629 | (cua--rectangle-operation nil 1 nil nil nil ; do not tabify |
| 630 | '(lambda (s e l r v) | 630 | (lambda (s e l r v) |
| 631 | (let ((copy t) (bs 0) (as 0) row) | 631 | (let ((copy t) (bs 0) (as 0) row) |
| 632 | (if (= s e) (setq e (1+ e))) | 632 | (if (= s e) (setq e (1+ e))) |
| 633 | (goto-char s) | 633 | (goto-char s) |
| @@ -750,7 +750,7 @@ If command is repeated at same position, delete the rectangle." | |||
| 750 | (when (/= left right) | 750 | (when (/= left right) |
| 751 | (sit-for 0) ; make window top/bottom reliable | 751 | (sit-for 0) ; make window top/bottom reliable |
| 752 | (cua--rectangle-operation nil t nil nil nil ; do not tabify | 752 | (cua--rectangle-operation nil t nil nil nil ; do not tabify |
| 753 | '(lambda (s e l r v) | 753 | (lambda (s e l r v) |
| 754 | (let ((rface (if v 'cua-rectangle 'cua-rectangle-noselect)) | 754 | (let ((rface (if v 'cua-rectangle 'cua-rectangle-noselect)) |
| 755 | overlay bs ms as) | 755 | overlay bs ms as) |
| 756 | (when (cua--rectangle-virtual-edges) | 756 | (when (cua--rectangle-virtual-edges) |
| @@ -840,7 +840,7 @@ If command is repeated at same position, delete the rectangle." | |||
| 840 | (pad (cua--rectangle-virtual-edges)) | 840 | (pad (cua--rectangle-virtual-edges)) |
| 841 | indent) | 841 | indent) |
| 842 | (cua--rectangle-operation (if clear 'clear 'corners) nil t pad nil | 842 | (cua--rectangle-operation (if clear 'clear 'corners) nil t pad nil |
| 843 | '(lambda (s e l r) | 843 | (lambda (s e l r) |
| 844 | (move-to-column col pad) | 844 | (move-to-column col pad) |
| 845 | (if (and (eolp) | 845 | (if (and (eolp) |
| 846 | (< (current-column) col)) | 846 | (< (current-column) col)) |
| @@ -852,7 +852,7 @@ If command is repeated at same position, delete the rectangle." | |||
| 852 | (if (cua--rectangle-right-side t) | 852 | (if (cua--rectangle-right-side t) |
| 853 | (cua--rectangle-insert-col (current-column)) | 853 | (cua--rectangle-insert-col (current-column)) |
| 854 | (setq indent (- (current-column) l)))) | 854 | (setq indent (- (current-column) l)))) |
| 855 | '(lambda (l r) | 855 | (lambda (l r) |
| 856 | (when (and indent (> indent 0)) | 856 | (when (and indent (> indent 0)) |
| 857 | (aset cua--rectangle 2 (+ l indent)) | 857 | (aset cua--rectangle 2 (+ l indent)) |
| 858 | (aset cua--rectangle 3 (+ r indent -1))))))) | 858 | (aset cua--rectangle 3 (+ r indent -1))))))) |
| @@ -1000,7 +1000,7 @@ The text previously in the region is not overwritten by the blanks, | |||
| 1000 | but instead winds up to the right of the rectangle." | 1000 | but instead winds up to the right of the rectangle." |
| 1001 | (interactive) | 1001 | (interactive) |
| 1002 | (cua--rectangle-operation 'corners nil t 1 nil | 1002 | (cua--rectangle-operation 'corners nil t 1 nil |
| 1003 | '(lambda (s e l r) | 1003 | (lambda (s e l r) |
| 1004 | (skip-chars-forward " \t") | 1004 | (skip-chars-forward " \t") |
| 1005 | (let ((ws (- (current-column) l)) | 1005 | (let ((ws (- (current-column) l)) |
| 1006 | (p (point))) | 1006 | (p (point))) |
| @@ -1015,7 +1015,7 @@ at that column is deleted. | |||
| 1015 | With prefix arg, also delete whitespace to the left of that column." | 1015 | With prefix arg, also delete whitespace to the left of that column." |
| 1016 | (interactive "P") | 1016 | (interactive "P") |
| 1017 | (cua--rectangle-operation 'clear nil t 1 nil | 1017 | (cua--rectangle-operation 'clear nil t 1 nil |
| 1018 | '(lambda (s e l r) | 1018 | (lambda (s e l r) |
| 1019 | (when arg | 1019 | (when arg |
| 1020 | (skip-syntax-backward " " (line-beginning-position)) | 1020 | (skip-syntax-backward " " (line-beginning-position)) |
| 1021 | (setq s (point))) | 1021 | (setq s (point))) |
| @@ -1027,7 +1027,7 @@ With prefix arg, also delete whitespace to the left of that column." | |||
| 1027 | The text previously in the rectangle is overwritten by the blanks." | 1027 | The text previously in the rectangle is overwritten by the blanks." |
| 1028 | (interactive) | 1028 | (interactive) |
| 1029 | (cua--rectangle-operation 'keep nil nil 1 nil | 1029 | (cua--rectangle-operation 'keep nil nil 1 nil |
| 1030 | '(lambda (s e l r) | 1030 | (lambda (s e l r) |
| 1031 | (goto-char e) | 1031 | (goto-char e) |
| 1032 | (skip-syntax-forward " " (line-end-position)) | 1032 | (skip-syntax-forward " " (line-end-position)) |
| 1033 | (setq e (point)) | 1033 | (setq e (point)) |
| @@ -1042,7 +1042,7 @@ The text previously in the rectangle is overwritten by the blanks." | |||
| 1042 | (interactive) | 1042 | (interactive) |
| 1043 | (let (x) | 1043 | (let (x) |
| 1044 | (cua--rectangle-operation 'clear nil t t nil | 1044 | (cua--rectangle-operation 'clear nil t t nil |
| 1045 | '(lambda (s e l r) | 1045 | (lambda (s e l r) |
| 1046 | (let ((b (line-beginning-position))) | 1046 | (let ((b (line-beginning-position))) |
| 1047 | (skip-syntax-backward "^ " b) | 1047 | (skip-syntax-backward "^ " b) |
| 1048 | (skip-syntax-backward " " b) | 1048 | (skip-syntax-backward " " b) |
| @@ -1050,7 +1050,7 @@ The text previously in the rectangle is overwritten by the blanks." | |||
| 1050 | (skip-syntax-forward " " (line-end-position)) | 1050 | (skip-syntax-forward " " (line-end-position)) |
| 1051 | (delete-region s (point)) | 1051 | (delete-region s (point)) |
| 1052 | (indent-to l)) | 1052 | (indent-to l)) |
| 1053 | '(lambda (l r) | 1053 | (lambda (l r) |
| 1054 | (move-to-column l) | 1054 | (move-to-column l) |
| 1055 | ;; (setq cua-save-point (point)) | 1055 | ;; (setq cua-save-point (point)) |
| 1056 | )))) | 1056 | )))) |
| @@ -1087,7 +1087,7 @@ The text previously in the rectangle is overwritten by the blanks." | |||
| 1087 | The length of STRING need not be the same as the rectangle width." | 1087 | The length of STRING need not be the same as the rectangle width." |
| 1088 | (interactive "sString rectangle: ") | 1088 | (interactive "sString rectangle: ") |
| 1089 | (cua--rectangle-operation 'keep nil t t nil | 1089 | (cua--rectangle-operation 'keep nil t t nil |
| 1090 | '(lambda (s e l r) | 1090 | (lambda (s e l r) |
| 1091 | (delete-region s e) | 1091 | (delete-region s e) |
| 1092 | (skip-chars-forward " \t") | 1092 | (skip-chars-forward " \t") |
| 1093 | (let ((ws (- (current-column) l))) | 1093 | (let ((ws (- (current-column) l))) |
| @@ -1095,14 +1095,14 @@ The length of STRING need not be the same as the rectangle width." | |||
| 1095 | (insert string) | 1095 | (insert string) |
| 1096 | (indent-to (+ (current-column) ws)))) | 1096 | (indent-to (+ (current-column) ws)))) |
| 1097 | (unless (cua--rectangle-restriction) | 1097 | (unless (cua--rectangle-restriction) |
| 1098 | '(lambda (l r) | 1098 | (lambda (l r) |
| 1099 | (cua--rectangle-right (max l (+ l (length string) -1))))))) | 1099 | (cua--rectangle-right (max l (+ l (length string) -1))))))) |
| 1100 | 1100 | ||
| 1101 | (defun cua-fill-char-rectangle (character) | 1101 | (defun cua-fill-char-rectangle (character) |
| 1102 | "Replace CUA rectangle contents with CHARACTER." | 1102 | "Replace CUA rectangle contents with CHARACTER." |
| 1103 | (interactive "cFill rectangle with character: ") | 1103 | (interactive "cFill rectangle with character: ") |
| 1104 | (cua--rectangle-operation 'clear nil t 1 nil | 1104 | (cua--rectangle-operation 'clear nil t 1 nil |
| 1105 | '(lambda (s e l r) | 1105 | (lambda (s e l r) |
| 1106 | (delete-region s e) | 1106 | (delete-region s e) |
| 1107 | (move-to-column l t) | 1107 | (move-to-column l t) |
| 1108 | (insert-char character (- r l))))) | 1108 | (insert-char character (- r l))))) |
| @@ -1113,7 +1113,7 @@ The length of STRING need not be the same as the rectangle width." | |||
| 1113 | (if buffer-read-only | 1113 | (if buffer-read-only |
| 1114 | (message "Cannot replace in read-only buffer") | 1114 | (message "Cannot replace in read-only buffer") |
| 1115 | (cua--rectangle-operation 'keep nil t 1 nil | 1115 | (cua--rectangle-operation 'keep nil t 1 nil |
| 1116 | '(lambda (s e l r) | 1116 | (lambda (s e l r) |
| 1117 | (if (re-search-forward regexp e t) | 1117 | (if (re-search-forward regexp e t) |
| 1118 | (replace-match newtext nil nil)))))) | 1118 | (replace-match newtext nil nil)))))) |
| 1119 | 1119 | ||
| @@ -1121,7 +1121,7 @@ The length of STRING need not be the same as the rectangle width." | |||
| 1121 | "Increment each line of CUA rectangle by prefix amount." | 1121 | "Increment each line of CUA rectangle by prefix amount." |
| 1122 | (interactive "p") | 1122 | (interactive "p") |
| 1123 | (cua--rectangle-operation 'keep nil t 1 nil | 1123 | (cua--rectangle-operation 'keep nil t 1 nil |
| 1124 | '(lambda (s e l r) | 1124 | (lambda (s e l r) |
| 1125 | (cond | 1125 | (cond |
| 1126 | ((re-search-forward "0x\\([0-9a-fA-F]+\\)" e t) | 1126 | ((re-search-forward "0x\\([0-9a-fA-F]+\\)" e t) |
| 1127 | (let* ((txt (cua--filter-buffer-noprops (match-beginning 1) (match-end 1))) | 1127 | (let* ((txt (cua--filter-buffer-noprops (match-beginning 1) (match-end 1))) |
| @@ -1154,14 +1154,14 @@ The numbers are formatted according to the FORMAT string." | |||
| 1154 | (setq format cua--rectangle-seq-format) | 1154 | (setq format cua--rectangle-seq-format) |
| 1155 | (setq cua--rectangle-seq-format format)) | 1155 | (setq cua--rectangle-seq-format format)) |
| 1156 | (cua--rectangle-operation 'clear nil t 1 nil | 1156 | (cua--rectangle-operation 'clear nil t 1 nil |
| 1157 | '(lambda (s e l r) | 1157 | (lambda (s e l r) |
| 1158 | (delete-region s e) | 1158 | (delete-region s e) |
| 1159 | (insert (format format first)) | 1159 | (insert (format format first)) |
| 1160 | (setq first (+ first incr))))) | 1160 | (setq first (+ first incr))))) |
| 1161 | 1161 | ||
| 1162 | (defmacro cua--convert-rectangle-as (command tabify) | 1162 | (defmacro cua--convert-rectangle-as (command tabify) |
| 1163 | `(cua--rectangle-operation 'clear nil nil nil ,tabify | 1163 | `(cua--rectangle-operation 'clear nil nil nil ,tabify |
| 1164 | '(lambda (s e l r) | 1164 | (lambda (s e l r) |
| 1165 | (,command s e)))) | 1165 | (,command s e)))) |
| 1166 | 1166 | ||
| 1167 | (defun cua-upcase-rectangle () | 1167 | (defun cua-upcase-rectangle () |
| @@ -1218,7 +1218,7 @@ The numbers are formatted according to the FORMAT string." | |||
| 1218 | (if cua--debug | 1218 | (if cua--debug |
| 1219 | (print z auxbuf)) | 1219 | (print z auxbuf)) |
| 1220 | (cua--rectangle-operation nil nil t pad nil | 1220 | (cua--rectangle-operation nil nil t pad nil |
| 1221 | '(lambda (s e l r) | 1221 | (lambda (s e l r) |
| 1222 | (let (cc) | 1222 | (let (cc) |
| 1223 | (goto-char e) | 1223 | (goto-char e) |
| 1224 | (skip-chars-forward " \t") | 1224 | (skip-chars-forward " \t") |
| @@ -1266,7 +1266,7 @@ A numeric prefix argument is used a new width for the filled rectangle." | |||
| 1266 | nil nil nil nil))) | 1266 | nil nil nil nil))) |
| 1267 | (cua--rectangle-aux-replace width t t t 1 | 1267 | (cua--rectangle-aux-replace width t t t 1 |
| 1268 | 'cua--left-fill-rectangle | 1268 | 'cua--left-fill-rectangle |
| 1269 | '(lambda () (insert text)))) | 1269 | (lambda () (insert text)))) |
| 1270 | 1270 | ||
| 1271 | (defun cua-refill-rectangle (width) | 1271 | (defun cua-refill-rectangle (width) |
| 1272 | "Fill contents of current rectagle. | 1272 | "Fill contents of current rectagle. |
| @@ -1285,7 +1285,7 @@ With prefix arg, replace rectangle with output from command." | |||
| 1285 | nil nil nil | 1285 | nil nil nil |
| 1286 | 'shell-command-history))) | 1286 | 'shell-command-history))) |
| 1287 | (cua--rectangle-aux-replace -1 t t replace 1 | 1287 | (cua--rectangle-aux-replace -1 t t replace 1 |
| 1288 | '(lambda (s e) | 1288 | (lambda (s e) |
| 1289 | (shell-command-on-region s e command | 1289 | (shell-command-on-region s e command |
| 1290 | replace replace nil)))) | 1290 | replace replace nil)))) |
| 1291 | 1291 | ||
| @@ -1298,7 +1298,7 @@ With prefix arg, replace rectangle with output from command." | |||
| 1298 | "Remove the first line of the rectangle and scroll remaining lines up." | 1298 | "Remove the first line of the rectangle and scroll remaining lines up." |
| 1299 | (interactive) | 1299 | (interactive) |
| 1300 | (cua--rectangle-aux-replace 0 t t t t | 1300 | (cua--rectangle-aux-replace 0 t t t t |
| 1301 | '(lambda (s e) | 1301 | (lambda (s e) |
| 1302 | (if (= (forward-line 1) 0) | 1302 | (if (= (forward-line 1) 0) |
| 1303 | (delete-region s (point)))))) | 1303 | (delete-region s (point)))))) |
| 1304 | 1304 | ||
| @@ -1307,7 +1307,7 @@ With prefix arg, replace rectangle with output from command." | |||
| 1307 | The remaining lines are scrolled down, losing the last line." | 1307 | The remaining lines are scrolled down, losing the last line." |
| 1308 | (interactive) | 1308 | (interactive) |
| 1309 | (cua--rectangle-aux-replace 0 t t t t | 1309 | (cua--rectangle-aux-replace 0 t t t t |
| 1310 | '(lambda (s e) | 1310 | (lambda (s e) |
| 1311 | (goto-char s) | 1311 | (goto-char s) |
| 1312 | (insert "\n")))) | 1312 | (insert "\n")))) |
| 1313 | 1313 | ||
| @@ -1337,7 +1337,7 @@ With prefix arg, indent to that column." | |||
| 1337 | (pad (cua--rectangle-virtual-edges)) | 1337 | (pad (cua--rectangle-virtual-edges)) |
| 1338 | indent) | 1338 | indent) |
| 1339 | (cua--rectangle-operation 'corners nil t pad nil | 1339 | (cua--rectangle-operation 'corners nil t pad nil |
| 1340 | '(lambda (s e l r) | 1340 | (lambda (s e l r) |
| 1341 | (move-to-column | 1341 | (move-to-column |
| 1342 | (if (cua--rectangle-right-side t) | 1342 | (if (cua--rectangle-right-side t) |
| 1343 | (max (1+ r) col) l) | 1343 | (max (1+ r) col) l) |
| @@ -1348,7 +1348,7 @@ With prefix arg, indent to that column." | |||
| 1348 | (if (cua--rectangle-right-side t) | 1348 | (if (cua--rectangle-right-side t) |
| 1349 | (cua--rectangle-insert-col (current-column)) | 1349 | (cua--rectangle-insert-col (current-column)) |
| 1350 | (setq indent (- l (current-column)))))) | 1350 | (setq indent (- l (current-column)))))) |
| 1351 | '(lambda (l r) | 1351 | (lambda (l r) |
| 1352 | (when (and indent (> indent 0)) | 1352 | (when (and indent (> indent 0)) |
| 1353 | (aset cua--rectangle 2 (- l indent)) | 1353 | (aset cua--rectangle 2 (- l indent)) |
| 1354 | (aset cua--rectangle 3 (- r indent 1))))))) | 1354 | (aset cua--rectangle 3 (- r indent 1))))))) |
diff --git a/lisp/emulation/tpu-edt.el b/lisp/emulation/tpu-edt.el index f86d3be0fc0..b4bf47a6504 100644 --- a/lisp/emulation/tpu-edt.el +++ b/lisp/emulation/tpu-edt.el | |||
| @@ -1278,9 +1278,9 @@ kill modified buffers without asking." | |||
| 1278 | 1278 | ||
| 1279 | (defun tpu-make-file-buffer-list (buffer-list) | 1279 | (defun tpu-make-file-buffer-list (buffer-list) |
| 1280 | "Return names from BUFFER-LIST excluding those beginning with a space or star." | 1280 | "Return names from BUFFER-LIST excluding those beginning with a space or star." |
| 1281 | (delq nil (mapcar '(lambda (b) | 1281 | (delq nil (mapcar (lambda (b) |
| 1282 | (if (or (= (aref (buffer-name b) 0) ? ) | 1282 | (if (or (= (aref (buffer-name b) 0) ?\s) |
| 1283 | (= (aref (buffer-name b) 0) ?*)) nil b)) | 1283 | (= (aref (buffer-name b) 0) ?*)) nil b)) |
| 1284 | buffer-list))) | 1284 | buffer-list))) |
| 1285 | 1285 | ||
| 1286 | (defun tpu-next-window nil | 1286 | (defun tpu-next-window nil |
diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el index 5daef7f9666..f06428d81eb 100644 --- a/lisp/emulation/viper-cmd.el +++ b/lisp/emulation/viper-cmd.el | |||
| @@ -1084,7 +1084,7 @@ as a Meta key and any number of multiple escapes are allowed." | |||
| 1084 | "Function that implements ESC key in Viper emulation of Vi." | 1084 | "Function that implements ESC key in Viper emulation of Vi." |
| 1085 | (interactive) | 1085 | (interactive) |
| 1086 | (let ((cmd (or (key-binding (viper-envelop-ESC-key)) | 1086 | (let ((cmd (or (key-binding (viper-envelop-ESC-key)) |
| 1087 | '(lambda () (interactive) (error "Viper bell"))))) | 1087 | (lambda () (interactive) (error "Viper bell"))))) |
| 1088 | 1088 | ||
| 1089 | ;; call the actual function to execute ESC (if no other symbols followed) | 1089 | ;; call the actual function to execute ESC (if no other symbols followed) |
| 1090 | ;; or the key bound to the ESC sequence (if the sequence was issued | 1090 | ;; or the key bound to the ESC sequence (if the sequence was issued |
diff --git a/lisp/emulation/viper-util.el b/lisp/emulation/viper-util.el index 4aace25fc9c..24a38236176 100644 --- a/lisp/emulation/viper-util.el +++ b/lisp/emulation/viper-util.el | |||
| @@ -1080,7 +1080,7 @@ Otherwise return the normal value." | |||
| 1080 | char-p (= (length base-key-name) 1)) | 1080 | char-p (= (length base-key-name) 1)) |
| 1081 | (setq mod-char-list | 1081 | (setq mod-char-list |
| 1082 | (mapcar | 1082 | (mapcar |
| 1083 | '(lambda (elt) (upcase (substring (symbol-name elt) 0 1))) | 1083 | (lambda (elt) (upcase (substring (symbol-name elt) 0 1))) |
| 1084 | modifiers)) | 1084 | modifiers)) |
| 1085 | (if char-p | 1085 | (if char-p |
| 1086 | (setq key-name | 1086 | (setq key-name |
| @@ -1153,7 +1153,7 @@ Otherwise return the normal value." | |||
| 1153 | ;; XEmacs only | 1153 | ;; XEmacs only |
| 1154 | (defun viper-event-vector-p (vec) | 1154 | (defun viper-event-vector-p (vec) |
| 1155 | (and (vectorp vec) | 1155 | (and (vectorp vec) |
| 1156 | (eval (cons 'and (mapcar '(lambda (elt) (if (eventp elt) t)) vec))))) | 1156 | (eval (cons 'and (mapcar (lambda (elt) (if (eventp elt) t)) vec))))) |
| 1157 | 1157 | ||
| 1158 | 1158 | ||
| 1159 | ;; check if vec is a vector of character symbols | 1159 | ;; check if vec is a vector of character symbols |
| @@ -1239,7 +1239,7 @@ Arguments become related buffers. This function should normally be used in | |||
| 1239 | the `Local variables' section of a file." | 1239 | the `Local variables' section of a file." |
| 1240 | (setq viper-related-files-and-buffers-ring | 1240 | (setq viper-related-files-and-buffers-ring |
| 1241 | (make-ring (1+ (length other-files-or-buffers)))) | 1241 | (make-ring (1+ (length other-files-or-buffers)))) |
| 1242 | (mapc '(lambda (elt) | 1242 | (mapc (lambda (elt) |
| 1243 | (viper-ring-insert viper-related-files-and-buffers-ring elt)) | 1243 | (viper-ring-insert viper-related-files-and-buffers-ring elt)) |
| 1244 | other-files-or-buffers) | 1244 | other-files-or-buffers) |
| 1245 | (viper-ring-insert viper-related-files-and-buffers-ring (buffer-name)) | 1245 | (viper-ring-insert viper-related-files-and-buffers-ring (buffer-name)) |
diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el index 0da3345aae4..1057eb00cdd 100644 --- a/lisp/emulation/viper.el +++ b/lisp/emulation/viper.el | |||
| @@ -851,19 +851,19 @@ It also can't undo some Viper settings." | |||
| 851 | ;; over misspelled words (due to the overlay keymaps) | 851 | ;; over misspelled words (due to the overlay keymaps) |
| 852 | (defvar flyspell-mode-hook) | 852 | (defvar flyspell-mode-hook) |
| 853 | (add-hook 'flyspell-mode-hook | 853 | (add-hook 'flyspell-mode-hook |
| 854 | '(lambda () | 854 | (lambda () |
| 855 | (define-key flyspell-mouse-map viper-ESC-key nil))) | 855 | (define-key flyspell-mouse-map viper-ESC-key nil))) |
| 856 | ;; if viper is started from .emacs, it might be impossible to get certain | 856 | ;; if viper is started from .emacs, it might be impossible to get certain |
| 857 | ;; info about the display and windows until emacs initialization is complete | 857 | ;; info about the display and windows until emacs initialization is complete |
| 858 | ;; So do it via the window-setup-hook | 858 | ;; So do it via the window-setup-hook |
| 859 | (add-hook 'window-setup-hook | 859 | (add-hook 'window-setup-hook |
| 860 | '(lambda () | 860 | (lambda () |
| 861 | (modify-frame-parameters | 861 | (modify-frame-parameters |
| 862 | (selected-frame) | 862 | (selected-frame) |
| 863 | (list (cons 'viper-vi-state-cursor-color | 863 | (list (cons 'viper-vi-state-cursor-color |
| 864 | (viper-get-cursor-color)))) | 864 | (viper-get-cursor-color)))) |
| 865 | (setq viper-vi-state-cursor-color (viper-get-cursor-color)) | 865 | (setq viper-vi-state-cursor-color (viper-get-cursor-color)) |
| 866 | )) | 866 | )) |
| 867 | 867 | ||
| 868 | ;; Tell vc-diff to put *vc* in Vi mode | 868 | ;; Tell vc-diff to put *vc* in Vi mode |
| 869 | (eval-after-load | 869 | (eval-after-load |
diff --git a/lisp/eshell/em-glob.el b/lisp/eshell/em-glob.el index 732c6c05bfe..db9b003895f 100644 --- a/lisp/eshell/em-glob.el +++ b/lisp/eshell/em-glob.el | |||
| @@ -148,10 +148,10 @@ This option slows down recursive glob processing by quite a bit." | |||
| 148 | ;; if this is a glob pattern than needs to be expanded, then it | 148 | ;; if this is a glob pattern than needs to be expanded, then it |
| 149 | ;; will need to expand each member of the resulting glob list | 149 | ;; will need to expand each member of the resulting glob list |
| 150 | (add-to-list 'eshell-current-modifiers | 150 | (add-to-list 'eshell-current-modifiers |
| 151 | '(lambda (list) | 151 | (lambda (list) |
| 152 | (if (listp list) | 152 | (if (listp list) |
| 153 | (mapcar 'expand-file-name list) | 153 | (mapcar 'expand-file-name list) |
| 154 | (expand-file-name list))))) | 154 | (expand-file-name list))))) |
| 155 | (add-to-list 'eshell-current-modifiers 'eshell-extended-glob)) | 155 | (add-to-list 'eshell-current-modifiers 'eshell-extended-glob)) |
| 156 | 156 | ||
| 157 | (defun eshell-parse-glob-chars () | 157 | (defun eshell-parse-glob-chars () |
diff --git a/lisp/eshell/em-pred.el b/lisp/eshell/em-pred.el index f3027ea9b5e..2308e08ed62 100644 --- a/lisp/eshell/em-pred.el +++ b/lisp/eshell/em-pred.el | |||
| @@ -84,16 +84,16 @@ ordinary strings." | |||
| 84 | (?s . (eshell-pred-file-mode 4000)) ; setuid | 84 | (?s . (eshell-pred-file-mode 4000)) ; setuid |
| 85 | (?S . (eshell-pred-file-mode 2000)) ; setgid | 85 | (?S . (eshell-pred-file-mode 2000)) ; setgid |
| 86 | (?t . (eshell-pred-file-mode 1000)) ; sticky bit | 86 | (?t . (eshell-pred-file-mode 1000)) ; sticky bit |
| 87 | (?U . '(lambda (file) ; owned by effective uid | 87 | (?U . #'(lambda (file) ; owned by effective uid |
| 88 | (if (file-exists-p file) | 88 | (if (file-exists-p file) |
| 89 | (= (nth 2 (file-attributes file)) (user-uid))))) | 89 | (= (nth 2 (file-attributes file)) (user-uid))))) |
| 90 | ;;; (?G . '(lambda (file) ; owned by effective gid | 90 | ;; (?G . #'(lambda (file) ; owned by effective gid |
| 91 | ;;; (if (file-exists-p file) | 91 | ;; (if (file-exists-p file) |
| 92 | ;;; (= (nth 2 (file-attributes file)) (user-uid))))) | 92 | ;; (= (nth 2 (file-attributes file)) (user-uid))))) |
| 93 | (?* . '(lambda (file) | 93 | (?* . #'(lambda (file) |
| 94 | (and (file-regular-p file) | 94 | (and (file-regular-p file) |
| 95 | (not (file-symlink-p file)) | 95 | (not (file-symlink-p file)) |
| 96 | (file-executable-p file)))) | 96 | (file-executable-p file)))) |
| 97 | (?l . (eshell-pred-file-links)) | 97 | (?l . (eshell-pred-file-links)) |
| 98 | (?u . (eshell-pred-user-or-group ?u "user" 2 'eshell-user-id)) | 98 | (?u . (eshell-pred-user-or-group ?u "user" 2 'eshell-user-id)) |
| 99 | (?g . (eshell-pred-user-or-group ?g "group" 3 'eshell-group-id)) | 99 | (?g . (eshell-pred-user-or-group ?g "group" 3 'eshell-group-id)) |
| @@ -111,36 +111,25 @@ The format of each entry is | |||
| 111 | (put 'eshell-predicate-alist 'risky-local-variable t) | 111 | (put 'eshell-predicate-alist 'risky-local-variable t) |
| 112 | 112 | ||
| 113 | (defcustom eshell-modifier-alist | 113 | (defcustom eshell-modifier-alist |
| 114 | '((?E . '(lambda (lst) | 114 | '((?E . #'(lambda (lst) |
| 115 | (mapcar | 115 | (mapcar |
| 116 | (function | 116 | (function |
| 117 | (lambda (str) | 117 | (lambda (str) |
| 118 | (eshell-stringify | 118 | (eshell-stringify |
| 119 | (car (eshell-parse-argument str))))) lst))) | 119 | (car (eshell-parse-argument str))))) lst))) |
| 120 | (?L . '(lambda (lst) | 120 | (?L . #'(lambda (lst) (mapcar 'downcase lst))) |
| 121 | (mapcar 'downcase lst))) | 121 | (?U . #'(lambda (lst) (mapcar 'upcase lst))) |
| 122 | (?U . '(lambda (lst) | 122 | (?C . #'(lambda (lst) (mapcar 'capitalize lst))) |
| 123 | (mapcar 'upcase lst))) | 123 | (?h . #'(lambda (lst) (mapcar 'file-name-directory lst))) |
| 124 | (?C . '(lambda (lst) | ||
| 125 | (mapcar 'capitalize lst))) | ||
| 126 | (?h . '(lambda (lst) | ||
| 127 | (mapcar 'file-name-directory lst))) | ||
| 128 | (?i . (eshell-include-members)) | 124 | (?i . (eshell-include-members)) |
| 129 | (?x . (eshell-include-members t)) | 125 | (?x . (eshell-include-members t)) |
| 130 | (?r . '(lambda (lst) | 126 | (?r . #'(lambda (lst) (mapcar 'file-name-sans-extension lst))) |
| 131 | (mapcar 'file-name-sans-extension lst))) | 127 | (?e . #'(lambda (lst) (mapcar 'file-name-extension lst))) |
| 132 | (?e . '(lambda (lst) | 128 | (?t . #'(lambda (lst) (mapcar 'file-name-nondirectory lst))) |
| 133 | (mapcar 'file-name-extension lst))) | 129 | (?q . #'(lambda (lst) (mapcar 'eshell-escape-arg lst))) |
| 134 | (?t . '(lambda (lst) | 130 | (?u . #'(lambda (lst) (eshell-uniqify-list lst))) |
| 135 | (mapcar 'file-name-nondirectory lst))) | 131 | (?o . #'(lambda (lst) (sort lst 'string-lessp))) |
| 136 | (?q . '(lambda (lst) | 132 | (?O . #'(lambda (lst) (nreverse (sort lst 'string-lessp)))) |
| 137 | (mapcar 'eshell-escape-arg lst))) | ||
| 138 | (?u . '(lambda (lst) | ||
| 139 | (eshell-uniqify-list lst))) | ||
| 140 | (?o . '(lambda (lst) | ||
| 141 | (sort lst 'string-lessp))) | ||
| 142 | (?O . '(lambda (lst) | ||
| 143 | (nreverse (sort lst 'string-lessp)))) | ||
| 144 | (?j . (eshell-join-members)) | 133 | (?j . (eshell-join-members)) |
| 145 | (?S . (eshell-split-members)) | 134 | (?S . (eshell-split-members)) |
| 146 | (?R . 'reverse) | 135 | (?R . 'reverse) |
diff --git a/lisp/files.el b/lisp/files.el index 24a0e0a5b62..2dad1b0eeb5 100644 --- a/lisp/files.el +++ b/lisp/files.el | |||
| @@ -278,7 +278,7 @@ The value `never' means do not make them." | |||
| 278 | :group 'backup | 278 | :group 'backup |
| 279 | :group 'vc) | 279 | :group 'vc) |
| 280 | (put 'version-control 'safe-local-variable | 280 | (put 'version-control 'safe-local-variable |
| 281 | '(lambda (x) (or (booleanp x) (equal x 'never)))) | 281 | (lambda (x) (or (booleanp x) (equal x 'never)))) |
| 282 | 282 | ||
| 283 | (defcustom dired-kept-versions 2 | 283 | (defcustom dired-kept-versions 2 |
| 284 | "When cleaning directory, number of versions to keep." | 284 | "When cleaning directory, number of versions to keep." |
diff --git a/lisp/gnus/gnus-cus.el b/lisp/gnus/gnus-cus.el index 2f99abba22c..98f04263571 100644 --- a/lisp/gnus/gnus-cus.el +++ b/lisp/gnus/gnus-cus.el | |||
| @@ -1034,19 +1034,19 @@ articles in the thread. | |||
| 1034 | (widget-create | 1034 | (widget-create |
| 1035 | 'push-button | 1035 | 'push-button |
| 1036 | :notify | 1036 | :notify |
| 1037 | '(lambda (&rest ignore) | 1037 | (lambda (&rest ignore) |
| 1038 | (let* ((info (assq gnus-agent-cat-name gnus-category-alist)) | 1038 | (let* ((info (assq gnus-agent-cat-name gnus-category-alist)) |
| 1039 | (widgets category-fields)) | 1039 | (widgets category-fields)) |
| 1040 | (while widgets | 1040 | (while widgets |
| 1041 | (let* ((widget (pop widgets)) | 1041 | (let* ((widget (pop widgets)) |
| 1042 | (value (condition-case nil (widget-value widget) (error)))) | 1042 | (value (condition-case nil (widget-value widget) (error)))) |
| 1043 | (eval `(setf (,(widget-get widget :accessor) ',info) | 1043 | (eval `(setf (,(widget-get widget :accessor) ',info) |
| 1044 | ',value))))) | 1044 | ',value))))) |
| 1045 | (gnus-category-write) | 1045 | (gnus-category-write) |
| 1046 | (gnus-kill-buffer (current-buffer)) | 1046 | (gnus-kill-buffer (current-buffer)) |
| 1047 | (when (get-buffer gnus-category-buffer) | 1047 | (when (get-buffer gnus-category-buffer) |
| 1048 | (switch-to-buffer (get-buffer gnus-category-buffer)) | 1048 | (switch-to-buffer (get-buffer gnus-category-buffer)) |
| 1049 | (gnus-category-list))) | 1049 | (gnus-category-list))) |
| 1050 | "Done") | 1050 | "Done") |
| 1051 | (widget-insert | 1051 | (widget-insert |
| 1052 | "\n Note: Empty fields default to the customizable global\ | 1052 | "\n Note: Empty fields default to the customizable global\ |
diff --git a/lisp/gnus/gnus-delay.el b/lisp/gnus/gnus-delay.el index bfd17055ea5..c632cab422f 100644 --- a/lisp/gnus/gnus-delay.el +++ b/lisp/gnus/gnus-delay.el | |||
| @@ -151,8 +151,7 @@ DELAY is a string, giving the length of the time. Possible values are: | |||
| 151 | (when (gnus-group-entry group) | 151 | (when (gnus-group-entry group) |
| 152 | (gnus-activate-group group) | 152 | (gnus-activate-group group) |
| 153 | (add-hook 'message-send-hook | 153 | (add-hook 'message-send-hook |
| 154 | '(lambda () | 154 | (lambda () (message-remove-header gnus-delay-header))) |
| 155 | (message-remove-header gnus-delay-header))) | ||
| 156 | (setq articles (nndraft-articles)) | 155 | (setq articles (nndraft-articles)) |
| 157 | (while (setq article (pop articles)) | 156 | (while (setq article (pop articles)) |
| 158 | (gnus-request-head article group) | 157 | (gnus-request-head article group) |
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el index 8797780251a..20986d25942 100644 --- a/lisp/gnus/gnus.el +++ b/lisp/gnus/gnus.el | |||
| @@ -4357,11 +4357,11 @@ current display is used." | |||
| 4357 | (switch-to-buffer gnus-group-buffer) | 4357 | (switch-to-buffer gnus-group-buffer) |
| 4358 | (funcall gnus-other-frame-function arg) | 4358 | (funcall gnus-other-frame-function arg) |
| 4359 | (add-hook 'gnus-exit-gnus-hook | 4359 | (add-hook 'gnus-exit-gnus-hook |
| 4360 | '(lambda nil | 4360 | (lambda nil |
| 4361 | (when (and (frame-live-p gnus-other-frame-object) | 4361 | (when (and (frame-live-p gnus-other-frame-object) |
| 4362 | (cdr (frame-list))) | 4362 | (cdr (frame-list))) |
| 4363 | (delete-frame gnus-other-frame-object)) | 4363 | (delete-frame gnus-other-frame-object)) |
| 4364 | (setq gnus-other-frame-object nil))))))) | 4364 | (setq gnus-other-frame-object nil))))))) |
| 4365 | 4365 | ||
| 4366 | ;;;###autoload | 4366 | ;;;###autoload |
| 4367 | (defun gnus (&optional arg dont-connect slave) | 4367 | (defun gnus (&optional arg dont-connect slave) |
diff --git a/lisp/hilit-chg.el b/lisp/hilit-chg.el index 6591ef44ff0..041c1ee938b 100644 --- a/lisp/hilit-chg.el +++ b/lisp/hilit-chg.el | |||
| @@ -1025,9 +1025,8 @@ This is called when `global-highlight-changes-mode' is turned on." | |||
| 1025 | ;; (defun hilit-chg-debug-show (&optional beg end) | 1025 | ;; (defun hilit-chg-debug-show (&optional beg end) |
| 1026 | ;; (interactive) | 1026 | ;; (interactive) |
| 1027 | ;; (message "--- hilit-chg-debug-show ---") | 1027 | ;; (message "--- hilit-chg-debug-show ---") |
| 1028 | ;; (hilit-chg-map-changes '(lambda (prop start end) | 1028 | ;; (hilit-chg-map-changes (lambda (prop start end) |
| 1029 | ;; (message "%d-%d: %s" start end prop) | 1029 | ;; (message "%d-%d: %s" start end prop)) |
| 1030 | ;; ) | ||
| 1031 | ;; beg end | 1030 | ;; beg end |
| 1032 | ;; )) | 1031 | ;; )) |
| 1033 | ;; | 1032 | ;; |
diff --git a/lisp/ido.el b/lisp/ido.el index d1b5fd07938..b50ddcc1254 100644 --- a/lisp/ido.el +++ b/lisp/ido.el | |||
| @@ -3903,7 +3903,7 @@ This is to make them appear as if they were \"virtual buffers\"." | |||
| 3903 | (funcall f completion-list | 3903 | (funcall f completion-list |
| 3904 | :help-string "ido " | 3904 | :help-string "ido " |
| 3905 | :activate-callback | 3905 | :activate-callback |
| 3906 | '(lambda (x y z) (message "Doesn't work yet, sorry!")))) | 3906 | (lambda (x y z) (message "Doesn't work yet, sorry!")))) |
| 3907 | ;; else running Emacs | 3907 | ;; else running Emacs |
| 3908 | ;;(add-hook 'completion-setup-hook 'completion-setup-function) | 3908 | ;;(add-hook 'completion-setup-hook 'completion-setup-function) |
| 3909 | (display-completion-list completion-list))))))) | 3909 | (display-completion-list completion-list))))))) |
diff --git a/lisp/ielm.el b/lisp/ielm.el index c445e647878..4397ea0b413 100644 --- a/lisp/ielm.el +++ b/lisp/ielm.el | |||
| @@ -62,7 +62,7 @@ the remaining prompts will be accidentally messed up. You may | |||
| 62 | wish to put something like the following in your `.emacs' file: | 62 | wish to put something like the following in your `.emacs' file: |
| 63 | 63 | ||
| 64 | \(add-hook 'ielm-mode-hook | 64 | \(add-hook 'ielm-mode-hook |
| 65 | '(lambda () | 65 | (lambda () |
| 66 | (define-key ielm-map \"\\C-w\" 'comint-kill-region) | 66 | (define-key ielm-map \"\\C-w\" 'comint-kill-region) |
| 67 | (define-key ielm-map [C-S-backspace] | 67 | (define-key ielm-map [C-S-backspace] |
| 68 | 'comint-kill-whole-line))) | 68 | 'comint-kill-whole-line))) |
diff --git a/lisp/image-dired.el b/lisp/image-dired.el index 31a6aed7206..ce351f13a19 100644 --- a/lisp/image-dired.el +++ b/lisp/image-dired.el | |||
| @@ -2590,7 +2590,7 @@ tags to their respective image file. Internal function used by | |||
| 2590 | ;; `(,(nth 4 fattribs) ,(nth 7 fattribs) ,f))) | 2590 | ;; `(,(nth 4 fattribs) ,(nth 7 fattribs) ,f))) |
| 2591 | ;; (directory-files (image-dired-dir) t ".+\.thumb\..+$")) | 2591 | ;; (directory-files (image-dired-dir) t ".+\.thumb\..+$")) |
| 2592 | ;; ;; Sort function. Compare time between two files. | 2592 | ;; ;; Sort function. Compare time between two files. |
| 2593 | ;; '(lambda (l1 l2) | 2593 | ;; (lambda (l1 l2) |
| 2594 | ;; (time-less-p (car l1) (car l2))))) | 2594 | ;; (time-less-p (car l1) (car l2))))) |
| 2595 | ;; (dirsize (apply '+ (mapcar (lambda (x) (cadr x)) files)))) | 2595 | ;; (dirsize (apply '+ (mapcar (lambda (x) (cadr x)) files)))) |
| 2596 | ;; (while (> dirsize image-dired-dir-max-size) | 2596 | ;; (while (> dirsize image-dired-dir-max-size) |
diff --git a/lisp/international/quail.el b/lisp/international/quail.el index 51a0dcace14..3fb5818644b 100644 --- a/lisp/international/quail.el +++ b/lisp/international/quail.el | |||
| @@ -2458,10 +2458,10 @@ should be made by `quail-build-decode-map' (which see)." | |||
| 2458 | 2458 | ||
| 2459 | (define-button-type 'quail-keyboard-layout-button | 2459 | (define-button-type 'quail-keyboard-layout-button |
| 2460 | :supertype 'help-xref | 2460 | :supertype 'help-xref |
| 2461 | 'help-function '(lambda (layout) | 2461 | 'help-function (lambda (layout) |
| 2462 | (help-setup-xref `(quail-keyboard-layout-button ,layout) | 2462 | (help-setup-xref `(quail-keyboard-layout-button ,layout) |
| 2463 | nil) | 2463 | nil) |
| 2464 | (quail-show-keyboard-layout layout)) | 2464 | (quail-show-keyboard-layout layout)) |
| 2465 | 'help-echo (purecopy "mouse-2, RET: show keyboard layout")) | 2465 | 'help-echo (purecopy "mouse-2, RET: show keyboard layout")) |
| 2466 | 2466 | ||
| 2467 | (define-button-type 'quail-keyboard-customize-button | 2467 | (define-button-type 'quail-keyboard-customize-button |
diff --git a/lisp/iswitchb.el b/lisp/iswitchb.el index 171048e22dc..e0da2563c1a 100644 --- a/lisp/iswitchb.el +++ b/lisp/iswitchb.el | |||
| @@ -207,7 +207,7 @@ | |||
| 207 | ;; (delete-minibuffer-contents)) | 207 | ;; (delete-minibuffer-contents)) |
| 208 | ;; | 208 | ;; |
| 209 | ;; (add-hook 'iswitchb-define-mode-map-hook | 209 | ;; (add-hook 'iswitchb-define-mode-map-hook |
| 210 | ;; '(lambda () (define-key | 210 | ;; (lambda () (define-key |
| 211 | ;; iswitchb-mode-map "\C-o" | 211 | ;; iswitchb-mode-map "\C-o" |
| 212 | ;; 'iswitchb-exclude-nonmatching))) | 212 | ;; 'iswitchb-exclude-nonmatching))) |
| 213 | 213 | ||
diff --git a/lisp/loadup.el b/lisp/loadup.el index 525b8d27b8d..7e80ff97cff 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el | |||
| @@ -81,7 +81,7 @@ | |||
| 81 | 81 | ||
| 82 | ;; Do it after subr, since both after-load-functions and add-hook are | 82 | ;; Do it after subr, since both after-load-functions and add-hook are |
| 83 | ;; implemented in subr.el. | 83 | ;; implemented in subr.el. |
| 84 | (add-hook 'after-load-functions '(lambda (f) (garbage-collect))) | 84 | (add-hook 'after-load-functions (lambda (f) (garbage-collect))) |
| 85 | 85 | ||
| 86 | ;; We specify .el in case someone compiled version.el by mistake. | 86 | ;; We specify .el in case someone compiled version.el by mistake. |
| 87 | (load "version.el") | 87 | (load "version.el") |
| @@ -304,7 +304,7 @@ | |||
| 304 | (equal (nth 4 command-line-args) "bootstrap")) | 304 | (equal (nth 4 command-line-args) "bootstrap")) |
| 305 | (setcdr load-path nil)) | 305 | (setcdr load-path nil)) |
| 306 | 306 | ||
| 307 | (remove-hook 'after-load-functions '(lambda (f) (garbage-collect))) | 307 | (remove-hook 'after-load-functions (lambda (f) (garbage-collect))) |
| 308 | 308 | ||
| 309 | (setq inhibit-load-charset-map nil) | 309 | (setq inhibit-load-charset-map nil) |
| 310 | (clear-charset-maps) | 310 | (clear-charset-maps) |
diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el index 9aac041e8bd..a5aad7dd1b0 100644 --- a/lisp/mail/emacsbug.el +++ b/lisp/mail/emacsbug.el | |||
| @@ -227,8 +227,8 @@ usually do not have translators to read other languages for them.\n\n") | |||
| 227 | system-configuration-options "'\n\n")) | 227 | system-configuration-options "'\n\n")) |
| 228 | (insert "Important settings:\n") | 228 | (insert "Important settings:\n") |
| 229 | (mapc | 229 | (mapc |
| 230 | '(lambda (var) | 230 | (lambda (var) |
| 231 | (insert (format " value of $%s: %s\n" var (getenv var)))) | 231 | (insert (format " value of $%s: %s\n" var (getenv var)))) |
| 232 | '("LC_ALL" "LC_COLLATE" "LC_CTYPE" "LC_MESSAGES" | 232 | '("LC_ALL" "LC_COLLATE" "LC_CTYPE" "LC_MESSAGES" |
| 233 | "LC_MONETARY" "LC_NUMERIC" "LC_TIME" "LANG" "XMODIFIERS")) | 233 | "LC_MONETARY" "LC_NUMERIC" "LC_TIME" "LANG" "XMODIFIERS")) |
| 234 | (insert (format " locale-coding-system: %s\n" locale-coding-system)) | 234 | (insert (format " locale-coding-system: %s\n" locale-coding-system)) |
diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el index b86bdb178f6..934637ecbbd 100644 --- a/lisp/mail/feedmail.el +++ b/lisp/mail/feedmail.el | |||
| @@ -1437,7 +1437,7 @@ internal buffers will be reused and things will get confused." | |||
| 1437 | ) | 1437 | ) |
| 1438 | 1438 | ||
| 1439 | (defcustom feedmail-queue-runner-mode-setter | 1439 | (defcustom feedmail-queue-runner-mode-setter |
| 1440 | '(lambda (&optional arg) (mail-mode)) | 1440 | (lambda (&optional arg) (mail-mode)) |
| 1441 | "A function to set the proper mode of a message file. | 1441 | "A function to set the proper mode of a message file. |
| 1442 | Called when the message is read back out of the queue directory with a single | 1442 | Called when the message is read back out of the queue directory with a single |
| 1443 | argument, the optional argument used in the call to | 1443 | argument, the optional argument used in the call to |
| @@ -1473,7 +1473,7 @@ set `mail-header-separator' to the value of | |||
| 1473 | 1473 | ||
| 1474 | 1474 | ||
| 1475 | (defcustom feedmail-queue-runner-message-sender | 1475 | (defcustom feedmail-queue-runner-message-sender |
| 1476 | '(lambda (&optional arg) (mail-send)) | 1476 | (lambda (&optional arg) (mail-send)) |
| 1477 | "Function to initiate sending a message file. | 1477 | "Function to initiate sending a message file. |
| 1478 | Called for each message read back out of the queue directory with a | 1478 | Called for each message read back out of the queue directory with a |
| 1479 | single argument, the optional argument used in the call to | 1479 | single argument, the optional argument used in the call to |
| @@ -1491,7 +1491,7 @@ you really don't need that. Called with funcall, not call-interactively." | |||
| 1491 | 1491 | ||
| 1492 | 1492 | ||
| 1493 | (defcustom feedmail-queue-runner-cleaner-upper | 1493 | (defcustom feedmail-queue-runner-cleaner-upper |
| 1494 | '(lambda (fqm-file &optional arg) | 1494 | (lambda (fqm-file &optional arg) |
| 1495 | (delete-file fqm-file) | 1495 | (delete-file fqm-file) |
| 1496 | (if arg (feedmail-say-chatter "Nuked %s" fqm-file))) | 1496 | (if arg (feedmail-say-chatter "Nuked %s" fqm-file))) |
| 1497 | "Function that will be called after a message has been sent. | 1497 | "Function that will be called after a message has been sent. |
| @@ -1642,7 +1642,7 @@ local gurus." | |||
| 1642 | ;; don't be overconfident about the name of the trace buffer | 1642 | ;; don't be overconfident about the name of the trace buffer |
| 1643 | (tracer (concat "trace.*smtp.*" (regexp-quote smtpmail-smtp-server)))) | 1643 | (tracer (concat "trace.*smtp.*" (regexp-quote smtpmail-smtp-server)))) |
| 1644 | (mapcar | 1644 | (mapcar |
| 1645 | '(lambda (buffy) | 1645 | (lambda (buffy) |
| 1646 | (if (string-match tracer (buffer-name buffy)) | 1646 | (if (string-match tracer (buffer-name buffy)) |
| 1647 | (progn | 1647 | (progn |
| 1648 | (insert "SMTP Trace from " (buffer-name buffy) "\n---------------") | 1648 | (insert "SMTP Trace from " (buffer-name buffy) "\n---------------") |
| @@ -1667,7 +1667,7 @@ local gurus." | |||
| 1667 | ;; don't be overconfident about the name of the trace buffer | 1667 | ;; don't be overconfident about the name of the trace buffer |
| 1668 | (tracer (concat "trace.*smtp.*" (regexp-quote smtp-server)))) | 1668 | (tracer (concat "trace.*smtp.*" (regexp-quote smtp-server)))) |
| 1669 | (mapcar | 1669 | (mapcar |
| 1670 | '(lambda (buffy) | 1670 | (lambda (buffy) |
| 1671 | (if (string-match tracer (buffer-name buffy)) | 1671 | (if (string-match tracer (buffer-name buffy)) |
| 1672 | (progn | 1672 | (progn |
| 1673 | (insert "SMTP Trace from " (buffer-name buffy) "\n---------------") | 1673 | (insert "SMTP Trace from " (buffer-name buffy) "\n---------------") |
| @@ -1996,7 +1996,7 @@ backup file names and the like)." | |||
| 1996 | (if feedmail-queue-run-orderer | 1996 | (if feedmail-queue-run-orderer |
| 1997 | (setq list-of-possible-fqms (funcall feedmail-queue-run-orderer list-of-possible-fqms))) | 1997 | (setq list-of-possible-fqms (funcall feedmail-queue-run-orderer list-of-possible-fqms))) |
| 1998 | (mapc | 1998 | (mapc |
| 1999 | '(lambda (blobby) | 1999 | (lambda (blobby) |
| 2000 | (setq maybe-file (expand-file-name blobby feedmail-queue-directory)) | 2000 | (setq maybe-file (expand-file-name blobby feedmail-queue-directory)) |
| 2001 | (cond | 2001 | (cond |
| 2002 | ((file-directory-p maybe-file) nil) ; don't care about subdirs | 2002 | ((file-directory-p maybe-file) nil) ; don't care about subdirs |
| @@ -2238,7 +2238,7 @@ the counts." | |||
| 2238 | ;; iterate, counting things we find along the way in the directory | 2238 | ;; iterate, counting things we find along the way in the directory |
| 2239 | (if (file-directory-p queue-directory) | 2239 | (if (file-directory-p queue-directory) |
| 2240 | (mapc | 2240 | (mapc |
| 2241 | '(lambda (blobby) | 2241 | (lambda (blobby) |
| 2242 | (cond | 2242 | (cond |
| 2243 | ((file-directory-p blobby) nil) ; don't care about subdirs | 2243 | ((file-directory-p blobby) nil) ; don't care about subdirs |
| 2244 | ((feedmail-fqm-p blobby) | 2244 | ((feedmail-fqm-p blobby) |
| @@ -2665,7 +2665,7 @@ fiddle-plex, as described in the documentation for the variable | |||
| 2665 | (save-excursion | 2665 | (save-excursion |
| 2666 | (if feedmail-enable-spray | 2666 | (if feedmail-enable-spray |
| 2667 | (mapcar | 2667 | (mapcar |
| 2668 | '(lambda (feedmail-spray-this-address) | 2668 | (lambda (feedmail-spray-this-address) |
| 2669 | (let ((spray-buffer (get-buffer-create " *FQM Outgoing Email Spray*"))) | 2669 | (let ((spray-buffer (get-buffer-create " *FQM Outgoing Email Spray*"))) |
| 2670 | (with-current-buffer spray-buffer | 2670 | (with-current-buffer spray-buffer |
| 2671 | (erase-buffer) | 2671 | (erase-buffer) |
diff --git a/lisp/mail/mspools.el b/lisp/mail/mspools.el index 862cb2a1eee..9af59672689 100644 --- a/lisp/mail/mspools.el +++ b/lisp/mail/mspools.el | |||
| @@ -215,12 +215,12 @@ your primary spool is. If this fails, set it to something like | |||
| 215 | 215 | ||
| 216 | ;; Mailing list inboxes | 216 | ;; Mailing list inboxes |
| 217 | ;; must have VM already loaded to get vm-folder-directory. | 217 | ;; must have VM already loaded to get vm-folder-directory. |
| 218 | (mapcar '(lambda (s) | 218 | (mapcar (lambda (s) |
| 219 | "make the appropriate entry for vm-spool-files" | 219 | "make the appropriate entry for vm-spool-files" |
| 220 | (list | 220 | (list |
| 221 | (concat mspools-folder-directory s) | 221 | (concat mspools-folder-directory s) |
| 222 | (concat mspools-folder-directory s "." mspools-suffix) | 222 | (concat mspools-folder-directory s "." mspools-suffix) |
| 223 | (concat mspools-folder-directory s ".crash"))) | 223 | (concat mspools-folder-directory s ".crash"))) |
| 224 | ;; So I create a vm-spool-files entry for each of those mail drops | 224 | ;; So I create a vm-spool-files entry for each of those mail drops |
| 225 | (mapcar 'file-name-sans-extension | 225 | (mapcar 'file-name-sans-extension |
| 226 | (directory-files mspools-folder-directory nil | 226 | (directory-files mspools-folder-directory nil |
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el index bbb02d7b978..cfacf5fad55 100644 --- a/lisp/mail/sendmail.el +++ b/lisp/mail/sendmail.el | |||
| @@ -864,9 +864,9 @@ the user from the mailer." | |||
| 864 | (let ((l)) | 864 | (let ((l)) |
| 865 | (mapc | 865 | (mapc |
| 866 | ;; remove duplicates | 866 | ;; remove duplicates |
| 867 | '(lambda (e) | 867 | (lambda (e) |
| 868 | (unless (member e l) | 868 | (unless (member e l) |
| 869 | (push e l))) | 869 | (push e l))) |
| 870 | (split-string new-header-values | 870 | (split-string new-header-values |
| 871 | ",[[:space:]]+" t)) | 871 | ",[[:space:]]+" t)) |
| 872 | (mapconcat 'identity l ", ")) | 872 | (mapconcat 'identity l ", ")) |
diff --git a/lisp/mh-e/mh-alias.el b/lisp/mh-e/mh-alias.el index c93aaeb70da..2df6025bf09 100644 --- a/lisp/mh-e/mh-alias.el +++ b/lisp/mh-e/mh-alias.el | |||
| @@ -638,10 +638,10 @@ filing messages." | |||
| 638 | (message "Making passwd aliases...") | 638 | (message "Making passwd aliases...") |
| 639 | (setq passwd-matches | 639 | (setq passwd-matches |
| 640 | (mapconcat | 640 | (mapconcat |
| 641 | '(lambda (elem) | 641 | (lambda (elem) |
| 642 | (if (or (string-match regexp (car elem)) | 642 | (if (or (string-match regexp (car elem)) |
| 643 | (string-match regexp (cadr elem))) | 643 | (string-match regexp (cadr elem))) |
| 644 | (format "%s: %s\n" (car elem) (cadr elem)))) | 644 | (format "%s: %s\n" (car elem) (cadr elem)))) |
| 645 | mh-alias-passwd-alist "")) | 645 | mh-alias-passwd-alist "")) |
| 646 | (message "Making passwd aliases...done"))) | 646 | (message "Making passwd aliases...done"))) |
| 647 | (if (and (string-equal "" matches) | 647 | (if (and (string-equal "" matches) |
diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el index ccae063827f..90803d183d2 100644 --- a/lisp/mh-e/mh-e.el +++ b/lisp/mh-e/mh-e.el | |||
| @@ -933,7 +933,7 @@ finally GNU mailutils MH." | |||
| 933 | (t | 933 | (t |
| 934 | (message "Unknown variant %s; use %s" | 934 | (message "Unknown variant %s; use %s" |
| 935 | variant | 935 | variant |
| 936 | (mapconcat '(lambda (x) (format "%s" (car x))) | 936 | (mapconcat (lambda (x) (format "%s" (car x))) |
| 937 | (mh-variants) " or ")))))) | 937 | (mh-variants) " or ")))))) |
| 938 | 938 | ||
| 939 | (defcustom-mh mh-variant 'autodetect | 939 | (defcustom-mh mh-variant 'autodetect |
diff --git a/lisp/mh-e/mh-inc.el b/lisp/mh-e/mh-inc.el index 4f83ed70508..5248d6ab75e 100644 --- a/lisp/mh-e/mh-inc.el +++ b/lisp/mh-e/mh-inc.el | |||
| @@ -39,12 +39,12 @@ | |||
| 39 | "Help text for `mh-inc-spool-map'.") | 39 | "Help text for `mh-inc-spool-map'.") |
| 40 | 40 | ||
| 41 | (define-key mh-inc-spool-map "?" | 41 | (define-key mh-inc-spool-map "?" |
| 42 | '(lambda () | 42 | (lambda () |
| 43 | (interactive) | 43 | (interactive) |
| 44 | (if mh-inc-spool-map-help | 44 | (if mh-inc-spool-map-help |
| 45 | (mh-help mh-inc-spool-map-help) | 45 | (mh-help mh-inc-spool-map-help) |
| 46 | (mh-ephem-message | 46 | (mh-ephem-message |
| 47 | "There are no keys defined yet; customize `mh-inc-spool-list'")))) | 47 | "There are no keys defined yet; customize `mh-inc-spool-list'")))) |
| 48 | 48 | ||
| 49 | ;;;###mh-autoload | 49 | ;;;###mh-autoload |
| 50 | (defun mh-inc-spool-make () | 50 | (defun mh-inc-spool-make () |
diff --git a/lisp/mh-e/mh-junk.el b/lisp/mh-e/mh-junk.el index 2ffc24e26e8..897f7518b1e 100644 --- a/lisp/mh-e/mh-junk.el +++ b/lisp/mh-e/mh-junk.el | |||
| @@ -312,9 +312,9 @@ information can be used so that you can replace multiple | |||
| 312 | (delete-other-windows) | 312 | (delete-other-windows) |
| 313 | (pop-to-buffer (get-buffer-create "*MH-E Spammer Frequencies*")) | 313 | (pop-to-buffer (get-buffer-create "*MH-E Spammer Frequencies*")) |
| 314 | (erase-buffer) | 314 | (erase-buffer) |
| 315 | (maphash '(lambda (key value) "" | 315 | (maphash (lambda (key value) "" |
| 316 | (if (> value 2) | 316 | (if (> value 2) |
| 317 | (insert (format "%s %s\n" key value)))) | 317 | (insert (format "%s %s\n" key value)))) |
| 318 | domains) | 318 | domains) |
| 319 | (sort-numeric-fields 2 (point-min) (point-max)) | 319 | (sort-numeric-fields 2 (point-min) (point-max)) |
| 320 | (reverse-region (point-min) (point-max)) | 320 | (reverse-region (point-min) (point-max)) |
diff --git a/lisp/mh-e/mh-mime.el b/lisp/mh-e/mh-mime.el index ba994e73a91..48c6a3793ef 100644 --- a/lisp/mh-e/mh-mime.el +++ b/lisp/mh-e/mh-mime.el | |||
| @@ -1637,8 +1637,8 @@ This action can be undone by running \\[undo]." | |||
| 1637 | ;; Do an alias lookup on recipients | 1637 | ;; Do an alias lookup on recipients |
| 1638 | (message-options-set 'message-recipients | 1638 | (message-options-set 'message-recipients |
| 1639 | (mapconcat | 1639 | (mapconcat |
| 1640 | '(lambda (ali) | 1640 | (lambda (ali) |
| 1641 | (mail-strip-quoted-names (mh-alias-expand ali))) | 1641 | (mail-strip-quoted-names (mh-alias-expand ali))) |
| 1642 | (split-string (message-options-get 'message-recipients) "[, ]+") | 1642 | (split-string (message-options-get 'message-recipients) "[, ]+") |
| 1643 | ", "))) | 1643 | ", "))) |
| 1644 | (let ((saved-text (buffer-string)) | 1644 | (let ((saved-text (buffer-string)) |
diff --git a/lisp/msb.el b/lisp/msb.el index cbc953da98e..12e5a0192fe 100644 --- a/lisp/msb.el +++ b/lisp/msb.el | |||
| @@ -315,7 +315,7 @@ No buffers at all if less than 1 or nil (or any non-number)." | |||
| 315 | :set 'msb-custom-set | 315 | :set 'msb-custom-set |
| 316 | :group 'msb) | 316 | :group 'msb) |
| 317 | 317 | ||
| 318 | (defvar msb-horizontal-shift-function '(lambda () 0) | 318 | (defvar msb-horizontal-shift-function (lambda () 0) |
| 319 | "*Function that specifies how many pixels to shift the top menu leftwards.") | 319 | "*Function that specifies how many pixels to shift the top menu leftwards.") |
| 320 | 320 | ||
| 321 | (defcustom msb-display-invisible-buffers-p nil | 321 | (defcustom msb-display-invisible-buffers-p nil |
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el index 53d58a70d29..b1d8279e93f 100644 --- a/lisp/net/ange-ftp.el +++ b/lisp/net/ange-ftp.el | |||
| @@ -5448,7 +5448,7 @@ Other orders of $ and _ seem to all work just fine.") | |||
| 5448 | ;; base-versions | 5448 | ;; base-versions |
| 5449 | ;; (file-name-directory fn))) | 5449 | ;; (file-name-directory fn))) |
| 5450 | ;; (versions (mapcar | 5450 | ;; (versions (mapcar |
| 5451 | ;; '(lambda (arg) | 5451 | ;; (lambda (arg) |
| 5452 | ;; (if (and (string-match | 5452 | ;; (if (and (string-match |
| 5453 | ;; "[0-9]+$" arg bv-length) | 5453 | ;; "[0-9]+$" arg bv-length) |
| 5454 | ;; (= (match-beginning 0) bv-length)) | 5454 | ;; (= (match-beginning 0) bv-length)) |
diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el index 05c7af2a8c3..87af3d13591 100644 --- a/lisp/net/dbus.el +++ b/lisp/net/dbus.el | |||
| @@ -121,7 +121,7 @@ See `dbus-registered-objects-table' for a description of the | |||
| 121 | hash table." | 121 | hash table." |
| 122 | (let (result) | 122 | (let (result) |
| 123 | (maphash | 123 | (maphash |
| 124 | '(lambda (key value) (add-to-list 'result (cons key value) 'append)) | 124 | (lambda (key value) (add-to-list 'result (cons key value) 'append)) |
| 125 | dbus-registered-objects-table) | 125 | dbus-registered-objects-table) |
| 126 | result)) | 126 | result)) |
| 127 | 127 | ||
| @@ -271,20 +271,20 @@ usage: (dbus-name-owner-changed-handler service old-owner new-owner)" | |||
| 271 | ;; Check whether SERVICE is a known name. | 271 | ;; Check whether SERVICE is a known name. |
| 272 | (when (not (string-match "^:" service)) | 272 | (when (not (string-match "^:" service)) |
| 273 | (maphash | 273 | (maphash |
| 274 | '(lambda (key value) | 274 | (lambda (key value) |
| 275 | (dolist (elt value) | 275 | (dolist (elt value) |
| 276 | ;; key has the structure (BUS INTERFACE MEMBER). | 276 | ;; key has the structure (BUS INTERFACE MEMBER). |
| 277 | ;; elt has the structure (UNAME SERVICE PATH HANDLER). | 277 | ;; elt has the structure (UNAME SERVICE PATH HANDLER). |
| 278 | (when (string-equal old-owner (car elt)) | 278 | (when (string-equal old-owner (car elt)) |
| 279 | ;; Remove old key, and add new entry with changed name. | 279 | ;; Remove old key, and add new entry with changed name. |
| 280 | (dbus-unregister-object (list key (cdr elt))) | 280 | (dbus-unregister-object (list key (cdr elt))) |
| 281 | ;; Maybe we could arrange the lists a little bit better | 281 | ;; Maybe we could arrange the lists a little bit better |
| 282 | ;; that we don't need to extract every single element? | 282 | ;; that we don't need to extract every single element? |
| 283 | (dbus-register-signal | 283 | (dbus-register-signal |
| 284 | ;; BUS SERVICE PATH | 284 | ;; BUS SERVICE PATH |
| 285 | (nth 0 key) (nth 1 elt) (nth 2 elt) | 285 | (nth 0 key) (nth 1 elt) (nth 2 elt) |
| 286 | ;; INTERFACE MEMBER HANDLER | 286 | ;; INTERFACE MEMBER HANDLER |
| 287 | (nth 1 key) (nth 2 key) (nth 3 elt))))) | 287 | (nth 1 key) (nth 2 key) (nth 3 elt))))) |
| 288 | (copy-hash-table dbus-registered-objects-table)))) | 288 | (copy-hash-table dbus-registered-objects-table)))) |
| 289 | ;; The error is reported only in debug mode. | 289 | ;; The error is reported only in debug mode. |
| 290 | (when dbus-debug | 290 | (when dbus-debug |
| @@ -825,15 +825,15 @@ be \"out\"." | |||
| 825 | (setq direction nil)) | 825 | (setq direction nil)) |
| 826 | ;; Collect the signatures. | 826 | ;; Collect the signatures. |
| 827 | (mapconcat | 827 | (mapconcat |
| 828 | '(lambda (x) | 828 | (lambda (x) |
| 829 | (let ((arg (dbus-introspect-get-argument | 829 | (let ((arg (dbus-introspect-get-argument |
| 830 | bus service path interface name x))) | 830 | bus service path interface name x))) |
| 831 | (if (or (not (stringp direction)) | 831 | (if (or (not (stringp direction)) |
| 832 | (string-equal | 832 | (string-equal |
| 833 | direction | 833 | direction |
| 834 | (dbus-introspect-get-attribute arg "direction"))) | 834 | (dbus-introspect-get-attribute arg "direction"))) |
| 835 | (dbus-introspect-get-attribute arg "type") | 835 | (dbus-introspect-get-attribute arg "type") |
| 836 | ""))) | 836 | ""))) |
| 837 | (dbus-introspect-get-argument-names bus service path interface name) | 837 | (dbus-introspect-get-argument-names bus service path interface name) |
| 838 | ""))) | 838 | ""))) |
| 839 | 839 | ||
diff --git a/lisp/net/eudc-export.el b/lisp/net/eudc-export.el index df3a2e04118..87ff0b4060f 100644 --- a/lisp/net/eudc-export.el +++ b/lisp/net/eudc-export.el | |||
| @@ -44,7 +44,7 @@ If SILENT is non-nil then the created BBDB record is not displayed." | |||
| 44 | ;; This function runs in a special context where lisp symbols corresponding | 44 | ;; This function runs in a special context where lisp symbols corresponding |
| 45 | ;; to field names in record are bound to the corresponding values | 45 | ;; to field names in record are bound to the corresponding values |
| 46 | (eval | 46 | (eval |
| 47 | `(let* (,@(mapcar '(lambda (c) | 47 | `(let* (,@(mapcar (lambda (c) |
| 48 | (list (car c) (if (listp (cdr c)) | 48 | (list (car c) (if (listp (cdr c)) |
| 49 | (list 'quote (cdr c)) | 49 | (list 'quote (cdr c)) |
| 50 | (cdr c)))) | 50 | (cdr c)))) |
| @@ -108,7 +108,7 @@ If RECURSE is non-nil then SPEC may be a list of atomic specs." | |||
| 108 | (void-variable nil))) | 108 | (void-variable nil))) |
| 109 | ((and recurse | 109 | ((and recurse |
| 110 | (listp spec)) | 110 | (listp spec)) |
| 111 | (mapcar '(lambda (spec-elem) | 111 | (mapcar (lambda (spec-elem) |
| 112 | (eudc-parse-spec spec-elem record nil)) | 112 | (eudc-parse-spec spec-elem record nil)) |
| 113 | spec)) | 113 | spec)) |
| 114 | (t | 114 | (t |
diff --git a/lisp/net/eudc-hotlist.el b/lisp/net/eudc-hotlist.el index fd0c56ed693..64b2d34af9c 100644 --- a/lisp/net/eudc-hotlist.el +++ b/lisp/net/eudc-hotlist.el | |||
| @@ -89,7 +89,7 @@ These are the special commands of this mode: | |||
| 89 | "------" gap "--------\n" | 89 | "------" gap "--------\n" |
| 90 | "\n") | 90 | "\n") |
| 91 | (setq eudc-hotlist-list-beginning (point)) | 91 | (setq eudc-hotlist-list-beginning (point)) |
| 92 | (mapc '(lambda (entry) | 92 | (mapc (lambda (entry) |
| 93 | (insert (car entry)) | 93 | (insert (car entry)) |
| 94 | (indent-to proto-col) | 94 | (indent-to proto-col) |
| 95 | (insert (symbol-name (cdr entry)) "\n")) | 95 | (insert (symbol-name (cdr entry)) "\n")) |
| @@ -103,7 +103,7 @@ These are the special commands of this mode: | |||
| 103 | (error "Not in a EUDC hotlist edit buffer")) | 103 | (error "Not in a EUDC hotlist edit buffer")) |
| 104 | (let ((server (read-from-minibuffer "Server: ")) | 104 | (let ((server (read-from-minibuffer "Server: ")) |
| 105 | (protocol (completing-read "Protocol: " | 105 | (protocol (completing-read "Protocol: " |
| 106 | (mapcar '(lambda (elt) | 106 | (mapcar (lambda (elt) |
| 107 | (cons (symbol-name elt) | 107 | (cons (symbol-name elt) |
| 108 | elt)) | 108 | elt)) |
| 109 | eudc-known-protocols))) | 109 | eudc-known-protocols))) |
diff --git a/lisp/net/eudc.el b/lisp/net/eudc.el index 8616c805f41..6f4d5b2bbda 100644 --- a/lisp/net/eudc.el +++ b/lisp/net/eudc.el | |||
| @@ -351,12 +351,12 @@ accordingly. Otherwise it is set to its EUDC default binding" | |||
| 351 | The translation is done according to | 351 | The translation is done according to |
| 352 | `eudc-protocol-attributes-translation-alist'." | 352 | `eudc-protocol-attributes-translation-alist'." |
| 353 | (if eudc-protocol-attributes-translation-alist | 353 | (if eudc-protocol-attributes-translation-alist |
| 354 | (mapcar '(lambda (attribute) | 354 | (mapcar (lambda (attribute) |
| 355 | (let ((trans (assq (car attribute) | 355 | (let ((trans (assq (car attribute) |
| 356 | (symbol-value eudc-protocol-attributes-translation-alist)))) | 356 | (symbol-value eudc-protocol-attributes-translation-alist)))) |
| 357 | (if trans | 357 | (if trans |
| 358 | (cons (cdr trans) (cdr attribute)) | 358 | (cons (cdr trans) (cdr attribute)) |
| 359 | attribute))) | 359 | attribute))) |
| 360 | query) | 360 | query) |
| 361 | query)) | 361 | query)) |
| 362 | 362 | ||
| @@ -366,7 +366,7 @@ The translation is done according to | |||
| 366 | `eudc-protocol-attributes-translation-alist'." | 366 | `eudc-protocol-attributes-translation-alist'." |
| 367 | (if eudc-protocol-attributes-translation-alist | 367 | (if eudc-protocol-attributes-translation-alist |
| 368 | (let (trans) | 368 | (let (trans) |
| 369 | (mapcar '(lambda (attribute) | 369 | (mapcar (lambda (attribute) |
| 370 | (setq trans (assq attribute | 370 | (setq trans (assq attribute |
| 371 | (symbol-value eudc-protocol-attributes-translation-alist))) | 371 | (symbol-value eudc-protocol-attributes-translation-alist))) |
| 372 | (if trans | 372 | (if trans |
| @@ -692,7 +692,7 @@ server for future sessions." | |||
| 692 | (interactive (list | 692 | (interactive (list |
| 693 | (read-from-minibuffer "Directory Server: ") | 693 | (read-from-minibuffer "Directory Server: ") |
| 694 | (intern (completing-read "Protocol: " | 694 | (intern (completing-read "Protocol: " |
| 695 | (mapcar '(lambda (elt) | 695 | (mapcar (lambda (elt) |
| 696 | (cons (symbol-name elt) | 696 | (cons (symbol-name elt) |
| 697 | elt)) | 697 | elt)) |
| 698 | eudc-known-protocols))))) | 698 | eudc-known-protocols))))) |
| @@ -796,7 +796,7 @@ If none try N - 1 and so forth." | |||
| 796 | (> n 0)) | 796 | (> n 0)) |
| 797 | (setq formats | 797 | (setq formats |
| 798 | (delq nil | 798 | (delq nil |
| 799 | (mapcar '(lambda (format) | 799 | (mapcar (lambda (format) |
| 800 | (if (= n | 800 | (if (= n |
| 801 | (length format)) | 801 | (length format)) |
| 802 | format | 802 | format |
diff --git a/lisp/net/eudcb-bbdb.el b/lisp/net/eudcb-bbdb.el index 1dd0648f569..5afd255f419 100644 --- a/lisp/net/eudcb-bbdb.el +++ b/lisp/net/eudcb-bbdb.el | |||
| @@ -73,32 +73,29 @@ | |||
| 73 | "Return RECORD if it matches `eudc-bbdb-current-query', nil otherwise." | 73 | "Return RECORD if it matches `eudc-bbdb-current-query', nil otherwise." |
| 74 | (catch 'unmatch | 74 | (catch 'unmatch |
| 75 | (progn | 75 | (progn |
| 76 | (mapc | 76 | (dolist (condition eudc-bbdb-current-query) |
| 77 | (function | 77 | (let ((attr (car condition)) |
| 78 | (lambda (condition) | 78 | (val (cdr condition)) |
| 79 | (let ((attr (car condition)) | 79 | (case-fold-search t) |
| 80 | (val (cdr condition)) | 80 | bbdb-val) |
| 81 | (case-fold-search t) | 81 | (or (and (memq attr '(firstname lastname aka company phones |
| 82 | bbdb-val) | 82 | addresses net)) |
| 83 | (or (and (memq attr '(firstname lastname aka company phones addresses net)) | 83 | (progn |
| 84 | (progn | 84 | (setq bbdb-val |
| 85 | (setq bbdb-val | 85 | (eval (list (intern (concat "bbdb-record-" |
| 86 | (eval (list (intern (concat "bbdb-record-" | 86 | (symbol-name attr))) |
| 87 | (symbol-name attr))) | 87 | 'record))) |
| 88 | 'record))) | 88 | (if (listp bbdb-val) |
| 89 | (if (listp bbdb-val) | 89 | (if eudc-bbdb-enable-substring-matches |
| 90 | (if eudc-bbdb-enable-substring-matches | 90 | (eval `(or ,@(mapcar (lambda (subval) |
| 91 | (eval `(or ,@(mapcar '(lambda (subval) | 91 | (string-match val subval)) |
| 92 | (string-match val | 92 | bbdb-val))) |
| 93 | subval)) | 93 | (member (downcase val) |
| 94 | bbdb-val))) | 94 | (mapcar 'downcase bbdb-val))) |
| 95 | (member (downcase val) | 95 | (if eudc-bbdb-enable-substring-matches |
| 96 | (mapcar 'downcase bbdb-val))) | 96 | (string-match val bbdb-val) |
| 97 | (if eudc-bbdb-enable-substring-matches | 97 | (string-equal (downcase val) (downcase bbdb-val)))))) |
| 98 | (string-match val bbdb-val) | 98 | (throw 'unmatch nil)))) |
| 99 | (string-equal (downcase val) (downcase bbdb-val)))))) | ||
| 100 | (throw 'unmatch nil))))) | ||
| 101 | eudc-bbdb-current-query) | ||
| 102 | record))) | 99 | record))) |
| 103 | 100 | ||
| 104 | ;; External. | 101 | ;; External. |
diff --git a/lisp/net/eudcb-ldap.el b/lisp/net/eudcb-ldap.el index 14594409dfa..fc7519e5b30 100644 --- a/lisp/net/eudcb-ldap.el +++ b/lisp/net/eudcb-ldap.el | |||
| @@ -172,10 +172,10 @@ attribute names are returned. Default to `person'" | |||
| 172 | "Format the EUDC QUERY list as a RFC1558 LDAP search filter." | 172 | "Format the EUDC QUERY list as a RFC1558 LDAP search filter." |
| 173 | (format "(&%s)" | 173 | (format "(&%s)" |
| 174 | (apply 'concat | 174 | (apply 'concat |
| 175 | (mapcar '(lambda (item) | 175 | (mapcar (lambda (item) |
| 176 | (format "(%s=%s)" | 176 | (format "(%s=%s)" |
| 177 | (car item) | 177 | (car item) |
| 178 | (eudc-ldap-escape-query-special-chars (cdr item)))) | 178 | (eudc-ldap-escape-query-special-chars (cdr item)))) |
| 179 | query)))) | 179 | query)))) |
| 180 | 180 | ||
| 181 | 181 | ||
diff --git a/lisp/net/tramp-cache.el b/lisp/net/tramp-cache.el index f8bc594e959..e3e6264b28f 100644 --- a/lisp/net/tramp-cache.el +++ b/lisp/net/tramp-cache.el | |||
| @@ -176,7 +176,7 @@ Remove also properties of all files in subdirectories." | |||
| 176 | 'directory-file-name (list directory)))) | 176 | 'directory-file-name (list directory)))) |
| 177 | (tramp-message vec 8 "%s" directory) | 177 | (tramp-message vec 8 "%s" directory) |
| 178 | (maphash | 178 | (maphash |
| 179 | '(lambda (key value) | 179 | (lambda (key value) |
| 180 | (when (and (stringp (tramp-file-name-localname key)) | 180 | (when (and (stringp (tramp-file-name-localname key)) |
| 181 | (string-match directory (tramp-file-name-localname key))) | 181 | (string-match directory (tramp-file-name-localname key))) |
| 182 | (remhash key tramp-cache-data))) | 182 | (remhash key tramp-cache-data))) |
| @@ -199,7 +199,7 @@ Remove also properties of all files in subdirectories." | |||
| 199 | (add-hook 'eshell-pre-command-hook 'tramp-flush-file-function) | 199 | (add-hook 'eshell-pre-command-hook 'tramp-flush-file-function) |
| 200 | (add-hook 'kill-buffer-hook 'tramp-flush-file-function) | 200 | (add-hook 'kill-buffer-hook 'tramp-flush-file-function) |
| 201 | (add-hook 'tramp-cache-unload-hook | 201 | (add-hook 'tramp-cache-unload-hook |
| 202 | '(lambda () | 202 | (lambda () |
| 203 | (remove-hook 'before-revert-hook | 203 | (remove-hook 'before-revert-hook |
| 204 | 'tramp-flush-file-function) | 204 | 'tramp-flush-file-function) |
| 205 | (remove-hook 'eshell-pre-command-hook | 205 | (remove-hook 'eshell-pre-command-hook |
| @@ -289,7 +289,7 @@ KEY identifies the connection, it is either a process or a vector." | |||
| 289 | (when (hash-table-p table) | 289 | (when (hash-table-p table) |
| 290 | (let (result) | 290 | (let (result) |
| 291 | (maphash | 291 | (maphash |
| 292 | '(lambda (key value) | 292 | (lambda (key value) |
| 293 | (let ((tmp (format | 293 | (let ((tmp (format |
| 294 | "(%s %s)" | 294 | "(%s %s)" |
| 295 | (if (processp key) | 295 | (if (processp key) |
| @@ -309,7 +309,7 @@ KEY identifies the connection, it is either a process or a vector." | |||
| 309 | "Return a list of all known connection vectors according to `tramp-cache'." | 309 | "Return a list of all known connection vectors according to `tramp-cache'." |
| 310 | (let (result) | 310 | (let (result) |
| 311 | (maphash | 311 | (maphash |
| 312 | '(lambda (key value) | 312 | (lambda (key value) |
| 313 | (when (and (vectorp key) (null (aref key 3))) | 313 | (when (and (vectorp key) (null (aref key 3))) |
| 314 | (add-to-list 'result key))) | 314 | (add-to-list 'result key))) |
| 315 | tramp-cache-data) | 315 | tramp-cache-data) |
| @@ -326,7 +326,7 @@ KEY identifies the connection, it is either a process or a vector." | |||
| 326 | (let ((cache (copy-hash-table tramp-cache-data))) | 326 | (let ((cache (copy-hash-table tramp-cache-data))) |
| 327 | ;; Remove temporary data. | 327 | ;; Remove temporary data. |
| 328 | (maphash | 328 | (maphash |
| 329 | '(lambda (key value) | 329 | (lambda (key value) |
| 330 | (if (and (vectorp key) (not (tramp-file-name-localname key))) | 330 | (if (and (vectorp key) (not (tramp-file-name-localname key))) |
| 331 | (progn | 331 | (progn |
| 332 | (remhash "process-name" value) | 332 | (remhash "process-name" value) |
| @@ -356,7 +356,7 @@ KEY identifies the connection, it is either a process or a vector." | |||
| 356 | (unless noninteractive | 356 | (unless noninteractive |
| 357 | (add-hook 'kill-emacs-hook 'tramp-dump-connection-properties)) | 357 | (add-hook 'kill-emacs-hook 'tramp-dump-connection-properties)) |
| 358 | (add-hook 'tramp-cache-unload-hook | 358 | (add-hook 'tramp-cache-unload-hook |
| 359 | '(lambda () | 359 | (lambda () |
| 360 | (remove-hook 'kill-emacs-hook | 360 | (remove-hook 'kill-emacs-hook |
| 361 | 'tramp-dump-connection-properties))) | 361 | 'tramp-dump-connection-properties))) |
| 362 | 362 | ||
| @@ -367,7 +367,7 @@ This function is added always in `tramp-get-completion-function' | |||
| 367 | for all methods. Resulting data are derived from connection history." | 367 | for all methods. Resulting data are derived from connection history." |
| 368 | (let (res) | 368 | (let (res) |
| 369 | (maphash | 369 | (maphash |
| 370 | '(lambda (key value) | 370 | (lambda (key value) |
| 371 | (if (and (vectorp key) | 371 | (if (and (vectorp key) |
| 372 | (string-equal method (tramp-file-name-method key)) | 372 | (string-equal method (tramp-file-name-method key)) |
| 373 | (not (tramp-file-name-localname key))) | 373 | (not (tramp-file-name-localname key))) |
diff --git a/lisp/net/tramp-cmds.el b/lisp/net/tramp-cmds.el index 58f1e2c6a9e..764ee35d45b 100644 --- a/lisp/net/tramp-cmds.el +++ b/lisp/net/tramp-cmds.el | |||
| @@ -258,8 +258,8 @@ buffer in your bug report. | |||
| 258 | (dolist (buffer | 258 | (dolist (buffer |
| 259 | (delq nil | 259 | (delq nil |
| 260 | (mapcar | 260 | (mapcar |
| 261 | '(lambda (b) | 261 | (lambda (b) |
| 262 | (when (string-match "\\*tramp/" (buffer-name b)) b)) | 262 | (when (string-match "\\*tramp/" (buffer-name b)) b)) |
| 263 | (buffer-list)))) | 263 | (buffer-list)))) |
| 264 | (let ((reporter-eval-buffer buffer) | 264 | (let ((reporter-eval-buffer buffer) |
| 265 | (buffer-name (buffer-name buffer)) | 265 | (buffer-name (buffer-name buffer)) |
diff --git a/lisp/net/tramp-ftp.el b/lisp/net/tramp-ftp.el index f048208ea41..d42a6f57ea9 100644 --- a/lisp/net/tramp-ftp.el +++ b/lisp/net/tramp-ftp.el | |||
| @@ -121,12 +121,12 @@ present for backward compatibility." | |||
| 121 | ;; handling. | 121 | ;; handling. |
| 122 | (put 'substitute-in-file-name 'ange-ftp 'tramp-handle-substitute-in-file-name) | 122 | (put 'substitute-in-file-name 'ange-ftp 'tramp-handle-substitute-in-file-name) |
| 123 | (add-hook 'tramp-ftp-unload-hook | 123 | (add-hook 'tramp-ftp-unload-hook |
| 124 | '(lambda () | 124 | (lambda () |
| 125 | (setplist 'substitute-in-file-name | 125 | (setplist 'substitute-in-file-name |
| 126 | (delete 'ange-ftp | 126 | (delete 'ange-ftp |
| 127 | (delete 'tramp-handle-substitute-in-file-name | 127 | (delete 'tramp-handle-substitute-in-file-name |
| 128 | (symbol-plist | 128 | (symbol-plist |
| 129 | 'substitute-in-file-name)))))) | 129 | 'substitute-in-file-name)))))) |
| 130 | 130 | ||
| 131 | ;;;###tramp-autoload | 131 | ;;;###tramp-autoload |
| 132 | (defun tramp-ftp-file-name-handler (operation &rest args) | 132 | (defun tramp-ftp-file-name-handler (operation &rest args) |
diff --git a/lisp/net/webjump.el b/lisp/net/webjump.el index be79bc721e2..3a2560b3c61 100644 --- a/lisp/net/webjump.el +++ b/lisp/net/webjump.el | |||
| @@ -447,11 +447,11 @@ Please submit bug reports and other feedback to the author, Neil W. Van Dyke | |||
| 447 | (or (null str) (string-match "^[ \t]*$" str))) | 447 | (or (null str) (string-match "^[ \t]*$" str))) |
| 448 | 448 | ||
| 449 | (defun webjump-url-encode (str) | 449 | (defun webjump-url-encode (str) |
| 450 | (mapconcat '(lambda (c) | 450 | (mapconcat (lambda (c) |
| 451 | (let ((s (char-to-string c))) | 451 | (let ((s (char-to-string c))) |
| 452 | (cond ((string= s " ") "+") | 452 | (cond ((string= s " ") "+") |
| 453 | ((string-match "[a-zA-Z_.-/]" s) s) | 453 | ((string-match "[a-zA-Z_.-/]" s) s) |
| 454 | (t (upcase (format "%%%02x" c)))))) | 454 | (t (upcase (format "%%%02x" c)))))) |
| 455 | (encode-coding-string str 'utf-8) | 455 | (encode-coding-string str 'utf-8) |
| 456 | "")) | 456 | "")) |
| 457 | 457 | ||
diff --git a/lisp/org/org-ascii.el b/lisp/org/org-ascii.el index d5964538a9c..fbe0c0a30a3 100644 --- a/lisp/org/org-ascii.el +++ b/lisp/org/org-ascii.el | |||
| @@ -369,55 +369,55 @@ publishing directory." | |||
| 369 | (push (concat (nth 3 lang-words) "\n") thetoc) | 369 | (push (concat (nth 3 lang-words) "\n") thetoc) |
| 370 | (push (concat (make-string (string-width (nth 3 lang-words)) ?=) | 370 | (push (concat (make-string (string-width (nth 3 lang-words)) ?=) |
| 371 | "\n") thetoc) | 371 | "\n") thetoc) |
| 372 | (mapc '(lambda (line) | 372 | (mapc (lambda (line) |
| 373 | (if (string-match org-todo-line-regexp | 373 | (if (string-match org-todo-line-regexp |
| 374 | line) | 374 | line) |
| 375 | ;; This is a headline | 375 | ;; This is a headline |
| 376 | (progn | 376 | (progn |
| 377 | (setq have-headings t) | 377 | (setq have-headings t) |
| 378 | (setq level (- (match-end 1) (match-beginning 1) | 378 | (setq level (- (match-end 1) (match-beginning 1) |
| 379 | level-offset) | 379 | level-offset) |
| 380 | level (org-tr-level level) | 380 | level (org-tr-level level) |
| 381 | txt (match-string 3 line) | 381 | txt (match-string 3 line) |
| 382 | todo | 382 | todo |
| 383 | (or (and org-export-mark-todo-in-toc | 383 | (or (and org-export-mark-todo-in-toc |
| 384 | (match-beginning 2) | 384 | (match-beginning 2) |
| 385 | (not (member (match-string 2 line) | 385 | (not (member (match-string 2 line) |
| 386 | org-done-keywords))) | 386 | org-done-keywords))) |
| 387 | ; TODO, not DONE | 387 | ; TODO, not DONE |
| 388 | (and org-export-mark-todo-in-toc | 388 | (and org-export-mark-todo-in-toc |
| 389 | (= level umax-toc) | 389 | (= level umax-toc) |
| 390 | (org-search-todo-below | 390 | (org-search-todo-below |
| 391 | line lines level)))) | 391 | line lines level)))) |
| 392 | (setq txt (org-html-expand-for-ascii txt)) | 392 | (setq txt (org-html-expand-for-ascii txt)) |
| 393 | 393 | ||
| 394 | (while (string-match org-bracket-link-regexp txt) | 394 | (while (string-match org-bracket-link-regexp txt) |
| 395 | (setq txt | 395 | (setq txt |
| 396 | (replace-match | 396 | (replace-match |
| 397 | (match-string (if (match-end 2) 3 1) txt) | 397 | (match-string (if (match-end 2) 3 1) txt) |
| 398 | t t txt))) | 398 | t t txt))) |
| 399 | 399 | ||
| 400 | (if (and (memq org-export-with-tags '(not-in-toc nil)) | 400 | (if (and (memq org-export-with-tags '(not-in-toc nil)) |
| 401 | (string-match | 401 | (string-match |
| 402 | (org-re "[ \t]+:[[:alnum:]_@#%:]+:[ \t]*$") | 402 | (org-re "[ \t]+:[[:alnum:]_@#%:]+:[ \t]*$") |
| 403 | txt)) | 403 | txt)) |
| 404 | (setq txt (replace-match "" t t txt))) | 404 | (setq txt (replace-match "" t t txt))) |
| 405 | (if (string-match quote-re0 txt) | 405 | (if (string-match quote-re0 txt) |
| 406 | (setq txt (replace-match "" t t txt))) | 406 | (setq txt (replace-match "" t t txt))) |
| 407 | 407 | ||
| 408 | (if org-export-with-section-numbers | 408 | (if org-export-with-section-numbers |
| 409 | (setq txt (concat (org-section-number level) | 409 | (setq txt (concat (org-section-number level) |
| 410 | " " txt))) | 410 | " " txt))) |
| 411 | (if (<= level umax-toc) | 411 | (if (<= level umax-toc) |
| 412 | (progn | 412 | (progn |
| 413 | (push | 413 | (push |
| 414 | (concat | 414 | (concat |
| 415 | (make-string | 415 | (make-string |
| 416 | (* (max 0 (- level org-min-level)) 4) ?\ ) | 416 | (* (max 0 (- level org-min-level)) 4) ?\ ) |
| 417 | (format (if todo "%s (*)\n" "%s\n") txt)) | 417 | (format (if todo "%s (*)\n" "%s\n") txt)) |
| 418 | thetoc) | 418 | thetoc) |
| 419 | (setq org-last-level level)) | 419 | (setq org-last-level level)) |
| 420 | )))) | 420 | )))) |
| 421 | lines) | 421 | lines) |
| 422 | (setq thetoc (if have-headings (nreverse thetoc) nil)))) | 422 | (setq thetoc (if have-headings (nreverse thetoc) nil)))) |
| 423 | 423 | ||
diff --git a/lisp/org/org-attach.el b/lisp/org/org-attach.el index c9679edc65a..ae97db20f70 100644 --- a/lisp/org/org-attach.el +++ b/lisp/org/org-attach.el | |||
| @@ -246,10 +246,10 @@ This checks for the existence of a \".git\" directory in that directory." | |||
| 246 | (cd dir) | 246 | (cd dir) |
| 247 | (shell-command "git add .") | 247 | (shell-command "git add .") |
| 248 | (shell-command "git ls-files --deleted" t) | 248 | (shell-command "git ls-files --deleted" t) |
| 249 | (mapc '(lambda (file) | 249 | (mapc (lambda (file) |
| 250 | (unless (string= file "") | 250 | (unless (string= file "") |
| 251 | (shell-command | 251 | (shell-command |
| 252 | (concat "git rm \"" file "\"")))) | 252 | (concat "git rm \"" file "\"")))) |
| 253 | (split-string (buffer-string) "\n")) | 253 | (split-string (buffer-string) "\n")) |
| 254 | (shell-command "git commit -m 'Synchronized attachments'"))))) | 254 | (shell-command "git commit -m 'Synchronized attachments'"))))) |
| 255 | 255 | ||
diff --git a/lisp/org/org-exp.el b/lisp/org/org-exp.el index 002ad025fbe..3278d108b52 100644 --- a/lisp/org/org-exp.el +++ b/lisp/org/org-exp.el | |||
| @@ -2136,7 +2136,7 @@ TYPE must be a string, any of: | |||
| 2136 | markup (org-symname-or-string (pop params)) | 2136 | markup (org-symname-or-string (pop params)) |
| 2137 | lang (and (member markup '("src" "SRC")) | 2137 | lang (and (member markup '("src" "SRC")) |
| 2138 | (org-symname-or-string (pop params))) | 2138 | (org-symname-or-string (pop params))) |
| 2139 | switches (mapconcat '(lambda (x) (format "%s" x)) params " ") | 2139 | switches (mapconcat (lambda (x) (format "%s" x)) params " ") |
| 2140 | start nil end nil) | 2140 | start nil end nil) |
| 2141 | (delete-region (match-beginning 0) (match-end 0)) | 2141 | (delete-region (match-beginning 0) (match-end 0)) |
| 2142 | (if (or (not file) | 2142 | (if (or (not file) |
diff --git a/lisp/org/org-html.el b/lisp/org/org-html.el index a6933978710..8ccca0ca987 100644 --- a/lisp/org/org-html.el +++ b/lisp/org/org-html.el | |||
| @@ -1090,74 +1090,74 @@ lang=\"%s\" xml:lang=\"%s\"> | |||
| 1090 | (push "<div id=\"text-table-of-contents\">\n" thetoc) | 1090 | (push "<div id=\"text-table-of-contents\">\n" thetoc) |
| 1091 | (push "<ul>\n<li>" thetoc) | 1091 | (push "<ul>\n<li>" thetoc) |
| 1092 | (setq lines | 1092 | (setq lines |
| 1093 | (mapcar '(lambda (line) | 1093 | (mapcar (lambda (line) |
| 1094 | (if (and (string-match org-todo-line-regexp line) | 1094 | (if (and (string-match org-todo-line-regexp line) |
| 1095 | (not (get-text-property 0 'org-protected line))) | 1095 | (not (get-text-property 0 'org-protected line))) |
| 1096 | ;; This is a headline | 1096 | ;; This is a headline |
| 1097 | (progn | 1097 | (progn |
| 1098 | (setq have-headings t) | 1098 | (setq have-headings t) |
| 1099 | (setq level (- (match-end 1) (match-beginning 1) | 1099 | (setq level (- (match-end 1) (match-beginning 1) |
| 1100 | level-offset) | 1100 | level-offset) |
| 1101 | level (org-tr-level level) | 1101 | level (org-tr-level level) |
| 1102 | txt (save-match-data | 1102 | txt (save-match-data |
| 1103 | (org-html-expand | 1103 | (org-html-expand |
| 1104 | (org-export-cleanup-toc-line | 1104 | (org-export-cleanup-toc-line |
| 1105 | (match-string 3 line)))) | 1105 | (match-string 3 line)))) |
| 1106 | todo | 1106 | todo |
| 1107 | (or (and org-export-mark-todo-in-toc | 1107 | (or (and org-export-mark-todo-in-toc |
| 1108 | (match-beginning 2) | 1108 | (match-beginning 2) |
| 1109 | (not (member (match-string 2 line) | 1109 | (not (member (match-string 2 line) |
| 1110 | org-done-keywords))) | 1110 | org-done-keywords))) |
| 1111 | ; TODO, not DONE | 1111 | ; TODO, not DONE |
| 1112 | (and org-export-mark-todo-in-toc | 1112 | (and org-export-mark-todo-in-toc |
| 1113 | (= level umax-toc) | 1113 | (= level umax-toc) |
| 1114 | (org-search-todo-below | 1114 | (org-search-todo-below |
| 1115 | line lines level)))) | 1115 | line lines level)))) |
| 1116 | (if (string-match | 1116 | (if (string-match |
| 1117 | (org-re "[ \t]+:\\([[:alnum:]_@:]+\\):[ \t]*$") txt) | 1117 | (org-re "[ \t]+:\\([[:alnum:]_@:]+\\):[ \t]*$") txt) |
| 1118 | (setq txt (replace-match " <span class=\"tag\"> \\1</span>" t nil txt))) | 1118 | (setq txt (replace-match " <span class=\"tag\"> \\1</span>" t nil txt))) |
| 1119 | (if (string-match quote-re0 txt) | 1119 | (if (string-match quote-re0 txt) |
| 1120 | (setq txt (replace-match "" t t txt))) | 1120 | (setq txt (replace-match "" t t txt))) |
| 1121 | (setq snumber (org-section-number level)) | 1121 | (setq snumber (org-section-number level)) |
| 1122 | (if org-export-with-section-numbers | 1122 | (if org-export-with-section-numbers |
| 1123 | (setq txt (concat snumber " " txt))) | 1123 | (setq txt (concat snumber " " txt))) |
| 1124 | (if (<= level (max umax umax-toc)) | 1124 | (if (<= level (max umax umax-toc)) |
| 1125 | (setq head-count (+ head-count 1))) | 1125 | (setq head-count (+ head-count 1))) |
| 1126 | (if (<= level umax-toc) | 1126 | (if (<= level umax-toc) |
| 1127 | (progn | 1127 | (progn |
| 1128 | (if (> level org-last-level) | 1128 | (if (> level org-last-level) |
| 1129 | (progn | 1129 | (progn |
| 1130 | (setq cnt (- level org-last-level)) | 1130 | (setq cnt (- level org-last-level)) |
| 1131 | (while (>= (setq cnt (1- cnt)) 0) | 1131 | (while (>= (setq cnt (1- cnt)) 0) |
| 1132 | (push "\n<ul>\n<li>" thetoc)) | 1132 | (push "\n<ul>\n<li>" thetoc)) |
| 1133 | (push "\n" thetoc))) | 1133 | (push "\n" thetoc))) |
| 1134 | (if (< level org-last-level) | 1134 | (if (< level org-last-level) |
| 1135 | (progn | 1135 | (progn |
| 1136 | (setq cnt (- org-last-level level)) | 1136 | (setq cnt (- org-last-level level)) |
| 1137 | (while (>= (setq cnt (1- cnt)) 0) | 1137 | (while (>= (setq cnt (1- cnt)) 0) |
| 1138 | (push "</li>\n</ul>" thetoc)) | 1138 | (push "</li>\n</ul>" thetoc)) |
| 1139 | (push "\n" thetoc))) | 1139 | (push "\n" thetoc))) |
| 1140 | ;; Check for targets | 1140 | ;; Check for targets |
| 1141 | (while (string-match org-any-target-regexp line) | 1141 | (while (string-match org-any-target-regexp line) |
| 1142 | (setq line (replace-match | 1142 | (setq line (replace-match |
| 1143 | (concat "@<span class=\"target\">" (match-string 1 line) "@</span> ") | 1143 | (concat "@<span class=\"target\">" (match-string 1 line) "@</span> ") |
| 1144 | t t line))) | 1144 | t t line))) |
| 1145 | (while (string-match "<\\(<\\)+\\|>\\(>\\)+" txt) | 1145 | (while (string-match "<\\(<\\)+\\|>\\(>\\)+" txt) |
| 1146 | (setq txt (replace-match "" t t txt))) | 1146 | (setq txt (replace-match "" t t txt))) |
| 1147 | (setq href | 1147 | (setq href |
| 1148 | (replace-regexp-in-string | 1148 | (replace-regexp-in-string |
| 1149 | "\\." "_" (format "sec-%s" snumber))) | 1149 | "\\." "_" (format "sec-%s" snumber))) |
| 1150 | (setq href (or (cdr (assoc href org-export-preferred-target-alist)) href)) | 1150 | (setq href (or (cdr (assoc href org-export-preferred-target-alist)) href)) |
| 1151 | (push | 1151 | (push |
| 1152 | (format | 1152 | (format |
| 1153 | (if todo | 1153 | (if todo |
| 1154 | "</li>\n<li><a href=\"#%s\"><span class=\"todo\">%s</span></a>" | 1154 | "</li>\n<li><a href=\"#%s\"><span class=\"todo\">%s</span></a>" |
| 1155 | "</li>\n<li><a href=\"#%s\">%s</a>") | 1155 | "</li>\n<li><a href=\"#%s\">%s</a>") |
| 1156 | href txt) thetoc) | 1156 | href txt) thetoc) |
| 1157 | 1157 | ||
| 1158 | (setq org-last-level level)) | 1158 | (setq org-last-level level)) |
| 1159 | ))) | 1159 | ))) |
| 1160 | line) | 1160 | line) |
| 1161 | lines)) | 1161 | lines)) |
| 1162 | (while (> org-last-level (1- org-min-level)) | 1162 | (while (> org-last-level (1- org-min-level)) |
| 1163 | (setq org-last-level (1- org-last-level)) | 1163 | (setq org-last-level (1- org-last-level)) |
diff --git a/lisp/org/org-mouse.el b/lisp/org/org-mouse.el index cec19d89de1..ddd476e98b2 100644 --- a/lisp/org/org-mouse.el +++ b/lisp/org/org-mouse.el | |||
| @@ -526,7 +526,7 @@ SCHEDULED: or DEADLINE: or ANYTHINGLIKETHIS:" | |||
| 526 | ("Check Tags" | 526 | ("Check Tags" |
| 527 | ,@(org-mouse-keyword-menu | 527 | ,@(org-mouse-keyword-menu |
| 528 | (sort (mapcar 'car (org-get-buffer-tags)) 'string-lessp) | 528 | (sort (mapcar 'car (org-get-buffer-tags)) 'string-lessp) |
| 529 | '(lambda (tag) (org-tags-sparse-tree nil tag))) | 529 | (lambda (tag) (org-tags-sparse-tree nil tag))) |
| 530 | "--" | 530 | "--" |
| 531 | ["Custom Tag ..." org-tags-sparse-tree t]) | 531 | ["Custom Tag ..." org-tags-sparse-tree t]) |
| 532 | ["Check Phrase ..." org-occur] | 532 | ["Check Phrase ..." org-occur] |
| @@ -537,18 +537,18 @@ SCHEDULED: or DEADLINE: or ANYTHINGLIKETHIS:" | |||
| 537 | ("Display Tags" | 537 | ("Display Tags" |
| 538 | ,@(org-mouse-keyword-menu | 538 | ,@(org-mouse-keyword-menu |
| 539 | (sort (mapcar 'car (org-get-buffer-tags)) 'string-lessp) | 539 | (sort (mapcar 'car (org-get-buffer-tags)) 'string-lessp) |
| 540 | '(lambda (tag) (org-tags-view nil tag))) | 540 | (lambda (tag) (org-tags-view nil tag))) |
| 541 | "--" | 541 | "--" |
| 542 | ["Custom Tag ..." org-tags-view t]) | 542 | ["Custom Tag ..." org-tags-view t]) |
| 543 | ["Display Calendar" org-goto-calendar t] | 543 | ["Display Calendar" org-goto-calendar t] |
| 544 | "--" | 544 | "--" |
| 545 | ,@(org-mouse-keyword-menu | 545 | ,@(org-mouse-keyword-menu |
| 546 | (mapcar 'car org-agenda-custom-commands) | 546 | (mapcar 'car org-agenda-custom-commands) |
| 547 | '(lambda (key) | 547 | (lambda (key) |
| 548 | (eval `(flet ((read-char-exclusive () (string-to-char ,key))) | 548 | (eval `(flet ((read-char-exclusive () (string-to-char ,key))) |
| 549 | (org-agenda nil)))) | 549 | (org-agenda nil)))) |
| 550 | nil | 550 | nil |
| 551 | '(lambda (key) | 551 | (lambda (key) |
| 552 | (let ((entry (assoc key org-agenda-custom-commands))) | 552 | (let ((entry (assoc key org-agenda-custom-commands))) |
| 553 | (org-mouse-clip-text | 553 | (org-mouse-clip-text |
| 554 | (cond | 554 | (cond |
| @@ -832,7 +832,7 @@ This means, between the beginning of line and the point." | |||
| 832 | ("Tags and Priorities" | 832 | ("Tags and Priorities" |
| 833 | ,@(org-mouse-keyword-menu | 833 | ,@(org-mouse-keyword-menu |
| 834 | (org-mouse-priority-list) | 834 | (org-mouse-priority-list) |
| 835 | '(lambda (keyword) | 835 | (lambda (keyword) |
| 836 | (org-mouse-set-priority (string-to-char keyword))) | 836 | (org-mouse-set-priority (string-to-char keyword))) |
| 837 | priority "Priority %s") | 837 | priority "Priority %s") |
| 838 | "--" | 838 | "--" |
| @@ -905,7 +905,7 @@ This means, between the beginning of line and the point." | |||
| 905 | (mouse-drag-region event))) | 905 | (mouse-drag-region event))) |
| 906 | 906 | ||
| 907 | (add-hook 'org-mode-hook | 907 | (add-hook 'org-mode-hook |
| 908 | '(lambda () | 908 | (lambda () |
| 909 | (setq org-mouse-context-menu-function 'org-mouse-context-menu) | 909 | (setq org-mouse-context-menu-function 'org-mouse-context-menu) |
| 910 | 910 | ||
| 911 | (when (memq 'context-menu org-mouse-features) | 911 | (when (memq 'context-menu org-mouse-features) |
| @@ -1129,14 +1129,14 @@ This means, between the beginning of line and the point." | |||
| 1129 | 1129 | ||
| 1130 | ; (setq org-agenda-mode-hook nil) | 1130 | ; (setq org-agenda-mode-hook nil) |
| 1131 | (add-hook 'org-agenda-mode-hook | 1131 | (add-hook 'org-agenda-mode-hook |
| 1132 | '(lambda () | 1132 | (lambda () |
| 1133 | (setq org-mouse-context-menu-function 'org-mouse-agenda-context-menu) | 1133 | (setq org-mouse-context-menu-function 'org-mouse-agenda-context-menu) |
| 1134 | (org-defkey org-agenda-mode-map [mouse-3] 'org-mouse-show-context-menu) | 1134 | (org-defkey org-agenda-mode-map [mouse-3] 'org-mouse-show-context-menu) |
| 1135 | (org-defkey org-agenda-mode-map [down-mouse-3] 'org-mouse-move-tree-start) | 1135 | (org-defkey org-agenda-mode-map [down-mouse-3] 'org-mouse-move-tree-start) |
| 1136 | (org-defkey org-agenda-mode-map [C-mouse-4] 'org-agenda-earlier) | 1136 | (org-defkey org-agenda-mode-map [C-mouse-4] 'org-agenda-earlier) |
| 1137 | (org-defkey org-agenda-mode-map [C-mouse-5] 'org-agenda-later) | 1137 | (org-defkey org-agenda-mode-map [C-mouse-5] 'org-agenda-later) |
| 1138 | (org-defkey org-agenda-mode-map [drag-mouse-3] | 1138 | (org-defkey org-agenda-mode-map [drag-mouse-3] |
| 1139 | '(lambda (event) (interactive "e") | 1139 | (lambda (event) (interactive "e") |
| 1140 | (case (org-mouse-get-gesture event) | 1140 | (case (org-mouse-get-gesture event) |
| 1141 | (:left (org-agenda-earlier 1)) | 1141 | (:left (org-agenda-earlier 1)) |
| 1142 | (:right (org-agenda-later 1))))))) | 1142 | (:right (org-agenda-later 1))))))) |
diff --git a/lisp/org/org-src.el b/lisp/org/org-src.el index bd1c3802044..5a877963a40 100644 --- a/lisp/org/org-src.el +++ b/lisp/org/org-src.el | |||
| @@ -674,7 +674,7 @@ the language, a switch telling if the content should be in a single line." | |||
| 674 | (defun org-src-mode-configure-edit-buffer () | 674 | (defun org-src-mode-configure-edit-buffer () |
| 675 | (when (org-bound-and-true-p org-edit-src-from-org-mode) | 675 | (when (org-bound-and-true-p org-edit-src-from-org-mode) |
| 676 | (org-add-hook 'kill-buffer-hook | 676 | (org-add-hook 'kill-buffer-hook |
| 677 | '(lambda () (delete-overlay org-edit-src-overlay)) nil 'local) | 677 | (lambda () (delete-overlay org-edit-src-overlay)) nil 'local) |
| 678 | (if (org-bound-and-true-p org-edit-src-allow-write-back-p) | 678 | (if (org-bound-and-true-p org-edit-src-allow-write-back-p) |
| 679 | (progn | 679 | (progn |
| 680 | (setq buffer-offer-save t) | 680 | (setq buffer-offer-save t) |
diff --git a/lisp/org/org.el b/lisp/org/org.el index 4b316ab60ab..a55111ec816 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el | |||
| @@ -1576,7 +1576,7 @@ single keystroke rather than having to type \"yes\"." | |||
| 1576 | (const :tag "no confirmation (dangerous)" nil))) | 1576 | (const :tag "no confirmation (dangerous)" nil))) |
| 1577 | (put 'org-confirm-shell-link-function | 1577 | (put 'org-confirm-shell-link-function |
| 1578 | 'safe-local-variable | 1578 | 'safe-local-variable |
| 1579 | '(lambda (x) (member x '(yes-or-no-p y-or-n-p)))) | 1579 | (lambda (x) (member x '(yes-or-no-p y-or-n-p)))) |
| 1580 | 1580 | ||
| 1581 | (defcustom org-confirm-elisp-link-function 'yes-or-no-p | 1581 | (defcustom org-confirm-elisp-link-function 'yes-or-no-p |
| 1582 | "Non-nil means ask for confirmation before executing Emacs Lisp links. | 1582 | "Non-nil means ask for confirmation before executing Emacs Lisp links. |
| @@ -1596,7 +1596,7 @@ single keystroke rather than having to type \"yes\"." | |||
| 1596 | (const :tag "no confirmation (dangerous)" nil))) | 1596 | (const :tag "no confirmation (dangerous)" nil))) |
| 1597 | (put 'org-confirm-shell-link-function | 1597 | (put 'org-confirm-shell-link-function |
| 1598 | 'safe-local-variable | 1598 | 'safe-local-variable |
| 1599 | '(lambda (x) (member x '(yes-or-no-p y-or-n-p)))) | 1599 | (lambda (x) (member x '(yes-or-no-p y-or-n-p)))) |
| 1600 | 1600 | ||
| 1601 | (defconst org-file-apps-defaults-gnu | 1601 | (defconst org-file-apps-defaults-gnu |
| 1602 | '((remote . emacs) | 1602 | '((remote . emacs) |
| @@ -2519,7 +2519,7 @@ a double prefix argument to a time stamp command like `C-c .' or `C-c !', | |||
| 2519 | and by using a prefix arg to `S-up/down' to specify the exact number | 2519 | and by using a prefix arg to `S-up/down' to specify the exact number |
| 2520 | of minutes to shift." | 2520 | of minutes to shift." |
| 2521 | :group 'org-time | 2521 | :group 'org-time |
| 2522 | :get '(lambda (var) ; Make sure both elements are there | 2522 | :get (lambda (var) ; Make sure both elements are there |
| 2523 | (if (integerp (default-value var)) | 2523 | (if (integerp (default-value var)) |
| 2524 | (list (default-value var) 5) | 2524 | (list (default-value var) 5) |
| 2525 | (default-value var))) | 2525 | (default-value var))) |
| @@ -3021,7 +3021,7 @@ or contain a special line | |||
| 3021 | If the file does not specify a category, then file's base name | 3021 | If the file does not specify a category, then file's base name |
| 3022 | is used instead.") | 3022 | is used instead.") |
| 3023 | (make-variable-buffer-local 'org-category) | 3023 | (make-variable-buffer-local 'org-category) |
| 3024 | (put 'org-category 'safe-local-variable '(lambda (x) (or (symbolp x) (stringp x)))) | 3024 | (put 'org-category 'safe-local-variable (lambda (x) (or (symbolp x) (stringp x)))) |
| 3025 | 3025 | ||
| 3026 | (defcustom org-agenda-files nil | 3026 | (defcustom org-agenda-files nil |
| 3027 | "The files to be used for agenda display. | 3027 | "The files to be used for agenda display. |
diff --git a/lisp/play/fortune.el b/lisp/play/fortune.el index a61b52f4ad1..55b0a564fef 100644 --- a/lisp/play/fortune.el +++ b/lisp/play/fortune.el | |||
| @@ -49,7 +49,7 @@ | |||
| 49 | 49 | ||
| 50 | ;; I have also this in my .gnus: | 50 | ;; I have also this in my .gnus: |
| 51 | ;;(add-hook 'gnus-article-mode-hook | 51 | ;;(add-hook 'gnus-article-mode-hook |
| 52 | ;; '(lambda () | 52 | ;; (lambda () |
| 53 | ;; (define-key gnus-article-mode-map "i" 'fortune-from-region))) | 53 | ;; (define-key gnus-article-mode-map "i" 'fortune-from-region))) |
| 54 | ;; which allows marking a region and then pressing "i" so that the marked | 54 | ;; which allows marking a region and then pressing "i" so that the marked |
| 55 | ;; region will be automatically added to my favourite fortune-file. | 55 | ;; region will be automatically added to my favourite fortune-file. |
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el index f6d497569ba..2cce5e13fb0 100644 --- a/lisp/progmodes/cperl-mode.el +++ b/lisp/progmodes/cperl-mode.el | |||
| @@ -8594,10 +8594,10 @@ the appropriate statement modifier." | |||
| 8594 | (pargs (cdr (car flist)))) | 8594 | (pargs (cdr (car flist)))) |
| 8595 | (setq command | 8595 | (setq command |
| 8596 | (concat command " | " pcom " " | 8596 | (concat command " | " pcom " " |
| 8597 | (mapconcat '(lambda (phrase) | 8597 | (mapconcat (lambda (phrase) |
| 8598 | (if (not (stringp phrase)) | 8598 | (if (not (stringp phrase)) |
| 8599 | (error "Malformed Man-filter-list")) | 8599 | (error "Malformed Man-filter-list")) |
| 8600 | phrase) | 8600 | phrase) |
| 8601 | pargs " "))) | 8601 | pargs " "))) |
| 8602 | (setq flist (cdr flist)))) | 8602 | (setq flist (cdr flist)))) |
| 8603 | command)) | 8603 | command)) |
diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el index e9bb43c4d6d..28f5d329fd5 100644 --- a/lisp/progmodes/f90.el +++ b/lisp/progmodes/f90.el | |||
| @@ -78,9 +78,9 @@ | |||
| 78 | ;; To customize f90-mode for your taste, use, for example: | 78 | ;; To customize f90-mode for your taste, use, for example: |
| 79 | ;; (you don't have to specify values for all the parameters below) | 79 | ;; (you don't have to specify values for all the parameters below) |
| 80 | ;; | 80 | ;; |
| 81 | ;;(add-hook 'f90-mode-hook | 81 | ;; (add-hook 'f90-mode-hook |
| 82 | ;; ;; These are the default values. | 82 | ;; ;; These are the default values. |
| 83 | ;; '(lambda () (setq f90-do-indent 3 | 83 | ;; (lambda () (setq f90-do-indent 3 |
| 84 | ;; f90-if-indent 3 | 84 | ;; f90-if-indent 3 |
| 85 | ;; f90-type-indent 3 | 85 | ;; f90-type-indent 3 |
| 86 | ;; f90-program-indent 2 | 86 | ;; f90-program-indent 2 |
diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el index c2ee1a93389..61055ef4342 100644 --- a/lisp/progmodes/gdb-mi.el +++ b/lisp/progmodes/gdb-mi.el | |||
| @@ -2539,7 +2539,7 @@ If not in a source or disassembly buffer just set point." | |||
| 2539 | ;; Don't bind "q" to kill-this-buffer as we need it for breakpoint icons. | 2539 | ;; Don't bind "q" to kill-this-buffer as we need it for breakpoint icons. |
| 2540 | (define-key map "q" 'gdb-delete-frame-or-window) | 2540 | (define-key map "q" 'gdb-delete-frame-or-window) |
| 2541 | (define-key map "\r" 'gdb-goto-breakpoint) | 2541 | (define-key map "\r" 'gdb-goto-breakpoint) |
| 2542 | (define-key map "\t" '(lambda () | 2542 | (define-key map "\t" (lambda () |
| 2543 | (interactive) | 2543 | (interactive) |
| 2544 | (gdb-set-window-buffer | 2544 | (gdb-set-window-buffer |
| 2545 | (gdb-get-buffer-create 'gdb-threads-buffer) t))) | 2545 | (gdb-get-buffer-create 'gdb-threads-buffer) t))) |
| @@ -2626,7 +2626,7 @@ corresponding to the mode line clicked." | |||
| 2626 | (define-key map "i" 'gdb-interrupt-thread) | 2626 | (define-key map "i" 'gdb-interrupt-thread) |
| 2627 | (define-key map "c" 'gdb-continue-thread) | 2627 | (define-key map "c" 'gdb-continue-thread) |
| 2628 | (define-key map "s" 'gdb-step-thread) | 2628 | (define-key map "s" 'gdb-step-thread) |
| 2629 | (define-key map "\t" '(lambda () | 2629 | (define-key map "\t" (lambda () |
| 2630 | (interactive) | 2630 | (interactive) |
| 2631 | (gdb-set-window-buffer | 2631 | (gdb-set-window-buffer |
| 2632 | (gdb-get-buffer-create 'gdb-breakpoints-buffer) t))) | 2632 | (gdb-get-buffer-create 'gdb-breakpoints-buffer) t))) |
| @@ -3582,7 +3582,7 @@ member." | |||
| 3582 | (let ((map (make-sparse-keymap))) | 3582 | (let ((map (make-sparse-keymap))) |
| 3583 | (suppress-keymap map) | 3583 | (suppress-keymap map) |
| 3584 | (define-key map "q" 'kill-this-buffer) | 3584 | (define-key map "q" 'kill-this-buffer) |
| 3585 | (define-key map "\t" '(lambda () | 3585 | (define-key map "\t" (lambda () |
| 3586 | (interactive) | 3586 | (interactive) |
| 3587 | (gdb-set-window-buffer | 3587 | (gdb-set-window-buffer |
| 3588 | (gdb-get-buffer-create | 3588 | (gdb-get-buffer-create |
| @@ -3670,7 +3670,7 @@ member." | |||
| 3670 | (define-key map "\r" 'gdb-edit-register-value) | 3670 | (define-key map "\r" 'gdb-edit-register-value) |
| 3671 | (define-key map [mouse-2] 'gdb-edit-register-value) | 3671 | (define-key map [mouse-2] 'gdb-edit-register-value) |
| 3672 | (define-key map "q" 'kill-this-buffer) | 3672 | (define-key map "q" 'kill-this-buffer) |
| 3673 | (define-key map "\t" '(lambda () | 3673 | (define-key map "\t" (lambda () |
| 3674 | (interactive) | 3674 | (interactive) |
| 3675 | (gdb-set-window-buffer | 3675 | (gdb-set-window-buffer |
| 3676 | (gdb-get-buffer-create | 3676 | (gdb-get-buffer-create |
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el index f45273026b4..259ee81c9ba 100644 --- a/lisp/progmodes/gud.el +++ b/lisp/progmodes/gud.el | |||
| @@ -116,11 +116,11 @@ Used to grey out relevant toolbar icons.") | |||
| 116 | (display-buffer-reuse-frames t)) | 116 | (display-buffer-reuse-frames t)) |
| 117 | (catch 'info-found | 117 | (catch 'info-found |
| 118 | (walk-windows | 118 | (walk-windows |
| 119 | '(lambda (window) | 119 | (lambda (window) |
| 120 | (if (eq (window-buffer window) (get-buffer "*info*")) | 120 | (if (eq (window-buffer window) (get-buffer "*info*")) |
| 121 | (progn | 121 | (progn |
| 122 | (setq same-window-regexps nil) | 122 | (setq same-window-regexps nil) |
| 123 | (throw 'info-found nil)))) | 123 | (throw 'info-found nil)))) |
| 124 | nil 0) | 124 | nil 0) |
| 125 | (select-frame (make-frame))) | 125 | (select-frame (make-frame))) |
| 126 | (if (eq gud-minor-mode 'gdbmi) | 126 | (if (eq gud-minor-mode 'gdbmi) |
diff --git a/lisp/progmodes/idlw-help.el b/lisp/progmodes/idlw-help.el index 7202d95c8db..05fcedde048 100644 --- a/lisp/progmodes/idlw-help.el +++ b/lisp/progmodes/idlw-help.el | |||
| @@ -835,7 +835,7 @@ see if a link is set for it. Try extra help functions if necessary." | |||
| 835 | 835 | ||
| 836 | ((or idlwave-help-browser-is-local | 836 | ((or idlwave-help-browser-is-local |
| 837 | (string-match "w3" (symbol-name idlwave-help-browser-function))) | 837 | (string-match "w3" (symbol-name idlwave-help-browser-function))) |
| 838 | (idlwave-help-display-help-window '(lambda () (browse-url full-link)))) | 838 | (idlwave-help-display-help-window (lambda () (browse-url full-link)))) |
| 839 | 839 | ||
| 840 | (t (browse-url full-link))))) | 840 | (t (browse-url full-link))))) |
| 841 | 841 | ||
diff --git a/lisp/progmodes/idlw-shell.el b/lisp/progmodes/idlw-shell.el index 01c256ab41b..b2cd24f0f98 100644 --- a/lisp/progmodes/idlw-shell.el +++ b/lisp/progmodes/idlw-shell.el | |||
| @@ -4243,15 +4243,15 @@ Otherwise, just expand the file name." | |||
| 4243 | (define-key idlwave-shell-electric-debug-mode-map "_" | 4243 | (define-key idlwave-shell-electric-debug-mode-map "_" |
| 4244 | 'idlwave-shell-stack-down) | 4244 | 'idlwave-shell-stack-down) |
| 4245 | (define-key idlwave-shell-electric-debug-mode-map "e" | 4245 | (define-key idlwave-shell-electric-debug-mode-map "e" |
| 4246 | '(lambda () (interactive) (idlwave-shell-print '(16)))) | 4246 | (lambda () (interactive) (idlwave-shell-print '(16)))) |
| 4247 | (define-key idlwave-shell-electric-debug-mode-map "q" 'idlwave-shell-retall) | 4247 | (define-key idlwave-shell-electric-debug-mode-map "q" 'idlwave-shell-retall) |
| 4248 | (define-key idlwave-shell-electric-debug-mode-map "t" | 4248 | (define-key idlwave-shell-electric-debug-mode-map "t" |
| 4249 | '(lambda () (interactive) (idlwave-shell-send-command "help,/TRACE"))) | 4249 | (lambda () (interactive) (idlwave-shell-send-command "help,/TRACE"))) |
| 4250 | (define-key idlwave-shell-electric-debug-mode-map [(control ??)] | 4250 | (define-key idlwave-shell-electric-debug-mode-map [(control ??)] |
| 4251 | 'idlwave-shell-electric-debug-help) | 4251 | 'idlwave-shell-electric-debug-help) |
| 4252 | (define-key idlwave-shell-electric-debug-mode-map "x" | 4252 | (define-key idlwave-shell-electric-debug-mode-map "x" |
| 4253 | '(lambda (arg) (interactive "P") | 4253 | (lambda (arg) (interactive "P") |
| 4254 | (idlwave-shell-print arg nil nil t))) | 4254 | (idlwave-shell-print arg nil nil t))) |
| 4255 | 4255 | ||
| 4256 | 4256 | ||
| 4257 | ; Enter the prefix map in two places. | 4257 | ; Enter the prefix map in two places. |
diff --git a/lisp/progmodes/mixal-mode.el b/lisp/progmodes/mixal-mode.el index bf5662cdfa3..0d8cdd9f9b1 100644 --- a/lisp/progmodes/mixal-mode.el +++ b/lisp/progmodes/mixal-mode.el | |||
| @@ -1059,8 +1059,7 @@ EXECUTION-TIME holds info about the time it takes, number or string.") | |||
| 1059 | (let* ((completion-ignore-case t) | 1059 | (let* ((completion-ignore-case t) |
| 1060 | ;; we already have a list, but it is not in the right format | 1060 | ;; we already have a list, but it is not in the right format |
| 1061 | ;; transform it to a valid table so completition can use it | 1061 | ;; transform it to a valid table so completition can use it |
| 1062 | (table (mapcar '(lambda (elm) | 1062 | (table (mapcar (lambda (elm) (cons (symbol-name (car elm)) nil)) |
| 1063 | (cons (symbol-name (car elm)) nil)) | ||
| 1064 | mixal-operation-codes-alist)) | 1063 | mixal-operation-codes-alist)) |
| 1065 | ;; prompt is different depending on we are close to a valid op-code | 1064 | ;; prompt is different depending on we are close to a valid op-code |
| 1066 | (have-default (assq (intern-soft (current-word)) | 1065 | (have-default (assq (intern-soft (current-word)) |
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 67a51dfbeee..e35fc89618a 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el | |||
| @@ -2380,7 +2380,7 @@ without confirmation." | |||
| 2380 | (features (cons 'python-mode features))) ; and requires this | 2380 | (features (cons 'python-mode features))) ; and requires this |
| 2381 | (brm-init) ; second line of normal recipe | 2381 | (brm-init) ; second line of normal recipe |
| 2382 | (remove-hook 'python-mode-hook ; undo this from `brm-init' | 2382 | (remove-hook 'python-mode-hook ; undo this from `brm-init' |
| 2383 | '(lambda () (easy-menu-add brm-menu))) | 2383 | (lambda () (easy-menu-add brm-menu))) |
| 2384 | (easy-menu-define | 2384 | (easy-menu-define |
| 2385 | python-brm-menu python-mode-map | 2385 | python-brm-menu python-mode-map |
| 2386 | "Bicycle Repair Man" | 2386 | "Bicycle Repair Man" |
diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el index facbba60057..1da819660d2 100644 --- a/lisp/progmodes/sql.el +++ b/lisp/progmodes/sql.el | |||
| @@ -1207,13 +1207,13 @@ Based on `comint-mode-map'.") | |||
| 1207 | 1207 | ||
| 1208 | (mapc | 1208 | (mapc |
| 1209 | ;; In Emacs 22+, provide SYSTEM-FLAG to define-abbrev. | 1209 | ;; In Emacs 22+, provide SYSTEM-FLAG to define-abbrev. |
| 1210 | '(lambda (abbrev) | 1210 | (lambda (abbrev) |
| 1211 | (let ((name (car abbrev)) | 1211 | (let ((name (car abbrev)) |
| 1212 | (expansion (cdr abbrev))) | 1212 | (expansion (cdr abbrev))) |
| 1213 | (condition-case nil | 1213 | (condition-case nil |
| 1214 | (define-abbrev sql-mode-abbrev-table name expansion nil 0 t) | 1214 | (define-abbrev sql-mode-abbrev-table name expansion nil 0 t) |
| 1215 | (error | 1215 | (error |
| 1216 | (define-abbrev sql-mode-abbrev-table name expansion))))) | 1216 | (define-abbrev sql-mode-abbrev-table name expansion))))) |
| 1217 | '(("ins" . "insert") | 1217 | '(("ins" . "insert") |
| 1218 | ("upd" . "update") | 1218 | ("upd" . "update") |
| 1219 | ("del" . "delete") | 1219 | ("del" . "delete") |
diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el index 8bb9256078a..eab34f6f026 100644 --- a/lisp/progmodes/verilog-mode.el +++ b/lisp/progmodes/verilog-mode.el | |||
| @@ -4586,7 +4586,7 @@ This lets programs calling batch mode to easily extract error messages." | |||
| 4586 | (verilog-mode)))) | 4586 | (verilog-mode)))) |
| 4587 | (buffer-list)) | 4587 | (buffer-list)) |
| 4588 | ;; Process the files | 4588 | ;; Process the files |
| 4589 | (mapcar '(lambda (buf) | 4589 | (mapcar (lambda (buf) |
| 4590 | (when (buffer-file-name buf) | 4590 | (when (buffer-file-name buf) |
| 4591 | (save-excursion | 4591 | (save-excursion |
| 4592 | (if (not (file-exists-p (buffer-file-name buf))) | 4592 | (if (not (file-exists-p (buffer-file-name buf))) |
| @@ -6373,7 +6373,7 @@ for matches of `str' and adding the occurrence tp `all' through point END." | |||
| 6373 | 6373 | ||
| 6374 | (defun verilog-keyword-completion (keyword-list) | 6374 | (defun verilog-keyword-completion (keyword-list) |
| 6375 | "Give list of all possible completions of keywords in KEYWORD-LIST." | 6375 | "Give list of all possible completions of keywords in KEYWORD-LIST." |
| 6376 | (mapcar '(lambda (s) | 6376 | (mapcar (lambda (s) |
| 6377 | (if (string-match (concat "\\<" verilog-str) s) | 6377 | (if (string-match (concat "\\<" verilog-str) s) |
| 6378 | (if (or (null verilog-pred) | 6378 | (if (or (null verilog-pred) |
| 6379 | (funcall verilog-pred s)) | 6379 | (funcall verilog-pred s)) |
| @@ -6493,7 +6493,7 @@ and `verilog-separator-keywords'.)" | |||
| 6493 | (all-completions verilog-str 'verilog-completion))) | 6493 | (all-completions verilog-str 'verilog-completion))) |
| 6494 | (match (if verilog-toggle-completions | 6494 | (match (if verilog-toggle-completions |
| 6495 | "" (try-completion | 6495 | "" (try-completion |
| 6496 | verilog-str (mapcar '(lambda (elm) | 6496 | verilog-str (mapcar (lambda (elm) |
| 6497 | (cons elm 0)) allcomp))))) | 6497 | (cons elm 0)) allcomp))))) |
| 6498 | ;; Delete old string | 6498 | ;; Delete old string |
| 6499 | (delete-region b e) | 6499 | (delete-region b e) |
| @@ -11447,13 +11447,13 @@ Wilson Snyder (wsnyder@wsnyder.org)." | |||
| 11447 | (verilog-auto-re-search-do "/\\*AUTOINOUTCOMP([^)]*)\\*/" 'verilog-auto-inout-comp) | 11447 | (verilog-auto-re-search-do "/\\*AUTOINOUTCOMP([^)]*)\\*/" 'verilog-auto-inout-comp) |
| 11448 | ;; next in/outs which need previous sucked inputs first | 11448 | ;; next in/outs which need previous sucked inputs first |
| 11449 | (verilog-auto-re-search-do "/\\*AUTOOUTPUT\\((\"[^\"]*\")\\)\\*/" | 11449 | (verilog-auto-re-search-do "/\\*AUTOOUTPUT\\((\"[^\"]*\")\\)\\*/" |
| 11450 | '(lambda () (verilog-auto-output t))) | 11450 | (lambda () (verilog-auto-output t))) |
| 11451 | (verilog-auto-re-search-do "/\\*AUTOOUTPUT\\*/" 'verilog-auto-output) | 11451 | (verilog-auto-re-search-do "/\\*AUTOOUTPUT\\*/" 'verilog-auto-output) |
| 11452 | (verilog-auto-re-search-do "/\\*AUTOINPUT\\((\"[^\"]*\")\\)\\*/" | 11452 | (verilog-auto-re-search-do "/\\*AUTOINPUT\\((\"[^\"]*\")\\)\\*/" |
| 11453 | '(lambda () (verilog-auto-input t))) | 11453 | (lambda () (verilog-auto-input t))) |
| 11454 | (verilog-auto-re-search-do "/\\*AUTOINPUT\\*/" 'verilog-auto-input) | 11454 | (verilog-auto-re-search-do "/\\*AUTOINPUT\\*/" 'verilog-auto-input) |
| 11455 | (verilog-auto-re-search-do "/\\*AUTOINOUT\\((\"[^\"]*\")\\)\\*/" | 11455 | (verilog-auto-re-search-do "/\\*AUTOINOUT\\((\"[^\"]*\")\\)\\*/" |
| 11456 | '(lambda () (verilog-auto-inout t))) | 11456 | (lambda () (verilog-auto-inout t))) |
| 11457 | (verilog-auto-re-search-do "/\\*AUTOINOUT\\*/" 'verilog-auto-inout) | 11457 | (verilog-auto-re-search-do "/\\*AUTOINOUT\\*/" 'verilog-auto-inout) |
| 11458 | ;; Then tie off those in/outs | 11458 | ;; Then tie off those in/outs |
| 11459 | (verilog-auto-re-search-do "/\\*AUTOTIEOFF\\*/" 'verilog-auto-tieoff) | 11459 | (verilog-auto-re-search-do "/\\*AUTOTIEOFF\\*/" 'verilog-auto-tieoff) |
diff --git a/lisp/ps-print.el b/lisp/ps-print.el index 3d1dbfb406a..a6d6a5676c1 100644 --- a/lisp/ps-print.el +++ b/lisp/ps-print.el | |||
| @@ -975,7 +975,7 @@ Please send all bug fixes and enhancements to | |||
| 975 | ;; (setq ps-font-info-database '(<your stuff> <the standard stuff>)) | 975 | ;; (setq ps-font-info-database '(<your stuff> <the standard stuff>)) |
| 976 | ;; or, use `ps-print-hook' (see section Hooks): | 976 | ;; or, use `ps-print-hook' (see section Hooks): |
| 977 | ;; (add-hook 'ps-print-hook | 977 | ;; (add-hook 'ps-print-hook |
| 978 | ;; '(lambda () | 978 | ;; (lambda () |
| 979 | ;; (or (assq 'Helvetica ps-font-info-database) | 979 | ;; (or (assq 'Helvetica ps-font-info-database) |
| 980 | ;; (setq ps-font-info-database (append ...))))) | 980 | ;; (setq ps-font-info-database (append ...))))) |
| 981 | ;; | 981 | ;; |
diff --git a/lisp/term.el b/lisp/term.el index df95ca830ab..6d7f6f5c535 100644 --- a/lisp/term.el +++ b/lisp/term.el | |||
| @@ -4254,8 +4254,8 @@ special identifiers such as COM1." | |||
| 4254 | (setq x | 4254 | (setq x |
| 4255 | (sort | 4255 | (sort |
| 4256 | (copy-sequence serial-speed-history) | 4256 | (copy-sequence serial-speed-history) |
| 4257 | '(lambda (a b) (when (and (stringp a) (stringp b)) | 4257 | (lambda (a b) (when (and (stringp a) (stringp b)) |
| 4258 | (> (string-to-number a) (string-to-number b)))))) | 4258 | (> (string-to-number a) (string-to-number b)))))) |
| 4259 | (dolist (i x) (when (not (equal i (car y))) (push i y))) | 4259 | (dolist (i x) (when (not (equal i (car y))) (push i y))) |
| 4260 | y)) | 4260 | y)) |
| 4261 | 4261 | ||
diff --git a/lisp/terminal.el b/lisp/terminal.el index 0bde04eb2ec..6fdaecf9c9c 100644 --- a/lisp/terminal.el +++ b/lisp/terminal.el | |||
| @@ -105,8 +105,8 @@ performance." | |||
| 105 | (define-key map [t] 'te-pass-through) | 105 | (define-key map [t] 'te-pass-through) |
| 106 | (define-key map [switch-frame] 'handle-switch-frame) | 106 | (define-key map [switch-frame] 'handle-switch-frame) |
| 107 | (define-key map "\e" terminal-meta-map) | 107 | (define-key map "\e" terminal-meta-map) |
| 108 | ;(define-key map "\C-l" | 108 | ;;(define-key map "\C-l" |
| 109 | ; '(lambda () (interactive) (te-pass-through) (redraw-display))) | 109 | ;; (lambda () (interactive) (te-pass-through) (redraw-display))) |
| 110 | (setq terminal-map map))) | 110 | (setq terminal-map map))) |
| 111 | 111 | ||
| 112 | (defvar terminal-escape-map nil) | 112 | (defvar terminal-escape-map nil) |
diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el index 99c9a83e4fb..bc8644be786 100644 --- a/lisp/textmodes/flyspell.el +++ b/lisp/textmodes/flyspell.el | |||
| @@ -296,7 +296,7 @@ If this variable is nil, all regions are treated as small." | |||
| 296 | ;;* using flyspell with mail-mode add the following expression */ | 296 | ;;* using flyspell with mail-mode add the following expression */ |
| 297 | ;;* in your .emacs file: */ | 297 | ;;* in your .emacs file: */ |
| 298 | ;;* (add-hook 'mail-mode */ | 298 | ;;* (add-hook 'mail-mode */ |
| 299 | ;;* '(lambda () (setq flyspell-generic-check-word-predicate */ | 299 | ;;* (lambda () (setq flyspell-generic-check-word-predicate */ |
| 300 | ;;* 'mail-mode-flyspell-verify))) */ | 300 | ;;* 'mail-mode-flyspell-verify))) */ |
| 301 | ;;*---------------------------------------------------------------------*/ | 301 | ;;*---------------------------------------------------------------------*/ |
| 302 | (defvar flyspell-generic-check-word-predicate nil | 302 | (defvar flyspell-generic-check-word-predicate nil |
diff --git a/lisp/thumbs.el b/lisp/thumbs.el index b251ca60246..7a505758408 100644 --- a/lisp/thumbs.el +++ b/lisp/thumbs.el | |||
| @@ -226,7 +226,7 @@ reached." | |||
| 226 | (let ((fattribs-list (file-attributes f))) | 226 | (let ((fattribs-list (file-attributes f))) |
| 227 | `(,(nth 4 fattribs-list) ,(nth 7 fattribs-list) ,f))) | 227 | `(,(nth 4 fattribs-list) ,(nth 7 fattribs-list) ,f))) |
| 228 | (directory-files (thumbs-thumbsdir) t (image-file-name-regexp))) | 228 | (directory-files (thumbs-thumbsdir) t (image-file-name-regexp))) |
| 229 | '(lambda (l1 l2) (time-less-p (car l1) (car l2))))) | 229 | (lambda (l1 l2) (time-less-p (car l1) (car l2))))) |
| 230 | (dirsize (apply '+ (mapcar (lambda (x) (cadr x)) files-list)))) | 230 | (dirsize (apply '+ (mapcar (lambda (x) (cadr x)) files-list)))) |
| 231 | (while (> dirsize thumbs-thumbsdir-max-size) | 231 | (while (> dirsize thumbs-thumbsdir-max-size) |
| 232 | (progn | 232 | (progn |
diff --git a/lisp/vc/add-log.el b/lisp/vc/add-log.el index 3149764d331..e5aead2309f 100644 --- a/lisp/vc/add-log.el +++ b/lisp/vc/add-log.el | |||
| @@ -578,7 +578,7 @@ It takes the same format as the TZ argument of `set-time-zone-rule'. | |||
| 578 | If nil, use local time. | 578 | If nil, use local time. |
| 579 | If t, use universal time.") | 579 | If t, use universal time.") |
| 580 | (put 'add-log-time-zone-rule 'safe-local-variable | 580 | (put 'add-log-time-zone-rule 'safe-local-variable |
| 581 | '(lambda (x) (or (booleanp x) (stringp x)))) | 581 | (lambda (x) (or (booleanp x) (stringp x)))) |
| 582 | 582 | ||
| 583 | (defun add-log-iso8601-time-zone (&optional time) | 583 | (defun add-log-iso8601-time-zone (&optional time) |
| 584 | (let* ((utc-offset (or (car (current-time-zone time)) 0)) | 584 | (let* ((utc-offset (or (car (current-time-zone time)) 0)) |
| @@ -1051,8 +1051,8 @@ Runs `change-log-mode-hook'. | |||
| 1051 | (set (make-local-variable 'fill-indent-according-to-mode) t) | 1051 | (set (make-local-variable 'fill-indent-according-to-mode) t) |
| 1052 | ;; Avoid that filling leaves behind a single "*" on a line. | 1052 | ;; Avoid that filling leaves behind a single "*" on a line. |
| 1053 | (add-hook 'fill-nobreak-predicate | 1053 | (add-hook 'fill-nobreak-predicate |
| 1054 | '(lambda () | 1054 | (lambda () |
| 1055 | (looking-back "^\\s *\\*\\s *" (line-beginning-position))) | 1055 | (looking-back "^\\s *\\*\\s *" (line-beginning-position))) |
| 1056 | nil t) | 1056 | nil t) |
| 1057 | (set (make-local-variable 'indent-line-function) 'change-log-indent) | 1057 | (set (make-local-variable 'indent-line-function) 'change-log-indent) |
| 1058 | (set (make-local-variable 'tab-always-indent) nil) | 1058 | (set (make-local-variable 'tab-always-indent) nil) |
diff --git a/lisp/vc/ediff-diff.el b/lisp/vc/ediff-diff.el index 078947e8501..20c83429ced 100644 --- a/lisp/vc/ediff-diff.el +++ b/lisp/vc/ediff-diff.el | |||
| @@ -50,7 +50,7 @@ Must produce output compatible with Unix's diff3 program." | |||
| 50 | 50 | ||
| 51 | ;; The following functions must precede all defcustom-defined variables. | 51 | ;; The following functions must precede all defcustom-defined variables. |
| 52 | 52 | ||
| 53 | (fset 'ediff-set-actual-diff-options '(lambda () nil)) | 53 | (fset 'ediff-set-actual-diff-options (lambda () nil)) |
| 54 | 54 | ||
| 55 | (defcustom ediff-shell | 55 | (defcustom ediff-shell |
| 56 | (cond ((memq system-type '(ms-dos windows-nt)) | 56 | (cond ((memq system-type '(ms-dos windows-nt)) |
diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el index 92f52157cb2..40ffea624fb 100644 --- a/lisp/vc/ediff-util.el +++ b/lisp/vc/ediff-util.el | |||
| @@ -1682,7 +1682,7 @@ the width of the A/B/C windows." | |||
| 1682 | 'ediff-get-lines-to-region-start) | 1682 | 'ediff-get-lines-to-region-start) |
| 1683 | ((eq op 'scroll-up) | 1683 | ((eq op 'scroll-up) |
| 1684 | 'ediff-get-lines-to-region-end) | 1684 | 'ediff-get-lines-to-region-end) |
| 1685 | (t '(lambda (a b c) 0)))) | 1685 | (t (lambda (a b c) 0)))) |
| 1686 | (max-lines (max (funcall func 'A n ctl-buf) | 1686 | (max-lines (max (funcall func 'A n ctl-buf) |
| 1687 | (funcall func 'B n ctl-buf) | 1687 | (funcall func 'B n ctl-buf) |
| 1688 | (if (ediff-buffer-live-p ediff-buffer-C) | 1688 | (if (ediff-buffer-live-p ediff-buffer-C) |