aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/ChangeLog')
-rw-r--r--lisp/ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d2ee593c38..e4d4062668 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-05 Glenn Morris <[email protected]>
+
+ * eshell/em-unix.el (diff-no-select): Autoload it.
+ (eshell/diff): Use diff-no-select. (Bug#10420)
+
2012-01-05 Chong Yidong <[email protected]>
* shell.el (shell-dynamic-complete-functions): Revert last change.