master 3edd7f8453d 01/10: Merge from origin/emacs-29

[Eli Zaretskii]

branch: master
commit 3edd7f8453dae19b3da2c6a564769554ae8408a0
Merge: 024432e583d 94bef169e2e
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    Merge from origin/emacs-29
    
    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
---
 lisp/progmodes/java-ts-mode.el |  2 ++
 lisp/shell.el                  |  3 +--
 lisp/simple.el                 | 10 +++++++++-
 lisp/sqlite-mode.el            | 17 +----------------
 4 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/lisp/progmodes/java-ts-mode.el b/lisp/progmodes/java-ts-mode.el
index 99d34789dcc..f2faa1a7e77 100644
--- a/lisp/progmodes/java-ts-mode.el
+++ b/lisp/progmodes/java-ts-mode.el
@@ -99,6 +99,8 @@
      ((parent-is "field_declaration") parent-bol java-ts-mode-indent-offset)
      ((parent-is "return_statement") parent-bol java-ts-mode-indent-offset)
      ((parent-is "variable_declarator") parent-bol java-ts-mode-indent-offset)
+     ((match ">" "type_arguments") parent-bol 0)
+     ((parent-is "type_arguments") parent-bol java-ts-mode-indent-offset)
      ((parent-is "method_invocation") parent-bol java-ts-mode-indent-offset)
      ((parent-is "switch_rule") parent-bol java-ts-mode-indent-offset)
      ((parent-is "switch_label") parent-bol java-ts-mode-indent-offset)
diff --git a/lisp/shell.el b/lisp/shell.el
index 084113c673a..21ffdc63a05 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -327,9 +327,8 @@ and syntax highlighting is set up with `sh-mode'.  In 
addition to
 buffer as the current buffer after its setup is done.  This can
 be used to further customize fontification and other behavior of
 the indirect buffer."
-  :type 'boolean
+  :type 'hook
   :group 'shell
-  :safe 'booleanp
   :version "29.1")
 
 (defcustom shell-highlight-undef-enable nil
diff --git a/lisp/simple.el b/lisp/simple.el
index ef11a5eb4f6..7a05584fc4b 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -5094,7 +5094,15 @@ characters."
     exit-status))
 
 (defun shell-command-to-string (command)
-  "Execute shell command COMMAND and return its output as a string."
+  "Execute shell command COMMAND and return its output as a string.
+Use `shell-quote-argument' to quote dangerous characters in
+COMMAND before passing it as an argument to this function.
+
+Use this function only when a shell interpreter is needed.  In
+other cases, consider alternatives such as `call-process' or
+`process-lines', which do not invoke the shell.  Prefer built-in
+functions like `mv' to the external command \"mv\".  For more
+information, see Info node ‘(elisp)Security Considerations’."
   (with-output-to-string
     (with-current-buffer standard-output
       (shell-command command t))))
diff --git a/lisp/sqlite-mode.el b/lisp/sqlite-mode.el
index 71c9e57fc12..38e9f84b842 100644
--- a/lisp/sqlite-mode.el
+++ b/lisp/sqlite-mode.el
@@ -136,22 +136,7 @@
 
 (defun sqlite-mode--column-names (table)
   "Return a list of the column names for TABLE."
-  (let ((sql
-         (caar
-          (sqlite-select
-           sqlite--db
-           "select sql from sqlite_master where tbl_name = ? AND type = 
'table'"
-           (list table)))))
-    (with-temp-buffer
-      (insert sql)
-      (mapcar #'string-trim
-              (split-string
-               ;; Extract the args to CREATE TABLE.  Point is
-               ;; currently at its end.
-               (buffer-substring
-                (1- (point))                          ; right before )
-                (1+ (progn (backward-sexp) (point)))) ; right after (
-               ",")))))
+  (mapcar (lambda (row) (nth 1 row)) (sqlite-select sqlite--db (format "pragma 
table_info(%s)" table))))
 
 (defun sqlite-mode-list-data ()
   "List the data from the table under point."