From 6c0cf21816887c8ea25c87bc526219752cf10a09 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 1 Jan 2010 06:57:39 -0500 Subject: Retrospective commit from 2009-11-14. Resurrect support for integer values of `cursor' property. Rename paragraph-direction to bidi-paragraph-direction. xdisp.c (init_iterator, text_outside_line_unchanged_p) (try_window_id): Rename paragraph_direction to bidi_paragraph_direction. (set_cursor_from_row): Handle integer values of `cursor' property on display strings. buffer.c (init_buffer_once, syms_of_buffer): Rename paragraph_direction to bidi_paragraph_direction. buffer.h (struct buffer): Rename paragraph_direction to bidi_paragraph_direction. --- src/buffer.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/buffer.c') diff --git a/src/buffer.c b/src/buffer.c index 0d9247eb61b..521fe9b5019 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -5188,7 +5188,7 @@ init_buffer_once () buffer_defaults.ctl_arrow = Qt; buffer_defaults.bidi_display_reordering = Qnil; buffer_defaults.direction_reversed = Qnil; - buffer_defaults.paragraph_direction = 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; @@ -5275,7 +5275,7 @@ init_buffer_once () 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.paragraph_direction, 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; @@ -5798,8 +5798,8 @@ See also the variable `bidi-display-reordering'. */); doc: /* Non-nil means reorder bidirectional text for display in the visual order. See also the variable `direction-reversed'. */); - DEFVAR_PER_BUFFER ("paragraph-direction", - ¤t_buffer->paragraph_direction, Qnil, + DEFVAR_PER_BUFFER ("bidi-paragraph-direction", + ¤t_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 -- cgit v1.3