* mime-def.el (mime-library-version-string): bump up to FLAM-DOODLE 1.9.1.

[elisp/flim.git] / ew-scan-u.el

diff --git a/ew-scan-u.el b/ew-scan-u.el
index 04137c2..e02fbf6 100644 (file)
--- a/ew-scan-u.el
+++ b/ew-scan-u.el
@@ -8,28 +8,38 @@
   `(let ((res (ew-make-anchor col str))
         (p 0)
         (q (length str))
-        r)
+        r
+        type)
      (while (< p q)
        (setq r p)
-       (,scan
-        str p q
-        ([" \t"] (ew-add-frag res r p 'ew:us-wsp-tok))
-        (((* [^ " \t\r"]) (* (+ ?\r) [^ " \t\r\n"] (* [^ " \t\r"])) (* ?\r)
-         (?\r ?\n [" \t"]))
-        (when (< r (- p 3))
-          (ew-add-frag res r (- p 3) 'ew:us-texts-tok)
-          (setq r (- p 3)))
-         (ew-add-frag res r p 'ew:us-fold-tok))
-        (((* [^ " \t\r"]) (* (+ ?\r) [^ " \t\r\n"] (* [^ " \t\r"])) (* ?\r)
-         (?\r ?\n [^ " \t"]))
-        (when (< r (- p 3))
-          (ew-add-frag res r (- p 3) 'ew:us-texts-tok)
-          (setq r (- p 3)))
-         (ew-add-frag res r (setq p q) 'ew:err-tok))
-        (((* [^ " \t\r"]) (* (+ ?\r) [^ " \t\r\n"] (* [^ " \t\r"])) (* ?\r))
-        (if (< r p)
-            (ew-add-frag res r p 'ew:us-texts-tok)
-          (ew-add-frag res r (setq p q) 'ew:err-tok)))))
+       (setq
+       type
+       (,scan
+        str p q
+        ([" \t"] 'ew:us-wsp-tok)
+        (((* [^ " \t\r"])
+          (* (+ ?\r) [^ " \t\r\n"] (* [^ " \t\r"]))
+          (* ?\r)
+          (?\r ?\n [" \t"]))
+         (when (< r (- p 3))
+           (ew-add-frag res r (- p 3) 'ew:us-texts-tok)
+           (setq r (- p 3)))
+         'ew:us-fold-tok)
+        (((* [^ " \t\r"])
+          (* (+ ?\r) [^ " \t\r\n"] (* [^ " \t\r"]))
+          (* ?\r)
+          (?\r ?\n [^ " \t"]))
+         (when (< r (- p 3))
+           (ew-add-frag res r (- p 3) 'ew:us-texts-tok)
+           (setq r (- p 3)))
+         (setq p q) 'ew:err-tok)
+        (((* [^ " \t\r"])
+          (* (+ ?\r) [^ " \t\r\n"] (* [^ " \t\r"]))
+          (* ?\r))
+         (if (< r p)
+             'ew:us-texts-tok
+           (progn (setq p q) 'ew:err-tok)))))
+       (ew-add-frag res r p type))
      (ew-terminate res)
      res))