summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Rebuild for athena apt repositorydebian/30.1_git20230415.1_bpo11+1_athena1athena/bullseye-backportsSean Whitton2023-04-16
|
* Merge branch 'athena/unstable' into athena/bullseye-backportsSean Whitton2023-04-16
|\
| * Release rebuild to athena apt repositorydebian/30.1_git20230415.1Sean Whitton2023-04-16
| |
| * changelogSean Whitton2023-04-16
| |
| * Merge upstream Git snapshot into athena/unstableSean Whitton2023-04-16
| |\
| | * Merge from origin/emacs-29Eli Zaretskii2023-04-15
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b7023da6627 Make image-map bindings available on image links d9e96c029bb * CONTRIBUTE: Fix a typo 3f71a2a0cf6 ; * lisp/progmodes/c-ts-mode.el (treesit-node-next-siblin... adf9c956c28 Add to Eglot support for additional language-servers. b3603b84bd9 Partial support for DEFUN in c-ts-mode (bug#62825) # Conflicts: # lisp/progmodes/c-ts-mode.el
| | | * Make image-map bindings available on image linksAndreas Schwab2023-04-15
| | | | | | | | | | | | | | | | | | | | * lisp/net/shr.el (shr-map): Move shr-browse-image to "M-i". * lisp/net/eww.el (eww-image-link-keymap): Use shr-image-map.
| | | * * CONTRIBUTE: Fix a typoAlan Mackenzie2023-04-15
| | | |
| | | * ; * lisp/progmodes/c-ts-mode.el (treesit-node-next-sibling): Declare.Eli Zaretskii2023-04-15
| | | |
| | | * Add to Eglot support for additional language-servers.Jostein Kjønigsen2023-04-15
| | | | | | | | | | | | | | | | | | | | | | | | * lisp/progmodes/eglot.el (eglot-server-programs): Add 'vscode-markdown-language-server' for Markdown and 'dot-language-server' for GraphViz. (Bug#62844)
| | | * Partial support for DEFUN in c-ts-mode (bug#62825)Yuan Fu2023-04-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The DEFUN is hard to incorporate because it's made of two nodes rather than one, and most tree-sitter functionalities assume a defun is one node. I fixed the indent-defun and add-log functionality, but beginning/end-of-defun and imenu still don't recognize DEFUN. * lisp/progmodes/c-ts-mode.el (c-ts-mode-emacs-devel): New variable. (c-ts-mode--defun-name): Support DEFUN. (c-ts-mode--defun-valid-p): Support DEFUN. (c-ts-mode--emacs-defun-p) (c-ts-mode--emacs-defun-at-point): New functions. (c-ts-mode-indent-defun): Use c-ts-mode--emacs-defun-at-point. (c-ts-mode--emacs-current-defun-name): New function. (c-ts-mode, c++-ts-mode): Optionally setup custom defun-name function.
| | * | ; Merge from origin/emacs-29Eli Zaretskii2023-04-15
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | The following commits were skipped: 14e809ddff1 Fix style and unwinding code in treesit.c 759cdf1e510 Catch signals produced by PRED in tree-sitter search func...
| | | * Fix style and unwinding code in treesit.cEli Zaretskii2023-04-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was supposed to be a cherry-pick from master, but isn't, due to the unnecessary rush to fix master without cleaning up the mess first and without separating changes that can and cannot be backported. * src/treesit.c (treesit_traverse_cleanup_cursor): Fix indentation style. (Ftreesit_search_subtree, Ftreesit_search_forward) (Ftreesit_induce_sparse_tree): Fix specpdl unwinding. (Bug#62823) Do not merge to master.
| | | * Catch signals produced by PRED in tree-sitter search functionsYuan Fu2023-04-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Earlier we switched to using cursors rather than nodes to traverse the parse tree. Because cursors need cleanup, we have to catch signals thrown by the predicate functions and free the cursor. Failing to do this will result in leaking the cursor whenever the predicate function signals in a search function. This change fixes the leak. * src/treesit.c (treesit_traverse_cleanup_cursor): New function. (Ftreesit_search_subtree) (Ftreesit_search_forward) (Ftreesit_induce_sparse_tree): Catch signals. (Bug#62823) (cherry picked from commit a5eb9f6ad4e6f5a2819b540a477f1e889f6ef355)
| | * | Merge from origin/emacs-29Eli Zaretskii2023-04-15
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 864a4dc2363 Fix compilation of w32.c with old MinGW system headers a22eb9ae0f9 ruby-add-log-current-method: Reduce the use of 'nreverse' 17d803d0a75 Fix detection of WebP images by their signature 43290391ce2 ; Eglot: make version parseable by version-to-list 6e6e8b5c974 Add more documentation for the keys of `package-vc-select... 7972b76c2c7 ; vc-checkout: Wrap var lookup in 'bound-and-true-p' e9fef1d70ff vc-checkout: Try to use the vc-dir's backend first 372e024accd ; Fix wallpaper-tests on XFCE 7055fd8e43e Improve documentation related to 'ispell-complete-word' 61fd017abde * configure.ac: Add -lbsd on Haiku. 05971c4d9a4 Add menu to 'c-ts-mode' and 'c++-ts-mode' # Conflicts: # lisp/progmodes/eglot.el # lisp/progmodes/ruby-mode.el
| | | * Fix compilation of w32.c with old MinGW system headersEli Zaretskii2023-04-13
| | | | | | | | | | | | | | | | | | | | | | | | * src/w32.c (CONSOLE_FONT_INFO): Make sure the definition is not visible for MinGW versions whose w32api's version is before 5.2.0. (Bug#52792)
| | | * ruby-add-log-current-method: Reduce the use of 'nreverse'Dmitry Gutov2023-04-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lisp/progmodes/ruby-mode.el (ruby-add-log-current-method): Reduce the use of 'nreverse' (bug#62761). * test/lisp/progmodes/ruby-mode-tests.el (ruby-add-log-current-method-singleton-referencing-outer): New test.
| | | * Fix detection of WebP images by their signatureVisuwesh2023-04-12
| | | | | | | | | | | | | | | | | | | | | | | | * lisp/image.el (image-type-header-regexps): The 4 characters between "RIFF" and "WEBP" in WebP images can also be newlines. (Bug#62790)
| | | * ; Eglot: make version parseable by version-to-listJoão Távora2023-04-12
| | | | | | | | | | | | | | | | * lisp/progmodes/eglot.el (Version): Correct version.
| | | * Add more documentation for the keys of `package-vc-selected-packages`.Earl Hyatt2023-04-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * doc/emacs/package.texi (Specifying Package Sources): List the accepted keys in a new subsection of Fetching Package Sources. * lisp/emacs-lisp/package-vc.el (package-vc-selected-packages): Mention the `:doc` key. Add the `:doc` key to the Customize form, mention the new Info node, correct "TexInfo" to "Texinfo", avoid Git-specific terms for the description of `:branch`, mention guessing `:vc-backend` based on the URL.
| | | * ; vc-checkout: Wrap var lookup in 'bound-and-true-p'Dmitry Gutov2023-04-12
| | | |
| | | * vc-checkout: Try to use the vc-dir's backend firstDmitry Gutov2023-04-11
| | | | | | | | | | | | | | | | | | | | | | | | * lisp/vc/vc.el (vc-checkout): Try to use the vc-dir's backend before looking for the file's one. The latter doesn't work when the file doesn't exist on disk yet (bug#62674).
| | | * ; Fix wallpaper-tests on XFCEEli Zaretskii2023-04-11
| | | | | | | | | | | | | | | | | | | | | | | | * test/lisp/image/wallpaper-tests.el (wallpaper--find-command-args/return-list): Account for command-args being a function. (Bug#62673)
| | | * Improve documentation related to 'ispell-complete-word'Eli Zaretskii2023-04-11
| | | | | | | | | | | | | | | | | | | | | | | | * lisp/textmodes/ispell.el (ispell-alternate-dictionary) (ispell-complete-word-dict, ispell-complete-word): Doc fixes. (Bug#62775)
| | | * * configure.ac: Add -lbsd on Haiku.Po Lu2023-04-11
| | | |
| | | * Add menu to 'c-ts-mode' and 'c++-ts-mode'Eli Zaretskii2023-04-11
| | | | | | | | | | | | | | | | * lisp/progmodes/c-ts-mode.el (c-ts-mode-menu): New menu.
| | * | ; Merge from origin/emacs-29Eli Zaretskii2023-04-15
| | |\| | | | | | | | | | | | | | | | | | | | | The following commit was skipped: 954e2d96a92 Update manual about `sort`
| | | * Update manual about `sort`Mattias Engdegård2023-04-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * doc/lispref/sequences.texi (Sequence Functions): Remove inaccurate and over-specific claims about how `sort` works for lists: there is no guarantee that it doesn't modify the `car` fields of the input list (which is precisely what it does at this time). (cherry picked from commit c753a9592345e2084d69e9e2cc458c16db2e4141)
| | * | Merge from origin/emacs-29Eli Zaretskii2023-04-15
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c62afb10cf0 Fix wallpaper-tests on MS-Windows f2d212c6966 Fix a couple of eglot-tests 338b3718b6c Fix visiting RPM files b4afee03193 Fix ff-quiet-mode doc 2445100d7d6 ; Improve documentation of 'match-buffers' d4d0da96f0b ; Update make-tarball.txt for Emacs 29. 9b0bf694da4 ; Fix ldefs-boot.el. 0cb86a348c7 ; Update ChangeLog.4. # Conflicts: # ChangeLog.4
| | | * Fix wallpaper-tests on MS-WindowsEli Zaretskii2023-04-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * test/lisp/image/wallpaper-tests.el (wallpaper--find-setter) (wallpaper--find-setter/call-predicate) (wallpaper--find-setter/set-current-setter) (wallpaper-set/calls-init-action) (wallpaper-set/calls-wallpaper-set-function) (wallpaper-set/runs-command, wallpaper-set/runs-command/detach): Skip these tests if native functions are used for changing wallpaper. These tests are irrelevant in that case.
| | | * Fix a couple of eglot-testsBasil L. Contovounesios2023-04-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * test/lisp/progmodes/eglot-tests.el (eglot-test-rust-analyzer-watches-files): Bump timeout. (eglot-test-json-basic): Check for yas-minor-mode before using it, like other tests do (bug#61637).
| | | * Fix visiting RPM filesEli Zaretskii2023-04-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We cannot call 'sh-set-shell' inside 'sh-base-mode', since various settings of 'sh-mode', in particular the syntax table, is not yet set. Likewise with various hooks: since 'sh-base-mode' is not a mode any file should be visited with, it makes no sense to set up stuff like 'hack-local-variables-hook' in 'sh-base-mode'; it should be set in the descendant modes instead. * lisp/progmodes/sh-script.el (sh-base-mode): Move the call to 'sh-set-shell' from here... (sh-mode): ...to here... (bash-ts-mode): ...with a copy here. (Bug#62748)
| | | * Fix ff-quiet-mode docBasil L. Contovounesios2023-04-10
| | | | | | | | | | | | | | | | | | | | * lisp/find-file.el (ff-quiet-mode, ff-find-other-file): Say that ff-quiet-mode disables tracing, not the inverse.
| | | * ; Improve documentation of 'match-buffers'Eli Zaretskii2023-04-10
| | | | | | | | | | | | | | | | | | | | | | | | * doc/lispref/buffers.texi (Buffer List): * lisp/subr.el (match-buffers): Fix documentation of 'buffer-match-p' and 'match-buffers'.
| | | * ; Update make-tarball.txt for Emacs 29.Eli Zaretskii2023-04-10
| | | |
| | | * ; Fix ldefs-boot.el.emacs-29.0.90Eli Zaretskii2023-04-10
| | | |
| | | * ; Update ChangeLog.4.Eli Zaretskii2023-04-10
| | | |
| | * | ; Merge from origin/emacs-29Eli Zaretskii2023-04-15
| | |\| | | | | | | | | | | | | | | | | | | | | The following commit was skipped: 5e039d5a6e9 * lisp/ldefs-boot.el: Regenerate.
| | | * * lisp/ldefs-boot.el: Regenerate.Eli Zaretskii2023-04-10
| | | |
| | * | Merge from origin/emacs-29Eli Zaretskii2023-04-15
| | |\| | | | | | | | | | | | | 671abd0cc40 Merge branch 'emacs-29' of git.sv.gnu.org:/srv/git/emacs ...
| | | * Merge branch 'emacs-29' of git.sv.gnu.org:/srv/git/emacs into emacs-29Eli Zaretskii2023-04-10
| | | |\ | | | | | | | | | | | | | | | Pull in latest changes.
| | * | | ; Merge from origin/emacs-29Eli Zaretskii2023-04-15
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | The following commit was skipped: 4bc678ec9f4 Bump Emacs version to 29.0.90
| | | * | Bump Emacs version to 29.0.90Eli Zaretskii2023-04-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * README: * configure.ac: * nt/README.W32: * msdos/sed2v2.inp: Bump version to 29.0.90.
| | * | | Merge from origin/emacs-29Eli Zaretskii2023-04-15
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | db8f207e52f Fix some cases of incomplete code's indentation [c/c++-ts... 589959fb09d project-search: Pipe the list of files through 'file-regu...
| | | * | Fix some cases of incomplete code's indentation [c/c++-ts-mode]Dmitry Gutov2023-04-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lisp/progmodes/c-ts-mode.el (c-ts-base--before-indent): Try to guess when the parse tree is incomplete, and provide a better node to indent against (bug#62717). (c-ts-base-mode): Set up advice for local treesit-indent-function.
| | | * | project-search: Pipe the list of files through 'file-regular-p'Dmitry Gutov2023-04-10
| | | | | | | | | | | | | | | | | | | | | | | | | * lisp/progmodes/project.el (project-search): Pipe the list of files through 'file-regular-p' to skip directories (bug#62735).
| | * | | ; Merge from origin/emacs-29Eli Zaretskii2023-04-15
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | The following commit was skipped: 2b91567bf61 Update ChangeLog and AUTHORS for Emacs 29
| | | * | Update ChangeLog and AUTHORS for Emacs 29Eli Zaretskii2023-04-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * admin/authors.el: Update for Emacs 29. * etc/AUTHORS: Re-generate for Emacs 29. * ChangeLog.4: New generated file. * Makefile.in (PREFERRED_BRANCH): Update to emacs-29. (CHANGELOG_HISTORY_INDEX_MAX): Bump to 4.
| | * | | Merge from origin/emacs-29Eli Zaretskii2023-04-15
| | |\ \ \ | | | | |/ | | | |/| | | | | | d6af1f14982 ; doc/lispref/windows.texi: Fix @pxref paren.
| | | * | ; doc/lispref/windows.texi: Fix @pxref paren.Basil L. Contovounesios2023-04-09
| | | | |