master 1d0e3030ff2 9/9: Merge from origin/emacs-29

[Eli Zaretskii]

branch: master
commit 1d0e3030ff228948477ee3ba6bd289476269a020
Merge: e5e35a2be6c d9e43f2197f
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    Merge from origin/emacs-29
    
    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...
---
 lisp/edmacro.el              | 13 ++++++++++---
 src/sqlite.c                 |  2 ++
 test/lisp/net/tramp-tests.el | 10 ++++++----
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/lisp/edmacro.el b/lisp/edmacro.el
index 232ef767b45..28d210f7780 100644
--- a/lisp/edmacro.el
+++ b/lisp/edmacro.el
@@ -252,14 +252,14 @@ With a prefix argument, format the macro in a more 
concise way."
 ;;;###autoload
 (defun read-kbd-macro (start &optional end)
   "Read the region as a keyboard macro definition.
-The region is interpreted as spelled-out keystrokes, e.g., \"M-x abc RET\".
-See documentation for `edmacro-mode' for details.
+The region between START and END is interpreted as spelled-out keystrokes,
+e.g., \"M-x abc RET\".  See documentation for `edmacro-mode' for details.
 Leading/trailing \"C-x (\" and \"C-x )\" in the text are allowed and ignored.
 The resulting macro is installed as the \"current\" keyboard macro.
 
 In Lisp, may also be called with a single STRING argument in which case
 the result is returned rather than being installed as the current macro.
-The result will be a string if possible, otherwise an event vector.
+The result is a vector of input events.
 Second argument NEED-VECTOR means to return an event vector always."
   (interactive "r")
   (if (stringp start)
@@ -763,6 +763,13 @@ This function assumes that the events can be stored in a 
string."
 
 (defun edmacro-parse-keys (string &optional _need-vector)
   (let ((result (kbd string)))
+    ;; Always return a vector.  Stefan Monnier <monnier@iro.umontreal.ca>
+    ;; writes: "I want to eliminate the use of strings that stand for a
+    ;; sequence of events because it does nothing more than leave latent
+    ;; bugs and create confusion (between the strings used as input to
+    ;; `read-kbd-macro' and the strings that used to be output by
+    ;; `read-kbd-macro'), while increasing the complexity of the rest of
+    ;; the code which has to handle both vectors and strings."
     (if (stringp result)
         (seq-into result 'vector)
       result)))
diff --git a/src/sqlite.c b/src/sqlite.c
index fd528f2b0d5..7135cc672bc 100644
--- a/src/sqlite.c
+++ b/src/sqlite.c
@@ -716,7 +716,9 @@ Only modules on Emacs' list of allowed modules can be 
loaded.  */)
     "rtree",
     "sha1",
     "uuid",
+    "vector0",
     "vfslog",
+    "vss0",
     "zipfile",
     NULL
   };
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index a2460686e96..726403f193c 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -4881,6 +4881,7 @@ This tests also `make-symbolic-link', `file-truename' and 
`add-name-to-file'."
                (if (tramp--test-expensive-test-p)
                    ;; It doesn't work for `initials' and `shorthand'
                    ;; completion styles.  Should it?
+                  ;; `orderless' passes the tests, but it is an ELPA package.
                    '(emacs21 emacs22 basic partial-completion substring flex)
                 '(basic)))
 
@@ -5193,10 +5194,11 @@ This tests also `make-symbolic-link', `file-truename' 
and `add-name-to-file'."
 (defun tramp--test-timeout-handler (&rest _ignore)
   "Timeout handler, reporting a failed test."
   (interactive)
-  (let ((proc (get-buffer-process (current-buffer))))
-    (when (processp proc)
-      (tramp--test-message
-       "cmd: %s\nbuf:\n%s\n---" (process-command proc) (buffer-string))))
+  (tramp--test-message "proc: %s" (get-buffer-process (current-buffer)))
+  (when-let ((proc (get-buffer-process (current-buffer)))
+            ((processp proc)))
+    (tramp--test-message "cmd: %s" (process-command proc)))
+  (tramp--test-message "buf: %s\n%s\n---" (current-buffer) (buffer-string))
   (ert-fail (format "`%s' timed out" (ert-test-name (ert-running-test)))))
 
 (ert-deftest tramp-test29-start-file-process ()