diff lisp/ChangeLog @ 107275:cf50b15a097b

Merge from mainline.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Tue, 09 Feb 2010 21:54:40 +0000
parents 4f195898e986
children 8839cd62c3d2
line wrap: on
line diff
--- a/lisp/ChangeLog	Tue Feb 09 00:01:14 2010 +0000
+++ b/lisp/ChangeLog	Tue Feb 09 21:54:40 2010 +0000
@@ -1,3 +1,8 @@
+2010-02-09  Chong Yidong  <cyd@stupidchicken.com>
+
+	* eshell/em-ls.el (eshell-ls-applicable): Frob file attributes
+	correctly (Bug#5548).
+
 2010-02-08  Jose E. Marchesi  <jemarch@gnu.org>
 
 	* progmodes/ada-mode.el (ada-in-numeric-literal-p): New function.