X-Git-Url: https://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fqp.el;h=f87ec6680ef78579ab783441afc40618b202af37;hb=609e9daf5a06f5d39ca20cc6718f72a414866870;hp=8c3b82892ca0fb04b2b8478c843fad993facc79f;hpb=babe54cf5412efcfc7159935a3fb6d766ddf21f1;p=gnus

diff --git a/lisp/qp.el b/lisp/qp.el
index 8c3b82892..f87ec6680 100644
--- a/lisp/qp.el
+++ b/lisp/qp.el
@@ -1,6 +1,6 @@
 ;;; qp.el --- Quoted-Printable functions
 
-;; Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: mail, extensions
@@ -32,10 +32,18 @@
 (require 'mm-util)
 (eval-when-compile (defvar mm-use-ultra-safe-encoding))
 
+;;;###autoload
 (defun quoted-printable-decode-region (from to &optional coding-system)
   "Decode quoted-printable in the region between FROM and TO, per RFC 2045.
 If CODING-SYSTEM is non-nil, decode bytes into characters with that
-coding-system."
+coding-system.
+
+Interactively, you can supply the CODING-SYSTEM argument
+with \\[universal-coding-system-argument].
+
+The CODING-SYSTEM argument is a historical hangover and is deprecated.
+QP encodes raw bytes and should be decoded into raw bytes.  Decoding
+them into characters should be done separately."
   (interactive
    ;; Let the user determine the coding system with "C-x RET c".
    (list (region-beginning) (region-end) coding-system-for-read))
@@ -63,12 +71,8 @@ coding-system."
 		 (let ((byte (string-to-int (buffer-substring (1+ (point))
 							      (+ 3 (point)))
 					    16)))
-		   (insert byte)
-		   (delete-char 3)
-		   ;; Why backward-char???
-		   ;;(unless (eq byte 61) ;; 61 is not ?= in XEmacs
-		   ;;  (backward-char))
-		   ))
+		   (mm-insert-byte byte 1)
+		   (delete-char 3)))
 		(t
 		 (message "Malformed quoted-printable text")
 		 (forward-char)))))
@@ -77,8 +81,10 @@ coding-system."
 
 (defun quoted-printable-decode-string (string &optional coding-system)
   "Decode the quoted-printable encoded STRING and return the result.
-If CODING-SYSTEM is non-nil, decode the region with coding-system."
-  (with-temp-buffer
+If CODING-SYSTEM is non-nil, decode the region with coding-system.
+Use of CODING-SYSTEM is deprecated; this function should deal with
+raw bytes, and coding conversion should be done separately."
+  (mm-with-unibyte-buffer
     (insert string)
     (quoted-printable-decode-region (point-min) (point-max) coding-system)
     (buffer-string)))
@@ -94,6 +100,15 @@ You should probably avoid non-ASCII characters in this arg.
 If `mm-use-ultra-safe-encoding' is set, fold lines unconditionally and
 encode lines starting with \"From\"."
   (interactive "r")
+  (save-excursion
+    (goto-char from)
+    (if (fboundp 'string-to-multibyte)	; Emacs 22
+	(if (re-search-forward (string-to-multibyte "[^\x0-\x7f\x80-\xff]")
+			       to t)
+	    ;; Fixme: This is somewhat misleading.
+	    (error "Multibyte character in QP encoding region"))
+      (if (re-search-forward (mm-string-as-multibyte "[^\0-\377]") to t)
+	  (error "Multibyte character in QP encoding region"))))
   (unless class
     ;; Avoid using 8bit characters. = is \075.
     ;; Equivalent to "^\000-\007\013\015-\037\200-\377="
@@ -101,19 +116,14 @@ encode lines starting with \"From\"."
   (save-excursion
     (save-restriction
       (narrow-to-region from to)
-      ;; We can live with characters between 00-FF.
-      (goto-char (point-min))
-      (while (not (eobp))
-	(if (>= (char-after) 256)
-	    (error "Multibyte character in QP encoding region"))
-	(forward-char))
       ;; Encode all the non-ascii and control characters.
       (goto-char (point-min))
       (while (and (skip-chars-forward class)
 		  (not (eobp)))
 	(insert
 	 (prog1
-	     (format "=%02X" (char-after))
+	     ;; To unibyte in case of Emacs 22 eight-bit.
+	     (format "=%02X" (mm-multibyte-char-to-unibyte (char-after)))
 	   (delete-char 1))))
       ;; Encode white space at the end of lines.
       (goto-char (point-min))
@@ -128,7 +138,7 @@ encode lines starting with \"From\"."
 	     (and (boundp 'mm-use-ultra-safe-encoding)
 		  mm-use-ultra-safe-encoding)))
 	(when (or fold mm-use-ultra-safe-encoding)
-	  (let ((tab-width 1))	; HTAB is one character.
+	  (let ((tab-width 1))		; HTAB is one character.
 	    (goto-char (point-min))
 	    (while (not (eobp))
 	      ;; In ultra-safe mode, encode "From " at the beginning
@@ -137,7 +147,7 @@ encode lines starting with \"From\"."
 		(if (looking-at "From ")
 		    (replace-match "From=20" nil t)
 		  (if (looking-at "-")
-			(replace-match "=2D" nil t))))
+		      (replace-match "=2D" nil t))))
 	      (end-of-line)
 	      ;; Fold long lines.
 	      (while (> (current-column) 76) ; tab-width must be 1.