aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2013-06-04 19:33:46 +0300
committerEli Zaretskii2013-06-04 19:33:46 +0300
commitba59bd80a234985ecc1c65533c0471791d5b8d62 (patch)
tree84beb6459fabfdcfce3a9b4510212cb3fe6c2783 /src
parent6490c52ee82c796612ac1feb2661bc6e5c8ad07d (diff)
downloademacs-ba59bd80a234985ecc1c65533c0471791d5b8d62.tar.gz
emacs-ba59bd80a234985ecc1c65533c0471791d5b8d62.zip
Fix bug #14540 with inaccurate doc string of pos-visible-in-window-p.
src/window.c (Fpos_visible_in_window_p): Doc fix.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/window.c7
2 files changed, 8 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 7fdd456c9a7..0914d8efac0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12013-06-04 Eli Zaretskii <eliz@gnu.org>
2
3 * window.c (Fpos_visible_in_window_p): Doc fix. (Bug#14540)
4
12013-06-03 Eli Zaretskii <eliz@gnu.org> 52013-06-03 Eli Zaretskii <eliz@gnu.org>
2 6
3 * w32console.c (initialize_w32_display): Return the dimensions of 7 * w32console.c (initialize_w32_display): Return the dimensions of
diff --git a/src/window.c b/src/window.c
index 7cf35a480f7..28e01103eb1 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1620,12 +1620,13 @@ specifies the position of the last visible glyph in WINDOW. POS
1620defaults to point in WINDOW; WINDOW defaults to the selected window. 1620defaults to point in WINDOW; WINDOW defaults to the selected window.
1621 1621
1622If POS is visible, return t if PARTIALLY is nil; if PARTIALLY is non-nil, 1622If POS is visible, return t if PARTIALLY is nil; if PARTIALLY is non-nil,
1623return value is a list of 2 or 6 elements (X Y [RTOP RBOT ROWH VPOS]), 1623the return value is a list of 2 or 6 elements (X Y [RTOP RBOT ROWH VPOS]),
1624where X and Y are the pixel coordinates relative to the top left corner 1624where X and Y are the pixel coordinates relative to the top left corner
1625of the window. The remaining elements are omitted if the character after 1625of the window. The remaining elements are omitted if the character after
1626POS is fully visible; otherwise, RTOP and RBOT are the number of pixels 1626POS is fully visible; otherwise, RTOP and RBOT are the number of pixels
1627off-window at the top and bottom of the row, ROWH is the height of the 1627off-window at the top and bottom of the screen line ("row") containing
1628display row, and VPOS is the row number (0-based) containing POS. */) 1628POS, ROWH is the visible height of that row, and VPOS is the row number
1629\(zero-based). */)
1629 (Lisp_Object pos, Lisp_Object window, Lisp_Object partially) 1630 (Lisp_Object pos, Lisp_Object window, Lisp_Object partially)
1630{ 1631{
1631 register struct window *w; 1632 register struct window *w;