diff options
| author | Paul Eggert | 2011-07-29 14:14:19 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-07-29 14:14:19 -0700 |
| commit | eacb6b4bfa897c12c41a4af73f40ab61b45a8548 (patch) | |
| tree | d0f9e055b6780b64db72c65753a793e1d1a59f66 /src/buffer.c | |
| parent | 5402029425ceee114d7ed071ac981227f0d1fc38 (diff) | |
| parent | 096a60526593c1571da1ec9137b878ad8178f833 (diff) | |
| download | emacs-eacb6b4bfa897c12c41a4af73f40ab61b45a8548.tar.gz emacs-eacb6b4bfa897c12c41a4af73f40ab61b45a8548.zip | |
Merge from trunk.
Diffstat (limited to 'src/buffer.c')
| -rw-r--r-- | src/buffer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/buffer.c b/src/buffer.c index a40275db8de..45d6fa36d04 100644 --- a/src/buffer.c +++ b/src/buffer.c | |||
| @@ -4926,7 +4926,7 @@ init_buffer_once (void) | |||
| 4926 | BVAR (&buffer_defaults, truncate_lines) = Qnil; | 4926 | BVAR (&buffer_defaults, truncate_lines) = Qnil; |
| 4927 | BVAR (&buffer_defaults, word_wrap) = Qnil; | 4927 | BVAR (&buffer_defaults, word_wrap) = Qnil; |
| 4928 | BVAR (&buffer_defaults, ctl_arrow) = Qt; | 4928 | BVAR (&buffer_defaults, ctl_arrow) = Qt; |
| 4929 | BVAR (&buffer_defaults, bidi_display_reordering) = Qnil; | 4929 | BVAR (&buffer_defaults, bidi_display_reordering) = Qt; |
| 4930 | BVAR (&buffer_defaults, bidi_paragraph_direction) = Qnil; | 4930 | BVAR (&buffer_defaults, bidi_paragraph_direction) = Qnil; |
| 4931 | BVAR (&buffer_defaults, cursor_type) = Qt; | 4931 | BVAR (&buffer_defaults, cursor_type) = Qt; |
| 4932 | BVAR (&buffer_defaults, extra_line_spacing) = Qnil; | 4932 | BVAR (&buffer_defaults, extra_line_spacing) = Qnil; |