# HG changeset patch
# User Michael Albinus <michael.albinus@gmx.de>
# Date 1186383451 0
# Node ID 5f8e4804505c3c6af1e9f00403452ed76394adb8
# Parent  0b78d96e9e7a987bf20f8fbf51bd7a6835381909
* net/ange-ftp.el (ange-ftp-hook-function): Catch also errors in
process-filter.

diff -r 0b78d96e9e7a -r 5f8e4804505c lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Aug 06 06:53:40 2007 +0000
+++ b/lisp/ChangeLog	Mon Aug 06 06:57:31 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  Martin Rudalics  <rudalics@gmx.at>
 
 	* help.el (resize-temp-buffer-window): Use window-full-width-p
diff -r 0b78d96e9e7a -r 5f8e4804505c lisp/net/ange-ftp.el
--- a/lisp/net/ange-ftp.el	Mon Aug 06 06:53:40 2007 +0000
+++ b/lisp/net/ange-ftp.el	Mon Aug 06 06:57:31 2007 +0000
@@ -4274,7 +4274,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