Mercurial > emacs
changeset 108003:4b71850034e6
* buffer.h (struct buffer): Remove unused var `direction_reversed'.
* buffer.c (init_buffer_once, syms_of_buffer): Remove its initialization.
* bidi.c (bidi_initialize): Simplify fallback_paragraph_*_re init.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Tue, 20 Apr 2010 13:01:39 -0400 |
| parents | c609e6e60b3d |
| children | 9d210d83ed69 |
| files | src/ChangeLog src/bidi.c src/buffer.c src/buffer.h src/dispextern.h |
| diffstat | 5 files changed, 18 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Tue Apr 20 12:52:43 2010 -0400 +++ b/src/ChangeLog Tue Apr 20 13:01:39 2010 -0400 @@ -1,3 +1,10 @@ +2010-04-20 Stefan Monnier <monnier@iro.umontreal.ca> + + * buffer.h (struct buffer): Remove unused var `direction_reversed'. + * buffer.c (init_buffer_once, syms_of_buffer): Remove its initialization. + + * bidi.c (bidi_initialize): Simplify fallback_paragraph_*_re init. + 2010-04-20 Eli Zaretskii <eliz@gnu.org> Fix R2L paragraph display on TTY.
--- a/src/bidi.c Tue Apr 20 12:52:43 2010 -0400 +++ b/src/bidi.c Tue Apr 20 13:01:39 2010 -0400 @@ -399,20 +399,18 @@ bidi_type[i].to ? bidi_type[i].to : bidi_type[i].from, make_number (bidi_type[i].type)); - fallback_paragraph_start_re = - Fsymbol_value (Fintern_soft (build_string ("paragraph-start"), Qnil)); + Qparagraph_start = intern ("paragraph-start"); + staticpro (&Qparagraph_start); + fallback_paragraph_start_re = Fsymbol_value (Qparagraph_start); if (!STRINGP (fallback_paragraph_start_re)) fallback_paragraph_start_re = build_string ("\f\\|[ \t]*$"); staticpro (&fallback_paragraph_start_re); - Qparagraph_start = intern ("paragraph-start"); - staticpro (&Qparagraph_start); - fallback_paragraph_separate_re = - Fsymbol_value (Fintern_soft (build_string ("paragraph-separate"), Qnil)); + Qparagraph_separate = intern ("paragraph-separate"); + staticpro (&Qparagraph_separate); + fallback_paragraph_separate_re = Fsymbol_value (Qparagraph_separate); if (!STRINGP (fallback_paragraph_separate_re)) fallback_paragraph_separate_re = build_string ("[ \t\f]*$"); staticpro (&fallback_paragraph_separate_re); - Qparagraph_separate = intern ("paragraph-separate"); - staticpro (&Qparagraph_separate); bidi_initialized = 1; } @@ -752,6 +750,7 @@ static EMACS_INT bidi_at_paragraph_end (EMACS_INT charpos, EMACS_INT bytepos) { + /* FIXME: Why Fbuffer_local_value rather than just Fsymbol_value? */ Lisp_Object sep_re = Fbuffer_local_value (Qparagraph_separate, Fcurrent_buffer ()); Lisp_Object start_re = Fbuffer_local_value (Qparagraph_start, @@ -830,6 +829,7 @@ static EMACS_INT bidi_find_paragraph_start (EMACS_INT pos, EMACS_INT pos_byte) { + /* FIXME: Why Fbuffer_local_value rather than just Fsymbol_value? */ Lisp_Object re = Fbuffer_local_value (Qparagraph_start, Fcurrent_buffer ()); EMACS_INT limit = ZV, limit_byte = ZV_BYTE;
--- a/src/buffer.c Tue Apr 20 12:52:43 2010 -0400 +++ b/src/buffer.c Tue Apr 20 13:01:39 2010 -0400 @@ -5175,7 +5175,6 @@ 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; @@ -5262,7 +5261,6 @@ 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. */ @@ -5784,11 +5782,6 @@ This variable is never applied to a way of decoding a file while reading it. */); - DEFVAR_PER_BUFFER ("direction-reversed", - ¤t_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", ¤t_buffer->bidi_display_reordering, Qnil, doc: /* Non-nil means reorder bidirectional text for display in the visual order. @@ -5797,12 +5790,12 @@ 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 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. */);
--- a/src/buffer.h Tue Apr 20 12:52:43 2010 -0400 +++ b/src/buffer.h Tue Apr 20 13:01:39 2010 -0400 @@ -679,9 +679,6 @@ /* Non-nil means reorder bidirectional text for display in the visual order. */ Lisp_Object bidi_display_reordering; - /* Non-nil means set beginning of lines at the right edge of - windows. */ - Lisp_Object direction_reversed; /* If non-nil, specifies which direction of text to force in all the paragraphs of the buffer. Nil means determine paragraph direction dynamically for each paragraph. */