diff options
| author | Paul Eggert | 2011-03-13 10:28:15 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-03-13 10:28:15 -0700 |
| commit | 3eca4629203c3038f04db312999ca32d8e292e50 (patch) | |
| tree | 7dab20a2f6de3e300fd266f51b71efd1d9f52188 /src/buffer.c | |
| parent | 01e0b5adf4e35c2b00705c212b853936fe218cac (diff) | |
| parent | d32df629a23d0e04eb70df9c6e60e821d905c822 (diff) | |
| download | emacs-3eca4629203c3038f04db312999ca32d8e292e50.tar.gz emacs-3eca4629203c3038f04db312999ca32d8e292e50.zip | |
Merge from mainline.
Diffstat (limited to 'src/buffer.c')
| -rw-r--r-- | src/buffer.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/buffer.c b/src/buffer.c index c95fbb5f516..448c9236387 100644 --- a/src/buffer.c +++ b/src/buffer.c | |||
| @@ -5332,9 +5332,6 @@ syms_of_buffer (void) | |||
| 5332 | Fput (Qprotected_field, Qerror_message, | 5332 | Fput (Qprotected_field, Qerror_message, |
| 5333 | make_pure_c_string ("Attempt to modify a protected field")); | 5333 | make_pure_c_string ("Attempt to modify a protected field")); |
| 5334 | 5334 | ||
| 5335 | /* All these use DEFVAR_LISP_NOPRO because the slots in | ||
| 5336 | buffer_defaults will all be marked via Vbuffer_defaults. */ | ||
| 5337 | |||
| 5338 | DEFVAR_BUFFER_DEFAULTS ("default-mode-line-format", | 5335 | DEFVAR_BUFFER_DEFAULTS ("default-mode-line-format", |
| 5339 | mode_line_format, | 5336 | mode_line_format, |
| 5340 | doc: /* Default value of `mode-line-format' for buffers that don't override it. | 5337 | doc: /* Default value of `mode-line-format' for buffers that don't override it. |