Mercurial > emacs

diff lisp/international/utf-7.el @ 92360:4054054dd212

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from emacs--rel--22 Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1090
author Miles Bader <miles@gnu.org>
date Sat, 01 Mar 2008 01:28:31 +0000
parents 606f2d163a64 58e18c83bf75
children 1e3a407766b9
line wrap: on
line diff
--- a/lisp/international/utf-7.el	Sat Mar 01 01:28:14 2008 +0000
+++ b/lisp/international/utf-7.el	Sat Mar 01 01:28:31 2008 +0000
@@ -110,7 +110,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))