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

Allow :diminish to take no argument, once again

Browse source
This commit is contained in:
John Wiegley 2017-11-28 16:27:09 -08:00
parent c811637b30
commit 7531c374bf
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -829,10 +829,12 @@ If the package is installed, its entry is removed from
;;; :requires ;;; :requires
;; ;;
(defun use-package-as-one (label args f) (defun use-package-as-one (label args f &optional allow-empty)
"Call F on the first element of ARGS if it has one element, or all of ARGS." "Call F on the first element of ARGS if it has one element, or all of ARGS.
If ALLOW-EMPTY is non-nil, it's OK for ARGS to be an empty list."
(declare (indent 1)) (declare (indent 1))
(if (and (not (null args)) (listp args) (listp (cdr args))) (if (or (and (not (null args)) (listp args) (listp (cdr args)))
(and allow-empty (null args)))
(if (= (length args) 1) (if (= (length args) 1)
(funcall f label (car args)) (funcall f label (car args))
(funcall f label args)) (funcall f label args))
@ -1546,7 +1548,7 @@ deferred until the prefix key sequence is pressed."
(defun use-package-normalize/:diminish (name keyword args) (defun use-package-normalize/:diminish (name keyword args)
(use-package-as-one (symbol-name keyword) args (use-package-as-one (symbol-name keyword) args
(apply-partially #'use-package-normalize-diminish name))) (apply-partially #'use-package-normalize-diminish name) t))
(defun use-package-handler/:diminish (name keyword arg rest state) (defun use-package-handler/:diminish (name keyword arg rest state)
(let ((body (use-package-process-keywords name rest state))) (let ((body (use-package-process-keywords name rest state)))