[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r105489: Fix bidi reordering around T
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r105489: Fix bidi reordering around TAB characters covered by display properties. |
Date: |
Thu, 18 Aug 2011 19:09:40 +0300 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 105489
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Thu 2011-08-18 19:09:40 +0300
message:
Fix bidi reordering around TAB characters covered by display properties.
src/dispextern.h (struct bidi_it): Move disp_pos and disp_prop_p
members before the level stack, so they would be saved and
restored when copying iterator state. Fixes incorrect reordering
around TABs covered by display properties.
modified:
src/ChangeLog
src/dispextern.h
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2011-08-18 15:33:22 +0000
+++ b/src/ChangeLog 2011-08-18 16:09:40 +0000
@@ -1,3 +1,10 @@
+2011-08-18 Eli Zaretskii <address@hidden>
+
+ * dispextern.h (struct bidi_it): Move disp_pos and disp_prop_p
+ members before the level stack, so they would be saved and
+ restored when copying iterator state. Fixes incorrect reordering
+ around TABs covered by display properties.
+
2011-08-18 Andreas Schwab <address@hidden>
* process.c (Fnetwork_interface_list): Correctly determine buffer
=== modified file 'src/dispextern.h'
--- a/src/dispextern.h 2011-08-15 17:47:25 +0000
+++ b/src/dispextern.h 2011-08-18 16:09:40 +0000
@@ -1859,6 +1859,9 @@
EMACS_INT ignore_bn_limit; /* position until which to ignore BNs */
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 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
@@ -1867,9 +1870,6 @@
struct bidi_string_data string; /* string to reorder */
bidi_dir_t paragraph_dir; /* current paragraph direction */
EMACS_INT separator_limit; /* where paragraph separator should end */
- 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 */
unsigned first_elt : 1; /* if non-zero, examine current char first */
unsigned new_paragraph : 1; /* if non-zero, we expect a new paragraph */
unsigned frame_window_p : 1; /* non-zero if displaying on a GUI frame */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r105489: Fix bidi reordering around TAB characters covered by display properties.,
Eli Zaretskii <=