mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-24 07:20:37 +00:00
Code Issues Releases Activity

(server-process-filter): Handle errors during

Browse Source 
evaluation of the argument.
This commit is contained in:
Andreas Schwab 2006-03-04 16:07:12 +00:00
parent da92726901
commit c6ce06a6d8
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/ChangeLog
View File

@ -1,3 +1,8 @@
2006-03-04 Andreas Schwab <schwab@suse.de>
* server.el (server-process-filter): Handle errors during
evaluation of the argument.
2006-03-03 John Paul Wallington <jpw@pobox.com>
* t-mouse.el (t-mouse-drag-start, t-mouse-swap-alt-keys): Doc fix;

6
lisp/server.el
View File

@ -343,10 +343,14 @@ PROC is the server process. Format of STRING is \"PATH PATH PATH... \\n\"."
(if coding-system
(setq arg (decode-coding-string arg coding-system)))
(if eval
(let ((v (eval (car (read-from-string arg)))))
(let* (errorp
(v (condition-case errobj
(eval (car (read-from-string arg)))
(error (setq errorp t) errobj))))
(when v
(with-temp-buffer
(let ((standard-output (current-buffer)))
(if errorp (princ "error: "))
(pp v)
;; Suppress the error rose when the pipe to PROC is closed.
(condition-case err