[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lib-src/emacsclient.c,v
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] Changes to emacs/lib-src/emacsclient.c,v |
Date: |
Sat, 12 Jan 2008 15:49:49 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Eli Zaretskii <eliz> 08/01/12 15:49:49
Index: emacsclient.c
===================================================================
RCS file: /cvsroot/emacs/emacs/lib-src/emacsclient.c,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -b -r1.118 -r1.119
--- emacsclient.c 9 Jan 2008 04:40:05 -0000 1.118
+++ emacsclient.c 12 Jan 2008 15:49:48 -0000 1.119
@@ -170,7 +170,9 @@
{ "socket-name", required_argument, NULL, 's' },
#endif
{ "server-file", required_argument, NULL, 'f' },
+#ifndef WINDOWSNT
{ "display", required_argument, NULL, 'd' },
+#endif
{ 0, 0, 0, 0 }
};
@@ -477,9 +479,11 @@
char **argv;
{
alternate_editor = egetenv ("ALTERNATE_EDITOR");
+#ifndef WINDOWSNT
display = egetenv ("DISPLAY");
if (display && strlen (display) == 0)
display = NULL;
+#endif
while (1)
{
@@ -515,9 +519,11 @@
server_file = optarg;
break;
+#ifndef WINDOWSNT
case 'd':
display = optarg;
break;
+#endif
case 'n':
nowait = 1;
@@ -594,8 +600,10 @@
-c, --create-frame Create a new frame instead of trying to\n\
use the current Emacs frame\n\
-e, --eval Evaluate the FILE arguments as ELisp expressions\n\
--n, --no-wait Don't wait for the server to return\n\
--d, --display=DISPLAY Visit the file in the given display\n"
+-n, --no-wait Don't wait for the server to return\n"
+#ifndef WINDOWSNT
+"-d, --display=DISPLAY Visit the file in the given display\n"
+#endif
#ifndef NO_SOCKETS_IN_FILE_SYSTEM
"-s, --socket-name=FILENAME\n\
Set filename of the UNIX socket for communication\n"
- [Emacs-diffs] Changes to emacs/lib-src/emacsclient.c,v, Miles Bader, 2008/01/08
- [Emacs-diffs] Changes to emacs/lib-src/emacsclient.c,v, Glenn Morris, 2008/01/08
- [Emacs-diffs] Changes to emacs/lib-src/emacsclient.c,v, Glenn Morris, 2008/01/08
- [Emacs-diffs] Changes to emacs/lib-src/emacsclient.c,v,
Eli Zaretskii <=
- [Emacs-diffs] Changes to emacs/lib-src/emacsclient.c,v, Juanma Barranquero, 2008/01/25
- [Emacs-diffs] Changes to emacs/lib-src/emacsclient.c,v, Stefan Monnier, 2008/01/26