diff --git a/etc/NEWS b/etc/NEWS index 2aa1f148f90..1b3532b5657 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -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 diff --git a/lisp/treesit.el b/lisp/treesit.el index 41ebc62fca6..8163ffdf329 100644 --- a/lisp/treesit.el +++ b/lisp/treesit.el @@ -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.