X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fmm-uu.el;h=a97cced165510c51388c9dfa5a6af106c630a1cc;hb=25ae8d0af030d77d5fead1083abf8b20259b55c4;hp=4f660130272a91a6c79eee1818b952c8079cf059;hpb=dab90e322488e20205f3e4c254049f40577275a9;p=elisp%2Fgnus.git-

diff --git a/lisp/mm-uu.el b/lisp/mm-uu.el
index 4f66013..a97cced 100644
--- a/lisp/mm-uu.el
+++ b/lisp/mm-uu.el
@@ -1,10 +1,10 @@
 ;;; mm-uu.el -- Return uu stuffs as mm handles
-;; Copyright (c) 1998,99 by Shenghuo Zhu
+;; Copyright (c) 1998, 1999, 2000 Free Software Foundation, Inc.
 
 ;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
-;; Keywords: postscript uudecode binhex shar forward
+;; Keywords: postscript uudecode binhex shar forward news
 
-;; This file is part of pgnus.
+;; This file is part of GNU Emacs.
 
 ;; 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
@@ -26,8 +26,8 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'cl))
 (require 'mail-parse)
-(require 'message)
 (require 'nnheader)
 (require 'mm-decode)
 (require 'gnus-mailcap)
@@ -155,7 +155,7 @@ To disable dissecting shar codes, for instance, add
 		       (let ((nnheader-file-name-translation-alist
 			      '((?/ . ?,) (? . ?_) (?* . ?_) (?$ . ?_))))
 			 (nnheader-translate-file-chars (match-string 1))))))
-	(forward-line) ;; in case of failure
+	(forward-line);; in case of failure
 	(setq start-char-1 (point))
 	(setq end-line (symbol-value
 			(intern (concat "mm-uu-" (symbol-name type)
@@ -165,55 +165,62 @@ To disable dissecting shar codes, for instance, add
 	  (setq end-char-1 (match-beginning 0))
 	  (forward-line)
 	  (setq end-char (point))
-	  (when (or (not (eq type 'binhex))
-		    (setq file-name
-			  (ignore-errors
-			    (binhex-decode-region start-char end-char t))))
+	  (when (cond 
+		 ((eq type 'binhex)
+		  (setq file-name
+			(ignore-errors
+			  (binhex-decode-region start-char end-char t))))
+		 ((eq type 'forward)
+		  (save-excursion
+		    (goto-char start-char-1)
+		    (looking-at "[\r\n]*[a-zA-Z][a-zA-Z0-9-]*:")))
+		 (t t))
 	    (if (> start-char text-start)
 		(push
 		 (mm-make-handle (mm-uu-copy-to-buffer text-start start-char)
-		       text-plain-type)
+				 text-plain-type)
 		 result))
 	    (push
 	     (cond
 	      ((eq type 'postscript)
 	       (mm-make-handle (mm-uu-copy-to-buffer start-char end-char)
-		     '("application/postscript")))
+			       '("application/postscript")))
 	      ((eq type 'forward)
 	       (mm-make-handle (mm-uu-copy-to-buffer start-char-1 end-char-1)
 			       '("message/rfc822" (charset . gnus-decoded))))
 	      ((eq type 'uu)
 	       (mm-make-handle (mm-uu-copy-to-buffer start-char end-char)
-		     (list (or (and file-name
-				    (string-match "\\.[^\\.]+$" file-name)
-				    (mailcap-extension-to-mime
-				     (match-string 0 file-name)))
-			       "application/octet-stream"))
-		     'x-uuencode nil
-		     (if (and file-name (not (equal file-name "")))
-			 (list mm-dissect-disposition
-			       (cons 'filename file-name)))))
+			       (list (or (and file-name
+					      (string-match "\\.[^\\.]+$"
+							    file-name)
+					      (mailcap-extension-to-mime
+					       (match-string 0 file-name)))
+					 "application/octet-stream"))
+			       'x-uuencode nil
+			       (if (and file-name (not (equal file-name "")))
+				   (list mm-dissect-disposition
+					 (cons 'filename file-name)))))
 	      ((eq type 'binhex)
 	       (mm-make-handle (mm-uu-copy-to-buffer start-char end-char)
-		     (list (or (and file-name
-				    (string-match "\\.[^\\.]+$" file-name)
-				    (mailcap-extension-to-mime
-				     (match-string 0 file-name)))
-			       "application/octet-stream"))
-		     'x-binhex nil
-		     (if (and file-name (not (equal file-name "")))
-			 (list mm-dissect-disposition
-			       (cons 'filename file-name)))))
+			       (list (or (and file-name
+					      (string-match "\\.[^\\.]+$" file-name)
+					      (mailcap-extension-to-mime
+					       (match-string 0 file-name)))
+					 "application/octet-stream"))
+			       'x-binhex nil
+			       (if (and file-name (not (equal file-name "")))
+				   (list mm-dissect-disposition
+					 (cons 'filename file-name)))))
 	      ((eq type 'shar)
 	       (mm-make-handle (mm-uu-copy-to-buffer start-char end-char)
-		     '("application/x-shar"))))
+			       '("application/x-shar"))))
 	     result)
 	    (setq text-start end-char))))
       (when result
 	(if (> (point-max) (1+ text-start))
 	    (push
 	     (mm-make-handle (mm-uu-copy-to-buffer text-start (point-max))
-		   text-plain-type)
+			     text-plain-type)
 	     result))
 	(setq result (cons "multipart/mixed" (nreverse result))))
       result)))