diff options
| author | Jim Blandy <jimb@redhat.com> | 1992-07-15 02:24:58 +0000 |
|---|---|---|
| committer | Jim Blandy <jimb@redhat.com> | 1992-07-15 02:24:58 +0000 |
| commit | 4310192488cb557b06c40053c09e49922e3afaa7 (patch) | |
| tree | 46a7d371c3fbd3cda7000f7cc4a1dcbb71f41aae /lisp/emerge.el | |
| parent | cb13adc96567d5c262e1ee6d58fb524cf47a9392 (diff) | |
| download | emacs-4310192488cb557b06c40053c09e49922e3afaa7.tar.gz | |
*** empty log message ***
Diffstat (limited to 'lisp/emerge.el')
| -rw-r--r-- | lisp/emerge.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/emerge.el b/lisp/emerge.el index bcb15da3aee..cf9fcebe94c 100644 --- a/lisp/emerge.el +++ b/lisp/emerge.el @@ -400,7 +400,7 @@ ; number of lines or characters by which the windows are scrolled. ; Otherwise, the amount of motion is computed based on the dimensions of ; the merge buffer window -- the height of the merge buffer window -; (minus next-screen-context-lines), or half the width of the merge +; (minus next-frame-context-lines), or half the width of the merge ; buffer window. (The A and B version windows are assumed to be as high ; as the merge window, but half as wide.) If the argument is just `C-u ; -', then the scrolling is half the default amount. @@ -2898,7 +2898,7 @@ SPC, it is ignored; if it is anything else, it is processed as a command." (if (not (pos-visible-in-window-p)) (let ((echo-keystrokes 0)) (while (and (not (pos-visible-in-window-p)) - (> (1- (screen-height)) (window-height))) + (> (1- (frame-height)) (window-height))) (enlarge-window 1)) (let ((c (read-char))) (if (/= c 32) |