aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/eshell/esh-cmd.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3988ed707c3..ed74bd452fd 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12012-05-09 Juanma Barranquero <lekktu@gmail.com>
2
3 * eshell/esh-cmd.el (eshell-debug-command): Fix typo in previous change.
4
12012-05-08 Glenn Morris <rgm@gnu.org> 52012-05-08 Glenn Morris <rgm@gnu.org>
2 6
3 * files.el (auto-mode-alist): Treat ".make" like ".mk". 7 * files.el (auto-mode-alist): Treat ".make" like ".mk".
diff --git a/lisp/eshell/esh-cmd.el b/lisp/eshell/esh-cmd.el
index b1f8fd037a4..850cecbc0a5 100644
--- a/lisp/eshell/esh-cmd.el
+++ b/lisp/eshell/esh-cmd.el
@@ -242,7 +242,7 @@ If you change this without using customize after Eshell has loaded,
242you must re-load 'esh-cmd.el'." 242you must re-load 'esh-cmd.el'."
243 :initialize 'custom-initialize-default 243 :initialize 'custom-initialize-default
244 :set (lambda (symbol value) 244 :set (lambda (symbol value)
245 (set sym val) 245 (set symbol value)
246 (load-library "esh-cmd")) 246 (load-library "esh-cmd"))
247 :type 'boolean 247 :type 'boolean
248 :group 'eshell-cmd) 248 :group 'eshell-cmd)