Merge from emacs--rel--22

[gnu-emacs] / lisp / international / utf-7.el

diff --git a/lisp/international/utf-7.el b/lisp/international/utf-7.el
index 77e2a18c684cc551e3cad6d67142cb2f2f563e93..e2fe6949caea72e7ef8dffacd781deb1a3107be1 100644 (file)
--- a/lisp/international/utf-7.el
+++ b/lisp/international/utf-7.el
@@ -110,7 +110,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))