diff options
| author | Sam Steingold <sds@gnu.org> | 2014-12-18 15:24:39 -0500 |
|---|---|---|
| committer | Sam Steingold <sds@gnu.org> | 2014-12-18 15:24:39 -0500 |
| commit | f87eff571ab7ca477e4b8ccb68a2eb306426f11e (patch) | |
| tree | 9fdf6a854ebd72e5560cd087da9438a7308003db /lisp/emacs-lisp | |
| parent | 0f765f454dd4278a529e247598a3da50f551cf0c (diff) | |
| download | emacs-f87eff571ab7ca477e4b8ccb68a2eb306426f11e.tar.gz emacs-f87eff571ab7ca477e4b8ccb68a2eb306426f11e.tar.bz2 emacs-f87eff571ab7ca477e4b8ccb68a2eb306426f11e.zip | |
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.
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/package.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index c25c29a89cb..80b7670c1f0 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -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)))) |