merge from trunk

2 files changed, 7 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index cc8704da2a1..00f3fa8eccf 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-14  Eli Zaretskii  <eliz@gnu.org>
+
+        * buffer.c (syms_of_buffer) <left-margin-width, right-margin-width>:
+        Doc fix.  (Bug#15375)
+
 2013-09-13  Dmitry Antipov  <dmantipov@yandex.ru>
 
         Unify Fx_focus_frame between all ports.
diff --git a/src/buffer.c b/src/buffer.c
index ff05da6d0d9..71c01237205 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -5909,7 +5909,7 @@ See also the functions `display-table-slot' and `set-display-table-slot'.  */);
 
   DEFVAR_PER_BUFFER ("left-margin-width", &BVAR (current_buffer, left_margin_cols),
                      Qintegerp,
-                     doc: /* Width of left marginal area for display of a buffer.
+                     doc: /* Width in columns of left marginal area for display of a buffer.
 A value of nil means no marginal area.
 
 Setting this variable does not take effect until a new buffer is displayed
@@ -5917,7 +5917,7 @@ in a window.  To make the change take effect, call `set-window-buffer'.  */);
 
   DEFVAR_PER_BUFFER ("right-margin-width", &BVAR (current_buffer, right_margin_cols),
                      Qintegerp,
-                     doc: /* Width of right marginal area for display of a buffer.
+                     doc: /* Width in columns of right marginal area for display of a buffer.
 A value of nil means no marginal area.
 
 Setting this variable does not take effect until a new buffer is displayed