diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2007-08-06 06:50:09 +0000 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2007-08-06 06:50:09 +0000 |
| commit | 227eb7449791678de9fe23c948fb7a7f13776549 (patch) | |
| tree | 68348b63981eb3285e223a3f5e6188e789861ceb /lisp | |
| parent | 570288ee6c79ff2c79d39ecb17f0e38fb37a7b7d (diff) | |
| download | emacs-227eb7449791678de9fe23c948fb7a7f13776549.tar.gz | |
* net/ange-ftp.el (ange-ftp-hook-function): Catch also errors in
process-filter.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/net/ange-ftp.el | 7 |
2 files changed, 11 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 70fbba60737..879d9646e04 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2007-08-06 Michael Albinus <michael.albinus@gmx.de> + + * net/ange-ftp.el (ange-ftp-hook-function): Catch also errors in + process-filter. + 2007-08-06 Kenichi Handa <handa@m17n.org> * international/quail.el: Wrap (require 'help-mode) by diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el index fd7f0682622..c3d27d3d124 100644 --- a/lisp/net/ange-ftp.el +++ b/lisp/net/ange-ftp.el @@ -4285,7 +4285,12 @@ NEWNAME should be the name to give the new compressed or uncompressed file.") ;;;###autoload (defun ange-ftp-hook-function (operation &rest args) (let ((fn (get operation 'ange-ftp))) - (if fn (save-match-data (apply fn args)) + (if fn + ;; Catch also errors in process-filter. + (condition-case err + (let ((debug-on-error t)) + (save-match-data (apply fn args))) + (error (error (error-message-string err)))) (ange-ftp-run-real-handler operation args)))) ;; The following code is commented out because Tramp now deals with |