lisp/ChangeLog (2013-11-21): Unmark tiny change

[gnus] / lisp / qp.el

diff --git a/lisp/qp.el b/lisp/qp.el
index 6c5840e..0b7c063 100644 (file)
--- a/lisp/qp.el
+++ b/lisp/qp.el
@@ -1,27 +1,24 @@
 ;;; qp.el --- Quoted-Printable functions
 
-;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005
-;;        Free Software Foundation, Inc.
+;; Copyright (C) 1998-2014 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: mail, extensions
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -31,7 +28,7 @@
 ;;; Code:
 
 (require 'mm-util)
-(eval-when-compile (defvar mm-use-ultra-safe-encoding))
+(defvar mm-use-ultra-safe-encoding)
 
 ;;;###autoload
 (defun quoted-printable-decode-region (from to &optional coding-system)
@@ -68,12 +65,24 @@ 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)
+                     (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)))
                (t
                 (message "Malformed quoted-printable text")
                 (forward-char)))))
@@ -82,7 +91,7 @@ them into characters should be done separately."
 
 (defun quoted-printable-decode-string (string &optional coding-system)
   "Decode the quoted-printable encoded STRING and return the result.
-If CODING-SYSTEM is non-nil, decode the region with coding-system.
+If CODING-SYSTEM is non-nil, decode the string with coding-system.
 Use of CODING-SYSTEM is deprecated; this function should deal with
 raw bytes, and coding conversion should be done separately."
   (mm-with-unibyte-buffer
@@ -118,7 +127,7 @@ encode lines starting with \"From\"."
                  (not (eobp)))
        (insert
         (prog1
-            ;; To unibyte in case of Emacs 22 eight-bit.
+            ;; To unibyte in case of Emacs 23 (unicode) eight-bit.
             (format "=%02X" (mm-multibyte-char-to-unibyte (char-after)))
           (delete-char 1))))
       ;; Encode white space at the end of lines.
@@ -156,13 +165,14 @@ encode lines starting with \"From\"."
 
 (defun quoted-printable-encode-string (string)
   "Encode the STRING as quoted-printable and return the result."
-  (let ((default-enable-multibyte-characters (mm-multibyte-string-p string)))
-    (with-temp-buffer
-      (insert string)
-      (quoted-printable-encode-region (point-min) (point-max))
-      (buffer-string))))
+  (with-temp-buffer
+    (if (mm-multibyte-string-p string)
+       (mm-enable-multibyte)
+      (mm-disable-multibyte))
+    (insert string)
+    (quoted-printable-encode-region (point-min) (point-max))
+    (buffer-string)))
 
 (provide 'qp)
 
-;;; arch-tag: db89e52a-e4a1-4b69-926f-f434f04216ba
 ;;; qp.el ends here