diff options
| author | Glenn Morris | 2020-02-23 07:50:28 -0800 |
|---|---|---|
| committer | Glenn Morris | 2020-02-23 07:50:28 -0800 |
| commit | 3f01a17d68644cc3d802e1565e6f2a3b89d9279a (patch) | |
| tree | 5e1a60be7a5b935af4f04ffd4d6dba866b4cf34d /lisp/eshell | |
| parent | b6be1ce644a07b6dc30eaa24dec082effd7add40 (diff) | |
| parent | dd5756436c580cc0d00ee875d6645861daf5a867 (diff) | |
| download | emacs-3f01a17d68644cc3d802e1565e6f2a3b89d9279a.tar.gz emacs-3f01a17d68644cc3d802e1565e6f2a3b89d9279a.zip | |
Merge from origin/emacs-27
dd5756436c Move more logic to vc-ignore from vc-default-ignore
2aed279be1 Warn about the likes of "[:alnum:]" in regexps
0273f261a7 Don't write absolute filenames and duplicate strings to CV...
d7c22338d2 Fix cursor-sensor--detect when current buf != selected win...
2e39fc83bb * doc/emacs/sending.texi (Mail Sending): Fix index entries.
b410f902d5 Document 'message-send-mail-function' in the Emacs manual
ac0546612d Fix reference to 'message-send-and-exit' in Emacs manual
cd6a9b8f65 Skip shell prompt on current line in Eshell even if it's p...
Diffstat (limited to 'lisp/eshell')
| -rw-r--r-- | lisp/eshell/em-prompt.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/eshell/em-prompt.el b/lisp/eshell/em-prompt.el index 25b8ccaba17..9ae5ae12816 100644 --- a/lisp/eshell/em-prompt.el +++ b/lisp/eshell/em-prompt.el | |||
| @@ -187,7 +187,7 @@ See `eshell-prompt-regexp'." | |||
| 187 | "Move to end of Nth previous prompt in the buffer. | 187 | "Move to end of Nth previous prompt in the buffer. |
| 188 | See `eshell-prompt-regexp'." | 188 | See `eshell-prompt-regexp'." |
| 189 | (interactive "p") | 189 | (interactive "p") |
| 190 | (beginning-of-line) ; Don't count prompt on current line. | 190 | (forward-line 0) ; Don't count prompt on current line. |
| 191 | (eshell-next-prompt (- n))) | 191 | (eshell-next-prompt (- n))) |
| 192 | 192 | ||
| 193 | (defun eshell-skip-prompt () | 193 | (defun eshell-skip-prompt () |