Backport trunk 2013-03-26T00:42:08Z!monnier@iro.umontreal.ca em-prompt fix

* lisp/eshell/em-prompt.el (eshell-emit-prompt):
Make sure we can't insert into the prompt either.

Fixes: debbugs:13963

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5783761a0b4063d75d755fa51b944274d1e0933a..dd209f75bf6846b0fda203feeec8ccb7fa4525f6 100644 (file)
--- 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 c1c4d4730f9146d41c627698e07a0071187846d1..c5429c59bd66d57842918ed68f282546bbaa4902 100644 (file)
--- 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)))