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

Merge pull request from PhilHudson/master

Browse source 
Support optional diminish replacement string parameter using conses
GitHub-reference: https://github.com/jwiegley/use-package/issues/4
This commit is contained in:
John Wiegley 2012-11-20 17:54:14 -08:00
commit 2a63e3f2ef
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -193,7 +193,7 @@
;; if you have that installed. It's purpose is to remove strings from your ;; if you have that installed. It's purpose is to remove strings from your
;; mode-line that would otherwise always be there and provide no useful ;; mode-line that would otherwise always be there and provide no useful
;; information. It is invoked with the `:diminish' keyword, which is passed ;; information. It is invoked with the `:diminish' keyword, which is passed
;; the minor mode symbol: ;; either the minor mode symbol, or a cons of the symbol and a replacement string:
;; ;;
;; (use-package abbrev ;; (use-package abbrev
;; :diminish abbrev-mode ;; :diminish abbrev-mode
@ -348,8 +348,14 @@
,config-body ,config-body
(ignore-errors (ignore-errors
,@(if (listp diminish-var) ,@(if (listp diminish-var)
(mapcar (lambda (var) `(diminish (quote ,var))) (if (listp (cdr diminish-var))
(mapcar (lambda (var)
(if (listp var)
`(diminish (quote ,(car var)) ,(cdr var))
`(diminish (quote ,var))))
diminish-var) diminish-var)
`((diminish (quote ,(car diminish-var)) ,(cdr diminish-var)))
)
`((diminish (quote ,diminish-var)))))))) `((diminish (quote ,diminish-var))))))))
(if (and commands (symbolp commands)) (if (and commands (symbolp commands))