(eword-decode-version): Use `mime-module-version' instead of

[elisp/semi.git] / eword-decode.el

diff --git a/eword-decode.el b/eword-decode.el
index f7a0450..6d86b00 100644 (file)
--- a/eword-decode.el
+++ b/eword-decode.el
@@ -40,7 +40,7 @@
   :group 'mime)
 
 (defconst eword-decode-version
-  `,(mapconcat #'number-to-string (cdr semi-version) "."))
+  `,(mapconcat #'number-to-string (cddr mime-module-version) "."))
 
 
 ;;; @ MIME encoded-word definition
@@ -454,7 +454,7 @@ be the result."
                          (null (setq r (funcall func string must-unfold)))
                          )
                (setq rest (cdr rest)))
-             (or r '((error) . ""))
+             (or r `((error . ,string) . ""))
              ))
       (setq dest (cons (car ret) dest))
       (setq string (cdr ret))
@@ -508,11 +508,11 @@ such as a version of Net$cape)."
       (setq max-column fill-column))
   (let ((c start-column)
        (tokens (eword-lexical-analyze string must-unfold))
-       (result ""))
-    (while tokens
-      (let* ((token (car tokens))
-            (type (car token)))
-       (setq tokens (cdr tokens))
+       (result "")
+       token)
+    (while (and (setq token (car tokens))
+               (setq tokens (cdr tokens)))
+      (let* ((type (car token)))
        (if (eq type 'spaces)
            (let* ((next-token (car tokens))
                   (next-str (eword-decode-token next-token))
@@ -529,7 +529,9 @@ such as a version of Net$cape)."
            (setq result (concat result str)
                  c (+ c (string-width str)))
            ))))
-    result))
+    (if token
+       (concat result (eword-decode-token token))
+      result)))
 
 (defun eword-decode-and-unfold-structured-field (string)
   "Decode and unfold STRING as structured field body.