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

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        07/12/10 03:51:26

Index: server.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/server.el,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -b -r1.153 -r1.154
--- server.el   23 Nov 2007 23:59:19 -0000      1.153
+++ server.el   10 Dec 2007 03:51:25 -0000      1.154
@@ -242,8 +242,7 @@
   "Delete PROC, including its buffers, terminals and frames.
 If NOFRAME is non-nil, let the frames live.  (To be used from
 `delete-frame-functions'.)"
-  (server-log (concat "server-delete-client" (if noframe " noframe"))
-             proc)
+  (server-log (concat "server-delete-client" (if noframe " noframe")) proc)
   ;; Force a new lookup of client (prevents infinite recursion).
   (when (memq proc server-clients)
     (let ((buffers (process-get proc 'buffers)))
@@ -339,7 +338,7 @@
                      display
                      ;; Make it display (and remember) some dummy buffer, so
                      ;; we can detect later if the frame is in use or not.
-                     `((server-dummmy-buffer . ,buffer)
+                     `((server-dummy-buffer . ,buffer)
                        ;; This frame may be deleted later (see
                        ;; server-unselect-display) so we want it to be as
                        ;; unobtrusive as possible.
@@ -833,7 +832,8 @@
                 ;; -display DISPLAY:
                 ;; Open X frames on the given display instead of the default.
                 ((and (equal "-display" arg) command-line-args-left)
-                 (setq display (pop command-line-args-left)))
+                 (setq display (pop command-line-args-left))
+                  (if (zerop (length display)) (setq display nil)))
 
                 ;; -window-system:  Open a new X frame.
                 ((equal "-window-system" arg)