Mercurial > emacs
comparison lisp/simple.el @ 111933:5032326a2135 EMACS_PRETEST_23_2_91
Bump version to 23.2.91.
Regenerate configure and ldefs-boot.el.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Fri, 10 Dec 2010 12:46:40 -0500 |
| parents | f475600c36d9 |
| children | 2f24255ca500 |
comparison
equal
deleted
inserted
replaced
| 111932:656e54e27a1b | 111933:5032326a2135 |
|---|---|
| 4113 (min (- (window-text-height) scroll-margin 1) (1- vpos)))) | 4113 (min (- (window-text-height) scroll-margin 1) (1- vpos)))) |
| 4114 nil) | 4114 nil) |
| 4115 ;; When already vscrolled, we vscroll some more if we can, | 4115 ;; When already vscrolled, we vscroll some more if we can, |
| 4116 ;; or clear vscroll and move forward at end of tall image. | 4116 ;; or clear vscroll and move forward at end of tall image. |
| 4117 ((> (setq vs (window-vscroll nil t)) 0) | 4117 ((> (setq vs (window-vscroll nil t)) 0) |
| 4118 | |
| 4119 ;; If we are vscrolling an image at the top of the screen, | |
| 4120 ;; we could actually advance point if this yields space | |
| 4121 ;; below.... | |
| 4122 | |
| 4118 (when (> rbot 0) | 4123 (when (> rbot 0) |
| 4119 (set-window-vscroll nil (+ vs (min rbot (frame-char-height))) t))) | 4124 (set-window-vscroll nil (+ vs (min rbot (frame-char-height))) t))) |
| 4120 ;; If cursor just entered the bottom scroll margin, move forward, | 4125 ;; If cursor just entered the bottom scroll margin, move forward, |
| 4121 ;; but also vscroll one line so redisplay wont recenter. | 4126 ;; but also vscroll one line so redisplay wont recenter. |
| 4122 ((and (> vpos 0) | 4127 ((and (> vpos 0) |