diff options
| author | Paul Eggert | 2011-04-25 23:17:52 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-04-25 23:17:52 -0700 |
| commit | 671875dac181f7f1337f21d013a9c3d5f235ddf2 (patch) | |
| tree | 4091c2537439713df8efe8d3376116a6db3eb1c5 /src/buffer.c | |
| parent | f904488ff40dcee3e340b63a6386dde124d1241c (diff) | |
| parent | 0c6b7b19e52ba18b5d4fd2d4b73b133a0a721603 (diff) | |
| download | emacs-671875dac181f7f1337f21d013a9c3d5f235ddf2.tar.gz emacs-671875dac181f7f1337f21d013a9c3d5f235ddf2.zip | |
Merge from mainline.
Diffstat (limited to 'src/buffer.c')
| -rw-r--r-- | src/buffer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/buffer.c b/src/buffer.c index ddaacd93707..d9949045444 100644 --- a/src/buffer.c +++ b/src/buffer.c | |||
| @@ -5551,7 +5551,8 @@ Linefeed indents to this column in Fundamental mode. */); | |||
| 5551 | 5551 | ||
| 5552 | DEFVAR_PER_BUFFER ("tab-width", &BVAR (current_buffer, tab_width), | 5552 | DEFVAR_PER_BUFFER ("tab-width", &BVAR (current_buffer, tab_width), |
| 5553 | make_number (LISP_INT_TAG), | 5553 | make_number (LISP_INT_TAG), |
| 5554 | doc: /* *Distance between tab stops (for display of tab characters), in columns. */); | 5554 | doc: /* *Distance between tab stops (for display of tab characters), in columns. |
| 5555 | This should be an integer greater than zero. */); | ||
| 5555 | 5556 | ||
| 5556 | DEFVAR_PER_BUFFER ("ctl-arrow", &BVAR (current_buffer, ctl_arrow), Qnil, | 5557 | DEFVAR_PER_BUFFER ("ctl-arrow", &BVAR (current_buffer, ctl_arrow), Qnil, |
| 5557 | doc: /* *Non-nil means display control chars with uparrow. | 5558 | doc: /* *Non-nil means display control chars with uparrow. |