[Emacs-diffs] /srv/bzr/emacs/emacs-24 r111342: Backport trunk r112134 em-prompt fix

[Glenn Morris]

------------------------------------------------------------
revno: 111342
fixes bug: http://debbugs.gnu.org/13963
author: Stefan Monnier <address@hidden>
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Sat 2013-04-06 16:05:53 -0700
message:
  Backport trunk r112134 em-prompt fix
  
  * lisp/eshell/em-prompt.el (eshell-emit-prompt):
  Make sure we can't insert into the prompt either.
modified:
  lisp/ChangeLog
  lisp/eshell/em-prompt.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-03-26 01:55:11 +0000
+++ b/lisp/ChangeLog    2013-04-06 23:05:53 +0000
@@ -1,3 +1,8 @@
+2013-04-06  Stefan Monnier  <address@hidden>
+
+       * 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  <address@hidden>
 
        Un-indent after "pass" and "return" statements (Bug#13888)

=== modified file 'lisp/eshell/em-prompt.el'
--- a/lisp/eshell/em-prompt.el  2013-01-01 09:11:05 +0000
+++ b/lisp/eshell/em-prompt.el  2013-04-06 23:05:53 +0000
@@ -122,6 +122,7 @@
           (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)))