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

lisp/ChangeLog

+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

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))