Merge remote-tracking branch 'origin/master' into feature/android

6 files changed, 48 insertions, 10 deletions

diff --git a/lisp/dynamic-setting.el b/lisp/dynamic-setting.el
index 9ce09657345..ebe25ab9c75 100644
--- a/lisp/dynamic-setting.el
+++ b/lisp/dynamic-setting.el
@@ -33,6 +33,7 @@
 ;;; Customizable variables
 
 (declare-function font-get-system-font "xsettings.c" ())
+(declare-function reconsider-frame-font "frame.c" ())
 
 (defvar font-use-system-font)
 
diff --git a/lisp/files.el b/lisp/files.el
index ada37d2e9e5..9fdae107068 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -681,7 +681,8 @@ The command \\[normal-mode], when used interactively,
 always obeys file local variable specifications and the -*- line,
 and ignores this variable.
 
-Also see the `permanently-enabled-local-variables' variable."
+Also see the `permanently-enabled-local-variables' and
+`safe-local-variable-directories' variables."
   :risky t
   :type '(choice (const :tag "Query Unsafe" t)
                  (const :tag "Safe Only" :safe)
@@ -3696,6 +3697,18 @@ variable to set.")
   "A list of file-local variables that are always enabled.
 This overrides any `enable-local-variables' setting.")
 
+(defcustom safe-local-variable-directories '()
+  "A list of directories where local variables are always enabled.
+Directory-local variables loaded from these directories, such as the
+variables in .dir-locals.el, will be enabled even if they are risky.
+The names of the directories in the list must be absolute, and must
+end in a slash.  Remote directories can be included if the
+variable `enable-remote-dir-locals' is non-nil."
+  :version "30.1"
+  :type '(repeat string)
+  :risky t
+  :group 'find-file)
+
 (defun hack-local-variables-confirm (all-vars unsafe-vars risky-vars dir-name)
   "Get confirmation before setting up local variable values.
 ALL-VARS is the list of all variables to be set up.
@@ -3734,7 +3747,11 @@ n  -- to ignore the local variables list.")
 !  -- to apply the local variables list, and permanently mark these
       values (*) as safe (in the future, they will be set automatically.)
 i  -- to ignore the local variables list, and permanently mark these
-      values (*) as ignored\n\n")
+      values (*) as ignored"
+                    (if dir-name "
++  -- to apply the local variables list, and trust all directory-local
+      variables in this directory\n\n"
+                      "\n\n"))
           (insert "\n\n"))
         (dolist (elt all-vars)
           (cond ((member elt unsafe-vars)
@@ -3758,7 +3775,11 @@ i  -- to ignore the local variables list, and permanently mark these
         (pop-to-buffer buf '(display-buffer--maybe-at-bottom))
         (let* ((exit-chars '(?y ?n ?\s))
                (prompt (format "Please type %s%s: "
-                               (if offer-save "y, n, ! or i" "y or n")
+                               (if offer-save
+                                   (if dir-name
+                                       "y, n, !, i, +"
+                                     "y, n, !, i")
+                                 "y or n")
                                (if (< (line-number-at-pos (point-max))
                                       (window-body-height))
                                    ""
@@ -3766,8 +3787,13 @@ i  -- to ignore the local variables list, and permanently mark these
                char)
           (when offer-save
             (push ?i exit-chars)
-            (push ?! exit-chars))
+            (push ?! exit-chars)
+            (when dir-name
+              (push ?+ exit-chars)))
           (setq char (read-char-choice prompt exit-chars))
+          (when (and offer-save dir-name (= char ?+))
+            (customize-push-and-save 'safe-local-variable-directories
+                                     (list dir-name)))
           (when (and offer-save
                      (or (= char ?!) (= char ?i))
                      unsafe-vars)
@@ -3776,7 +3802,7 @@ i  -- to ignore the local variables list, and permanently mark these
                  'safe-local-variable-values
                'ignored-local-variable-values)
              unsafe-vars))
-          (prog1 (memq char '(?! ?\s ?y))
+          (prog1 (memq char '(?! ?\s ?y ?+))
             (quit-window t)))))))
 
 (defconst hack-local-variable-regexp
@@ -3908,6 +3934,7 @@ DIR-NAME is the name of the associated directory.  Otherwise it is nil."
                   (null unsafe-vars)
                   (null risky-vars))
              (memq enable-local-variables '(:all :safe))
+             (member dir-name safe-local-variable-directories)
              (hack-local-variables-confirm all-vars unsafe-vars
                                            risky-vars dir-name))
          (dolist (elt all-vars)
diff --git a/lisp/net/soap-client.el b/lisp/net/soap-client.el
index e4b8bbd9cb5..866b33decc6 100644
--- a/lisp/net/soap-client.el
+++ b/lisp/net/soap-client.el
@@ -5,7 +5,7 @@
 ;; Author: Alexandru Harsanyi <AlexHarsanyi@gmail.com>
 ;; Author: Thomas Fitzsimmons <fitzsim@fitzsim.org>
 ;; Created: December, 2009
-;; Version: 3.2.1
+;; Version: 3.2.2
 ;; Keywords: soap, web-services, comm, hypermedia
 ;; Package: soap-client
 ;; URL: https://github.com/alex-hhh/emacs-soap-client
@@ -717,9 +717,12 @@ representing leap seconds."
                 second)
               minute hour day month year second-fraction datatype time-zone)
       (let ((time
-             (encode-time (list
-                           (if new-decode-time new-decode-time-second second)
-                           minute hour day month year nil nil time-zone))))
+             ;; Continue calling encode-time the old way, for backward
+             ;; compatibility in GNU ELPA.
+             (apply
+              #'encode-time (list
+                             (if new-decode-time new-decode-time-second second)
+                             minute hour day month year nil nil time-zone))))
         (if new-decode-time
             (with-no-warnings (decode-time time nil t))
           (decode-time time))))))
@@ -946,7 +949,7 @@ This is a specialization of `soap-encode-attributes' for
    (t nil)))
 
 (defun soap-type-is-array? (type)
-  "Return t if TYPE defines an ARRAY."
+  "Return t if TYPE is an ARRAY."
   (and (soap-xs-complex-type-p type)
        (eq (soap-xs-complex-type-indicator type) 'array)))
 
diff --git a/lisp/progmodes/prog-mode.el b/lisp/progmodes/prog-mode.el
index 7a53399ad14..16497097061 100644
--- a/lisp/progmodes/prog-mode.el
+++ b/lisp/progmodes/prog-mode.el
@@ -36,6 +36,7 @@
 (declare-function treesit-available-p "treesit.c")
 (declare-function treesit-parser-list "treesit.c")
 (declare-function treesit-node-type "treesit.c")
+(declare-function treesit-node-at "treesit.c")
 
 (defgroup prog-mode nil
   "Generic programming mode, from which others derive."
diff --git a/lisp/term/haiku-win.el b/lisp/term/haiku-win.el
index ae5a2f2fc6b..50c9cb5b9d4 100644
--- a/lisp/term/haiku-win.el
+++ b/lisp/term/haiku-win.el
@@ -36,6 +36,9 @@
 (require 'menu-bar)
 (require 'fontset)
 (require 'dnd)
+;; For when building a --without-x configuration, where this is not
+;; preloaded.
+(eval-when-compile (require 'mwheel))
 
 (add-to-list 'display-format-alist '(".*" . haiku))
 
diff --git a/lisp/x-dnd.el b/lisp/x-dnd.el
index acfbbed9677..b87fc97f8fd 100644
--- a/lisp/x-dnd.el
+++ b/lisp/x-dnd.el
@@ -31,6 +31,9 @@
 ;;; Code:
 
 (require 'dnd)
+;; For when building a --without-x configuration, where this is not
+;; preloaded.
+(eval-when-compile (require 'mwheel))
 
 ;;; Customizable variables
 (defcustom x-dnd-test-function #'x-dnd-default-test-function