aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2014-12-18 19:15:01 +0200
committerAndreas Schwab2015-01-08 00:17:32 +0100
commit8596361bb3a005394db8328d8f0a6df0cb91b5cc (patch)
tree0a30d42682fd4a2f473f60bb4c74a0a8035a63c4 /src
parent50414e9410fb1e34ba0699e46808b0bc767117c9 (diff)
downloademacs-8596361bb3a005394db8328d8f0a6df0cb91b5cc.tar.gz
emacs-8596361bb3a005394db8328d8f0a6df0cb91b5cc.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 861ba91c275..8680c5e231b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -253,6 +253,10 @@
253 * xterm.c (do_ewmh_fullscreen): Don't remove maximized_horz/vert 253 * xterm.c (do_ewmh_fullscreen): Don't remove maximized_horz/vert
254 when going to fullscreen (Bug#0x180004f). 254 when going to fullscreen (Bug#0x180004f).
255 255
2562014-12-27 Eli Zaretskii <eliz@gnu.org>
257
258 * window.c (Fwindow_body_width): Doc fix. (Bug#19395)
259
2562014-12-27 Stefan Monnier <monnier@iro.umontreal.ca> 2602014-12-27 Stefan Monnier <monnier@iro.umontreal.ca>
257 261
258 * buffer.c (syms_of_buffer) <Vafter_change_functions>: fix docstring. 262 * buffer.c (syms_of_buffer) <Vafter_change_functions>: fix docstring.
diff --git a/src/window.c b/src/window.c
index b508988953f..1d2221fd9b2 100644
--- a/src/window.c
+++ b/src/window.c
@@ -974,7 +974,10 @@ or scroll bars.
974If PIXELWISE is nil, return the largest integer smaller than WINDOW's 974If PIXELWISE is nil, return the largest integer smaller than WINDOW's
975pixel width divided by the character width of WINDOW's frame. This 975pixel width divided by the character width of WINDOW's frame. This
976means that if a column at the right of the text area is only partially 976means that if a column at the right of the text area is only partially
977visible, that column is not counted. */) 977visible, that column is not counted.
978
979Note that the returned value includes the column reserved for the
980continuation glyph. */)
978 (Lisp_Object window, Lisp_Object pixelwise) 981 (Lisp_Object window, Lisp_Object pixelwise)
979{ 982{
980 return make_number (window_body_width (decode_live_window (window), 983 return make_number (window_body_width (decode_live_window (window),