Use while-let more

magit · May 6, 2024 · b6c9286 · b6c9286
1 parent ea0d30d
commit b6c9286
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/lisp/git-commit.el b/lisp/git-commit.el
@@ -1256,8 +1256,8 @@ Added to `font-lock-extend-region-functions'."
                  (font-lock-ensure)
                (with-no-warnings
                  (font-lock-fontify-buffer))))
-           (let (next (pos (point-min)))
-             (while (setq next (next-single-property-change pos 'face))
+           (let ((pos (point-min)))
+             (while-let ((next (next-single-property-change pos 'face)))
                (put-text-property pos next 'font-lock-face
                                   (get-text-property pos 'face))
                (setq pos next))

diff --git a/lisp/magit-diff.el b/lisp/magit-diff.el
@@ -1363,10 +1363,9 @@ for a revision."
                                  (and (cl-typep section 'magit-file-section)
                                       (equal (oref section value) file)))
                                (oref (or parent magit-root-section) children))))
-    (let ((hunk nil)
-          (hunks (oref diff children)))
+    (let ((hunks (oref diff children)))
       (cl-block nil
-        (while (setq hunk (pop hunks))
+        (while-let ((hunk (pop hunks)))
           (when-let ((range (oref hunk to-range)))
             (pcase-let* ((`(,beg ,len) range)
                          (end (+ beg len)))