masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-05 11:49:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Failed to require a package is just a message

Browse source
This commit is contained in:
John Wiegley 2015-03-24 22:30:48 -05:00
parent d1e91745b3
commit c850481d06
1 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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