X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=mel-q.el;h=47a7a2b0dc961dfb12a4787f95906735fe1d52c2;hb=8a3113daa75934774a9cff658c360a7719b2407f;hp=6ec4f0b983aadc53962a1d8e6c16711cdca6bd03;hpb=3b0f471b1530aadd6e2cbe01e0e8d79a05e43a3b;p=elisp%2Fflim.git

diff --git a/mel-q.el b/mel-q.el
index 6ec4f0b..47a7a2b 100644
--- a/mel-q.el
+++ b/mel-q.el
@@ -44,19 +44,18 @@
     (save-restriction
       (narrow-to-region start end)
       (goto-char start)
-      (let ((col 0)
-	    enable-multibyte-characters)
+      (let ((col 0))
 	(while (< (point)(point-max))
 	  (cond ((>= col 75)
 		 (insert "=\n")
 		 (setq col 0)
 		 )
-		((looking-at "^From ")
+		((looking-at-as-unibyte "^From ")
 		 (replace-match "=46rom ")
 		 (backward-char 1)
 		 (setq col (+ col 6))
 		 )
-		((looking-at "[ \t]\n")
+		((looking-at-as-unibyte "[ \t]\n")
 		 (forward-char 1)
 		 (insert "=\n")
 		 (forward-char 1)
@@ -159,53 +158,37 @@ It calls external quoted-printable encoder specified by
 ;;; @ Quoted-Printable decoder
 ;;;
 
-(defun quoted-printable-decode-string (string)
-  "Decode STRING which is encoded in quoted-printable, and return the result."
-  (let (q h l)
-    (mapconcat (function
-		(lambda (chr)
-		  (cond ((eq chr ?=)
-			 (setq q t)
-			 "")
-			(q (setq h
-				 (cond ((<= ?a chr) (+ (- chr ?a) 10))
-				       ((<= ?A chr) (+ (- chr ?A) 10))
-				       ((<= ?0 chr) (- chr ?0))
-				       ))
-			   (setq q nil)
-			   "")
-			(h (setq l (cond ((<= ?a chr) (+ (- chr ?a) 10))
-					 ((<= ?A chr) (+ (- chr ?A) 10))
-					 ((<= ?0 chr) (- chr ?0))
-					 ))
-			   (prog1
-			       (char-to-string (logior (ash h 4) l))
-			     (setq h nil)
-			     )
-			   )
-			(t (char-to-string chr))
-			)))
-	       string "")))
+(defsubst quoted-printable-hex-char-to-num (chr)
+  (cond ((<= ?a chr) (+ (- chr ?a) 10))
+	((<= ?A chr) (+ (- chr ?A) 10))
+	((<= ?0 chr) (- chr ?0))
+	))
 
 (defun quoted-printable-internal-decode-region (start end)
   (save-excursion
     (save-restriction
       (narrow-to-region start end)
       (goto-char (point-min))
-      (while (re-search-forward "=\n" nil t)
-	(replace-match "")
-	)
-      (goto-char (point-min))
-      (let (b e str)
-	(while (re-search-forward quoted-printable-octet-regexp nil t)
-	  (setq b (match-beginning 0))
-	  (setq e (match-end 0))
-	  (setq str (buffer-substring b e))
-	  (delete-region b e)
-	  (insert (string-as-multibyte (quoted-printable-decode-string str)))
-	  ))
-      )))
-
+      (while (search-forward "=" nil t)
+	(let ((beg (match-beginning 0)))
+	  (cond ((looking-at "\n")
+		 (delete-region beg (match-end 0))
+		 )
+		((looking-at
+		  `,(concat "[" quoted-printable-hex-chars
+			    "][" quoted-printable-hex-chars "]"))
+		 (let* ((end (match-end 0))
+			(hex (buffer-substring (match-beginning 0) end)))
+		   (delete-region beg end)
+		   (insert
+		    (logior
+		     (ash (quoted-printable-hex-char-to-num (aref hex 0)) 4)
+		     (quoted-printable-hex-char-to-num (aref hex 1))))
+		   ))
+		(t
+		 ;; invalid
+		 ))
+	  )))))
 
 (defvar quoted-printable-external-decoder '("mmencode" "-q" "-u")
   "*list of quoted-printable decoder program name and its arguments.")
@@ -239,6 +222,13 @@ the program (maybe mmencode included in metamail or XEmacs package)."
     (quoted-printable-internal-decode-region start end)
     ))
 
+(defun quoted-printable-decode-string (string)
+  "Decode STRING which is encoded in quoted-printable, and return the result."
+  (with-temp-buffer
+    (insert string)
+    (quoted-printable-decode-region (point-min)(point-max))
+    (buffer-string)))
+
 
 (defvar quoted-printable-external-decoder-option-to-specify-file '("-o")
   "*list of options of quoted-printable decoder program to specify file.")
@@ -300,16 +290,10 @@ MODE allows `text', `comment', `phrase' or nil.  Default value is
 			((eq chr ?=)
 			 (setq q t)
 			 "")
-			(q (setq h (cond ((<= ?a chr) (+ (- chr ?a) 10))
-					 ((<= ?A chr) (+ (- chr ?A) 10))
-					 ((<= ?0 chr) (- chr ?0))
-					 ))
+			(q (setq h (quoted-printable-hex-char-to-num chr))
 			   (setq q nil)
 			   "")
-			(h (setq l (cond ((<= ?a chr) (+ (- chr ?a) 10))
-					 ((<= ?A chr) (+ (- chr ?A) 10))
-					 ((<= ?0 chr) (- chr ?0))
-					 ))
+			(h (setq l (quoted-printable-hex-char-to-num chr))
 			   (prog1
 			       (char-to-string (logior (ash h 4) l))
 			     (setq h nil)