summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/emerge.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a65b9e444be..7a46f4ea292 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-25 Pavel Jan,Bm(Bk <Pavel@Janik.cz>
+
+ * emerge.el (emerge-show-file-name): Use frame-height instead of
+ obsolete screen-height.
+
2001-12-25 Richard M. Stallman <rms@gnu.org>
* window.el (balance-windows): Use new PRESERVE-BEFORE arg
diff --git a/lisp/emerge.el b/lisp/emerge.el
index 68e857ff245..e08e566ee2a 100644
--- a/lisp/emerge.el
+++ b/lisp/emerge.el
@@ -3115,7 +3115,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-event)))
(if (not (eq c 32))