diff options
| author | Joakim Verona | 2013-09-14 11:40:24 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-09-14 11:40:24 +0200 |
| commit | 2b483f0f59ff7f125dfbe490e42eb84c238ac971 (patch) | |
| tree | ba1528a35fc63b414fe981fe335b053beec4bfe3 /src/buffer.c | |
| parent | 9523ac3289ca64bd74c42a1cc20ed1df7a9896e7 (diff) | |
| parent | 08a209bff2e8f91720e5b2dfbac071ea2286814b (diff) | |
| download | emacs-2b483f0f59ff7f125dfbe490e42eb84c238ac971.tar.gz emacs-2b483f0f59ff7f125dfbe490e42eb84c238ac971.zip | |
merge from trunk
Diffstat (limited to 'src/buffer.c')
| -rw-r--r-- | src/buffer.c | 4 |
1 files changed, 2 insertions, 2 deletions
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'. */); | |||
| 5909 | 5909 | ||
| 5910 | DEFVAR_PER_BUFFER ("left-margin-width", &BVAR (current_buffer, left_margin_cols), | 5910 | DEFVAR_PER_BUFFER ("left-margin-width", &BVAR (current_buffer, left_margin_cols), |
| 5911 | Qintegerp, | 5911 | Qintegerp, |
| 5912 | doc: /* Width of left marginal area for display of a buffer. | 5912 | doc: /* Width in columns of left marginal area for display of a buffer. |
| 5913 | A value of nil means no marginal area. | 5913 | A value of nil means no marginal area. |
| 5914 | 5914 | ||
| 5915 | Setting this variable does not take effect until a new buffer is displayed | 5915 | 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'. */); | |||
| 5917 | 5917 | ||
| 5918 | DEFVAR_PER_BUFFER ("right-margin-width", &BVAR (current_buffer, right_margin_cols), | 5918 | DEFVAR_PER_BUFFER ("right-margin-width", &BVAR (current_buffer, right_margin_cols), |
| 5919 | Qintegerp, | 5919 | Qintegerp, |
| 5920 | doc: /* Width of right marginal area for display of a buffer. | 5920 | doc: /* Width in columns of right marginal area for display of a buffer. |
| 5921 | A value of nil means no marginal area. | 5921 | A value of nil means no marginal area. |
| 5922 | 5922 | ||
| 5923 | Setting this variable does not take effect until a new buffer is displayed | 5923 | Setting this variable does not take effect until a new buffer is displayed |