Importing pgnus-0.79

[elisp/gnus.git-] / lisp / qp.el

diff --git a/lisp/qp.el b/lisp/qp.el
index d0e93bc..a529868 100644 (file)
--- a/lisp/qp.el
+++ b/lisp/qp.el
@@ -1,5 +1,5 @@
-;;; qp.el --- Quoted-printable functions
-;; Copyright (C) 1998 Free Software Foundation, Inc.
+;;; qp.el --- Quoted-Printable functions
+;; Copyright (C) 1998,99 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; This file is part of GNU Emacs.
@@ -32,22 +32,31 @@
   (save-excursion
     (goto-char from)
     (while (search-forward "=" to t)
-      (cond ((eq (following-char) ?\n)
-            (delete-char -1)
-            (delete-char 1))
-           ((and
-             (memq (following-char) quoted-printable-encoding-characters)
-             (memq (char-after (1+ (point)))
-                   quoted-printable-encoding-characters))
-            (subst-char-in-region
-             (1- (point)) (point) ?=
-             (string-to-number
-              (buffer-substring (point) (+ 2 (point)))
-              16))
-            (delete-char 2))
-           ((looking-at "=")
-            (delete-char 1))
-           ((message "Malformed MIME quoted-printable message"))))))
+      (cond
+       ;; End of the line.
+       ((eq (char-after) ?\n)
+       (delete-char -1)
+       (delete-char 1))
+       ;; Encoded character.
+       ((and
+        (memq (char-after) quoted-printable-encoding-characters)
+        (memq (char-after (1+ (point)))
+              quoted-printable-encoding-characters))
+       (subst-char-in-region
+        (1- (point)) (point) ?=
+        (string-to-number
+         (buffer-substring (point) (+ 2 (point)))
+         16))
+       (delete-char 2))
+       ;; Quoted equal sign.
+       ((eq (char-after) ?=)
+       (delete-char 1))
+       ;; End of buffer.
+       ((eobp)
+       (delete-char -1))
+       ;; Invalid.
+       (t
+       (message "Malformed MIME quoted-printable message"))))))
 
 (defun quoted-printable-decode-string (string)
  "Decode the quoted-printable-encoded STRING and return the results."
@@ -64,13 +73,15 @@ matched by that regexp."
   (save-excursion
     (save-restriction
       (narrow-to-region from to)
+      (mm-encode-body)
       (goto-char (point-min))
-      (while (re-search-forward
-             (or class "[\000-\007\013\015-\037\200-\377=]") nil t)
+      (while (and (skip-chars-forward
+                  (or class "^\000-\007\013\015-\037\200-\377="))
+                 (not (eobp)))
        (insert
         (prog1
-            (upcase (format "=%x" (char-after (1- (point)))))
-          (delete-char -1))))
+            (upcase (format "=%x" (char-after)))
+          (delete-char 1))))
       (when fold
        ;; Fold long lines.
        (goto-char (point-min))
@@ -84,7 +95,7 @@ matched by that regexp."
 
 (defun quoted-printable-encode-string (string)
  "QP-encode STRING and return the results."
- (with-temp-buffer
+ (mm-with-unibyte-buffer
    (insert string)
    (quoted-printable-encode-region (point-min) (point-max))
    (buffer-string)))