Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/
Now on revision 100241.
------------------------------------------------------------
revno: 100241
committer: Glenn Morris <rgm@gnu.org>
branch nick: trunk
timestamp: Tue 2010-05-11 20:44:36 -0700
message:
  Simplify linker-related logic in src/Makefile.in.
  
  * src/Makefile.in (YMF_PASS_LDFLAGS, LD, LINKER): Simplify the logic.
  (LINKER_WAS_SPECIFIED): Remove.
diff:
=== modified file 'src/ChangeLog'
--- src/ChangeLog	2010-05-12 03:01:16 +0000
+++ src/ChangeLog	2010-05-12 03:44:36 +0000
@@ -1,5 +1,8 @@
 2010-05-12  Glenn Morris  <rgm@gnu.org>
 
+	* Makefile.in (YMF_PASS_LDFLAGS, LD, LINKER): Simplify the logic.
+	(LINKER_WAS_SPECIFIED): Remove.
+
 	* Makefile.in (LIB_GCC): Set using configure, not cpp.
 	(GNULIB_VAR) [!ORDINARY_LINK]: Always set to $LIB_GCC.
 	* m/arm.h (LIB_GCC) [GNU_LINUX]:

=== modified file 'src/Makefile.in'
--- src/Makefile.in	2010-05-12 03:01:16 +0000
+++ src/Makefile.in	2010-05-12 03:44:36 +0000
@@ -1,7 +1,7 @@
 # Makefile for GNU Emacs.
 # Copyright (C) 1985, 1987, 1988, 1993, 1994, 1995, 1999, 2000, 2001, 2002,
-#               2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-#               Free Software Foundation, Inc.
+#   2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+#   Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -260,16 +260,22 @@
 LIBX_OTHER=@LIBX_OTHER@
 #endif /* not HAVE_X_WINDOWS */
 
-#ifndef ORDINARY_LINK
+
+/* A macro which other sections of Makefile can redefine to munge the
+   flags before they are passed to LD.  This is helpful if you have
+   redefined LD to something odd, like "gcc".
+   (The YMF prefix is a holdover from the old name "ymakefile".)  */
+#define YMF_PASS_LDFLAGS(flags) flags
+
+
+#ifdef ORDINARY_LINK
+LD = $(CC)
+
+#else /* not ORDINARY_LINK */
 GNULIB_VAR = $(LIB_GCC)
 
 /* Fix linking if compiled with GCC.  */
-#ifdef __GNUC__
-
-#ifdef LINKER
-#define LINKER_WAS_SPECIFIED
-#endif
-
+#if defined (__GNUC__) && ! defined (LINKER)
 /* Versions of GCC >= 2.0 put their library, libgcc.a, in obscure
    places that are difficult to figure out at make time.  Fortunately,
    these same versions allow you to pass arbitrary flags on to the
@@ -278,42 +284,23 @@
    Well, it is not quite perfect.  The "-nostdlib" keeps GCC from
    searching for libraries in its internal directories, so we have to
    ask GCC explicitly where to find libgcc.a.  */
-
-#ifndef LINKER
 #define LINKER $(CC) -nostdlib
-#endif
-
-#ifndef LINKER_WAS_SPECIFIED
-/* GCC passes any argument prefixed with -Xlinker directly to the
-   linker.  See prefix-args.c for an explanation of why we do not do
-   this with the shell''s ``for'' construct.
-   Note that some people do not have '.'  in their paths, so we must
-   use ./prefix-args.  */
+/* GCC passes any argument prefixed with -Xlinker directly to the linker.
+   See prefix-args.c for an explanation of why we do not do this with the
+   shell''s ``for'' construct.  Note that sane people do not have '.' in
+   their paths, so we must use ./prefix-args.  */
+#undef YMF_PASS_LDFLAGS
 #define YMF_PASS_LDFLAGS(flags) `./prefix-args -Xlinker flags`
-#else
-#define YMF_PASS_LDFLAGS(flags) flags
-#endif
-
-#endif /* not ORDINARY_LINK */
-
-#ifdef ORDINARY_LINK
-LD = $(CC)
-#else
+#endif /* defined (__GNUC__) && ! defined (LINKER) */
+
 #ifdef LINKER
 LD=LINKER
 #else /* not LINKER */
 LD=ld
 #endif /* not LINKER */
+
 #endif /* not ORDINARY_LINK */
 
-/* A macro which other sections of Makefile can redefine to munge the
-   flags before they are passed to LD.  This is helpful if you have
-   redefined LD to something odd, like "gcc".
-   (The YMF prefix is a holdover from the old name "ymakefile".)
-  */
-#ifndef YMF_PASS_LDFLAGS
-#define YMF_PASS_LDFLAGS(flags) flags
-#endif
 
 #ifdef MSDOS
 #ifdef HAVE_X_WINDOWS
------------------------------------------------------------
revno: 100240
committer: Glenn Morris <rgm@gnu.org>
branch nick: trunk
timestamp: Tue 2010-05-11 20:09:56 -0700
message:
  Regenerate configure.
diff:
=== modified file 'configure'
--- configure	2010-05-11 03:05:31 +0000
+++ configure	2010-05-12 03:09:56 +0000
@@ -800,7 +800,6 @@
 GNUSTEP_SYSTEM_HEADERS
 GNUSTEP_SYSTEM_LIBRARIES
 GNU_OBJC_CFLAGS
-LIB_SRC_EXTRA_INSTALLABLES
 OTHER_FILES
 XMENU_OBJ
 XOBJ
@@ -815,6 +814,7 @@
 POST_ALLOC_OBJ
 LD_SWITCH_SYSTEM_TEMACS
 LD_SWITCH_SYSTEM_EXTRA
+LIB_GCC
 LTLIBOBJS'
 ac_subst_files=''
 ac_user_opts='
@@ -26354,7 +26354,6 @@
 
 
 
-
 cat >>confdefs.h <<_ACEOF
 #define EMACS_CONFIGURATION "${canonical}"
 _ACEOF
@@ -26568,6 +26567,34 @@
 
 
 
+LIB_GCC=
+if test "x$GCC" = "xyes"; then
+
+  case "$opsys" in
+    ## cygwin: don't link against static libgcc.
+    cygwin|freebsd|netbsd|openbsd) LIB_GCC= ;;
+
+    gnu-*)
+      ## armin76@gentoo.org reported that the lgcc_s flag is necessary to
+      ## build on ARM EABI under GNU/Linux.  (Bug#5518)
+      ## Note that m/arm.h never bothered to undefine LIB_GCC first.
+      if test "$machine" = "arm"; then
+        LIB_GCC="-lgcc_s"
+      else
+        ## FIXME? s/gnu-linux.h used to define LIB_GCC as below, then
+        ## immediately undefine it again and redefine it to empty.
+        ## Was the C_SWITCH_X_SITE part really necessary?
+##      LIB_GCC=`$(CC) $(C_SWITCH_X_SITE) -print-libgcc-file-name`
+        LIB_GCC=
+      fi
+      ;;
+
+    ## Ask GCC where to find libgcc.a.
+    *) LIB_GCC=`$(CC) -print-libgcc-file-name 2> /dev/null` ;;
+  esac
+fi
+
+
------------------------------------------------------------
revno: 100239
committer: Glenn Morris <rgm@gnu.org>
branch nick: trunk
timestamp: Tue 2010-05-11 20:06:50 -0700
message:
  Remove unused output variable LIB_SRC_EXTRA_INSTALLABLES.
  
  * configure.in (LIB_SRC_EXTRA_INSTALLABLES): Remove, unused.
  
  * lib-src/Makefile.in (INSTALLABLES): Remove @LIB_SRC_EXTRA_INSTALLABLES@.
  
  * msdos/sed3v2.inp (INSTALLABLES): No more @LIB_SRC_EXTRA_INSTALLABLES@.
diff:
=== modified file 'ChangeLog'
--- ChangeLog	2010-05-12 03:01:16 +0000
+++ ChangeLog	2010-05-12 03:06:50 +0000
@@ -1,5 +1,7 @@
 2010-05-12  Glenn Morris  <rgm@gnu.org>
 
+	* configure.in (LIB_SRC_EXTRA_INSTALLABLES): Remove, unused.
+
 	* configure.in (LIB_GCC): New output variable.
 
 2010-05-11  Glenn Morris  <rgm@gnu.org>

=== modified file 'configure.in'
--- configure.in	2010-05-12 03:01:16 +0000
+++ configure.in	2010-05-12 03:06:50 +0000
@@ -3050,7 +3050,6 @@
 AC_SUBST(GNUSTEP_SYSTEM_HEADERS)
 AC_SUBST(GNUSTEP_SYSTEM_LIBRARIES)
 AC_SUBST(GNU_OBJC_CFLAGS)
-AC_SUBST(LIB_SRC_EXTRA_INSTALLABLES)
 AC_SUBST(OTHER_FILES)
 
 AC_DEFINE_UNQUOTED(EMACS_CONFIGURATION,  "${canonical}",

=== modified file 'lib-src/ChangeLog'
--- lib-src/ChangeLog	2010-05-11 03:18:58 +0000
+++ lib-src/ChangeLog	2010-05-12 03:06:50 +0000
@@ -1,3 +1,7 @@
+2010-05-12  Glenn Morris  <rgm@gnu.org>
+
+	* Makefile.in (INSTALLABLES): Remove @LIB_SRC_EXTRA_INSTALLABLES@.
+
 2010-05-11  Glenn Morris  <rgm@gnu.org>
 
 	* Makefile.in (.m.o): Remove, there are no .m files.

=== modified file 'lib-src/Makefile.in'
--- lib-src/Makefile.in	2010-05-11 03:18:58 +0000
+++ lib-src/Makefile.in	2010-05-12 03:06:50 +0000
@@ -108,7 +108,7 @@
 
 # Things that a user might actually run,
 # which should be installed in bindir.
-INSTALLABLES = etags${EXEEXT} ctags${EXEEXT} emacsclient${EXEEXT} b2m${EXEEXT} ebrowse${EXEEXT} @LIB_SRC_EXTRA_INSTALLABLES@
+INSTALLABLES = etags${EXEEXT} ctags${EXEEXT} emacsclient${EXEEXT} b2m${EXEEXT} ebrowse${EXEEXT}
 INSTALLABLE_SCRIPTS = rcs-checkin grep-changelog
 
 # Things that Emacs runs internally, or during the build process,

=== modified file 'msdos/ChangeLog'
--- msdos/ChangeLog	2010-05-12 03:01:16 +0000
+++ msdos/ChangeLog	2010-05-12 03:06:50 +0000
@@ -1,5 +1,7 @@
 2010-05-12  Glenn Morris  <rgm@gnu.org>
 
+	* sed3v2.inp (INSTALLABLES): No more @LIB_SRC_EXTRA_INSTALLABLES@.
+
 	* sed1v2.inp (LIB_GCC): Edit to -Lgcc.
 
 2010-05-11  Glenn Morris  <rgm@gnu.org>

=== modified file 'msdos/sed3v2.inp'
--- msdos/sed3v2.inp	2010-05-10 02:16:09 +0000
+++ msdos/sed3v2.inp	2010-05-12 03:06:50 +0000
@@ -45,7 +45,6 @@
 /^GETOPT_H *=/s!@GETOPT_H@!getopt.h!
 /^GETOPTOBJS *=/s!@GETOPTOBJS@!getopt.o getopt1.o!
 /^INSTALLABLES/s/emacsclient *//
-/^INSTALLABLES/s/ @LIB_SRC_EXTRA_INSTALLABLES@//
 s!^	\./!	!
 /^UTILITIES=/s/ wakeup//
 /^UTILITIES=/s/ movemail//
------------------------------------------------------------
revno: 100238
committer: Glenn Morris <rgm@gnu.org>
branch nick: trunk
timestamp: Tue 2010-05-11 20:01:16 -0700
message:
  Move LIB_GCC from cpp to configure.
  
  * configure.in (LIB_GCC): New output variable.
  
  * src/Makefile.in (LIB_GCC): Set using configure, not cpp.
  (GNULIB_VAR) [!ORDINARY_LINK]: Always set to $LIB_GCC.
  * src/m/arm.h (LIB_GCC) [GNU_LINUX]:
  * src/s/cygwin.h (LIB_GCC):
  * src/s/freebsd.h (LIB_GCC):
  * src/s/gnu-linux.h (LIB_GCC):
  * src/s/msdos.h (LIB_GCC):
  * src/s/netbsd.h (LIB_GCC):
  Move to configure.
  
  * msdos/sed1v2.inp (LIB_GCC): Edit to -Lgcc.
diff:
=== modified file 'ChangeLog'
--- ChangeLog	2010-05-11 21:02:32 +0000
+++ ChangeLog	2010-05-12 03:01:16 +0000
@@ -1,3 +1,7 @@
+2010-05-12  Glenn Morris  <rgm@gnu.org>
+
+	* configure.in (LIB_GCC): New output variable.
+
 2010-05-11  Glenn Morris  <rgm@gnu.org>
 
 	* make-dist (msdos): No more mainmake.

=== modified file 'configure.in'
--- configure.in	2010-05-11 21:02:32 +0000
+++ configure.in	2010-05-12 03:01:16 +0000
@@ -3234,6 +3234,35 @@
 AC_SUBST(LD_SWITCH_SYSTEM_EXTRA)
 
 
+LIB_GCC=
+if test "x$GCC" = "xyes"; then
+
+  case "$opsys" in
+    ## cygwin: don't link against static libgcc.
+    cygwin|freebsd|netbsd|openbsd) LIB_GCC= ;;
+
+    gnu-*)
+      ## armin76@gentoo.org reported that the lgcc_s flag is necessary to
+      ## build on ARM EABI under GNU/Linux.  (Bug#5518)
+      ## Note that m/arm.h never bothered to undefine LIB_GCC first.
+      if test "$machine" = "arm"; then
+        LIB_GCC="-lgcc_s"
+      else
+        ## FIXME? s/gnu-linux.h used to define LIB_GCC as below, then
+        ## immediately undefine it again and redefine it to empty.
+        ## Was the C_SWITCH_X_SITE part really necessary?
+##      LIB_GCC=`$(CC) $(C_SWITCH_X_SITE) -print-libgcc-file-name`
+        LIB_GCC=
+      fi
+      ;;
+
+    ## Ask GCC where to find libgcc.a.
+    *) LIB_GCC=`$(CC) -print-libgcc-file-name 2> /dev/null` ;;
+  esac
+fi                              dnl if $GCC
+AC_SUBST(LIB_GCC)
+
+
 AH_TOP([/* GNU Emacs site configuration template file.
    Copyright (C) 1988, 1993, 1994, 1999, 2000, 2001, 2002, 2004, 2005,
      2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.

=== modified file 'msdos/ChangeLog'
--- msdos/ChangeLog	2010-05-11 02:51:08 +0000
+++ msdos/ChangeLog	2010-05-12 03:01:16 +0000
@@ -1,3 +1,7 @@
+2010-05-12  Glenn Morris  <rgm@gnu.org>
+
+	* sed1v2.inp (LIB_GCC): Edit to -Lgcc.
+
 2010-05-11  Glenn Morris  <rgm@gnu.org>
 
 	* sed1x.inp (LIBS_SYSTEM): Edit to -lxext -lsys.

=== modified file 'msdos/sed1v2.inp'
--- msdos/sed1v2.inp	2010-05-10 02:16:09 +0000
+++ msdos/sed1v2.inp	2010-05-12 03:01:16 +0000
@@ -51,6 +51,7 @@
 /^LD_SWITCH_SYSTEM *=/s/@LD_SWITCH_SYSTEM@//
 /^LD_SWITCH_SYSTEM_EXTRA *=/s/@LD_SWITCH_SYSTEM_EXTRA@//
 /^LIBS_SYSTEM *=/s/@LIBS_SYSTEM@//
+/^LIB_GCC *=/s/@LIB_GCC@/-Lgcc/
 /^LIBTIFF *=/s/@LIBTIFF@//
 /^LIBJPEG *=/s/@LIBJPEG@//
 /^LIBPNG *=/s/@LIBPNG@//

=== modified file 'src/ChangeLog'
--- src/ChangeLog	2010-05-11 21:02:32 +0000
+++ src/ChangeLog	2010-05-12 03:01:16 +0000
@@ -1,3 +1,15 @@
+2010-05-12  Glenn Morris  <rgm@gnu.org>
+
+	* Makefile.in (LIB_GCC): Set using configure, not cpp.
+	(GNULIB_VAR) [!ORDINARY_LINK]: Always set to $LIB_GCC.
+	* m/arm.h (LIB_GCC) [GNU_LINUX]:
+	* s/cygwin.h (LIB_GCC):
+	* s/freebsd.h (LIB_GCC):
+	* s/gnu-linux.h (LIB_GCC):
+	* s/msdos.h (LIB_GCC):
+	* s/netbsd.h (LIB_GCC):
+	Move to configure.
+
 2010-05-11  Karel Klic  <kklic@redhat.com>
 
 	* ftfont.c: Fix incorrect parentheses of #if condition for

=== modified file 'src/Makefile.in'
--- src/Makefile.in	2010-05-11 02:51:08 +0000
+++ src/Makefile.in	2010-05-12 03:01:16 +0000
@@ -91,6 +91,9 @@
 ## Some systems define this to request special libraries.
 LIBS_SYSTEM=@LIBS_SYSTEM@
 
+## Where to find libgcc.a, if using gcc and necessary.
+LIB_GCC=@LIB_GCC@
+
 LIBTIFF=@LIBTIFF@
 LIBJPEG=@LIBJPEG@
 LIBPNG=@LIBPNG@
@@ -258,6 +261,8 @@
 #endif /* not HAVE_X_WINDOWS */
 
 #ifndef ORDINARY_LINK
+GNULIB_VAR = $(LIB_GCC)
+
 /* Fix linking if compiled with GCC.  */
 #ifdef __GNUC__
 
@@ -278,13 +283,6 @@
 #define LINKER $(CC) -nostdlib
 #endif
 
-#ifndef LIB_GCC
-/* Ask GCC where to find libgcc.a.  */
-#define LIB_GCC `$(CC) -print-libgcc-file-name`
-#endif /* not LIB_GCC */
-
-GNULIB_VAR = LIB_GCC
-
 #ifndef LINKER_WAS_SPECIFIED
 /* GCC passes any argument prefixed with -Xlinker directly to the
    linker.  See prefix-args.c for an explanation of why we do not do
@@ -296,10 +294,6 @@
 #define YMF_PASS_LDFLAGS(flags) flags
 #endif
 
-#else /* not __GNUC__ */
-GNULIB_VAR =
-
-#endif /* not __GNUC__ */
 #endif /* not ORDINARY_LINK */
 
 #ifdef ORDINARY_LINK

=== modified file 'src/m/arm.h'
--- src/m/arm.h	2010-05-12 02:37:59 +0000
+++ src/m/arm.h	2010-05-12 03:01:16 +0000
@@ -24,11 +24,5 @@
 
 #define NO_REMAP
 
-/* armin76@gentoo.org reported that the lgcc_s flag is necessary to
-   build on ARM EABI under GNU/Linux (Bug#5518).  */
-#ifdef GNU_LINUX
-#define LIB_GCC -lgcc_s
-#endif
-
 /* arch-tag: 07856f0c-f0c8-4bd8-99af-0b7fa1e5ee42
    (do not change this comment) */

=== modified file 'src/s/cygwin.h'
--- src/s/cygwin.h	2010-05-08 02:05:24 +0000
+++ src/s/cygwin.h	2010-05-12 03:01:16 +0000
@@ -127,9 +127,6 @@
    returns ENOSYS.  A workaround is to set G_SLICE=always-malloc. */
 #define G_SLICE_ALWAYS_MALLOC
 
-/* Don't link against static libgcc */
-#define LIB_GCC
-
 /* the end */
 
 /* arch-tag: 5ae7ba00-83b0-4ab3-806a-3e845779191b

=== modified file 'src/s/freebsd.h'
--- src/s/freebsd.h	2010-05-10 02:16:09 +0000
+++ src/s/freebsd.h	2010-05-12 03:01:16 +0000
@@ -30,9 +30,6 @@
 
 #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base)
 
-#undef LIB_GCC
-#define LIB_GCC
-
 #define HAVE_GETLOADAVG 1
 #define DECLARE_GETPWUID_WITH_UID_T
 

=== modified file 'src/s/gnu-linux.h'
--- src/s/gnu-linux.h	2010-05-10 00:07:47 +0000
+++ src/s/gnu-linux.h	2010-05-12 03:01:16 +0000
@@ -140,9 +140,6 @@
 #endif /* !_IO_STDIO_H && ! __UCLIBC__ */
 #endif /* emacs */
 
-/* Ask GCC where to find libgcc.a.  */
-#define LIB_GCC `$(CC) $(C_SWITCH_X_SITE) -print-libgcc-file-name`
-
 #ifdef emacs
 #define INTERRUPT_INPUT
 #endif
@@ -151,9 +148,6 @@
 
 #define POSIX                 /* affects getpagesize.h and systty.h */
 
-#undef LIB_GCC
-#define LIB_GCC
-
 #define UNEXEC unexelf.o
 
 /* This is to work around mysterious gcc failures in some system versions.

=== modified file 'src/s/msdos.h'
--- src/s/msdos.h	2010-05-11 02:51:08 +0000
+++ src/s/msdos.h	2010-05-12 03:01:16 +0000
@@ -95,7 +95,6 @@
 #define ORDINARY_LINK
 
 /* command.com does not understand `...` so we define this.  */
-#define LIB_GCC -Lgcc
 #define SEPCHAR ';'
 
 #define NULL_DEVICE "nul"

=== modified file 'src/s/netbsd.h'
--- src/s/netbsd.h	2010-05-08 02:05:24 +0000
+++ src/s/netbsd.h	2010-05-12 03:01:16 +0000
@@ -26,9 +26,6 @@
 
 #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base)
 
-#undef LIB_GCC
-#define LIB_GCC
-
 #define AMPERSAND_FULL_NAME
 
 /* On post 1.3 releases of NetBSD, gcc -nostdlib also clears
------------------------------------------------------------
revno: 100237
committer: Glenn Morris <rgm@gnu.org>
branch nick: trunk
timestamp: Tue 2010-05-11 19:37:59 -0700
message:
  Minor comment reformatting for some src/m/*.h files.
diff:
=== modified file 'src/m/alpha.h'
--- src/m/alpha.h	2010-05-06 05:27:17 +0000
+++ src/m/alpha.h	2010-05-12 02:37:59 +0000
@@ -1,6 +1,7 @@
 /* Machine description file for the alpha chip.
-   Copyright (C) 1994, 1997, 1999, 2001, 2002, 2003, 2004, 2005, 2006,
-                 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+
+Copyright (C) 1994, 1997, 1999, 2001, 2002, 2003, 2004, 2005, 2006,
+  2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 
 Author: Rainer Schoepf
 (according to authors.el)
@@ -30,7 +31,6 @@
 
 /* Now define a symbol for the cpu type, if your compiler
    does not define it automatically.  */
-
 /* __alpha defined automatically */
 
 
@@ -75,12 +75,10 @@
 #else  /* not __ELF__ */
 
 /* Describe layout of the address space in an executing process.  */
-
 #define TEXT_START    0x120000000
 #define DATA_START    0x140000000
 
 /* The program to be used for unexec. */
-
 #define UNEXEC unexalpha.o
 
 #endif /* __ELF__ */

=== modified file 'src/m/amdx86-64.h'
--- src/m/amdx86-64.h	2010-05-03 02:23:42 +0000
+++ src/m/amdx86-64.h	2010-05-12 02:37:59 +0000
@@ -1,6 +1,7 @@
 /* machine description file for AMD x86-64.
-   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-     Free Software Foundation, Inc.
+
+Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -17,16 +18,11 @@
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="linux"  */
-
 #define BITS_PER_LONG           64
 #define BITS_PER_EMACS_INT      64
 
 /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
    is the most significant byte.  */
-
 #undef WORDS_BIG_ENDIAN
 
 /* Now define a symbol for the cpu type, if your compiler
@@ -44,15 +40,12 @@
    are always unsigned.
 
    This flag only matters if you use USE_LISP_UNION_TYPE.  */
-
 #define EXPLICIT_SIGN_EXTEND
 
 /* Data type of load average, as read out of kmem.  */
-
 #define LOAD_AVE_TYPE long
 
 /* Convert that into an integer that is 100 for a load average of 1.0  */
-
 #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
 
 /* Define XPNTR to avoid or'ing with DATA_SEG_BITS */

=== modified file 'src/m/arm.h'
--- src/m/arm.h	2010-04-25 22:16:58 +0000
+++ src/m/arm.h	2010-05-12 02:37:59 +0000
@@ -1,6 +1,7 @@
 /* Machine description file for ARM-based non-RISCiX machines.
-   Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-                 2008, 2009, 2010  Free Software Foundation, Inc.
+
+Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+  2009, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -17,11 +18,8 @@
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-
-
 /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
    is the most significant byte.  */
-
 #undef WORDS_BIG_ENDIAN
 
 #define NO_REMAP

=== modified file 'src/m/hp800.h'
--- src/m/hp800.h	2010-04-25 22:16:58 +0000
+++ src/m/hp800.h	2010-05-12 02:37:59 +0000
@@ -1,6 +1,7 @@
 /* machine description file for hp9000 series 800 machines.
-   Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-                 2008, 2009, 2010  Free Software Foundation, Inc.
+
+Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+  2009, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -17,14 +18,8 @@
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="hpux"  */
-
 /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
    is the most significant byte.  */
-
 #define WORDS_BIG_ENDIAN
 
 /* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
@@ -32,7 +27,6 @@
    are always unsigned.
 
    This flag only matters if you use USE_LISP_UNION_TYPE.  */
-
 #define EXPLICIT_SIGN_EXTEND
 
 /* Systems with GCC don't need to lose. */

=== modified file 'src/m/ia64.h'
--- src/m/ia64.h	2010-04-25 22:16:58 +0000
+++ src/m/ia64.h	2010-05-12 02:37:59 +0000
@@ -1,7 +1,9 @@
 /* machine description file for the IA-64 architecture.
-   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-                 2008, 2009, 2010  Free Software Foundation, Inc.
-     Contributed by David Mosberger <davidm@hpl.hp.com>
+
+Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+  2009, 2010  Free Software Foundation, Inc.
+
+Contributed by David Mosberger <davidm@hpl.hp.com>
 
 This file is part of GNU Emacs.
 
@@ -23,15 +25,12 @@
 
 /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
    is the most significant byte.  */
-
 #undef WORDS_BIG_ENDIAN
 
 /* Now define a symbol for the cpu type, if your compiler
    does not define it automatically.  */
-
 /* __ia64__ defined automatically */
 
-
 /* Define the type to use.  */
 #define EMACS_INT		long
 #define EMACS_UINT		unsigned long
@@ -41,15 +40,12 @@
    are always unsigned.
 
    This flag only matters if you use USE_LISP_UNION_TYPE.  */
-
 #define EXPLICIT_SIGN_EXTEND
 
 /* Data type of load average, as read out of kmem.  */
-
 #define LOAD_AVE_TYPE		long
 
 /* Convert that into an integer that is 100 for a load average of 1.0  */
-
 #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
 
 #ifdef __ELF__

=== modified file 'src/m/ibmrs6000.h'
--- src/m/ibmrs6000.h	2010-05-07 00:30:56 +0000
+++ src/m/ibmrs6000.h	2010-05-12 02:37:59 +0000
@@ -1,6 +1,7 @@
 /* R2 AIX machine/system dependent defines
-   Copyright (C) 1988, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-                 2009, 2010  Free Software Foundation, Inc.
+
+Copyright (C) 1988, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+  2009, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -21,7 +22,6 @@
 /* The data segment in this machine always starts at address 0x20000000.
    An address of data cannot be stored correctly in a Lisp object;
    we always lose the high bits.  We must tell XPNTR to add them back.  */
-
 #define TEXT_START 0x10000000
 #define DATA_START 0x20000000
 #define WORDS_BIG_ENDIAN

=== modified file 'src/m/ibms390.h'
--- src/m/ibms390.h	2010-05-06 05:27:17 +0000
+++ src/m/ibms390.h	2010-05-12 02:37:59 +0000
@@ -1,6 +1,7 @@
 /* machine description file template.
-   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-                 2008, 2009, 2010 Free Software Foundation, Inc.
+
+Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+  2008, 2009, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 

=== modified file 'src/m/ibms390x.h'
--- src/m/ibms390x.h	2010-05-06 05:27:17 +0000
+++ src/m/ibms390x.h	2010-05-12 02:37:59 +0000
@@ -1,6 +1,7 @@
 /* machine description file for IBM S390 in 64-bit mode
-   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-     Free Software Foundation, Inc.
+
+Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -20,7 +21,6 @@
 /* This file was made by copying the significant parts of amdx86-64.h
    into ibms390.h.  */
 
-
 /* Used for machine IBM s390 64 bits with opsys gnu-linux.  */
 #define BITS_PER_LONG 64
 #define BITS_PER_EMACS_INT 64

=== modified file 'src/m/intel386.h'
--- src/m/intel386.h	2010-05-06 05:27:17 +0000
+++ src/m/intel386.h	2010-05-12 02:37:59 +0000
@@ -1,6 +1,7 @@
 /* Machine description file for intel 386.
-   Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-                 2009, 2010  Free Software Foundation, Inc.
+
+Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+  2009, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 

=== modified file 'src/m/iris4d.h'
--- src/m/iris4d.h	2010-05-01 20:23:29 +0000
+++ src/m/iris4d.h	2010-05-12 02:37:59 +0000
@@ -1,6 +1,7 @@
 /* machine description file for Iris-4D machines.  Use with s/irix*.h.
-   Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-                 2008, 2009, 2010  Free Software Foundation, Inc.
+
+Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+  2009, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -20,7 +21,6 @@
 
 /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
    is the most significant byte.  */
-
 #define WORDS_BIG_ENDIAN
 
 /* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
@@ -28,17 +28,13 @@
    are always unsigned.
 
    This flag only matters if you use USE_LISP_UNION_TYPE.  */
-
 #define EXPLICIT_SIGN_EXTEND
 
 #define TEXT_START 0x400000
 
-/*
- * DATA_SEG_BITS forces extra bits to be or'd in with any pointers which
- * were stored in a Lisp_Object (as Emacs uses fewer than 32 bits for
- * the value field of a LISP_OBJECT).
- */
-
+/* DATA_SEG_BITS forces extra bits to be or'd in with any pointers which
+   were stored in a Lisp_Object (as Emacs uses fewer than 32 bits for
+   the value field of a LISP_OBJECT).  */
 #define DATA_START 0x10000000
 #define DATA_SEG_BITS	0x10000000
 
@@ -48,7 +44,6 @@
 
 /* The standard definitions of these macros would work ok,
    but these are faster because the constants are short.  */
-
 #define XUINT(a) (((unsigned)(a) << BITS_PER_INT-VALBITS) >> BITS_PER_INT-VALBITS)
 
 #define XSET(var, type, ptr) \

=== modified file 'src/m/m68k.h'
--- src/m/m68k.h	2010-01-13 08:35:10 +0000
+++ src/m/m68k.h	2010-05-12 02:37:59 +0000
@@ -1,6 +1,7 @@
 /* Machine description file for generic Motorola 68k.
-   Copyright (C) 1985, 1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-                 2008, 2009, 2010  Free Software Foundation, Inc.
+
+Copyright (C) 1985, 1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+  2008, 2009, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -19,12 +20,10 @@
 
 /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
    is the most significant byte.  */
-
 #define WORDS_BIG_ENDIAN
 
 /* Now define a symbol for the cpu type, if your compiler
    does not define it automatically.  */
-
 #ifndef m68k
 #define m68k
 #endif
@@ -34,7 +33,6 @@
    are always unsigned.
 
    This flag only matters if you use USE_LISP_UNION_TYPE.  */
-
 #define EXPLICIT_SIGN_EXTEND
 
 #ifdef GNU_LINUX

=== modified file 'src/m/macppc.h'
--- src/m/macppc.h	2010-04-27 03:14:14 +0000
+++ src/m/macppc.h	2010-05-12 02:37:59 +0000
@@ -1,6 +1,7 @@
 /* machine description file For the powerpc Macintosh.
-   Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-                 2008, 2009, 2010  Free Software Foundation, Inc.
+
+Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+  2009, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -19,15 +20,12 @@
 
 /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
    is the most significant byte.  */
-
 #define WORDS_BIG_ENDIAN
 
 /* Data type of load average, as read out of kmem.  */
-
 #define LOAD_AVE_TYPE long
 
 /* Convert that into an integer that is 100 for a load average of 1.0  */
-
 #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
 
 #if (defined (__NetBSD__) || defined (__OpenBSD__)) && defined (__ELF__)
@@ -36,7 +34,6 @@
 
 /* NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp> says this is needed
    For MkLinux/LinuxPPC.  */
-
 #ifdef GNU_LINUX
 #define LINKER $(CC) -nostdlib
 #endif

=== modified file 'src/m/mips.h'
--- src/m/mips.h	2010-04-25 22:16:58 +0000
+++ src/m/mips.h	2010-05-12 02:37:59 +0000
@@ -1,6 +1,7 @@
 /* m- file for Mips machines.
-   Copyright (C) 1987, 1992, 1999, 2001, 2002, 2003, 2004, 2005, 2006,
-                 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+
+Copyright (C) 1987, 1992, 1999, 2001, 2002, 2003, 2004, 2005, 2006,
+  2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -17,18 +18,8 @@
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="note"
-
-NOTE-START
-This is used on GNU/Linux and netbsd.
-NOTE-END  */
-
 /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
    is the most significant byte.  */
-
 #if ! (defined (__MIPSEL__) || defined (MIPSEL) || defined (_MIPSEL))
 #define WORDS_BIG_ENDIAN
 #endif
@@ -38,13 +29,10 @@
    are always unsigned.
 
    This flag only matters if you use USE_LISP_UNION_TYPE.  */
-
 #define EXPLICIT_SIGN_EXTEND
 
 /* Describe layout of the address space in an executing process.  */
-
 #define TEXT_START      0x00400000
 
 /* arch-tag: 8fd020ee-78a7-4d87-96ce-6129f52f7bee
    (do not change this comment) */
-

=== modified file 'src/m/sparc.h'
--- src/m/sparc.h	2010-05-06 05:27:17 +0000
+++ src/m/sparc.h	2010-05-12 02:37:59 +0000
@@ -1,6 +1,7 @@
 /* machine description file for Sun 4 SPARC.
-   Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-                 2009, 2010  Free Software Foundation, Inc.
+
+Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+  2009, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 

=== modified file 'src/m/template.h'
--- src/m/template.h	2010-04-25 22:16:58 +0000
+++ src/m/template.h	2010-05-12 02:37:59 +0000
@@ -1,6 +1,7 @@
 /* machine description file template.
-   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-                 2008, 2009, 2010  Free Software Foundation, Inc.
+
+Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+  2008, 2009, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -17,14 +18,8 @@
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="<name of system .h file here, without the s- or .h>"  */
-
 /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
    is the most significant byte.  */
-
 #define WORDS_BIG_ENDIAN
 
 /* Now define a symbol for the cpu type, if your compiler
@@ -36,21 +31,17 @@
    are always unsigned.
 
    This flag only matters if you use USE_LISP_UNION_TYPE.  */
-
 #define EXPLICIT_SIGN_EXTEND
 
 /* Data type of load average, as read out of kmem.  */
-
 #define LOAD_AVE_TYPE long
 
 /* Convert that into an integer that is 100 for a load average of 1.0  */
-
 #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
 
 /* Define CANNOT_DUMP on machines where unexec does not work.
    Then the function dump-emacs will not be defined
    and temacs will do (load "loadup") automatically unless told otherwise.  */
-
 #define CANNOT_DUMP
 
 /* Define VIRT_ADDR_VARIES if the virtual addresses of
@@ -59,31 +50,25 @@
 
    Otherwise Emacs assumes that text space precedes data space,
    numerically.  */
-
 #define VIRT_ADDR_VARIES
 
 /* Define NO_REMAP if memory segmentation makes it not work well
    to change the boundary between the text section and data section
    when Emacs is dumped.  If you define this, the preloaded Lisp
    code will not be sharable; but that's better than failing completely.  */
-
 #define NO_REMAP
 
 /* Some really obscure 4.2-based systems (like Sequent DYNIX)
- * do not support asynchronous I/O (using SIGIO) on sockets,
- * even though it works fine on tty's.  If you have one of
- * these systems, define the following, and then use it in
- * config.h (or elsewhere) to decide when (not) to use SIGIO.
- *
- * You'd think this would go in an operating-system description file,
- * but since it only occurs on some, but not all, BSD systems, the
- * reasonable place to select for it is in the machine description
- * file.
- */
+   do not support asynchronous I/O (using SIGIO) on sockets,
+   even though it works fine on tty's.  If you have one of
+   these systems, define the following, and then use it in
+   config.h (or elsewhere) to decide when (not) to use SIGIO.
 
+   You'd think this would go in an operating-system description file,
+   but since it only occurs on some, but not all, BSD systems, the
+   reasonable place to select for it is in the machine description file.  */
 #define NO_SOCK_SIGIO
 
-
 /* After adding support for a new system, modify the large case
    statement in the `configure' script to recognize reasonable
    configuration names, and add a description of the system to

=== modified file 'src/m/vax.h'
--- src/m/vax.h	2010-05-06 05:27:17 +0000
+++ src/m/vax.h	2010-05-12 02:37:59 +0000
@@ -1,6 +1,7 @@
 /* machine description file for vax.
-   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-                 2008, 2009, 2010  Free Software Foundation, Inc.
+
+Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+  2008, 2009, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
------------------------------------------------------------
revno: 100236 [merge]
committer: Katsumi Yamaoka <yamaoka@jpl.org>
branch nick: trunk
timestamp: Wed 2010-05-12 02:10:56 +0000
message:
  Synch with Gnus trunk.
  (message-forward-make-body-mml): Assume original message is multibyte string;
   error on unibyte.
  (message-forward-make-body-plain): Ditto;
   don't add excessive newline in body end.
diff:
=== modified file 'lisp/gnus/ChangeLog'
--- lisp/gnus/ChangeLog	2010-05-11 06:04:22 +0000
+++ lisp/gnus/ChangeLog	2010-05-12 02:09:58 +0000
@@ -1,3 +1,10 @@
+2010-05-12  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* message.el (message-forward-make-body-mml): Assume original message
+	is multibyte string; error on unibyte.
+	(message-forward-make-body-plain): Ditto; don't add excessive newline
+	in body end.
+
 2010-05-11  Andreas Seltenreich  <seltenreich@gmx.de>
 
 	* gnus-sum.el (gnus-summary-kill-thread): Use gnus-summary-mark-article

=== modified file 'lisp/gnus/message.el'
--- lisp/gnus/message.el	2010-05-10 03:39:23 +0000
+++ lisp/gnus/message.el	2010-05-12 02:09:58 +0000
@@ -7162,27 +7162,27 @@
   (insert
    "\n-------------------- Start of forwarded message --------------------\n")
   (let ((b (point))
-	contents multibyte-p e)
-    (with-current-buffer forward-buffer
-      (setq contents (buffer-string)
-	    multibyte-p (mm-multibyte-p)))
-    (insert
-     (with-temp-buffer
-       (if multibyte-p
-	   (progn
-	     (mm-enable-multibyte)
-	     (insert contents))
-	 (mm-disable-multibyte)
-	 (insert contents)
-	 (mm-enable-multibyte))
-       (mime-to-mml)
-       (goto-char (point-min))
-       (when (looking-at "From ")
-	 (replace-match "X-From-Line: "))
-       (buffer-string)))
+	(contents (with-current-buffer forward-buffer (buffer-string)))
+	e)
+    (unless (featurep 'xemacs)
+      (unless (multibyte-string-p contents)
+	(error "Attempt to insert unibyte string from the buffer \"%s\"\
+ to the multibyte buffer \"%s\""
+	       (if (bufferp forward-buffer)
+		   (buffer-name forward-buffer)
+		 forward-buffer)
+	       (buffer-name))))
+    (insert (mm-with-multibyte-buffer
+	      (insert contents)
+	      (mime-to-mml)
+	      (goto-char (point-min))
+	      (when (looking-at "From ")
+		(replace-match "X-From-Line: "))
+	      (buffer-string)))
+    (unless (bolp) (insert "\n"))
     (setq e (point))
     (insert
-     "\n-------------------- End of forwarded message --------------------\n")
+     "-------------------- End of forwarded message --------------------\n")
     (message-remove-ignored-headers b e)))
 
 (defun message-remove-ignored-headers (b e)
@@ -7218,24 +7218,22 @@
   (insert "\n\n<#mml type=message/rfc822 disposition=inline>\n")
   (let ((b (point)) e)
     (if (not message-forward-decoded-p)
-	(let (contents multibyte-p)
-	  (with-current-buffer forward-buffer
-	    (setq contents (buffer-string)
-		  multibyte-p (mm-multibyte-p)))
-	  (insert
-	   (with-temp-buffer
-	     (if multibyte-p
-		 (progn
-		   (mm-enable-multibyte)
-		   (insert contents))
-	       (mm-disable-multibyte)
-	       (insert contents)
-	       (mm-enable-multibyte))
-	     (mime-to-mml)
-	     (goto-char (point-min))
-	     (when (looking-at "From ")
-	       (replace-match "X-From-Line: "))
-	     (buffer-string))))
+	(let ((contents (with-current-buffer forward-buffer (buffer-string))))
+	  (unless (featurep 'xemacs)
+	    (unless (multibyte-string-p contents)
+	      (error "Attempt to insert unibyte string from the buffer \"%s\"\
+ to the multibyte buffer \"%s\""
+		     (if (bufferp forward-buffer)
+			 (buffer-name forward-buffer)
+		       forward-buffer)
+		     (buffer-name))))
+	  (insert (mm-with-multibyte-buffer
+		    (insert contents)
+		    (mime-to-mml)
+		    (goto-char (point-min))
+		    (when (looking-at "From ")
+		      (replace-match "X-From-Line: "))
+		    (buffer-string))))
       (save-restriction
 	(narrow-to-region (point) (point))
 	(mml-insert-buffer forward-buffer)
------------------------------------------------------------
revno: 100235
committer: Stefan Monnier <monnier@iro.umontreal.ca>
branch nick: trunk
timestamp: Tue 2010-05-11 20:39:46 -0400
message:
  Allow the default completion to cycle.
  * minibuffer.el (completion-cycle-threshold): New custom var.
  (completion--do-completion): Use it.
  (minibuffer-complete): Use cycling if appropriate.
diff:
=== modified file 'etc/NEWS'
--- etc/NEWS	2010-05-10 02:07:58 +0000
+++ etc/NEWS	2010-05-12 00:39:46 +0000
@@ -43,6 +43,8 @@
 
 * Changes in Emacs 24.1
 
+** Completion can cycle, depending on completion-cycle-threshold.
+
 ** auto-mode-case-fold is now enabled by default.
 
 +++

=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-05-11 22:01:34 +0000
+++ lisp/ChangeLog	2010-05-12 00:39:46 +0000
@@ -1,3 +1,9 @@
+2010-05-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* minibuffer.el (completion-cycle-threshold): New custom var.
+	(completion--do-completion): Use it.
+	(minibuffer-complete): Use cycling if appropriate.
+
 2010-05-11  Juanma Barranquero  <lekktu@gmail.com>
 
 	* dirtrack.el (dirtrackp): Remove defcustom; don't make automatically

=== modified file 'lisp/minibuffer.el'
--- lisp/minibuffer.el	2010-05-11 13:24:49 +0000
+++ lisp/minibuffer.el	2010-05-12 00:39:46 +0000
@@ -76,6 +76,9 @@
 ;;     the provided string (as is the case in filecache.el), in which
 ;;     case partial-completion (for example) doesn't make any sense
 ;;     and neither does the completions-first-difference highlight.
+;;   - indicate how to display the completions in *Completions* (turn
+;;     \n into something else, add special boundaries between
+;;     completions).  E.g. when completing from the kill-ring.
 
 ;; - make partial-completion-mode obsolete:
 ;;   - (?) <foo.h> style completion for file names.
@@ -489,6 +492,18 @@
   (insert newtext)
   (delete-region (point) (+ (point) (- end beg))))
 
+(defcustom completion-cycle-threshold nil
+  "Number of completion candidates below which cycling is used.
+Depending on this setting `minibuffer-complete' may use cycling,
+like `minibuffer-force-complete'.
+If nil, cycling is never used.
+If t, cycling is always used.
+If an integer, cycling is used as soon as there are fewer completion
+candidates than this number."
+  :type '(choice (const :tag "No cycling" nil)
+          (const :tag "Always cycle" t)
+          (integer :tag "Threshold")))
+
 (defun completion--do-completion (&optional try-completion-function)
   "Do the completion and return a summary of what happened.
 M = completion was performed, the text was Modified.
@@ -548,14 +563,43 @@
           ;; It did find a match.  Do we match some possibility exactly now?
           (let ((exact (test-completion completion
 					minibuffer-completion-table
-					minibuffer-completion-predicate)))
-            (if completed
+					minibuffer-completion-predicate))
+                (comps
+                 ;; Check to see if we want to do cycling.  We do it
+                 ;; here, after having performed the normal completion,
+                 ;; so as to take advantage of the difference between
+                 ;; try-completion and all-completions, for things
+                 ;; like completion-ignored-extensions.
+                 (when (and completion-cycle-threshold
+                            ;; Check that the completion didn't make
+                            ;; us jump to a different boundary.
+                            (or (not completed)
+                                (< (car (completion-boundaries
+                                         (substring completion 0 comp-pos)
+                                         minibuffer-completion-table
+                                         minibuffer-completion-predicate
+                                         ""))
+                                   comp-pos)))
+                   (completion-all-sorted-completions))))
+            (setq completion-all-sorted-completions nil)
+            (cond
+             ((and (not (ignore-errors
+                          ;; This signal an (intended) error if comps is too
+                          ;; short or if completion-cycle-threshold is t.
+                          (consp (nthcdr completion-cycle-threshold comps))))
+                   ;; More than 1, so there's something to cycle.
+                   (consp (cdr comps)))
+              ;; Fewer than completion-cycle-threshold remaining
+              ;; completions: let's cycle.
+              (setq completed t exact t)
+              (setq completion-all-sorted-completions comps)
+              (minibuffer-force-complete))
+             (completed
                 ;; We could also decide to refresh the completions,
                 ;; if they're displayed (and assuming there are
                 ;; completions left).
-                (minibuffer-hide-completions)
+              (minibuffer-hide-completions))
               ;; Show the completion table, if requested.
-              (cond
                ((not exact)
                 (if (case completion-auto-help
                       (lazy (eq this-command last-command))
@@ -566,7 +610,7 @@
                ;; means we've already given a "Next char not unique" message
                ;; and the user's hit TAB again, so now we give him help.
                ((eq this-command last-command)
-                (if completion-auto-help (minibuffer-completion-help)))))
+              (if completion-auto-help (minibuffer-completion-help))))
 
             (minibuffer--bitset completed t exact))))))))
 
@@ -580,21 +624,26 @@
   ;; If the previous command was not this,
   ;; mark the completion buffer obsolete.
   (unless (eq this-command last-command)
+    (setq completion-all-sorted-completions nil)
     (setq minibuffer-scroll-window nil))
 
-  (let ((window minibuffer-scroll-window))
+  (cond
     ;; If there's a fresh completion window with a live buffer,
     ;; and this command is repeated, scroll that window.
-    (if (window-live-p window)
+   ((window-live-p minibuffer-scroll-window)
+    (let ((window minibuffer-scroll-window))
         (with-current-buffer (window-buffer window)
           (if (pos-visible-in-window-p (point-max) window)
 	      ;; If end is in view, scroll up to the beginning.
 	      (set-window-start window (point-min) nil)
 	    ;; Else scroll down one screen.
 	    (scroll-other-window))
-	  nil)
-
-      (case (completion--do-completion)
+        nil)))
+   ;; If we're cycling, keep on cycling.
+   (completion-all-sorted-completions
+    (minibuffer-force-complete)
+    t)
+   (t (case (completion--do-completion)
         (#b000 nil)
         (#b001 (minibuffer-message "Sole completion")
                t)
------------------------------------------------------------
revno: 100234
committer: Juanma Barranquero <lekktu@gmail.com>
branch nick: trunk
timestamp: Wed 2010-05-12 00:01:34 +0200
message:
  Fix bug#6173: "(require 'dirtrack) erroring"
  
  * dirtrack.el (dirtrackp): Remove defcustom; don't make automatically
    buffer-local (it's an obsolete alias for `dirtrack-mode'.)
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-05-11 21:02:32 +0000
+++ lisp/ChangeLog	2010-05-11 22:01:34 +0000
@@ -1,3 +1,8 @@
+2010-05-11  Juanma Barranquero  <lekktu@gmail.com>
+
+	* dirtrack.el (dirtrackp): Remove defcustom; don't make automatically
+	buffer-local (it's an obsolete alias for `dirtrack-mode') (bug#6173).
+
 2010-05-11  Juri Linkov  <juri@jurta.org>
 
 	* scroll-all.el (scroll-all-check-to-scroll):

=== modified file 'lisp/dirtrack.el'
--- lisp/dirtrack.el	2010-01-29 19:08:09 +0000
+++ lisp/dirtrack.el	2010-05-11 22:01:34 +0000
@@ -143,13 +143,6 @@
   :group 'dirtrack
   :type  'string)
 
-(defcustom dirtrackp t
-  "If non-nil, directory tracking via `dirtrack' is enabled."
-  :group 'dirtrack
-  :type  'boolean)
-
-(make-variable-buffer-local 'dirtrackp)
-
 (defcustom dirtrack-directory-function
   (if (memq system-type (list 'ms-dos 'windows-nt 'cygwin))
       'dirtrack-windows-directory-function
------------------------------------------------------------
revno: 100233 [merge]
committer: Stefan Monnier <monnier@iro.umontreal.ca>
branch nick: trunk
timestamp: Tue 2010-05-11 17:02:32 -0400
message:
  Merge from emacs-23
diff:
=== modified file 'src/ChangeLog'
--- src/ChangeLog	2010-05-11 02:51:08 +0000
+++ src/ChangeLog	2010-05-11 21:02:32 +0000
@@ -1,3 +1,8 @@
+2010-05-11  Karel Klic  <kklic@redhat.com>
+
+	* ftfont.c: Fix incorrect parentheses of #if condition for
+	definining M17N_FLT_USE_NEW_FEATURE.
+
 2010-05-11  Glenn Morris  <rgm@gnu.org>
 
 	* Makefile.in (LIBS_SYSTEM) [MSDOS]: Do not reset.

=== modified file 'src/ftfont.c'
--- src/ftfont.c	2010-04-23 12:29:11 +0000
+++ src/ftfont.c	2010-05-11 11:15:29 +0000
@@ -1578,8 +1578,8 @@
 
 #ifdef HAVE_M17N_FLT
 
-#if ((LIBOTF_MAJOR_VERSION > 1) || (LIBOTF_RELEASE_NUMBER >= 10) \
-     && (M17NLIB_MAJOR_VERSION > 1) || (M17NLIB_MINOR_VERSION >= 6))
+#if (((LIBOTF_MAJOR_VERSION > 1) || (LIBOTF_RELEASE_NUMBER >= 10))	\
+     && ((M17NLIB_MAJOR_VERSION > 1) || (M17NLIB_MINOR_VERSION >= 6)))
 /* We can use the new feature of libotf and m17n-flt to handle the
    character encoding scheme introduced in Unicode 5.1 and 5.2 for
    some Agian scripts.  */
------------------------------------------------------------
revno: 100232
committer: Juri Linkov <juri@jurta.org>
branch nick: trunk
timestamp: Tue 2010-05-11 22:42:21 +0300
message:
  * scroll-all.el (scroll-all-check-to-scroll):
  Add `scroll-up-command' and `scroll-down-command' (bug#6164).
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-05-11 18:51:27 +0000
+++ lisp/ChangeLog	2010-05-11 19:42:21 +0000
@@ -1,3 +1,8 @@
+2010-05-11  Juri Linkov  <juri@jurta.org>
+
+	* scroll-all.el (scroll-all-check-to-scroll):
+	Add `scroll-up-command' and `scroll-down-command' (bug#6164).
+
 2010-05-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* iimage.el (iimage-mode-map): Move initialization into declaration.

=== modified file 'lisp/scroll-all.el'
--- lisp/scroll-all.el	2010-01-13 08:35:10 +0000
+++ lisp/scroll-all.el	2010-05-11 19:42:21 +0000
@@ -90,9 +90,9 @@
 	 (call-interactively 'scroll-all-scroll-down-all))
 	((eq this-command 'previous-line)
 	 (call-interactively 'scroll-all-scroll-up-all))
-	((eq this-command 'scroll-up)
+	((memq this-command '(scroll-up scroll-up-command))
 	 (call-interactively 'scroll-all-page-down-all))
-	((eq this-command 'scroll-down)
+	((memq this-command '(scroll-down scroll-down-command))
 	 (call-interactively 'scroll-all-page-up-all))
 	((eq this-command 'beginning-of-buffer)
 	 (call-interactively 'scroll-all-beginning-of-buffer-all))
------------------------------------------------------------
revno: 100231
committer: Stefan Monnier <monnier@iro.umontreal.ca>
branch nick: trunk
timestamp: Tue 2010-05-11 14:51:27 -0400
message:
  * iimage.el: Misc cleanup.
  (iimage-mode-map): Move initialization into declaration.
  (iimage-mode-buffer): Use with-silent-modifications.
  Simplify calling convention.  Adjust callers.
  (iimage-mode): Don't run hook redundantly.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-05-11 13:24:49 +0000
+++ lisp/ChangeLog	2010-05-11 18:51:27 +0000
@@ -1,5 +1,10 @@
 2010-05-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+	* iimage.el (iimage-mode-map): Move initialization into declaration.
+	(iimage-mode-buffer): Use with-silent-modifications.
+	Simplify calling convention.  Adjust callers.
+	(iimage-mode): Don't run hook redundantly.
+
 	* minibuffer.el (completion-pcm--pattern->regex):
 	Fix last change (bug#6160).
 
@@ -800,6 +805,8 @@
 
 2010-04-21  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+	Make the log-edit comments use RFC822 format throughout.
+
 	* vc.el (vc-checkin, vc-modify-change-comment):
 	Adjust to new vc-start/finish-logentry.
 	(vc-find-conflicted-file): New command.

=== modified file 'lisp/iimage.el'
--- lisp/iimage.el	2010-01-13 08:35:10 +0000
+++ lisp/iimage.el	2010-05-11 18:51:27 +0000
@@ -55,19 +55,17 @@
   :group 'image)
 
 (defconst iimage-version "1.1")
-(defvar iimage-mode nil)
-(defvar iimage-mode-map nil)
 
-;; Set up key map.
-(unless iimage-mode-map
-  (setq iimage-mode-map (make-sparse-keymap))
-  (define-key iimage-mode-map "\C-l" 'iimage-recenter))
+(defvar iimage-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map "\C-l" 'iimage-recenter)
+    map))
 
 (defun iimage-recenter (&optional arg)
-"Re-draw images and recenter."
+  "Re-draw images and recenter."
   (interactive "P")
-  (iimage-mode-buffer 0)
-  (iimage-mode-buffer 1)
+  (iimage-mode-buffer nil)
+  (iimage-mode-buffer t)
   (recenter arg))
 
 (defvar iimage-mode-image-filename-regex
@@ -81,7 +79,7 @@
   `((,(concat "\\(`?file://\\|\\[\\[\\|<\\|`\\)?"
 	      "\\(" iimage-mode-image-filename-regex "\\)"
 	      "\\(\\]\\]\\|>\\|'\\)?") . 2))
-"*Alist of filename REGEXP vs NUM.
+  "*Alist of filename REGEXP vs NUM.
 Each element looks like (REGEXP . NUM).
 NUM specifies which parenthesized expression in the regexp.
 
@@ -90,54 +88,43 @@
     `file://foo.png'
     \\[\\[foo.gif]]
     <foo.png>
-     foo.JPG
-")
+     foo.JPG")
 
 (defvar iimage-mode-image-search-path nil
-"*List of directories to search for image files for iimage-mode.")
+  "*List of directories to search for image files for `iimage-mode'.")
 
 ;;;###autoload
-(defun turn-on-iimage-mode ()
-"Unconditionally turn on iimage mode."
-  (interactive)
-  (iimage-mode 1))
+(define-obsolete-function-alias 'turn-on-iimage-mode 'iimage-mode "24.1")
 
 (defun turn-off-iimage-mode ()
-"Unconditionally turn off iimage mode."
+  "Unconditionally turn off iimage mode."
   (interactive)
   (iimage-mode 0))
 
-(defalias 'iimage-locate-file 'locate-file)
-
 (defun iimage-mode-buffer (arg)
-"Display/undisplay images.
-With numeric ARG, display the images if and only if ARG is positive."
-  (interactive)
-  (let ((ing (if (numberp arg)
-		 (> arg 0)
-	       iimage-mode))
-	(modp (buffer-modified-p (current-buffer)))
-	file buffer-read-only)
-    (save-excursion
-      (goto-char (point-min))
-      (dolist (pair iimage-mode-image-regex-alist)
-	(while (re-search-forward (car pair) nil t)
-	  (if (and (setq file (match-string (cdr pair)))
-		   (setq file (iimage-locate-file file
-				   (cons default-directory
-					 iimage-mode-image-search-path))))
-	      (if ing
-		  (add-text-properties (match-beginning 0) (match-end 0)
-				       (list 'display (create-image file)))
-		(remove-text-properties (match-beginning 0) (match-end 0)
-					'(display)))))))
-    (set-buffer-modified-p modp)))
+  "Display images if ARG is non-nil, undisplay them otherwise."
+  (let ((image-path (cons default-directory iimage-mode-image-search-path))
+	file)
+    (with-silent-modifications
+      (save-excursion
+        (goto-char (point-min))
+        (dolist (pair iimage-mode-image-regex-alist)
+          (while (re-search-forward (car pair) nil t)
+            (if (and (setq file (match-string (cdr pair)))
+                     (setq file (locate-file file image-path)))
+                ;; FIXME: we don't mark our images, so we can't reliably
+                ;; remove them either (we may leave some of ours, and we
+                ;; may remove other packages's display properties).
+                (if arg
+                    (add-text-properties (match-beginning 0) (match-end 0)
+                                         (list 'display (create-image file)))
+                  (remove-text-properties (match-beginning 0) (match-end 0)
+                                          '(display))))))))))
 
 ;;;###autoload
 (define-minor-mode iimage-mode
   "Toggle inline image minor mode."
   :group 'iimage :lighter " iImg" :keymap iimage-mode-map
-  (run-hooks 'iimage-mode-hook)
   (iimage-mode-buffer iimage-mode))
 
 (provide 'iimage)
------------------------------------------------------------
revno: 100230
committer: Eli Zaretskii <eliz@gnu.org>
branch nick: trunk
timestamp: Tue 2010-05-11 20:52:18 +0300
message:
   xdisp.c (init_iterator): Fix comment from last change.
diff:
=== modified file 'src/xdisp.c'
--- src/xdisp.c	2010-05-10 18:40:26 +0000
+++ src/xdisp.c	2010-05-11 17:52:18 +0000
@@ -2699,8 +2699,8 @@
   it->multibyte_p = !NILP (current_buffer->enable_multibyte_characters);
 
   /* Do we need to reorder bidirectional text?  Not if this is a
-     unibyte buffer: all single-byte characters are by definition
-     strong L2R, so no reordering is needed.  And bidi.c doesn't
+     unibyte buffer: by definition, none of the single-byte characters
+     are strong R2L, so no reordering is needed.  And bidi.c doesn't
      support unibyte buffers anyway.  */
   it->bidi_p
     = !NILP (current_buffer->bidi_display_reordering) && it->multibyte_p;
------------------------------------------------------------
revno: 100229
committer: Stefan Monnier <monnier@iro.umontreal.ca>
branch nick: trunk
timestamp: Tue 2010-05-11 09:24:49 -0400
message:
  * minibuffer.el (completion-pcm--pattern->regex): Fix last change.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-05-11 02:04:13 +0000
+++ lisp/ChangeLog	2010-05-11 13:24:49 +0000
@@ -1,3 +1,8 @@
+2010-05-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* minibuffer.el (completion-pcm--pattern->regex):
+	Fix last change (bug#6160).
+
 2010-05-10  Juri Linkov  <juri@jurta.org>
 
 	Remove nodes visited during Isearch from the Info history.
@@ -11,8 +16,8 @@
 2010-05-10  Michael Albinus  <michael.albinus@gmx.de>
 
 	* net/tramp.el (tramp-do-file-attributes-with-stat): Add space in
-	format string, in order to work around a bug in pdksh.  Reported
-	by Gilles Pion <gpion@lfdj.com>.
+	format string, in order to work around a bug in pdksh.
+	Reported by Gilles Pion <gpion@lfdj.com>.
 	(tramp-handle-verify-visited-file-modtime): Do not send a command
 	when the connection is not established.
 	(tramp-handle-set-file-times): Simplify the check for utc.

=== modified file 'lisp/minibuffer.el'
--- lisp/minibuffer.el	2010-05-09 22:39:36 +0000
+++ lisp/minibuffer.el	2010-05-11 13:24:49 +0000
@@ -1835,8 +1835,8 @@
                   (lambda (x)
                     (cond
                      ((stringp x) (regexp-quote x))
-                     ((if (consp group) (memq x group) group)
-                      "\\(.*?\\)" ".*?")))
+                     ((if (consp group) (memq x group) group) "\\(.*?\\)")
+		     (t ".*?")))
                   pattern
                   ""))))
     ;; Avoid pathological backtracking.
------------------------------------------------------------
revno: 100228 [merge]
committer: Katsumi Yamaoka <yamaoka@jpl.org>
branch nick: trunk
timestamp: Tue 2010-05-11 06:05:19 +0000
message:
  Synch with Gnus trunk.
  (gnus-summary-kill-thread): Use gnus-summary-mark-article instead of
   g-s-m-a-as-unread to set the expirable mark.  (Bug#5284)
   By Andreas Seltenreich <seltenreich (at) gmx.de>.
diff:
=== modified file 'lisp/gnus/ChangeLog'
--- lisp/gnus/ChangeLog	2010-05-11 04:43:46 +0000
+++ lisp/gnus/ChangeLog	2010-05-11 06:04:22 +0000
@@ -1,3 +1,8 @@
+2010-05-11  Andreas Seltenreich  <seltenreich@gmx.de>
+
+	* gnus-sum.el (gnus-summary-kill-thread): Use gnus-summary-mark-article
+	instead of g-s-m-a-as-unread to set the expirable mark.  (Bug#5284)
+
 2010-05-11  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* mm-extern.el (mm-extern-url): Don't use

=== modified file 'lisp/gnus/gnus-sum.el'
--- lisp/gnus/gnus-sum.el	2010-05-10 12:07:40 +0000
+++ lisp/gnus/gnus-sum.el	2010-05-11 06:04:22 +0000
@@ -11508,7 +11508,7 @@
 	      ((> unmark 0)
 	       (gnus-summary-mark-article-as-unread gnus-unread-mark))
 	      ((= unmark 0)
-	       (gnus-summary-mark-article-as-unread gnus-expirable-mark))
+	       (gnus-summary-mark-article nil gnus-expirable-mark))
 	      (t
 	       (gnus-summary-mark-article-as-unread gnus-ticked-mark)))
 	(setq articles (cdr articles))))
------------------------------------------------------------
revno: 100227 [merge]
committer: Katsumi Yamaoka <yamaoka@jpl.org>
branch nick: trunk
timestamp: Tue 2010-05-11 04:44:44 +0000
message:
  Synch with Gnus trunk.
  (mm-extern-url): Don't use mm-with-unibyte-current-buffer.
  (mm-extern-cache-contents): Use with-current-buffer instead of
   save-excursion + set-buffer.
diff:
=== modified file 'lisp/gnus/ChangeLog'
--- lisp/gnus/ChangeLog	2010-05-10 12:07:40 +0000
+++ lisp/gnus/ChangeLog	2010-05-11 04:43:46 +0000
@@ -1,3 +1,10 @@
+2010-05-11  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* mm-extern.el (mm-extern-url): Don't use
+	mm-with-unibyte-current-buffer.
+	(mm-extern-cache-contents): Use with-current-buffer instead of
+	save-excursion + set-buffer.
+
 2010-05-10  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* mm-util.el (mm-emacs-mule): Remove.

=== modified file 'lisp/gnus/mm-extern.el'
--- lisp/gnus/mm-extern.el	2010-01-13 08:35:10 +0000
+++ lisp/gnus/mm-extern.el	2010-05-11 04:43:46 +0000
@@ -67,9 +67,8 @@
 	(coding-system-for-read mm-binary-coding-system))
     (unless url
       (error "URL is not specified"))
-    (mm-with-unibyte-current-buffer
-      (mm-url-insert-file-contents url))
     (mm-disable-multibyte)
+    (mm-url-insert-file-contents url)
     (setq buffer-file-name name)))
 
 (defun mm-extern-anon-ftp (handle)
@@ -125,7 +124,7 @@
 			    (or access-type
 				(error "Couldn't find access type"))))
 			  mm-extern-function-alist)))
-	 buf handles)
+	 handles)
     (unless func
       (error "Access type (%s) is not supported" access-type))
     (mm-with-part handle
@@ -136,8 +135,7 @@
     (unless (bufferp (car handles))
       (mm-destroy-parts handles)
       (error "Multipart external body is not supported"))
-    (save-excursion
-      (set-buffer (setq buf (mm-handle-buffer handles)))
+    (with-current-buffer (mm-handle-buffer handles)
       (let (good)
 	(unwind-protect
 	    (progn
------------------------------------------------------------
revno: 100226
committer: Glenn Morris <rgm@gnu.org>
branch nick: trunk
timestamp: Mon 2010-05-10 20:18:58 -0700
message:
  Minor lib-src/Makefile.in edits.
  
  * lib-src/Makefile.in (.m.o): Remove, there are no .m files.
  (BASE_CFLAGS): New variable.
  (ALL_CFLAGS, LINK_CFLAGS, CPP_CFLAGS): Use $BASE_CFLAGS.
  (check): Update the message.
  (update-game-score${EXEEXT}): Do not use $MOVE_FLAGS.
diff:
=== modified file 'lib-src/ChangeLog'
--- lib-src/ChangeLog	2010-05-11 03:00:32 +0000
+++ lib-src/ChangeLog	2010-05-11 03:18:58 +0000
@@ -1,5 +1,11 @@
 2010-05-11  Glenn Morris  <rgm@gnu.org>
 
+	* Makefile.in (.m.o): Remove, there are no .m files.
+	(BASE_CFLAGS): New variable.
+	(ALL_CFLAGS, LINK_CFLAGS, CPP_CFLAGS): Use $BASE_CFLAGS.
+	(check): Update the message.
+	(update-game-score${EXEEXT}): Do not use $MOVE_FLAGS.
+
 	* Makefile.in: Convert comments to makefile format.
 
 	* Makefile.in (LIBS_SYSTEM) [MSDOS]: Do not reset.

=== modified file 'lib-src/Makefile.in'
--- lib-src/Makefile.in	2010-05-11 03:00:32 +0000
+++ lib-src/Makefile.in	2010-05-11 03:18:58 +0000
@@ -161,15 +161,15 @@
 # Those files shared with other GNU utilities need HAVE_CONFIG_H
 # defined before they know they can take advantage of the information
 # in ../src/config.h.
-ALL_CFLAGS = $(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) -DHAVE_CONFIG_H -I. -I../src -I${srcdir} -I${srcdir}/../src ${LDFLAGS} ${CPPFLAGS} ${CFLAGS}
-LINK_CFLAGS = $(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) -DHAVE_CONFIG_H -I. -I../src -I${srcdir} -I${srcdir}/../src ${LDFLAGS} ${CFLAGS}
-CPP_CFLAGS = $(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) -DHAVE_CONFIG_H -I. -I../src -I${srcdir} -I${srcdir}/../src ${CPPFLAGS} ${CFLAGS}
+BASE_CFLAGS = $(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) -DHAVE_CONFIG_H -I. -I../src -I${srcdir} -I${srcdir}/../src
+
+ALL_CFLAGS = ${BASE_CFLAGS} ${LDFLAGS} ${CPPFLAGS} ${CFLAGS}
+LINK_CFLAGS = ${BASE_CFLAGS} ${LDFLAGS} ${CFLAGS}
+CPP_CFLAGS = ${BASE_CFLAGS} ${CPPFLAGS} ${CFLAGS}
 
 LOADLIBES=$(LIBS_SYSTEM)
 
 
-.SUFFIXES: .m
-
 ## This is the default compilation command.
 ## But we should never rely on it, because some make version failed to
 ## find it for getopt.o.
@@ -177,9 +177,6 @@
 .c.o:
 	${CC} -c ${CPP_CFLAGS} $<
 
-.m.o:
-	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $<
-
 all: ${DONT_INSTALL} ${UTILITIES} ${INSTALLABLES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS}
 
 ## These targets copy the scripts into the build directory so that
@@ -287,7 +284,7 @@
 
 ## Test the contents of the directory.
 check:
-	@echo "We don't have any tests for GNU Emacs yet."
+	@echo "We don't have any tests for the lib-src/ directory yet."
 
 tags: TAGS
 TAGS: etags${EXEEXT}
@@ -370,7 +367,7 @@
 	$(CC) ${ALL_CFLAGS} ${srcdir}/hexl.c $(LOADLIBES) -o hexl
 
 update-game-score${EXEEXT}: update-game-score.o $(GETOPTDEPS)
-	$(CC) ${LINK_CFLAGS} ${MOVE_FLAGS} update-game-score.o $(GETOPTOBJS) $(LOADLIBES) -o update-game-score
+	$(CC) ${LINK_CFLAGS} update-game-score.o $(GETOPTOBJS) $(LOADLIBES) -o update-game-score
 
 update-game-score.o: ${srcdir}/update-game-score.c ../src/config.h $(GETOPT_H)
 	$(CC) -c ${CPP_CFLAGS} ${srcdir}/update-game-score.c \
------------------------------------------------------------
Use --include-merges or -n0 to see merged revisions.