From 1cef2d7cbea407eaeff5c65e9594e03fabe3bf5e Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Wed, 2 Jan 2019 17:55:45 +0200 Subject: 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. --- src/composite.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/composite.h') 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 . */ #define EMACS_COMPOSITE_H #include "font.h" +#include "dispextern.h" INLINE_HEADER_BEGIN @@ -321,7 +322,7 @@ extern void composition_compute_stop_pos (struct composition_it *, Lisp_Object); extern bool composition_reseat_it (struct composition_it *, ptrdiff_t, ptrdiff_t, ptrdiff_t, struct window *, - struct face *, Lisp_Object); + bidi_dir_t, struct face *, Lisp_Object); extern int composition_update_it (struct composition_it *, ptrdiff_t, ptrdiff_t, Lisp_Object); -- cgit v1.2.1