From: John Wiegley <johnw@newartisans.com>
Date: Wed, 25 Mar 2015 02:59:10 +0000 (-0500)
Subject: Minor fix to :diminish
X-Git-Tag: emacs-29.0.90~1306^2~15^2~343
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d1e91745b37aea1559667a4453abd8b083c1b9cf;p=emacs.git

Minor fix to :diminish
---

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