Partially revert last Gnus merge

[gnus] / lisp / qp.el

diff --git a/lisp/qp.el b/lisp/qp.el
index 1b9b4ce..bfa1fe0 100644 (file)
--- a/lisp/qp.el
+++ b/lisp/qp.el
@@ -1,7 +1,6 @@
 ;;; qp.el --- Quoted-Printable functions
 
-;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-;;   2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 1998-2012  Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: mail, extensions
@@ -54,7 +53,14 @@ them into characters should be done separately."
       ;; or both of which are lowercase letters in "abcdef", is
       ;; formally illegal. A robust implementation might choose to
       ;; recognize them as the corresponding uppercase letters.''
-      (let ((case-fold-search t))
+      (let ((case-fold-search t)
+           (decode-hex #'(lambda (n1 n2)
+                           (+ (* (if (<= n1 ?9) (- n1 ?0)
+                                   (if (<= n1 ?F) (+ (- n1 ?A) 10)
+                                     (+ (- n1 ?a) 10))) 16)
+                              (if (<= n2 ?9) (- n2 ?0)
+                                (if (<= n2 ?F) (+ (- n2 ?A) 10)
+                                  (+ (- n2 ?a) 10)))))))
        (narrow-to-region from to)
        ;; Do this in case we're called from Gnus, say, in a buffer
        ;; which already contains non-ASCII characters which would
@@ -66,12 +72,17 @@ them into characters should be done separately."
                    (not (eobp)))
          (cond ((eq (char-after (1+ (point))) ?\n)
                 (delete-char 2))
-               ((looking-at "=[0-9A-F][0-9A-F]")
-                (let ((byte (string-to-number (buffer-substring (1+ (point))
-                                                             (+ 3 (point)))
-                                           16)))
-                  (mm-insert-byte byte 1)
-                  (delete-char 3)))
+               ((looking-at "\\(=[0-9A-F][0-9A-F]\\)+")
+                ;; Decode this sequence at once; i.e. by a single
+                ;; deletion and insertion.
+                (let* ((n (/ (- (match-end 0) (point)) 3))
+                       (str (make-string n 0)))
+                  (dotimes (i n)
+                    (aset str i (funcall decode-hex (char-after (1+ (point)))
+                                         (char-after (+ 2 (point)))))
+                    (forward-char 3))
+                  (delete-region (match-beginning 0) (match-end 0))
+                  (insert str)))
                (t
                 (message "Malformed quoted-printable text")
                 (forward-char)))))
@@ -164,5 +175,4 @@ encode lines starting with \"From\"."
 
 (provide 'qp)
 
-;; arch-tag: db89e52a-e4a1-4b69-926f-f434f04216ba
 ;;; qp.el ends here