diff options
| author | Glenn Morris | 2011-04-22 20:07:16 -0700 |
|---|---|---|
| committer | Glenn Morris | 2011-04-22 20:07:16 -0700 |
| commit | 4ffd0d6b569d252e4e807d4e9c9d6a5bd5b08640 (patch) | |
| tree | 26c20c7c4da56fae7e041c9345c76cce1224188c /src/buffer.c | |
| parent | 81de9236e1daa1fe7dfd0ef9aaaf1e13b6aa74e4 (diff) | |
| parent | be71f8100a71a5b896ef05c32f51a09a3d9e3993 (diff) | |
| download | emacs-4ffd0d6b569d252e4e807d4e9c9d6a5bd5b08640.tar.gz emacs-4ffd0d6b569d252e4e807d4e9c9d6a5bd5b08640.zip | |
Merge from emacs-23; up to 2010-06-09T17:54:28Z!albinus@detlef.
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 c649836adb8..46e8ddf1538 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. |