diff lisp/ChangeLog @ 109223:3d4150adbcf7

Merge from mainline.
author Katsumi Yamaoka <katsumi@flagship2>
date Mon, 14 Jun 2010 11:56:46 +0000
parents 65de28008783
children c20f62b45fc9
line wrap: on
line diff
--- a/lisp/ChangeLog	Sun Jun 13 09:38:33 2010 +0000
+++ b/lisp/ChangeLog	Mon Jun 14 11:56:46 2010 +0000
@@ -1,3 +1,9 @@
+2010-06-14  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* image-mode.el (image-mode-map): Remap left-char and right-char.
+
+	* nxml/nxml-mode.el (nxml-indent-line): Standardize indent behavior.
+
 2010-06-12  Chong Yidong  <cyd@stupidchicken.com>
 
 	* term/common-win.el (x-colors): Add all the color names defined