[Emacs-diffs] /srv/bzr/emacs/trunk r107187: Fix last fix of server-unselect-display

[martin rudalics]

------------------------------------------------------------
revno: 107187
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Wed 2012-02-08 17:48:25 +0100
message:
  Fix last fix of server-unselect-display
modified:
  lisp/server.el

=== modified file 'lisp/server.el'
--- a/lisp/server.el    2012-02-08 14:59:05 +0000
+++ b/lisp/server.el    2012-02-08 16:48:25 +0000
@@ -403,14 +403,14 @@
     ;; Rewritten to avoid inadvertently killing the current buffer after
     ;; `delete-frame' removed FRAME (Bug#10729).
     (let ((buffer (frame-parameter frame 'server-dummy-buffer)))
+      (if (and (one-window-p 'nomini frame)
+              (eq (window-buffer (frame-first-window frame)) buffer))
+         ;; The temp frame still only shows one buffer, and that is the
+         ;; internal temp buffer.
+         (delete-frame frame)
+       (set-frame-parameter frame 'visibility t)
+       (set-frame-parameter frame 'server-dummy-buffer nil))
       (when (buffer-live-p buffer)
-       (if (and (one-window-p 'nomini frame)
-                (eq (window-buffer (frame-first-window frame)) buffer))
-           ;; The temp frame still only shows one buffer, and that is the
-           ;; internal temp buffer.
-           (delete-frame frame)
-         (set-frame-parameter frame 'visibility t)
-         (set-frame-parameter frame 'server-dummy-buffer nil))
        (kill-buffer buffer)))))
 
 (defun server-handle-delete-frame (frame)