X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fmm-bodies.el;h=4a25c1486a8aad206fa018b7dd98037df54ce55b;hb=851278bf56a0156a4dd5896e9959f63e33d07ee2;hp=5a70f33d95fa94c218dacad18ac0c0f7da534a56;hpb=ff79efac756f360c9a48b292b4619699fe19d057;p=gnus

diff --git a/lisp/mm-bodies.el b/lisp/mm-bodies.el
index 5a70f33d9..4a25c1486 100644
--- a/lisp/mm-bodies.el
+++ b/lisp/mm-bodies.el
@@ -1,7 +1,6 @@
 ;;; mm-bodies.el --- Functions for decoding MIME things
 
-;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008, 2009, 2010 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>
@@ -24,10 +23,6 @@
 
 ;;; Code:
 
-;; For Emacs <22.2 and XEmacs.
-(eval-and-compile
-  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
-
 (require 'mm-util)
 (require 'rfc2047)
 (require 'mm-encode)
@@ -88,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.
@@ -198,7 +193,8 @@ 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 '(nil 7bit 8bit binary))