diff options
| -rw-r--r-- | lisp/eshell/em-dirs.el | 8 | ||||
| -rw-r--r-- | lisp/eshell/em-pred.el | 58 | ||||
| -rw-r--r-- | lisp/eshell/em-script.el | 10 | ||||
| -rw-r--r-- | lisp/eshell/eshell.el | 6 |
4 files changed, 41 insertions, 41 deletions
diff --git a/lisp/eshell/em-dirs.el b/lisp/eshell/em-dirs.el index c702ee192a6..c04a1a67d58 100644 --- a/lisp/eshell/em-dirs.el +++ b/lisp/eshell/em-dirs.el @@ -199,10 +199,10 @@ Thus, this does not include the current directory.") (when eshell-cd-on-directory (setq-local eshell-interpreter-alist - (cons (cons #'(lambda (file _args) - (eshell-lone-directory-p file)) - 'eshell-dirs-substitute-cd) - eshell-interpreter-alist))) + (cons (cons (lambda (file _args) + (eshell-lone-directory-p file)) + 'eshell-dirs-substitute-cd) + eshell-interpreter-alist))) (add-hook 'eshell-parse-argument-hook #'eshell-parse-user-reference nil t) diff --git a/lisp/eshell/em-pred.el b/lisp/eshell/em-pred.el index aecc8bb4e0a..b0a7544bdab 100644 --- a/lisp/eshell/em-pred.el +++ b/lisp/eshell/em-pred.el @@ -85,18 +85,18 @@ ordinary strings." (?s . (eshell-pred-file-mode #o4000)) ; setuid (?S . (eshell-pred-file-mode #o2000)) ; setgid (?t . (eshell-pred-file-mode #o1000)) ; sticky bit - (?U . #'(lambda (file) ; owned by effective uid - (if (file-exists-p file) - (= (file-attribute-user-id (file-attributes file)) - (user-uid))))) - ;; (?G . #'(lambda (file) ; owned by effective gid - ;; (if (file-exists-p file) - ;; (= (file-attribute-user-id (file-attributes file)) - ;; (user-uid))))) - (?* . #'(lambda (file) - (and (file-regular-p file) - (not (file-symlink-p file)) - (file-executable-p file)))) + (?U . (lambda (file) ; owned by effective uid + (if (file-exists-p file) + (= (file-attribute-user-id (file-attributes file)) + (user-uid))))) + ;; (?G . (lambda (file) ; owned by effective gid + ;; (if (file-exists-p file) + ;; (= (file-attribute-user-id (file-attributes file)) + ;; (user-uid))))) + (?* . (lambda (file) + (and (file-regular-p file) + (not (file-symlink-p file)) + (file-executable-p file)))) (?l . (eshell-pred-file-links)) (?u . (eshell-pred-user-or-group ?u "user" 2 'eshell-user-id)) (?g . (eshell-pred-user-or-group ?g "group" 3 'eshell-group-id)) @@ -114,25 +114,25 @@ The format of each entry is (put 'eshell-predicate-alist 'risky-local-variable t) (defcustom eshell-modifier-alist - '((?E . #'(lambda (lst) - (mapcar - (lambda (str) - (eshell-stringify - (car (eshell-parse-argument str)))) - lst))) - (?L . #'(lambda (lst) (mapcar 'downcase lst))) - (?U . #'(lambda (lst) (mapcar 'upcase lst))) - (?C . #'(lambda (lst) (mapcar 'capitalize lst))) - (?h . #'(lambda (lst) (mapcar 'file-name-directory lst))) + '((?E . (lambda (lst) + (mapcar + (lambda (str) + (eshell-stringify + (car (eshell-parse-argument str)))) + lst))) + (?L . (lambda (lst) (mapcar #'downcase lst))) + (?U . (lambda (lst) (mapcar #'upcase lst))) + (?C . (lambda (lst) (mapcar #'capitalize lst))) + (?h . (lambda (lst) (mapcar #'file-name-directory lst))) (?i . (eshell-include-members)) (?x . (eshell-include-members t)) - (?r . #'(lambda (lst) (mapcar 'file-name-sans-extension lst))) - (?e . #'(lambda (lst) (mapcar 'file-name-extension lst))) - (?t . #'(lambda (lst) (mapcar 'file-name-nondirectory lst))) - (?q . #'(lambda (lst) (mapcar 'eshell-escape-arg lst))) - (?u . #'(lambda (lst) (eshell-uniquify-list lst))) - (?o . #'(lambda (lst) (sort lst 'string-lessp))) - (?O . #'(lambda (lst) (nreverse (sort lst 'string-lessp)))) + (?r . (lambda (lst) (mapcar #'file-name-sans-extension lst))) + (?e . (lambda (lst) (mapcar #'file-name-extension lst))) + (?t . (lambda (lst) (mapcar #'file-name-nondirectory lst))) + (?q . (lambda (lst) (mapcar #'eshell-escape-arg lst))) + (?u . (lambda (lst) (eshell-uniquify-list lst))) + (?o . (lambda (lst) (sort lst #'string-lessp))) + (?O . (lambda (lst) (nreverse (sort lst #'string-lessp)))) (?j . (eshell-join-members)) (?S . (eshell-split-members)) (?R . 'reverse) diff --git a/lisp/eshell/em-script.el b/lisp/eshell/em-script.el index aecc48610f7..658ea085c95 100644 --- a/lisp/eshell/em-script.el +++ b/lisp/eshell/em-script.el @@ -59,11 +59,11 @@ This includes when running `eshell-command'." (defun eshell-script-initialize () ;Called from `eshell-mode' via intern-soft! "Initialize the script parsing code." (setq-local eshell-interpreter-alist - (cons (cons #'(lambda (file _args) - (string= (file-name-nondirectory file) - "eshell")) - 'eshell/source) - eshell-interpreter-alist)) + (cons (cons (lambda (file _args) + (string= (file-name-nondirectory file) + "eshell")) + 'eshell/source) + eshell-interpreter-alist)) (setq-local eshell-complex-commands (append '("source" ".") eshell-complex-commands)) ;; these two variables are changed through usage, but we don't want diff --git a/lisp/eshell/eshell.el b/lisp/eshell/eshell.el index 3aaf2fb78aa..101ac860346 100644 --- a/lisp/eshell/eshell.el +++ b/lisp/eshell/eshell.el @@ -294,9 +294,9 @@ With prefix ARG, insert output into the current buffer at point." (setq arg current-prefix-arg)) (let ((eshell-non-interactive-p t)) ;; Enable `eshell-mode' only in this minibuffer. - (minibuffer-with-setup-hook #'(lambda () - (eshell-mode) - (eshell-command-mode +1)) + (minibuffer-with-setup-hook (lambda () + (eshell-mode) + (eshell-command-mode +1)) (unless command (setq command (read-from-minibuffer "Emacs shell command: ")) (if (eshell-using-module 'eshell-hist) |