X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/14e8de0c3f87a228c05902be66c5bcf953636611..51fb064bc72968e739e8dea580e58796c1a87f4c:/lisp/international/utf-7.el

diff --git a/lisp/international/utf-7.el b/lisp/international/utf-7.el
index 77e2a18c68..e2fe6949ca 100644
--- 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))