]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from origin/emacs-29
authorEli Zaretskii <eliz@gnu.org>
Sat, 23 Sep 2023 13:32:57 +0000 (09:32 -0400)
committerEli Zaretskii <eliz@gnu.org>
Sat, 23 Sep 2023 13:32:57 +0000 (09:32 -0400)
6bc3800000c Ensure ucs-names is consistent with Unicode names
93134bb9c2f Make key-translate actually work
85f49a9bc8b Update to Org 9.6.9
2826c26537c Add leim subdirectories to emacs package

1  2 
lisp/finder.el
lisp/international/mule-cmds.el
lisp/org/org.el

diff --cc lisp/finder.el
Simple merge
Simple merge
diff --cc lisp/org/org.el
Simple merge