aboutsummaryrefslogtreecommitdiffstats
path: root/src/buffer.c
diff options
context:
space:
mode:
authorPaul Eggert2011-07-28 22:31:12 -0700
committerPaul Eggert2011-07-28 22:31:12 -0700
commit18ab493650d648ab8dca651ea2698861f926e895 (patch)
treeb16ca478db1e96af8d0be9a20ff1361bea6d12ee /src/buffer.c
parent726e0ab18e84ce0df6b9dc1612bf4d92b9d1e52a (diff)
parent43dc9f5b0187276c24e1f63f2a23ba4b81c20e07 (diff)
downloademacs-18ab493650d648ab8dca651ea2698861f926e895.tar.gz
emacs-18ab493650d648ab8dca651ea2698861f926e895.zip
Merge from trunk.
Diffstat (limited to 'src/buffer.c')
-rw-r--r--src/buffer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/buffer.c b/src/buffer.c
index fc9d3b5bd40..cacc8a41339 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -4923,7 +4923,7 @@ init_buffer_once (void)
4923 BVAR (&buffer_defaults, truncate_lines) = Qnil; 4923 BVAR (&buffer_defaults, truncate_lines) = Qnil;
4924 BVAR (&buffer_defaults, word_wrap) = Qnil; 4924 BVAR (&buffer_defaults, word_wrap) = Qnil;
4925 BVAR (&buffer_defaults, ctl_arrow) = Qt; 4925 BVAR (&buffer_defaults, ctl_arrow) = Qt;
4926 BVAR (&buffer_defaults, bidi_display_reordering) = Qnil; 4926 BVAR (&buffer_defaults, bidi_display_reordering) = Qt;
4927 BVAR (&buffer_defaults, bidi_paragraph_direction) = Qnil; 4927 BVAR (&buffer_defaults, bidi_paragraph_direction) = Qnil;
4928 BVAR (&buffer_defaults, cursor_type) = Qt; 4928 BVAR (&buffer_defaults, cursor_type) = Qt;
4929 BVAR (&buffer_defaults, extra_line_spacing) = Qnil; 4929 BVAR (&buffer_defaults, extra_line_spacing) = Qnil;