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

[Juanma Barranquero]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Juanma Barranquero <lektu>      06/11/02 01:29:42

Index: server.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/server.el,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -b -r1.116 -r1.117
--- server.el   1 Nov 2006 21:37:11 -0000       1.116
+++ server.el   2 Nov 2006 01:29:41 -0000       1.117
@@ -388,6 +388,7 @@
           (process-put proc :authenticated t)
           (server-log "Authentication successful" proc))
       (server-log "Authentication failed" proc)
+      (process-send-string proc "Authentication failed")
       (delete-process proc)
       ;; We return immediately
       (return-from server-process-filter)))
@@ -446,14 +447,10 @@
                  (when v
                    (with-temp-buffer
                      (let ((standard-output (current-buffer)))
-                       (if errorp (princ "error: "))
+                         (when errorp (princ "error: "))
                        (pp v)
-                       ;; Suppress the error signalled when the pipe to
-                       ;; PROC is closed.
-                       (condition-case err
-                           (process-send-region proc (point-min) (point-max))
-                         (file-error nil)
-                         (error nil))
+                         (ignore-errors
+                           (process-send-region proc (point-min) (point-max)))
                        ))))
              ;; ARG is a file name.
              ;; Collapse multiple slashes to single slashes.
@@ -514,10 +511,10 @@
          (if (and obuf (set-buffer obuf))
              (progn
                (cond ((file-exists-p filen)
-                      (if (not (verify-visited-file-modtime obuf))
+                      (when (not (verify-visited-file-modtime obuf))
                           (revert-buffer t nil)))
                      (t
-                      (if (y-or-n-p
+                      (when (y-or-n-p
                            (concat "File no longer exists: "
                                    filen
                                    ", write buffer to file? "))