]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from origin/emacs-29
authorEli Zaretskii <eliz@gnu.org>
Sat, 23 Sep 2023 13:32:56 +0000 (09:32 -0400)
committerEli Zaretskii <eliz@gnu.org>
Sat, 23 Sep 2023 13:32:56 +0000 (09:32 -0400)
94bef169e2e Document shell-command-to-string security considerations
b74d9e8bad9 Fix shell-indirect-setup-hook :type (Bug#66051)
f549d4330f3 Remove column quoting from sqlite-mode
cf7efabe3ff Add indentation rules for type_arguments

1  2 
lisp/progmodes/java-ts-mode.el
lisp/shell.el
lisp/simple.el

Simple merge
diff --cc lisp/shell.el
Simple merge
diff --cc lisp/simple.el
Simple merge