Commit f87eff57 authored by Sam Steingold's avatar Sam Steingold

Fix the `with-demoted-errors' calls

* lisp/emacs-lisp/package.el (package-activate-1): Fix the
`with-demoted-errors' calls: the first argument must be a string literal.
parent 0f765f45
......@@ -2,6 +2,8 @@
* emacs-lisp/package.el: Avoid compilation warning by declaring
the `find-library-name' function.
(package-activate-1): Fix the `with-demoted-errors' calls:
the first argument must be a string literal.
2014-12-18 Martin Rudalics <rudalics@gmx.at>
......
......@@ -532,7 +532,7 @@ correspond to previously loaded files (those returned by
(autoloads-file (expand-file-name
(format "%s-autoloads" name) pkg-dir))
(loaded-files-list (and reload (package--list-loaded-files pkg-dir))))
(with-demoted-errors (format "Error loading %s: %%s" name)
(with-demoted-errors "Error in package-activate-1: %s"
(load autoloads-file nil t))
(when (and (eq old-lp load-path)
(not (or (member pkg-dir load-path)
......@@ -545,7 +545,7 @@ correspond to previously loaded files (those returned by
;; to their new definitions. If another package is being installed which
;; depends on this new definition, not doing this update would cause
;; compilation errors and break the installation.
(with-demoted-errors (format "Error loading %s: %%s" name)
(with-demoted-errors "Error in package-activate-1: %s"
(mapc (lambda (feature) (load feature nil t))
;; Skip autoloads file since we already evaluated it above.
(remove (file-truename autoloads-file) loaded-files-list))))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment