diff options
| author | Eli Zaretskii | 2014-11-30 18:06:19 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2014-11-30 18:06:19 +0200 |
| commit | 59c4d5f95337d6393edb5ffe6b9ef74e4f89058f (patch) | |
| tree | 7065d829bf1279d6ba5552c654fdd923535019d7 | |
| parent | babb0ca80be9a46eee70f23377f360e927797ae2 (diff) | |
| download | emacs-59c4d5f95337d6393edb5ffe6b9ef74e4f89058f.tar.gz emacs-59c4d5f95337d6393edb5ffe6b9ef74e4f89058f.zip | |
Fix bug #19211 with move-end-of-line in non-interactive session.
lisp/simple.el (line-move): If noninteractive, call line-move-1, not
forward-line, since the former is compatible with line-move-visual
both in terms of the column to which it moves and the return
value.
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/simple.el | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9a45f08b92c..726d9b02ac8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,10 @@ | |||
| 1 | 2014-11-30 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * simple.el (line-move): If noninteractive, call line-move-1, not | ||
| 4 | forward-line, since the former is compatible with line-move-visual | ||
| 5 | both in terms of the column to which it moves and the return | ||
| 6 | value. (Bug#19211) | ||
| 7 | |||
| 1 | 2014-11-27 Stephen Berman <stephen.berman@gmx.net> | 8 | 2014-11-27 Stephen Berman <stephen.berman@gmx.net> |
| 2 | Stefan Monnier <monnier@iro.umontreal.ca> | 9 | Stefan Monnier <monnier@iro.umontreal.ca> |
| 3 | 10 | ||
diff --git a/lisp/simple.el b/lisp/simple.el index 0c0e8158303..65fcf6e90b2 100644 --- a/lisp/simple.el +++ b/lisp/simple.el | |||
| @@ -5191,7 +5191,7 @@ TRY-VSCROLL controls whether to vscroll tall lines: if either | |||
| 5191 | `auto-window-vscroll' or TRY-VSCROLL is nil, this function will | 5191 | `auto-window-vscroll' or TRY-VSCROLL is nil, this function will |
| 5192 | not vscroll." | 5192 | not vscroll." |
| 5193 | (if noninteractive | 5193 | (if noninteractive |
| 5194 | (forward-line arg) | 5194 | (line-move-1 arg noerror to-end) |
| 5195 | (unless (and auto-window-vscroll try-vscroll | 5195 | (unless (and auto-window-vscroll try-vscroll |
| 5196 | ;; Only vscroll for single line moves | 5196 | ;; Only vscroll for single line moves |
| 5197 | (= (abs arg) 1) | 5197 | (= (abs arg) 1) |