From: Glenn Morris <rgm@gnu.org>
Date: Wed, 25 Apr 2007 05:53:28 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-22.0.990~160
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e40e449f41c339f39e259738101e99f6eb3e392c;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 9506e447a97..1b3245e90f1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,10 +1,12 @@
-2007-04-25  Johan Bockg,Ae(Brd  <bojohan@dd.chalmers.se>
+2007-04-25  Mathias Dahl  <mathias.dahl@gmail.com>
 
-	* custom.el (defface): Doc fix.
+	* image-dired.el (image-dired-display-image): Derive image-type
+	from filename rather than assuming jpeg, in case no resizing was
+	needed.
 
-2007-04-24  Chong Yidong  <cyd@stupidchicken.com>
+2007-04-25  Johan Bockg,Ae(Brd  <bojohan@dd.chalmers.se>
 
-	* progmodes/python.el: File removed due to unclear legal status.
+	* custom.el (defface): Doc fix.
 
 2007-04-24  J.D. Smith  <jdsmith@as.arizona.edu>