masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-04 19:29:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'emacs-29' of git.savannah.gnu.org:/srv/git/emacs into emacs-29

Browse source
This commit is contained in:
Eli Zaretskii 2023-09-19 15:10:58 +03:00
commit a2953ea300
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
etc/NEWS
View file

@ -35,10 +35,10 @@ using 'emacsclient':
Previously, users had to manually configure their GNU/Linux desktop Previously, users had to manually configure their GNU/Linux desktop
environment to open 'org-protocol' links in Emacs. These links should environment to open 'org-protocol' links in Emacs. These links should
now open in Emacs automatically, as the 'emacsclient.desktop' file now now open in Emacs automatically, as the "emacsclient.desktop" file now
arranges for Emacs to be the default application for the 'org-protocol' arranges for Emacs to be the default application for the 'org-protocol'
URI scheme. See the Org mode manual, Info node '(org) Protocols for URI scheme. See the Org mode manual, Info node "(org) Protocols" for
External Access' for more details. more details.
* Changes in Emacs 29.2 * Changes in Emacs 29.2

7
lisp/treesit.el
View file

@ -544,7 +544,12 @@ region."
(when (eq (treesit-parser-language parser) (when (eq (treesit-parser-language parser)
language) language)
(treesit-parser-set-included-ranges (treesit-parser-set-included-ranges
parser set-ranges)))))))) parser (or set-ranges
;; When there's no range for the embedded
;; language, set it's range to a dummy (1
;; . 1), otherwise it would be set to the
;; whole buffer, which is not what we want.
`((,(point-min) . ,(point-min))))))))))))
(defun treesit-parser-range-on (parser beg &optional end) (defun treesit-parser-range-on (parser beg &optional end)
"Check if PARSER's range covers the portion between BEG and END. "Check if PARSER's range covers the portion between BEG and END.