summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1994-08-10 20:32:38 +0000
committerRichard M. Stallman <rms@gnu.org>1994-08-10 20:32:38 +0000
commit8646118f1756c8e40b495a7b6cea5a0d2d6a4934 (patch)
tree3201c4fb54d8fcf5e012a8b3c4ea2b95ea7a0a12
parent7fa3680263bf0bf54aef9824a4642fc603c9d3aa (diff)
downloademacs-8646118f1756c8e40b495a7b6cea5a0d2d6a4934.tar.gz
(Fwindow_end): Undo previous change.
-rw-r--r--src/window.c18
1 files changed, 11 insertions, 7 deletions
diff --git a/src/window.c b/src/window.c
index 1401abda32c..22db914d7f6 100644
--- a/src/window.c
+++ b/src/window.c
@@ -489,12 +489,8 @@ DEFUN ("window-start", Fwindow_start, Swindow_start, 0, 1, 0,
return Fmarker_position (decode_window (window)->start);
}
-DEFUN ("window-end", Fwindow_end, Swindow_end, 0, 1, 0,
- "Return position at which display currently ends in WINDOW.\n\
-This is updated by redisplay, when it runs to completion.\n\
-Simply changing the buffer text or setting `window-start'\n\
-does not update this value.\n\
-\n\
+/* This is text temporarily removed from the doc string below.
+
This function returns nil if the position is not currently known.\n\
That happens when redisplay is preempted and doesn't finish.\n\
If in that case you want to compute where the end of the window would\n\
@@ -502,7 +498,13 @@ have been if redisplay had finished, do this:\n\
(save-excursion\n\
(goto-char (window-start window))\n\
(vertical-motion (1- (window-height window)) window)\n\
- (point))")
+ (point))") */
+
+DEFUN ("window-end", Fwindow_end, Swindow_end, 0, 1, 0,
+ "Return position at which display currently ends in WINDOW.\n\
+This is updated by redisplay, when it runs to completion.\n\
+Simply changing the buffer text or setting `window-start'\n\
+does not update this value.")
(window)
Lisp_Object window;
{
@@ -513,12 +515,14 @@ have been if redisplay had finished, do this:\n\
buf = w->buffer;
CHECK_BUFFER (buf, 0);
+#if 0 /* This change broke some things. We should make it later. */
/* If we don't know the end position, return nil.
The user can compute it with vertical-motion if he wants to.
It would be nicer to do it automatically,
but that's so slow that it would probably bother people. */
if (NILP (w->window_end_valid))
return Qnil;
+#endif
XSET (value, Lisp_Int,
BUF_Z (XBUFFER (buf)) - XFASTINT (w->window_end_pos));