diff options
| -rw-r--r-- | lisp/emacs-lisp/package.el | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index b3f1f2fc759..cf1509947bd 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el | |||
| @@ -1896,10 +1896,8 @@ Otherwise return nil." | |||
| 1896 | (when str | 1896 | (when str |
| 1897 | (when (string-match "\\`[ \t]*[$]Revision:[ \t]+" str) | 1897 | (when (string-match "\\`[ \t]*[$]Revision:[ \t]+" str) |
| 1898 | (setq str (substring str (match-end 0)))) | 1898 | (setq str (substring str (match-end 0)))) |
| 1899 | (condition-case nil | 1899 | (ignore-errors |
| 1900 | (if (version-to-list str) | 1900 | (if (version-to-list str) str)))) |
| 1901 | str) | ||
| 1902 | (error nil)))) | ||
| 1903 | 1901 | ||
| 1904 | (declare-function lm-homepage "lisp-mnt" (&optional file)) | 1902 | (declare-function lm-homepage "lisp-mnt" (&optional file)) |
| 1905 | 1903 | ||
| @@ -2998,9 +2996,11 @@ objects removed." | |||
| 2998 | (redisplay 'force) | 2996 | (redisplay 'force) |
| 2999 | (dolist (elt (package--sort-by-dependence delete-list)) | 2997 | (dolist (elt (package--sort-by-dependence delete-list)) |
| 3000 | (condition-case-unless-debug err | 2998 | (condition-case-unless-debug err |
| 3001 | (let ((inhibit-message t)) | 2999 | (let ((inhibit-message package-menu-async)) |
| 3002 | (package-delete elt nil 'nosave)) | 3000 | (package-delete elt nil 'nosave)) |
| 3003 | (error (message (cadr err)))))))) | 3001 | (error (message "Error trying to delete `%s': %S" |
| 3002 | (package-desc-full-name elt) | ||
| 3003 | err))))))) | ||
| 3004 | 3004 | ||
| 3005 | (defun package--update-selected-packages (add remove) | 3005 | (defun package--update-selected-packages (add remove) |
| 3006 | "Update the `package-selected-packages' list according to ADD and REMOVE. | 3006 | "Update the `package-selected-packages' list according to ADD and REMOVE. |