diff options
| author | Eli Zaretskii | 2011-11-19 21:49:56 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2011-11-19 21:49:56 +0200 |
| commit | 0e23d96a60e4283caf112c0d06bb49a8a86ab2bf (patch) | |
| tree | cae735709728638914cda934810d6c4ca27172ac | |
| parent | f8fe6f9674b53239529644f95b71f2d885d76a08 (diff) | |
| download | emacs-0e23d96a60e4283caf112c0d06bb49a8a86ab2bf.tar.gz emacs-0e23d96a60e4283caf112c0d06bb49a8a86ab2bf.zip | |
Fix bug #10076 with vertical cursor motion in hscrolled windows.
lisp/simple.el (line-move): Force movement by logical lines for any
hscrolled window, not only when auto-hscroll-mode is on.
(line-move-visual): Update doc string to that effect.
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/simple.el | 14 |
2 files changed, 12 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b35ddc25d73..86a6c1c3754 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2011-11-19 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * simple.el (line-move): Force movement by logical lines for any | ||
| 4 | hscrolled window, not only when auto-hscroll-mode is on. | ||
| 5 | (line-move-visual): Update doc string to that effect. (Bug#10076) | ||
| 6 | |||
| 1 | 2011-11-19 Andreas Schwab <schwab@linux-m68k.org> | 7 | 2011-11-19 Andreas Schwab <schwab@linux-m68k.org> |
| 2 | 8 | ||
| 3 | * language/european.el (macintosh): Define as alias for mac-roman. | 9 | * language/european.el (macintosh): Define as alias for mac-roman. |
diff --git a/lisp/simple.el b/lisp/simple.el index e70d37588a0..1dc866cf64d 100644 --- a/lisp/simple.el +++ b/lisp/simple.el | |||
| @@ -4277,8 +4277,8 @@ into account variable-width characters and line continuation. | |||
| 4277 | If nil, `line-move' moves point by logical lines. | 4277 | If nil, `line-move' moves point by logical lines. |
| 4278 | A non-nil setting of `goal-column' overrides the value of this variable | 4278 | A non-nil setting of `goal-column' overrides the value of this variable |
| 4279 | and forces movement by logical lines. | 4279 | and forces movement by logical lines. |
| 4280 | Disabling `auto-hscroll-mode' also overrides forces movement by logical | 4280 | A window that is horizontally scrolled also forces movement by logical |
| 4281 | lines when the window is horizontally scrolled." | 4281 | lines." |
| 4282 | :type 'boolean | 4282 | :type 'boolean |
| 4283 | :group 'editing-basics | 4283 | :group 'editing-basics |
| 4284 | :version "23.1") | 4284 | :version "23.1") |
| @@ -4358,12 +4358,10 @@ lines when the window is horizontally scrolled." | |||
| 4358 | (if (and line-move-visual | 4358 | (if (and line-move-visual |
| 4359 | ;; Display-based column are incompatible with goal-column. | 4359 | ;; Display-based column are incompatible with goal-column. |
| 4360 | (not goal-column) | 4360 | (not goal-column) |
| 4361 | ;; When auto-hscroll-mode is turned off and the text in | 4361 | ;; When the text in the window is scrolled to the left, |
| 4362 | ;; the window is scrolled to the left, display-based | 4362 | ;; display-based motion doesn't make sense (because each |
| 4363 | ;; motion doesn't make sense (because each logical line | 4363 | ;; logical line occupies exactly one screen line). |
| 4364 | ;; occupies exactly one screen line). | 4364 | (not (> (window-hscroll) 0))) |
| 4365 | (not (and (null auto-hscroll-mode) | ||
| 4366 | (> (window-hscroll) 0)))) | ||
| 4367 | (line-move-visual arg noerror) | 4365 | (line-move-visual arg noerror) |
| 4368 | (line-move-1 arg noerror to-end)))) | 4366 | (line-move-1 arg noerror to-end)))) |
| 4369 | 4367 | ||