masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-05 03:39:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Require cl-lib and do not use seq functions

Browse source 
cl-lib is also required for a separate call to cl-mapcan.

Fixes https://github.com/jwiegley/use-package/issues/520
This commit is contained in:
Basil L. Contovounesios 2017-11-29 15:47:00 +00:00
parent b7041c0f29
commit 4303a2faf6
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/use-package/use-package.el
View file

@ -41,6 +41,7 @@
(require 'bind-key) (require 'bind-key)
(require 'bytecomp) (require 'bytecomp)
(require 'cl-lib)
(eval-when-compile (require 'cl)) (eval-when-compile (require 'cl))
(eval-when-compile (require 'regexp-opt)) (eval-when-compile (require 'regexp-opt))
@ -1426,7 +1427,7 @@ deferred until the prefix key sequence is pressed."
(or (symbolp k) (or (symbolp k)
(and (listp k) (and (listp k)
(listp (cdr k)) (listp (cdr k))
(seq-every-p #'symbolp k)))) (cl-every #'symbolp k))))
#'(lambda (v) #'(lambda (v)
(or (symbolp v) (functionp v))) (or (symbolp v) (functionp v)))
name label arg)))) name label arg))))
@ -1452,7 +1453,7 @@ deferred until the prefix key sequence is pressed."
(let ((syms (car def)) (let ((syms (car def))
(fun (cdr def))) (fun (cdr def)))
(mapcar (mapcar
#'(lambda (sym) #'(lambda (sym)
`(add-hook (quote ,(intern (format "%s-hook" sym))) `(add-hook (quote ,(intern (format "%s-hook" sym)))
(function ,fun))) (function ,fun)))
(if (symbolp syms) (list syms) syms)))) args)))) (if (symbolp syms) (list syms) syms)))) args))))