summaryrefslogtreecommitdiff
path: root/lisp/international/utf-7.el
diff options
context:
space:
mode:
authorMiles Bader <miles@gnu.org>2008-03-01 01:28:31 +0000
committerMiles Bader <miles@gnu.org>2008-03-01 01:28:31 +0000
commit51fb064bc72968e739e8dea580e58796c1a87f4c (patch)
tree80c29b96dbb547a7c8db57a6d57ae4c6d2bfc1ca /lisp/international/utf-7.el
parent14e8de0c3f87a228c05902be66c5bcf953636611 (diff)
parent613f60eeb171e5ad881f52d9e7c0ffce2e182fcb (diff)
downloademacs-51fb064bc72968e739e8dea580e58796c1a87f4c.tar.gz
emacs-51fb064bc72968e739e8dea580e58796c1a87f4c.tar.bz2
emacs-51fb064bc72968e739e8dea580e58796c1a87f4c.zip
Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1090
Diffstat (limited to 'lisp/international/utf-7.el')
-rw-r--r--lisp/international/utf-7.el4
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/international/utf-7.el b/lisp/international/utf-7.el
index 77e2a18c684..e2fe6949cae 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))