diff options
| author | Stefan Kangas <stefankangas@gmail.com> | 2023-02-27 06:30:20 +0100 |
|---|---|---|
| committer | Stefan Kangas <stefankangas@gmail.com> | 2023-02-27 06:30:20 +0100 |
| commit | c640dc9ef533c1fa68cf7b29f63a3fb32e4c3b06 (patch) | |
| tree | c15d896782c119376efa5a20f74e729a0fd25c22 /src | |
| parent | 6c4abbab7999f55792a323e4bb1eb55ef5a7b990 (diff) | |
| parent | 267fc6d00c4db6f20da3c2d63e48a71ab70505d3 (diff) | |
| download | emacs-c640dc9ef533c1fa68cf7b29f63a3fb32e4c3b06.tar.gz | |
Merge from origin/emacs-29
267fc6d00c4 ruby-smie-rules: Fix misindentation of a method call afte...
0fde314f6f6 * lib-src/etags.c (process_file_name): Free malloc'ed var...
dde9d149af3 ; Improve documentation of loading *.eln files
7c552be89da ; Another doc fix in eglot.el
75c65fcc98e ; Fix last change
a3d15c1f749 ; Fix last change
ca79b138d42 Eglot: rename and redocument encoding-related functions (...
3e3e6d71be7 Eglot: support positionEncoding LSP capability (bug#61726)
b0e87e930e8 Eglot: use faster strategy for moving to LSP positions (b...
5b174b96834 Fix mule-tests in UTF-8 locales
5256392a7ec Fix 'vertical-motion' when display strings are around
0db88d625a7 ; * src/treesit.c (treesit_predicate_match): Fix typo.
Diffstat (limited to 'src')
| -rw-r--r-- | src/indent.c | 2 | ||||
| -rw-r--r-- | src/treesit.c | 2 |
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)); |