ChangeLog fixes

diff --git a/src/ChangeLog b/src/ChangeLog
index 8e439f1a1d4c28793248a8fe322c5854ded74172..d35c65266cc5f560ab4e6b2ab2ab062da24ab976 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -6764,7 +6764,7 @@
        conversion specifiers.  For example, use "...%"pI"d..." rather
        than "...%"pEd"...".
        (pEd): Remove.  All uses replaced with similar uses of pI.
-       * src/m/amdx86-64.h, src/m/ia64.h, src/m/ibms390x.h: Likewise.
+       * m/amdx86-64.h, m/ia64.h, m/ibms390x.h: Likewise.
        * alloc.c (check_pure_size): Don't overflow by converting size to int.
        * bidi.c (bidi_dump_cached_states): Use pI to avoid cast.
        * data.c (Fnumber_to_string): Use pI instead of if-then-else-abort.
@@ -7746,8 +7746,7 @@
        Without this change, on typical 64-bit hosts error ("...%d...", N)
        was used to print both 32- and 64-bit integers N, which relied on
        undefined behavior.
-       * lisp.h, src/m/amdx86-64.h, src/m/ia64.h, src/m/ibms390x.h (pEd):
-       New macro.
+       * lisp.h, m/amdx86-64.h, m/ia64.h, m/ibms390x.h (pEd): New macro.
        * lisp.h (error, verror): Mark as printf-like functions.
        * eval.c (verror): Use vsnprintf, not doprnt, to do the real work.
        Report overflow in size calculations when allocating printf buffer.

diff --git a/src/ChangeLog.11 b/src/ChangeLog.11
index e8bfd9643129871f498b54021926e162a0e74b56..2e5404779b18ff4b926917f398143b804a6855ac 100644 (file)
--- a/src/ChangeLog.11
+++ b/src/ChangeLog.11
@@ -533,8 +533,8 @@
        * deps.mk (getloadavg.o): Remove; gnulib now does this.
        * lisp.h (getloadavg) [!defined HAVE_GETLOADAVG]: Remove; gnulib
        now does this.
-       * src/s/freebsd.h (HAVE_GETLOADAVG): Remove; gnulib now does this.
-       * src/s/netbsd.h (HAVE_GETLOADAVG): Likewise.
+       * s/freebsd.h (HAVE_GETLOADAVG): Remove; gnulib now does this.
+       * s/netbsd.h (HAVE_GETLOADAVG): Likewise.
        * config.in: Regenerate.
 
 2011-02-15  Eli Zaretskii  <eliz@gnu.org>
@@ -12539,7 +12539,7 @@
 
 2009-06-23  Jim Meyering  <meyering@redhat.com>
 
-       * src/ftfont.c (setup_otf_gstring, ftfont_shape_by_flt):
+       * ftfont.c (setup_otf_gstring, ftfont_shape_by_flt):
        Use xmalloc and xrealloc (not malloc and realloc), so subsequent heap
        pointer dereferences are guaranteed to be valid.
 

diff --git a/src/ChangeLog.7 b/src/ChangeLog.7
index 891c1ca081aa7d87c559a33c456e651f2216ca17..91fe15663a7615806b328db229ea949126e1b938 100644 (file)
--- a/src/ChangeLog.7
+++ b/src/ChangeLog.7
@@ -331,7 +331,7 @@
 
 1998-07-30  Paul Eggert  <eggert@twinsun.com>
 
-       * src/Makefile.in (widget.o, xfns.o, xmenu.o):
+       * Makefile.in (widget.o, xfns.o, xmenu.o):
        Prepend $(srcdir)/ to rule dependencies outside this dir.
 
 1998-07-29  Kenichi Handa  <handa@etl.go.jp>