*** empty log message ***

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 6165aa7b84547fc768f639fe3829b9c15c373f83..4315ffa9e5e7ee5b8cae2b0d6577dbf443b63a58 100644 (file)
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2000-10-05  Miles Bader  <miles@lsi.nec.co.jp>
+
+       * gnus-pointer.xbm, gnus-pointer.xpm: Remove top empty line.
+
 2000-09-22  Gerd Moellmann  <gerd@gnu.org>
 
        * splash.xbm: File removed.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d6a76f4116a6cfcd48e9d19e46a64fdc7e803720..2c0e21af573ebd4d1d5f2d6325102ed97aa20ee3 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,19 @@
+2000-10-05  Miles Bader  <miles@lsi.nec.co.jp>
+
+       * smerge-mode.el (smerge-mine-face, smerge-other-face) 
+       (smerge-base-face, smerge-markers-face): Add dark-background variants.
+
+2000-10-04  Miles Bader  <miles@lsi.nec.co.jp>
+
+       * emacs-lisp/authors.el (authors-canonical-author-id): Renamed
+       from authors-canonical-author-name.  Return a cons-cell containing
+       both name and email addr instead of a string.  Use
+       mail-extract-address-components to do the real work.
+       (authors-scan-el, authors-scan-change-log): Use new name.
+       (authors-add): Accept a cons-cell for author, and add entries
+       under both name and email-addr.  Change structure of hash-table
+       entries.
+
 2000-10-04  Peter Breton  <pbreton@ne.mediaone.net>
 
        * net/net-utils.el (nslookup-font-lock-keywords)

diff --git a/src/ChangeLog b/src/ChangeLog
index 40b21ea1a260a16bc01b60825c2f83b406cb6e40..8861cde7612ad27aae7ccf7c4e1984579110fbe9 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-05  Miles Bader  <miles@lsi.nec.co.jp>
+
+       * xfns.c (image_ascent): Rearrange ascent calculation for the
+       has-a-font case.
+
 2000-10-04  Stefan Monnier  <monnier@cs.yale.edu>
 
        * keymap.c (Fwhere_is_internal): Ignore `menu-bar' and `tool-bar'.