aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/eshell/em-prompt.el4
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9b68897a32b..ed95c03d6ea 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12013-12-18 Leo Liu <sdl.web@gmail.com>
2
3 * eshell/em-prompt.el (eshell-emit-prompt): Fix last change. (Bug#16186)
4
12013-12-18 Eli Zaretskii <eliz@gnu.org> 52013-12-18 Eli Zaretskii <eliz@gnu.org>
2 6
3 * ls-lisp.el (ls-lisp-insert-directory): Don't modify %d and %f 7 * ls-lisp.el (ls-lisp-insert-directory): Don't modify %d and %f
diff --git a/lisp/eshell/em-prompt.el b/lisp/eshell/em-prompt.el
index 1092eb5b4de..91c3daf87e4 100644
--- a/lisp/eshell/em-prompt.el
+++ b/lisp/eshell/em-prompt.el
@@ -125,8 +125,8 @@ arriving, or after."
125 (add-text-properties 0 (length prompt) 125 (add-text-properties 0 (length prompt)
126 '(read-only t 126 '(read-only t
127 font-lock-face eshell-prompt 127 font-lock-face eshell-prompt
128 front-sticky (face read-only) 128 front-sticky (font-lock-face read-only)
129 rear-nonsticky (face read-only)) 129 rear-nonsticky (font-lock-face read-only))
130 prompt)) 130 prompt))
131 (eshell-interactive-print prompt))) 131 (eshell-interactive-print prompt)))
132 (run-hooks 'eshell-after-prompt-hook)) 132 (run-hooks 'eshell-after-prompt-hook))