diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-08-25 12:06:56 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-08-25 12:06:56 -0700 |
| commit | a974cdce9b9121158e623a3fab6ad731ff5d48ec (patch) | |
| tree | 689bdfe3830c42dea926a04079d9da9cfcbc9200 /src/dispextern.h | |
| parent | 011ba6eaacfa50cc9871d0cfea34e8f0a7a5bc43 (diff) | |
| parent | e25be79236edca0e26a9fcd81b7f2a3746e8f9ef (diff) | |
| download | emacs-a974cdce9b9121158e623a3fab6ad731ff5d48ec.tar.gz | |
Merge from trunk.
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 9cefea27e1c..f0be8ec136b 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -1861,8 +1861,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 |