procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from origin/emacs-29

Browse source 
c966e7ec38 * lisp/net/tramp.el (tramp-skeleton-write-region): Fix mi...
a2953ea300 Merge branch 'emacs-29' of git.savannah.gnu.org:/srv/git/...
5cba5ee890 Fix tree-sitter range update function
41333cb2d5 ; * etc/NEWS: Fix typos.
a3a9ed40d8 ; * CONTRIBUTE: Clarify "mark" wrt NEWS entries.  (Bug#66...
0a6a9ac6f1 ; * etc/NEWS: Fix last change.
5611274bbd Announce handling 'org-protocol' URI scheme in NEWS

# Conflicts:
#	lisp/treesit.el
This commit is contained in:
Eli Zaretskii 2023-09-23 09:41:02 -04:00
commit 617c358da7
4 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CONTRIBUTE
View file

@ -120,9 +120,9 @@ Emacs version in which they will appear. Likewise with defcustom's
whose value is changed -- update their ':version' tag.
Think about whether your change requires updating the manuals. If you
know it does not, mark the NEWS entry with "---". If you know
that *all* the necessary documentation updates have been made as part
of your changes or those by others, mark the entry with "+++".
know it does not, mark the NEWS entry with "---" before the entry. If
you know that *all* the necessary documentation updates have been made
as part of your changes or those by others, mark the entry with "+++".
Otherwise, do not mark it.
If your change requires updating the manuals to document new

13
etc/NEWS
View file

@ -44,6 +44,19 @@ ALSA on these operating systems instead.
* Startup Changes in Emacs 30.1
** On GNU/Linux, Emacs is now the default application for 'org-protocol'.
Org mode provides a way to quickly capture bookmarks, notes, and links
using 'emacsclient':
emacsclient "org-protocol://store-link?url=URL&title=TITLE"
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
arranges for Emacs to be the default application for the 'org-protocol'
URI scheme. See the Org mode manual, Info node "(org) Protocols" for
more details.
* Changes in Emacs 30.1

2
lisp/net/tramp.el
View file

@ -3522,7 +3522,7 @@ BODY is the backend specific code."
(let ((inhibit-file-name-handlers
`(tramp-file-name-handler
tramp-crypt-file-name-handler
. inhibit-file-name-handlers))
. ,inhibit-file-name-handlers))
(inhibit-file-name-operation 'write-region))
(find-file-name-handler ,visit 'write-region))))
;; We use this to save the value of

9
lisp/treesit.el
View file

@ -716,8 +716,13 @@ region."
old-ranges new-ranges beg end)
(point-min) (point-max))))
(dolist (parser (treesit-parser-list nil language))
(treesit-parser-set-included-ranges
parser set-ranges))))))))
(treesit-parser-set-included-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.