diff options
| author | Kim F. Storm | 2005-05-05 22:43:06 +0000 |
|---|---|---|
| committer | Kim F. Storm | 2005-05-05 22:43:06 +0000 |
| commit | 22c8bff16ac71a128e8a23124f0299caa3094f05 (patch) | |
| tree | b6eb02ca42d86066eb6bbd6d2b32226514124ef0 | |
| parent | 8a3707836d87b28145b077792efde5012370a82e (diff) | |
| download | emacs-22c8bff16ac71a128e8a23124f0299caa3094f05.tar.gz emacs-22c8bff16ac71a128e8a23124f0299caa3094f05.zip | |
(line-move-1): Fix 2005-04-26 change. Must still use
vertical-motion when selective-display is active.
| -rw-r--r-- | lisp/simple.el | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/lisp/simple.el b/lisp/simple.el index 43a5708d6c3..204b2fb21bb 100644 --- a/lisp/simple.el +++ b/lisp/simple.el | |||
| @@ -3416,13 +3416,14 @@ Outline mode sets this." | |||
| 3416 | ;; Now move a line. | 3416 | ;; Now move a line. |
| 3417 | (end-of-line) | 3417 | (end-of-line) |
| 3418 | ;; If there's no invisibility here, move over the newline. | 3418 | ;; If there's no invisibility here, move over the newline. |
| 3419 | (if (not (line-move-invisible-p (point))) | 3419 | (if (and (not (integerp selective-display)) |
| 3420 | (not (line-move-invisible-p (point)))) | ||
| 3420 | ;; We avoid vertical-motion when possible | 3421 | ;; We avoid vertical-motion when possible |
| 3421 | ;; because that has to fontify. | 3422 | ;; because that has to fontify. |
| 3422 | (if (eobp) | 3423 | (if (eobp) |
| 3423 | (if (not noerror) | 3424 | (if (not noerror) |
| 3424 | (signal 'end-of-buffer nil) | 3425 | (signal 'end-of-buffer nil) |
| 3425 | (setq done t)) | 3426 | (setq done t)) |
| 3426 | (forward-line 1)) | 3427 | (forward-line 1)) |
| 3427 | ;; Otherwise move a more sophisticated way. | 3428 | ;; Otherwise move a more sophisticated way. |
| 3428 | ;; (What's the logic behind this code?) | 3429 | ;; (What's the logic behind this code?) |
| @@ -3432,11 +3433,13 @@ Outline mode sets this." | |||
| 3432 | (setq done t)))) | 3433 | (setq done t)))) |
| 3433 | (unless done | 3434 | (unless done |
| 3434 | (setq arg (1- arg)))) | 3435 | (setq arg (1- arg)))) |
| 3435 | ;; The logic of this is the same as the loop above, | 3436 | ;; The logic of this is the same as the loop above, |
| 3436 | ;; it just goes in the other direction. | 3437 | ;; it just goes in the other direction. |
| 3437 | (while (and (< arg 0) (not done)) | 3438 | (while (and (< arg 0) (not done)) |
| 3438 | (beginning-of-line) | 3439 | (beginning-of-line) |
| 3439 | (if (or (bobp) (not (line-move-invisible-p (1- (point))))) | 3440 | (if (or (bobp) |
| 3441 | (and (not (integerp selective-display)) | ||
| 3442 | (not (line-move-invisible-p (1- (point)))))) | ||
| 3440 | (if (bobp) | 3443 | (if (bobp) |
| 3441 | (if (not noerror) | 3444 | (if (not noerror) |
| 3442 | (signal 'beginning-of-buffer nil) | 3445 | (signal 'beginning-of-buffer nil) |