From 5bc880a47d90e1d140eb43c6037e628a06f127c7 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Mon, 6 Aug 2007 06:57:31 +0000 Subject: [PATCH] * net/ange-ftp.el (ange-ftp-hook-function): Catch also errors in process-filter. --- lisp/ChangeLog | 5 +++++ lisp/net/ange-ftp.el | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 39c2cd1fdcf..0f94bcb9f1d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2007-08-06 Michael Albinus + + * net/ange-ftp.el (ange-ftp-hook-function): Catch also errors in + process-filter. + 2007-08-06 Martin Rudalics * help.el (resize-temp-buffer-window): Use window-full-width-p diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el index 310442d4012..a05d9126dcd 100644 --- a/lisp/net/ange-ftp.el +++ b/lisp/net/ange-ftp.el @@ -4274,7 +4274,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 -- 2.39.2