[Emacs-diffs] Changes to emacs/lib-src/emacsclient.c,v

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        08/01/26 21:27:39

Index: emacsclient.c
===================================================================
RCS file: /sources/emacs/emacs/lib-src/emacsclient.c,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -b -r1.120 -r1.121
--- emacsclient.c       25 Jan 2008 15:43:38 -0000      1.120
+++ emacsclient.c       26 Jan 2008 21:27:38 -0000      1.121
@@ -479,10 +479,14 @@
      char **argv;
 {
   alternate_editor = egetenv ("ALTERNATE_EDITOR");
-#ifndef WINDOWSNT
+
+  /* We used to set `display' to $DISPLAY by default, but this changed the
+     default behavior and is sometimes inconvenient.  So instead of forcing
+     users to say "--display ''" when they want to use Emacs's existing tty
+     or display connection, we force them to use "--display $DISPLAY" if
+     they want Emacs to connect to their current display.  */
+#if 0
   display = egetenv ("DISPLAY");
-  if (display && strlen (display) == 0)
-    display = NULL;
 #endif
 
   while (1)
@@ -519,7 +523,11 @@
          server_file = optarg;
          break;
 
-#ifndef WINDOWSNT
+         /* We used to disallow this argument in w32, but it seems better
+            to allow it, for the occasional case where the user is
+            connecting with a w32 client to a server compiled with X11
+            support.  */
+#if 1 /* !defined WINDOWS */
        case 'd':
          display = optarg;
          break;
@@ -558,6 +566,9 @@
        }
     }
 
+  if (display && strlen (display) == 0)
+    display = NULL;
+
   if (!tty && display)
     window_system = 1;
 #if !defined (WINDOWSNT) && !defined (HAVE_CARBON)