masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-06 12:19:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Minor fix to :diminish

Browse source
This commit is contained in:
John Wiegley 2015-03-24 21:59:10 -05:00
parent c3a4b03b5f
commit d1e91745b3
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -919,9 +919,10 @@ deferred until the prefix key sequence is pressed."
(let ((body (use-package-process-keywords name-symbol rest state))) (let ((body (use-package-process-keywords name-symbol rest state)))
(use-package-concat (use-package-concat
(mapcar #'(lambda (var) (mapcar #'(lambda (var)
(if (consp var) `(if (fboundp 'diminish)
,(if (consp var)
`(diminish ',(car var) ,(cdr var)) `(diminish ',(car var) ,(cdr var))
`(diminish ',var))) `(diminish ',var))))
arg) arg)
body))) body)))
@ -1024,11 +1025,11 @@ this file. Usage:
,@(mapcar #'(lambda (var) `(defvar ,var)) ,@(mapcar #'(lambda (var) `(defvar ,var))
(plist-get args* :defines)) (plist-get args* :defines))
(with-demoted-errors (with-demoted-errors
,(format "Error loading %s: %%S" name-symbol) ,(format "Cannot load %s: %%S" name-symbol)
,(if use-package-verbose ,(if use-package-verbose
`(message "Compiling package %s" ',name-symbol)) `(message "Compiling package %s" ',name-symbol))
,(unless (plist-get args* :no-require) ,(unless (plist-get args* :no-require)
`(require ',name-symbol nil t))))))) `(require ',name-symbol)))))))
(let ((body (let ((body
(macroexp-progn (macroexp-progn