aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2014-12-18 19:15:01 +0200
committerEli Zaretskii2014-12-18 19:15:01 +0200
commit811aceeaef8d436bdecbbb2f87bcdbefeb0cdfd0 (patch)
tree759b1fd2de808dd9bb87fddc6e1edc362d51afc0 /src
parent78101c2b5840218933675236062060523bdd163c (diff)
downloademacs-811aceeaef8d436bdecbbb2f87bcdbefeb0cdfd0.tar.gz
emacs-811aceeaef8d436bdecbbb2f87bcdbefeb0cdfd0.zip
src/window.c (Fwindow_body_width): Doc fix. (Bug#19395)
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/window.c5
2 files changed, 8 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index c0b9039c339..d6de89a9d50 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12014-12-18 Eli Zaretskii <eliz@gnu.org>
2
3 * window.c (Fwindow_body_width): Doc fix. (Bug#19395)
4
12014-12-15 Stefan Monnier <monnier@iro.umontreal.ca> 52014-12-15 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * buffer.c (syms_of_buffer) <Vafter_change_functions>: fix docstring. 7 * buffer.c (syms_of_buffer) <Vafter_change_functions>: fix docstring.
diff --git a/src/window.c b/src/window.c
index 6938ffb8cb8..ccd714ae12e 100644
--- a/src/window.c
+++ b/src/window.c
@@ -973,7 +973,10 @@ or scroll bars.
973If PIXELWISE is nil, return the largest integer smaller than WINDOW's 973If PIXELWISE is nil, return the largest integer smaller than WINDOW's
974pixel width divided by the character width of WINDOW's frame. This 974pixel width divided by the character width of WINDOW's frame. This
975means that if a column at the right of the text area is only partially 975means that if a column at the right of the text area is only partially
976visible, that column is not counted. */) 976visible, that column is not counted.
977
978Note that the returned value includes the column reserved for the
979continuation glyph. */)
977 (Lisp_Object window, Lisp_Object pixelwise) 980 (Lisp_Object window, Lisp_Object pixelwise)
978{ 981{
979 return make_number (window_body_width (decode_live_window (window), 982 return make_number (window_body_width (decode_live_window (window),