Merge pull request from npostavs/easy-diminish

needed extra layer of nesting for diminish calls
GitHub-reference: https://github.com/jwiegley/use-package/issues/21
This commit is contained in:
John Wiegley 2013-04-16 15:28:37 -07:00
commit ef6b97c29f

View file

@ -457,12 +457,12 @@ For full documentation. please see commentary.
(ignore-errors
,@(cond
((stringp diminish-var)
`(diminish (quote ,(intern (concat name-string "-mode")))
,diminish-var))
`((diminish (quote ,(intern (concat name-string "-mode")))
,diminish-var)))
((symbolp diminish-var)
`(diminish (quote ,diminish-var)))
`((diminish (quote ,diminish-var))))
((and (consp diminish-var) (stringp (cdr diminish-var)))
`(diminish (quote ,(car diminish-var)) ,(cdr diminish-var)))
`((diminish (quote ,(car diminish-var)) ,(cdr diminish-var))))
(t ; list of symbols or (symbol . "string") pairs
(mapcar (lambda (var)
(if (listp var)