changeset 80235:58e18c83bf75

(utf-7-encode): Never skip the trailing - for the `imap' variant.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Thu, 28 Feb 2008 19:43:51 +0000
parents 0a746c028341
children 15905daa91d3
files lisp/ChangeLog lisp/international/utf-7.el
diffstat 2 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Thu Feb 28 19:41:44 2008 +0000
+++ b/lisp/ChangeLog	Thu Feb 28 19:43:51 2008 +0000
@@ -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
--- a/lisp/international/utf-7.el	Thu Feb 28 19:41:44 2008 +0000
+++ b/lisp/international/utf-7.el	Thu Feb 28 19:43:51 2008 +0000
@@ -126,7 +126,9 @@
 	      ;; 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))