]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from origin/emacs-29
authorEli Zaretskii <eliz@gnu.org>
Sat, 18 Nov 2023 11:07:48 +0000 (06:07 -0500)
committerEli Zaretskii <eliz@gnu.org>
Sat, 18 Nov 2023 11:07:48 +0000 (06:07 -0500)
d9e43f2197f Document changes in 'edmacro-parse-keys'
3327f36ad95 Add 2 SQLite extensions to allow-list.
8d2012024de * test/lisp/net/tramp-tests.el (tramp--test-timeout-handl...

1  2 
lisp/edmacro.el
test/lisp/net/tramp-tests.el

diff --cc lisp/edmacro.el
Simple merge
Simple merge