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

[Po Lu]

branch: feature/android
commit ddaca337e3a81e811de6e0f61ed78c414a1986be
Merge: fbc8c2f660f 4b3de748b0b
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>

    Merge remote-tracking branch 'origin/master' into feature/android
---
 lisp/progmodes/eglot.el                                | 3 ++-
 test/lisp/emacs-lisp/eieio-tests/eieio-test-persist.el | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
index 8df2e52b0e7..0140db0c4b3 100644
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@ -231,6 +231,7 @@ chosen (interactively or automatically)."
                                 (erlang-mode . ("erlang_ls" "--transport" 
"stdio"))
                                 ((yaml-ts-mode yaml-mode) . 
("yaml-language-server" "--stdio"))
                                 (nix-mode . ,(eglot-alternatives '("nil" 
"rnix-lsp")))
+                                (nickel-mode . ("nls"))
                                 (gdscript-mode . ("localhost" 6008))
                                 ((fortran-mode f90-mode) . ("fortls"))
                                 (futhark-mode . ("futhark" "lsp"))
@@ -740,7 +741,7 @@ ACTION is an LSP object of either `CodeAction' or `Command' 
type."
      (((Command)) (eglot--request server :workspace/executeCommand action))
      (((CodeAction) edit command)
       (when edit (eglot--apply-workspace-edit edit))
-      (when command (eglot--request server :workspace/executeCommand 
action))))))
+      (when command (eglot--request server :workspace/executeCommand 
command))))))
 
 (cl-defgeneric eglot-initialization-options (server)
   "JSON object to send under `initializationOptions'."
diff --git a/test/lisp/emacs-lisp/eieio-tests/eieio-test-persist.el 
b/test/lisp/emacs-lisp/eieio-tests/eieio-test-persist.el
index 4e5d2f36cf8..4f13881dbd4 100644
--- a/test/lisp/emacs-lisp/eieio-tests/eieio-test-persist.el
+++ b/test/lisp/emacs-lisp/eieio-tests/eieio-test-persist.el
@@ -40,7 +40,7 @@ This is usually a symbol that starts with `:'."
        (car tuple)
       nil)))
 
-(defun hash-equal (hash1 hash2)
+(defun eieio-test--hash-equal (hash1 hash2)
   "Compare two hash tables to see whether they are equal."
   (and (= (hash-table-count hash1)
           (hash-table-count hash2))
@@ -78,7 +78,7 @@ This is usually a symbol that starts with `:'."
        (if initarg-p
            (unless
                (cond ((and (hash-table-p origvalue) (hash-table-p 
fromdiskvalue))
-                      (hash-equal origvalue fromdiskvalue))
+                      (eieio-test--hash-equal origvalue fromdiskvalue))
                      (t (equal origvalue fromdiskvalue)))
              (error "Slot %S Original Val %S != Persistent Val %S"
                     oneslot origvalue fromdiskvalue))
@@ -87,7 +87,7 @@ This is usually a symbol that starts with `:'."
                (diskval fromdiskvalue))
            (unless
                (cond ((and (hash-table-p origval) (hash-table-p diskval))
-                      (hash-equal origval diskval))
+                      (eieio-test--hash-equal origval diskval))
                      (t (equal origval diskval)))
            (error "Slot %S Persistent Val %S != Default Value %S"
                   oneslot diskval origvalue))))))))