*** empty log message ***

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 74512fa69793434faad4b69b9e3b009b466cf3cd..1c9de0ac3e7aec23cf8dff5d6a76bc34b66816de 100644 (file)
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,4 +1,8 @@
-2007-04-25  Yavor Doganov <yavor@gnu.org>  (tiny change)
+2007-04-25  Werner Lemberg  <wl@gnu.org>
+
+       * emacs.1: Replace -- with \(em.
+
+2007-04-25  Yavor Doganov  <yavor@gnu.org>  (tiny change)
 
        * emacs.1, etags.1: Escape some minus signs.
 

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8d6f6104f54861c879ce9c751e1d172282a64eb0..1b3245e90f153caab296e0ca7e4fa790db6cb4b7 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2007-04-25  Mathias Dahl  <mathias.dahl@gmail.com>
+
+       * image-dired.el (image-dired-display-image): Derive image-type
+       from filename rather than assuming jpeg, in case no resizing was
+       needed.
+
 2007-04-25  Johan Bockg\e,Ae\e(Brd  <bojohan@dd.chalmers.se>
 
        * custom.el (defface): Doc fix.