From: Gerd Moellmann <gerd@gnu.org>
Date: Tue, 14 Nov 2000 05:44:18 +0000 (+0000)
Subject: (Fpos_visible_in_window_p): Call pos_visible with
X-Git-Tag: emacs-pretest-21.0.90~85
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5f0c971db711154bb140052812814506a7419ce0;p=emacs.git

(Fpos_visible_in_window_p): Call pos_visible with
extra argument.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 31a116a8fe6..e8abc2970c9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,22 @@
+2000-11-14  Gerd Moellmann  <gerd@gnu.org>
+
+	* window.c (Fpos_visible_in_window_p): Call pos_visible with
+	extra argument.
+
+	* xdisp.c (current_mode_line_height, current_header_line_height):
+	New variables.
+	(init_xdisp): Initialize them.
+	(pos_visible_p): Add parameter EXACT_MODE_LINE_HEIGHTS_P.  Compute
+	and use exact mode line heights if it is set.
+
+	* lisp.h (pos_visible_p): Change prototype.
+
+	* dispextern.h (CURRENT_MODE_LINE_HEIGHT)
+	(CURRENT_HEADER_LINE_HEIGHT):  Look at current_mode_line_height
+	and current_header_line_height first.
+	(current_mode_line_height, current_header_line_height): Declare
+	extern.
+
 2000-11-14  Miles Bader  <miles@lsi.nec.co.jp>
 
 	* xterm.c (x_alloc_lighter_color): Use real brightness calculation.
diff --git a/src/window.c b/src/window.c
index 5257c1b0cdb..4c755a3f03e 100644
--- a/src/window.c
+++ b/src/window.c
@@ -337,7 +337,7 @@ POS defaults to point in WINDOW; WINDOW defaults to the selected window.")
 	 char in the window.  */
       if (!NILP (fully))
 	{
-	  pos_visible_p (w, posint, &fully_p);
+	  pos_visible_p (w, posint, &fully_p, !NILP (fully));
 	  in_window = fully_p ? Qt : Qnil;
 	}
       else
@@ -350,7 +350,7 @@ POS defaults to point in WINDOW; WINDOW defaults to the selected window.")
     in_window = Qnil;
   else
     {
-      if (pos_visible_p (w, posint, &fully_p))
+      if (pos_visible_p (w, posint, &fully_p, !NILP (fully)))
 	in_window = NILP (fully) || fully_p ? Qt : Qnil;
       else
 	in_window = Qnil;