qp.el (quoted-printable-decode-region): Inline+CSE+strength-reduction

[gnus] / lisp / qp.el

diff --git a/lisp/qp.el b/lisp/qp.el
index bfa1fe0..c4487c6 100644 (file)
--- a/lisp/qp.el
+++ b/lisp/qp.el
@@ -53,14 +53,7 @@ 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)
-           (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)))))))
+      (let ((case-fold-search t))
        (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
@@ -78,8 +71,15 @@ them into characters should be done separately."
                 (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)))))
+                     (let ((n1 (char-after (1+ (point))))
+                           (n2 (char-after (+ 2 (point)))))
+                       (aset str i
+                             (+ (* 16 (- n1 (if (<= n1 ?9) ?0
+                                              (if (<= n1 ?F) (- ?A 10)
+                                                (- ?a 10)))))
+                                (- n2 (if (<= n2 ?9) ?0
+                                        (if (<= n2 ?F) (- ?A 10)
+                                          (- ?a 10)))))))
                     (forward-char 3))
                   (delete-region (match-beginning 0) (match-end 0))
                   (insert str)))