Restore accidental change to insert-register

[gnu-emacs] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 845fce543b6cdeea4d7b187fce34f04960a725ce..f7504583c254674730713494bb68afec373f0216 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-07-09  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Add gnulib's strtoimax module, needed on Solaris 8.
+       * Makefile.in (GNULIB_MODULES): Add strtoimax.
+       * lib/strtoll.c, m4/strtoimax.m4, m4/strtoll.m4: New files,
+       automatically imported from gnulib.
+       * lib/gnulib.mk, m4/gl-comp.m4: Regenerate.
+
 2011-07-08  Paul Eggert  <eggert@cs.ucla.edu>
 
        Add gnulib support for pthread_sigmask (Bug#9010).
@@ -7,12 +15,13 @@
        so that gnulib can assume the libraries in LIBS.
        * lib/signal.in.h, m4/pthread_sigmask.m4, m4/signal_h.m4:
        * lib/pthread_sigprocmask.c, lib/sigprocmask.c, m4/signalblocking.m4:
+       * lib/pthread_sigmask.c:
        New files, automatically imported from gnulib.
        * lib/gnulib.mk, m4/gl-comp.m4: Automatically-imported update
        due to the above changes.
        * .bzrignore: Add lib/signal.h.
-       * src/Makefile.in (LIB_PTHREAD_SIGMASK): New macro.
-       (LIBES): Use it.
+
+       * lib/getopt.c, lib/unistd.in.h, m4/getopt.m4: Merge from gnulib.
 
 2011-07-07  Andreas Schwab  <schwab@linux-m68k.org>