diff options
| author | Joakim Verona | 2013-03-26 16:20:17 +0100 |
|---|---|---|
| committer | Joakim Verona | 2013-03-26 16:20:17 +0100 |
| commit | 6f6db22fc74ffb7fbdd4d805545b7e28cd59f0c8 (patch) | |
| tree | 4a58903b4c3d010e90fc37fe10ea4d9895876d01 /lisp/eshell | |
| parent | 62dd123f7c11ddbe156bc0e84dcb7ca1da5368bb (diff) | |
| parent | 48c226c2c2592e31a47559bd1689fcc4354d9479 (diff) | |
| download | emacs-6f6db22fc74ffb7fbdd4d805545b7e28cd59f0c8.tar.gz emacs-6f6db22fc74ffb7fbdd4d805545b7e28cd59f0c8.zip | |
conflict resolve
Diffstat (limited to 'lisp/eshell')
| -rw-r--r-- | lisp/eshell/em-prompt.el | 1 |
1 files changed, 1 insertions, 0 deletions
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))) |