summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-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 5783761a0b4..dd209f75bf6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-06 Stefan Monnier <monnier@iro.umontreal.ca>
+
+ * eshell/em-prompt.el (eshell-emit-prompt): Make sure we can't insert
+ into the prompt either (bug#13963).
+
2013-03-26 Fabián Ezequiel Gallina <fabian@anue.biz>
Un-indent after "pass" and "return" statements (Bug#13888)
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."
(add-text-properties 0 (length prompt)
'(read-only t
face eshell-prompt
+ front-sticky (face read-only)
rear-nonsticky (face read-only))
prompt))
(eshell-interactive-print prompt)))