X-Git-Url: https://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Futf7.el;h=47c3b0f4c5dbbbf0e00aec0a01726aada91f6d1c;hb=7ad80d3719e53fc5e4c2c337c84f91c08ff7a2d1;hp=269da5f6cfb46e848ed85bd5d019b5d97df1780d;hpb=c358f44b1670d12d5eff5fe5a447a19afd34a252;p=gnus

diff --git a/lisp/utf7.el b/lisp/utf7.el
index 269da5f6c..47c3b0f4c 100644
--- a/lisp/utf7.el
+++ b/lisp/utf7.el
@@ -1,7 +1,7 @@
 ;;; utf7.el --- UTF-7 encoding/decoding for Emacs   -*-coding: iso-8859-1;-*-
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+;;   2008, 2009, 2010  Free Software Foundation, Inc.
 
 ;; Author: Jon K Hellan <hellan@acm.org>
 ;; Maintainer: bugs@gnus.org
@@ -9,10 +9,10 @@
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs 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 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -20,9 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -80,7 +78,7 @@
 (defconst utf7-utf-16-coding-system
   (cond ((mm-coding-system-p 'utf-16-be-no-signature) ; Mule-UCS
 	 'utf-16-be-no-signature)
-	((and (mm-coding-system-p 'utf-16-be) ; Emacs 21.3, Emacs 22
+	((and (mm-coding-system-p 'utf-16-be) ; Emacs
 	      ;; Avoid versions with BOM.
 	      (= 2 (length (encode-coding-string "a" 'utf-16-be))))
 	 'utf-16-be)
@@ -114,7 +112,7 @@ Use IMAP modification if FOR-IMAP is non-nil."
 		 (skip-chars-forward not-direct-encoding-chars)))
 	    (if (and (= fc esc-char)
 		     (= run-length 1))	; Lone esc-char?
-		(delete-backward-char 1) ; Now there's one too many
+		(delete-char -1)        ; Now there's one too many
 	      (utf7-fragment-encode p (point) for-imap))
 	    (insert "-")))))))
 
@@ -155,7 +153,7 @@ Use IMAP modification if FOR-IMAP is non-nil."
 	      (save-excursion
 		(utf7-fragment-decode p (point) for-imap)
 		(goto-char p)
-		(delete-backward-char 1)))))))))
+		(delete-char -1)))))))))
 
 (defun utf7-fragment-decode (start end &optional for-imap)
   "Decode base64 encoded fragment from START to END of UTF-7 text in buffer.
@@ -207,30 +205,28 @@ Characters are in raw byte pairs in narrowed buffer."
   (mm-decode-coding-region (point-min) (point-max) 'iso-8859-1)
   (mm-enable-multibyte))
 
+;;;###autoload
 (defun utf7-encode (string &optional for-imap)
   "Encode UTF-7 STRING.  Use IMAP modification if FOR-IMAP is non-nil."
   (if (and (coding-system-p 'utf-7) (coding-system-p 'utf-7-imap))
       ;; Emacs 23 with proper support for IMAP
       (encode-coding-string string (if for-imap 'utf-7-imap 'utf-7))
-    (let ((default-enable-multibyte-characters t))
-      (with-temp-buffer
-	(insert string)
-	(utf7-encode-internal for-imap)
-	(buffer-string)))))
+    (mm-with-multibyte-buffer
+     (insert string)
+     (utf7-encode-internal for-imap)
+     (buffer-string))))
 
 (defun utf7-decode (string &optional for-imap)
   "Decode UTF-7 STRING.  Use IMAP modification if FOR-IMAP is non-nil."
   (if (and (coding-system-p 'utf-7) (coding-system-p 'utf-7-imap))
       ;; Emacs 23 with proper support for IMAP
       (decode-coding-string string (if for-imap 'utf-7-imap 'utf-7))
-    (let ((default-enable-multibyte-characters nil))
-      (with-temp-buffer
-	(insert string)
-	(utf7-decode-internal for-imap)
-	(mm-enable-multibyte)
-	(buffer-string)))))
+    (mm-with-unibyte-buffer
+     (insert string)
+     (utf7-decode-internal for-imap)
+     (mm-enable-multibyte)
+     (buffer-string))))
 
 (provide 'utf7)
 
-;;; arch-tag: 96078b55-85c7-4161-aed2-932c24b282c7
 ;;; utf7.el ends here