aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/buffer.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index cc8704da2a1..8df160e1196 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12013-09-14 Eli Zaretskii <eliz@gnu.org>
2
3 * buffer.c (syms_of_buffer) <left-margin-width, right-margin-width>:
4 Doc fix. (Bug#15375)
5
12013-09-13 Dmitry Antipov <dmantipov@yandex.ru> 62013-09-13 Dmitry Antipov <dmantipov@yandex.ru>
2 7
3 Unify Fx_focus_frame between all ports. 8 Unify Fx_focus_frame between all ports.
diff --git a/src/buffer.c b/src/buffer.c
index 0bcb608dbd3..3d7468904f2 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -5900,7 +5900,7 @@ See also the functions `display-table-slot' and `set-display-table-slot'. */);
5900 5900
5901 DEFVAR_PER_BUFFER ("left-margin-width", &BVAR (current_buffer, left_margin_cols), 5901 DEFVAR_PER_BUFFER ("left-margin-width", &BVAR (current_buffer, left_margin_cols),
5902 Qintegerp, 5902 Qintegerp,
5903 doc: /* Width of left marginal area for display of a buffer. 5903 doc: /* Width in columns of left marginal area for display of a buffer.
5904A value of nil means no marginal area. 5904A value of nil means no marginal area.
5905 5905
5906Setting this variable does not take effect until a new buffer is displayed 5906Setting this variable does not take effect until a new buffer is displayed
@@ -5908,7 +5908,7 @@ in a window. To make the change take effect, call `set-window-buffer'. */);
5908 5908
5909 DEFVAR_PER_BUFFER ("right-margin-width", &BVAR (current_buffer, right_margin_cols), 5909 DEFVAR_PER_BUFFER ("right-margin-width", &BVAR (current_buffer, right_margin_cols),
5910 Qintegerp, 5910 Qintegerp,
5911 doc: /* Width of right marginal area for display of a buffer. 5911 doc: /* Width in columns of right marginal area for display of a buffer.
5912A value of nil means no marginal area. 5912A value of nil means no marginal area.
5913 5913
5914Setting this variable does not take effect until a new buffer is displayed 5914Setting this variable does not take effect until a new buffer is displayed