aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2007-08-06 06:57:31 +0000
committerMichael Albinus2007-08-06 06:57:31 +0000
commit5bc880a47d90e1d140eb43c6037e628a06f127c7 (patch)
tree17c62a2d51180ba6b51b90ba78dec30c6c1394b2
parent8f06e122c551781a5fb5fc43819386383c9a9a84 (diff)
downloademacs-5bc880a47d90e1d140eb43c6037e628a06f127c7.tar.gz
emacs-5bc880a47d90e1d140eb43c6037e628a06f127c7.zip
* net/ange-ftp.el (ange-ftp-hook-function): Catch also errors in
process-filter.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/net/ange-ftp.el7
2 files changed, 11 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 39c2cd1fdcf..0f94bcb9f1d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12007-08-06 Michael Albinus <michael.albinus@gmx.de>
2
3 * net/ange-ftp.el (ange-ftp-hook-function): Catch also errors in
4 process-filter.
5
12007-08-06 Martin Rudalics <rudalics@gmx.at> 62007-08-06 Martin Rudalics <rudalics@gmx.at>
2 7
3 * help.el (resize-temp-buffer-window): Use window-full-width-p 8 * 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.")
4274;;;###autoload 4274;;;###autoload
4275(defun ange-ftp-hook-function (operation &rest args) 4275(defun ange-ftp-hook-function (operation &rest args)
4276 (let ((fn (get operation 'ange-ftp))) 4276 (let ((fn (get operation 'ange-ftp)))
4277 (if fn (save-match-data (apply fn args)) 4277 (if fn
4278 ;; Catch also errors in process-filter.
4279 (condition-case err
4280 (let ((debug-on-error t))
4281 (save-match-data (apply fn args)))
4282 (error (error (error-message-string err))))
4278 (ange-ftp-run-real-handler operation args)))) 4283 (ange-ftp-run-real-handler operation args))))
4279 4284
4280;; The following code is commented out because Tramp now deals with 4285;; The following code is commented out because Tramp now deals with