Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 505-522)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - Update from CVS: etc/TUTORIAL.cn: Updated.
   - Merge from erc--emacs--22

 * gnus--rel--5.10  (patch 164-167)

   - Update from CVS

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

3 files changed, 54 insertions, 37 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index c2319d6486b..70bd5bb6ed7 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,31 @@
+2006-11-13  Jason Rumney  <jasonr@gnu.org>
+
+        * emacsclient.c [WINDOWSNT]: Let config.h define HAVE_SOCKETS and
+        HAVE_INET_SOCKETS.
+
+2006-11-13  Juanma Barranquero  <lekktu@gmail.com>
+
+        * makefile.w32-in (emacsclient): Depend also on emacsclientw.exe.
+        ($(BLD)/emacsclientw.exe): New target.
+        (install): Install emacsclientw.exe.
+        ($(BLD)/cvtmail.$(O), $(BLD)/emacstool.$(O)): Remove obsolete targets.
+        (ECLIENT_CFLAGS): Remove redundant flags.
+
+        * emacsclient.c [WINDOWSNT]: Undef _WINSOCKAPI_ and _WINSOCK_H.
+
+2006-11-13  Jason Rumney  <jasonr@gnu.org>
+
+        * makefile.w32-in ($(BLD)/emacsclient.$(O)): Use CFLAGS.
+
+2006-11-10  David Reitter  <david.reitter@gmail.com>
+
+        * emacsclient.c [!WINDOWSNT]: Include <sys/types.h>.
+
+2006-11-08  Juanma Barranquero  <lekktu@gmail.com>
+
+        * emacsclient.c (get_server_config) [WINDOWSNT]: Declare set_fg as
+        FARPROC to avoid a compiler warning.
+
 2006-11-07  Juanma Barranquero  <lekktu@gmail.com>
 
         * emacsclient.c (get_server_config) [WINDOWSNT]: Look for the server
@@ -9,11 +37,11 @@
 
 2006-11-06  Juanma Barranquero  <lekktu@gmail.com>
 
-        * emacsclient.c (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show
+        * emacsclient.c (longopts) [!NO_SOCKETS_IN_FILE_SYSTEM]: Don't show
         option --socket-name.
         (decode_options): Don't get EMACS_SERVER_FILE here, it could override
         command line options.
-        (decode_options) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't parse "-s" option.
+        (decode_options) [!NO_SOCKETS_IN_FILE_SYSTEM]: Don't parse "-s" option.
         (fail): Don't check for missing arguments, it is now done in set_socket.
         (file_name_absolute_p): New function (loosely based on the one in
         fileio.c).
@@ -455,7 +483,7 @@
 
 2004-09-08  Francesco Potort,Al(B  <pot@gnu.org>
 
-        * etags.c [LONG_OPTIONS]: make it TRUE (ifdef) or FALSE (ifndef)
+        * etags.c [LONG_OPTIONS]: Make it TRUE (ifdef) or FALSE (ifndef)
         for ease of use.
 
 2004-07-17  Richard M. Stallman  <rms@gnu.org>
@@ -2665,7 +2693,7 @@
 
         * movemail.c (rindex): Add declaration.
 
-Tue Jul  1 01:09:07 1997  Geoff Voelker  <voelker@cs.washington.edu>
+1997-07-01  Geoff Voelker  <voelker@cs.washington.edu>
 
         * makefile.nt (GETOPTOBJS, GETOPTDEFS, MOVEMAILOBJS): Define.
         (movemail.exe): Depend upon and link with getopt files.
@@ -3914,7 +3942,7 @@ Tue Jul  1 01:09:07 1997  Geoff Voelker  <voelker@cs.washington.edu>
         * profile.c (TV1, TV2): Use EMACS_TIME as type.
         (get_time): Use EMACS_SUB_TIME.
 
-1994-10-30  voelker  <voelker@cs.washington.edu>
+1994-10-30  Geoff Voelker  <voelker@cs.washington.edu>
 
         * ntlib.c: New file.
         * makefile.nt: New file.
@@ -6047,6 +6075,7 @@ Tue Jul  1 01:09:07 1997  Geoff Voelker  <voelker@cs.washington.edu>
 
 ;; Local Variables:
 ;; coding: iso-2022-7bit
+;; add-log-time-zone-rule: t
 ;; End:
 
     Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995,
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 3c3b27374fc..3e8c56f2ce5 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -28,11 +28,13 @@ Boston, MA 02110-1301, USA.  */
 
 #ifdef WINDOWSNT
 
+/* config.h defines these, which disables sockets altogether! */
+# undef _WINSOCKAPI_
+# undef _WINSOCK_H
+
 # include <malloc.h>
 # include <stdlib.h>
 
-# define HAVE_SOCKETS
-# define HAVE_INET_SOCKETS
 # define NO_SOCKETS_IN_FILE_SYSTEM
 
 # define HSOCKET SOCKET
@@ -41,6 +43,8 @@ Boston, MA 02110-1301, USA.  */
 
 #else /* !WINDOWSNT */
 
+# include <sys/types.h>
+
 # ifdef HAVE_INET_SOCKETS
 #  include <netinet/in.h>
 # endif
@@ -510,7 +514,7 @@ get_server_config (server, authentication)
 
     if (hUser32 = LoadLibrary ("user32.dll"))
       {
-        void (*set_fg)(DWORD);
+        FARPROC set_fg;
         if (set_fg = GetProcAddress (hUser32, "AllowSetForegroundWindow"))
           set_fg (atoi (pid));
         FreeLibrary (hUser32);
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 6fa9724a861..c04637056f8 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -26,13 +26,7 @@ ALL = make-docfile hexl ctags etags movemail ebrowse sorted-doc digest-doc emacs
 
 LOCAL_FLAGS     = -DWINDOWSNT -DDOS_NT -DSTDC_HEADERS=1 -DNO_LDAV=1 \
                   -DNO_ARCHIVES=1 -DHAVE_CONFIG_H=1 -I../nt/inc \
-                  -I../src
-
-# don't know what (if) to do with these yet...
-#
-#               $(BLD)/server.exe       \
-#               $(BLD)/emacstool.exe    \
-#               $(BLD)/cvtmail.exe      \
+                  -I../src
 
 LIBS          = $(BASE_LIBS) $(ADVAPI32)
 
@@ -58,7 +52,7 @@ movemail:	$(BLD) $(BLD)/movemail.exe
 fakemail:       $(BLD) $(BLD)/fakemail.exe
 sorted-doc:     $(BLD) $(BLD)/sorted-doc.exe
 digest-doc:     $(BLD) $(BLD)/digest-doc.exe
-emacsclient:    $(BLD) $(BLD)/emacsclient.exe
+emacsclient:    $(BLD) $(BLD)/emacsclient.exe $(BLD)/emacsclientw.exe
 
 test-distrib:   $(BLD) $(BLD)/test-distrib.exe
         "$(BLD)/test-distrib.exe" "$(SRC)/testfile"
@@ -74,7 +68,7 @@ $(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 = -DWINDOWSNT -DHAVE_GETCWD -DHAVE_STRERROR -c
+ECLIENT_CFLAGS = -DHAVE_GETCWD -DHAVE_STRERROR
 ECLIENTOBJS =   $(BLD)/emacsclient.$(O) \
                 $(BLD)/getopt.$(O) \
                 $(BLD)/getopt1.$(O) \
@@ -84,8 +78,12 @@ $(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)
 
+$(BLD)/emacsclientw.exe:        $(ECLIENTOBJS)
+# put wsock32.lib before $(LIBS) to ensure we don't link to ws2_32.lib
+                $(LINK) $(LINK_OUT)$@ -mwindows $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(LIBS)
+
 $(BLD)/emacsclient.$(O):        emacsclient.c
-                $(CC) $(ECLIENT_CFLAGS) $(CC_OUT)$@ emacsclient.c
+                $(CC) $(CFLAGS) $(ECLIENT_CFLAGS) $(CC_OUT)$@ emacsclient.c
 
 ETAGSOBJ      = $(BLD)/etags.$(O) \
                 $(BLD)/getopt.$(O) \
@@ -98,9 +96,9 @@ $(BLD)/etags.exe: 	$(ETAGSOBJ)
 
 
 EBROWSEOBJ    = $(BLD)/ebrowse.$(O) \
-                $(BLD)/getopt.$(O) \
-                $(BLD)/getopt1.$(O) \
-                $(BLD)/ntlib.$(O)
+                $(BLD)/getopt.$(O) \
+                $(BLD)/getopt1.$(O) \
+                $(BLD)/ntlib.$(O)
 
 $(BLD)/ebrowse.exe:     $(EBROWSEOBJ)
                 $(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(EBROWSEOBJ) $(LIBS)
@@ -131,14 +129,6 @@ $(BLD)/ctags.$(O): ctags.c
                 $(CC) $(CFLAGS) $(CTAGS_CFLAGS) $(CC_OUT)$@ ctags.c
 
 #
-# don't know what to do with these yet...
-#
-# $(BLD)/emacstool.exe:         $(BLD)/emacstool.$(O)
-# $(BLD)/server.exe:            $(BLD)/server.$(O)
-# $(BLD)/cvtmail.exe:           $(BLD)/cvtmail.$(O)
-# $(BLD)/emacsclient.exe:       $(BLD)/emacsclient.$(O)
-
-#
 # From ..\src\Makefile.in
 # It doesn't matter if the real name is *.obj for the files in this list,
 # make-docfile blindly replaces .o with .c anyway.  Keep .o in this list
@@ -309,6 +299,7 @@ install:	$(INSTALL_FILES)
                 $(CP) $(BLD)/sorted-doc.exe $(INSTALL_DIR)/bin
                 $(CP) $(BLD)/digest-doc.exe $(INSTALL_DIR)/bin
                 $(CP) $(BLD)/emacsclient.exe $(INSTALL_DIR)/bin
+                $(CP) $(BLD)/emacsclientw.exe $(INSTALL_DIR)/bin
                 - mkdir "$(INSTALL_DIR)/etc"
                 $(CP) $(DOC) $(INSTALL_DIR)/etc
 
@@ -364,9 +355,6 @@ $(BLD)/ctags.$(O) : \
         $(SRC)/ntlib.h \
         $(SRC)/getopt.h
 
-$(BLD)/cvtmail.$(O) : \
-        $(SRC)/cvtmail.c
-
 $(BLD)/digest-doc.$(O) : \
         $(SRC)/digest-doc.c
 
@@ -376,10 +364,6 @@ $(BLD)/emacsclient.$(O) : \
         $(EMACS_ROOT)/src/m/intel386.h \
         $(EMACS_ROOT)/lib-src/../src/config.h
 
-$(BLD)/emacstool.$(O) : \
-        $(SRC)/emacstool.c \
-        $(EMACS_ROOT)/nt/inc/sys/file.h
-
 $(BLD)/etags.$(O) : \
         $(SRC)/etags.c \
         $(EMACS_ROOT)/nt/inc/sys/param.h \
@@ -441,7 +425,7 @@ $(BLD)/movemail.$(O) : \
         $(EMACS_ROOT)/lib-src/../src/syswait.h \
         $(EMACS_ROOT)/nt/inc/pwd.h \
         $(SRC)/ntlib.h
-                $(CC) $(CFLAGS) -DUSG $(CC_OUT)$@ movemail.c
+        $(CC) $(CFLAGS) -DUSG $(CC_OUT)$@ movemail.c
 
 $(BLD)/ntlib.$(O) : \
         $(SRC)/ntlib.c \