[nongnu] elpa/with-simulated-input 1b9123c708 112/134: Cache the return value of wsi-get-unbound-key

[ELPA Syncer]

branch: elpa/with-simulated-input
commit 1b9123c708632a53b00d3ffa7a713167abd9a2d8
Author: Ryan C. Thompson <rct@thompsonclan.org>
Commit: Ryan C. Thompson <rct@thompsonclan.org>

    Cache the return value of wsi-get-unbound-key
---
 tests/test-with-simulated-input.el |  6 ++++--
 with-simulated-input.el            | 33 +++++++++++++++++++++++----------
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/tests/test-with-simulated-input.el 
b/tests/test-with-simulated-input.el
index c2c2f9d646..6931bc09e1 100644
--- a/tests/test-with-simulated-input.el
+++ b/tests/test-with-simulated-input.el
@@ -21,8 +21,10 @@
   (it "should report an error if it fails to find an unbound key"
     ;; Now we call it with an empty list of modifiers and keys to
     ;; search, so it definitely should not find a binding.
-    (expect (wsi-get-unbound-key "" '("abc" "123"))
-            :to-throw 'error)))
+    (expect
+     (let ((wsi-last-used-next-action-bind nil))
+       (wsi-get-unbound-key "" '("abc" "123")))
+     :to-throw 'error)))
 
 (defmacro progn-at-runtime (&rest body)
   "Like `progn', but evaluate BODY entirely at runtime.
diff --git a/with-simulated-input.el b/with-simulated-input.el
index 48b9f8de0c..500c36b2ec 100644
--- a/with-simulated-input.el
+++ b/with-simulated-input.el
@@ -47,6 +47,9 @@
 (require 'files)
 (require 'cl-lib)
 
+(defvar wsi-last-used-next-action-bind nil
+  "Last keybind used by `with-simulated-input', if any.")
+
 (cl-defun wsi-key-bound-p (key)
   "Return non-nil if KEY is bound in any keymap.
 
@@ -85,21 +88,31 @@ modifier combinations, e.g.:
     '(\"C-\" \"M-\" \"C-M-\")
 
 for control, meta, or both. KEYS is a string containing all keys
-to check."
+to check.
+
+When this function returns, it also sets
+`wsi-last-used-next-action-bind' to the return value. The next
+time it is called, it checks this variable to see if it is still
+usable, and returns it if so, even if it isn't a valid choice
+given the value of MODIFIERS and KEYS."
   (declare (advertised-calling-convention (&optional modifiers keys) nil))
   (when (stringp modifiers)
     (setq modifiers (list modifiers)))
   (when (listp keys)
     (setq keys (apply #'concat keys)))
-  (cl-loop
-   named findkey
-   for modifier in modifiers
-   do (cl-loop
-       for char across keys
-       for bind = (concat modifier (string char))
-       when (not (wsi-key-bound-p bind))
-       do (cl-return-from findkey bind))
-   finally do (error "Could not find an unbound key with the specified 
modifiers")))
+  (if (and wsi-last-used-next-action-bind
+           (not (wsi-key-bound-p wsi-last-used-next-action-bind)))
+      wsi-last-used-next-action-bind
+    (cl-loop
+     named findkey
+     for modifier in modifiers
+     do (cl-loop
+         for char across keys
+         for bind = (concat modifier (string char))
+         when (not (wsi-key-bound-p bind))
+         do (cl-return-from findkey
+              (setq wsi-last-used-next-action-bind bind)))
+     finally do (error "Could not find an unbound key with the specified 
modifiers"))))
 
 ;;;###autoload
 (defun with-simulated-input-1 (main &rest keys)