]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a643d7e c966e7e)
Merge from origin/emacs-29
authorEli Zaretskii <eliz@gnu.org>
Sat, 23 Sep 2023 13:41:02 +0000 (09:41 -0400)
committerEli Zaretskii <eliz@gnu.org>
Sat, 23 Sep 2023 13:41:02 +0000 (09:41 -0400)
commit617c358da75e8cdf6e4c4120cb901a4b0553889b
tree255bd5bee9cc53784501af959050a40f0218d0batree | snapshot
parenta643d7e85b51e6e1f0a6ddcc9ba70d19ab559492commit | diff
parentc966e7ec381fa32ad09dab4329d5ad27d87b5b98commit | diff
Merge from origin/emacs-29

c966e7ec381 * lisp/net/tramp.el (tramp-skeleton-write-region): Fix mi...
a2953ea3003 Merge branch 'emacs-29' of git.savannah.gnu.org:/srv/git/...
5cba5ee8905 Fix tree-sitter range update function
41333cb2d5f ; * etc/NEWS: Fix typos.
a3a9ed40d89 ; * CONTRIBUTE: Clarify "mark" wrt NEWS entries.  (Bug#66...
0a6a9ac6f14 ; * etc/NEWS: Fix last change.
5611274bbda Announce handling 'org-protocol' URI scheme in NEWS

# Conflicts:
# lisp/treesit.el
CONTRIBUTE diff1 | diff2 | blob | history
etc/NEWS diff1 | diff2 | blob | history
lisp/net/tramp.el diff1 | diff2 | blob | history
lisp/treesit.el diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.