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 eb413b29f7bdcf60e2c98d57208990a26b7b66a2..e2fe6949caea72e7ef8dffacd781deb1a3107be1 100644 (file)
--- a/lisp/international/utf-7.el
+++ b/lisp/international/utf-7.el
@@ -1,13 +1,13 @@
 ;;; utf-7.el --- utf-7 coding system
 
-;; Copyright (C) 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 
 ;; Author: Dave Love <fx@gnu.org>
 ;; Keywords: i18n, mail
 
 ;; This file is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; This file is distributed in the hope that it will be useful,
@@ -36,24 +36,6 @@
 
 ;;; Code:
 
-;;;###autoload(autoload-coding-system 'utf-7 '(require 'utf-7))
-(make-coding-system
- 'utf-7 0 ?U
- "UTF-7 encoding of Unicode (RFC 2152)"
- nil
- `((safe-chars . ,(coding-system-get 'utf-16be 'safe-chars))
-   (mime-charset . utf-7)
-   (pre-write-conversion . utf-7-pre-write-conversion)
-   (post-read-conversion . utf-7-post-read-conversion)))
-
-;; (make-coding-system
-;;  'utf-7-imap 0 ?u
-;;  "UTF-7 encoding of Unicode, IMAP version (RFC 2060)"
-;;  nil
-;;  `((safe-chars . ,(coding-system-get 'utf-16be 'safe-chars))
-;;    (pre-write-conversion . utf-7-imap-pre-write-conversion)
-;;    (post-read-conversion . utf-7-imap-post-read-conversion)))
-
 (defun utf-7-decode (len imap)
   "Decode LEN bytes of UTF-7 at point.
 IMAP non-nil means use the IMAP version."
@@ -82,11 +64,13 @@ IMAP non-nil means use the IMAP version."
                  (delete-backward-char 1)))))))
       (- (point-max) (point-min)))))
 
+;;;###autoload
 (defun utf-7-post-read-conversion (len)
   (utf-7-decode len nil))
 
-;; (defun utf-7-imap-post-read-conversion (len)
-;;   (utf-7-decode len t))
+;;;###autoload
+(defun utf-7-imap-post-read-conversion (len)
+  (utf-7-decode len t))
 
 (defun utf-7-encode (from to imap)
   "Encode bytes between FROM and TO to UTF-7.
@@ -126,15 +110,19 @@ 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))
 
+;;;###autoload
 (defun utf-7-pre-write-conversion (from to)
   (utf-7-encode from to nil))
 
-;; (defun utf-7-imap-pre-write-conversion (from to)
-;;   (utf-7-encode from to t))
+;;;###autoload
+(defun utf-7-imap-pre-write-conversion (from to)
+  (utf-7-encode from to t))
 
 (provide 'utf-7)