diff --git a/src/ChangeLog b/src/ChangeLog
index 861ba91c275..8680c5e231b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -253,6 +253,10 @@
 	* xterm.c (do_ewmh_fullscreen): Don't remove maximized_horz/vert
 	when going to fullscreen (Bug#0x180004f).
 
+2014-12-27  Eli Zaretskii  <eliz@gnu.org>
+
+	* window.c (Fwindow_body_width): Doc fix.  (Bug#19395)
+
 2014-12-27  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* 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.
 If PIXELWISE is nil, return the largest integer smaller than WINDOW's
 pixel width divided by the character width of WINDOW's frame.  This
 means that if a column at the right of the text area is only partially
-visible, that column is not counted.  */)
+visible, that column is not counted.
+
+Note that the returned value includes the column reserved for the
+continuation glyph.  */)
   (Lisp_Object window, Lisp_Object pixelwise)
 {
   return make_number (window_body_width (decode_live_window (window),