X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;ds=sidebyside;f=lisp%2Fmm-bodies.el;h=4a25c1486a8aad206fa018b7dd98037df54ce55b;hb=b83561e18ceb438203812786590893bd5fc2a6cc;hp=01a75762e0f794ca3307339b050d61760f18cd5c;hpb=181430fb8217265da46f76f5be75b8b23c557145;p=gnus

diff --git a/lisp/mm-bodies.el b/lisp/mm-bodies.el
index 01a75762e..4a25c1486 100644
--- a/lisp/mm-bodies.el
+++ b/lisp/mm-bodies.el
@@ -1,39 +1,36 @@
 ;;; mm-bodies.el --- Functions for decoding MIME things
 
-;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2015 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;;	MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;; 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:
 
 ;;; Code:
 
-(eval-when-compile
-  (defvar mm-uu-decode-function)
-  (defvar mm-uu-binhex-decode-function))
-
 (require 'mm-util)
 (require 'rfc2047)
 (require 'mm-encode)
 
+(defvar mm-uu-yenc-decode-function)
+(defvar mm-uu-decode-function)
+(defvar mm-uu-binhex-decode-function)
+
 ;; 8bit treatment gets any char except: 0x32 - 0x7f, LF, TAB, BEL,
 ;; BS, vertical TAB, form feed, and ^_
 ;;
@@ -67,6 +64,9 @@ Valid encodings are `7bit', `8bit', `quoted-printable' and `base64'."
 			       (const base64))))
   :group 'mime)
 
+(autoload 'message-options-get "message")
+(declare-function message-options-set "message" (symbol value))
+
 (defun mm-encode-body (&optional charset)
   "Encode a body.
 Should be called narrowed to the body that is to be encoded.
@@ -83,9 +83,9 @@ If no encoding was done, nil is returned."
 	    (goto-char (point-min))
 	    (if (re-search-forward "[^\x0-\x7f]" nil t)
 		(or mail-parse-charset
-		    (message-options-get 'mm-encody-body-charset)
+		    (message-options-get 'mm-body-charset-encoding-alist)
 		    (message-options-set
-		     'mm-encody-body-charset
+		     'mm-body-charset-encoding-alist
 		     (mm-read-coding-system "Charset used in the article: ")))
 	      ;; The logic in `mml-generate-mime-1' confirms that it's OK
 	      ;; to return nil here.
@@ -171,8 +171,6 @@ If no encoding was done, nil is returned."
 ;;; Functions for decoding
 ;;;
 
-(eval-when-compile (defvar mm-uu-yenc-decode-function))
-
 (defun mm-decode-content-transfer-encoding (encoding &optional type)
   "Decodes buffer encoded with ENCODING, returning success status.
 If TYPE is `text/plain' CRLF->LF translation may occur."
@@ -195,13 +193,11 @@ If TYPE is `text/plain' CRLF->LF translation may occur."
 	       (while (re-search-forward "^[\t ]*\r?\n" nil t)
 		 (delete-region (match-beginning 0) (match-end 0)))
 	       (goto-char (point-max))
-	       (when (re-search-backward "^[A-Za-z0-9+/]+=*[\t ]*$" nil t)
+	       (when (re-search-backward "^[\t ]*[A-Za-z0-9+/]+=*[\t ]*$"
+					 nil t)
 		 (forward-line))
 	       (point))))
-	   ((memq encoding '(7bit 8bit binary))
-	    ;; Do nothing.
-	    t)
-	   ((null encoding)
+	   ((memq encoding '(nil 7bit 8bit binary))
 	    ;; Do nothing.
 	    t)
 	   ((memq encoding '(x-uuencode x-uue))
@@ -302,5 +298,4 @@ decoding.  If it is nil, default to `mail-parse-charset'."
 
 (provide 'mm-bodies)
 
-;;; arch-tag: 41104bb6-4443-4ca9-8d5c-ff87ecf27d8d
 ;;; mm-bodies.el ends here