Merge remote-tracking branch 'origin/master' into feature/android

2 files changed, 2 insertions, 2 deletions

diff --git a/src/indent.c b/src/indent.c
index 6de18d749ca..08d2bf5ea28 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -2401,7 +2401,7 @@ whether or not it is currently displayed in some window.  */)
              last line that it occupies.  */
           if (it_start < ZV)
             {
-              if ((it.bidi_it.scan_dir > 0)
+              if ((it.bidi_it.scan_dir >= 0 || it.vpos == vpos_init)
                   ? IT_CHARPOS (it) < it_start
                   : IT_CHARPOS (it) > it_start)
                 {
diff --git a/src/treesit.c b/src/treesit.c
index ef0f2407840..5a4fe3e8803 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -2484,7 +2484,7 @@ treesit_predicate_match (Lisp_Object args, struct capture_range captures)
 {
   if (XFIXNUM (Flength (args)) != 2)
     xsignal2 (Qtreesit_query_error,
-              build_string ("Predicate `equal' requires two "
+              build_string ("Predicate `match' requires two "
                             "arguments but only given"),
               Flength (args));