(quoted-printable-decode-region): Use mm-insert-byte.

Signal error on malformed text, as for base64.
(quoted-printable-encode-region): DTRT in Emacs 22.

diff --git a/lisp/qp.el b/lisp/qp.el
index 3a4d492..62d7562 100644 (file)
--- 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 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: mail, extensions
@@ -32,13 +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.
 
 Interactively, you can supply the CODING-SYSTEM argument
-with \\[universal-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))
@@ -66,14 +71,10 @@ with \\[universal-coding-system-argument]."
                 (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")
+                (error "Malformed quoted-printable text")
                 (forward-char)))))
       (if coding-system
          (mm-decode-coding-region (point-min) (point-max) coding-system)))))
@@ -97,6 +98,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="
@@ -104,19 +114,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))
@@ -131,7 +136,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
@@ -140,7 +145,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.