Merge from emacs--devo--0

[gnu-emacs] / lib-src / emacsclient.c

diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 8e8cb9b379ad433432511227864933740f42533b..ae7ff12e17d36888c924ccc380f85c0557f3e1a7 100644 (file)
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
@@ -462,7 +462,7 @@ decode_options (argc, argv)
   else
     tty = 1;
 #endif
-  
+
   /* --no-wait implies --current-frame on ttys when there are file
        arguments or expressions given.  */
   if (nowait && tty && argc - optind > 0)
@@ -482,27 +482,32 @@ decode_options (argc, argv)
 void
 print_help_and_exit ()
 {
+  /* Spaces and tabs are significant in this message; they're chosen so the
+     message aligns properly both in a tty and in a Windows message box.
+     Please try to preserve them; otherwise the output is very hard to read
+     when using emacsclientw.  */
   message (FALSE,
           "Usage: %s [OPTIONS] FILE...\n\
 Tell the Emacs server to visit the specified files.\n\
 Every FILE can be either just a FILENAME or [+LINE[:COLUMN]] FILENAME.\n\
 \n\
 The following OPTIONS are accepted:\n\
--V, --version           Just print version info and return\n\
--H, --help              Print this usage information message\n\
--t, --tty               Open a new Emacs frame on the current terminal\n\
--c, --current-frame    Do not create a new frame; 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"
+-V, --version          Just print version info and return\n\
+-H, --help             Print this usage information message\n\
+-t, --tty              Open a new Emacs frame on the current terminal\n\
+-c, --current-frame    Do not create a new frame;\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"
 #ifndef NO_SOCKETS_IN_FILE_SYSTEM
 "-s, --socket-name=FILENAME\n\
-                        Set filename of the UNIX socket for communication\n"
+                       Set filename of the UNIX socket for communication\n"
 #endif
 "-f, --server-file=FILENAME\n\
-                        Set filename of the TCP authentication file\n\
+                       Set filename of the TCP authentication file\n\
 -a, --alternate-editor=EDITOR\n\
-                        Editor to fallback to if the server is not running\n\
+                       Editor to fallback to if the server is not running\n\
 \n\
 Report bugs to bug-gnu-emacs@gnu.org.\n", progname);
   exit (EXIT_SUCCESS);
@@ -538,7 +543,7 @@ main (argc, argv)
   main_argv = argv;
   progname = argv[0];
   message (TRUE, "%s: Sorry, the Emacs server is supported only\n"
-          "on systems with Berkeley sockets.\n", 
+          "on systems with Berkeley sockets.\n",
           argv[0]);
   fail ();
 }
@@ -551,8 +556,6 @@ main (argc, argv)
 # include <sys/types.h>
 # include <sys/socket.h>
 # include <sys/un.h>
-# include <sys/stat.h>
-# include <errno.h>
 #endif
 
 #define AUTH_KEY_LENGTH      64
@@ -976,7 +979,7 @@ handle_sigtstp (int signalnum)
 {
   int old_errno = errno;
   sigset_t set;
-  
+
   if (emacs_socket)
     send_to_emacs (emacs_socket, "-suspend \n");
 
@@ -1145,9 +1148,9 @@ HSOCKET
 set_socket ()
 {
   HSOCKET s;
-  
+
   INITIALIZE ();
-  
+
 #ifndef NO_SOCKETS_IN_FILE_SYSTEM
   /* Explicit --socket-name argument.  */
   if (socket_name)
@@ -1170,12 +1173,12 @@ set_socket ()
       s = set_tcp_socket ();
       if ((s != INVALID_SOCKET) || alternate_editor)
        return s;
- 
+
       message (TRUE, "%s: error accessing server file \"%s\"",
               progname, server_file);
       exit (EXIT_FAILURE);
     }
-  
+
 #ifndef NO_SOCKETS_IN_FILE_SYSTEM
   /* Implicit local socket.  */
   s = set_local_socket ();
@@ -1332,7 +1335,7 @@ main (argc, argv)
 
   if (current_frame)
     send_to_emacs (emacs_socket, "-current-frame ");
-  
+
   if (display)
     {
       send_to_emacs (emacs_socket, "-display ");
@@ -1342,11 +1345,11 @@ main (argc, argv)
 
   if (tty)
     {
+      char *type = getenv ("TERM");
       char *tty_name = NULL;
 #ifndef WINDOWSNT
       tty_name = ttyname (fileno (stdin));
 #endif
-      char *type = getenv ("TERM");
 
       if (! tty_name)
         {