diff options
| author | Jim Porter | 2023-08-21 18:23:11 -0700 |
|---|---|---|
| committer | Jim Porter | 2023-08-21 18:23:11 -0700 |
| commit | 357c2fba9825a44e27bf83ecd7a3527a32268a47 (patch) | |
| tree | bf197ead3fc0fa89ad0f90436e0cc06a5b6fc550 /src | |
| parent | 0df2efa4d6953fb3dbc50c5faa845e80154b447b (diff) | |
| parent | 3296031ad74f8cdc9638ae948b5372a81a43a2d1 (diff) | |
| download | emacs-357c2fba9825a44e27bf83ecd7a3527a32268a47.tar.gz emacs-357c2fba9825a44e27bf83ecd7a3527a32268a47.zip | |
Merge from origin/emacs-29
3296031ad74 ; Another improvement for documentation of pixelwise scro...
baeb2d71ae7 Support defun navigation for DEFUN in c-ts-mode (bug#64442)
781ddd7e7d8 Fix touchpad scrolling on MS-Windows
c125bd060e2 Fix order in which package-vc dependencies are resolved
500ced133ad Fix building of VC package manuals with relative org link...
456ecabe9e8 Fix the documentation of 'cl-flet'
f6ebd1ef0d0 ; * src/treesit.c (Ftreesit_node_parent): Improve comment...
fac0e2d5334 Avoid false "wrong passphrase" messages in EPA
8f683b51d8b Fix jsx font-lock in older tree-sitter-js grammars
d9af79ae39d Fix cloning 'face-remapping-alist' for indirect buffers
636fb267c46 Improve documentation of case transfer in replacement com...
7856d51436b Fix horizontal scrolling of images with C-f
8cf5659ec2f ; Fix defcustom in completion.el
a8c8a4e3680 ; * src/fns.c (Fcopy_sequence): Doc fix. (Bug#64960)
205d87cdca0 Fix unpacking ZIP archives on MS-Windows
3712e8bc385 ; Fix typos in lisp/keymap.el doc strings (bug#65329).
21b2ecee661 Fix command example in Eshell manual
26949819df0 ; lisp/progmodes/csharp-mode.el (treesit-query-capture): ...
221ed70b90a ; Improve documentation of 'define-alternatives'
32280205e27 Add user options mentioned in the Eshell manual to the va...
cf3145a486b * Add missing alias to `native-comp-enable-subr-trampolin...
922b6490286 * Add missing alias to `native-comp-enable-subr-trampolin...
6962823c83c ; * etc/PROBLEMS: Fix typo and clarify wording.
# Conflicts:
# doc/misc/eshell.texi
Diffstat (limited to 'src')
| -rw-r--r-- | src/fns.c | 3 | ||||
| -rw-r--r-- | src/search.c | 4 | ||||
| -rw-r--r-- | src/treesit.c | 4 | ||||
| -rw-r--r-- | src/w32term.c | 2 |
4 files changed, 10 insertions, 3 deletions
| @@ -746,7 +746,8 @@ usage: (vconcat &rest SEQUENCES) */) | |||
| 746 | DEFUN ("copy-sequence", Fcopy_sequence, Scopy_sequence, 1, 1, 0, | 746 | DEFUN ("copy-sequence", Fcopy_sequence, Scopy_sequence, 1, 1, 0, |
| 747 | doc: /* Return a copy of a list, vector, string, char-table or record. | 747 | doc: /* Return a copy of a list, vector, string, char-table or record. |
| 748 | The elements of a list, vector or record are not copied; they are | 748 | The elements of a list, vector or record are not copied; they are |
| 749 | shared with the original. | 749 | shared with the original. See Info node `(elisp) Sequence Functions' |
| 750 | for more details about this sharing and its effects. | ||
| 750 | If the original sequence is empty, this function may return | 751 | If the original sequence is empty, this function may return |
| 751 | the same empty object instead of its copy. */) | 752 | the same empty object instead of its copy. */) |
| 752 | (Lisp_Object arg) | 753 | (Lisp_Object arg) |
diff --git a/src/search.c b/src/search.c index 3edfc0bc1a8..742a78cb0cd 100644 --- a/src/search.c +++ b/src/search.c | |||
| @@ -2363,7 +2363,9 @@ the replacement text. Otherwise, maybe capitalize the whole text, or | |||
| 2363 | maybe just word initials, based on the replaced text. If the replaced | 2363 | maybe just word initials, based on the replaced text. If the replaced |
| 2364 | text has only capital letters and has at least one multiletter word, | 2364 | text has only capital letters and has at least one multiletter word, |
| 2365 | convert NEWTEXT to all caps. Otherwise if all words are capitalized | 2365 | convert NEWTEXT to all caps. Otherwise if all words are capitalized |
| 2366 | in the replaced text, capitalize each word in NEWTEXT. | 2366 | in the replaced text, capitalize each word in NEWTEXT. Note that |
| 2367 | what exactly is a word is determined by the syntax tables in effect | ||
| 2368 | in the current buffer. | ||
| 2367 | 2369 | ||
| 2368 | If optional third arg LITERAL is non-nil, insert NEWTEXT literally. | 2370 | If optional third arg LITERAL is non-nil, insert NEWTEXT literally. |
| 2369 | Otherwise treat `\\' as special: | 2371 | Otherwise treat `\\' as special: |
diff --git a/src/treesit.c b/src/treesit.c index 1f694e47201..550bc8b9ee0 100644 --- a/src/treesit.c +++ b/src/treesit.c | |||
| @@ -1900,6 +1900,10 @@ Return nil if NODE has no parent. If NODE is nil, return nil. */) | |||
| 1900 | TSNode treesit_node = XTS_NODE (node)->node; | 1900 | TSNode treesit_node = XTS_NODE (node)->node; |
| 1901 | Lisp_Object parser = XTS_NODE (node)->parser; | 1901 | Lisp_Object parser = XTS_NODE (node)->parser; |
| 1902 | TSTreeCursor cursor; | 1902 | TSTreeCursor cursor; |
| 1903 | /* See the comments to treesit_cursor_helper about the algorithm for | ||
| 1904 | finding the parent node. The complexity is roughly proportional | ||
| 1905 | to the square root of the current node's depth in the parse tree, | ||
| 1906 | and we punt if the tree is too deep. */ | ||
| 1903 | if (!treesit_cursor_helper (&cursor, treesit_node, parser)) | 1907 | if (!treesit_cursor_helper (&cursor, treesit_node, parser)) |
| 1904 | return return_value; | 1908 | return return_value; |
| 1905 | 1909 | ||
diff --git a/src/w32term.c b/src/w32term.c index 57dc6b465e4..a5f17a18213 100644 --- a/src/w32term.c +++ b/src/w32term.c | |||
| @@ -3412,7 +3412,7 @@ w32_construct_mouse_wheel (struct input_event *result, W32Msg *msg, | |||
| 3412 | ((double)FRAME_LINE_HEIGHT (f) * scroll_unit) | 3412 | ((double)FRAME_LINE_HEIGHT (f) * scroll_unit) |
| 3413 | / ((double)WHEEL_DELTA / delta); | 3413 | / ((double)WHEEL_DELTA / delta); |
| 3414 | nlines = value_to_report / FRAME_LINE_HEIGHT (f) + 0.5; | 3414 | nlines = value_to_report / FRAME_LINE_HEIGHT (f) + 0.5; |
| 3415 | result->arg = list3 (make_fixnum (nlines), | 3415 | result->arg = list3 (make_fixnum (eabs (nlines)), |
| 3416 | make_float (0.0), | 3416 | make_float (0.0), |
| 3417 | make_float (value_to_report)); | 3417 | make_float (value_to_report)); |
| 3418 | } | 3418 | } |