diff options
| author | Eli Zaretskii | 2019-01-02 17:55:45 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2019-01-02 17:55:45 +0200 |
| commit | 1cef2d7cbea407eaeff5c65e9594e03fabe3bf5e (patch) | |
| tree | 456d095c98137f695d2f6b6cdd94ffd87dee93a7 /src/composite.h | |
| parent | 48776b70115edf3775df19d80f734048dadff198 (diff) | |
| download | emacs-1cef2d7cbea407eaeff5c65e9594e03fabe3bf5e.tar.gz emacs-1cef2d7cbea407eaeff5c65e9594e03fabe3bf5e.zip | |
Fix text direction of the HarfBuzz shaping buffer
* src/indent.c (scan_for_column, compute_motion):
* src/xdisp.c (CHAR_COMPOSED_P): Pass PDIR argument to
composition_reseat_it.
* src/composite.c (composition_reseat_it): Accept an
additional argument PDIR that provides the current paragraph's
base direction; all callers changed. Use PDIR to fix
calculation of the DIRECTION argument to autocmp_chars.
(Bug#33944)
* src/composite.h: Include dispextern.h.
(composition_reseat_it): Update prototype.
Diffstat (limited to 'src/composite.h')
| -rw-r--r-- | src/composite.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/composite.h b/src/composite.h index ad39a08dca3..44f7ab7f616 100644 --- a/src/composite.h +++ b/src/composite.h | |||
| @@ -26,6 +26,7 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */ | |||
| 26 | #define EMACS_COMPOSITE_H | 26 | #define EMACS_COMPOSITE_H |
| 27 | 27 | ||
| 28 | #include "font.h" | 28 | #include "font.h" |
| 29 | #include "dispextern.h" | ||
| 29 | 30 | ||
| 30 | INLINE_HEADER_BEGIN | 31 | INLINE_HEADER_BEGIN |
| 31 | 32 | ||
| @@ -321,7 +322,7 @@ extern void composition_compute_stop_pos (struct composition_it *, | |||
| 321 | Lisp_Object); | 322 | Lisp_Object); |
| 322 | extern bool composition_reseat_it (struct composition_it *, ptrdiff_t, | 323 | extern bool composition_reseat_it (struct composition_it *, ptrdiff_t, |
| 323 | ptrdiff_t, ptrdiff_t, struct window *, | 324 | ptrdiff_t, ptrdiff_t, struct window *, |
| 324 | struct face *, Lisp_Object); | 325 | bidi_dir_t, struct face *, Lisp_Object); |
| 325 | extern int composition_update_it (struct composition_it *, | 326 | extern int composition_update_it (struct composition_it *, |
| 326 | ptrdiff_t, ptrdiff_t, Lisp_Object); | 327 | ptrdiff_t, ptrdiff_t, Lisp_Object); |
| 327 | 328 | ||