Merge branch 'emacs-29' of git://git.sv.gnu.org/emacs into pgtk-nativecomp #2
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* doc/lispref/objects.texi (Syntax for Strings): Describe in more detail how to specify special characters in string literals. (Printed Representation, Character Type, Nonprinting Characters): Improve information and add cross-references about printed representation and read syntax. (Bug#67033)
* lisp/emacs-lisp/cl-extra.el (cl--random-time) (cl-find-class): Add docstrings. (Bug#66949)
* lisp/eshell/esh-proc.el (eshell-gather-process-output): Get the local part of the $PATH (bug#67126). Do not merge to master. Copyright-paperwork-exempt: yes
This became broken 7 years ago, when the 'boundp condition was removed, and with it an important unrelated part of the code. * lisp/textmodes/ispell.el (ispell-message): Fix cite-regexp.
* lisp/emacs-lisp/shortdoc.el (text-properties): Add missing ':no-eval' keyword. (Bug#67138)
bug#67150 * lisp/progmodes/eglot.el (eglot-server-programs): Update language-id for languages handled by typescript-language-server. (cherry picked from commit 1fe9498)
Reported by Alfie John <alfie@rustjobs.com>.
(cherry picked from commit 58d9e73)
* lisp/doc-view.el (doc-view-set-doc-type): Fix CBZ file detection. (Bug#67133) This fix is almost identical to the previous fix for ODF file detection in bug#54947 which resulted in commit b3ff490
* doc/lispref/tips.texi (Documentation Tips, Coding Conventions) (Key Binding Conventions, Programming Tips, Compilation Tips) (Warning Tips, Comment Tips, Library Headers): Improve indexing.
* doc/lispref/control.texi (pcase Macro, Backquote Patterns): Improve cross-references.
* doc/lispref/tips.texi (Documentation Tips): Clarify "important arguments". (Bug#67217)
* lisp/abbrev.el (prepare-abbrev-list-buffer, add-abbrev) (inverse-add-abbrev, abbrev--describe) (abbrev--possibly-save): Add doc strings.
* lisp/net/tramp.el (tramp-skeleton-file-name-all-completions): New defmacro. (tramp-completion-handle-file-name-all-completions): * lisp/net/tramp-adb.el (tramp-adb-handle-file-name-all-completions): * lisp/net/tramp-crypt.el (tramp-crypt-handle-file-name-all-completions): * lisp/net/tramp-fuse.el (tramp-fuse-handle-file-name-all-completions): * lisp/net/tramp-gvfs.el (tramp-gvfs-handle-file-name-all-completions): * lisp/net/tramp-sh.el (tramp-sh-handle-file-name-all-completions): * lisp/net/tramp-smb.el (tramp-smb-handle-file-name-all-completions): * lisp/net/tramp-sudoedit.el (tramp-sudoedit-handle-file-name-all-completions): Use it.
* src/sqlite.c (Fsqlite_load_extension): Add 2 Free Software extensions to the allow-list. For the details, see https://lists.gnu.org/archive/html/emacs-devel/2023-11/msg00234.html.
* lisp/edmacro.el (edmacro-parse-keys): Add a comment for forcing output to be a vector. (read-kbd-macro): Adjust the doc string to changes in 'edmacro-parse-keys'. (Bug#67182)
* lisp/emacs-lisp/subr-x.el (string-pixel-width): Instead of checking for display-line-numbers-mode, set the display-line-numbers variable to nil (bug#67248).
* lisp/progmodes/python.el (python--treesit-keywords): Add "not in".
* doc/lispintro/emacs-lisp-intro.texi (Lisp macro): Improve wording in description of 'unless'. (Bug#67185)
* doc/emacs/cmdargs.texi (Initial Options): Document that --script and -x ignore file-local variables. (Bug#67321)
* lisp/sqlite.el (with-sqlite-transaction): Don't commit changes if BODY errors out. Roll back the transaction if committing fails. (Bug#67142) * etc/NEWS: * doc/lispref/text.texi (Database): Document the error handling in 'with-sqlite-transaction'.
* test/lisp/progmodes/java-ts-mode-resources/indent.erts: New file with tests for indentation. * test/lisp/progmodes/java-ts-mode-resources/movement.erts: New file with tests for movement. * test/lisp/progmodes/java-ts-mode-tests.el: New tests. * test/lisp/progmodes/typescript-ts-mode-resources/indent.erts: New file with tests for indentation. * test/lisp/progmodes/typescript-ts-mode-tests.el: New tests. (cherry picked from commit c8dd37b)
* doc/lispref/objects.texi (Non-ASCII in Strings): More accurate description of when a hexadecimal escape sequence yields a unibyte character. (Bug#68751)
* lisp/international/emoji.el (emoji--read-emoji): Signal user-error on empty input. (Bug#68671) Do not merge to master.
…re". (cherry picked from commit 744a10a)
* lisp/net/tramp-sh.el (tramp-maybe-open-connection): Exit remote shell when login fails.
* doc/lispref/package.texi (Multi-file Packages): Fix wording and markup. (Bug#65027) (cherry picked from commit 6d76e39)
* src/w32term.c (w32_flip_buffers_if_dirty): Do nothing if F is not a GUI frame. This avoids rare crashes in "emacs -nw". * src/w32console.c (initialize_w32_display): Set the ENABLE_EXTENDED_FLAGS bit in 'prev_console_mode'. (cherry picked from commit e1970c9)
* lisp/minibuffer.el (completion--complete-and-exit): If minibuffer-completion-confirm is a function which returns nil, immediately fail to complete. See bug#66187.
* lisp/startup.el (fancy-startup-text, fancy-about-text): Doc fixes. (Bug#68788)
* lisp/desktop.el (desktop-save-mode): Improve docstring.
Do not merge to master.
* lisp/net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band): Flush file properties when needed. (Bug#68805)
* lisp/progmodes/eglot.el (eglot-server-programs): Support kotlin-ts-mode. (Bug#68865) Copyright-paperwork-exempt: yes
* lisp/progmodes/eglot.el (eglot-server-programs): Add php-ts-mode. (Bug#68870) Copyright-paperwork-exempt: yes
* lisp/progmodes/eglot.el (eglot-server-programs): Add nushell language server. (Bug#68823)
* lisp/textmodes/pixel-fill.el (pixel-fill-region): Make sure the selected window displays the current buffer. This is important when this function is called inside 'with-current-buffer' or similar forms which temporarily change the buffer displayed in the selected window. (Bug#67791)
Starting from version 0.20.2 the grammar's primary expression "function" has been renamed to "function_expression". A new function checks if the new primary expression is available, and if so, it returns the correct rules. * lisp/progmodes/js.el (js--treesit-font-lock-compatibility-definition-feature): New function. (js--treesit-font-lock-settings): Use it. (Bug#68879)
* lisp/progmodes/js.el (js--treesit-font-lock-compatibility-definition-feature): Fix comments.
Update optional arguments 'predicate' and 'include-node' of 'treesit-node-top-level'.
* lisp/minibuffer.el (read-file-name-default): Pass REQUIRE-MATCH argument through substitute-in-file-name. * lisp/minibuffer.el (read-file-name): Update docstring. Resolves bug#68815.
* lisp/dired.el (dired-mark): Skip "." and "..", but not symlinks to those two. (Bug#38729) (Bug#68814)
* doc/misc/tramp.texi (Frequently Asked Questions): Clarify FIDO entry. * lisp/net/tramp-sh.el (tramp-actions-before-shell) (tramp-actions-copy-out-of-band): Use `tramp-security-key-pin-regexp'. * lisp/net/tramp.el (tramp-security-key-pin-regexp): New defcustom. (tramp-action-otp-password, tramp-read-passwd): Trim password prompt. (tramp-action-show-and-confirm-message): Expand for PIN requests.
Run "TZ=UTC0 admin/update-copyright". Do not merge.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
At this snapshot, after running
make -j$(nproc) NATIVE_FAST_BOOT=1, I see a binary at./src/emacsthat reports its version thusly:That said, I have done next to no testing on the resulting artifact: y'all have more experience with whether these merges have subtle issues or not, though, so I wanted to at least share how far I'd gotten.
The main star of the show here is 1606d2b : almost all of the merge conflicts I fixed were copyright year related, which I tried to get ahead of at 3825368 (and that helped; instead of ~2000 conflicting files there were only ~160-something).
I also threw in a bonus autoreconf ( 1b6a4bb , modeled after e.g. a44d906 ).