From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Thu, 28 Feb 2008 19:43:51 +0000 (+0000)
Subject: (utf-7-encode): Never skip the trailing - for the `imap' variant.
X-Git-Tag: emacs-pretest-22.1.92~49
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=13dbab28a0b0b010272b8597150701a3db454ff9;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 341702e7c8a..bbeb08782ba 100644
--- 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 4076c574266..f523c311787 100644
--- 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))