comparison src/buffer.c @ 96233:514e5b8b3fbf

(syms_of_buffer): New variables default-word-wrap and word-wrap. (init_buffer_once): Initialize them.
author Chong Yidong <cyd@stupidchicken.com>
date Tue, 24 Jun 2008 17:56:14 +0000
parents 54e76878a8c0
children cb6aa853e038
comparison
equal deleted inserted replaced
96232:6a58401d4e31 96233:514e5b8b3fbf
5137 buffer_defaults.overlays_after = NULL; 5137 buffer_defaults.overlays_after = NULL;
5138 buffer_defaults.overlay_center = BEG; 5138 buffer_defaults.overlay_center = BEG;
5139 5139
5140 XSETFASTINT (buffer_defaults.tab_width, 8); 5140 XSETFASTINT (buffer_defaults.tab_width, 8);
5141 buffer_defaults.truncate_lines = Qnil; 5141 buffer_defaults.truncate_lines = Qnil;
5142 buffer_defaults.word_wrap = Qnil;
5142 buffer_defaults.ctl_arrow = Qt; 5143 buffer_defaults.ctl_arrow = Qt;
5143 buffer_defaults.direction_reversed = Qnil; 5144 buffer_defaults.direction_reversed = Qnil;
5144 buffer_defaults.cursor_type = Qt; 5145 buffer_defaults.cursor_type = Qt;
5145 buffer_defaults.extra_line_spacing = Qnil; 5146 buffer_defaults.extra_line_spacing = Qnil;
5146 buffer_defaults.cursor_in_non_selected_windows = Qt; 5147 buffer_defaults.cursor_in_non_selected_windows = Qt;
5209 #ifndef old 5210 #ifndef old
5210 XSETFASTINT (buffer_local_flags.selective_display_ellipses, idx); ++idx; 5211 XSETFASTINT (buffer_local_flags.selective_display_ellipses, idx); ++idx;
5211 #endif 5212 #endif
5212 XSETFASTINT (buffer_local_flags.tab_width, idx); ++idx; 5213 XSETFASTINT (buffer_local_flags.tab_width, idx); ++idx;
5213 XSETFASTINT (buffer_local_flags.truncate_lines, idx); ++idx; 5214 XSETFASTINT (buffer_local_flags.truncate_lines, idx); ++idx;
5215 XSETFASTINT (buffer_local_flags.word_wrap, idx); ++idx;
5214 XSETFASTINT (buffer_local_flags.ctl_arrow, idx); ++idx; 5216 XSETFASTINT (buffer_local_flags.ctl_arrow, idx); ++idx;
5215 XSETFASTINT (buffer_local_flags.fill_column, idx); ++idx; 5217 XSETFASTINT (buffer_local_flags.fill_column, idx); ++idx;
5216 XSETFASTINT (buffer_local_flags.left_margin, idx); ++idx; 5218 XSETFASTINT (buffer_local_flags.left_margin, idx); ++idx;
5217 XSETFASTINT (buffer_local_flags.abbrev_table, idx); ++idx; 5219 XSETFASTINT (buffer_local_flags.abbrev_table, idx); ++idx;
5218 XSETFASTINT (buffer_local_flags.display_table, idx); ++idx; 5220 XSETFASTINT (buffer_local_flags.display_table, idx); ++idx;
5499 5501
5500 DEFVAR_LISP_NOPRO ("default-truncate-lines", 5502 DEFVAR_LISP_NOPRO ("default-truncate-lines",
5501 &buffer_defaults.truncate_lines, 5503 &buffer_defaults.truncate_lines,
5502 doc: /* Default value of `truncate-lines' for buffers that do not override it. 5504 doc: /* Default value of `truncate-lines' for buffers that do not override it.
5503 This is the same as (default-value 'truncate-lines). */); 5505 This is the same as (default-value 'truncate-lines). */);
5506
5507 DEFVAR_LISP_NOPRO ("default-word-wrap",
5508 &buffer_defaults.word_wrap,
5509 doc: /* Default value of `word-wrap' for buffers that do not override it.
5510 This is the same as (default-value 'word-wrap). */);
5504 5511
5505 DEFVAR_LISP_NOPRO ("default-fill-column", 5512 DEFVAR_LISP_NOPRO ("default-fill-column",
5506 &buffer_defaults.fill_column, 5513 &buffer_defaults.fill_column,
5507 doc: /* Default value of `fill-column' for buffers that do not override it. 5514 doc: /* Default value of `fill-column' for buffers that do not override it.
5508 This is the same as (default-value 'fill-column). */); 5515 This is the same as (default-value 'fill-column). */);
5751 5758
5752 Note that this is overridden by the variable 5759 Note that this is overridden by the variable
5753 `truncate-partial-width-windows' if that variable is non-nil 5760 `truncate-partial-width-windows' if that variable is non-nil
5754 and this buffer is not full-frame width. */); 5761 and this buffer is not full-frame width. */);
5755 5762
5763 DEFVAR_PER_BUFFER ("word-wrap", &current_buffer->word_wrap, Qnil,
5764 doc: /* *Non-nil means to use word-wrapping for continuation lines.
5765 When word-wrapping is on, continuation lines are wrapped at the space
5766 or tab character nearest to the right window edge.
5767 If nil, continuation lines are wrapped at the right screen edge.
5768
5769 This variable has no effect if long lines are truncated (see
5770 `truncate-lines' and `truncate-partial-width-windows'). */);
5771
5756 #ifdef DOS_NT 5772 #ifdef DOS_NT
5757 DEFVAR_PER_BUFFER ("buffer-file-type", &current_buffer->buffer_file_type, 5773 DEFVAR_PER_BUFFER ("buffer-file-type", &current_buffer->buffer_file_type,
5758 Qnil, 5774 Qnil,
5759 doc: /* Non-nil if the visited file is a binary file. 5775 doc: /* Non-nil if the visited file is a binary file.
5760 This variable is meaningful on MS-DOG and Windows NT. 5776 This variable is meaningful on MS-DOG and Windows NT.