aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/server.el6
2 files changed, 11 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e67c4f1b5d..236993fd00 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2004-10-09 Masatake YAMATO <[email protected]>
+
+ * server.el (server-process-filter): Wrap `process-send-region'
+ by `condition-case' to guard the case when the pipe to PROC is
+ closed.
+
2004-10-07 Mark A. Hershberger <[email protected]>
* xml.el (xml-substitute-special): Limit handling of external
diff --git a/lisp/server.el b/lisp/server.el
index fe2fc0f59f..3a330f07a3 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -343,7 +343,11 @@ PROC is the server process. Format of STRING is \"PATH PATH PATH... \\n\"."
(with-temp-buffer
(let ((standard-output (current-buffer)))
(pp v)
- (process-send-region proc (point-min) (point-max))))))
+ ;; 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))
+ ))))
;; ARG is a file name.
;; Collapse multiple slashes to single slashes.
(setq arg (command-line-normalize-file-name arg))