summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/server.el3
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ad2b0fa9dfc..79e90083295 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-31 Masatake YAMATO <jet@gyve.org>
+
+ * server.el (server-process-filter): Suppress `error', too.
+
2004-12-30 Jay Belanger <belanger@truman.edu>
* calc/calc-store.el (calc-copy-variable): Fix mistyped variable
diff --git a/lisp/server.el b/lisp/server.el
index 534ba9fa09e..2c946b90275 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -346,7 +346,8 @@ PROC is the server process. Format of STRING is \"PATH PATH PATH... \\n\"."
;; Suppress the error rose when the pipe to PROC is closed.
(condition-case err
(process-send-region proc (point-min) (point-max))
- (file-error nil))
+ (file-error nil)
+ (error nil))
))))
;; ARG is a file name.
;; Collapse multiple slashes to single slashes.