[Emacs-diffs] /srv/bzr/emacs/trunk r107973: Fix emacsclient/server behavior under --without-x.

[Chong Yidong]

------------------------------------------------------------
revno: 107973
fixes bug(s): http://debbugs.gnu.org/11102
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Fri 2012-04-20 18:37:57 +0800
message:
  Fix emacsclient/server behavior under --without-x.
  
  * lib-src/emacsclient.c (main): Send -tty to Emacs under more circumstanced 
(Bug#8314).
  
  * lisp/server.el (server-process-filter): Only try to open a window
  system frame if compiled with graphical support (Bug#8314).
modified:
  lib-src/ChangeLog
  lib-src/emacsclient.c
  lisp/ChangeLog
  lisp/server.el

=== modified file 'lib-src/ChangeLog'
--- a/lib-src/ChangeLog 2012-04-20 08:48:50 +0000
+++ b/lib-src/ChangeLog 2012-04-20 10:37:57 +0000
@@ -2,6 +2,7 @@
 
        * emacsclient.c (decode_options): Move -t -n corner case handling
        into server.el (Bug#11102).
+       (main): Send -tty to Emacs under more circumstanced (Bug#8314).
 
 2012-04-18  Paul Eggert  <address@hidden>
 

=== modified file 'lib-src/emacsclient.c'
--- a/lib-src/emacsclient.c     2012-04-15 08:49:24 +0000
+++ b/lib-src/emacsclient.c     2012-04-20 10:37:57 +0000
@@ -1658,10 +1658,10 @@
       send_to_emacs (emacs_socket, " ");
     }
 
-  /* If using the current frame, send tty information to Emacs anyway.
-     In daemon mode, Emacs may need to occupy this tty if no other
-     frame is available.  */
-  if (tty || (current_frame && !eval))
+  /* Unless we are certain we don't want to occupy the tty, send our
+     tty information to Emacs.  For example, in daemon mode Emacs may
+     need to occupy this tty if no other frame is available.  */
+  if (!current_frame || !eval)
     {
       const char *tty_type, *tty_name;
 

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-04-20 10:04:19 +0000
+++ b/lisp/ChangeLog    2012-04-20 10:37:57 +0000
@@ -4,6 +4,8 @@
        is a string and there are no files to open (Bug#2825).
        (server-create-window-system-frame, server-create-tty-frame):
        Don't switch buffers here.
+       (server-process-filter): Only try to open a window system frame if
+       compiled with graphical support (Bug#8314).
 
 2012-04-20  Dan Nicolaescu  <address@hidden>
 

=== modified file 'lisp/server.el'
--- a/lisp/server.el    2012-04-20 10:04:19 +0000
+++ b/lisp/server.el    2012-04-20 10:37:57 +0000
@@ -1076,8 +1076,9 @@
 
                 ;; -window-system:  Open a new X frame.
                 (`"-window-system"
-                 (setq dontkill t)
-                 (setq tty-name 'window-system))
+                (if (fboundp 'x-create-frame)
+                    (setq dontkill t
+                          tty-name 'window-system)))
 
                 ;; -resume:  Resume a suspended tty frame.
                 (`"-resume"
@@ -1105,7 +1106,8 @@
                  (setq dontkill t)
                  (pop args-left))
 
-                ;; -tty DEVICE-NAME TYPE:  Open a new tty frame at the client.
+               ;; -tty DEVICE-NAME TYPE:  Open a new tty frame.
+               ;; (But if we see -window-system later, use that.)
                 (`"-tty"
                  (setq tty-name (pop args-left)
                        tty-type (pop args-left)