diff options
42 files changed, 78 insertions, 80 deletions
diff --git a/helm-adaptative.el b/helm-adaptative.el index 59f25d5a..24aa4529 100644 --- a/helm-adaptative.el +++ b/helm-adaptative.el @@ -20,7 +20,7 @@ ;;; Code: -(require 'cl) +(require 'cl-lib) (require 'helm) @@ -177,7 +177,7 @@ This is a filtered candidate transformer you can use with the ;; ... assemble a list containing the (CANIDATE . USAGE-COUNT) ;; pairs (mapcar (lambda (candidate-info) - (let ((cl-count 0)) + (let ((count 0)) (cl-dolist (pattern-info (cdr candidate-info)) (if (not (equal (car pattern-info) helm-pattern)) @@ -197,7 +197,7 @@ This is a filtered candidate transformer you can use with the ;; sort the list in descending order, so candidates with highest ;; priorty come first (progn - (setq usage (sort usage (lambda (cl-first second) + (setq usage (sort usage (lambda (first second) (> (cdr first) (cdr second))))) ;; put those candidates first which have the highest usage count diff --git a/helm-aliases.el b/helm-aliases.el index 4df68ee5..378ef031 100644 --- a/helm-aliases.el +++ b/helm-aliases.el @@ -17,7 +17,7 @@ ;;; Code: -(eval-when-compile (require 'cl)) +(require 'cl-lib) ;;; Helper functions to create aliases with old helm definitions diff --git a/helm-apt.el b/helm-apt.el index 4e922ec4..5c86cd2c 100644 --- a/helm-apt.el +++ b/helm-apt.el @@ -17,7 +17,7 @@ ;;; Code: -(eval-when-compile (require 'cl)) +(require 'cl-lib) (require 'helm) (require 'helm-utils) (require 'helm-external) @@ -44,7 +44,7 @@ (defvar helm-apt-map - (let ((cl-map (make-sparse-keymap))) + (let ((map (make-sparse-keymap))) (set-keymap-parent map helm-map) (define-key map (kbd "C-c ?") 'helm-apt-help) (define-key map (kbd "M-I") 'helm-apt-show-only-installed) diff --git a/helm-bbdb.el b/helm-bbdb.el index cb208d99..321ad1c0 100644 --- a/helm-bbdb.el +++ b/helm-bbdb.el @@ -17,7 +17,7 @@ ;;; Code: -(eval-when-compile (require 'cl)) +(require 'cl-lib) (require 'helm) (require 'helm-mode) diff --git a/helm-bmkext.el b/helm-bmkext.el index f98fe9a8..b0120c22 100644 --- a/helm-bmkext.el +++ b/helm-bmkext.el @@ -21,7 +21,7 @@ ;; http://julien.danjou.info/google-maps-el.html ;;; Code: -(eval-when-compile (require 'cl)) +(require 'cl-lib) (require 'helm) (require 'helm-bookmark) (require 'helm-adaptative) diff --git a/helm-bookmark.el b/helm-bookmark.el index ffa6d9f8..fc86e386 100644 --- a/helm-bookmark.el +++ b/helm-bookmark.el @@ -16,7 +16,7 @@ ;; along with this program. If not, see <http://www.gnu.org/licenses/>. ;;; Code: -(eval-when-compile (require 'cl)) +(require 'cl-lib) (eval-when-compile (require 'bookmark)) (require 'helm) (require 'helm-utils) @@ -71,7 +71,7 @@ (defvar helm-bookmark-map - (let ((cl-map (make-sparse-keymap))) + (let ((map (make-sparse-keymap))) (set-keymap-parent map helm-map) (define-key map (kbd "C-c o") 'helm-bookmark-run-jump-other-window) (define-key map (kbd "C-d") 'helm-bookmark-run-delete) diff --git a/helm-buffers.el b/helm-buffers.el index 613ef971..0cd4f05c 100644 --- a/helm-buffers.el +++ b/helm-buffers.el @@ -17,7 +17,7 @@ ;;; Code: -(require 'cl) +(require 'cl-lib) (require 'helm) (require 'helm-utils) (require 'helm-elscreen) @@ -88,7 +88,7 @@ When disabled (nil) use the longest buffer-name length found." ;;; Buffers keymap ;; (defvar helm-buffer-map - (let ((cl-map (make-sparse-keymap))) + (let ((map (make-sparse-keymap))) (set-keymap-parent map helm-map) (define-key map (kbd "C-c ?") 'helm-buffer-help) ;; No need to have separate command for grep and zgrep @@ -114,7 +114,7 @@ When disabled (nil) use the longest buffer-name length found." "Keymap for buffer sources in helm.") (defvar helm-buffers-ido-virtual-map - (let ((cl-map (make-sparse-keymap))) + (let ((map (make-sparse-keymap))) (set-keymap-parent map helm-map) (define-key map (kbd "C-c ?") 'helm-buffers-ido-virtual-help) (define-key map (kbd "C-c o") 'helm-ff-run-switch-other-window) diff --git a/helm-call-tree.el b/helm-call-tree.el index b6402499..340de020 100644 --- a/helm-call-tree.el +++ b/helm-call-tree.el @@ -19,7 +19,7 @@ ;;; Code: -(eval-when-compile (require 'cl)) +(require 'cl-lib) (require 'helm) (declare-function simple-call-tree-analyze "ext:simple-call-tree.el" (&optional test)) diff --git a/helm-color.el b/helm-color.el index 639421c4..e901266e 100644 --- a/helm-color.el +++ b/helm-color.el @@ -16,7 +16,7 @@ ;; along with this program. If not, see <http://www.gnu.org/licenses/>. ;;; Code: -(eval-when-compile (require 'cl)) +(require 'cl-lib) (require 'helm) ;;; Customize Face diff --git a/helm-command.el b/helm-command.el index dbeffded..3baeee7e 100644 --- a/helm-command.el +++ b/helm-command.el @@ -17,7 +17,7 @@ ;;; Code: -(require 'cl) +(require 'cl-lib) (require 'helm) (require 'helm-mode) (require 'helm-elisp) @@ -75,7 +75,7 @@ Return nil if no mode-map found." (defun helm-M-x-current-mode-map-alist () "Return mode-map alist of current `major-mode'." - (let ((cl-map (helm-get-mode-map-from-mode major-mode))) + (let ((map (helm-get-mode-map-from-mode major-mode))) (when (and map (boundp map)) (helm-M-x-get-major-mode-command-alist (symbol-value map))))) diff --git a/helm-config.el b/helm-config.el index 0ea090e8..7e1fd155 100644 --- a/helm-config.el +++ b/helm-config.el @@ -49,7 +49,7 @@ :group 'helm-config :set (lambda (var key) - (cl-dolist (cl-map '(minibuffer-local-completion-map + (cl-dolist (map '(minibuffer-local-completion-map minibuffer-local-filename-completion-map minibuffer-local-filename-must-match-map ; Emacs 23.1.+ minibuffer-local-isearch-map @@ -70,7 +70,7 @@ ;; ;; (defvar helm-command-map - (let ((cl-map (make-sparse-keymap))) + (let ((map (make-sparse-keymap))) (define-key map (kbd "a") 'helm-apropos) (define-key map (kbd "e") 'helm-etags-select) (define-key map (kbd "l") 'helm-locate) diff --git a/helm-dabbrev.el b/helm-dabbrev.el index 0309ea66..58745f96 100644 --- a/helm-dabbrev.el +++ b/helm-dabbrev.el @@ -76,7 +76,7 @@ but the initial search for all candidates in buffer(s)." (other :tag "Smart" 'smart))) (defvar helm-dabbrev-map - (let ((cl-map (make-sparse-keymap))) + (let ((map (make-sparse-keymap))) (set-keymap-parent map helm-map) (define-key map (kbd "M-/") 'helm-next-line) (define-key map (kbd "M-:") 'helm-previous-line) diff --git a/helm-elisp.el b/helm-elisp.el index 09de6286..57276ed1 100644 --- a/helm-elisp.el +++ b/helm-elisp.el @@ -16,7 +16,7 @@ ;; along with this program. If not, see <http://www.gnu.org/licenses/>. ;;; Code: -(eval-when-compile (require 'cl)) +(require 'cl-lib) (require 'helm) (require 'helm-utils) (require 'helm-info) diff --git a/helm-elscreen.el b/helm-elscreen.el index e33afb64..e8c8ad40 100644 --- a/helm-elscreen.el +++ b/helm-elscreen.el @@ -16,7 +16,7 @@ ;; along with this program. If not, see <http://www.gnu.org/licenses/>. ;;; Code: -(eval-when-compile (require 'cl)) +(require 'cl-lib) (require 'helm) (declare-function elscreen-find-screen-by-buffer "ext:elscreen.el" (buffer &optional create)) diff --git a/helm-emms.el b/helm-emms.el index b860ee98..504fd2e6 100644 --- a/helm-emms.el +++ b/helm-emms.el @@ -17,7 +17,7 @@ ;;; Code: -(eval-when-compile (require 'cl)) +(require 'cl-lib) (require 'helm) (declare-function emms-streams "ext:emms-streams") diff --git a/helm-eshell.el b/helm-eshell.el index 82393e2c..7eaad056 100644 --- a/helm-eshell.el +++ b/helm-eshell.el @@ -23,7 +23,7 @@ ;; ;;; Code: -(eval-when-compile (require 'cl)) +(require 'cl-lib) (require 'helm) (require 'helm-elisp) (require 'helm-regexp) @@ -34,14 +34,14 @@ (declare-function eshell-parse-arguments "esh-arg" (beg end)) (defvar helm-eshell-history-map - (let ((cl-map (make-sparse-keymap))) + (let ((map (make-sparse-keymap))) (set-keymap-parent map helm-map) (define-key map (kbd "M-p") 'helm-next-line) map) "Keymap for `helm-eshell-history'.") (defvar helm-esh-completion-map - (let ((cl-map (make-sparse-keymap))) + (let ((map (make-sparse-keymap))) (set-keymap-parent map helm-map) (define-key map (kbd "TAB") 'helm-next-line) map) @@ -162,7 +162,7 @@ The function that call this should set `helm-ec-target' to thing at point." ;; Use thing-at-point instead of last args value ;; to exclude possible delimiters e.g "(". (target (thing-at-point 'symbol)) - (cl-first (car args)) ; Maybe lisp delimiter "(". + (first (car args)) ; Maybe lisp delimiter "(". last) ; Will be the last but parsed by pcomplete. (setq helm-ec-target (or target " ") end (point) diff --git a/helm-eval.el b/helm-eval.el index 4304a03b..b318a233 100644 --- a/helm-eval.el +++ b/helm-eval.el @@ -16,7 +16,7 @@ ;; along with this program. If not, see <http://www.gnu.org/licenses/>. ;;; Code: -(eval-when-compile (require 'cl)) +(require 'cl-lib) (require 'helm) (require 'eldoc) @@ -50,7 +50,7 @@ Should take one arg: the string to display." (defvar helm-eldoc-active-minibuffers-list nil) (defvar helm-eval-expression-map - (let ((cl-map (make-sparse-keymap))) + (let ((map (make-sparse-keymap))) (set-keymap-parent map helm-map) (define-key map (kbd "<C-return>") 'helm-eval-new-line-and-indent) (define-key map (kbd "<tab>") 'lisp-indent-line) diff --git a/helm-external.el b/helm-external.el index 6e9cf745..b1519d2f 100644 --- a/helm-external.el +++ b/helm-external.el @@ -17,7 +17,7 @@ ;;; Code: -(eval-when-compile (require 'cl)) +(require 'cl-lib) (require 'helm) @@ -85,7 +85,7 @@ If EXE is already running just jump to his window if `helm-raise-command' is non--nil. When FILE argument is provided run EXE with FILE. In this case EXE must be provided as \"EXE %s\"." - (lexical-let* ((real-com (car (split-string (replace-regexp-in-string + (let* ((real-com (car (split-string (replace-regexp-in-string "%s" "" exe)))) (proc (if file (concat real-com " " file) real-com)) process-connection-type) diff --git a/helm-files.el b/helm-files.el index aa7dd2d2..7a693933 100644 --- a/helm-files.el +++ b/helm-files.el @@ -17,7 +17,7 @@ ;;; Code: -(require 'cl) +(require 'cl-lib) (require 'helm) (require 'helm-utils) (require 'helm-external) @@ -283,7 +283,7 @@ This happen only in `helm-find-files'." ;; ;; Keymaps (defvar helm-find-files-map - (let ((cl-map (make-sparse-keymap))) + (let ((map (make-sparse-keymap))) (set-keymap-parent map helm-map) (define-key map (kbd "C-]") 'helm-ff-run-toggle-basename) (define-key map (kbd "C-x C-f") 'helm-ff-run-locate) @@ -336,7 +336,7 @@ This happen only in `helm-find-files'." "Keymap for `helm-find-files'.") (defvar helm-read-file-map - (let ((cl-map (make-sparse-keymap))) + (let ((map (make-sparse-keymap))) (set-keymap-parent map helm-map) (define-key map (kbd "<C-return>") 'helm-cr-empty-string) (define-key map (kbd "C-]") 'helm-ff-run-toggle-basename) @@ -355,7 +355,7 @@ This happen only in `helm-find-files'." "Keymap for `helm-read-file-name'.") (defvar helm-esh-on-file-map - (let ((cl-map (make-sparse-keymap))) + (let ((map (make-sparse-keymap))) (set-keymap-parent map helm-map) (define-key map (kbd "C-c ?") 'helm-esh-help) map) diff --git a/helm-firefox.el b/helm-firefox.el index 8d22ee48..cd0052d7 100644 --- a/helm-firefox.el +++ b/helm-firefox.el @@ -16,7 +16,7 @@ ;; along with this program. If not, see <http://www.gnu.org/licenses/>. ;;; Code: -(eval-when-compile (require 'cl)) +(require 'cl-lib) (require 'helm) (require 'helm-utils) (require 'helm-adaptative) diff --git a/helm-font.el b/helm-font.el index 0411d5d3..371f552a 100644 --- a/helm-font.el +++ b/helm-font.el @@ -17,11 +17,11 @@ ;;; Code: -(eval-when-compile (require 'cl)) +(require 'cl-lib) (require 'helm) (defvar helm-ucs-map - (let ((cl-map (make-sparse-keymap))) + (let ((map (make-sparse-keymap))) (set-keymap-parent map helm-map) (define-key map (kbd "<C-backspace>") 'helm-ucs-persistent-delete) (define-key map (kbd "<C-left>") 'helm-ucs-persistent-backward) diff --git a/helm-gentoo.el b/helm-gentoo.el index eb28dc96..6e36a4c6 100644 --- a/helm-gentoo.el +++ b/helm-gentoo.el @@ -16,7 +16,7 @@ ;; along with this program. If not, see <http://www.gnu.org/licenses/>. ;;; Code: -(eval-when-compile (require 'cl)) +(require 'cl-lib) (require 'helm) (declare-function term-line-mode "term") diff --git a/helm-grep.el b/helm-grep.el index 414e3ee7..0b8871ee 100644 --- a/helm-grep.el +++ b/helm-grep.el @@ -16,7 +16,7 @@ ;; along with this program. If not, see <http://www.gnu.org/licenses/>. ;;; Code: -(eval-when-compile (require 'cl)) +(require 'cl-lib) (require 'helm) (require 'grep) (require 'helm-regexp) @@ -171,7 +171,7 @@ If set to nil `doc-view-mode' will be used instead of an external command." ;; ;; (defvar helm-grep-map - (let ((cl-map (make-sparse-keymap))) + (let ((map (make-sparse-keymap))) (set-keymap-parent map helm-map) (define-key map (kbd "M-<down>") 'helm-goto-next-file) (define-key map (kbd "M-<up>") 'helm-goto-precedent-file) @@ -187,7 +187,7 @@ If set to nil `doc-view-mode' will be used instead of an external command." "Keymap used in Grep sources.") (defvar helm-pdfgrep-map - (let ((cl-map (make-sparse-keymap))) + (let ((map (make-sparse-keymap))) (set-keymap-parent map helm-map) (define-key map (kbd "M-<down>") 'helm-goto-next-file) (define-key map (kbd "M-<up>") 'helm-goto-precedent-file) @@ -197,7 +197,7 @@ If set to nil `doc-view-mode' will be used instead of an external command." "Keymap used in pdfgrep.") (defvar helm-grep-mode-map - (let ((cl-map (make-sparse-keymap))) + (let ((map (make-sparse-keymap))) (define-key map (kbd "RET") 'helm-grep-mode-jump) (define-key map (kbd "C-o") 'helm-grep-mode-jump-other-window) (define-key map (kbd "q") 'helm-grep-mode-quit) diff --git a/helm-imenu.el b/helm-imenu.el index 19b961e6..53eab000 100644 --- a/helm-imenu.el +++ b/helm-imenu.el @@ -17,7 +17,7 @@ ;;; Code: -(require 'cl) +(require 'cl-lib) (require 'helm) (require 'imenu) diff --git a/helm-info.el b/helm-info.el index c3b44543..44269dba 100644 --- a/helm-info.el +++ b/helm-info.el @@ -17,7 +17,7 @@ ;;; Code: -(eval-when-compile (require 'cl)) +(require 'cl-lib) (require 'helm) (require 'helm-plugin) (require 'helm-net) diff --git a/helm-locate.el b/helm-locate.el index 9c57194b..f7916395 100644 --- a/helm-locate.el +++ b/helm-locate.el @@ -21,7 +21,7 @@ ;;; Code: -(eval-when-compile (require 'cl)) +(require 'cl-lib) (require 'helm) @@ -85,7 +85,7 @@ the opposite of \"locate\" command." (defvar helm-generic-files-map - (let ((cl-map (make-sparse-keymap))) + (let ((map (make-sparse-keymap))) (set-keymap-parent map helm-map) (define-key map (kbd "C-]") 'helm-ff-run-toggle-basename) (define-key map (kbd "C-s") 'helm-ff-run-grep) diff --git a/helm-man.el b/helm-man.el index cf075076..bb8790f1 100644 --- a/helm-man.el +++ b/helm-man.el @@ -17,7 +17,7 @@ ;;; Code: -(eval-when-compile (require 'cl)) +(require 'cl-lib) (require 'helm) (declare-function woman-file-name-all-completions "woman.el" (topic)) diff --git a/helm-match-plugin.el b/helm-match-plugin.el index 369893d2..0e21ca0a 100644 --- a/helm-match-plugin.el +++ b/helm-match-plugin.el @@ -24,7 +24,7 @@ ;;; Code: (require 'helm) -(require 'cl) +(require 'cl-lib) ;;;; Match-plugin @@ -329,7 +329,7 @@ Same as `helm-mp-3-match' but more strict, matching against prefix also. e.g \"bar foo\" will match \"barfoo\" but not \"foobar\" contrarily to `helm-mp-3-match'." (let* ((pat (helm-mp-3-get-patterns (or pattern helm-pattern))) - (cl-first (car pat))) + (first (car pat))) (and (funcall (car first) (helm-mp-prefix-match str (cdr first))) (cl-loop for (predicate . regexp) in (cdr pat) always (funcall predicate (string-match regexp str)))))) diff --git a/helm-misc.el b/helm-misc.el index a65a8264..ba42ac90 100644 --- a/helm-misc.el +++ b/helm-misc.el @@ -16,7 +16,7 @@ ;; along with this program. If not, see <http://www.gnu.org/licenses/>. ;;; Code: -(eval-when-compile (require 'cl)) +(require 'cl-lib) (require 'helm) diff --git a/helm-mode.el b/helm-mode.el index 8f51e21c..09066e2a 100644 --- a/helm-mode.el +++ b/helm-mode.el @@ -17,7 +17,7 @@ ;;; Code: -(eval-when-compile (require 'cl)) +(require 'cl-lib) (require 'helm) (require 'helm-files) @@ -87,7 +87,7 @@ This enable support for `completing-read-multiple' when non--nil." (defvar helm-comp-read-map - (let ((cl-map (make-sparse-keymap))) + (let ((map (make-sparse-keymap))) (set-keymap-parent map helm-map) (define-key map (kbd "<C-return>") 'helm-cr-empty-string) map) @@ -307,7 +307,7 @@ that use `helm-comp-read' See `helm-M-x' for example." (setq must-match 'confirm)) (let* ((minibuffer-completion-confirm must-match) (must-match-map (when must-match - (let ((cl-map (make-sparse-keymap))) + (let ((map (make-sparse-keymap))) (define-key map (kbd "RET") 'helm-confirm-and-exit-minibuffer) map))) @@ -705,7 +705,7 @@ Keys description: history nil nil alistp))) (minibuffer-completion-confirm must-match) (must-match-map (when must-match - (let ((cl-map (make-sparse-keymap))) + (let ((map (make-sparse-keymap))) (define-key map (kbd "RET") 'helm-confirm-and-exit-minibuffer) map))) diff --git a/helm-net.el b/helm-net.el index 4ecf8558..9488e6a2 100644 --- a/helm-net.el +++ b/helm-net.el @@ -17,7 +17,7 @@ ;;; Code: -(eval-when-compile (require 'cl)) +(require 'cl-lib) (require 'helm) (require 'url) (require 'xml) diff --git a/helm-org.el b/helm-org.el index 0c309939..2067254f 100644 --- a/helm-org.el +++ b/helm-org.el @@ -16,7 +16,7 @@ ;; along with this program. If not, see <http://www.gnu.org/licenses/>. ;;; Code: -(eval-when-compile (require 'cl)) +(require 'cl-lib) (require 'helm) (require 'helm-plugin) (require 'org) diff --git a/helm-plugin.el b/helm-plugin.el index 2c2bac95..e6235c1e 100644 --- a/helm-plugin.el +++ b/helm-plugin.el @@ -17,7 +17,7 @@ ;;; Code: -(require 'cl) +(require 'cl-lib) (require 'helm) (require 'helm-utils) diff --git a/helm-regexp.el b/helm-regexp.el index 0170c4bb..ebab7a87 100644 --- a/helm-regexp.el +++ b/helm-regexp.el @@ -17,7 +17,7 @@ ;;; Code: -(require 'cl) +(require 'cl-lib) (require 'helm) (require 'helm-utils) @@ -51,7 +51,7 @@ This setting apply also to `helm-source-occur'." (defvar helm-moccur-map - (let ((cl-map (make-sparse-keymap))) + (let ((map (make-sparse-keymap))) (set-keymap-parent map helm-map) (define-key map (kbd "M-<down>") 'helm-goto-next-file) (define-key map (kbd "M-<up>") 'helm-goto-precedent-file) diff --git a/helm-ring.el b/helm-ring.el index c931ece8..a7a79c51 100644 --- a/helm-ring.el +++ b/helm-ring.el @@ -17,7 +17,7 @@ ;;; Code: -(eval-when-compile (require 'cl)) +(require 'cl-lib) (require 'helm) (require 'helm-utils) (require 'helm-elisp) @@ -56,7 +56,7 @@ If nil or zero (disabled), don't truncate candidate, show all." ;; ;; (defvar helm-kill-ring-map - (let ((cl-map (make-sparse-keymap))) + (let ((map (make-sparse-keymap))) (set-keymap-parent map helm-map) (define-key map (kbd "M-y") 'helm-next-line) (define-key map (kbd "M-u") 'helm-previous-line) diff --git a/helm-semantic.el b/helm-semantic.el index db1ad621..1557a4dc 100644 --- a/helm-semantic.el +++ b/helm-semantic.el @@ -22,9 +22,7 @@ ;;; Code: -(eval-when-compile - (require 'cl)) - +(require 'cl-lib) (require 'semantic) (require 'helm-imenu) diff --git a/helm-sys.el b/helm-sys.el index aa52eb12..8cdd0041 100644 --- a/helm-sys.el +++ b/helm-sys.el @@ -17,7 +17,7 @@ ;;; Code: -(eval-when-compile (require 'cl)) +(require 'cl-lib) (require 'helm) (require 'helm-utils) @@ -38,7 +38,7 @@ A format string where %s will be replaced with `frame-width'." ;; (defvar helm-top-sort-fn nil) (defvar helm-top-map - (let ((cl-map (make-sparse-keymap))) + (let ((map (make-sparse-keymap))) (set-keymap-parent map helm-map) (define-key map (kbd "C-c ?") 'helm-top-help) (define-key map (kbd "M-P") 'helm-top-run-sort-by-cpu) diff --git a/helm-tags.el b/helm-tags.el index 609f5759..867eacaa 100644 --- a/helm-tags.el +++ b/helm-tags.el @@ -17,7 +17,7 @@ ;;; Code: -(eval-when-compile (require 'cl)) +(require 'cl-lib) (require 'helm) @@ -38,7 +38,7 @@ Don't search tag file deeply if outside this value." (defvar helm-etags-map - (let ((cl-map (make-sparse-keymap))) + (let ((map (make-sparse-keymap))) (set-keymap-parent map helm-map) (define-key map (kbd "M-<down>") 'helm-goto-next-file) (define-key map (kbd "M-<up>") 'helm-goto-precedent-file) diff --git a/helm-utils.el b/helm-utils.el index ef4264e9..9c92a179 100644 --- a/helm-utils.el +++ b/helm-utils.el @@ -17,7 +17,7 @@ ;;; Code: -(require 'cl) +(require 'cl-lib) (require 'helm) (require 'compile) ; Fixme: Is this needed? (require 'dired) @@ -89,7 +89,7 @@ ARGS is a list of the first N arguments to pass to FUN. The result is a new function which does the same as FUN, except that the first N arguments are fixed at the values with which this function was called." - (lexical-let ((fun fun) (args1 args)) + (let ((fun fun) (args1 args)) (lambda (&rest args2) (apply fun (append args1 args2)))))) (unless (fboundp 'assoc-default) diff --git a/helm-w3m.el b/helm-w3m.el index 8e9f11a0..e03559dd 100644 --- a/helm-w3m.el +++ b/helm-w3m.el @@ -17,7 +17,7 @@ ;;; Code: -(eval-when-compile (require 'cl)) +(require 'cl-lib) (require 'helm) (require 'helm-utils) (require 'helm-adaptative) diff --git a/helm-yaoddmuse.el b/helm-yaoddmuse.el index c4e28b2f..4810d359 100644 --- a/helm-yaoddmuse.el +++ b/helm-yaoddmuse.el @@ -17,7 +17,7 @@ ;;; Code: -(eval-when-compile (require 'cl)) +(require 'cl-lib) (require 'helm) (declare-function yaoddmuse-update-pagename "ext:yaoddmuse.el" (&optional unforced)) @@ -28,7 +28,7 @@ ;;; Code: -(require 'cl) +(require 'cl-lib) ;;; Multi keys @@ -68,7 +68,7 @@ See `helm-define-multi-key'." "Return an anonymous multi-key command running FUNCTIONS. Run each function of FUNCTIONS list in turn when called within DELAY seconds." (cl-declare (indent 1)) - (lexical-let ((funs functions) + (let ((funs functions) (iter (cl-gensym "helm-iter-key")) (timeout delay)) (eval (list 'defvar iter nil)) @@ -93,7 +93,7 @@ Run each function of FUNCTIONS list in turn when called within DELAY seconds." (defun helm-iter-list (seq) "Return an iterator object from SEQ." - (lexical-let ((lis seq)) + (let ((lis seq)) (lambda () (let ((elm (car lis))) (setq lis (cdr lis)) @@ -114,7 +114,7 @@ second call within 0.5s run `helm-swap-windows'." ;; ;; (defvar helm-map - (let ((cl-map (make-sparse-keymap))) + (let ((map (make-sparse-keymap))) (set-keymap-parent map minibuffer-local-map) (define-key map (kbd "<down>") 'helm-next-line) (define-key map (kbd "<up>") 'helm-previous-line) @@ -3507,7 +3507,7 @@ See also `helm-sources' docstring." (when buffer (with-current-buffer buffer (let ((start-point (if search-from-end (point-max) (point-min))) - (cl-endp (if search-from-end #'bobp #'eobp)) + (endp (if search-from-end #'bobp #'eobp)) (inhibit-point-motion-hooks t)) (goto-char (1- start-point)) (if (string= pattern "") @@ -3564,7 +3564,7 @@ See also `helm-sources' docstring." always (string-match i part)) (string-match pattern part)))) -(defun helm-initial-candidates-from-candidate-buffer (cl-endp +(defun helm-initial-candidates-from-candidate-buffer (endp get-line-fn limit search-from-end) (delq nil (cl-loop with next-line-fn = @@ -4099,7 +4099,7 @@ visible or invisible in all sources of current helm session" Only useful for debugging." (interactive) (with-helm-window - (lexical-let ((overlays (reverse helm-visible-mark-overlays))) + (let ((overlays (reverse helm-visible-mark-overlays))) (helm-run-after-quit (lambda () (with-output-to-temp-buffer "*helm visible marks*" |