From: Michael Albinus <michael.albinus@gmx.de>
Date: Mon, 6 Aug 2007 06:57:31 +0000 (+0000)
Subject: * net/ange-ftp.el (ange-ftp-hook-function): Catch also errors in
X-Git-Tag: emacs-pretest-22.1.90~1097
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5bc880a47d90e1d140eb43c6037e628a06f127c7;p=emacs.git

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

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  <michael.albinus@gmx.de>
+
+	* net/ange-ftp.el (ange-ftp-hook-function): Catch also errors in
+	process-filter.
+
 2007-08-06  Martin Rudalics  <rudalics@gmx.at>
 
 	* 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