* net/ange-ftp.el (ange-ftp-hook-function): Catch also errors in

process-filter.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 70fbba60737c3698749587b9bbb1be00a19505e0..879d9646e04cc4c778e667d5d94f874cbcbef88e 100644 (file)
--- 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 fd7f068262244043c01dd6121cc084aa35d6f601..c3d27d3d12496818423d3c56cdc37b1224676d90 100644 (file)
--- 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