el/dot-emacs.el (mdw-examine-fill-prefixes): Rewrite to be iterative.

Emacs Lisp is hopelessly deficient in terms of control flow, but this
seems like the best choice available.

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index c5742d0f92758f729e75db8d97f014158e666419..5bde8093ff4a476f6b3aee361522b3480ebe765b 100644 (file)
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -1254,12 +1254,17 @@ (defun mdw-examine-fill-prefixes (l)
   "Given a list of dynamic fill prefixes, pick one which matches
 context and return the static fill prefix to use.  Point must be
 at the start of a line, and match data must be saved."
   "Given a list of dynamic fill prefixes, pick one which matches
 context and return the static fill prefix to use.  Point must be
 at the start of a line, and match data must be saved."

-  (cond ((not l) nil)
-       ((looking-at (car (car l)))
-        (mdw-maybe-tabify (apply #'concat
+  (let ((prefix nil))
+    (while (cond ((null l) nil)
+                ((looking-at (caar l))
+                 (setq prefix
+                         (mdw-maybe-tabify
+                          (apply #'concat

                                  (mapcar #'mdw-do-prefix-match
                                          (cdr (car l))))))
                                  (mapcar #'mdw-do-prefix-match
                                          (cdr (car l))))))

-       (t (mdw-examine-fill-prefixes (cdr l)))))
+                 nil))
+      (setq l (cdr l)))
+    prefix))

 
 (defun mdw-choose-dynamic-fill-prefix ()
   "Work out the dynamic fill prefix based on the variable `mdw-fill-prefix'."
 
 (defun mdw-choose-dynamic-fill-prefix ()
   "Work out the dynamic fill prefix based on the variable `mdw-fill-prefix'."