[elpa] externals/jinx 5f013b89a9 2/2: Minor simplification

[ELPA Syncer]

branch: externals/jinx
commit 5f013b89a94b01395cdb52d592adea403a1f3b97
Author: Daniel Mendler <mail@daniel-mendler.de>
Commit: Daniel Mendler <mail@daniel-mendler.de>

    Minor simplification
---
 README.org |  2 +-
 jinx.el    | 45 +++++++++++++++++++++++----------------------
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/README.org b/README.org
index f1cc05a42a..9ff964348e 100644
--- a/README.org
+++ b/README.org
@@ -110,7 +110,7 @@ more suggestions fit on the screen and enable annotations.
 
 #+begin_src emacs-lisp
 (add-to-list 'vertico-multiform-categories
-             '(jinx grid (vertico-grid-annotate . 25)))
+             '(jinx grid (vertico-grid-annotate . 20)))
 (vertico-multiform-mode 1)
 #+end_src
 
diff --git a/jinx.el b/jinx.el
index b0c7584eb9..40a977bd02 100644
--- a/jinx.el
+++ b/jinx.el
@@ -295,6 +295,7 @@ Predicate may return a position to skip forward.")
 
 ;;;; Declarations for the bytecode compiler
 
+(defvar repeat-mode)
 (defvar jinx-mode)
 (declare-function jinx--mod-check nil)
 (declare-function jinx--mod-add nil)
@@ -816,29 +817,29 @@ With prefix argument GLOBAL change the languages 
globally."
 If prefix argument ALL non-nil correct all misspellings."
   (interactive "*P")
   (unless jinx-mode (jinx-mode 1))
-  (cl-letf (((symbol-function #'jinx--timer-handler) #'ignore) ;; Inhibit
-            (repeat-mode nil) ;; No repeating of jinx-next and jinx-previous
-            (old-point (and (not all) (point-marker))))
+  (cl-letf* (((symbol-function #'jinx--timer-handler) #'ignore) ;; Inhibit
+             (repeat-mode nil) ;; No repeating of jinx-next and jinx-previous
+             (old-point (and (not all) (point-marker)))
+             (overlays
+              (if all
+                  (jinx--force-overlays (point-min) (point-max) :check t)
+                (jinx--force-overlays (window-start) (window-end) :visible t)))
+             (count (length overlays))
+             (idx 0))
+    (when all
+      (push-mark))
     (unwind-protect
-          (let* ((overlays
-                  (if all
-                      (jinx--force-overlays (point-min) (point-max) :check t)
-                    (jinx--force-overlays (window-start) (window-end) :visible 
t)))
-                 (count (length overlays))
-                 (idx 0))
-            (when all
-              (push-mark))
-            (while (when-let ((ov (nth idx overlays)))
-                     (let* ((deleted (not (overlay-buffer ov)))
-                            (skip
-                             (catch 'jinx--goto
-                               (unless deleted
-                                 (jinx--correct
-                                  ov all
-                                  (and all (format " (%d of %d)" (1+ idx) 
count)))))))
-                       (cond
-                        ((integerp skip) (setq idx (mod (+ idx skip) count)))
-                        ((or all deleted) (cl-incf idx)))))))
+        (while (when-let ((ov (nth idx overlays)))
+                 (let* ((deleted (not (overlay-buffer ov)))
+                        (skip
+                         (catch 'jinx--goto
+                           (unless deleted
+                             (jinx--correct
+                              ov all
+                              (and all (format " (%d of %d)" (1+ idx) 
count)))))))
+                   (cond
+                    ((integerp skip) (setq idx (mod (+ idx skip) count)))
+                    ((or all deleted) (cl-incf idx))))))
       (when old-point (goto-char old-point))
       (jinx--in-base-buffer #'jit-lock-refontify))))