Re: emacsclient/server finished, documentation, raising frames

["Juanma Barranquero" <lekktu@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 1452 bytes --]

Discussion has stagnated, but still something should be done.

So this is a little patch to implement what Jason proposed: an option
to choose whether server.el raises the frame or not when switching to
a buffer.

The patch does *not* try to raise the frame in two situations:

  - In the weird "No server buffers remain to edit" case (which, if I
understand the code correctly, only happens as a result of a user
interaction, and not by calling emacsclient, so focus is not an
issue).^(1)

  - When `server-window' is a function. It is trivial to raise the
frame also in this situation (just moving the `(when
server-raise-window ...)' out of the enclosing `if'), but I feel that
it is better this way. If the user wants to raise the frame, he can do
it easily in his function, and if not, doing it ourselves would only
cause him trouble.^(2)

Does anyone oppose to installing this patch and settling the issue for
now? We can always redesign `server-window' and `server-switch-buffer'
after the release, if needed.

                          /L/e/k/t/u


^(1) BTW, I'd like to know the use case that makes this happen. I've
had to trick Emacs into killing a server-edited buffer without
server.el knowing about it to be able to trigger this part of the
code.

^(2) Counterargument: if the user has a `server-window' function and
doesn't want server.el raising the frame, he can set
`server-raise-frame' to nil. So one way or the other is fine by me.

[-- Attachment #2: server.patch --]
[-- Type: application/octet-stream, Size: 2058 bytes --]

Index: lisp/ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.10278
diff -u -2 -r1.10278 ChangeLog
--- lisp/ChangeLog	8 Nov 2006 19:22:33 -0000	1.10278
+++ lisp/ChangeLog	9 Nov 2006 01:18:27 -0000
@@ -1,2 +1,7 @@
+2006-11-09  Juanma Barranquero  <lekktu@gmail.com>
+
+	* server.el (server-raise-frame): New option.
+	(server-switch-buffer): Use it.
+
 2006-11-08  Alan Mackenzie  <acm@muc.de>
 
Index: lisp/server.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/server.el,v
retrieving revision 1.120
diff -u -2 -r1.120 server.el
--- lisp/server.el	7 Nov 2006 10:42:52 -0000	1.120
+++ lisp/server.el	9 Nov 2006 01:18:03 -0000
@@ -113,4 +113,10 @@
 (put 'server-auth-dir 'risky-local-variable t)
 
+(defcustom server-raise-frame t
+  "*If non-nil, raise frame when switching to a buffer."
+  :group 'server
+  :type 'boolean
+  :version "22.1")
+
 (defcustom server-visit-hook nil
   "*Hook run when visiting a file for the Emacs server."
@@ -703,9 +709,7 @@
 	  (if (and win (not server-window))
 	      ;; The buffer is already displayed: just reuse the window.
-	      (let ((frame (window-frame win)))
-		(when (eq (frame-visible-p frame) 'icon)
-		  (raise-frame frame))
-		(select-window win)
-		(set-buffer next-buffer))
+              (progn
+                (select-window win)
+                (set-buffer next-buffer))
 	    ;; Otherwise, let's find an appropriate window.
 	    (cond ((and (windowp server-window)
@@ -731,5 +735,8 @@
 	      ;; After all the above, we might still have ended up with
 	      ;; a minibuffer/dedicated-window (if there's no other).
-	      (error (pop-to-buffer next-buffer)))))))))
+	      (error (pop-to-buffer next-buffer))))
+          (when server-raise-frame
+            (select-frame-set-input-focus (window-frame (selected-window))))
+          )))))
 
 (define-key ctl-x-map "#" 'server-edit)

[-- Attachment #3: Type: text/plain, Size: 142 bytes --]

_______________________________________________
Emacs-devel mailing list
Emacs-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-devel