From: Glenn Morris <rgm@gnu.org>
Date: Wed, 25 Apr 2007 05:53:17 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-23.0.90~12803
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e28f9ad3c609d67a29649bea5e29da0432e502a2;p=emacs.git

*** empty log message ***
---

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 74512fa6979..1c9de0ac3e7 100644
--- 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 8d6f6104f54..1b3245e90f1 100644
--- 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,Ae(Brd  <bojohan@dd.chalmers.se>
 
 	* custom.el (defface): Doc fix.