From d1e91745b37aea1559667a4453abd8b083c1b9cf Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Tue, 24 Mar 2015 21:59:10 -0500 Subject: [PATCH] Minor fix to :diminish --- lisp/use-package/use-package.el | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) 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 -- 2.39.2