diff options
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/checkdoc.el | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/package.el | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/radix-tree.el | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/thunk.el | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/lisp/emacs-lisp/checkdoc.el b/lisp/emacs-lisp/checkdoc.el index 59b7831fb58..300a3908c14 100644 --- a/lisp/emacs-lisp/checkdoc.el +++ b/lisp/emacs-lisp/checkdoc.el @@ -171,7 +171,7 @@ (defvar checkdoc-version "0.6.1" "Release version of checkdoc you are currently running.") -(eval-when-compile (require 'cl-lib)) +(require 'cl-lib) (require 'help-mode) ;; for help-xref-info-regexp (require 'thingatpt) ;; for handy thing-at-point-looking-at diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 1edc06d024d..67533679b99 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -143,8 +143,8 @@ ;;; Code: +(require 'cl-lib) (eval-when-compile (require 'subr-x)) -(eval-when-compile (require 'cl-lib)) (eval-when-compile (require 'epg)) ;For setf accessors. (require 'seq) diff --git a/lisp/emacs-lisp/radix-tree.el b/lisp/emacs-lisp/radix-tree.el index 8946560d3ba..e3c5800efb1 100644 --- a/lisp/emacs-lisp/radix-tree.el +++ b/lisp/emacs-lisp/radix-tree.el @@ -235,6 +235,8 @@ PREFIX is only used internally." (radix-tree-iter-mappings tree (lambda (_k _v) (setq i (1+ i)))) i)) +(declare-function map-apply "map" (function map)) + (defun radix-tree-from-map (map) ;; Aka (cl-defmethod map-into (map (type (eql radix-tree)))) ...) (require 'map) diff --git a/lisp/emacs-lisp/thunk.el b/lisp/emacs-lisp/thunk.el index bbdd7d61f6c..823d4960aa0 100644 --- a/lisp/emacs-lisp/thunk.el +++ b/lisp/emacs-lisp/thunk.el @@ -48,7 +48,7 @@ ;;; Code: -(eval-when-compile (require 'cl-macs)) +(require 'cl-lib) (defmacro thunk-delay (&rest body) "Delay the evaluation of BODY." |