Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/
Now on revision 103120.
------------------------------------------------------------
revno: 103120 [merge]
committer: Paul Eggert <eggert@cs.ucla.edu>
branch nick: trunk
timestamp: Fri 2011-02-04 23:19:23 -0800
message:
  Merge: * emacsclient.c: conform to C89 pointer rules
diff:
=== modified file 'lib-src/ChangeLog'
--- lib-src/ChangeLog	2011-02-02 19:50:21 +0000
+++ lib-src/ChangeLog	2011-02-05 07:18:46 +0000
@@ -1,3 +1,9 @@
+2011-02-05  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* emacsclient.c: conform to C89 pointer rules
+	(file_name_absolute_p): Accept const char *, not const unsigned
+	char *, to satisfy C89 rules.
+
 2011-02-02  Eli Zaretskii  <eliz@gnu.org>
 
 	* makefile.w32-in (ETAGS_CFLAGS, CTAGS_CFLAGS): Add

=== modified file 'lib-src/emacsclient.c'
--- lib-src/emacsclient.c	2011-01-25 04:08:28 +0000
+++ lib-src/emacsclient.c	2011-02-05 07:18:46 +0000
@@ -854,7 +854,7 @@
 
 
 int
-file_name_absolute_p (const unsigned char *filename)
+file_name_absolute_p (const char *filename)
 {
   /* Sanity check, it shouldn't happen.  */
   if (! filename) return FALSE;
@@ -867,7 +867,7 @@
 
 #ifdef WINDOWSNT
   /* X:\xxx is always absolute.  */
-  if (isalpha (filename[0])
+  if (isalpha ((unsigned char) filename[0])
       && filename[1] == ':' && (filename[2] == '\\' || filename[2] == '/'))
     return TRUE;
------------------------------------------------------------
revno: 103119 [merge]
committer: Paul Eggert <eggert@cs.ucla.edu>
branch nick: trunk
timestamp: Fri 2011-02-04 21:48:58 -0800
message:
  Merge: * regex.c: conform to C89 pointer rules
diff:
=== modified file 'src/ChangeLog'
--- src/ChangeLog	2011-02-05 05:07:22 +0000
+++ src/ChangeLog	2011-02-05 05:48:19 +0000
@@ -1,5 +1,10 @@
 2011-02-05  Paul Eggert  <eggert@cs.ucla.edu>
 
+	* regex.c: conform to C89 pointer rules
+	(re_wctype): Add cast, as C89 does not allow assigning between
+	char * and unsigned char *.
+	(regex_compile): Likewise.
+
 	sync from gnulib to remove HAVE_STDBOOL_H
 	* config.in: Regenerate.
 

=== modified file 'src/regex.c'
--- src/regex.c	2011-01-26 08:36:39 +0000
+++ src/regex.c	2011-02-05 05:48:19 +0000
@@ -2118,7 +2118,7 @@
 re_wctype_t
 re_wctype (const re_char *str)
 {
-  const char *string = str;
+  const char *string = (const char *) str;
   if      (STREQ (string, "alnum"))	return RECC_ALNUM;
   else if (STREQ (string, "alpha"))	return RECC_ALPHA;
   else if (STREQ (string, "word"))	return RECC_WORD;
@@ -2700,7 +2700,7 @@
 	    main_pend = pend;
 	    main_pattern = pattern;
 	    p = pattern = whitespace_regexp;
-	    pend = p + strlen (p);
+	    pend = p + strlen ((const char *) p);
 	    break;
 	  }
------------------------------------------------------------
revno: 103118 [merge]
committer: Paul Eggert <eggert@cs.ucla.edu>
branch nick: trunk
timestamp: Fri 2011-02-04 21:08:12 -0800
message:
  sync from gnulib to remove HAVE_STDBOOL_H
diff:
=== modified file 'ChangeLog'
--- ChangeLog	2011-02-03 21:38:05 +0000
+++ ChangeLog	2011-02-05 05:07:22 +0000
@@ -1,3 +1,14 @@
+2011-02-05  Paul Eggert  <eggert@cs.ucla.edu>
+
+	sync from gnulib to remove HAVE_STDBOOL_H
+	* m4/stdbool.m4 (AC_CHECK_HEADER_STDBOOL): Renamed from
+	AC_HEADER_STDBOOL.  All uses changed.  Do not define
+	HAVE_STDBOOL_H, as gnulib does not need this.  This change is
+	imported from the latest Autoconf git.  It was motivated by Emacs,
+	which uses gnulib but does not need HAVE_STDBOOL_H.
+	* configure, src/config.in: Regenerate.
+	* config.guess, config.sub: Sync to 2011-02-02 versions (whitespace)
+
 2011-02-03  Paul Eggert  <eggert@cs.ucla.edu>
 
 	allow C code to suppress warnings about ignored return values

=== modified file 'config.guess'
--- config.guess	2011-01-27 07:24:57 +0000
+++ config.guess	2011-02-05 05:07:22 +0000
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
 #   2011 Free Software Foundation, Inc.
 
-timestamp='2011-01-23'
+timestamp='2011-02-02'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -181,7 +181,7 @@
 		fi
 		;;
 	    *)
-	        os=netbsd
+		os=netbsd
 		;;
 	esac
 	# The OS release
@@ -224,7 +224,7 @@
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
 		;;
 	*5.*)
-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
 		;;
 	esac
 	# According to Compaq, /usr/sbin/psrinfo has been available on
@@ -299,7 +299,7 @@
 	echo s390-ibm-zvmoe
 	exit ;;
     *:OS400:*:*)
-        echo powerpc-ibm-os400
+	echo powerpc-ibm-os400
 	exit ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
@@ -398,23 +398,23 @@
     # MiNT.  But MiNT is downward compatible to TOS, so this should
     # be no problem.
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
 	echo m68k-atari-mint${UNAME_RELEASE}
-        exit ;;
+	exit ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-milan-mint${UNAME_RELEASE}
+	exit ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-hades-mint${UNAME_RELEASE}
+	exit ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-unknown-mint${UNAME_RELEASE}
+	exit ;;
     m68k:machten:*:*)
 	echo m68k-apple-machten${UNAME_RELEASE}
 	exit ;;
@@ -484,8 +484,8 @@
 	echo m88k-motorola-sysv3
 	exit ;;
     AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
+	# DG/UX returns AViiON for all architectures
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
 	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
 	then
 	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
@@ -498,7 +498,7 @@
 	else
 	    echo i586-dg-dgux${UNAME_RELEASE}
 	fi
- 	exit ;;
+	exit ;;
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
 	exit ;;
@@ -598,52 +598,52 @@
 	    9000/[678][0-9][0-9])
 		if [ -x /usr/bin/getconf ]; then
 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
+		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+		    case "${sc_cpu_version}" in
+		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+		      532)                      # CPU_PA_RISC2_0
+			case "${sc_kernel_bits}" in
+			  32) HP_ARCH="hppa2.0n" ;;
+			  64) HP_ARCH="hppa2.0w" ;;
 			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-                        esac ;;
-                    esac
+			esac ;;
+		    esac
 		fi
 		if [ "${HP_ARCH}" = "" ]; then
 		    eval $set_cc_for_build
-		    sed 's/^              //' << EOF >$dummy.c
-
-              #define _HPUX_SOURCE
-              #include <stdlib.h>
-              #include <unistd.h>
-
-              int main ()
-              {
-              #if defined(_SC_KERNEL_BITS)
-                  long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
-                  long cpu  = sysconf (_SC_CPU_VERSION);
-
-                  switch (cpu)
-              	{
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-              	case CPU_PA_RISC2_0:
-              #if defined(_SC_KERNEL_BITS)
-              	    switch (bits)
-              		{
-              		case 64: puts ("hppa2.0w"); break;
-              		case 32: puts ("hppa2.0n"); break;
-              		default: puts ("hppa2.0"); break;
-              		} break;
-              #else  /* !defined(_SC_KERNEL_BITS) */
-              	    puts ("hppa2.0"); break;
-              #endif
-              	default: puts ("hppa1.0"); break;
-              	}
-                  exit (0);
-              }
+		    sed 's/^		//' << EOF >$dummy.c
+
+		#define _HPUX_SOURCE
+		#include <stdlib.h>
+		#include <unistd.h>
+
+		int main ()
+		{
+		#if defined(_SC_KERNEL_BITS)
+		    long bits = sysconf(_SC_KERNEL_BITS);
+		#endif
+		    long cpu  = sysconf (_SC_CPU_VERSION);
+
+		    switch (cpu)
+			{
+			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+			case CPU_PA_RISC2_0:
+		#if defined(_SC_KERNEL_BITS)
+			    switch (bits)
+				{
+				case 64: puts ("hppa2.0w"); break;
+				case 32: puts ("hppa2.0n"); break;
+				default: puts ("hppa2.0"); break;
+				} break;
+		#else  /* !defined(_SC_KERNEL_BITS) */
+			    puts ("hppa2.0"); break;
+		#endif
+			default: puts ("hppa1.0"); break;
+			}
+		    exit (0);
+		}
 EOF
 		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
 		    test -z "$HP_ARCH" && HP_ARCH=hppa
@@ -734,22 +734,22 @@
 	exit ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
-        exit ;;
+	exit ;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-        exit ;;
+	exit ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
 	echo c34-convex-bsd
-        exit ;;
+	exit ;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
 	echo c38-convex-bsd
-        exit ;;
+	exit ;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
-        exit ;;
+	exit ;;
     CRAY*Y-MP:*:*:*)
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit ;;
@@ -773,14 +773,14 @@
 	exit ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit ;;
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
     5000:UNIX_System_V:4.*:*)
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
@@ -808,14 +808,14 @@
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
     i*:windows32*:*)
-    	# uname -m includes "-pc" on this system.
-    	echo ${UNAME_MACHINE}-mingw32
+	# uname -m includes "-pc" on this system.
+	echo ${UNAME_MACHINE}-mingw32
 	exit ;;
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
     *:Interix*:*)
-    	case ${UNAME_MACHINE} in
+	case ${UNAME_MACHINE} in
 	    x86)
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
@@ -870,7 +870,7 @@
 	  EV6)   UNAME_MACHINE=alphaev6 ;;
 	  EV67)  UNAME_MACHINE=alphaev67 ;;
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
+	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
@@ -895,7 +895,7 @@
 	echo crisv32-axis-linux-gnu
 	exit ;;
     frv:Linux:*:*)
-    	echo frv-unknown-linux-gnu
+	echo frv-unknown-linux-gnu
 	exit ;;
     i*86:Linux:*:*)
 	LIBC=gnu
@@ -963,7 +963,7 @@
 	echo ${UNAME_MACHINE}-ibm-linux
 	exit ;;
     sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     sh*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -981,7 +981,7 @@
 	echo x86_64-unknown-linux-gnu
 	exit ;;
     xtensa*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -990,11 +990,11 @@
 	echo i386-sequent-sysv4
 	exit ;;
     i*86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
+	# Unixware is an offshoot of SVR4, but it has its own version
+	# number series starting with 2...
+	# I am not positive that other SVR4 systems won't match this,
 	# I just have to hope.  -- rms.
-        # Use sysv4.2uw... so that sysv4* matches it.
+	# Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
 	exit ;;
     i*86:OS/2:*:*)
@@ -1026,7 +1026,7 @@
 	fi
 	exit ;;
     i*86:*:5:[678]*)
-    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+	# UnixWare 7.x, OpenUNIX and OpenServer 6.
 	case `/bin/uname -X | grep "^Machine"` in
 	    *486*)	     UNAME_MACHINE=i486 ;;
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
@@ -1054,13 +1054,13 @@
 	exit ;;
     pc:*:*:*)
 	# Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i586.
+	# uname -m prints for DJGPP always 'pc', but it prints nothing about
+	# the processor, so we play safe by assuming i586.
 	# Note: whatever this is, it MUST be the same as what config.sub
 	# prints for the "djgpp" host, or else GDB configury will decide that
 	# this is a cross-build.
 	echo i586-pc-msdosdjgpp
-        exit ;;
+	exit ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
 	exit ;;
@@ -1095,8 +1095,8 @@
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
 	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && { echo i486-ncr-sysv4; exit; } ;;
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4; exit; } ;;
     NCR*:*:4.2:* | MPRAS*:*:4.2:*)
 	OS_REL='.3'
 	test -r /etc/.relid \
@@ -1139,10 +1139,10 @@
 		echo ns32k-sni-sysv
 	fi
 	exit ;;
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit ;;
+    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+			# says <Richard.M.Bartel@ccMail.Census.GOV>
+	echo i586-unisys-sysv4
+	exit ;;
     *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <hewes@openmarket.com>.
 	# How about differentiating between stratus architectures? -djm
@@ -1168,11 +1168,11 @@
 	exit ;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 	if [ -d /usr/nec ]; then
-	        echo mips-nec-sysv${UNAME_RELEASE}
+		echo mips-nec-sysv${UNAME_RELEASE}
 	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
+		echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
-        exit ;;
+	exit ;;
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
 	echo powerpc-be-beos
 	exit ;;
@@ -1285,13 +1285,13 @@
 	echo pdp10-unknown-its
 	exit ;;
     SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
+	echo mips-sei-seiux${UNAME_RELEASE}
 	exit ;;
     *:DragonFly:*:*)
 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit ;;
     *:*VMS:*:*)
-    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+	UNAME_MACHINE=`(uname -p) 2>/dev/null`
 	case "${UNAME_MACHINE}" in
 	    A*) echo alpha-dec-vms ; exit ;;
 	    I*) echo ia64-dec-vms ; exit ;;
@@ -1331,11 +1331,11 @@
 #include <sys/param.h>
   printf ("m68k-sony-newsos%s\n",
 #ifdef NEWSOS4
-          "4"
+	"4"
 #else
-	  ""
+	""
 #endif
-         ); exit (0);
+	); exit (0);
 #endif
 #endif
 

=== modified file 'config.sub'
--- config.sub	2011-01-27 07:24:57 +0000
+++ config.sub	2011-02-05 05:07:22 +0000
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
 #   2011 Free Software Foundation, Inc.
 
-timestamp='2011-01-01'
+timestamp='2011-02-02'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -158,8 +158,8 @@
 		os=
 		basic_machine=$1
 		;;
-        -bluegene*)
-	        os=-cnk
+	-bluegene*)
+		os=-cnk
 		;;
 	-sim | -cisco | -oki | -wec | -winbond)
 		os=
@@ -175,10 +175,10 @@
 		os=-chorusos
 		basic_machine=$1
 		;;
- 	-chorusrdb)
- 		os=-chorusrdb
+	-chorusrdb)
+		os=-chorusrdb
 		basic_machine=$1
- 		;;
+		;;
 	-hiux*)
 		os=-hiuxwe2
 		;;
@@ -424,7 +424,7 @@
 		basic_machine=a29k-amd
 		os=-udi
 		;;
-    	abacus)
+	abacus)
 		basic_machine=abacus-unknown
 		;;
 	adobe68k)
@@ -507,7 +507,7 @@
 		basic_machine=c90-cray
 		os=-unicos
 		;;
-        cegcc)
+	cegcc)
 		basic_machine=arm-unknown
 		os=-cegcc
 		;;
@@ -755,7 +755,7 @@
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
-        microblaze)
+	microblaze)
 		basic_machine=microblaze-xilinx
 		;;
 	mingw32)
@@ -862,10 +862,10 @@
 	np1)
 		basic_machine=np1-gould
 		;;
-        neo-tandem)
+	neo-tandem)
 		basic_machine=neo-tandem
 		;;
-        nse-tandem)
+	nse-tandem)
 		basic_machine=nse-tandem
 		;;
 	nsr-tandem)
@@ -1102,8 +1102,8 @@
 		basic_machine=t90-cray
 		os=-unicos
 		;;
-        # This must be matched before tile*.
-        tilegx*)
+	# This must be matched before tile*.
+	tilegx*)
 		basic_machine=tilegx-unknown
 		os=-linux-gnu
 		;;
@@ -1275,11 +1275,11 @@
 if [ x"$os" != x"" ]
 then
 case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
+	# First match some system type aliases
+	# that might get confused with valid system types.
 	# -solaris* is a basic system type, with this one exception.
-        -auroraux)
-	        os=-auroraux
+	-auroraux)
+		os=-auroraux
 		;;
 	-solaris1 | -solaris1.*)
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
@@ -1364,7 +1364,7 @@
 	-opened*)
 		os=-openedition
 		;;
-        -os400*)
+	-os400*)
 		os=-os400
 		;;
 	-wince*)
@@ -1413,7 +1413,7 @@
 	-sinix*)
 		os=-sysv4
 		;;
-        -tpf*)
+	-tpf*)
 		os=-tpf
 		;;
 	-triton*)
@@ -1458,8 +1458,8 @@
 	-dicos*)
 		os=-dicos
 		;;
-        -nacl*)
-	        ;;
+	-nacl*)
+		;;
 	-none)
 		;;
 	*)
@@ -1482,10 +1482,10 @@
 # system, and we'll never get to this point.
 
 case $basic_machine in
-        score-*)
+	score-*)
 		os=-elf
 		;;
-        spu-*)
+	spu-*)
 		os=-elf
 		;;
 	*-acorn)
@@ -1497,8 +1497,8 @@
 	arm*-semi)
 		os=-aout
 		;;
-        c4x-* | tic4x-*)
-        	os=-coff
+	c4x-* | tic4x-*)
+		os=-coff
 		;;
 	tic54x-*)
 		os=-coff
@@ -1534,7 +1534,7 @@
 	m68*-cisco)
 		os=-aout
 		;;
-        mep-*)
+	mep-*)
 		os=-elf
 		;;
 	mips*-cisco)
@@ -1561,7 +1561,7 @@
 	*-ibm)
 		os=-aix
 		;;
-    	*-knuth)
+	*-knuth)
 		os=-mmixware
 		;;
 	*-wec)

=== modified file 'configure'
--- configure	2011-02-03 19:29:35 +0000
+++ configure	2011-02-05 05:07:22 +0000
@@ -14533,11 +14533,7 @@
 
 fi
 
-   if test $ac_cv_header_stdbool_h = yes; then
-
-$as_echo "#define HAVE_STDBOOL_H 1" >>confdefs.h
-
-   fi
+
 
     REPLACE_NULL=0;
   HAVE_WCHAR_T=1;

=== modified file 'm4/stdbool.m4'
--- m4/stdbool.m4	2011-01-30 23:34:18 +0000
+++ m4/stdbool.m4	2011-02-05 05:07:22 +0000
@@ -5,13 +5,13 @@
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
-#serial 3
+#serial 4
 
 # Prepare for substituting <stdbool.h> if it is not supported.
 
 AC_DEFUN([AM_STDBOOL_H],
 [
-  AC_REQUIRE([AC_HEADER_STDBOOL])
+  AC_REQUIRE([AC_CHECK_HEADER_STDBOOL])
 
   # Define two additional variables used in the Makefile substitution.
 
@@ -33,11 +33,9 @@
 # AM_STDBOOL_H will be renamed to gl_STDBOOL_H in the future.
 AC_DEFUN([gl_STDBOOL_H], [AM_STDBOOL_H])
 
-# This version of the macro is needed in autoconf <= 2.67.  Autoconf has
-# it built in since 2.60, but we want the tweaks from the 2.68 version
-# to avoid rejecting xlc and clang due to relying on extensions.
+# This version of the macro is needed in autoconf <= 2.68.
 
-AC_DEFUN([AC_HEADER_STDBOOL],
+AC_DEFUN([AC_CHECK_HEADER_STDBOOL],
   [AC_CACHE_CHECK([for stdbool.h that conforms to C99],
      [ac_cv_header_stdbool_h],
      [AC_COMPILE_IFELSE(
@@ -98,6 +96,4 @@
         [ac_cv_header_stdbool_h=yes],
         [ac_cv_header_stdbool_h=no])])
    AC_CHECK_TYPES([_Bool])
-   if test $ac_cv_header_stdbool_h = yes; then
-     AC_DEFINE([HAVE_STDBOOL_H], [1], [Define to 1 if stdbool.h conforms to C99.])
-   fi])
+])

=== modified file 'src/ChangeLog'
--- src/ChangeLog	2011-02-04 15:32:34 +0000
+++ src/ChangeLog	2011-02-05 05:07:22 +0000
@@ -1,3 +1,8 @@
+2011-02-05  Paul Eggert  <eggert@cs.ucla.edu>
+
+	sync from gnulib to remove HAVE_STDBOOL_H
+	* config.in: Regenerate.
+
 2011-02-04  Eli Zaretskii  <eliz@gnu.org>
 
 	* makefile.w32-in (LISP_H, PROCESS_H): New variables.

=== modified file 'src/config.in'
--- src/config.in	2011-01-30 23:34:18 +0000
+++ src/config.in	2011-02-05 05:07:22 +0000
@@ -615,9 +615,6 @@
 /* Define to 1 if `speed_t' is declared by <termios.h>. */
 #undef HAVE_SPEED_T
 
-/* Define to 1 if stdbool.h conforms to C99. */
-#undef HAVE_STDBOOL_H
-
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
------------------------------------------------------------
revno: 103117
author: Gnus developers <ding@gnus.org>
committer: Katsumi Yamaoka <yamaoka@jpl.org>
branch nick: trunk
timestamp: Sat 2011-02-05 00:11:16 +0000
message:
  Merge changes made in Gnus trunk.
  
  shr.el (shr-render-td): Store the actual background colour used.
  gnus-sum.el (gnus-user-date): Renamed back from gnus-summary-user-date since user code refers to it.
  auth-source.el: Rewrite.
  gnus.texi: Add DEVEL header (suggested by Andreas Schwab).
  WEBHACKDEVEL work:
   Makefile.in (webhack, nowebhack): Hacks to produce for-the-web manuals.
   auth.texi: Use WEBHACKDEVEL.
   emacs-mime.texi: Use WEBHACKDEVEL.
   gnus.texi: Use WEBHACKDEVEL.
   message.texi: Use WEBHACKDEVEL.
   pgg.texi: Use WEBHACKDEVEL.
   sasl.texi: Use WEBHACKDEVEL.
   sieve.texi: Use WEBHACKDEVEL.
   overrides.texi: New file to set or clear WEBHACKDEVEL.
  message.el (message-setup-1): Remove the read-only stuff, since it doesn't work under XEmacs, for some reason.
diff:
=== modified file 'doc/misc/ChangeLog'
--- doc/misc/ChangeLog	2011-02-03 19:29:10 +0000
+++ doc/misc/ChangeLog	2011-02-05 00:11:16 +0000
@@ -1,3 +1,28 @@
+2011-02-04  Teodor Zlatanov  <tzz@lifelogs.com>
+
+	* overrides.texi: New file to set or clear WEBHACKDEVEL.
+
+	* sieve.texi: Use WEBHACKDEVEL.
+
+	* sasl.texi: Use WEBHACKDEVEL.
+
+	* pgg.texi: Use WEBHACKDEVEL.
+
+	* message.texi: Use WEBHACKDEVEL.
+
+	* gnus.texi: Use WEBHACKDEVEL.
+
+	* emacs-mime.texi: Use WEBHACKDEVEL.
+
+	* auth.texi: Use WEBHACKDEVEL.
+
+	* Makefile.in (webhack, nowebhack): Hacks to produce for-the-web
+	manuals.
+
+2011-02-04  Lars Ingebrigtsen  <larsi@gnus.org>
+
+	* gnus.texi: Add DEVEL header (suggested by Andreas Schwab).
+
 2011-02-03  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* texinfo.tex: Update to version 2011-02-01.10 from gnulib,

=== modified file 'doc/misc/auth.texi'
--- doc/misc/auth.texi	2011-01-25 04:08:28 +0000
+++ doc/misc/auth.texi	2011-02-05 00:11:16 +0000
@@ -1,4 +1,7 @@
 \input texinfo                  @c -*-texinfo-*-
+
+@include overrides.texi
+
 @setfilename ../../info/auth
 @settitle Emacs auth-source Library @value{VERSION}
 
@@ -35,7 +38,12 @@
 @end direntry
 
 @titlepage
+@ifset WEBHACKDEVEL
+@title Emacs auth-source Library (DEVELOPMENT VERSION)
+@end ifset
+@ifclear WEBHACKDEVEL
 @title Emacs auth-source Library
+@end ifclear
 @author by Ted Zlatanov
 @page
 @vskip 0pt plus 1filll

=== modified file 'doc/misc/emacs-mime.texi'
--- doc/misc/emacs-mime.texi	2011-01-25 04:08:28 +0000
+++ doc/misc/emacs-mime.texi	2011-02-05 00:11:16 +0000
@@ -1,5 +1,7 @@
 \input texinfo
 
+@include overrides.texi
+
 @setfilename ../../info/emacs-mime
 @settitle Emacs MIME Manual
 @synindex fn cp
@@ -38,7 +40,12 @@
 @setchapternewpage odd
 
 @titlepage
+@ifset WEBHACKDEVEL
+@title Emacs MIME Manual (DEVELOPMENT VERSION)
+@end ifset
+@ifclear WEBHACKDEVEL
 @title Emacs MIME Manual
+@end ifclear
 
 @author by Lars Magne Ingebrigtsen
 @page

=== modified file 'doc/misc/gnus.texi'
--- doc/misc/gnus.texi	2011-02-03 23:43:22 +0000
+++ doc/misc/gnus.texi	2011-02-05 00:11:16 +0000
@@ -1,5 +1,7 @@
 \input texinfo
 
+@include overrides.texi
+
 @setfilename ../../info/gnus
 @settitle Gnus Manual
 @syncodeindex fn cp
@@ -329,7 +331,12 @@
 
 
 @titlepage
+@ifset WEBHACKDEVEL
+@title Gnus Manual (DEVELOPMENT VERSION)
+@end ifset
+@ifclear WEBHACKDEVEL
 @title Gnus Manual
+@end ifclear
 
 @author by Lars Magne Ingebrigtsen
 @page

=== modified file 'doc/misc/message.texi'
--- doc/misc/message.texi	2011-01-25 04:08:28 +0000
+++ doc/misc/message.texi	2011-02-05 00:11:16 +0000
@@ -1,5 +1,7 @@
 \input texinfo                  @c -*-texinfo-*-
 
+@include overrides.texi
+
 @setfilename ../../info/message
 @settitle Message Manual
 @synindex fn cp
@@ -34,7 +36,12 @@
 @end iftex
 
 @titlepage
+@ifset WEBHACKDEVEL
+@title Message Manual (DEVELOPMENT VERSION)
+@end ifset
+@ifclear WEBHACKDEVEL
 @title Message Manual
+@end ifclear
 
 @author by Lars Magne Ingebrigtsen
 @page

=== added file 'doc/misc/overrides.texi'
--- doc/misc/overrides.texi	1970-01-01 00:00:00 +0000
+++ doc/misc/overrides.texi	2011-02-05 00:11:16 +0000
@@ -0,0 +1,1 @@
+@clear WEBHACKDEVEL

=== modified file 'doc/misc/pgg.texi'
--- doc/misc/pgg.texi	2011-01-25 04:08:28 +0000
+++ doc/misc/pgg.texi	2011-02-05 00:11:16 +0000
@@ -1,4 +1,7 @@
 \input texinfo                  @c -*-texinfo-*-
+
+@include overrides.texi
+
 @setfilename ../../info/pgg
 @settitle PGG @value{VERSION}
 
@@ -30,7 +33,12 @@
 @end direntry
 
 @titlepage
+@ifset WEBHACKDEVEL
+@title PGG (DEVELOPMENT VERSION)
+@end ifset
+@ifclear WEBHACKDEVEL
 @title PGG
+@end ifclear
 
 @author by Daiki Ueno
 @page

=== modified file 'doc/misc/sasl.texi'
--- doc/misc/sasl.texi	2011-01-25 04:08:28 +0000
+++ doc/misc/sasl.texi	2011-02-05 00:11:16 +0000
@@ -1,4 +1,7 @@
 \input texinfo                  @c -*-texinfo-*-
+
+@include overrides.texi
+
 @setfilename ../../info/sasl
 
 @set VERSION 0.2
@@ -37,7 +40,12 @@
 
 
 @titlepage
+@ifset WEBHACKDEVEL
+@title Emacs SASL Library @value{VERSION} (DEVELOPMENT VERSION)
+@end ifset
+@ifclear WEBHACKDEVEL
 @title Emacs SASL Library @value{VERSION}
+@end ifclear
 
 @author by Daiki Ueno
 @page

=== modified file 'doc/misc/sieve.texi'
--- doc/misc/sieve.texi	2011-01-25 04:08:28 +0000
+++ doc/misc/sieve.texi	2011-02-05 00:11:16 +0000
@@ -1,4 +1,7 @@
 \input texinfo                  @c -*-texinfo-*-
+
+@include overrides.texi
+
 @setfilename ../../info/sieve
 @settitle Emacs Sieve Manual
 @synindex fn cp
@@ -34,7 +37,12 @@
 @setchapternewpage odd
 
 @titlepage
+@ifset WEBHACKDEVEL
+@title Emacs Sieve Manual (DEVELOPMENT VERSION)
+@end ifset
+@ifclear WEBHACKDEVEL
 @title Emacs Sieve Manual
+@end ifclear
 
 @author by Simon Josefsson
 @page

=== modified file 'lisp/gnus/ChangeLog'
--- lisp/gnus/ChangeLog	2011-02-04 09:51:56 +0000
+++ lisp/gnus/ChangeLog	2011-02-05 00:11:16 +0000
@@ -1,5 +1,13 @@
 2011-02-04  Lars Ingebrigtsen  <larsi@gnus.org>
 
+	* message.el (message-setup-1): Remove the read-only stuff, since it
+	doesn't work under XEmacs, for some reason.
+
+	* gnus-sum.el (gnus-user-date): Renamed back from
+	gnus-summary-user-date since user code refers to it.
+
+	* shr.el (shr-render-td): Store the actual background colour used.
+
 	* message.el (message-setup-1): Don't bind the constant
 	-forbidden-properties.
 	(message-setup-1): Revert previous change, since it needs to bind the

=== modified file 'lisp/gnus/gnus-sum.el'
--- lisp/gnus/gnus-sum.el	2011-02-03 23:43:22 +0000
+++ lisp/gnus/gnus-sum.el	2011-02-05 00:11:16 +0000
@@ -1395,7 +1395,7 @@
     (?u gnus-tmp-user-defined ?s)
     (?P (gnus-pick-line-number) ?d)
     (?B gnus-tmp-thread-tree-header-string ?s)
-    (user-date (gnus-summary-user-date
+    (user-date (gnus-user-date
 		,(macroexpand '(mail-header-date gnus-tmp-header))) ?s))
   "An alist of format specifications that can appear in summary lines.
 These are paired with what variables they correspond with, along with
@@ -3882,7 +3882,7 @@
 (make-obsolete-variable 'gnus-user-date-format-alist
                         'gnus-summary-user-date-format-alist "24.1")
 
-(defun gnus-summary-user-date (messy-date)
+(defun gnus-user-date (messy-date)
   "Format the messy-date according to `gnus-summary-user-date-format-alist'.
 Returns \"  ?  \" if there's bad input or if another error occurs.
 Input should look like this: \"Sun, 14 Oct 2001 13:34:39 +0200\"."

=== modified file 'lisp/gnus/message.el'
--- lisp/gnus/message.el	2011-02-04 09:51:56 +0000
+++ lisp/gnus/message.el	2011-02-05 00:11:16 +0000
@@ -6411,9 +6411,7 @@
          (funcall message-default-headers)
        message-default-headers))
     (or (bolp) (insert ?\n)))
-  (let ((message-forbidden-properties nil))
-    (insert (propertize (concat mail-header-separator "\n")
-			'read-only t 'rear-nonsticky t 'intangible t)))
+  (insert (concat mail-header-separator "\n"))
   (forward-line -1)
   ;; If a crash happens while replying, the auto-save file would *not* have a
   ;; `References:' header if `message-generate-headers-first' was nil.

=== modified file 'lisp/gnus/shr.el'
--- lisp/gnus/shr.el	2011-02-01 03:54:46 +0000
+++ lisp/gnus/shr.el	2011-02-05 00:11:16 +0000
@@ -601,7 +601,8 @@
 	(when fg
 	  (shr-put-color start end :foreground (cadr new-colors)))
 	(when bg
-	  (shr-put-color start end :background (car new-colors)))))))
+	  (shr-put-color start end :background (car new-colors))))
+      new-colors)))
 
 ;; Put a color in the region, but avoid putting colors on on blank
 ;; text at the start of the line, and the newline at the end, to avoid
@@ -1126,7 +1127,7 @@
 	  (fgcolor (cdr (assq :fgcolor cont)))
 	  (style (cdr (assq :style cont)))
 	  (shr-stylesheet shr-stylesheet)
-	  overlays)
+	  overlays actual-colors)
       (when style
 	(setq style (and (string-match "color" style)
 			 (shr-parse-style style))))
@@ -1178,16 +1179,17 @@
 		(insert (make-string (- width (current-column)) ? )))
 	      (forward-line 1)))
 	  (when style
-	    (shr-colorize-region
-	     (point-min) (point-max)
-	     (cdr (assq 'color shr-stylesheet))
-	     (cdr (assq 'background-color shr-stylesheet)))))
+	    (setq actual-colors
+		  (shr-colorize-region
+		   (point-min) (point-max)
+		   (cdr (assq 'color shr-stylesheet))
+		   (cdr (assq 'background-color shr-stylesheet))))))
 	(if fill
 	    (list max
 		  (count-lines (point-min) (point-max))
 		  (split-string (buffer-string) "\n")
 		  (shr-collect-overlays)
-		  (cdr (assq 'background-color shr-stylesheet)))
+		  (car actual-colors))
 	  (list max
 		(shr-natural-width)))))))
------------------------------------------------------------
revno: 103116
committer: Eli Zaretskii <eliz@gnu.org>
branch nick: trunk
timestamp: Fri 2011-02-04 17:32:34 +0200
message:
  Update dependencies in src/makefile.w32-in.
  
   makefile.w32-in (LISP_H, PROCESS_H): New variables.
   Replace all uses of lisp.h with $(LISP_H), and all uses of
   process.h with $(PROCESS_H).
   ($(BLD)/editfns.$(O)): Depend on ../lib/strftime.h.
   ($(BLD)/print.$(O)): Depend on ../lib/ftoastr.h and ../lib/intprops.h.
   ($(BLD)/sysdep.$(O)): Depend on ../lib/ignore-value.h.
diff:
=== modified file 'src/ChangeLog'
--- src/ChangeLog	2011-02-04 12:01:34 +0000
+++ src/ChangeLog	2011-02-04 15:32:34 +0000
@@ -1,10 +1,16 @@
 2011-02-04  Eli Zaretskii  <eliz@gnu.org>
 
+	* makefile.w32-in (LISP_H, PROCESS_H): New variables.
+	Replace all uses of lisp.h with $(LISP_H), and all uses of
+	process.h with $(PROCESS_H).
+	($(BLD)/editfns.$(O)): Depend on ../lib/strftime.h.
+	($(BLD)/print.$(O)): Depend on ../lib/ftoastr.h and ../lib/intprops.h.
+
 	* deps.mk: Update for recent changes: gnutls support, gnulib
 	imports, addition of globals.h.
 
-	* makefile.w32-in (IGNORE_VALUE_H): New variable.
-	($(BLD)/sysdep.$(O)): Depend on $(IGNORE_VALUE_H).
+	* makefile.w32-in ($(BLD)/sysdep.$(O)): Depend on
+	../lib/ignore-value.h.
 
 2011-02-03  Paul Eggert  <eggert@cs.ucla.edu>
 

=== modified file 'src/makefile.w32-in'
--- src/makefile.w32-in	2011-02-04 09:17:36 +0000
+++ src/makefile.w32-in	2011-02-04 15:32:34 +0000
@@ -347,14 +347,15 @@
 	     $(EMACS_ROOT)/src/m/intel386.h \
 	     $(EMACS_ROOT)/src/config.h \
 	     $(EMACS_ROOT)/nt/inc/sys/stat.h
-IGNORE_VALUE_H = $(EMACS_ROOT)/lib/ignore-value.h
+LISP_H     = $(SRC)/lisp.h $(SRC)/globals.h
+PROCESS_H  = $(SRC)/process.h $(SRC)/gnutls.h
 
 $(BLD)/alloc.$(O) : \
 	$(SRC)/alloc.c \
 	$(CONFIG_H) \
 	$(EMACS_ROOT)/nt/inc/unistd.h \
 	$(EMACS_ROOT)/nt/inc/sys/time.h \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/atimer.h \
 	$(SRC)/blockinput.h \
 	$(SRC)/buffer.h \
@@ -365,7 +366,7 @@
 	$(SRC)/frame.h \
 	$(SRC)/intervals.h \
 	$(SRC)/keyboard.h \
-	$(SRC)/process.h \
+	$(PROCESS_H) \
 	$(SRC)/puresize.h \
 	$(SRC)/syssignal.h \
 	$(SRC)/systime.h \
@@ -379,7 +380,7 @@
 	$(CONFIG_H) \
 	$(EMACS_ROOT)/nt/inc/unistd.h \
 	$(EMACS_ROOT)/nt/inc/sys/time.h \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/atimer.h \
 	$(SRC)/blockinput.h \
 	$(SRC)/syssignal.h \
@@ -388,7 +389,7 @@
 $(BLD)/bidi.$(O) : \
 	$(SRC)/bidi.c \
 	$(CONFIG_H) \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/bidimirror.h \
 	$(SRC)/biditype.h \
 	$(SRC)/buffer.h \
@@ -402,7 +403,7 @@
 	$(EMACS_ROOT)/nt/inc/unistd.h \
 	$(EMACS_ROOT)/nt/inc/sys/param.h \
 	$(EMACS_ROOT)/nt/inc/sys/time.h \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/atimer.h \
 	$(SRC)/blockinput.h \
 	$(SRC)/buffer.h \
@@ -424,7 +425,7 @@
 $(BLD)/bytecode.$(O) : \
 	$(SRC)/bytecode.c \
 	$(CONFIG_H) \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/buffer.h \
 	$(SRC)/character.h \
 	$(SRC)/dispextern.h \
@@ -436,7 +437,7 @@
 	$(SRC)/callint.c \
 	$(CONFIG_H) \
 	$(EMACS_ROOT)/nt/inc/sys/time.h \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/buffer.h \
 	$(SRC)/coding.h \
 	$(SRC)/commands.h \
@@ -454,7 +455,7 @@
 	$(EMACS_ROOT)/nt/inc/unistd.h \
 	$(EMACS_ROOT)/nt/inc/sys/file.h \
 	$(EMACS_ROOT)/nt/inc/sys/time.h \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/atimer.h \
 	$(SRC)/blockinput.h \
 	$(SRC)/buffer.h \
@@ -466,7 +467,7 @@
 	$(SRC)/dispextern.h \
 	$(SRC)/epaths.h \
 	$(SRC)/frame.h \
-	$(SRC)/process.h \
+	$(PROCESS_H) \
 	$(SRC)/syssignal.h \
 	$(SRC)/systime.h \
 	$(SRC)/systty.h \
@@ -477,7 +478,7 @@
 $(BLD)/casefiddle.$(O) : \
 	$(SRC)/casefiddle.c \
 	$(CONFIG_H) \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/buffer.h \
 	$(SRC)/character.h \
 	$(SRC)/commands.h \
@@ -488,14 +489,14 @@
 $(BLD)/casetab.$(O) : \
 	$(SRC)/casetab.c \
 	$(CONFIG_H) \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/buffer.h \
 	$(SRC)/character.h
 
 $(BLD)/category.$(O) : \
 	$(SRC)/category.c \
 	$(CONFIG_H) \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/buffer.h \
 	$(SRC)/category.h \
 	$(SRC)/character.h \
@@ -505,7 +506,7 @@
 $(BLD)/ccl.$(O) : \
 	$(SRC)/ccl.c \
 	$(CONFIG_H) \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/ccl.h \
 	$(SRC)/character.h \
 	$(SRC)/charset.h \
@@ -515,7 +516,7 @@
 $(BLD)/character.$(O) : \
 	$(SRC)/character.c \
 	$(CONFIG_H) \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/buffer.h \
 	$(SRC)/character.h \
 	$(SRC)/charset.h \
@@ -526,7 +527,7 @@
 	$(SRC)/charset.c \
 	$(CONFIG_H) \
 	$(EMACS_ROOT)/nt/inc/unistd.h \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/buffer.h \
 	$(SRC)/character.h \
 	$(SRC)/charset.h \
@@ -537,7 +538,7 @@
 $(BLD)/chartab.$(O) : \
 	$(SRC)/chartab.c \
 	$(CONFIG_H) \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/ccl.h \
 	$(SRC)/character.h \
 	$(SRC)/charset.h
@@ -546,7 +547,7 @@
 	$(SRC)/cmds.c \
 	$(CONFIG_H) \
 	$(EMACS_ROOT)/nt/inc/sys/time.h \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/buffer.h \
 	$(SRC)/character.h \
 	$(SRC)/coding.h \
@@ -564,7 +565,7 @@
 $(BLD)/coding.$(O) : \
 	$(SRC)/coding.c \
 	$(CONFIG_H) \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/buffer.h \
 	$(SRC)/ccl.h \
 	$(SRC)/character.h \
@@ -580,7 +581,7 @@
 $(BLD)/composite.$(O) : \
 	$(SRC)/composite.c \
 	$(CONFIG_H) \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/buffer.h \
 	$(SRC)/ccl.h \
 	$(SRC)/character.h \
@@ -598,7 +599,7 @@
 	$(SRC)/data.c \
 	$(CONFIG_H) \
 	$(EMACS_ROOT)/nt/inc/sys/time.h \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/buffer.h \
 	$(SRC)/ccl.h \
 	$(SRC)/character.h \
@@ -622,7 +623,7 @@
 	$(EMACS_ROOT)/nt/inc/unistd.h \
 	$(EMACS_ROOT)/nt/inc/sys/dir.h \
 	$(EMACS_ROOT)/nt/inc/sys/time.h \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/atimer.h \
 	$(SRC)/blockinput.h \
 	$(SRC)/buffer.h \
@@ -640,7 +641,7 @@
 	$(CONFIG_H) \
 	$(EMACS_ROOT)/nt/inc/unistd.h \
 	$(EMACS_ROOT)/nt/inc/sys/time.h \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/atimer.h \
 	$(SRC)/blockinput.h \
 	$(SRC)/buffer.h \
@@ -655,7 +656,7 @@
 	$(SRC)/indent.h \
 	$(SRC)/intervals.h \
 	$(SRC)/keyboard.h \
-	$(SRC)/process.h \
+	$(PROCESS_H) \
 	$(SRC)/syssignal.h \
 	$(SRC)/systime.h \
 	$(SRC)/termchar.h \
@@ -672,7 +673,7 @@
 	$(EMACS_ROOT)/nt/inc/unistd.h \
 	$(EMACS_ROOT)/nt/inc/sys/file.h \
 	$(EMACS_ROOT)/nt/inc/sys/time.h \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/buffer.h \
 	$(SRC)/character.h \
 	$(SRC)/coding.h \
@@ -685,7 +686,7 @@
 	$(SRC)/doprnt.c \
 	$(CONFIG_H) \
 	$(EMACS_ROOT)/nt/inc/unistd.h \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/character.h
 
 $(BLD)/editfns.$(O) : \
@@ -694,7 +695,8 @@
 	$(EMACS_ROOT)/nt/inc/pwd.h \
 	$(EMACS_ROOT)/nt/inc/unistd.h \
 	$(EMACS_ROOT)/nt/inc/sys/time.h \
-	$(SRC)/lisp.h \
+	$(EMACS_ROOT)/lib/strftime.h \
+	$(LISP_H) \
 	$(SRC)/atimer.h \
 	$(SRC)/blockinput.h \
 	$(SRC)/buffer.h \
@@ -714,7 +716,7 @@
 	$(EMACS_ROOT)/nt/inc/unistd.h \
 	$(EMACS_ROOT)/nt/inc/sys/file.h \
 	$(EMACS_ROOT)/nt/inc/sys/time.h \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/atimer.h \
 	$(SRC)/blockinput.h \
 	$(SRC)/buffer.h \
@@ -723,10 +725,11 @@
 	$(SRC)/composite.h \
 	$(SRC)/dispextern.h \
 	$(SRC)/frame.h \
+	$(SRC)/gnutls.h \
 	$(SRC)/intervals.h \
 	$(SRC)/keyboard.h \
 	$(SRC)/keymap.h \
-	$(SRC)/process.h \
+	$(PROCESS_H) \
 	$(SRC)/syssignal.h \
 	$(SRC)/systime.h \
 	$(SRC)/systty.h \
@@ -740,7 +743,7 @@
 	$(SRC)/eval.c \
 	$(CONFIG_H) \
 	$(EMACS_ROOT)/nt/inc/sys/time.h \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/atimer.h \
 	$(SRC)/blockinput.h \
 	$(SRC)/coding.h \
@@ -758,7 +761,7 @@
 	$(EMACS_ROOT)/nt/inc/pwd.h \
 	$(EMACS_ROOT)/nt/inc/unistd.h \
 	$(EMACS_ROOT)/nt/inc/sys/time.h \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/atimer.h \
 	$(SRC)/blockinput.h \
 	$(SRC)/buffer.h \
@@ -780,7 +783,7 @@
 	$(EMACS_ROOT)/nt/inc/unistd.h \
 	$(EMACS_ROOT)/nt/inc/sys/file.h \
 	$(EMACS_ROOT)/nt/inc/sys/time.h \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/buffer.h \
 	$(SRC)/character.h \
 	$(SRC)/coding.h \
@@ -798,7 +801,7 @@
 $(BLD)/floatfns.$(O) : \
 	$(SRC)/floatfns.c \
 	$(CONFIG_H) \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/syssignal.h
 
 $(BLD)/fns.$(O) : \
@@ -808,7 +811,7 @@
 	$(EMACS_ROOT)/nt/inc/nl_types.h \
 	$(EMACS_ROOT)/nt/inc/unistd.h \
 	$(EMACS_ROOT)/nt/inc/sys/time.h \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/atimer.h \
 	$(SRC)/blockinput.h \
 	$(SRC)/buffer.h \
@@ -829,7 +832,7 @@
 $(BLD)/font.$(O) : \
 	$(SRC)/font.c \
 	$(CONFIG_H) \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/buffer.h \
 	$(SRC)/ccl.h \
 	$(SRC)/character.h \
@@ -847,7 +850,7 @@
 	$(SRC)/fontset.c \
 	$(CONFIG_H) \
 	$(EMACS_ROOT)/nt/inc/sys/time.h \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/atimer.h \
 	$(SRC)/blockinput.h \
 	$(SRC)/buffer.h \
@@ -872,7 +875,7 @@
 	$(SRC)/frame.c \
 	$(CONFIG_H) \
 	$(EMACS_ROOT)/nt/inc/sys/time.h \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/atimer.h \
 	$(SRC)/blockinput.h \
 	$(SRC)/buffer.h \
@@ -897,7 +900,7 @@
 	$(SRC)/fringe.c \
 	$(CONFIG_H) \
 	$(EMACS_ROOT)/nt/inc/sys/time.h \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/atimer.h \
 	$(SRC)/blockinput.h \
 	$(SRC)/buffer.h \
@@ -919,7 +922,7 @@
 	$(CONFIG_H) \
 	$(EMACS_ROOT)/nt/inc/unistd.h \
 	$(EMACS_ROOT)/nt/inc/sys/time.h \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/atimer.h \
 	$(SRC)/blockinput.h \
 	$(SRC)/ccl.h \
@@ -940,7 +943,7 @@
 	$(SRC)/indent.c \
 	$(CONFIG_H) \
 	$(EMACS_ROOT)/nt/inc/sys/time.h \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/buffer.h \
 	$(SRC)/category.h \
 	$(SRC)/character.h \
@@ -963,7 +966,7 @@
 	$(SRC)/insdel.c \
 	$(CONFIG_H) \
 	$(EMACS_ROOT)/nt/inc/sys/time.h \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/atimer.h \
 	$(SRC)/blockinput.h \
 	$(SRC)/buffer.h \
@@ -980,7 +983,7 @@
 	$(SRC)/intervals.c \
 	$(CONFIG_H) \
 	$(EMACS_ROOT)/nt/inc/sys/time.h \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/buffer.h \
 	$(SRC)/coding.h \
 	$(SRC)/composite.h \
@@ -998,7 +1001,7 @@
 	$(EMACS_ROOT)/nt/inc/unistd.h \
 	$(EMACS_ROOT)/nt/inc/sys/ioctl.h \
 	$(EMACS_ROOT)/nt/inc/sys/time.h \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/atimer.h \
 	$(SRC)/blockinput.h \
 	$(SRC)/buffer.h \
@@ -1013,7 +1016,7 @@
 	$(SRC)/keyboard.h \
 	$(SRC)/keymap.h \
 	$(SRC)/macros.h \
-	$(SRC)/process.h \
+	$(PROCESS_H) \
 	$(SRC)/puresize.h \
 	$(SRC)/syntax.h \
 	$(SRC)/syssignal.h \
@@ -1029,7 +1032,7 @@
 	$(SRC)/keymap.c \
 	$(CONFIG_H) \
 	$(EMACS_ROOT)/nt/inc/sys/time.h \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/atimer.h \
 	$(SRC)/blockinput.h \
 	$(SRC)/buffer.h \
@@ -1059,7 +1062,7 @@
 	$(EMACS_ROOT)/nt/inc/unistd.h \
 	$(EMACS_ROOT)/nt/inc/sys/file.h \
 	$(EMACS_ROOT)/nt/inc/sys/time.h \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/atimer.h \
 	$(SRC)/blockinput.h \
 	$(SRC)/buffer.h \
@@ -1081,7 +1084,7 @@
 	$(SRC)/macros.c \
 	$(CONFIG_H) \
 	$(EMACS_ROOT)/nt/inc/sys/time.h \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/buffer.h \
 	$(SRC)/coding.h \
 	$(SRC)/commands.h \
@@ -1096,7 +1099,7 @@
 $(BLD)/marker.$(O) : \
 	$(SRC)/marker.c \
 	$(CONFIG_H) \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/buffer.h \
 	$(SRC)/character.h
 
@@ -1109,7 +1112,7 @@
 	$(SRC)/menu.c \
 	$(CONFIG_H) \
 	$(EMACS_ROOT)/nt/inc/sys/time.h \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/atimer.h \
 	$(SRC)/blockinput.h \
 	$(SRC)/coding.h \
@@ -1129,7 +1132,7 @@
 	$(SRC)/minibuf.c \
 	$(CONFIG_H) \
 	$(EMACS_ROOT)/nt/inc/sys/time.h \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/buffer.h \
 	$(SRC)/character.h \
 	$(SRC)/coding.h \
@@ -1155,12 +1158,12 @@
 	$(EMACS_ROOT)/nt/inc/sys/file.h \
 	$(EMACS_ROOT)/nt/inc/sys/socket.h \
 	$(EMACS_ROOT)/nt/inc/sys/time.h \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/coding.h \
 	$(SRC)/composite.h \
 	$(SRC)/dispextern.h \
 	$(SRC)/ndir.h \
-	$(SRC)/process.h \
+	$(PROCESS_H) \
 	$(SRC)/systime.h \
 	$(SRC)/w32.h \
 	$(SRC)/w32gui.h \
@@ -1169,14 +1172,14 @@
 $(BLD)/w32heap.$(O) : \
 	$(SRC)/w32heap.c \
 	$(CONFIG_H) \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/w32heap.h
 
 $(BLD)/w32inevt.$(O) : \
 	$(SRC)/w32inevt.c \
 	$(CONFIG_H) \
 	$(EMACS_ROOT)/nt/inc/sys/time.h \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/atimer.h \
 	$(SRC)/blockinput.h \
 	$(SRC)/coding.h \
@@ -1198,12 +1201,12 @@
 	$(EMACS_ROOT)/nt/inc/unistd.h \
 	$(EMACS_ROOT)/nt/inc/sys/file.h \
 	$(EMACS_ROOT)/nt/inc/sys/time.h \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/character.h \
 	$(SRC)/coding.h \
 	$(SRC)/composite.h \
 	$(SRC)/dispextern.h \
-	$(SRC)/process.h \
+	$(PROCESS_H) \
 	$(SRC)/syssignal.h \
 	$(SRC)/systime.h \
 	$(SRC)/syswait.h \
@@ -1215,7 +1218,7 @@
 $(BLD)/w32console.$(O) : \
 	$(SRC)/w32console.c \
 	$(CONFIG_H) \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/character.h \
 	$(SRC)/coding.h \
 	$(SRC)/composite.h \
@@ -1232,7 +1235,9 @@
 	$(CONFIG_H) \
 	$(EMACS_ROOT)/nt/inc/unistd.h \
 	$(EMACS_ROOT)/nt/inc/sys/time.h \
-	$(SRC)/lisp.h \
+	$(EMACS_ROOT)/lib/ftoastr.h \
+	$(EMACS_ROOT)/lib/intprops.h \
+	$(LISP_H) \
 	$(SRC)/atimer.h \
 	$(SRC)/blockinput.h \
 	$(SRC)/buffer.h \
@@ -1246,7 +1251,7 @@
 	$(SRC)/frame.h \
 	$(SRC)/intervals.h \
 	$(SRC)/keyboard.h \
-	$(SRC)/process.h \
+	$(PROCESS_H) \
 	$(SRC)/systime.h \
 	$(SRC)/termchar.h \
 	$(SRC)/termhooks.h \
@@ -1263,7 +1268,7 @@
 	$(EMACS_ROOT)/nt/inc/sys/file.h \
 	$(EMACS_ROOT)/nt/inc/sys/socket.h \
 	$(EMACS_ROOT)/nt/inc/sys/time.h \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/atimer.h \
 	$(SRC)/blockinput.h \
 	$(SRC)/buffer.h \
@@ -1274,7 +1279,7 @@
 	$(SRC)/dispextern.h \
 	$(SRC)/frame.h \
 	$(SRC)/keyboard.h \
-	$(SRC)/process.h \
+	$(PROCESS_H) \
 	$(SRC)/sysselect.h \
 	$(SRC)/syssignal.h \
 	$(SRC)/systime.h \
@@ -1291,7 +1296,7 @@
 	$(CONFIG_H) \
 	$(EMACS_ROOT)/nt/inc/unistd.h \
 	$(EMACS_ROOT)/nt/inc/sys/time.h \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/atimer.h \
 	$(SRC)/blockinput.h \
 	$(SRC)/getpagesize.h \
@@ -1300,7 +1305,7 @@
 $(BLD)/regex.$(O) : \
 	$(SRC)/regex.c \
 	$(CONFIG_H) \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/buffer.h \
 	$(SRC)/category.h \
 	$(SRC)/character.h \
@@ -1310,7 +1315,7 @@
 $(BLD)/region-cache.$(O) : \
 	$(SRC)/region-cache.c \
 	$(CONFIG_H) \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/buffer.h \
 	$(SRC)/region-cache.h
 
@@ -1318,7 +1323,7 @@
 	$(SRC)/scroll.c \
 	$(CONFIG_H) \
 	$(EMACS_ROOT)/nt/inc/sys/time.h \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/coding.h \
 	$(SRC)/composite.h \
 	$(SRC)/dispextern.h \
@@ -1334,7 +1339,7 @@
 	$(SRC)/search.c \
 	$(CONFIG_H) \
 	$(EMACS_ROOT)/nt/inc/sys/time.h \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/atimer.h \
 	$(SRC)/blockinput.h \
 	$(SRC)/buffer.h \
@@ -1356,7 +1361,7 @@
 	$(CONFIG_H) \
 	$(EMACS_ROOT)/nt/inc/unistd.h \
 	$(EMACS_ROOT)/nt/inc/sys/time.h \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/atimer.h \
 	$(SRC)/dispextern.h \
 	$(SRC)/syssignal.h \
@@ -1366,7 +1371,7 @@
 $(BLD)/syntax.$(O) : \
 	$(SRC)/syntax.c \
 	$(CONFIG_H) \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/buffer.h \
 	$(SRC)/category.h \
 	$(SRC)/character.h \
@@ -1389,8 +1394,8 @@
 	$(EMACS_ROOT)/nt/inc/sys/file.h \
 	$(EMACS_ROOT)/nt/inc/sys/socket.h \
 	$(EMACS_ROOT)/nt/inc/sys/time.h \
-	$(IGNORE_VALUE_H) \
-	$(SRC)/lisp.h \
+	$(EMACS_ROOT)/lib/ignore-value.h \
+	$(LISP_H) \
 	$(SRC)/atimer.h \
 	$(SRC)/blockinput.h \
 	$(SRC)/cm.h \
@@ -1399,7 +1404,7 @@
 	$(SRC)/dispextern.h \
 	$(SRC)/frame.h \
 	$(SRC)/keyboard.h \
-	$(SRC)/process.h \
+	$(PROCESS_H) \
 	$(SRC)/sysselect.h \
 	$(SRC)/syssignal.h \
 	$(SRC)/systime.h \
@@ -1418,7 +1423,7 @@
 	$(EMACS_ROOT)/nt/inc/unistd.h \
 	$(EMACS_ROOT)/nt/inc/sys/file.h \
 	$(EMACS_ROOT)/nt/inc/sys/time.h \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/atimer.h \
 	$(SRC)/blockinput.h \
 	$(SRC)/buffer.h \
@@ -1446,7 +1451,7 @@
 	$(SRC)/terminal.c \
 	$(CONFIG_H) \
 	$(EMACS_ROOT)/nt/inc/sys/time.h \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/charset.h \
 	$(SRC)/coding.h \
 	$(SRC)/composite.h \
@@ -1461,7 +1466,7 @@
 $(BLD)/textprop.$(O) : \
 	$(SRC)/textprop.c \
 	$(CONFIG_H) \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/buffer.h \
 	$(SRC)/composite.h \
 	$(SRC)/dispextern.h \
@@ -1472,12 +1477,12 @@
 $(BLD)/tparam.$(O) : \
 	$(SRC)/tparam.c \
 	$(CONFIG_H) \
-	$(SRC)/lisp.h
+	$(LISP_H)
 
 $(BLD)/undo.$(O) : \
 	$(SRC)/undo.c \
 	$(CONFIG_H) \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/buffer.h \
 	$(SRC)/commands.h \
 	$(SRC)/dispextern.h \
@@ -1492,14 +1497,14 @@
 $(BLD)/vm-limit.$(O) : \
 	$(SRC)/vm-limit.c \
 	$(CONFIG_H) \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/mem-limits.h
 
 $(BLD)/window.$(O) : \
 	$(SRC)/window.c \
 	$(CONFIG_H) \
 	$(EMACS_ROOT)/nt/inc/sys/time.h \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/atimer.h \
 	$(SRC)/blockinput.h \
 	$(SRC)/buffer.h \
@@ -1525,7 +1530,7 @@
 	$(CONFIG_H) \
 	$(EMACS_ROOT)/nt/inc/unistd.h \
 	$(EMACS_ROOT)/nt/inc/sys/time.h \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/atimer.h \
 	$(SRC)/blockinput.h \
 	$(SRC)/buffer.h \
@@ -1545,7 +1550,7 @@
 	$(SRC)/keyboard.h \
 	$(SRC)/keymap.h \
 	$(SRC)/macros.h \
-	$(SRC)/process.h \
+	$(PROCESS_H) \
 	$(SRC)/region-cache.h \
 	$(SRC)/systime.h \
 	$(SRC)/termchar.h \
@@ -1559,7 +1564,7 @@
 	$(SRC)/xfaces.c \
 	$(CONFIG_H) \
 	$(EMACS_ROOT)/nt/inc/sys/time.h \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/atimer.h \
 	$(SRC)/blockinput.h \
 	$(SRC)/buffer.h \
@@ -1585,7 +1590,7 @@
 	$(SRC)/w32fns.c \
 	$(CONFIG_H) \
 	$(EMACS_ROOT)/nt/inc/sys/time.h \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/atimer.h \
 	$(SRC)/blockinput.h \
 	$(SRC)/buffer.h \
@@ -1614,7 +1619,7 @@
 	$(SRC)/w32menu.c \
 	$(CONFIG_H) \
 	$(EMACS_ROOT)/nt/inc/sys/time.h \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/atimer.h \
 	$(SRC)/blockinput.h \
 	$(SRC)/buffer.h \
@@ -1638,7 +1643,7 @@
 	$(CONFIG_H) \
 	$(EMACS_ROOT)/nt/inc/unistd.h \
 	$(EMACS_ROOT)/nt/inc/sys/time.h \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/atimer.h \
 	$(SRC)/blockinput.h \
 	$(SRC)/buffer.h \
@@ -1655,7 +1660,7 @@
 	$(SRC)/intervals.h \
 	$(SRC)/keyboard.h \
 	$(SRC)/keymap.h \
-	$(SRC)/process.h \
+	$(PROCESS_H) \
 	$(SRC)/systime.h \
 	$(SRC)/systty.h \
 	$(SRC)/termchar.h \
@@ -1671,7 +1676,7 @@
 	$(SRC)/w32select.c \
 	$(CONFIG_H) \
 	$(EMACS_ROOT)/nt/inc/sys/time.h \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/atimer.h \
 	$(SRC)/blockinput.h \
 	$(SRC)/character.h \
@@ -1688,7 +1693,7 @@
 	$(SRC)/w32reg.c \
 	$(CONFIG_H) \
 	$(EMACS_ROOT)/nt/inc/sys/time.h \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/atimer.h \
 	$(SRC)/blockinput.h \
 	$(SRC)/systime.h \
@@ -1699,7 +1704,7 @@
 	$(SRC)/w32xfns.c \
 	$(CONFIG_H) \
 	$(EMACS_ROOT)/nt/inc/sys/time.h \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/atimer.h \
 	$(SRC)/blockinput.h \
 	$(SRC)/charset.h \
@@ -1716,7 +1721,7 @@
 $(BLD)/w32font.$(O) : \
 	$(SRC)/w32font.c \
 	$(CONFIG_H) \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/ccl.h \
 	$(SRC)/character.h \
 	$(SRC)/charset.h \
@@ -1733,7 +1738,7 @@
 $(BLD)/w32uniscribe.$(O) : \
 	$(SRC)/w32uniscribe.c \
 	$(CONFIG_H) \
-	$(SRC)/lisp.h \
+	$(LISP_H) \
 	$(SRC)/ccl.h \
 	$(SRC)/character.h \
 	$(SRC)/charset.h \
------------------------------------------------------------
revno: 103115
committer: Sam Steingold <sds@gnu.org>
branch nick: trunk
timestamp: Fri 2011-02-04 09:54:13 -0500
message:
  * lisp/mouse.el (mouse-buffer-menu-mode-groups): Add a "GDB" group.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2011-02-04 10:45:46 +0000
+++ lisp/ChangeLog	2011-02-04 14:54:13 +0000
@@ -1,3 +1,7 @@
+2011-02-04  Sam Steingold  <sds@gnu.org>
+
+	* mouse.el (mouse-buffer-menu-mode-groups): Add a "GDB" group.
+
 2011-02-04  Andreas Schwab  <schwab@linux-m68k.org>
 
 	* international/mule-util.el (with-coding-priority): Doc fix.

=== modified file 'lisp/mouse.el'
--- lisp/mouse.el	2011-02-01 21:37:12 +0000
+++ lisp/mouse.el	2011-02-04 14:54:13 +0000
@@ -1729,6 +1729,8 @@
     ("Outline" . "Text")
     ("\\(HT\\|SG\\|X\\|XHT\\)ML" . "SGML")
     ("log\\|diff\\|vc\\|cvs\\|Annotate" . "Version Control") ; "Change Management"?
+    ("Threads\\|Memory\\|Disassembly\\|Breakpoints\\|Frames\\|Locals\\|Registers\\|Inferior I/O\\|Debugger"
+     . "GDB")
     ("Lisp" . "Lisp")))
   "How to group various major modes together in \\[mouse-buffer-menu].
 Each element has the form (REGEXP . GROUPNAME).
------------------------------------------------------------
revno: 103114
author: Lars Ingebrigtsen <larsi@gnus.org>
committer: Katsumi Yamaoka <yamaoka@jpl.org>
branch nick: trunk
timestamp: Fri 2011-02-04 12:26:36 +0000
message:
  Doc fix.
diff:
=== modified file 'lisp/net/dns.el'
--- lisp/net/dns.el	2011-01-26 08:36:39 +0000
+++ lisp/net/dns.el	2011-02-04 12:26:36 +0000
@@ -252,8 +252,8 @@
       (nreverse spec))))
 
 (defun dns-read-int32 ()
-  ;; Full 32 bit Integers can't be handled by Emacs.  If we use
-  ;; floats, it works.
+  ;; Full 32 bit Integers can't be handled by 32-bit Emacsen.  If we
+  ;; use floats, it works.
   (format "%.0f" (+ (* (dns-read-bytes 1) 16777216.0)
 		    (dns-read-bytes 3))))
------------------------------------------------------------
revno: 103113
committer: Eli Zaretskii <eliz@gnu.org>
branch nick: trunk
timestamp: Fri 2011-02-04 14:01:34 +0200
message:
  deps.mk: Update for recent changes: gnutls, gnulib imports, globals.h.
diff:
=== modified file 'src/ChangeLog'
--- src/ChangeLog	2011-02-04 09:17:36 +0000
+++ src/ChangeLog	2011-02-04 12:01:34 +0000
@@ -1,5 +1,8 @@
 2011-02-04  Eli Zaretskii  <eliz@gnu.org>
 
+	* deps.mk: Update for recent changes: gnutls support, gnulib
+	imports, addition of globals.h.
+
 	* makefile.w32-in (IGNORE_VALUE_H): New variable.
 	($(BLD)/sysdep.$(O)): Depend on $(IGNORE_VALUE_H).
 

=== modified file 'src/deps.mk'
--- src/deps.mk	2011-01-30 23:34:18 +0000
+++ src/deps.mk	2011-02-04 12:01:34 +0000
@@ -37,106 +37,118 @@
 ### Code:
 
 atimer.o: atimer.c atimer.h syssignal.h systime.h lisp.h blockinput.h \
- $(config_h)
-bidi.o: bidi.c buffer.h character.h dispextern.h lisp.h \
-   biditype.h bidimirror.h $(config_h)
+ globals.h ../lib/unistd.h $(config_h)
+bidi.o: bidi.c buffer.h character.h dispextern.h msdos.h lisp.h \
+   biditype.h bidimirror.h globals.h $(config_h)
 buffer.o: buffer.c buffer.h region-cache.h commands.h window.h \
-   $(INTERVALS_H) blockinput.h atimer.h systime.h character.h \
-   indent.h keyboard.h coding.h keymap.h frame.h lisp.h $(config_h)
-callint.o: callint.c window.h commands.h buffer.h keymap.h \
+   $(INTERVALS_H) blockinput.h atimer.h systime.h character.h ../lib/unistd.h \
+   indent.h keyboard.h coding.h keymap.h frame.h lisp.h globals.h $(config_h)
+callint.o: callint.c window.h commands.h buffer.h keymap.h globals.h msdos.h \
    keyboard.h dispextern.h systime.h coding.h composite.h lisp.h $(config_h)
 callproc.o: callproc.c epaths.h buffer.h commands.h lisp.h $(config_h) \
    process.h systty.h syssignal.h character.h coding.h ccl.h msdos.h \
    composite.h w32.h blockinput.h atimer.h systime.h frame.h termhooks.h \
-   buffer.h
+   buffer.h gnutls.h dispextern.h ../lib/unistd.h globals.h
 casefiddle.o: casefiddle.c syntax.h commands.h buffer.h character.h \
-   composite.h keymap.h lisp.h $(config_h)
-casetab.o: casetab.c buffer.h character.h lisp.h $(config_h)
+   composite.h keymap.h lisp.h globals.h $(config_h)
+casetab.o: casetab.c buffer.h character.h lisp.h globals.h $(config_h)
 category.o: category.c category.h buffer.h charset.h keymap.h	\
-   character.h lisp.h $(config_h)
-ccl.o: ccl.c ccl.h charset.h character.h coding.h composite.h lisp.h $(config_h)
+   character.h lisp.h globals.h $(config_h)
+ccl.o: ccl.c ccl.h charset.h character.h coding.h composite.h lisp.h \
+   globals.h $(config_h)
 character.o: character.c character.h buffer.h charset.h composite.h disptab.h \
-   lisp.h $(config_h)
+   lisp.h globals.h $(config_h)
 charset.o: charset.c charset.h character.h buffer.h coding.h composite.h \
-   disptab.h lisp.h $(config_h)
-chartab.o: charset.h character.h ccl.h lisp.h $(config_h)
+   disptab.h lisp.h globals.h ../lib/unistd.h $(config_h)
+chartab.o: charset.h character.h ccl.h lisp.h globals.h $(config_h)
 coding.o: coding.c coding.h ccl.h buffer.h character.h charset.h composite.h \
-   window.h dispextern.h frame.h termhooks.h lisp.h $(config_h)
-cm.o: cm.c frame.h cm.h termhooks.h termchar.h dispextern.h lisp.h $(config_h)
+   window.h dispextern.h msdos.h frame.h termhooks.h \
+   lisp.h globals.h $(config_h)
+cm.o: cm.c frame.h cm.h termhooks.h termchar.h dispextern.h msdos.h \
+   lisp.h globals.h $(config_h)
 cmds.o: cmds.c syntax.h buffer.h character.h commands.h window.h lisp.h \
-   $(config_h) msdos.h dispextern.h keyboard.h keymap.h systime.h \
+   globals.h $(config_h) msdos.h dispextern.h keyboard.h keymap.h systime.h \
    coding.h frame.h composite.h
 pre-crt0.o: pre-crt0.c
 dbusbind.o: dbusbind.c termhooks.h frame.h keyboard.h lisp.h $(config_h)
 dired.o: dired.c commands.h buffer.h lisp.h $(config_h) character.h charset.h \
-   coding.h regex.h systime.h blockinput.h atimer.h composite.h
+   coding.h regex.h systime.h blockinput.h atimer.h composite.h \
+   ../lib/unistd.h globals.h
 dispnew.o: dispnew.c systime.h commands.h process.h frame.h coding.h \
    window.h buffer.h termchar.h termopts.h termhooks.h cm.h \
-   disptab.h indent.h $(INTERVALS_H) nsgui.h \
+   disptab.h indent.h $(INTERVALS_H) nsgui.h ../lib/unistd.h \
    xterm.h blockinput.h atimer.h character.h msdos.h keyboard.h \
-   syssignal.h lisp.h $(config_h)
-doc.o: doc.c lisp.h $(config_h) epaths.h buffer.h keyboard.h keymap.h \
-   character.h systime.h coding.h composite.h
-doprnt.o: doprnt.c character.h lisp.h $(config_h)
+   syssignal.h gnutls.h lisp.h globals.h $(config_h)
+# doc.o's dependency on buildobj.h is in src/Makefile.in.
+doc.o: doc.c lisp.h $(config_h) buffer.h keyboard.h keymap.h \
+   character.h systime.h coding.h composite.h ../lib/unistd.h globals.h
+doprnt.o: doprnt.c character.h lisp.h globals.h ../lib/unistd.h $(config_h)
 dosfns.o: buffer.h termchar.h termhooks.h frame.h blockinput.h window.h \
    msdos.h dosfns.h dispextern.h charset.h coding.h atimer.h systime.h \
    lisp.h $(config_h)
 editfns.o: editfns.c window.h buffer.h systime.h $(INTERVALS_H) character.h \
-   coding.h frame.h blockinput.h atimer.h lisp.h $(config_h)
+   coding.h frame.h blockinput.h atimer.h ../lib/unistd.h ../lib/strftime.h \
+   lisp.h globals.h $(config_h)
 emacs.o: emacs.c commands.h systty.h syssignal.h blockinput.h process.h \
    termhooks.h buffer.h atimer.h systime.h $(INTERVALS_H) lisp.h $(config_h) \
-   window.h dispextern.h keyboard.h keymap.h frame.h coding.h
+   globals.h ../lib/unistd.h window.h dispextern.h keyboard.h keymap.h \
+   frame.h coding.h gnutls.h msdos.h
 fileio.o: fileio.c window.h buffer.h systime.h $(INTERVALS_H) character.h \
-   coding.h msdos.h blockinput.h atimer.h lisp.h $(config_h) frame.h commands.h
+   coding.h msdos.h blockinput.h atimer.h lisp.h $(config_h) frame.h \
+   commands.h globals.h ../lib/unistd.h
 filelock.o: filelock.c buffer.h character.h coding.h systime.h composite.h \
-   lisp.h $(config_h)
+   ../lib/unistd.h lisp.h globals.h $(config_h)
 filemode.o: filemode.c $(config_h)
+font.o: font.c dispextern.h frame.h window.h ccl.h character.h charset.h \
+   font.h lisp.h globals.h $(config_h) buffer.h composite.h fontset.h \
+   xterm.h nsgui.h msdos.h
+fontset.o: fontset.c fontset.h ccl.h buffer.h character.h \
+   charset.h frame.h keyboard.h termhooks.h font.h lisp.h $(config_h) \
+   blockinput.h atimer.h systime.h coding.h $(INTERVALS_H) nsgui.h \
+   window.h xterm.h globals.h
 frame.o: frame.c xterm.h window.h frame.h termhooks.h commands.h keyboard.h \
    blockinput.h atimer.h systime.h buffer.h character.h fontset.h font.h    \
    msdos.h dosfns.h dispextern.h w32term.h nsgui.h termchar.h coding.h \
-   composite.h lisp.h $(config_h) termhooks.h ccl.h
+   composite.h lisp.h globals.h $(config_h) termhooks.h ccl.h
 fringe.o: fringe.c dispextern.h nsgui.h frame.h window.h buffer.h termhooks.h \
-   blockinput.h atimer.h systime.h lisp.h $(config_h)
-font.o: font.c dispextern.h frame.h window.h ccl.h character.h charset.h \
-   font.h lisp.h $(config_h) buffer.h composite.h fontset.h xterm.h nsgui.h
-ftfont.o: dispextern.h frame.h character.h charset.h composite.h font.h \
-   lisp.h $(config_h) blockinput.h atimer.h systime.h coding.h fontset.h \
-   ccl.h ftfont.h
-fontset.o: fontset.c fontset.h ccl.h buffer.h character.h \
-   charset.h frame.h keyboard.h termhooks.h font.h lisp.h $(config_h) \
-   blockinput.h atimer.h systime.h coding.h $(INTERVALS_H) nsgui.h \
-   window.h xterm.h
+   blockinput.h atimer.h systime.h lisp.h globals.h $(config_h)
+ftfont.o: ftfont.c dispextern.h frame.h character.h charset.h composite.h \
+   font.h lisp.h $(config_h) blockinput.h atimer.h systime.h coding.h \
+   fontset.h ccl.h ftfont.h globals.h
 getloadavg.o: getloadavg.c $(config_h)
+gnutls.o: gnutls.c gnutls.h process.h ../lib/unistd.h \
+   lisp.h globals.h $(config_h)
 gtkutil.o: gtkutil.c gtkutil.h xterm.h lisp.h frame.h lisp.h $(config_h) \
-   blockinput.h window.h atimer.h systime.h termhooks.h keyboard.h \
-   charset.h coding.h syssignal.h dispextern.h composite.h
+   blockinput.h window.h atimer.h systime.h termhooks.h keyboard.h charset.h \
+   coding.h syssignal.h dispextern.h composite.h globals.h xsettings.h
 image.o: image.c frame.h window.h dispextern.h blockinput.h atimer.h \
    systime.h xterm.h w32term.h w32gui.h font.h epaths.h character.h coding.h \
-   nsterm.h nsgui.h lisp.h $(config_h) composite.h termhooks.h ccl.h
+   nsterm.h nsgui.h ../lib/unistd.h lisp.h globals.h $(config_h) \
+   composite.h termhooks.h ccl.h
 indent.o: indent.c frame.h window.h indent.h buffer.h lisp.h $(config_h) \
    termchar.h termopts.h disptab.h region-cache.h character.h category.h \
-   keyboard.h systime.h coding.h $(INTERVALS_H)
+   keyboard.h systime.h coding.h $(INTERVALS_H) globals.h
 insdel.o: insdel.c window.h buffer.h $(INTERVALS_H) blockinput.h character.h \
-   dispextern.h atimer.h systime.h region-cache.h lisp.h $(config_h)
+   atimer.h systime.h region-cache.h lisp.h globals.h $(config_h)
 keyboard.o: keyboard.c termchar.h termhooks.h termopts.h buffer.h character.h \
    commands.h frame.h window.h macros.h disptab.h keyboard.h syssignal.h \
    systime.h syntax.h $(INTERVALS_H) blockinput.h atimer.h composite.h \
    xterm.h puresize.h msdos.h keymap.h w32term.h nsterm.h nsgui.h coding.h \
-   lisp.h $(config_h)
+   process.h ../lib/unistd.h gnutls.h lisp.h globals.h $(config_h)
 keymap.o: keymap.c buffer.h commands.h keyboard.h termhooks.h blockinput.h \
    atimer.h systime.h puresize.h character.h charset.h $(INTERVALS_H) \
-   keymap.h window.h coding.h frame.h lisp.h $(config_h)
+   keymap.h window.h coding.h frame.h lisp.h globals.h $(config_h)
 lastfile.o: lastfile.c $(config_h)
-macros.o: macros.c window.h buffer.h commands.h macros.h keyboard.h \
-   dispextern.h lisp.h $(config_h) systime.h coding.h composite.h
+macros.o: macros.c window.h buffer.h commands.h macros.h keyboard.h msdos.h \
+   dispextern.h lisp.h globals.h $(config_h) systime.h coding.h composite.h
 gmalloc.o: gmalloc.c $(config_h)
 ralloc.o: ralloc.c lisp.h $(config_h)
-vm-limit.o: vm-limit.c mem-limits.h lisp.h $(config_h)
-marker.o: marker.c buffer.h character.h lisp.h $(config_h)
+vm-limit.o: vm-limit.c mem-limits.h lisp.h globals.h $(config_h)
+marker.o: marker.c buffer.h character.h lisp.h globals.h $(config_h)
 md5.o: md5.c md5.h $(config_h)
 minibuf.o: minibuf.c syntax.h frame.h window.h keyboard.h systime.h \
    buffer.h commands.h character.h msdos.h $(INTERVALS_H) keymap.h \
-   termhooks.h lisp.h $(config_h) coding.h
+   termhooks.h lisp.h globals.h $(config_h) coding.h
 msdos.o: msdos.c msdos.h dosfns.h systime.h termhooks.h dispextern.h frame.h \
    termopts.h termchar.h character.h coding.h ccl.h disptab.h window.h \
    keyboard.h $(INTERVALS_H) buffer.h commands.h blockinput.h atimer.h \
@@ -156,39 +168,45 @@
 nsselect.o: nsselect.m blockinput.h nsterm.h nsgui.h frame.h lisp.h $(config_h)
 process.o: process.c process.h buffer.h window.h termhooks.h termopts.h \
    commands.h syssignal.h systime.h systty.h syswait.h frame.h dispextern.h \
-   blockinput.h atimer.h charset.h coding.h ccl.h msdos.h composite.h \
-   keyboard.h lisp.h $(config_h) character.h xgselect.h sysselect.h
-regex.o: regex.c syntax.h buffer.h lisp.h $(config_h) regex.h \
+   blockinput.h atimer.h coding.h msdos.h nsterm.h composite.h \
+   keyboard.h lisp.h globals.h $(config_h) character.h xgselect.h sysselect.h \
+   ../lib/unistd.h gnutls.h
+regex.o: regex.c syntax.h buffer.h lisp.h globals.h $(config_h) regex.h \
    category.h character.h
-region-cache.o: region-cache.c buffer.h region-cache.h lisp.h $(config_h)
+region-cache.o: region-cache.c buffer.h region-cache.h \
+   lisp.h globals.h $(config_h)
 scroll.o: scroll.c termchar.h dispextern.h frame.h msdos.h keyboard.h \
-   termhooks.h lisp.h $(config_h) systime.h coding.h composite.h window.h
+   termhooks.h lisp.h globals.h $(config_h) systime.h coding.h composite.h \
+   window.h
 search.o: search.c regex.h commands.h buffer.h region-cache.h syntax.h \
    blockinput.h atimer.h systime.h category.h character.h charset.h \
-   $(INTERVALS_H) \
-   lisp.h $(config_h)
-sound.o: sound.c dispextern.h syssignal.h lisp.h $(config_h) atimer.h systime.h
+   $(INTERVALS_H) lisp.h globals.h $(config_h)
+sound.o: sound.c dispextern.h syssignal.h lisp.h globals.h $(config_h) \
+   atimer.h systime.h ../lib/unistd.h msdos.h
 syntax.o: syntax.c syntax.h buffer.h commands.h category.h character.h \
-   keymap.h regex.h $(INTERVALS_H) lisp.h $(config_h)
+   keymap.h regex.h $(INTERVALS_H) lisp.h globals.h $(config_h)
 sysdep.o: sysdep.c syssignal.h systty.h systime.h syswait.h blockinput.h \
    process.h dispextern.h termhooks.h termchar.h termopts.h coding.h \
    frame.h atimer.h window.h msdos.h dosfns.h keyboard.h cm.h lisp.h \
-   $(config_h) composite.h sysselect.h
-term.o: term.c termchar.h termhooks.h termopts.h lisp.h $(config_h) \
+   globals.h $(config_h) composite.h sysselect.h gnutls.h \
+   ../lib/unistd.h ../lib/ignore-value.h
+term.o: term.c termchar.h termhooks.h termopts.h lisp.h globals.h $(config_h) \
    cm.h frame.h disptab.h keyboard.h character.h charset.h coding.h ccl.h \
    xterm.h msdos.h window.h keymap.h blockinput.h atimer.h systime.h \
-   systty.h syssignal.h $(INTERVALS_H) buffer.h
+   systty.h syssignal.h $(INTERVALS_H) buffer.h ../lib/unistd.h
 termcap.o: termcap.c lisp.h $(config_h)
 terminal.o: terminal.c frame.h termchar.h termhooks.h charset.h coding.h \
-   keyboard.h lisp.h $(config_h) dispextern.h composite.h systime.h
-terminfo.o: terminfo.c lisp.h $(config_h)
+   keyboard.h lisp.h globals.h $(config_h) dispextern.h composite.h systime.h \
+   msdos.h
+terminfo.o: terminfo.c lisp.h globals.h $(config_h)
 tparam.o: tparam.c lisp.h $(config_h)
-undo.o: undo.c buffer.h commands.h window.h dispextern.h lisp.h $(config_h)
+undo.o: undo.c buffer.h commands.h window.h dispextern.h msdos.h \
+   lisp.h globals.h $(config_h)
 unexaix.o: unexaix.c lisp.h $(config_h)
 unexalpha.o: unexalpha.c $(config_h)
 unexcw.o: unexcw.c lisp.h $(config_h)
 unexcoff.o: unexcoff.c lisp.h $(config_h)
-unexelf.o: unexelf.c $(config_h)
+unexelf.o: unexelf.c ../lib/unistd.h $(config_h)
 unexhp9k800.o: unexhp9k800.c $(config_h)
 unexmacosx.o: unexmacosx.c $(config_h)
 unexsol.o: unexsol.c lisp.h $(config_h)
@@ -200,79 +218,90 @@
 window.o: window.c indent.h commands.h frame.h window.h buffer.h termchar.h \
    disptab.h keyboard.h msdos.h coding.h termhooks.h \
    keymap.h blockinput.h atimer.h systime.h $(INTERVALS_H) \
-   xterm.h w32term.h nsterm.h nsgui.h lisp.h $(config_h)
-xdisp.o: xdisp.c macros.h commands.h process.h indent.h buffer.h dispextern.h \
+   xterm.h w32term.h nsterm.h nsgui.h lisp.h globals.h $(config_h)
+xdisp.o: xdisp.c macros.h commands.h process.h indent.h buffer.h \
    coding.h termchar.h frame.h window.h disptab.h termhooks.h character.h \
    charset.h lisp.h $(config_h) keyboard.h $(INTERVALS_H) region-cache.h \
    xterm.h w32term.h nsterm.h nsgui.h msdos.h composite.h fontset.h ccl.h \
-   blockinput.h atimer.h systime.h keymap.h font.h
-xfaces.o: xfaces.c dispextern.h frame.h xterm.h buffer.h blockinput.h	\
+   blockinput.h atimer.h systime.h keymap.h font.h globals.h termopts.h \
+   ../lib/unistd.h gnutls.h gtkutil.h
+xfaces.o: xfaces.c frame.h xterm.h buffer.h blockinput.h \
    window.h character.h charset.h msdos.h dosfns.h composite.h atimer.h	\
    systime.h keyboard.h fontset.h w32term.h nsterm.h coding.h ccl.h \
-   $(INTERVALS_H) nsgui.h termchar.h termhooks.h font.h lisp.h $(config_h)
-xfns.o: xfns.c buffer.h frame.h window.h keyboard.h xterm.h dispextern.h \
+   $(INTERVALS_H) nsgui.h termchar.h termhooks.h font.h \
+   lisp.h globals.h $(config_h)
+xfns.o: xfns.c buffer.h frame.h window.h keyboard.h xterm.h \
    $(srcdir)/../lwlib/lwlib.h blockinput.h atimer.h systime.h epaths.h \
    character.h charset.h coding.h gtkutil.h lisp.h $(config_h) termhooks.h \
-   fontset.h termchar.h font.h xsettings.h $(INTERVALS_H) ccl.h
+   fontset.h termchar.h font.h xsettings.h $(INTERVALS_H) ccl.h globals.h \
+   ../lib/unistd.h
 xfont.o: dispextern.h xterm.h frame.h blockinput.h character.h charset.h \
-   font.h lisp.h $(config_h) atimer.h systime.h fontset.h ccl.h
-xftfont.o: dispextern.h xterm.h frame.h blockinput.h character.h charset.h \
-   font.h lisp.h $(config_h) atimer.h systime.h fontset.h ccl.h ftfont.h
-ftxfont.o: dispextern.h xterm.h frame.h blockinput.h character.h charset.h \
-   font.h lisp.h $(config_h) atimer.h systime.h fontset.h ccl.h
+   font.h lisp.h globals.h $(config_h) atimer.h systime.h fontset.h ccl.h
+xftfont.o: xftfont.c dispextern.h xterm.h frame.h blockinput.h character.h \
+   charset.h font.h lisp.h globals.h $(config_h) atimer.h systime.h \
+   fontset.h ccl.h ftfont.h composite.h
+ftxfont.o: ftxfont.c dispextern.h xterm.h frame.h blockinput.h character.h \
+   charset.h font.h lisp.h globals.h $(config_h) atimer.h systime.h \
+   fontset.h ccl.h
 menu.o: menu.c lisp.h keyboard.h keymap.h frame.h termhooks.h blockinput.h \
    dispextern.h $(srcdir)/../lwlib/lwlib.h xterm.h gtkutil.h menu.h \
-   lisp.h $(config_h) systime.h coding.h composite.h window.h atimer.h nsgui.h
+   lisp.h globals.h $(config_h) systime.h coding.h composite.h window.h \
+   atimer.h nsterm.h w32term.h msdos.h
 xmenu.o: xmenu.c xterm.h termhooks.h window.h dispextern.h frame.h buffer.h \
    charset.h keyboard.h $(srcdir)/../lwlib/lwlib.h blockinput.h atimer.h \
-   systime.h gtkutil.h msdos.h coding.h menu.h lisp.h $(config_h) composite.h \
-   keymap.h sysselect.h
-xml.o: xml.c buffer.h lisp.h $(config_h)
+   systime.h gtkutil.h msdos.h coding.h menu.h lisp.h globals.h $(config_h) \
+   composite.h keymap.h sysselect.h
+xml.o: xml.c buffer.h lisp.h globals.h $(config_h)
 xterm.o: xterm.c xterm.h termhooks.h termopts.h termchar.h window.h buffer.h \
    dispextern.h frame.h disptab.h blockinput.h atimer.h systime.h syssignal.h \
    keyboard.h emacs-icon.h character.h charset.h ccl.h fontset.h composite.h \
-   coding.h process.h gtkutil.h font.h fontset.h lisp.h $(config_h) \
-   xsettings.h intervals.h keymap.h xgselect.h sysselect.h
+   coding.h process.h gtkutil.h font.h fontset.h lisp.h globals.h $(config_h) \
+   xsettings.h intervals.h keymap.h xgselect.h sysselect.h ../lib/unistd.h \
+   gnutls.h
 xselect.o: xselect.c process.h dispextern.h frame.h xterm.h blockinput.h \
    buffer.h atimer.h systime.h termhooks.h lisp.h $(config_h) keyboard.h \
-   coding.h composite.h
-xgselect.o: xgselect.h systime.h sysselect.h lisp.h $(config_h)
-xrdb.o: xrdb.c lisp.h $(config_h) epaths.h
+   coding.h composite.h ../lib/unistd.h globals.h gnutls.h
+xgselect.o: xgselect.h systime.h sysselect.h lisp.h globals.h $(config_h)
+xrdb.o: xrdb.c lisp.h globals.h $(config_h) epaths.h ../lib/unistd.h
 xsmfns.o: xsmfns.c lisp.h $(config_h) systime.h sysselect.h termhooks.h \
-   xterm.h lisp.h termopts.h frame.h dispextern.h
+   xterm.h lisp.h termopts.h frame.h dispextern.h ../lib/unistd.h globals.h \
+   gnutls.h keyboard.h coding.h composite.h
 xsettings.o: xterm.h xsettings.h lisp.h frame.h termhooks.h $(config_h) \
    dispextern.h keyboard.h systime.h coding.h composite.h blockinput.h \
-   atimer.h termopts.h
+   atimer.h termopts.h globals.h
 
 ## The files of Lisp proper.
 alloc.o: alloc.c process.h frame.h window.h buffer.h  puresize.h syssignal.h \
    keyboard.h blockinput.h atimer.h systime.h character.h lisp.h $(config_h) \
-   $(INTERVALS_H) termhooks.h
+   $(INTERVALS_H) termhooks.h gnutls.h coding.h ../lib/unistd.h globals.h
 bytecode.o: bytecode.c buffer.h syntax.h character.h window.h dispextern.h \
-  frame.h xterm.h lisp.h $(config_h)
+  lisp.h globals.h $(config_h) msdos.h
 data.o: data.c buffer.h puresize.h character.h syssignal.h keyboard.h frame.h \
    termhooks.h systime.h coding.h composite.h dispextern.h font.h ccl.h \
-   lisp.h $(config_h)
-eval.o: eval.c commands.h keyboard.h blockinput.h atimer.h systime.h \
-   dispextern.h lisp.h $(config_h) coding.h composite.h xterm.h
-floatfns.o: floatfns.c syssignal.h lisp.h $(config_h)
+   lisp.h globals.h $(config_h) msdos.h
+eval.o: eval.c commands.h keyboard.h blockinput.h atimer.h systime.h frame.h \
+   dispextern.h lisp.h globals.h $(config_h) coding.h composite.h xterm.h \
+   msdos.h
+floatfns.o: floatfns.c syssignal.h lisp.h globals.h $(config_h)
 fns.o: fns.c commands.h lisp.h $(config_h) frame.h buffer.h character.h \
-   keyboard.h keymap.h window.h dispextern.h $(INTERVALS_H) coding.h md5.h \
-   blockinput.h atimer.h systime.h xterm.h
+   keyboard.h keymap.h window.h $(INTERVALS_H) coding.h md5.h \
+   blockinput.h atimer.h systime.h xterm.h ../lib/unistd.h globals.h
 print.o: print.c process.h frame.h window.h buffer.h keyboard.h character.h \
-   lisp.h $(config_h) termchar.h $(INTERVALS_H) msdos.h termhooks.h \
-   blockinput.h atimer.h systime.h font.h charset.h coding.h ccl.h
+   lisp.h globals.h $(config_h) termchar.h $(INTERVALS_H) msdos.h termhooks.h \
+   blockinput.h atimer.h systime.h font.h charset.h coding.h ccl.h \
+   gnutls.h ../lib/unistd.h ../lib/ftoastr.h ../lib/intprops.h
 lread.o: lread.c commands.h keyboard.h buffer.h epaths.h character.h \
-   charset.h lisp.h $(config_h) $(INTERVALS_H) termhooks.h coding.h msdos.h \
-   systime.h frame.h blockinput.h atimer.h
+   charset.h lisp.h globals.h $(config_h) $(INTERVALS_H) termhooks.h \
+   coding.h msdos.h systime.h frame.h blockinput.h atimer.h ../lib/unistd.h
 
 ## Text properties support.
-composite.o: composite.c buffer.h character.h coding.h font.h ccl.h \
-   frame.h termhooks.h $(INTERVALS_H) window.h lisp.h $(config_h)
+composite.o: composite.c composite.h buffer.h character.h coding.h font.h \
+   ccl.h frame.h termhooks.h $(INTERVALS_H) window.h \
+   lisp.h globals.h $(config_h)
 intervals.o: intervals.c buffer.h $(INTERVALS_H) keyboard.h puresize.h \
-   keymap.h lisp.h $(config_h) systime.h coding.h
+   keymap.h lisp.h globals.h $(config_h) systime.h coding.h
 textprop.o: textprop.c buffer.h window.h $(INTERVALS_H) \
-   lisp.h $(config_h)
+   lisp.h globals.h $(config_h)
 
 
 ### deps.mk ends here
------------------------------------------------------------
revno: 103112
committer: Andreas Schwab <schwab@linux-m68k.org>
branch nick: emacs
timestamp: Fri 2011-02-04 11:45:46 +0100
message:
  * international/mule-util.el (with-coding-priority): Doc fix.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2011-02-04 09:12:32 +0000
+++ lisp/ChangeLog	2011-02-04 10:45:46 +0000
@@ -1,3 +1,7 @@
+2011-02-04  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* international/mule-util.el (with-coding-priority): Doc fix.
+
 2011-02-04  Eli Zaretskii  <eliz@gnu.org>
 
 	* arc-mode.el (archive-mode-map): Fix a typo in last change.

=== modified file 'lisp/international/mule-util.el'
--- lisp/international/mule-util.el	2011-01-25 04:08:28 +0000
+++ lisp/international/mule-util.el	2011-02-04 10:45:46 +0000
@@ -313,7 +313,7 @@
 ;;;###autoload
 (defmacro with-coding-priority (coding-systems &rest body)
   "Execute BODY like `progn' with CODING-SYSTEMS at the front of priority list.
-CODING-SYSTEMS is a list of coding systems.  See `set-coding-priority'.
+CODING-SYSTEMS is a list of coding systems.  See `set-coding-system-priority'.
 This affects the implicit sorting of lists of coding sysems returned by
 operations such as `find-coding-systems-region'."
   (let ((current (make-symbol "current")))
------------------------------------------------------------
revno: 103111
author: Lars Ingebrigtsen <larsi@gnus.org>
committer: Katsumi Yamaoka <yamaoka@jpl.org>
branch nick: trunk
timestamp: Fri 2011-02-04 09:51:56 +0000
message:
  message.el (message-setup-1): Don't bind the constant -forbidden-properties.
   (message-setup-1): Revert previous change, since it needs to bind the props to insert them.
   (message-resend): Allow removing the read-only separator line.
diff:
=== modified file 'lisp/gnus/ChangeLog'
--- lisp/gnus/ChangeLog	2011-02-03 23:43:22 +0000
+++ lisp/gnus/ChangeLog	2011-02-04 09:51:56 +0000
@@ -1,3 +1,11 @@
+2011-02-04  Lars Ingebrigtsen  <larsi@gnus.org>
+
+	* message.el (message-setup-1): Don't bind the constant
+	-forbidden-properties.
+	(message-setup-1): Revert previous change, since it needs to bind the
+	props to insert them.
+	(message-resend): Allow removing the read-only separator line.
+
 2011-02-03  Lars Ingebrigtsen  <larsi@gnus.org>
 
 	* nnimap.el (nnimap-request-accept-article): Give an error message if

=== modified file 'lisp/gnus/message.el'
--- lisp/gnus/message.el	2011-02-03 23:43:22 +0000
+++ lisp/gnus/message.el	2011-02-04 09:51:56 +0000
@@ -129,6 +129,17 @@
   :group 'message-buffers
   :type '(choice function (const nil)))
 
+(defcustom message-cite-style nil
+  "The overall style to be used when yanking cited text.
+Values are either `traditional' (cited text first),
+`top-post' (cited text at the bottom), or nil (don't override the
+individual message variables)."
+  :version "24.1"
+  :group 'message-various
+  :type '(choice (const :tag "None" :value nil)
+		 (const :tag "Traditional" :value traditional)
+		 (const :tag "Top-post" :value top-post)))
+
 (defcustom message-fcc-handler-function 'message-output
   "*A function called to save outgoing articles.
 This function will be called with the name of the file to store the
@@ -2764,7 +2775,7 @@
   :link '(custom-manual "(message)Various Message Variables")
   :type 'boolean)
 
-(defconst message-forbidden-properties
+(defvar message-forbidden-properties
   ;; No reason this should be clutter up customize.  We make it a
   ;; property list (rather than a list of property symbols), to be
   ;; directly useful for `remove-text-properties'.
@@ -6402,7 +6413,7 @@
     (or (bolp) (insert ?\n)))
   (let ((message-forbidden-properties nil))
     (insert (propertize (concat mail-header-separator "\n")
-                        'read-only t 'rear-nonsticky t 'intangible t)))
+			'read-only t 'rear-nonsticky t 'intangible t)))
   (forward-line -1)
   ;; If a crash happens while replying, the auto-save file would *not* have a
   ;; `References:' header if `message-generate-headers-first' was nil.
@@ -7429,7 +7440,8 @@
       ;; We first set up a normal mail buffer.
       (unless (message-mail-user-agent)
 	(set-buffer (get-buffer-create " *message resend*"))
-	(erase-buffer))
+	(let ((inhibit-read-only t))
+	  (erase-buffer)))
       (let ((message-this-is-mail t)
 	    message-generate-hashcash
 	    message-setup-hook)
@@ -7446,7 +7458,8 @@
 	(insert "Resent-"))
       (widen)
       (forward-line)
-      (delete-region (point) (point-max))
+      (let ((inhibit-read-only t))
+	(delete-region (point) (point-max)))
       (setq beg (point))
       ;; Insert the message to be resent.
       (insert-buffer-substring cur)
------------------------------------------------------------
revno: 103110
committer: Eli Zaretskii <eliz@gnu.org>
branch nick: trunk
timestamp: Fri 2011-02-04 11:17:36 +0200
message:
  Adapt to addition of ignore-value.h in revision 103104.
  
   src/makefile.w32-in (IGNORE_VALUE_H): New variable.
   ($(BLD)/sysdep.$(O)): Depend on $(IGNORE_VALUE_H).
   nt/config.nt (inline) [__GNUC__]: Define (for gnulib).
diff:
=== modified file 'nt/ChangeLog'
--- nt/ChangeLog	2011-01-31 20:04:42 +0000
+++ nt/ChangeLog	2011-02-04 09:17:36 +0000
@@ -1,3 +1,7 @@
+2011-02-04  Eli Zaretskii  <eliz@gnu.org>
+
+	* config.nt (inline) [__GNUC__]: Define (for gnulib).
+
 2011-01-31  Eli Zaretskii  <eliz@gnu.org>
 
 	* config.nt (VERSION): Uncomment definition.

=== modified file 'nt/config.nt'
--- nt/config.nt	2011-01-31 19:36:08 +0000
+++ nt/config.nt	2011-02-04 09:17:36 +0000
@@ -340,6 +340,7 @@
 /* If using GNU, then support inline function declarations. */
 #ifdef __GNUC__
 #define INLINE __inline__
+#define inline __inline__
 #else
 #define INLINE
 #endif

=== modified file 'src/ChangeLog'
--- src/ChangeLog	2011-02-03 19:29:35 +0000
+++ src/ChangeLog	2011-02-04 09:17:36 +0000
@@ -1,3 +1,8 @@
+2011-02-04  Eli Zaretskii  <eliz@gnu.org>
+
+	* makefile.w32-in (IGNORE_VALUE_H): New variable.
+	($(BLD)/sysdep.$(O)): Depend on $(IGNORE_VALUE_H).
+
 2011-02-03  Paul Eggert  <eggert@cs.ucla.edu>
 
 	allow C code to suppress warnings about ignored return values

=== modified file 'src/makefile.w32-in'
--- src/makefile.w32-in	2011-01-31 19:36:08 +0000
+++ src/makefile.w32-in	2011-02-04 09:17:36 +0000
@@ -347,6 +347,7 @@
 	     $(EMACS_ROOT)/src/m/intel386.h \
 	     $(EMACS_ROOT)/src/config.h \
 	     $(EMACS_ROOT)/nt/inc/sys/stat.h
+IGNORE_VALUE_H = $(EMACS_ROOT)/lib/ignore-value.h
 
 $(BLD)/alloc.$(O) : \
 	$(SRC)/alloc.c \
@@ -1388,6 +1389,7 @@
 	$(EMACS_ROOT)/nt/inc/sys/file.h \
 	$(EMACS_ROOT)/nt/inc/sys/socket.h \
 	$(EMACS_ROOT)/nt/inc/sys/time.h \
+	$(IGNORE_VALUE_H) \
 	$(SRC)/lisp.h \
 	$(SRC)/atimer.h \
 	$(SRC)/blockinput.h \
------------------------------------------------------------
revno: 103109
committer: Eli Zaretskii <eliz@gnu.org>
branch nick: trunk
timestamp: Fri 2011-02-04 11:12:32 +0200
message:
  Fix bug #7977 with special-mode-map in arc-mode.el.
  
   arc-mode.el (archive-mode-map): Fix a typo in last change.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2011-02-03 19:59:17 +0000
+++ lisp/ChangeLog	2011-02-04 09:12:32 +0000
@@ -1,3 +1,7 @@
+2011-02-04  Eli Zaretskii  <eliz@gnu.org>
+
+	* arc-mode.el (archive-mode-map): Fix a typo in last change.
+
 2011-02-03  Sam Steingold  <sds@gnu.org>
 
 	* progmodes/gdb-mi.el (gdb-breakpoints-list-handler-custom):

=== modified file 'lisp/arc-mode.el'
--- lisp/arc-mode.el	2011-02-01 21:22:21 +0000
+++ lisp/arc-mode.el	2011-02-04 09:12:32 +0000
@@ -339,7 +339,7 @@
 (defvar archive-local-name nil "Name of local copy of remote archive.")
 (defvar archive-mode-map
   (let ((map (make-keymap)))
-    (set-keymap-parent map 'special-mode-map)
+    (set-keymap-parent map special-mode-map)
     (define-key map " " 'archive-next-line)
     (define-key map "a" 'archive-alternate-display)
     ;;(define-key map "c" 'archive-copy)
------------------------------------------------------------
revno: 103108
committer: Glenn Morris <rgm@gnu.org>
branch nick: trunk
timestamp: Thu 2011-02-03 19:27:18 -0800
message:
  * lisp/obsolete/spell.el: Undo previous comment change.
diff:
=== modified file 'lisp/obsolete/spell.el'
--- lisp/obsolete/spell.el	2011-02-03 07:15:31 +0000
+++ lisp/obsolete/spell.el	2011-02-04 03:27:18 +0000
@@ -4,7 +4,8 @@
 
 ;; Maintainer: FSF
 ;; Keywords: wp, unix
-;; Obsolete-since: 24.1
+;; Obsolete-since: 23.1
+;;   (not in obsolete/ directory then, but all functions marked obsolete)
 
 ;; This file is part of GNU Emacs.
------------------------------------------------------------
Use --include-merges or -n0 to see merged revisions.