Failed to require a package is just a message

This commit is contained in:
John Wiegley 2015-03-24 22:30:48 -05:00
parent d1e91745b3
commit c850481d06

View file

@ -671,7 +671,7 @@ function for a particular keymap. The keymap is expected to be
defined by the package. In this way, loading the package is
deferred until the prefix key sequence is pressed."
(if (not (require package nil t))
(error "Could not load package %s" package)
(use-package-error (format "Could not load package.el: %s" package))
(if (and (boundp keymap-symbol)
(keymapp (symbol-value keymap-symbol)))
(let ((key (key-description (this-command-keys-vector)))
@ -682,8 +682,9 @@ deferred until the prefix key sequence is pressed."
(bind-key key keymap))
(setq unread-command-events
(listify-key-sequence (this-command-keys-vector))))
(error "use-package: package %s failed to define keymap %s"
package keymap-symbol))))
(use-package-error
(format "use-package: package.el %s failed to define keymap %s"
package keymap-symbol)))))
(defun use-package-handler/:bind-keymap
(name-symbol keyword arg rest state &optional override)
@ -882,10 +883,7 @@ deferred until the prefix key sequence is pressed."
config-body)
`((if (not (require ',name-symbol nil t))
(ignore
(display-warning
'use-package
(format "Could not load %s" ',name-symbol)
:error))
(message (format "Could not load %s" ',name-symbol)))
,@config-body)))))))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;