aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2013-04-06 16:05:53 -0700
committerGlenn Morris2013-04-06 16:05:53 -0700
commitf6ae5c5df1abb3f1aaa353c20c11c2e3c8fb0ae2 (patch)
tree644fe6bfe63f4a2cb7302476dd5b37957396eda1
parentb011a6e8011c51e09f28d528a541509c17d4eed0 (diff)
downloademacs-f6ae5c5df1abb3f1aaa353c20c11c2e3c8fb0ae2.tar.gz
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
-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 @@
12013-04-06 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * eshell/em-prompt.el (eshell-emit-prompt): Make sure we can't insert
4 into the prompt either (bug#13963).
5
12013-03-26 Fabián Ezequiel Gallina <fabian@anue.biz> 62013-03-26 Fabián Ezequiel Gallina <fabian@anue.biz>
2 7
3 Un-indent after "pass" and "return" statements (Bug#13888) 8 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."
122 (add-text-properties 0 (length prompt) 122 (add-text-properties 0 (length prompt)
123 '(read-only t 123 '(read-only t
124 face eshell-prompt 124 face eshell-prompt
125 front-sticky (face read-only)
125 rear-nonsticky (face read-only)) 126 rear-nonsticky (face read-only))
126 prompt)) 127 prompt))
127 (eshell-interactive-print prompt))) 128 (eshell-interactive-print prompt)))