diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-04-06 16:05:53 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2013-04-06 16:05:53 -0700 |
| commit | f6ae5c5df1abb3f1aaa353c20c11c2e3c8fb0ae2 (patch) | |
| tree | 644fe6bfe63f4a2cb7302476dd5b37957396eda1 /lisp | |
| parent | b011a6e8011c51e09f28d528a541509c17d4eed0 (diff) | |
| download | emacs-f6ae5c5df1abb3f1aaa353c20c11c2e3c8fb0ae2.tar.gz emacs-f6ae5c5df1abb3f1aaa353c20c11c2e3c8fb0ae2.tar.bz2 emacs-f6ae5c5df1abb3f1aaa353c20c11c2e3c8fb0ae2.zip | |
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
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/eshell/em-prompt.el | 1 |
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))) |