comparison src/buffer.c @ 107741:0e10810ea0f9

Merge from trunk

107740:cc6fa055586c

  swapfield (overlays_after, struct Lisp_Overlay *);
  swapfield (overlay_center, EMACS_INT);
  swapfield (undo_list, Lisp_Object);
  swapfield (mark, Lisp_Object);
  swapfield (enable_multibyte_characters, Lisp_Object);
  /* FIXME: Not sure what we should do with these *_marker fields.
     Hopefully they're just nil anyway.  */
  swapfield (pt_marker, Lisp_Object);
  swapfield (begv_marker, Lisp_Object);
  swapfield (zv_marker, Lisp_Object);

  XSETFASTINT (buffer_defaults.tab_width, 8);
  buffer_defaults.truncate_lines = Qnil;
  buffer_defaults.word_wrap = Qnil;
  buffer_defaults.ctl_arrow = Qt;
  buffer_defaults.direction_reversed = Qnil;
  buffer_defaults.cursor_type = Qt;
  buffer_defaults.extra_line_spacing = Qnil;
  buffer_defaults.cursor_in_non_selected_windows = Qt;

#ifdef DOS_NT

  buffer_permanent_local_flags[idx++] = 1;
#endif
  XSETFASTINT (buffer_local_flags.syntax_table, idx); ++idx;
  XSETFASTINT (buffer_local_flags.cache_long_line_scans, idx); ++idx;
  XSETFASTINT (buffer_local_flags.category_table, idx); ++idx;
  XSETFASTINT (buffer_local_flags.direction_reversed, idx); ++idx;
  XSETFASTINT (buffer_local_flags.buffer_file_coding_system, idx);
  /* Make this one a permanent local.  */
  buffer_permanent_local_flags[idx++] = 1;
  XSETFASTINT (buffer_local_flags.left_margin_cols, idx); ++idx;
  XSETFASTINT (buffer_local_flags.right_margin_cols, idx); ++idx;

  DEFVAR_LISP_NOPRO ("default-ctl-arrow",
		     &buffer_defaults.ctl_arrow,
		     doc: /* Default value of `ctl-arrow' for buffers that do not override it.
This is the same as (default-value 'ctl-arrow).  */);

  DEFVAR_LISP_NOPRO ("default-direction-reversed",
                     &buffer_defaults.direction_reversed,
                     doc: /* Default value of `direction-reversed' for buffers that do not override it.
This is the same as (default-value 'direction-reversed).  */);

  DEFVAR_LISP_NOPRO ("default-enable-multibyte-characters",
                     &buffer_defaults.enable_multibyte_characters,
                     doc: /* *Default value of `enable-multibyte-characters' for buffers not overriding it.
This is the same as (default-value 'enable-multibyte-characters).  */);

The variable `coding-system-for-write', if non-nil, overrides this variable.

This variable is never applied to a way of decoding a file while reading it.  */);

  DEFVAR_PER_BUFFER ("direction-reversed", &current_buffer->direction_reversed,
		     Qnil,
		     doc: /* *Non-nil means lines in the buffer are displayed right to left.  */);

  DEFVAR_PER_BUFFER ("truncate-lines", &current_buffer->truncate_lines, Qnil,
		     doc: /* *Non-nil means do not display continuation lines.
Instead, give each line of text just one screen line.

Note that this is overridden by the variable
`truncate-partial-width-windows' if that variable is non-nil

107741:0e10810ea0f9

  swapfield (overlays_after, struct Lisp_Overlay *);
  swapfield (overlay_center, EMACS_INT);
  swapfield (undo_list, Lisp_Object);
  swapfield (mark, Lisp_Object);
  swapfield (enable_multibyte_characters, Lisp_Object);
  swapfield (bidi_display_reordering, Lisp_Object);
  swapfield (bidi_paragraph_direction, Lisp_Object);
  /* FIXME: Not sure what we should do with these *_marker fields.
     Hopefully they're just nil anyway.  */
  swapfield (pt_marker, Lisp_Object);
  swapfield (begv_marker, Lisp_Object);
  swapfield (zv_marker, Lisp_Object);

  XSETFASTINT (buffer_defaults.tab_width, 8);
  buffer_defaults.truncate_lines = Qnil;
  buffer_defaults.word_wrap = Qnil;
  buffer_defaults.ctl_arrow = Qt;
  buffer_defaults.bidi_display_reordering = Qnil;
  buffer_defaults.direction_reversed = Qnil;
  buffer_defaults.bidi_paragraph_direction = Qnil;
  buffer_defaults.cursor_type = Qt;
  buffer_defaults.extra_line_spacing = Qnil;
  buffer_defaults.cursor_in_non_selected_windows = Qt;

#ifdef DOS_NT

  buffer_permanent_local_flags[idx++] = 1;
#endif
  XSETFASTINT (buffer_local_flags.syntax_table, idx); ++idx;
  XSETFASTINT (buffer_local_flags.cache_long_line_scans, idx); ++idx;
  XSETFASTINT (buffer_local_flags.category_table, idx); ++idx;
  XSETFASTINT (buffer_local_flags.bidi_display_reordering, idx); ++idx;
  XSETFASTINT (buffer_local_flags.direction_reversed, idx); ++idx;
  XSETFASTINT (buffer_local_flags.bidi_paragraph_direction, idx); ++idx;
  XSETFASTINT (buffer_local_flags.buffer_file_coding_system, idx);
  /* Make this one a permanent local.  */
  buffer_permanent_local_flags[idx++] = 1;
  XSETFASTINT (buffer_local_flags.left_margin_cols, idx); ++idx;
  XSETFASTINT (buffer_local_flags.right_margin_cols, idx); ++idx;

  DEFVAR_LISP_NOPRO ("default-ctl-arrow",
		     &buffer_defaults.ctl_arrow,
		     doc: /* Default value of `ctl-arrow' for buffers that do not override it.
This is the same as (default-value 'ctl-arrow).  */);

  DEFVAR_LISP_NOPRO ("default-enable-multibyte-characters",
                     &buffer_defaults.enable_multibyte_characters,
                     doc: /* *Default value of `enable-multibyte-characters' for buffers not overriding it.
This is the same as (default-value 'enable-multibyte-characters).  */);

The variable `coding-system-for-write', if non-nil, overrides this variable.

This variable is never applied to a way of decoding a file while reading it.  */);

  DEFVAR_PER_BUFFER ("direction-reversed",
		     &current_buffer->direction_reversed, Qnil,
		     doc: /* Non-nil means set beginning of lines at the right edge of the window.
See also the variable `bidi-display-reordering'.  */);

  DEFVAR_PER_BUFFER ("bidi-display-reordering",
		     &current_buffer->bidi_display_reordering, Qnil,
		     doc: /* Non-nil means reorder bidirectional text for display in the visual order.
See also the variable `direction-reversed'.  */);

  DEFVAR_PER_BUFFER ("bidi-paragraph-direction",
		     &current_buffer->bidi_paragraph_direction, Qnil,
		     doc: /* *If non-nil, forces directionality of text paragraphs in the buffer.
			     
If this is nil (the default), the direction of each paragraph is
determined by the first strong directional character of its text.
The values of `right-to-left' and `left-to-right' override that.
Any other value is treated as nil.
			     
This variable has no effect unless the buffer's value of
\`bidi-display-reordering' is non-nil.  */);

 DEFVAR_PER_BUFFER ("truncate-lines", &current_buffer->truncate_lines, Qnil,
		     doc: /* *Non-nil means do not display continuation lines.
Instead, give each line of text just one screen line.

Note that this is overridden by the variable
`truncate-partial-width-windows' if that variable is non-nil