X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=ew-scan-u.el;h=92c240fac41c6d37c3688e8ef2e4a6e82d03b778;hb=955b92b07f71c449e9ff8f2b49b7e12408527cec;hp=e02fbf64f2ab32b02552ec0fc959d3618776ac8b;hpb=b3e2c1ff1d03652370fe0d286f4669c5058b1f1b;p=elisp%2Fflim.git

diff --git a/ew-scan-u.el b/ew-scan-u.el
index e02fbf6..92c240f 100644
--- a/ew-scan-u.el
+++ b/ew-scan-u.el
@@ -16,29 +16,29 @@
 	type
 	(,scan
 	 str p q
-	 ([" \t"] 'ew:us-wsp-tok)
+	 ([" \t"] 'ew:us-wsp)
 	 (((* [^ " \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)
+	    (ew-add-frag res r (- p 3) 'ew:us-texts)
 	    (setq r (- p 3)))
-	  'ew:us-fold-tok)
+	  'ew:us-fold)
 	 (((* [^ " \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)
+	    (ew-add-frag res r (- p 3) 'ew:us-texts)
 	    (setq r (- p 3)))
-	  (setq p q) 'ew:err-tok)
+	  (setq p q) 'ew:*err*)
 	 (((* [^ " \t\r"])
 	   (* (+ ?\r) [^ " \t\r\n"] (* [^ " \t\r"]))
 	   (* ?\r))
 	  (if (< r p)
-	      'ew:us-texts-tok
-	    (progn (setq p q) 'ew:err-tok)))))
+	      'ew:us-texts
+	    (progn (setq p q) 'ew:*err*)))))
        (ew-add-frag res r p type))
      (ew-terminate res)
      res))