]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e6dd64a 4776d90)
Merge from origin/emacs-29
authorEli Zaretskii <eliz@gnu.org>
Sat, 30 Sep 2023 17:50:07 +0000 (13:50 -0400)
committerEli Zaretskii <eliz@gnu.org>
Sat, 30 Sep 2023 17:50:07 +0000 (13:50 -0400)
commit46978fa1eff286ea15248ee358fe62608ca070c5
treea9cce889b60229e11006585e276a018719e5fdadtree | snapshot
parente6dd64aaba55b93340de1d7e0d6783da6de2af2fcommit | diff
parent4776d90c31b3d5bc4117ca7ecde95444adf402accommit | diff
Merge from origin/emacs-29

4776d90c31b Add new Tramp test
ca5b48fd76d Fix tmm-mid-prompt :type (Bug#66179)
7447d3df94e Fix tree-sitter indentation conflict with multiple languages
bee18e52737 Fix bug#66093 in Tramp
7d5fee0feaa Support regeneration of ja-dic.el under '--with-small-ja-...

Conflicts:
make-dist
.gitignore diff1 | diff2 | blob | history
java/org/gnu/emacs/EmacsDesktopNotification.java diff1 | | blob | history
lisp/international/ja-dic-cnv.el diff1 | diff2 | blob | history
lisp/net/tramp-sshfs.el diff1 | diff2 | blob | history
lisp/net/tramp.el diff1 | diff2 | blob | history
lisp/treesit.el diff1 | diff2 | blob | history
make-dist diff1 | diff2 | blob | history
test/lisp/net/tramp-tests.el diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.