aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2013-03-25 20:42:08 -0400
committerStefan Monnier2013-03-25 20:42:08 -0400
commit8d4c974ee04e4b9e452bcc1b7cf20f5cf76cc6dd (patch)
treee0b6963d55e4be156c1d0009628742bb04001631
parentf83a656e333a47e5e452aac3eb192d2fd4c5760e (diff)
downloademacs-8d4c974ee04e4b9e452bcc1b7cf20f5cf76cc6dd.tar.gz
emacs-8d4c974ee04e4b9e452bcc1b7cf20f5cf76cc6dd.zip
* lisp/eshell/em-prompt.el (eshell-emit-prompt): Make sure we can't insert
into the prompt either. Fixes: debbugs:13963
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/eshell/em-prompt.el1
2 files changed, 6 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ffd158abe60..b6ec0480a2c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12013-03-26 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * eshell/em-prompt.el (eshell-emit-prompt): Make sure we can't insert
4 into the prompt either (bug#13963).
5
12013-03-25 Stefan Monnier <monnier@iro.umontreal.ca> 62013-03-25 Stefan Monnier <monnier@iro.umontreal.ca>
2 7
3 * font-lock.el (lisp-font-lock-keywords-2): Don't highlight the "error" 8 * font-lock.el (lisp-font-lock-keywords-2): Don't highlight the "error"
diff --git a/lisp/eshell/em-prompt.el b/lisp/eshell/em-prompt.el
index c1c4d4730f9..c5429c59bd6 100644
--- a/lisp/eshell/em-prompt.el
+++ b/lisp/eshell/em-prompt.el
@@ -122,6 +122,7 @@ arriving, or after."
122 (add-text-properties 0 (length prompt) 122 (add-text-properties 0 (length prompt)
123 '(read-only t 123 '(read-only t
124 face eshell-prompt 124 face eshell-prompt
125 front-sticky (face read-only)
125 rear-nonsticky (face read-only)) 126 rear-nonsticky (face read-only))
126 prompt)) 127 prompt))
127 (eshell-interactive-print prompt))) 128 (eshell-interactive-print prompt)))