Support diminishing to a replacement string as well as to nothing

`diminish' accepts an optional second argument, a replacement string. This change supports all the following arguments to ':diminish':

* package
* (package . "pkg")
* (package1 package2)
* ((package1 . "p1") (package2 . "p2))

The second and fourth formats are new with this change.

diff --git a/lisp/use-package/use-package.el b/lisp/use-package/use-package.el
index 26b388432a3d5387487b0396493881293c6db63f..f9bc5c2b32ecf2938bf4743571ab55d7838b50f3 100644 (file)
--- a/lisp/use-package/use-package.el
+++ b/lisp/use-package/use-package.el
@@ -193,7 +193,7 @@
 ;; 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
 ;; 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
 ;;     :diminish abbrev-mode
@@ -348,8 +348,14 @@
                    ,config-body
                    (ignore-errors
                      ,@(if (listp diminish-var)
-                           (mapcar (lambda (var) `(diminish (quote ,var)))
-                                   diminish-var)
+                           (if (listp (cdr diminish-var))
+                               (mapcar (lambda (var)
+                                           (if (listp var)
+                                               `(diminish (quote ,(car var)) ,(cdr var))
+                                               `(diminish (quote ,var))))
+                                diminish-var)
+                               `((diminish (quote ,(car diminish-var)) ,(cdr diminish-var)))
+                           )
                          `((diminish (quote ,diminish-var))))))))
 
       (if (and commands (symbolp commands))