Mercurial > emacs
changeset 82286:e0397e15d9bc
* net/ange-ftp.el (ange-ftp-hook-function): Catch also errors in
process-filter.
| author | Michael Albinus <michael.albinus@gmx.de> |
|---|---|
| date | Mon, 06 Aug 2007 06:50:09 +0000 |
| parents | e6a22becd0a3 |
| children | f2f7731c3eed |
| files | lisp/ChangeLog lisp/net/ange-ftp.el |
| diffstat | 2 files changed, 11 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Mon Aug 06 01:03:00 2007 +0000 +++ b/lisp/ChangeLog Mon Aug 06 06:50:09 2007 +0000 @@ -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
--- a/lisp/net/ange-ftp.el Mon Aug 06 01:03:00 2007 +0000 +++ b/lisp/net/ange-ftp.el Mon Aug 06 06:50:09 2007 +0000 @@ -4285,7 +4285,12 @@ ;;;###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