aboutsummaryrefslogtreecommitdiffstats
path: root/src/buffer.c
diff options
context:
space:
mode:
authorGlenn Morris2020-11-02 09:27:40 -0800
committerGlenn Morris2020-11-02 09:27:40 -0800
commit018e0c36fbae6570e58a95d2ac47c0577a496f91 (patch)
tree058be5b8f0a5145d8739e240058c37d1d267afbf /src/buffer.c
parente654b41c6f9eae424736bc8845d92b9dd97ccd3e (diff)
parent1fc9de4b81ceacabef6aafe48ecaabaf76f34bb2 (diff)
downloademacs-018e0c36fbae6570e58a95d2ac47c0577a496f91.tar.gz
emacs-018e0c36fbae6570e58a95d2ac47c0577a496f91.zip
Merge from origin/emacs-27
1fc9de4b81 Improve reproducibility of generated -pkg.el files da6234e2df Make sure pixel sizes are zero when setting window size fo... 2d15296db1 Fix failure of 'emacs --daemon' on Cygwin 8abce5b0c6 CC Mode: Only recognize foo (*bar) as a function pointer w... 85d1d8d768 Fix NEWS entry for fix of Bug#44080 2443b15a91 * src/buffer.c (syms_of_buffer) <fill-column>: Improve doc... # Conflicts: # etc/NEWS
Diffstat (limited to 'src/buffer.c')
-rw-r--r--src/buffer.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/buffer.c b/src/buffer.c
index 241f2d43a93..4fd2b0c8b17 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -5645,6 +5645,9 @@ Use the command `abbrev-mode' to change this variable. */);
5645 DEFVAR_PER_BUFFER ("fill-column", &BVAR (current_buffer, fill_column), 5645 DEFVAR_PER_BUFFER ("fill-column", &BVAR (current_buffer, fill_column),
5646 Qintegerp, 5646 Qintegerp,
5647 doc: /* Column beyond which automatic line-wrapping should happen. 5647 doc: /* Column beyond which automatic line-wrapping should happen.
5648It is used by filling commands, such as `fill-region' and `fill-paragraph',
5649and by `auto-fill-mode', which see.
5650See also `current-fill-column'.
5648Interactively, you can set the buffer local value using \\[set-fill-column]. */); 5651Interactively, you can set the buffer local value using \\[set-fill-column]. */);
5649 5652
5650 DEFVAR_PER_BUFFER ("left-margin", &BVAR (current_buffer, left_margin), 5653 DEFVAR_PER_BUFFER ("left-margin", &BVAR (current_buffer, left_margin),