aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasatake YAMATO2004-12-30 23:14:25 +0000
committerMasatake YAMATO2004-12-30 23:14:25 +0000
commit51b4073ade4cbbec9913ce55abc0f2739597edbe (patch)
treefa248ae4706e20299d1774af769570351182217e
parent0c753fd78fa910b99acc31affac85cffd7ed83f9 (diff)
downloademacs-51b4073ade4cbbec9913ce55abc0f2739597edbe.tar.gz
emacs-51b4073ade4cbbec9913ce55abc0f2739597edbe.zip
* server.el (server-process-filter): Suppress `error', too.
-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 @@
12004-12-31 Masatake YAMATO <jet@gyve.org>
2
3 * server.el (server-process-filter): Suppress `error', too.
4
12004-12-30 Jay Belanger <belanger@truman.edu> 52004-12-30 Jay Belanger <belanger@truman.edu>
2 6
3 * calc/calc-store.el (calc-copy-variable): Fix mistyped variable 7 * 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\"."
346 ;; Suppress the error rose when the pipe to PROC is closed. 346 ;; Suppress the error rose when the pipe to PROC is closed.
347 (condition-case err 347 (condition-case err
348 (process-send-region proc (point-min) (point-max)) 348 (process-send-region proc (point-min) (point-max))
349 (file-error nil)) 349 (file-error nil)
350 (error nil))
350 )))) 351 ))))
351 ;; ARG is a file name. 352 ;; ARG is a file name.
352 ;; Collapse multiple slashes to single slashes. 353 ;; Collapse multiple slashes to single slashes.