aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorEli Zaretskii2023-09-23 09:41:02 -0400
committerEli Zaretskii2023-09-23 09:41:02 -0400
commit617c358da75e8cdf6e4c4120cb901a4b0553889b (patch)
tree255bd5bee9cc53784501af959050a40f0218d0ba /java
parenta643d7e85b51e6e1f0a6ddcc9ba70d19ab559492 (diff)
parentc966e7ec381fa32ad09dab4329d5ad27d87b5b98 (diff)
downloademacs-617c358da75e8cdf6e4c4120cb901a4b0553889b.tar.gz
emacs-617c358da75e8cdf6e4c4120cb901a4b0553889b.zip
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
Diffstat (limited to 'java')
0 files changed, 0 insertions, 0 deletions