From: Stefan Monnier Date: Sat, 6 Apr 2013 23:05:53 +0000 (-0700) Subject: Backport trunk 2013-03-26T00:42:08Z!monnier@iro.umontreal.ca em-prompt fix X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1943^2~26 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f6ae5c5df1abb3f1aaa353c20c11c2e3c8fb0ae2;p=emacs.git 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 5783761a0b4..dd209f75bf6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2013-04-06 Stefan Monnier + + * 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 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)))