From 3ee3df4e9596bb8344e2569cf68376453d57251e Mon Sep 17 00:00:00 2001 From: Thierry Volpiatto Date: Wed, 30 Sep 2015 08:03:24 +0200 Subject: Unquote lambda's. --- helm-apt.el | 2 +- helm-buffers.el | 2 +- helm-command.el | 2 +- helm-dabbrev.el | 6 +++--- helm-elisp.el | 6 +++--- helm-eshell.el | 2 +- helm-external.el | 2 +- helm-files.el | 22 +++++++++---------- helm-grep.el | 20 ++++++++--------- helm-locate.el | 6 +++--- helm-mode.el | 6 +++--- helm-net.el | 2 +- helm-tags.el | 2 +- helm-utils.el | 2 +- helm.el | 66 ++++++++++++++++++++++++++++---------------------------- 15 files changed, 74 insertions(+), 74 deletions(-) diff --git a/helm-apt.el b/helm-apt.el index 800f69a3..897af9d6 100644 --- a/helm-apt.el +++ b/helm-apt.el @@ -248,7 +248,7 @@ Support install, remove and purge actions." (t (error "Unknown action")))) (beg (point)) end - (cand-list (mapconcat #'(lambda (x) (format "'%s'" x)) + (cand-list (mapconcat (lambda (x) (format "'%s'" x)) (helm-marked-candidates) " "))) (goto-char (point-max)) (insert (concat command cand-list)) diff --git a/helm-buffers.el b/helm-buffers.el index 26629404..92c53843 100644 --- a/helm-buffers.el +++ b/helm-buffers.el @@ -419,7 +419,7 @@ Should be called after others transformers i.e (boring buffers)." (if (string= helm-pattern "") candidates (sort candidates - #'(lambda (s1 s2) + (lambda (s1 s2) (< (string-width s1) (string-width s2)))))) (defun helm-buffers-mark-similar-buffers-1 () diff --git a/helm-command.el b/helm-command.el index dab0b954..6e88b051 100644 --- a/helm-command.el +++ b/helm-command.el @@ -177,7 +177,7 @@ than the default which is OBARRAY." candidates source 'real))) (helm--mode-line-display-prefarg t) (pers-help - #'(lambda (candidate) + (lambda (candidate) (let ((hbuf (get-buffer (help-buffer)))) (if (and in-help (string= candidate help-cand) (null helm-persistent-action-use-special-display)) diff --git a/helm-dabbrev.el b/helm-dabbrev.el index 72928ab2..7e768d93 100644 --- a/helm-dabbrev.el +++ b/helm-dabbrev.el @@ -158,7 +158,7 @@ but the initial search for all candidates in buffer(s)." (minibuf (minibufferp buffer1)) result pos-before pos-after (search-and-store - #'(lambda (pattern direction) + (lambda (pattern direction) (while (cl-case direction (1 (search-forward pattern nil t)) (-1 (search-backward pattern nil t)) @@ -230,7 +230,7 @@ but the initial search for all candidates in buffer(s)." (defun helm-dabbrev--get-candidates (abbrev) (cl-assert abbrev nil "[No Match]") (with-current-buffer (current-buffer) - (let* ((dabbrev-get #'(lambda (str all-bufs) + (let* ((dabbrev-get (lambda (str all-bufs) (helm-dabbrev--collect str helm-candidate-number-limit (cl-case helm-dabbrev-case-fold-search @@ -267,7 +267,7 @@ but the initial search for all candidates in buffer(s)." (zerop helm-dabbrev-cycle-threshold))) (helm-execute-action-at-once-if-one t) (helm-quit-if-no-candidate - #'(lambda () + (lambda () (message "[Helm-dabbrev: No expansion found]")))) (cl-assert (and (stringp dabbrev) (not (string= dabbrev ""))) nil "[Helm-dabbrev: Nothing found before point]") diff --git a/helm-elisp.el b/helm-elisp.el index 942ad9e4..438f24b4 100644 --- a/helm-elisp.el +++ b/helm-elisp.el @@ -513,7 +513,7 @@ Filename completion happen if string start after or between a double quote." (defun helm-def-source--emacs-functions (&optional default) (helm-build-in-buffer-source "Functions" :init `(lambda () - (helm-apropos-init #'(lambda (x) + (helm-apropos-init (lambda (x) (and (fboundp x) (not (commandp x)) (not (generic-p x)) @@ -530,7 +530,7 @@ Filename completion happen if string start after or between a double quote." (defun helm-def-source--eieio-classes (&optional default) (helm-build-in-buffer-source "Classes" :init `(lambda () - (helm-apropos-init #'(lambda (x) + (helm-apropos-init (lambda (x) (class-p x)) ,default)) :fuzzy-match helm-apropos-fuzzy-match @@ -544,7 +544,7 @@ Filename completion happen if string start after or between a double quote." (defun helm-def-source--eieio-generic (&optional default) (helm-build-in-buffer-source "Generic functions" :init `(lambda () - (helm-apropos-init #'(lambda (x) + (helm-apropos-init (lambda (x) (generic-p x)) ,default)) :fuzzy-match helm-apropos-fuzzy-match diff --git a/helm-eshell.el b/helm-eshell.el index 6f703e1d..0160bc7f 100644 --- a/helm-eshell.el +++ b/helm-eshell.el @@ -19,7 +19,7 @@ ;; ;; Enable like this in .emacs: ;; (add-hook 'eshell-mode-hook -;; #'(lambda () +;; (lambda () ;; (eshell-cmpl-initialize) ;; (define-key eshell-mode-map [remap pcomplete] 'helm-esh-pcomplete) ;; (define-key eshell-mode-map (kbd "M-p") 'helm-eshell-history))) diff --git a/helm-external.el b/helm-external.el index 43b7f2a7..693e1c45 100644 --- a/helm-external.el +++ b/helm-external.el @@ -105,7 +105,7 @@ In this case EXE must be provided as \"EXE %s\"." (start-process-shell-command proc nil real-com)) (set-process-sentinel (get-process proc) - #'(lambda (process event) + (lambda (process event) (when (and (string= event "finished\n") helm-raise-command (not (helm-get-pid-from-process-name real-com))) diff --git a/helm-files.el b/helm-files.el index 1da75f21..013b7d39 100644 --- a/helm-files.el +++ b/helm-files.el @@ -570,7 +570,7 @@ ACTION must be an action supported by `helm-dired-action'." helm-ff-auto-update-initial-value (dest (with-helm-display-marked-candidates helm-marked-buffer-name - (mapcar #'(lambda (f) + (mapcar (lambda (f) (if (file-directory-p f) (concat (helm-basename f) "/") (helm-basename f))) @@ -793,7 +793,7 @@ See `helm-find-files-eshell-command-on-file-1' for more info." (defun helm-ff-switch-to-eshell (_candidate) "Switch to eshell and cd to `helm-ff-default-directory'." - (let ((cd-eshell #'(lambda () + (let ((cd-eshell (lambda () (eshell-kill-input) (goto-char (point-max)) (insert @@ -1242,7 +1242,7 @@ Same as `dired-do-print' but for helm." (list lpr-switches) lpr-switches)) " ")))) - (file-args (mapconcat #'(lambda (x) + (file-args (mapconcat (lambda (x) (format "'%s'" x)) file-list " ")) (cmd-line (concat command " " file-args))) @@ -2007,7 +2007,7 @@ Return candidates prefixed with basename of `helm-input' first." (rest-cand (if cand1 (cdr candidates) candidates)) (memo-src (make-hash-table :test 'equal)) (all (sort rest-cand - #'(lambda (s1 s2) + (lambda (s1 s2) (let* ((score (lambda (str) (helm-ff-score-candidate-for-pattern str (helm-basename helm-input)))) @@ -2223,7 +2223,7 @@ If a prefix arg is given or `helm-follow-mode' is on open file." (new-pattern (helm-get-selection)) (num-lines-buf (with-current-buffer helm-buffer (count-lines (point-min) (point-max)))) - (insert-in-minibuffer #'(lambda (fname) + (insert-in-minibuffer (lambda (fname) (with-selected-window (minibuffer-window) (unless follow (delete-minibuffer-contents) @@ -2517,9 +2517,9 @@ copy and rename." (if (file-directory-p candidate) ;; When CANDIDATE is a directory, build file-name in this directory. ;; Else we use CANDIDATE. - #'(lambda (from) + (lambda (from) (expand-file-name (file-name-nondirectory from) candidate)) - #'(lambda (_from) candidate)) + (lambda (_from) candidate)) marker) (and (fboundp 'dired-async-mode) (dired-async-mode dired-async-state))) @@ -2628,7 +2628,7 @@ Ask to kill buffers associated with that file, too." (len (length files))) (with-helm-display-marked-candidates helm-marked-buffer-name - (mapcar #'(lambda (f) + (mapcar (lambda (f) (if (file-directory-p f) (concat (helm-basename f) "/") (helm-basename f))) @@ -2649,7 +2649,7 @@ Called with a prefix arg open files in background without selecting them." (ffap-newfile-prompt helm-ff-newfile-prompt-p) (find-file-wildcards nil) (make-dir-fn - #'(lambda (dir &optional helm-ff) + (lambda (dir &optional helm-ff) (when (y-or-n-p (format "Create directory `%s'? " dir)) (let ((dirfname (directory-file-name dir))) (if (file-exists-p dirfname) @@ -3072,7 +3072,7 @@ See `helm-browse-project'." (defvar helm-source-session (helm-build-sync-source "Session" :candidates (lambda () - (cl-delete-if-not #'(lambda (f) + (cl-delete-if-not (lambda (f) (or (string-match helm-tramp-file-name-regexp f) (file-exists-p f))) (mapcar 'car session-file-alist))) @@ -3275,7 +3275,7 @@ separator." (prog1 proc (set-process-sentinel proc - #'(lambda (process event) + (lambda (process event) (helm-process-deferred-sentinel-hook process event (helm-default-directory)) (if (string= event "finished\n") diff --git a/helm-grep.el b/helm-grep.el index 5254ef5a..508af3f9 100644 --- a/helm-grep.el +++ b/helm-grep.el @@ -330,7 +330,7 @@ It is intended to use as a let-bound variable, DON'T set this globaly.") (let ((files (if (file-remote-p in-directory) ;; Grep don't understand tramp filenames ;; use the local name. - (mapcar #'(lambda (x) + (mapcar (lambda (x) (file-remote-p x 'localname)) all-files) all-files))) @@ -365,7 +365,7 @@ It is intended to use as a let-bound variable, DON'T set this globaly.") only-files default-directory)) (ignored-files (unless (helm-grep-use-ack-p) (mapconcat - #'(lambda (x) + (lambda (x) (concat "--exclude=" (shell-quote-argument x))) helm-grep-ignored-files " "))) @@ -373,7 +373,7 @@ It is intended to use as a let-bound variable, DON'T set this globaly.") (mapconcat ;; Need grep version >=2.5.4 ;; of Gnuwin32 on windoze. - #'(lambda (x) + (lambda (x) (concat "--exclude-dir=" (shell-quote-argument x))) helm-grep-ignored-directories " "))) @@ -422,7 +422,7 @@ It is intended to use as a let-bound variable, DON'T set this globaly.") ;; Init sentinel. (set-process-sentinel (get-buffer-process helm-buffer) - #'(lambda (process event) + (lambda (process event) (let ((noresult (= (process-exit-status process) 1))) (unless noresult (helm-process-deferred-sentinel-hook @@ -564,7 +564,7 @@ If N is positive go forward otherwise go backward." (current-line-list (helm-grep-split-line sel)) (current-fname (nth 0 current-line-list)) (bob-or-eof (if (eq n 1) 'eobp 'bobp)) - (mark-maybe #'(lambda () + (mark-maybe (lambda () (if allow-mode (ignore) (helm-mark-current-line))))) @@ -788,7 +788,7 @@ Special commands: :fc-transformer '(helm-adaptive-sort helm-grep-ack-types-transformer) :buffer "*helm ack-types*"))) - (mapconcat #'(lambda (type) (concat "--type=" type)) types " "))) + (mapconcat (lambda (type) (concat "--type=" type)) types " "))) ;;; grep extensions @@ -862,7 +862,7 @@ in recurse, and ignoring EXTS, search being made on (not (helm-grep-use-ack-p :where 'recursive)) (or exts (helm-grep-get-file-extensions targets)))) (include-files (and exts - (mapconcat #'(lambda (x) + (mapconcat (lambda (x) (concat "--include=" (shell-quote-argument x))) (if (> (length exts) 1) @@ -1094,7 +1094,7 @@ If a prefix arg is given run grep on all buffers ignoring non--file-buffers." default-directory)) (fnargs (helm-grep-prepare-candidates (if (file-remote-p default-directory) - (mapcar #'(lambda (x) + (mapcar (lambda (x) (file-remote-p x 'localname)) only-files) only-files) @@ -1113,7 +1113,7 @@ If a prefix arg is given run grep on all buffers ignoring non--file-buffers." (message nil) (set-process-sentinel (get-buffer-process helm-buffer) - #'(lambda (_process event) + (lambda (_process event) (if (string= event "finished\n") (with-helm-window (setq mode-line-format @@ -1309,7 +1309,7 @@ See also `helm-do-grep-1'." (only (helm-read-file-name "Search in file(s): " :marked-candidates t - :test #'(lambda (file) + :test (lambda (file) (or (string= (file-name-extension file) "pdf") (string= (file-name-extension file) "PDF") (file-directory-p file))) diff --git a/helm-locate.el b/helm-locate.el index 9656530b..d25f5755 100644 --- a/helm-locate.el +++ b/helm-locate.el @@ -165,7 +165,7 @@ INIT is a string to use as initial input in prompt. See `helm-locate-with-db' and `helm-locate'." (require 'helm-mode) (helm-locate-set-command) - (let ((pfn #'(lambda (candidate) + (let ((pfn (lambda (candidate) (if (file-directory-p candidate) (message "Error: The locate Db should be a file") (if (= (shell-command @@ -185,7 +185,7 @@ See `helm-locate-with-db' and `helm-locate'." (or helm-ff-default-directory default-directory)) :preselect helm-locate-db-file-regexp - :test #'(lambda (x) + :test (lambda (x) (if helm-locate-db-file-regexp ;; Select only locate db files and directories ;; to allow navigation. @@ -270,7 +270,7 @@ See also `helm-locate'." cmd) (set-process-sentinel (get-buffer-process helm-buffer) - #'(lambda (_process event) + (lambda (_process event) (if (string= event "finished\n") (with-helm-window (setq mode-line-format diff --git a/helm-mode.el b/helm-mode.el index 17a69855..c8408bf5 100644 --- a/helm-mode.el +++ b/helm-mode.el @@ -136,7 +136,7 @@ To fuzzy match `completion-at-point' and friends see (interactive) (with-helm-alive-p (helm-exit-and-execute-action - #'(lambda (_candidate) + (lambda (_candidate) (identity ""))))) (defun helm-mode--keyboard-quit () @@ -1080,11 +1080,11 @@ Can be used as value for `completion-in-region-function'." (sort candidates 'helm-generic-sort-fn)))) :exec-when-only-one t :quit-when-no-cand - #'(lambda () + (lambda () ;; Delay message to overwrite "Quit". (run-with-timer 0.01 nil - #'(lambda () + (lambda () (message "[No matches]"))) t) ; exit minibuffer immediately. :must-match require-match)))) diff --git a/helm-net.el b/helm-net.el index bd60b2b6..cdcc53e1 100644 --- a/helm-net.el +++ b/helm-net.el @@ -401,7 +401,7 @@ Can be \"-new-tab\" (default) or \"-new-window\"." (append args (list url))) (set-process-sentinel (get-process proc) - #'(lambda (process event) + (lambda (process event) (when (string= event "finished\n") (message "%s process %s" process event)))))) diff --git a/helm-tags.el b/helm-tags.el index 3679c82d..d44343cd 100644 --- a/helm-tags.el +++ b/helm-tags.el @@ -133,7 +133,7 @@ Lookes recursively in parents directorys for a (defun helm-etags-find-tag-file-directory (current-dir) "Try to find the directory containing tag file. If not found in CURRENT-DIR search in upper directory." - (let ((file-exists? #'(lambda (dir) + (let ((file-exists? (lambda (dir) (let ((tag-path (expand-file-name helm-etags-tag-file-name dir))) (and (stringp tag-path) diff --git a/helm-utils.el b/helm-utils.el index fe11ebbe..c57af8be 100644 --- a/helm-utils.el +++ b/helm-utils.el @@ -274,7 +274,7 @@ that is sorting is done against real value of candidate." (split (split-string pattern)) (str1 (if (consp s1) (cdr s1) s1)) (str2 (if (consp s2) (cdr s2) s2)) - (score #'(lambda (str r1 r2 r3 lst) + (score (lambda (str r1 r2 r3 lst) (+ (if (string-match (concat "\\`" pattern) str) 1 0) (cond ((string-match r1 str) 5) ((and (string-match " " pattern) diff --git a/helm.el b/helm.el index 310cc55b..34353f89 100644 --- a/helm.el +++ b/helm.el @@ -77,10 +77,10 @@ Run each function of FUNCTIONS list in turn when called within DELAY seconds." (iter (cl-gensym "helm-iter-key")) (timeout delay)) (eval (list 'defvar iter nil)) - #'(lambda () (interactive) (helm-run-multi-key-command funs iter timeout)))) + (lambda () (interactive) (helm-run-multi-key-command funs iter timeout)))) (defun helm-run-multi-key-command (functions iterator delay) - (let ((fn #'(lambda () + (let ((fn (lambda () (cl-loop for count from 1 to (length functions) collect count))) next) @@ -1831,7 +1831,7 @@ to 10 as session local variable. ;; take precedence on same vars ;; that may have been passed before helm call. (helm-parse-keys plist))) - (apply fn (mapcar #'(lambda (key) (plist-get plist key)) + (apply fn (mapcar (lambda (key) (plist-get plist key)) helm-argument-keys))) (apply fn plist))))) ; [1] fn == helm-internal. @@ -2002,7 +2002,7 @@ Called from lisp, you can specify a buffer-name as a string with ARG." "List resumable helm buffers within running helm." (interactive) (if (and helm-alive-p (> (length helm-buffers) 0)) - (helm-run-after-exit #'(lambda () (helm-resume t))) + (helm-run-after-exit (lambda () (helm-resume t))) (message "No previous helm sessions to resume yet!"))) (defun helm-resume-p (any-resume) @@ -2192,7 +2192,7 @@ The function used to display `helm-buffer'." "Allow setting `no-other-window' window parameter in all windows. Arg ENABLE will be the value of the `no-other-window' window property." (walk-windows - #'(lambda (w) + (lambda (w) (unless (window-dedicated-p w) (set-window-parameter w 'no-other-window enabled))) 0)) @@ -2330,7 +2330,7 @@ It is intended to use this only in `helm-initial-setup'." ;; Call the init function for sources where appropriate (helm-funcall-foreach 'init (and helm-source-filter - (cl-remove-if-not #'(lambda (s) + (cl-remove-if-not (lambda (s) (member (assoc-default 'name s) helm-source-filter)) (helm-get-sources)))) @@ -2478,31 +2478,31 @@ For ANY-PRESELECT ANY-RESUME ANY-KEYMAP ANY-DEFAULT ANY-HISTORY, See `helm'." (thing-at-point 'symbol))))) (unwind-protect (minibuffer-with-setup-hook - #'(lambda () - ;; Start minor-mode with global value of helm-map. - (helm--minor-mode 1) - ;; Now overhide the global value of `helm-map' with - ;; the local one which is in this order: - ;; - The keymap of current source. - ;; - The value passed in ANY-KEYMAP - ;; which will become buffer local. - ;; - Or fallback to the global value of helm-map. - (helm--maybe-update-keymap - (or src-keymap any-keymap helm-map)) - (helm-log-run-hook 'helm-minibuffer-set-up-hook) - (setq timer - (run-with-idle-timer - (max helm-input-idle-delay 0.001) 'repeat - #'(lambda () - ;; Stop updating in persistent action - ;; or when `helm-suspend-update-flag' - ;; is non--nil. - (unless (or helm-in-persistent-action - helm-suspend-update-flag) - (save-selected-window - (helm-check-minibuffer-input) - (helm-print-error-messages)))))) - (helm--update-header-line)) ; minibuffer has already been filled here + (lambda () + ;; Start minor-mode with global value of helm-map. + (helm--minor-mode 1) + ;; Now overhide the global value of `helm-map' with + ;; the local one which is in this order: + ;; - The keymap of current source. + ;; - The value passed in ANY-KEYMAP + ;; which will become buffer local. + ;; - Or fallback to the global value of helm-map. + (helm--maybe-update-keymap + (or src-keymap any-keymap helm-map)) + (helm-log-run-hook 'helm-minibuffer-set-up-hook) + (setq timer + (run-with-idle-timer + (max helm-input-idle-delay 0.001) 'repeat + (lambda () + ;; Stop updating in persistent action + ;; or when `helm-suspend-update-flag' + ;; is non--nil. + (unless (or helm-in-persistent-action + helm-suspend-update-flag) + (save-selected-window + (helm-check-minibuffer-input) + (helm-print-error-messages)))))) + (helm--update-header-line)) ; minibuffer has already been filled here (read-from-minibuffer (or any-prompt "pattern: ") any-input helm-map nil hist tap @@ -3582,7 +3582,7 @@ Meant to be called at beginning of a sentinel process function." (run-at-time (or (and (boundp 'tramp-connection-min-time-diff) tramp-connection-min-time-diff) 5) - nil #'(lambda () + nil (lambda () (when helm-alive-p ; Don't run timer fn after quit. (setq helm-suspend-update-flag nil) (helm-check-minibuffer-input)))))) @@ -5330,7 +5330,7 @@ in source in `helm-before-initialize-hook'. e.g: \(add-hook 'helm-before-initialize-hook - #'(lambda () (helm-attrset 'follow 1 helm-source-buffers-list))) + (lambda () (helm-attrset 'follow 1 helm-source-buffers-list))) This will enable `helm-follow-mode' automatically in `helm-source-buffers-list'." (interactive "p") -- cgit v1.2.3