[Emacs-diffs] Changes to emacs/lisp/server.el

[Andreas Schwab]

Index: emacs/lisp/server.el
diff -u emacs/lisp/server.el:1.108 emacs/lisp/server.el:1.109
--- emacs/lisp/server.el:1.108  Mon Feb  6 14:33:35 2006
+++ emacs/lisp/server.el        Sat Mar  4 16:06:46 2006
@@ -343,10 +343,14 @@
            (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