diff options
| author | Chong Yidong | 2011-03-08 12:11:19 -0500 |
|---|---|---|
| committer | Chong Yidong | 2011-03-08 12:11:19 -0500 |
| commit | 515de2e32145b54e9ccf5cc8f74f1773e9652041 (patch) | |
| tree | 3c5140c60e80032d0d23f5896a0793492306e914 | |
| parent | a50575464256f7d77914548c520255e72950803c (diff) | |
| download | emacs-515de2e32145b54e9ccf5cc8f74f1773e9652041.tar.gz emacs-515de2e32145b54e9ccf5cc8f74f1773e9652041.zip | |
Use condition-case-no-debug in package.el.
* lisp/emacs-lisp/package.el (package-refresh-contents)
(package-menu-execute): Use condition-case-no-debug.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/emacs-lisp/package.el | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ca21c9ebf2c..7963e3432cb 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2011-03-08 Chong Yidong <cyd@stupidchicken.com> | ||
| 2 | |||
| 3 | * emacs-lisp/package.el (package-refresh-contents) | ||
| 4 | (package-menu-execute): Use condition-case-no-debug. | ||
| 5 | |||
| 1 | 2011-03-08 Michael Albinus <michael.albinus@gmx.de> | 6 | 2011-03-08 Michael Albinus <michael.albinus@gmx.de> |
| 2 | 7 | ||
| 3 | * simple.el (shell-command-to-string): Use `process-file'. | 8 | * simple.el (shell-command-to-string): Use `process-file'. |
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 397feb45633..d90164b5a95 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el | |||
| @@ -1040,7 +1040,7 @@ makes them available for download." | |||
| 1040 | (unless (file-exists-p package-user-dir) | 1040 | (unless (file-exists-p package-user-dir) |
| 1041 | (make-directory package-user-dir t)) | 1041 | (make-directory package-user-dir t)) |
| 1042 | (dolist (archive package-archives) | 1042 | (dolist (archive package-archives) |
| 1043 | (condition-case nil | 1043 | (condition-case-no-debug nil |
| 1044 | (package--download-one-archive archive "archive-contents") | 1044 | (package--download-one-archive archive "archive-contents") |
| 1045 | (error (message "Failed to download `%s' archive." | 1045 | (error (message "Failed to download `%s' archive." |
| 1046 | (car archive))))) | 1046 | (car archive))))) |
| @@ -1468,7 +1468,7 @@ packages marked for deletion are removed." | |||
| 1468 | delete-list | 1468 | delete-list |
| 1469 | ", ")))) | 1469 | ", ")))) |
| 1470 | (dolist (elt delete-list) | 1470 | (dolist (elt delete-list) |
| 1471 | (condition-case err | 1471 | (condition-case-no-debug err |
| 1472 | (package-delete (car elt) (cdr elt)) | 1472 | (package-delete (car elt) (cdr elt)) |
| 1473 | (error (message (cadr err))))) | 1473 | (error (message (cadr err))))) |
| 1474 | (error "Aborted"))) | 1474 | (error "Aborted"))) |