projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gmm-utils.el (gmm-flet, gmm-labels): New macros.
[gnus]
/
lisp
/
mm-bodies.el
diff --git
a/lisp/mm-bodies.el
b/lisp/mm-bodies.el
index
90d4acb
..
029218e
100644
(file)
--- a/
lisp/mm-bodies.el
+++ b/
lisp/mm-bodies.el
@@
-1,32
+1,29
@@
;;; mm-bodies.el --- Functions for decoding MIME things
;;; mm-bodies.el --- Functions for decoding MIME things
-;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2012 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; MORIOKA Tomohiko <morioka@jaist.ac.jp>
;; This file is part of GNU Emacs.
;; 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
;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation
; either version 3, 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
;; 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
;; 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:
;;; Commentary:
;;; Code:
-;; For Emacs <
22.2
.
+;; For Emacs <
22.2 and XEmacs
.
(eval-and-compile
(unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
(eval-and-compile
(unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
@@
-90,9
+87,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
(goto-char (point-min))
(if (re-search-forward "[^\x0-\x7f]" nil t)
(or mail-parse-charset
- (message-options-get 'mm-
encody-body-charse
t)
+ (message-options-get 'mm-
body-charset-encoding-alis
t)
(message-options-set
(message-options-set
- 'mm-
encody-body-charse
t
+ 'mm-
body-charset-encoding-alis
t
(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.
(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.
@@
-200,13
+197,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))
(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))))
(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))
;; Do nothing.
t)
((memq encoding '(x-uuencode x-uue))
@@
-307,5
+302,4
@@
decoding. If it is nil, default to `mail-parse-charset'."
(provide 'mm-bodies)
(provide 'mm-bodies)
-;;; arch-tag: 41104bb6-4443-4ca9-8d5c-ff87ecf27d8d
;;; mm-bodies.el ends here
;;; mm-bodies.el ends here