[Emacs-diffs] emacs/lib-src emacsclient.c ChangeLog

[Adrian Robert]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Adrian Robert <arobert> 09/01/23 09:08:03

Modified files:
        lib-src        : emacsclient.c ChangeLog 

Log message:
        * emacsclient.c (decode_options): Use a dummy display name under 
NS/Cocoa.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lib-src/emacsclient.c?cvsroot=emacs&r1=1.153&r2=1.154
http://cvs.savannah.gnu.org/viewcvs/emacs/lib-src/ChangeLog?cvsroot=emacs&r1=2.516&r2=2.517

Patches:
Index: emacsclient.c
===================================================================
RCS file: /sources/emacs/emacs/lib-src/emacsclient.c,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -b -r1.153 -r1.154
--- emacsclient.c       8 Jan 2009 03:38:51 -0000       1.153
+++ emacsclient.c       23 Jan 2009 09:08:03 -0000      1.154
@@ -574,7 +574,15 @@
      inconvenient.  So we force users to use "--display $DISPLAY" if
      they want Emacs to connect to their current display.  */
   if (!current_frame && !tty && !display)
+    {
     display = egetenv ("DISPLAY");
+#ifdef NS_IMPL_COCOA
+      /* Under Cocoa, we don't really use displays the same way as in X,
+         so provide a dummy. */
+      if (!display || strlen (display) == 0)
+        display = "ns";
+#endif
+    }
 
   /* A null-string display is invalid.  */
   if (display && strlen (display) == 0)

Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lib-src/ChangeLog,v
retrieving revision 2.516
retrieving revision 2.517
diff -u -b -r2.516 -r2.517
--- ChangeLog   14 Jan 2009 13:41:04 -0000      2.516
+++ ChangeLog   23 Jan 2009 09:08:03 -0000      2.517
@@ -1,3 +1,8 @@
+2009-01-23  Adrian Robert  <address@hidden>
+
+       * emacsclient.c (decode_options): Use a dummy display name under
+       NS/Cocoa.
+
 2009-01-14  Lars Rasmusson  <address@hidden>  (tiny change)
 
        * ebrowse.c (matching_regexp): Fix OB1 error.