1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-24 07:20:37 +00:00

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

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

View File

@ -35,10 +35,10 @@ using 'emacsclient':
Previously, users had to manually configure their GNU/Linux desktop
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'
URI scheme. See the Org mode manual, Info node '(org) Protocols for
External Access' for more details.
URI scheme. See the Org mode manual, Info node "(org) Protocols" for
more details.
* Changes in Emacs 29.2

View File

@ -544,7 +544,12 @@ region."
(when (eq (treesit-parser-language parser)
language)
(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)
"Check if PARSER's range covers the portion between BEG and END.