From 2c32857d579b76db314627d2bc296779aab400e3 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Tue, 28 Nov 2017 20:26:34 -0800 Subject: [PATCH] Make diminish a soft dependency, as delight already was Fixes https://github.com/jwiegley/use-package/issues/493 --- lisp/use-package/use-package.el | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lisp/use-package/use-package.el b/lisp/use-package/use-package.el index d9ec638474e..7ee7ac0efa2 100644 --- a/lisp/use-package/use-package.el +++ b/lisp/use-package/use-package.el @@ -7,7 +7,7 @@ ;; Created: 17 Jun 2012 ;; Modified: 17 Oct 2016 ;; Version: 2.3 -;; Package-Requires: ((bind-key "1.0") (diminish "0.44")) +;; Package-Requires: ((bind-key "1.0")) ;; Keywords: dotemacs startup speed config package ;; URL: https://github.com/jwiegley/use-package @@ -41,8 +41,6 @@ (require 'bind-key) (require 'bytecomp) -(require 'diminish nil t) -(require 'bytecomp) (eval-when-compile (require 'cl)) (eval-when-compile (require 'regexp-opt)) @@ -1607,7 +1605,8 @@ deferred until the prefix key sequence is pressed." (let ((body (use-package-process-keywords name rest state))) (use-package-concat body - `((delight '(,@args)))))) + `((if (fboundp 'delight) + (delight '(,@args))))))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; -- 2.39.2