[nongnu] elpa/evil a9a9c65b5d 08/10: Misc minor changes

[ELPA Syncer]

branch: elpa/evil
commit a9a9c65b5d0777048c4e8a66fcc06032e3dafc18
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Tom Dalziel <tom_dl@hotmail.com>

    Misc minor changes
    
    * README.md: Mention that `undo-fu` is also in NonGNU ELPA and update
    its repository URL.
    * evil.el: Update the undo-fu repository URL.
    * evil-macros.el (evil-define-interactive-code): Move the insertion of
    quote around `func` to the `cond` so the `quote` is not incorrectly
    added around lambda forms.
    * evil-tests.el: Add a FIXME.
    * evil-commands.el (evil-save-side-windows): Silence spurious warning.
---
 README.md        | 9 +++++----
 evil-commands.el | 5 ++++-
 evil-core.el     | 2 +-
 evil-macros.el   | 4 ++--
 evil-tests.el    | 4 ++++
 evil.el          | 2 +-
 6 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 198b18317c..02215faf2a 100644
--- a/README.md
+++ b/README.md
@@ -44,10 +44,8 @@ file.
 
 * Evil requires any of the following for `C-r`:
   * `undo-redo` from Emacs 28
-  * The [undo-tree](https://gitlab.com/tsc25/undo-tree) package
-    (available via GNU ELPA)
-  * The [undo-fu](https://gitlab.com/ideasman42/emacs-undo-fu) package
-    (available via MELPA)
+  * The [undo-tree] package (available via GNU ELPA)
+  * The [undo-fu] package (available via MELPA and NonGNU ELPA)
 
 * For the motions `g;` `g,` and for the last-change-register `.`, Evil
   requires the [goto-chg.el](https://github.com/emacs-evil/goto-chg)
@@ -80,3 +78,6 @@ Visit us on `irc.libera.chat #evil-mode`.
 See
 
[CONTRIBUTING.md](https://github.com/emacs-evil/evil/blob/master/CONTRIBUTING.md)
 for guidelines for issues and pull requests.
+
+[undo-tree]: https://gitlab.com/tsc25/undo-tree
+[undo-fu]: https://codeberg.org/ideasman42/emacs-undo-fu
diff --git a/evil-commands.el b/evil-commands.el
index 8d3db3db7d..40a01320e5 100644
--- a/evil-commands.el
+++ b/evil-commands.el
@@ -4451,8 +4451,11 @@ The \"!\" argument means to sort in reverse order."
   "Toggle side windows, evaluate BODY, restore side windows."
   (declare (indent defun) (debug (&rest form)))
   (let ((sides (make-symbol "sidesvar")))
-    `(let ((,sides (and (functionp 'window-toggle-side-windows)
+    `(let ((,sides (and (fboundp 'window-toggle-side-windows)
                         (window-with-parameter 'window-side))))
+       ;; The compiler doesn't understand that all uses are protected
+       ;; by `fboundp' :-(
+       (declare-function window-toggle-side-windows "window")
        (when ,sides
          (window-toggle-side-windows))
        (unwind-protect
diff --git a/evil-core.el b/evil-core.el
index 2f9a57568c..22b665406a 100644
--- a/evil-core.el
+++ b/evil-core.el
@@ -127,7 +127,7 @@
         (add-hook 'input-method-activate-hook #'evil-activate-input-method t t)
         (add-hook 'input-method-deactivate-hook #'evil-deactivate-input-method 
t t)
         (add-hook 'activate-mark-hook 'evil-visual-activate-hook nil t)
-        ;; FIXME: Add these hooks buffer-locally
+        ;; FIXME: Add these hooks buffer-locally and remove when disabling
         (add-hook 'pre-command-hook 'evil-repeat-pre-hook)
         (add-hook 'post-command-hook 'evil-repeat-post-hook))
     (evil-refresh-mode-line)
diff --git a/evil-macros.el b/evil-macros.el
index 90ae28bef0..1a60051e6d 100644
--- a/evil-macros.el
+++ b/evil-macros.el
@@ -746,10 +746,10 @@ via KEY-VALUE pairs. BODY should evaluate to a list of 
values.
                    `(lambda ,args
                       ,@(when doc `(,doc))
                       ,@body)
-                 (macroexp-progn body))))
+                 `',(macroexp-progn body))))
     `(eval-and-compile
        (evil--add-to-alist
-        evil-interactive-alist ,code (cons ',func ',properties))
+        evil-interactive-alist ,code (cons ,func ',properties))
        ,code)))
 
 ;;; Highlighting
diff --git a/evil-tests.el b/evil-tests.el
index 7d8bc9d547..cacc1b52bb 100644
--- a/evil-tests.el
+++ b/evil-tests.el
@@ -61,11 +61,15 @@
 ;;
 ;; This file is NOT part of Evil itself.
 
+;; FIXME: Merely loading an ELisp file should not change Emacs's config!
 (setq load-prefer-newer t)
 
 (require 'cl-lib)
 (require 'elp)
 (require 'ert)
+;; Load non-compiled `evil-ex'. (It defines `evil-parser' - which is
+;; needed by `evil-test-parser' - only inside an `eval-when-compile'.)
+(require 'evil-ex "evil-ex.el")
 (require 'evil)
 (require 'evil-digraphs)
 (require 'evil-test-helpers)
diff --git a/evil.el b/evil.el
index 61089a4c29..e5d7e45991 100644
--- a/evil.el
+++ b/evil.el
@@ -114,7 +114,7 @@
 ;; Evil requires undo-redo (Emacs 28), undo-fu or undo-tree for redo
 ;; functionality.  Otherwise, Evil uses regular Emacs undo.
 ;;
-;;     https://gitlab.com/ideasman42/emacs-undo-fu
+;;     https://codeberg.org/ideasman42/emacs-undo-fu
 ;;     https://melpa.org/#/undo-fu
 ;;     https://gitlab.com/tsc25/undo-tree
 ;;     https://elpa.gnu.org/packages/undo-tree.html