Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 523-544)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 168-171)

   - Update from CVS
   - Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-150

4 files changed, 210 insertions, 80 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 70bd5bb6ed7..97266d8a66e 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,78 @@
+2006-12-06  Christoph Conrad  <christoph.conrad@gmx.de>
+
+        * makefile.w32-in ($(BLD)/emacsclient.exe, $(BLD)/emacsclientw.exe):
+        Use $(USER32) for compatibility with Visual Studio .NET 2003.
+
+2006-11-30  Juanma Barranquero  <lekktu@gmail.com>
+
+        * emacsclient.c (emacs_pid): New variable.
+        (message): Remove leftover code.
+        (get_server_config): Set emacs_pid.  Don't allow Emacs to grab the
+        focus yet; emacsclient can still display an informational message
+        before sending requests to Emacs.
+        (main): Allow Emacs to grab the focus.  Simplify message() call.
+
+2006-11-30  Michael Mauger  <mmaug@yahoo.com>
+
+        * emacsclient.c (message): Make sure the message is properly
+        written even if it contains printf escapes, and flush the result.
+        (set_tcp_socket): Make the message for non-local connections
+        informational rather than an error.
+
+2006-11-28  Kevin Ryde <user42@zip.com.au>  (tiny change)
+
+        * etags.c (readline): Check for double quote after #line.
+
+2006-11-28  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>  (tiny change)
+
+        * etags.c (readline): sscanf could in principle return 2.
+
+2006-11-28  Francesco Potort,Al(B  <pot@gnu.org>
+
+        * etags.c (readline): lno is unsigned.
+        (TeX_commands): Use p++ (rather than *p++) to increment p.
+        (Lua_functions): Explicitly discard LOOKING_AT's return value.
+
+2006-11-27  Juanma Barranquero  <lekktu@gmail.com>
+
+        * makefile.w32-in (TRES): New macro (copied from nt/makefile.w32-in).
+        ($(TRES)): New rule (copied from nt/makefile.w32-in).
+        ($(BLD)/emacsclientw.exe): Add dependency.
+
+2006-11-27  Eli Zaretskii  <eliz@gnu.org>
+
+        * makefile.w32-in ($(BLD)/emacsclient.$(O)): Depend on
+        makefile.w32-in.
+
+2006-11-25  Juanma Barranquero  <lekktu@gmail.com>
+
+        * makefile.w32-in (VERSION): New macro.
+        (ECLIENT_CFLAGS): Add -DVERSION.
+
+2006-11-25  Jason Rumney  <jasonr@gnu.org>
+
+        * emacsclient.c (file_name_absolute_p) [WINDOWSNT]: Use isalpha().
+
+2006-11-24  Michael Mauger  <mmaug@yahoo.com>
+
+        * emacsclient.c (file_name_absolute_p) [WINDOWSNT]: Support
+        absolute file names with forward slashes.
+
+2006-11-23  Juanma Barranquero  <lekktu@gmail.com>
+
+        * emacsclient.c (print_help_and_exit): Tweak message contents and
+        tabs/spaces to improve alignment in message boxes.
+
+2006-11-22  Lennart Borgman  <lennart.borgman.073@student.lu.se>
+
+        * emacsclient.c: Include <stdarg.h>.
+        [WINDOWSNT]: Include <windows.h>.
+        (w32_check_console_app): New function.
+        (message): New function.
+        (decode_options, print_help_and_exit, fail, main)
+        (initialize_sockets, get_server_config, set_tcp_socket)
+        (set_local_socket, set_socket): Use message().
+
 2006-11-13  Jason Rumney  <jasonr@gnu.org>
 
         * emacsclient.c [WINDOWSNT]: Let config.h define HAVE_SOCKETS and
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 3e8c56f2ce5..f05b98eccee 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -34,6 +34,7 @@ Boston, MA 02110-1301, USA.  */
 
 # include <malloc.h>
 # include <stdlib.h>
+# include <windows.h>
 
 # define NO_SOCKETS_IN_FILE_SYSTEM
 
@@ -58,6 +59,7 @@ Boston, MA 02110-1301, USA.  */
 
 #undef signal
 
+#include <stdarg.h>
 #include <ctype.h>
 #include <stdio.h>
 #include "getopt.h"
@@ -127,6 +129,9 @@ char *socket_name = NULL;
 /* If non-NULL, the filename of the authentication file.  */
 char *server_file = NULL;
 
+/* PID of the Emacs server process.  */
+int emacs_pid = 0;
+
 void print_help_and_exit () NO_RETURN;
 
 struct option longopts[] =
@@ -144,6 +149,53 @@ struct option longopts[] =
   { 0, 0, 0, 0 }
 };
 
+/* Message functions. */
+
+#ifdef WINDOWSNT
+/* I first tried to check for STDOUT.  The check did not work,
+   I get a valid handle also in nonconsole apps.
+   Instead I test for console title, which seems to work.  */
+int
+w32_window_app()
+{
+  static int window_app = -1;
+  char szTitle[MAX_PATH];
+
+  if (window_app < 0)
+    window_app = (GetConsoleTitleA (szTitle, MAX_PATH) == 0);
+
+  return window_app;
+}
+#endif
+
+void
+message (int is_error, char *message, ...)
+{
+  char msg [2048];
+  va_list args;
+
+  va_start (args, message);
+  vsprintf (msg, message, args);
+  va_end (args);
+
+#ifdef WINDOWSNT
+  if (w32_window_app ())
+    {
+      if (is_error)
+        MessageBox (NULL, msg, "Emacsclient ERROR", MB_ICONERROR);
+      else
+        MessageBox (NULL, msg, "Emacsclient", MB_ICONINFORMATION);
+    }
+  else
+#endif
+    {
+      FILE *f = is_error ? stderr : stdout;
+
+      fputs (msg, f);
+      fflush (f);
+    }
+}
+
 /* Decode the options from argv and argc.
    The global variable `optind' will say how many arguments we used up.  */
 
@@ -201,7 +253,7 @@ decode_options (argc, argv)
           break;
 
         case 'V':
-          printf ("emacsclient %s\n", VERSION);
+          message (FALSE, "emacsclient %s\n", VERSION);
           exit (EXIT_SUCCESS);
           break;
 
@@ -210,7 +262,7 @@ decode_options (argc, argv)
           break;
 
         default:
-          fprintf (stderr, "Try `%s --help' for more information\n", progname);
+          message (TRUE, "Try `%s --help' for more information\n", progname);
           exit (EXIT_FAILURE);
           break;
         }
@@ -220,25 +272,26 @@ decode_options (argc, argv)
 void
 print_help_and_exit ()
 {
-  printf (
+  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 a version info and return\n\
--H, --help              Print this usage information message\n\
--n, --no-wait           Don't wait for the server to return\n\
--e, --eval              Evaluate the FILE arguments as ELisp expressions\n\
--d, --display=DISPLAY   Visit the file in the given display\n"
+\n\
+-V, --version           Just print version info and return\n\
+-H, --help              Print this usage information message\n\
+-e, --eval              Evaluate FILE arguments as Lisp 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 the filename of the UNIX socket for communication\n"
+                        Set filename of the UNIX socket for communication\n"
 #endif
 "-f, --server-file=FILENAME\n\
-                        Set the filename of the TCP configuration 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 server is not running\n\
 \n\
 Report bugs to bug-gnu-emacs@gnu.org.\n", progname);
   exit (EXIT_SUCCESS);
@@ -261,7 +314,7 @@ fail (argc, argv)
       argv[i] = (char *)alternate_editor;
 #endif
       execvp (alternate_editor, argv + i);
-      fprintf (stderr, "%s: error executing alternate editor \"%s\"\n",
+      message (TRUE, "%s: error executing alternate editor \"%s\"\n",
                progname, alternate_editor);
     }
   exit (EXIT_FAILURE);
@@ -275,9 +328,8 @@ main (argc, argv)
      int argc;
      char **argv;
 {
-  fprintf (stderr, "%s: Sorry, the Emacs server is supported only\n",
+  message (TRUE, "%s: Sorry, the Emacs server is supported only\non systems with Berkely sockets.\n",
            argv[0]);
-  fprintf (stderr, "on systems with Berkeley sockets.\n");
 
   fail (argc, argv);
 }
@@ -399,8 +451,8 @@ file_name_absolute_p (filename)
 
 #ifdef WINDOWSNT
   /* X:\xxx is always absolute; X:xxx is an error and will fail.  */
-  if (islower (tolower (filename[0]))
-      && filename[1] == ':' && filename[2] == '\\')
+  if (isalpha (filename[0])
+      && filename[1] == ':' && (filename[2] == '\\' || filename[2] == '/'))
     return TRUE;
 
   /* Both \xxx and \\xxx\yyy are absolute.  */
@@ -411,7 +463,7 @@ file_name_absolute_p (filename)
 }
 
 #ifdef WINDOWSNT
-/* Wrapper to make WSACleanup a cdecl, as required by atexit().  */
+/* Wrapper to make WSACleanup a cdecl, as required by atexit().  */
 void
 __cdecl close_winsock ()
 {
@@ -426,7 +478,7 @@ initialize_sockets ()
 
   if (WSAStartup (MAKEWORD (2, 0), &wsaData))
     {
-      fprintf (stderr, "%s: error initializing WinSock2", progname);
+      message (TRUE, "%s: error initializing WinSock2", progname);
       exit (EXIT_FAILURE);
     }
 
@@ -482,7 +534,7 @@ get_server_config (server, authentication)
     }
   else
     {
-      fprintf (stderr, "%s: invalid configuration info", progname);
+      message (TRUE, "%s: invalid configuration info", progname);
       exit (EXIT_FAILURE);
     }
 
@@ -492,35 +544,13 @@ get_server_config (server, authentication)
 
   if (! fread (authentication, AUTH_KEY_LENGTH, 1, config))
     {
-      fprintf (stderr, "%s: cannot read authentication info", progname);
+      message (TRUE, "%s: cannot read authentication info", progname);
       exit (EXIT_FAILURE);
     }
 
   fclose (config);
 
-#ifdef WINDOWSNT
-  /*
-    Modern Windows restrict which processes can set the foreground window.
-    So, for emacsclient to be able to force Emacs into the foreground, we
-    have to call AllowSetForegroundWindow().  Unfortunately, older Windows
-    (W95, W98 and NT) don't have this function, so we have to check first.
-
-    We're doing this here because it has to be done before sending info
-    to Emacs, and otherwise we'll need a global variable just to pass around
-    the pid, which is also inelegant.
-   */
-  {
-    HMODULE hUser32;
-
-    if (hUser32 = LoadLibrary ("user32.dll"))
-      {
-        FARPROC set_fg;
-        if (set_fg = GetProcAddress (hUser32, "AllowSetForegroundWindow"))
-          set_fg (atoi (pid));
-        FreeLibrary (hUser32);
-      }
-  }
-#endif
+  emacs_pid = atoi (pid);
 
   return TRUE;
 }
@@ -537,7 +567,7 @@ set_tcp_socket ()
     return INVALID_SOCKET;
 
   if (server.sin_addr.s_addr != inet_addr ("127.0.0.1"))
-    fprintf (stderr, "%s: connected to remote socket at %s\n",
+    message (FALSE, "%s: connected to remote socket at %s\n",
              progname, inet_ntoa (server.sin_addr));
 
   /*
@@ -545,8 +575,7 @@ set_tcp_socket ()
    */
   if ((s = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0)
     {
-      fprintf (stderr, "%s: ", progname);
-      perror ("socket");
+      message (TRUE, "%s: socket: %s\n", progname, strerror (errno));
       return INVALID_SOCKET;
     }
 
@@ -555,8 +584,7 @@ set_tcp_socket ()
    */
   if (connect (s, (struct sockaddr *) &server, sizeof server) < 0)
     {
-      fprintf (stderr, "%s: ", progname);
-      perror ("connect");
+      message (TRUE, "%s: connect: %s\n", progname, strerror (errno));
       return INVALID_SOCKET;
     }
 
@@ -608,8 +636,7 @@ set_local_socket ()
 
   if ((s = socket (AF_UNIX, SOCK_STREAM, 0)) < 0)
     {
-      fprintf (stderr, "%s: ", progname);
-      perror ("socket");
+      message (TRUE, "%s: socket: %s\n", progname, strerror (errno));
       return INVALID_SOCKET;
     }
 
@@ -639,7 +666,7 @@ set_local_socket ()
       strcpy (server.sun_path, socket_name);
     else
       {
-        fprintf (stderr, "%s: socket-name %s too long",
+        message (TRUE, "%s: socket-name %s too long",
                  progname, socket_name);
         exit (EXIT_FAILURE);
       }
@@ -674,7 +701,7 @@ set_local_socket ()
                   strcpy (server.sun_path, socket_name);
                 else
                   {
-                    fprintf (stderr, "%s: socket-name %s too long",
+                    message (TRUE, "%s: socket-name %s too long",
                              progname, socket_name);
                     exit (EXIT_FAILURE);
                   }
@@ -694,7 +721,7 @@ set_local_socket ()
            we are root. */
         if (0 != geteuid ())
           {
-            fprintf (stderr, "%s: Invalid socket owner\n", progname);
+            message (TRUE, "%s: Invalid socket owner\n", progname);
             return INVALID_SOCKET;
           }
         break;
@@ -702,12 +729,12 @@ set_local_socket ()
       case 2:
         /* `stat' failed */
         if (saved_errno == ENOENT)
-          fprintf (stderr,
+          message (TRUE,
                    "%s: can't find socket; have you started the server?\n\
 To start the server in Emacs, type \"M-x server-start\".\n",
                    progname);
         else
-          fprintf (stderr, "%s: can't stat %s: %s\n",
+          message (TRUE, "%s: can't stat %s: %s\n",
                    progname, server.sun_path, strerror (saved_errno));
         return INVALID_SOCKET;
       }
@@ -716,8 +743,7 @@ To start the server in Emacs, type \"M-x server-start\".\n",
   if (connect (s, (struct sockaddr *) &server, strlen (server.sun_path) + 2)
       < 0)
     {
-      fprintf (stderr, "%s: ", progname);
-      perror ("connect");
+      message (TRUE, "%s: connect: %s\n", progname, strerror (errno));
       return INVALID_SOCKET;
     }
 
@@ -740,7 +766,7 @@ set_socket ()
       if ((s != INVALID_SOCKET) || alternate_editor)
         return s;
 
-      fprintf (stderr, "%s: error accessing socket \"%s\"",
+      message (TRUE, "%s: error accessing socket \"%s\"",
                progname, socket_name);
       exit (EXIT_FAILURE);
     }
@@ -756,7 +782,7 @@ set_socket ()
       if ((s != INVALID_SOCKET) || alternate_editor)
         return s;
 
-      fprintf (stderr, "%s: error accessing server file \"%s\"",
+      message (TRUE, "%s: error accessing server file \"%s\"",
                progname, server_file);
       exit (EXIT_FAILURE);
     }
@@ -775,7 +801,7 @@ set_socket ()
     return s;
 
   /* No implicit or explicit socket, and no alternate editor.  */
-  fprintf (stderr, "%s: No socket or alternate editor.  Please use:\n\n"
+  message (TRUE, "%s: No socket or alternate editor.  Please use:\n\n"
 #ifndef NO_SOCKETS_IN_FILE_SYSTEM
 "\t--socket-name\n"
 #endif
@@ -802,8 +828,8 @@ main (argc, argv)
 
   if ((argc - optind < 1) && !eval)
     {
-      fprintf (stderr, "%s: file name or argument required\n", progname);
-      fprintf (stderr, "Try `%s --help' for more information\n", progname);
+      message (TRUE, "%s: file name or argument required\nTry `%s --help' for more information\n",
+              progname, progname);
       exit (EXIT_FAILURE);
     }
 
@@ -818,15 +844,37 @@ main (argc, argv)
   if (cwd == 0)
     {
       /* getwd puts message in STRING if it fails.  */
+      message (TRUE, "%s: %s (%s)\n", progname,
 #ifdef HAVE_GETCWD
-      fprintf (stderr, "%s: %s (%s)\n", progname,
-               "Cannot get current working directory", strerror (errno));
+               "Cannot get current working directory",
 #else
-      fprintf (stderr, "%s: %s (%s)\n", progname, string, strerror (errno));
+               string,
 #endif
+               strerror (errno));
       fail (argc, argv);
     }
 
+#ifdef WINDOWSNT
+  /*
+    Modern Windows restrict which processes can set the foreground window.
+    emacsclient can allow Emacs to grab the focus by calling the function
+    AllowSetForegroundWindow().  Unfortunately, older Windows (W95, W98
+    and NT) lack this function, so we have to check its availability.
+   */
+  if (emacs_pid)
+    {
+      HMODULE hUser32;
+
+      if (hUser32 = LoadLibrary ("user32.dll"))
+        {
+          FARPROC set_fg;
+          if (set_fg = GetProcAddress (hUser32, "AllowSetForegroundWindow"))
+            set_fg (emacs_pid);
+          FreeLibrary (hUser32);
+        }
+    }
+#endif
+
   if (nowait)
     SEND_STRING ("-nowait ");
 
diff --git a/lib-src/etags.c b/lib-src/etags.c
index 49a18be1df5..26dac368b4d 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -41,7 +41,7 @@
  * configuration file containing regexp definitions for etags.
  */
 
-char pot_etags_version[] = "@(#) pot revision number is 17.20";
+char pot_etags_version[] = "@(#) pot revision number is $Revision: 3.61 $";
 
 #define TRUE    1
 #define FALSE   0
@@ -4955,7 +4955,7 @@ Lua_functions (inf)
       if (bp[0] != 'f' && bp[0] != 'l')
         continue;
 
-      LOOKING_AT (bp, "local"); /* skip possible "local" */
+      (void)LOOKING_AT (bp, "local"); /* skip possible "local" */
 
       if (LOOKING_AT (bp, "function"))
         get_tag (bp, NULL);
@@ -5137,7 +5137,7 @@ TeX_commands (inf)
                 if (!opgrp || *p == TEX_clgrp)
                   {
                     while (*p != '\0' && *p != TEX_opgrp && *p != TEX_clgrp)
-                      *p++;
+                      p++;
                     linelen = p - lb.buffer + 1;
                   }
                 make_tag (cp, namelen, TRUE,
@@ -6256,15 +6256,14 @@ readline (lbp, stream)
       /* Check whether this is a #line directive. */
       if (result > 12 && strneq (lbp->buffer, "#line ", 6))
         {
-          int start, lno;
+          unsigned int lno;
+          int start = 0;
 
-          if (DEBUG) start = 0; /* shut up the compiler */
-          if (sscanf (lbp->buffer, "#line %d %n\"", &lno, &start) >= 1
-              && lbp->buffer[start] == '"')
+          if (sscanf (lbp->buffer, "#line %u \"%n", &lno, &start) >= 1
+              && start > 0)     /* double quote character found */
             {
-              char *endp = lbp->buffer + ++start;
+              char *endp = lbp->buffer + start;
 
-              assert (start > 0);
               while ((endp = etags_strchr (endp, '"')) != NULL
                      && endp[-1] == '\\')
                 endp++;
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index c04637056f8..65d40255ae7 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -24,11 +24,13 @@ ALL = make-docfile hexl ctags etags movemail ebrowse sorted-doc digest-doc emacs
 
 .PHONY: $(ALL)
 
+VERSION         = 22.0.91
+
 LOCAL_FLAGS     = -DWINDOWSNT -DDOS_NT -DSTDC_HEADERS=1 -DNO_LDAV=1 \
                   -DNO_ARCHIVES=1 -DHAVE_CONFIG_H=1 -I../nt/inc \
                   -I../src
 
-LIBS          = $(BASE_LIBS) $(ADVAPI32)
+LIBS            = $(BASE_LIBS) $(ADVAPI32)
 
 $(BLD)/make-docfile.exe:        $(BLD)/make-docfile.$(O) $(BLD)/ntlib.$(O)
                 $(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(BLD)/make-docfile.$(O) $(BLD)/ntlib.$(O) $(LIBS)
@@ -68,21 +70,27 @@ $(BLD)/movemail.exe:	$(MOVEMAILOBJS) getopt.h
 # put wsock32.lib before $(LIBS) to ensure we don't link to ws2_32.lib
                 $(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(MOVEMAILOBJS) $(WSOCK32) $(LIBS)
 
-ECLIENT_CFLAGS = -DHAVE_GETCWD -DHAVE_STRERROR
+ECLIENT_CFLAGS = -DHAVE_GETCWD -DHAVE_STRERROR -DVERSION="\"$(VERSION)\""
 ECLIENTOBJS =   $(BLD)/emacsclient.$(O) \
                 $(BLD)/getopt.$(O) \
                 $(BLD)/getopt1.$(O) \
                 $(BLD)/ntlib.$(O)
+TRES =          ../nt/$(BLD)/emacs.res
+
+$(TRES):        ../nt/emacs.rc
+                $(RC) $(RC_OUT)../nt/$(BLD)/emacs.res $(ALL_DEPS)
 
 $(BLD)/emacsclient.exe:         $(ECLIENTOBJS)
 # put wsock32.lib before $(LIBS) to ensure we don't link to ws2_32.lib
-                $(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(LIBS)
+                $(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(USER32) $(LIBS)
 
-$(BLD)/emacsclientw.exe:        $(ECLIENTOBJS)
+$(BLD)/emacsclientw.exe:        $(ECLIENTOBJS) $(TRES)
 # put wsock32.lib before $(LIBS) to ensure we don't link to ws2_32.lib
-                $(LINK) $(LINK_OUT)$@ -mwindows $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(LIBS)
+                $(LINK) $(LINK_OUT)$@ $(TRES) -mwindows $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(USER32) $(LIBS)
 
-$(BLD)/emacsclient.$(O):        emacsclient.c
+# emacsclient.$(O) depends on makefile.w32-in because makefile.w32-in
+# can be edited to define VERSION string, which is part of ECLIENT_CFLAGS.
+$(BLD)/emacsclient.$(O):        emacsclient.c makefile.w32-in
                 $(CC) $(CFLAGS) $(ECLIENT_CFLAGS) $(CC_OUT)$@ emacsclient.c
 
 ETAGSOBJ      = $(BLD)/etags.$(O) \