Mercurial > emacs
diff lisp/server.el @ 87220:655d101f4e6b
(server-select-display): Fix important typo.
(server-process-filter): Turn a "" display into nil.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Mon, 10 Dec 2007 03:51:25 +0000 |
parents | 2f0cad6a4f81 |
children | cd847b2ba99f 2fcaae6177a5 |
line wrap: on
line diff
--- a/lisp/server.el Mon Dec 10 03:48:05 2007 +0000 +++ b/lisp/server.el Mon Dec 10 03:51:25 2007 +0000 @@ -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)