Mercurial > emacs
comparison lisp/simple.el @ 83320:ebfb2856c8e6
Merged from miles@gnu.org--gnu-2005 (patch 447-448)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-447
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-448
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-360
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Sun, 26 Jun 2005 21:12:57 +0000 |
parents | d07fdd5d7d4e ca6b783d349c |
children | efa9e4606e7e |
comparison
equal
deleted
inserted
replaced
83319:8f5787c83345 | 83320:ebfb2856c8e6 |
---|---|
3444 (signal 'end-of-buffer nil) | 3444 (signal 'end-of-buffer nil) |
3445 (setq done t))) | 3445 (setq done t))) |
3446 (when (and (not done) | 3446 (when (and (not done) |
3447 (not (integerp selective-display)) | 3447 (not (integerp selective-display)) |
3448 (not (line-move-invisible-p (point)))) | 3448 (not (line-move-invisible-p (point)))) |
3449 ;; We avoid vertical-motion when possible | |
3450 ;; because that has to fontify. | |
3451 (forward-line 1) | |
3452 ;; If there are overlays in and around | |
3453 ;; the text we moved over, we need to be | |
3454 ;; sophisticated. | |
3455 (unless (overlays-in (max (1- pos-before) (point-min)) | 3449 (unless (overlays-in (max (1- pos-before) (point-min)) |
3456 (min (1+ (point)) (point-max))) | 3450 (min (1+ (point)) (point-max))) |
3451 ;; We avoid vertical-motion when possible | |
3452 ;; because that has to fontify. | |
3453 (forward-line 1) | |
3457 (setq line-done t))) | 3454 (setq line-done t))) |
3458 ;; Otherwise move a more sophisticated way. | |
3459 ;; (What's the logic behind this code?) | |
3460 (and (not done) (not line-done) | 3455 (and (not done) (not line-done) |
3456 ;; Otherwise move a more sophisticated way. | |
3461 (zerop (vertical-motion 1)) | 3457 (zerop (vertical-motion 1)) |
3462 (if (not noerror) | 3458 (if (not noerror) |
3463 (signal 'end-of-buffer nil) | 3459 (signal 'end-of-buffer nil) |
3464 (setq done t)))) | 3460 (setq done t)))) |
3465 (unless done | 3461 (unless done |
3475 (signal 'beginning-of-buffer nil) | 3471 (signal 'beginning-of-buffer nil) |
3476 (setq done t))) | 3472 (setq done t))) |
3477 (when (and (not done) | 3473 (when (and (not done) |
3478 (not (integerp selective-display)) | 3474 (not (integerp selective-display)) |
3479 (not (line-move-invisible-p (1- (point))))) | 3475 (not (line-move-invisible-p (1- (point))))) |
3480 (forward-line -1) | |
3481 (unless (overlays-in (max (1- (point)) (point-min)) | 3476 (unless (overlays-in (max (1- (point)) (point-min)) |
3482 (min (1+ pos-before) (point-max))) | 3477 (min (1+ pos-before) (point-max))) |
3478 (forward-line -1) | |
3483 (setq line-done t))) | 3479 (setq line-done t))) |
3484 (and (not done) (not line-done) | 3480 (and (not done) (not line-done) |
3485 (zerop (vertical-motion -1)) | 3481 (zerop (vertical-motion -1)) |
3486 (if (not noerror) | 3482 (if (not noerror) |
3487 (signal 'beginning-of-buffer nil) | 3483 (signal 'beginning-of-buffer nil) |