From f87eff571ab7ca477e4b8ccb68a2eb306426f11e Mon Sep 17 00:00:00 2001 From: Sam Steingold Date: Thu, 18 Dec 2014 15:24:39 -0500 Subject: [PATCH] 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. --- lisp/ChangeLog | 2 ++ lisp/emacs-lisp/package.el | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d1d866b1d5e..8978bde017d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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 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)))) -- 2.39.2