diff options
| author | Masatake YAMATO | 2004-10-08 15:50:59 +0000 |
|---|---|---|
| committer | Masatake YAMATO | 2004-10-08 15:50:59 +0000 |
| commit | 9afed9b1fa5aa59623def395f6229e177e0810d0 (patch) | |
| tree | b49f88efa8a5e593defeebc42dda9f09c41fa70d | |
| parent | 7ff2aa3963ec6a11d1789090aea6b0aba763a302 (diff) | |
| download | emacs-9afed9b1fa5aa59623def395f6229e177e0810d0.tar.gz emacs-9afed9b1fa5aa59623def395f6229e177e0810d0.zip | |
(server-process-filter): Wrap `process-send-region'
by `condition-case' to guard the case when the pipe to PROC is
closed.
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/server.el | 6 |
2 files changed, 11 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e67c4f1b5da..236993fd00b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2004-10-09 Masatake YAMATO <jet@gyve.org> | ||
| 2 | |||
| 3 | * server.el (server-process-filter): Wrap `process-send-region' | ||
| 4 | by `condition-case' to guard the case when the pipe to PROC is | ||
| 5 | closed. | ||
| 6 | |||
| 1 | 2004-10-07 Mark A. Hershberger <mah@everybody.org> | 7 | 2004-10-07 Mark A. Hershberger <mah@everybody.org> |
| 2 | 8 | ||
| 3 | * xml.el (xml-substitute-special): Limit handling of external | 9 | * xml.el (xml-substitute-special): Limit handling of external |
diff --git a/lisp/server.el b/lisp/server.el index fe2fc0f59f4..3a330f07a3c 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\"." | |||
| 343 | (with-temp-buffer | 343 | (with-temp-buffer |
| 344 | (let ((standard-output (current-buffer))) | 344 | (let ((standard-output (current-buffer))) |
| 345 | (pp v) | 345 | (pp v) |
| 346 | (process-send-region proc (point-min) (point-max)))))) | 346 | ;; Suppress the error rose when the pipe to PROC is closed. |
| 347 | (condition-case err | ||
| 348 | (process-send-region proc (point-min) (point-max)) | ||
| 349 | (file-error nil)) | ||
| 350 | )))) | ||
| 347 | ;; ARG is a file name. | 351 | ;; ARG is a file name. |
| 348 | ;; Collapse multiple slashes to single slashes. | 352 | ;; Collapse multiple slashes to single slashes. |
| 349 | (setq arg (command-line-normalize-file-name arg)) | 353 | (setq arg (command-line-normalize-file-name arg)) |