]> git.eshelyaron.com Git - emacs.git/log
emacs.git
4 months agoFix treesit crash (bug#71681)
Yuan Fu [Sat, 29 Jun 2024 07:16:36 +0000 (00:16 -0700)]
Fix treesit crash (bug#71681)

To reproduce the problem:

0. emacs -Q
1. eval: (add-to-list 'major-mode-remap-alist '(c-mode . c-ts-mode))
2. C-x v L
3. in the *vc-change-log* buffer move point to the commit 20af58d3a13
4. type D
5. crash caused by diff-font-lock-syntax fontification that uses treesit

Emacs: 6f2036243f2 (2024-06-23, latest master)
Tree-sitter: 3da7deed (2024-06-08, version 0.22.6)

The immediate cause of the crash is that tree-sitter accessed a node's
tree, but the tree is already deleted.  Commenting out the
ts_tree_delete line in treesit_ensure_parsed can "fix" the crash.

What happended, I think, is this:

1. Buffer modified, parser->need_reparse set to true,
parser->timestamp incremented.
2. A node is created from the parser, this node has the old tree but
the new timestamp (bad!).
3. Parser re-parses (treesit_ensure_parsed), new tree created, old
tree deleted.
4. Ftreesit_query_capture accessed the old node, and the old tree,
crash.

We shouldn't bump the parser timestamp when we set
parser->need_reparse to true; instead, we should bump the timestamp
when we actually reparsed and created a new tree.

* src/treesit.c (treesit_record_change): Don't bump parser timestamp.
(treesit_sync_visible_region): Don't bump parser timestamp.
(Ftreesit_parser_set_included_ranges): Don't bump parser timestamp.
(treesit_ensure_parsed): Bump parser timestamp.
(Ftreesit_query_capture): Add node check.

(cherry picked from commit 8819e5a45d503b62c38e6310ceda9266606cd6d1)

4 months agoRemove unused m4/printf-posix-rpl.m4
Paul Eggert [Sat, 29 Jun 2024 22:14:54 +0000 (23:14 +0100)]
Remove unused m4/printf-posix-rpl.m4

* m4/printf-posix-rpl.m4: Remove unused file.
This is leftover from an old Android branch,
and the m4 macros are no longer needed in the master branch.

(cherry picked from commit fad7109e52208bf77da468c2c73545c084bc1557)

4 months ago; Fix SHR test on MS-Windows
Jim Porter [Fri, 28 Jun 2024 17:40:05 +0000 (10:40 -0700)]
; Fix SHR test on MS-Windows

* test/lisp/net/shr-tests.el (shr-test/zoom-image): Ensure the image URL
is properly formatted: it should always have 3 slashes after "file:".

(cherry picked from commit eaf2dc96c1f44fe8e07cf19614d7b73df9397ea0)

4 months agoComplete to "nil" in directory local variables skeleton
Stefan Kangas [Sat, 29 Jun 2024 19:58:53 +0000 (21:58 +0200)]
Complete to "nil" in directory local variables skeleton

* lisp/autoinsert.el (auto-insert-alist): Make "nil" a completion
candidate for the directory local variables skeleton.  The "nil" value
means "any mode" in the context of directory local variable files.

(cherry picked from commit fcd6403d8ebf7ce6e61ba17971d4fdaaaaecf06c)

4 months agoSupport grep.el better in `python-base-mode`
Stefan Kangas [Sat, 29 Jun 2024 19:30:19 +0000 (21:30 +0200)]
Support grep.el better in `python-base-mode`

* lisp/progmodes/python.el (python-base-mode): When mode is first
enabled, add *.py alias to 'grep-files-aliases', and add common Python
tooling directories to 'grep-find-ignored-directories'.

(cherry picked from commit bc2e9210bf9f09e69a119ad998e05b2123113b5c)

4 months agoDelete redundant mention of `with-eval-after-load'
Stefan Kangas [Sat, 29 Jun 2024 19:15:46 +0000 (21:15 +0200)]
Delete redundant mention of `with-eval-after-load'

* lisp/progmodes/dcl-mode.el (dcl-mode): Delete redundant mention of
`with-eval-after-load'.

(cherry picked from commit 57880f597c56f4ba2521a731a7e87f920f0afbfd)

4 months ago* doc/misc/efaq.texi (New in Emacs 30): Fix typos.
Michael Albinus [Sat, 29 Jun 2024 16:42:13 +0000 (18:42 +0200)]
* doc/misc/efaq.texi (New in Emacs 30): Fix typos.

(cherry picked from commit ea8ce9843425da34066ac8686a7d61eb3cdb4968)

4 months ago; Fix typos in symbols
Stefan Kangas [Sat, 29 Jun 2024 15:29:38 +0000 (17:29 +0200)]
; Fix typos in symbols

(cherry picked from commit 45a20d781a9b00212609bf0e338bd6b1cc9ea68a)

4 months agoDocument security fixes in FAQ
Stefan Kangas [Sat, 29 Jun 2024 14:48:49 +0000 (16:48 +0200)]
Document security fixes in FAQ

* doc/misc/efaq.texi (New in Emacs 29): Recommend using Emacs 29.4.
* doc/misc/efaq.texi (Security risks with Emacs): New item with a
recommendation to upgrade Emacs for improved security.

(cherry picked from commit d95f039af4373e1f96c72f4825c194a1ef427cff)

4 months agoAdd "New in Emacs 30" to FAQ
Stefan Kangas [Sat, 29 Jun 2024 14:41:18 +0000 (16:41 +0200)]
Add "New in Emacs 30" to FAQ

* doc/misc/efaq.texi (New in Emacs 30): New section.

(cherry picked from commit d063af203c893354d1b02399502ff5be3f3eb36b)

4 months ago; Skip commit ca6b484162bd1856669e13a0eae716072729cc0e
Eshel Yaron [Mon, 1 Jul 2024 07:46:20 +0000 (09:46 +0200)]
; Skip commit ca6b484162bd1856669e13a0eae716072729cc0e

4 months ago; Skip commit 35c46663e49b51dcc3b56bed317c01bd45d6df25
Eshel Yaron [Mon, 1 Jul 2024 07:46:05 +0000 (09:46 +0200)]
; Skip commit 35c46663e49b51dcc3b56bed317c01bd45d6df25

4 months ago; Skip commit 0515b38d289f48914623ea60862d81d97d8f2f9f
Eshel Yaron [Mon, 1 Jul 2024 07:46:02 +0000 (09:46 +0200)]
; Skip commit 0515b38d289f48914623ea60862d81d97d8f2f9f

4 months ago; Skip commit 22af3a71039b9481f9a842e4c52a830c952d3dfa
Eshel Yaron [Mon, 1 Jul 2024 07:46:00 +0000 (09:46 +0200)]
; Skip commit 22af3a71039b9481f9a842e4c52a830c952d3dfa

4 months ago; Skip commit 000ef8876ae9e2098cf98e1b1c468c09be3acd43
Eshel Yaron [Mon, 1 Jul 2024 07:45:57 +0000 (09:45 +0200)]
; Skip commit 000ef8876ae9e2098cf98e1b1c468c09be3acd43

4 months ago; Skip commit 4088dc8e4ce940c3397b63df87c6e74da19d63cf
Eshel Yaron [Mon, 1 Jul 2024 07:45:33 +0000 (09:45 +0200)]
; Skip commit 4088dc8e4ce940c3397b63df87c6e74da19d63cf

4 months ago; Skip commit 2119cd52cdb58221a850360bf65c91cf3bf4b47e
Eshel Yaron [Mon, 1 Jul 2024 07:44:54 +0000 (09:44 +0200)]
; Skip commit 2119cd52cdb58221a850360bf65c91cf3bf4b47e

4 months ago; * etc/NEWS: Fix last change (bug#71499).
Eli Zaretskii [Sat, 29 Jun 2024 13:04:32 +0000 (16:04 +0300)]
; * etc/NEWS: Fix last change (bug#71499).

(cherry picked from commit 3088b0675966160806a4487c6ff97ae8a071d217)

4 months agoMake whitespace.el's cleanup add missing final newline
Björn Lindström [Tue, 11 Jun 2024 17:49:55 +0000 (19:49 +0200)]
Make whitespace.el's cleanup add missing final newline

* lisp/whitespace.el (whitespace-cleanup-region): If cleaning
up at end of file, add missing newline if indicated by
'whitespace-style'.  (Bug#71499)

* etc/NEWS: Announce the change in behavior.

(cherry picked from commit 2a7a7c6f697ac9699dec8b09f1cd2051247b2b45)

4 months ago; * lisp/epg.el (epg--start): Add commentary about encoding.
Eli Zaretskii [Sat, 29 Jun 2024 12:53:11 +0000 (15:53 +0300)]
; * lisp/epg.el (epg--start): Add commentary about encoding.

(cherry picked from commit 179800f36bb01e786ad7573780efeafb742e526e)

4 months agoFix non-ASCII filename operatiion on EasyPG (bug#71500)
Kazuhiro Ito [Sat, 29 Jun 2024 11:56:02 +0000 (20:56 +0900)]
Fix non-ASCII filename operatiion on EasyPG (bug#71500)

* lisp/epg.el (epg--start): Don't encode command-line arguments for
gpg2 program in raw-text.

(cherry picked from commit 73898f0214c9fa7f6216fc03dfdaccf67c6d0e03)

4 months agoSilence warning with global minor mode :predicate
Stefan Kangas [Sat, 29 Jun 2024 12:38:57 +0000 (14:38 +0200)]
Silence warning with global minor mode :predicate

* lisp/emacs-lisp/easy-mmode.el (define-globalized-minor-mode):
Silence byte-compiler warning when :predicate is used.

(cherry picked from commit a65b6aac6b59b2d9f28892d2a4e7426507035610)

4 months ago; Skip commit f5f7343ac41fc348ec187cf9fb32cdb7f803369c
Eshel Yaron [Mon, 1 Jul 2024 07:42:32 +0000 (09:42 +0200)]
; Skip commit f5f7343ac41fc348ec187cf9fb32cdb7f803369c

4 months ago; Skip commit c95066bf188680d11701aae238280f9f723c1a03
Eshel Yaron [Mon, 1 Jul 2024 07:42:29 +0000 (09:42 +0200)]
; Skip commit c95066bf188680d11701aae238280f9f723c1a03

4 months ago; Skip commit bf7db88ce1f4c91f9d5b064c7484d77f17b0de37
Eshel Yaron [Mon, 1 Jul 2024 07:42:26 +0000 (09:42 +0200)]
; Skip commit bf7db88ce1f4c91f9d5b064c7484d77f17b0de37

4 months ago; Skip commit 000424eb9ebfed271507dc403918a35c1b39631e
Eshel Yaron [Mon, 1 Jul 2024 07:42:21 +0000 (09:42 +0200)]
; Skip commit 000424eb9ebfed271507dc403918a35c1b39631e

4 months ago; Skip commit 5b5671587fbad2b4b0f1c12b37abd175033c6a16
Eshel Yaron [Mon, 1 Jul 2024 07:42:18 +0000 (09:42 +0200)]
; Skip commit 5b5671587fbad2b4b0f1c12b37abd175033c6a16

4 months ago; * lisp/thingatpt.el (sexp-at-point): Doc fix (bug#71777).
Eli Zaretskii [Sat, 29 Jun 2024 12:22:38 +0000 (15:22 +0300)]
; * lisp/thingatpt.el (sexp-at-point): Doc fix (bug#71777).

(cherry picked from commit 31124abdefe0886f7bc245bca7b8334d459ad79a)

4 months agoFix: make 'xwidget-webkit-scroll-backward' scroll backwards
George Huebner [Tue, 18 Jun 2024 22:14:41 +0000 (17:14 -0500)]
Fix: make 'xwidget-webkit-scroll-backward' scroll backwards

* lisp/xwidget.el (xwidget-webkit-scroll-backward): Move
hyphen out of %-formatter, changing semantics from a padding
specifier to a negative sign.  (Bug#71792)

Copyright-paperwork-exempt: yes
(cherry picked from commit 44f269d6e606acab6245d9ba12175bdd6252d63e)

4 months agoAdd jsdoc support to php-ts-mode in <script> element
Vincenzo Pupillo [Tue, 25 Jun 2024 09:29:54 +0000 (11:29 +0200)]
Add jsdoc support to php-ts-mode in <script> element

In the <script> element, enable jsdoc embedding in JavaScript.
* lisp/progmodes/php-ts-mode.el
(php-ts-mode--language-source-alist): Add jsdoc to parser recipe.
(php-ts-mode): Add jsdoc parser check and a new rule for
'treesit-range-settings'.  Update the commentary section.
(Bug#71771)

(cherry picked from commit 736b7cad406b28e95b1119feea7b083d8711d09e)

4 months agoUpdate to Transient v0.7.2-4-gf75bc48d
Jonas Bernoulli [Sat, 29 Jun 2024 12:06:12 +0000 (14:06 +0200)]
Update to Transient v0.7.2-4-gf75bc48d

(cherry picked from commit 5f3d964e397edd807c544f42a6db6b068a20c912)

4 months agoFix typo incurring leaks of face structures
Po Lu [Sat, 29 Jun 2024 12:02:45 +0000 (20:02 +0800)]
Fix typo incurring leaks of face structures

* src/xfaces.c (free_realized_face): Always free realized face
structures, and avoid sending X requests when the display is not
available, not when it is.

(cherry picked from commit 2d8881d5267febd0bc4117c2b7e5ee6c33ef436e)

4 months ago; Fix use of @footnote in cc-mode.texi
Eli Zaretskii [Sat, 29 Jun 2024 08:55:08 +0000 (11:55 +0300)]
; Fix use of @footnote in cc-mode.texi

* doc/misc/cc-mode.texi (Comment Commands, Minor Modes)
(Hungry WS Deletion): Move @footnote's out of @item's, to avoid
warnings from makeinfo.

(cherry picked from commit 219501dd629811e73d884300534f56647596fb6f)

4 months agoSync with Tramp 2.7.1
Michael Albinus [Sat, 29 Jun 2024 08:13:32 +0000 (10:13 +0200)]
Sync with Tramp 2.7.1

* doc/misc/trampver.texi:
* lisp/net/trampver.el (tramp-version): Adapt Tramp versions.
(customize-package-emacs-version-alist): Add Tramp version
integrated in Emacs 30.1.

* lisp/net/tramp-compat.el:
* lisp/net/tramp-message.el (tramp-warning): Use `lwarn'.

* test/lisp/net/tramp-tests.el
(tramp--test-deftest-without-file-attributes): New defmacro.
(tramp-test18-file-attributes-without-file-attributes)
(tramp-test19-directory-files-and-attributes-without-file-attributes)
(tramp-test18-file-attributes-without-file-attributes)
(tramp-test42-utf8-without-file-attributes): New tests.

(cherry picked from commit f0a487997564fb11dd6e6e8ba2361c9d8fc68f5a)

4 months ago; * etc/NEWS: Move the mwheel entry to a better place.
Eli Zaretskii [Sat, 29 Jun 2024 08:12:07 +0000 (11:12 +0300)]
; * etc/NEWS: Move the mwheel entry to a better place.

(cherry picked from commit 53dcf2b94929d3347e61a01be9ea09119a233333)

4 months agoFlag checkdoc-package-keywords-flag as a :safe variable
Jules Tamagnan [Fri, 28 Jun 2024 05:04:58 +0000 (22:04 -0700)]
Flag checkdoc-package-keywords-flag as a :safe variable

* lisp/emacs-lisp/checkdoc.el: Mark 'checkdoc-package-keywords-flag'
as a safe local variable.  (Bug#71812)

(cherry picked from commit d3b100d41922eea3650005881e388affa3b8236c)

4 months ago; Sort tree-sitter modes in NEWS
Stefan Kangas [Sat, 29 Jun 2024 03:22:09 +0000 (05:22 +0200)]
; Sort tree-sitter modes in NEWS

* etc/NEWS: Sort tree-sitter modes alphabetically.

(cherry picked from commit a5726782d0345b9459f4648c6af40544efbe33ad)

4 months ago; * etc/NEWS: Rearrange "New Modes and Packages in Emacs 30.1".
Stefan Kangas [Sat, 29 Jun 2024 02:50:14 +0000 (04:50 +0200)]
; * etc/NEWS: Rearrange "New Modes and Packages in Emacs 30.1".

This places new modes and packages in rough order of
importance (relevance to users) with most important first.
Feel free to amend.

(cherry picked from commit daa89dc939e6336a3de37607379bb6a8311b54ad)

4 months ago; * etc/NEWS: Move many items.
Stefan Kangas [Sat, 29 Jun 2024 02:09:51 +0000 (04:09 +0200)]
; * etc/NEWS: Move many items.

This moves items to more logical places in the hierarchy.
We might want to give this another pass or three.

(cherry picked from commit 4ddbf4f70ef74c76484cb0400ac30a3933234ec2)

4 months ago; * etc/NEWS: Copy-edits.
Stefan Kangas [Fri, 28 Jun 2024 23:04:03 +0000 (01:04 +0200)]
; * etc/NEWS: Copy-edits.

(cherry picked from commit 437b1ced268a168a7f1262524716ac07f8b08622)

4 months agoExpand docstring of which-key-mode
Stefan Kangas [Fri, 28 Jun 2024 22:56:11 +0000 (00:56 +0200)]
Expand docstring of which-key-mode

* lisp/which-key.el (which-key-mode): Expand docstring.

(cherry picked from commit 7372b2eb302f62536437b807f5220e5adfafbcf4)

4 months ago(cherry-pick-new-commits): Only fetch once, or with prefix arg
Eshel Yaron [Mon, 1 Jul 2024 06:39:04 +0000 (08:39 +0200)]
(cherry-pick-new-commits): Only fetch once, or with prefix arg

4 months ago; Use 'keymap-set' in 'lua-ts-mode'
john muhl [Wed, 22 May 2024 17:23:19 +0000 (12:23 -0500)]
; Use 'keymap-set' in 'lua-ts-mode'

* lisp/progmodes/lua-ts-mode.el (lua-ts-mode-map): Replace 'define-key'
with 'keymap-set'.  (Bug#71736)

(cherry picked from commit 8198a144376cfea3490ea5628392fb3a49fec2d6)

4 months agoImprove documentation of 'remove-overlays' in ELisp manual
Eli Zaretskii [Fri, 28 Jun 2024 11:52:05 +0000 (14:52 +0300)]
Improve documentation of 'remove-overlays' in ELisp manual

* doc/lispref/display.texi (Managing Overlays): Update
documentation of 'remove-overlays'.  (Bug#57534)  (Bug#13648)

(cherry picked from commit df0eb5be1eac7763236a99ffeb6e2b3561955bd9)

4 months agoFix link to major mode variable in docstring
Stefan Kangas [Fri, 28 Jun 2024 10:16:57 +0000 (12:16 +0200)]
Fix link to major mode variable in docstring

* lisp/emacs-lisp/easy-mmode.el (easy-mmode--arg-docstring): Fix link to
major mode variable in docstring.  (Bug#71815)

(cherry picked from commit 73c1252bb6b7cc61d9f992818568d3c57de4ff67)

4 months agoMake `shell-mode' more robust
Michael Albinus [Fri, 28 Jun 2024 09:28:33 +0000 (11:28 +0200)]
Make `shell-mode' more robust

* lisp/shell.el (shell-mode): Ensure that
`comint-input-ring-file-name' is non-nil when calling `file-truename'.

(cherry picked from commit c4ad54812acaf8f156962047eaaaf75b0c0ecf96)

4 months ago* src/w32uniscribe.c (syms_of_w32uniscribe_for_pdumper): Typos.
Po Lu [Thu, 27 Jun 2024 13:42:19 +0000 (21:42 +0800)]
* src/w32uniscribe.c (syms_of_w32uniscribe_for_pdumper): Typos.

(cherry picked from commit cbede3d43df99177cc6c2d63a24bbec9b19da451)

4 months agoFix Cygwin build
Po Lu [Thu, 27 Jun 2024 01:59:57 +0000 (09:59 +0800)]
Fix Cygwin build

* src/w32uniscribe.c (syms_of_w32uniscribe_for_pdumper): Define
and retrieve handle to USP10.DLL on Cygwin.

(cherry picked from commit 8d55b38e2a1212c47bfb9f93a73fa50b9f291609)

4 months agoRestore functionality on Windows 98
Po Lu [Sun, 23 Jun 2024 08:28:22 +0000 (16:28 +0800)]
Restore functionality on Windows 98

* configure.ac (W32_LIBS): Don't link with -lusp10 on non-Cygwin
systems.

* src/emacs.c (main): Call globals_of_w32 before the startup
directory is initialized.

* src/w32.c (maybe_load_unicows_dll): Call
load_unicows_dll_for_w32fns.

* src/w32.h: Update prototypes.

* src/w32fns.c (Fx_create_frame, w32_create_tip_frame): Do not
register the Uniscribe font driver when unavailable.
(pfnSHFileOperationW): New function pointer.
(Fsystem_move_file_to_trash): Load UNICOWS.DLL if not yet
loaded.  Call SHFileOperationW through said function pointer.
(pfnShellExecuteExW): New function pointer.
(Fw32_shell_execute) [!CYGWIN]: Load UNICOWS.DLL if not yet
loaded.  Call ShellExecuteExW through said function pointer.
(pfnShell_NotifyIconW): New function pointer.
(add_tray_notification, delete_tray_notification): Call
Shell_NotifyIconW through said function pointer.
(Fw32_notification_notify): Load UNICOWS.DLL.
(Fw32_notification_close): Return if Shell_NotifyIconW is
unavailable, as when UNICOWS.DLL has yet to be loaded.
(load_unicows_dll_for_w32fns): New function.

* src/w32notify.c (pfnReadDirectoryChangesW): New function
pointer.
(watch_completion, remove_watch, Fw32notify_add_watch)
(Fw32notify_rm_watch, Fw32notify_valid_p): Call
ReadDirectoryChangesW through said function pointer, and assert
its presence.
(globals_of_w32notify): Load ReadDirectoryChangesW from
KERNEL32.DLL.

* src/w32uniscribe.c (pfnScriptItemize, pfnScriptShape)
(pfnScriptPlace, pfnScriptGetGlyphABCWidth, pfnScriptFreeCache)
(pfnScriptGetCMap): New function pointers.
(uniscribe_close, uniscribe_shape, uniscribe_encode_char)
(uniscribe_check_otf_1): Call Uniscribe functions through the
same.
(syms_of_w32uniscribe_for_pdumper): Load Uniscribe library and
required functions from the same, and if unavailable, return
while leaving uniscribe_available intact.  On Cygwin, simply
assign USP10.DLL functions to the said new function pointers.

(cherry picked from commit 18e7a9f3d0c27385f8efeb2b1ef80b3446dca288)

4 months ago* lisp/avy.el: Minor fixes.
Eshel Yaron [Sun, 30 Jun 2024 20:36:15 +0000 (22:36 +0200)]
* lisp/avy.el: Minor fixes.

4 months ago* lisp/avy.el: New file.
Eshel Yaron [Sun, 30 Jun 2024 20:35:53 +0000 (22:35 +0200)]
* lisp/avy.el: New file.

4 months agoFix handling of help keys in 'y-or-n-p'
Eshel Yaron [Sun, 30 Jun 2024 20:25:30 +0000 (22:25 +0200)]
Fix handling of help keys in 'y-or-n-p'

4 months ago(describe-library): Mention package that library is part of
Eshel Yaron [Sun, 30 Jun 2024 18:48:05 +0000 (20:48 +0200)]
(describe-library): Mention package that library is part of

4 months agoNew command 'propertize-region'
Eshel Yaron [Sun, 30 Jun 2024 16:36:43 +0000 (18:36 +0200)]
New command 'propertize-region'

4 months ago(minibuffer-force-complete): Indicate number of possible completions
Eshel Yaron [Sat, 29 Jun 2024 19:09:54 +0000 (21:09 +0200)]
(minibuffer-force-complete): Indicate number of possible completions

4 months ago(read-extended-command): Be less weird
Eshel Yaron [Sat, 29 Jun 2024 18:40:43 +0000 (20:40 +0200)]
(read-extended-command): Be less weird

4 months agoInherit text props in Completion Preview insertion commands
Eshel Yaron [Sat, 29 Jun 2024 09:51:10 +0000 (11:51 +0200)]
Inherit text props in Completion Preview insertion commands

When completing with Completion Preview mode commands,
inherit text properties from surrounding text similarly to
other completion commands, such as 'completion-at-point'.

* lisp/completion-preview.el (completion-preview-insert)
(completion-preview-partial-insert)
(completion-preview-complete): Use 'insert-and-inherit'
instead of 'insert' to insert text for completion.
* test/lisp/completion-preview-tests.el
(completion-preview-insert-inherits-text-properties): New
test.

4 months ago; Skip commit c4ec905c9a9b68e99f5abf208be53c981cd718eb
Eshel Yaron [Fri, 28 Jun 2024 17:19:39 +0000 (19:19 +0200)]
; Skip commit c4ec905c9a9b68e99f5abf208be53c981cd718eb

4 months ago* lisp/hi-lock.el: More fixes related to revert-buffer.
Juri Linkov [Fri, 28 Jun 2024 06:42:43 +0000 (09:42 +0300)]
* lisp/hi-lock.el: More fixes related to revert-buffer.

(hi-lock-set-pattern): Use the same propertized string
for 'overlay-put' property to allow 'remove-overlays'
to remove it while using 'eq' on the property value.
https://lists.gnu.org/archive/html/emacs-devel/2024-06/msg01001.html

(cherry picked from commit bf862fc277034b6ada4a4a81dd640e116e6b9312)

4 months agoUpdate to Org 9.7.5-9-ga091ca
Kyle Meyer [Fri, 28 Jun 2024 03:55:35 +0000 (23:55 -0400)]
Update to Org 9.7.5-9-ga091ca

(cherry picked from commit 6cc8ffae9a6fa3bbdc71bf5eac3875000c9e7870)

4 months ago; Fix typo in lua-ts-mode.el
john muhl [Wed, 12 Jun 2024 15:41:03 +0000 (10:41 -0500)]
; Fix typo in lua-ts-mode.el

* lisp/progmodes/lua-ts-mode.el: Fix typo.  (Bug#71736)

(cherry picked from commit c477443ab80a087a94c357f3fe5fd62c97e6f6ab)

4 months ago; Add 'eglot-ensure' option to 'lua-ts-mode-hook'
john muhl [Wed, 15 Nov 2023 18:45:18 +0000 (12:45 -0600)]
; Add 'eglot-ensure' option to 'lua-ts-mode-hook'

* lisp/progmodes/lua-ts-mode.el (lua-ts-mode-hook): Add an option to
enable Eglot from the lua-ts-mode-hook.  (Bug#71736)

(cherry picked from commit 6e5e4d6193999eef31a3c62a3de64910ccbd3ffb)

4 months ago; Skip commit 58a2f36a8b93a2773dbf939ee67112897ea72944
Eshel Yaron [Fri, 28 Jun 2024 17:18:16 +0000 (19:18 +0200)]
; Skip commit 58a2f36a8b93a2773dbf939ee67112897ea72944

4 months ago; (completion-preview-partial-insert): Avoid no-op undo entries
Eshel Yaron [Fri, 28 Jun 2024 10:57:32 +0000 (12:57 +0200)]
; (completion-preview-partial-insert): Avoid no-op undo entries

* lisp/completion-preview.el
(completion-preview-partial-insert): Abort change group
rather than deleting entire temporary insertion, so as to
avoid recording no-op undo entries.  Move 'deactivate-mark'
let-binding outside of 'catch' form.

4 months agoWrite Antinews for Emacs 30 ELisp Reference
Eli Zaretskii [Thu, 27 Jun 2024 18:54:52 +0000 (21:54 +0300)]
Write Antinews for Emacs 30 ELisp Reference

* doc/lispref/anti.texi (Antinews):
* doc/lispref/elisp.texi (Top): Rewrite "Antinews" for Emacs 30.

(cherry picked from commit 039e6ffd86650b26364d1fab1014e19dfcab3b21)

4 months ago(eval-last-sexp): Fix bug#71774
Stefan Monnier [Thu, 27 Jun 2024 18:39:27 +0000 (14:39 -0400)]
(eval-last-sexp): Fix bug#71774

* lisp/progmodes/elisp-mode.el (eval-last-sexp): Set `values` only
when `eval-expression-debug-on-error` is nil.

(cherry picked from commit bf8c9f702ba7cba8f835996d49cad01865e2813e)

4 months ago* lisp/hi-lock.el: More fixes for revert-buffer (bug#57534)
Juri Linkov [Thu, 27 Jun 2024 18:08:28 +0000 (21:08 +0300)]
* lisp/hi-lock.el: More fixes for revert-buffer (bug#57534)

(hi-lock-set-pattern): Put the text property 'regexp' on the lighter string.
(hi-lock-revert-buffer-rehighlight): Get the real regexp from the
text property 'regexp'.  This fixes the case when the original
regexp gets lost after e.g. 'M-s . M-s h r'.

(cherry picked from commit 6d94090cadcff1b251457c2d82b287f4beb5a93d)

4 months ago* lisp/hi-lock.el (hi-lock-revert-buffer-rehighlight): Improve (bug#57534).
Juri Linkov [Thu, 27 Jun 2024 17:05:58 +0000 (20:05 +0300)]
* lisp/hi-lock.el (hi-lock-revert-buffer-rehighlight): Improve (bug#57534).

Instead of detecting invalidated overlays, use the same condition
as in 'hi-lock-set-pattern', and always re-highlight overlays,
because even when overlays stays on their original positions,
there is a need to highlight more matches possibly added after revert.

(cherry picked from commit 280c91782afa0c6ae667785b806da58e6be102ae)

4 months ago* lisp/tab-bar.el (tab-bar-select-restore-windows): Improve the docstring.
Juri Linkov [Thu, 27 Jun 2024 16:57:18 +0000 (19:57 +0300)]
* lisp/tab-bar.el (tab-bar-select-restore-windows): Improve the docstring.

Suggested by Kévin Le Gouguec <kevin.legouguec@gmail.com> in bug#71779.

(cherry picked from commit 339310d020587ac25798f94851834c7044c87be4)

4 months agoWrite Antinews for Emacs 30 user manual
Eli Zaretskii [Thu, 27 Jun 2024 16:36:39 +0000 (19:36 +0300)]
Write Antinews for Emacs 30 user manual

* doc/emacs/anti.texi (Antinews):
* doc/emacs/emacs.texi (Top): Rewrite "Antinews" for Emacs 30.

(cherry picked from commit c1e7569a925a5ff4666d2033a979511bc950bd2f)

4 months ago; * lisp/erc/erc-backend.el (erc-server-reconnect-timeout): Doc (bug#71756).
F. Jason Park [Mon, 24 Jun 2024 23:04:37 +0000 (16:04 -0700)]
; * lisp/erc/erc-backend.el (erc-server-reconnect-timeout): Doc (bug#71756).

(cherry picked from commit 233f683da8fa146e3328c96b4cf04211446e026e)

4 months ago; Skip commit 20a672b3b2b1c3306b26e546380f2902d10931a0
Eshel Yaron [Fri, 28 Jun 2024 06:12:02 +0000 (08:12 +0200)]
; Skip commit 20a672b3b2b1c3306b26e546380f2902d10931a0

4 months agoFix two tests for --without-all build
Andrea Corallo [Thu, 27 Jun 2024 13:32:03 +0000 (15:32 +0200)]
Fix two tests for --without-all build

* test/src/image-tests.el
(image-tests-image-mask-p/error-on-nongraphical-display)
(image-tests-image-metadata/error-on-nongraphical-display): xpm images
are not supported in all configurations so use xbm for non graphical
display tests.

(cherry picked from commit 6f9f9a2155542d6452847a9311772c399298c4c8)

4 months ago(buf_bytepos_to_charpos): Fix mixup introduced in commit b300052fb4ef
Stefan Monnier [Thu, 27 Jun 2024 19:36:28 +0000 (15:36 -0400)]
(buf_bytepos_to_charpos): Fix mixup introduced in commit b300052fb4ef

* src/marker.c (buf_bytepos_to_charpos): Don't compare byte-positions
with char-positions.

(cherry picked from commit b595b4598e7b3dabe4d45895f5580c9a351f2885)

4 months agoChange ERC version to 5.6.1-git
F. Jason Park [Thu, 13 Jun 2024 06:10:00 +0000 (23:10 -0700)]
Change ERC version to 5.6.1-git

* doc/misc/erc.texi: Change ERCVER to 5.6.1.
* lisp/erc/erc.el: (erc-version): Change working version to 5.6.1-git.
Do the same for the package Version header.  Don't bother updating
`customize-package-emacs-version-alist' until needed.

(cherry picked from commit 253172162107b34ebd24b8fbe1db4ac10a3931bd)

4 months ago; * etc/PROBLEMS (PGTK): Remove redundant 2nd PGTK section.
Eli Zaretskii [Thu, 27 Jun 2024 10:34:21 +0000 (13:34 +0300)]
; * etc/PROBLEMS (PGTK): Remove redundant 2nd PGTK section.

(cherry picked from commit 98daa10f065ad6a7f840c483b5a230fd3fbf3991)

4 months agoFix handling of non-nil 'dired-movement-style'
Eli Zaretskii [Thu, 27 Jun 2024 09:42:43 +0000 (12:42 +0300)]
Fix handling of non-nil 'dired-movement-style'

* lisp/dired.el (dired--move-to-next-line): Treat any non-nil
value of 'dired-movement-style' except 'cycle' as 'bounded'.
(dired-movement-style): Mention this in the doc string.
(Bug#71770)

(cherry picked from commit ced33bc23978c7e27c30a9e09bf8814f6798524f)

4 months ago; * lisp/gnus/message.el (message-idna-to-ascii-rhs): Doc fix (bug#71757).
Eli Zaretskii [Thu, 27 Jun 2024 09:33:47 +0000 (12:33 +0300)]
; * lisp/gnus/message.el (message-idna-to-ascii-rhs): Doc fix (bug#71757).

(cherry picked from commit b1e9b6fd67df1214dc01bd1b2622f141c59766f3)

4 months ago; Skip commit 5eb9a0d2c79beaaca8b3ea0ee8c6b4bd5efa4bf0
Eshel Yaron [Fri, 28 Jun 2024 05:51:34 +0000 (07:51 +0200)]
; Skip commit 5eb9a0d2c79beaaca8b3ea0ee8c6b4bd5efa4bf0

4 months agoDo not prematurely truncate python eldoc string
James Thomas [Sat, 22 Jun 2024 12:27:00 +0000 (17:57 +0530)]
Do not prematurely truncate python eldoc string

'eldoc-echo-area-use-multiline-p' is there for that.
* lisp/progmodes/python.el (python-eldoc-setup-code):
Make the change.  (Bug#71720)

* etc/NEWS: Announce the change in behavior.

(cherry picked from commit 6ec77f580ddbff9001abbc47ab2b857df41b3f36)

4 months ago; Fix simple-tests as fallout of last change
Eli Zaretskii [Thu, 27 Jun 2024 08:37:15 +0000 (11:37 +0300)]
; Fix simple-tests as fallout of last change

* test/lisp/simple-tests.el
(simple-execute-extended-command--shorter): Fix test broken by new
kill-whole-line tests.  (Bug#65734)

(cherry picked from commit f475a1a25449509aa8c081d63f6ca63833cfdd35)

4 months agoAdd tests for `kill-whole-line' (bug#65734)
Sebastian Miele [Wed, 19 Jun 2024 13:58:24 +0000 (15:58 +0200)]
Add tests for `kill-whole-line' (bug#65734)

* test/lisp/simple-tests.el (simple-test-point-tag):
(simple-test-mark-tag):
(simple-test--set-buffer-text-point-mark):
(simple-test--get-buffer-text-point-mark): Add helper functions used by
the tests.
(kill-whole-line-invisible):
(kill-whole-line-read-only):
(kill-whole-line-after-other-kill):
(kill-whole-line-buffer-boundaries):
(kill-whole-line-line-boundaries): Add tests for `kill-whole-line'.

(cherry picked from commit aa10d0c5ac1a4d706b8562671f2a22a82f9e733b)

4 months agokill-whole-line: Honor visibility; fix kill-ring when read-only (bug#65734)
Sebastian Miele [Wed, 19 Jun 2024 13:48:59 +0000 (15:48 +0200)]
kill-whole-line: Honor visibility; fix kill-ring when read-only (bug#65734)

* lisp/simple.el (kill-whole-line): Use visibility state before
performing any edits as reference instead of expecting that visibility
cannot change.  First of the two calls to `kill-region' may trigger
`after-change-functions' that might alter the visibility state.
Make sure that we populate the `kill-ring' with the contents of the
whole line when buffer is in `read-only-mode'.

(cherry picked from commit 058bb4ca25adb8f4bf78cc0f09a65d730dbd797d)

4 months ago* lisp/hi-lock.el (hi-lock-file-patterns-policy): Add value 'always'.
Juri Linkov [Thu, 27 Jun 2024 06:52:06 +0000 (09:52 +0300)]
* lisp/hi-lock.el (hi-lock-file-patterns-policy): Add value 'always'.

(hi-lock-mode): Update docstring.
(hi-lock-find-patterns): Return t for value 'always'.
(hi-lock-revert-buffer-rehighlight): Rewrite to correctly handle
all possible cases (bug#57534).

(cherry picked from commit e45173d114e37d5a652b5393ce7bcab1acea3f1a)

4 months ago; Skip commit d6afb017debb9cc1a88a129eea688e2f2bbf402a
Eshel Yaron [Fri, 28 Jun 2024 05:48:59 +0000 (07:48 +0200)]
; Skip commit d6afb017debb9cc1a88a129eea688e2f2bbf402a

4 months agoPrevent crashes and related issues if initial activity is destroyed on Android
Po Lu [Thu, 27 Jun 2024 03:06:59 +0000 (11:06 +0800)]
Prevent crashes and related issues if initial activity is destroyed on Android

* java/org/gnu/emacs/EmacsWindow.java
(EmacsWindow) <initialWindowCreated>: New variable.
(EmacsWindow): If the initial frame has not yet been created,
set attachmentToken to -1.

* java/org/gnu/emacs/EmacsWindowManager.java (registerWindow):
When the window's attachment token is -1 (i.e., it is the
default window), start EmacsActivity rather than
EmacsMultitaskActivity.  Catch exceptions around startActivity.

(cherry picked from commit 860840621a1ebe2e4f17ba8ae78d441ea75650b2)

4 months agoDisable preprocessing of assembler files with m4 on non-MIPS systems
Po Lu [Thu, 27 Jun 2024 02:15:13 +0000 (10:15 +0800)]
Disable preprocessing of assembler files with m4 on non-MIPS systems

* exec/Makefile.in (is_mips): New substitution.
(.s.o): Avoid calling m4 unless it be set.

* exec/configure.ac: Substitute is_mips, and don't generate
config-mips.m4 otherwise.

* exec/loader-x86.s:

* exec/loader-x86_64.s: Use assembler rather than m4-defined
comment syntax.

(cherry picked from commit fa322155ad51e3628256232bc113ad7499ab76e7)

4 months agoImprove Local Directory Variables auto-insert
Stefan Kangas [Wed, 26 Jun 2024 23:50:18 +0000 (01:50 +0200)]
Improve Local Directory Variables auto-insert

* lisp/autoinsert.el (auto-insert-alist): Confirm after entering
in a non-existent mode in Local Directory Variables skeleton.

(cherry picked from commit da11a2a5cc3fa7e28031dc87e0f07004a9a005f7)

4 months agoDoc fix in 'php-ts-mode'
Vincenzo Pupillo [Tue, 25 Jun 2024 08:37:40 +0000 (10:37 +0200)]
Doc fix in 'php-ts-mode'

* lisp/progmodes/php-ts-mode.el
(php-ts-mode--custom-html-font-lock-settings): Doc fix.  (Bug#71759)

(cherry picked from commit d5c6eb1f9646781cf103124fb7e88d1fa1cf2473)

4 months agoSupport .dir-locals-2.el in `auto-insert-mode`
Stefan Kangas [Wed, 26 Jun 2024 23:33:40 +0000 (01:33 +0200)]
Support .dir-locals-2.el in `auto-insert-mode`

* lisp/autoinsert.el (auto-insert-alist): Use Directory Local Variables
skeleton also for ".dir-locals-2.el".

(cherry picked from commit a2c3a91f0e3b6a3a22e74ef2dc473c12059e93c9)

4 months agoUse 'revert-function' in *xref* buffer
Eshel Yaron [Wed, 26 Jun 2024 16:51:32 +0000 (18:51 +0200)]
Use 'revert-function' in *xref* buffer

* lisp/progmodes/xref.el (xref--xref-buffer-mode-map): Cease
binding 'g' to 'xref-revert-buffer'.
(xref--xref-buffer-mode): Set 'revert-buffer-function' to...
(xref--revert-buffer): ...this.  New function, renamed from...
(xref-revert-buffer): ...this.  Make it an alias of
'revert-buffer'.
* etc/NEWS: Announce it.
* doc/emacs/maintaining.texi (Xref Commands): Update docs.

(cherry picked from commit 82125b1a6616259531ef3abd45b41089de160ba7)

4 months ago(quail-input-method): Fix bug#70541
Stefan Monnier [Wed, 26 Jun 2024 20:18:57 +0000 (16:18 -0400)]
(quail-input-method): Fix bug#70541

* lisp/international/quail.el (quail-input-method): Don't bind
`inhibit-modification-hooks`.
(quail-point-in-conversion-region): Simplify.

(cherry picked from commit 78951610a6e9a2977008a8d5884bf1f2f8330da2)

4 months agoAvoid compiler warnings in the Cygwin-w32 build
Ken Brown [Wed, 26 Jun 2024 19:57:39 +0000 (15:57 -0400)]
Avoid compiler warnings in the Cygwin-w32 build

* src/w32fns.c [DEFAULT_IMAGE_BASE]: Don't define on Cygwin.
* src/cygw32.h (w32_get_resource): Add prototype.  (Bug#71786)

(cherry picked from commit fb15affde8cb27ad358ad7070d150238cec11f99)

4 months agoAdd new face 'widget-unselected' to wid-edit.el
Stephen Berman [Wed, 26 Jun 2024 06:42:19 +0000 (08:42 +0200)]
Add new face 'widget-unselected' to wid-edit.el

* doc/misc/widget.texi (Customization): Document it.

* etc/NEWS: Announce 'widget-unselected' face.

* lisp/wid-edit.el (widget-unselected): New face.
(widget-specify-unselected, widget-specify-selected): New functions.
(widget-checkbox-action, widget-checklist-add-item)
(widget-radio-add-item, widget-radio-value-set)
(widget-radio-action): Use them.

(cherry picked from commit 8d354925ddb03781e8be96b21023393d217d3778)

4 months agoCease using etags as a default Xref backend
Eshel Yaron [Thu, 27 Jun 2024 19:18:16 +0000 (21:18 +0200)]
Cease using etags as a default Xref backend

4 months ago* lisp/repeat.el (repeat-check-map): Simplify
Eshel Yaron [Thu, 27 Jun 2024 19:17:29 +0000 (21:17 +0200)]
* lisp/repeat.el (repeat-check-map): Simplify

4 months ago(tags-completion-at-point-function): Simplify autoloading
Eshel Yaron [Thu, 27 Jun 2024 19:17:03 +0000 (21:17 +0200)]
(tags-completion-at-point-function): Simplify autoloading

4 months agoNullify 'completion-at-point-functions' default value
Eshel Yaron [Thu, 27 Jun 2024 19:16:43 +0000 (21:16 +0200)]
Nullify 'completion-at-point-functions' default value

4 months agoFix 'repeat-check-map'
Eshel Yaron [Wed, 26 Jun 2024 20:09:16 +0000 (22:09 +0200)]
Fix 'repeat-check-map'

4 months agoRemove 'read-minibuffer-restore-windows'
Eshel Yaron [Wed, 26 Jun 2024 18:55:12 +0000 (20:55 +0200)]
Remove 'read-minibuffer-restore-windows'