(utf-7-encode): Never skip the trailing - for the `imap' variant.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 341702e7c8a30367baf0affb280d724b26028b5e..bbeb08782ba215b908ff65ca558d7d6bc990f146 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-28  Daiki Ueno  <ueno@unixuser.org>
+
+       * international/utf-7.el (utf-7-encode): Never skip the trailing - for
+       the `imap' variant.
+
 2008-02-27  Juanma Barranquero  <lekktu@gmail.com>
 
        * uniquify.el (uniquify-buffer-base-name): If the base name is an

diff --git a/lisp/international/utf-7.el b/lisp/international/utf-7.el
index 4076c5742660280497a77b05dfe68f67caed7de1..f523c311787f8e5540c51aee931a9342cf24613a 100644 (file)
--- a/lisp/international/utf-7.el
+++ b/lisp/international/utf-7.el
@@ -126,7 +126,9 @@ ESC and SKIP-CHARS are adjusted for the normal and IMAP versions."
              ;; consistent with iconv, at least regarding `='.
              (skip-chars-forward "^= \t\n")
              (delete-region (point) (point-max))))
-         (unless (eobp)
+          ;; RFC2060 stipulates that all names MUST end in US-ASCII (i.e.
+          ;; a name that ends with a Unicode octet MUST end with a "-").
+         (if (or imap (not (eobp)))
            (insert ?-)))))
     nil))