X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fqp.el;h=87252684a4851f41979ec9f1fc092677b34cfc45;hb=c23b137e5e82992f99c3972fe871eaef9fb292a2;hp=90975c48cd334ad4d35d9c083ee14326bce8b00d;hpb=c9a393eeb329a99695566342a9f03b8a30000898;p=gnus

diff --git a/lisp/qp.el b/lisp/qp.el
index 90975c48c..87252684a 100644
--- 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,10 @@ 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) (+ (- n1 ?A) 10)) 16)
+			       (if (<= n2 ?9) (- n2 ?0) (+ (- 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 +68,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)))))