diff options
| author | Kim F. Storm <storm@cua.dk> | 2005-07-13 10:29:38 +0000 |
|---|---|---|
| committer | Kim F. Storm <storm@cua.dk> | 2005-07-13 10:29:38 +0000 |
| commit | 6a8b26dcd50f343b06668270615471a8f713bbda (patch) | |
| tree | 573e20cc11990725696dbdb27e16922300daf60e /lisp | |
| parent | 010b9a45b1afa80245d715cdc2e8793f2d0f9ed1 (diff) | |
| download | emacs-6a8b26dcd50f343b06668270615471a8f713bbda.tar.gz | |
(line-move-1): Always use vertical-motion to
do the last (or only) line move to ensure some movement.
Undo 2005-06-23 change--don't check for overlays.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/simple.el | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/lisp/simple.el b/lisp/simple.el index c2859fc35ef..7c6a1e5ccf4 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -3447,14 +3447,13 @@ Outline mode sets this." (signal 'end-of-buffer nil) (setq done t))) (when (and (not done) + (> arg 1) ;; Use vertical-motion for last move (not (integerp selective-display)) (not (line-move-invisible-p (point)))) - (unless (overlays-in (max (1- pos-before) (point-min)) - (min (1+ (point)) (point-max))) - ;; We avoid vertical-motion when possible - ;; because that has to fontify. - (forward-line 1) - (setq line-done t))) + ;; We avoid vertical-motion when possible + ;; because that has to fontify. + (forward-line 1) + (setq line-done t)) (and (not done) (not line-done) ;; Otherwise move a more sophisticated way. (zerop (vertical-motion 1)) @@ -3474,12 +3473,11 @@ Outline mode sets this." (signal 'beginning-of-buffer nil) (setq done t))) (when (and (not done) + (< arg -1) ;; Use vertical-motion for last move (not (integerp selective-display)) (not (line-move-invisible-p (1- (point))))) - (unless (overlays-in (max (1- (point)) (point-min)) - (min (1+ pos-before) (point-max))) - (forward-line -1) - (setq line-done t))) + (forward-line -1) + (setq line-done t)) (and (not done) (not line-done) (zerop (vertical-motion -1)) (if (not noerror) |