diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2011-08-25 13:45:33 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2011-08-25 13:45:33 +0300 |
| commit | 0c95fcf739dbfbae70f4e4700fdafedb4497e8df (patch) | |
| tree | f27c148c083aa9a6d290053b26ac8e45bfdcb07a /src/dispextern.h | |
| parent | a2ebe600c947152c10bf657dfb9dfabdb601c766 (diff) | |
| download | emacs-0c95fcf739dbfbae70f4e4700fdafedb4497e8df.tar.gz emacs-0c95fcf739dbfbae70f4e4700fdafedb4497e8df.tar.bz2 emacs-0c95fcf739dbfbae70f4e4700fdafedb4497e8df.zip | |
Handle `(space ...)' display spec as paragraph separator.
src/xdisp.c (compute_display_string_pos): Return 2 in DISP_PROP when
the display spec is of the form `(space ...)'.
(handle_display_spec): Return the value returned by
handle_single_display_spec, not just 1 or zero.
(handle_single_display_spec): If the display spec is of the form
`(space ...)', and specifies display in the text area, return 2
rather than 1.
src/dispextern.h (struct bidi_it): Rename the disp_prop_p member
into disp_prop; all users changed.
src/bidi.c (bidi_fetch_char): If compute_display_string_pos returns
DISP_PROP = 2, substitute the u+2029 PARAGRAPH SEPARATOR character
for the text covered by the display property.
lisp/buff-menu.el (Buffer-menu-buffer+size): Remove calls to
bidi-string-mark-left-to-right; they are unnecessary now.
doc/lispref/display.texi (Specified Space): Mention that `space' specs
influence bidi reordering.
(Bidirectional Display): Explain how to use `(space . PROPS)' for
separating fields with bidirectional content.
Diffstat (limited to 'src/dispextern.h')
| -rw-r--r-- | src/dispextern.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/dispextern.h b/src/dispextern.h index 084a3f9e07f..f5d20250fa7 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -1860,8 +1860,9 @@ struct bidi_it { bidi_dir_t sor; /* direction of start-of-run in effect */ int scan_dir; /* direction of text scan, 1: forw, -1: back */ EMACS_INT disp_pos; /* position of display string after ch */ - int disp_prop_p; /* if non-zero, there really is a - `display' property/string at disp_pos */ + int disp_prop; /* if non-zero, there really is a + `display' property/string at disp_pos; + if 2, the property is a `space' spec */ int stack_idx; /* index of current data on the stack */ /* Note: Everything from here on is not copied/saved when the bidi iterator state is saved, pushed, or popped. So only put here |