projects
/
elisp
/
flim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* eword-encode.el (make-ew-rword, ew-rword-text, ew-rword-charset)
[elisp/flim.git]
/
mime.el
diff --git
a/mime.el
b/mime.el
index
2160569
..
9dc2fcc
100644
(file)
--- a/
mime.el
+++ b/
mime.el
@@
-1,6
+1,6
@@
;;; mime.el --- MIME library module
;;; mime.el --- MIME library module
-;; Copyright (C) 1998,1999,2000 Free Software Foundation, Inc.
+;; Copyright (C) 1998,1999,2000,2001,2003 Free Software Foundation, Inc.
;; Author: MORIOKA Tomohiko <tomo@m17n.org>
;; Keywords: MIME, multimedia, mail, news
;; Author: MORIOKA Tomohiko <tomo@m17n.org>
;; Keywords: MIME, multimedia, mail, news
@@
-19,8
+19,8
@@
;; 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
;; 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., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Code:
;;; Code:
@@
-144,10
+144,9
@@
If MESSAGE is specified, it is regarded as root entity."
(defun mime-find-root-entity (entity)
"Return root entity of ENTITY."
(defun mime-find-root-entity (entity)
"Return root entity of ENTITY."
- (let ((p (mime-entity-parent entity)))
- (if (null p)
- entity
- (mime-entity-parent p))))
+ (while (not (mime-root-entity-p entity))
+ (setq entity (mime-entity-parent entity)))
+ entity)
;;; @ Header buffer (obsolete)
;;; @ Header buffer (obsolete)
@@
-333,7
+332,7
@@
default value."
(prog1
field-name
(setq field-name (symbol-name field-name)))
(prog1
field-name
(setq field-name (symbol-name field-name)))
- (intern (capitalize (capitalize field-name))))))
+ (intern (capitalize field-name)))))
(cond ((eq sym 'Content-Type)
(mime-entity-content-type entity)
)
(cond ((eq sym 'Content-Type)
(mime-entity-content-type entity)
)
@@
-392,13
+391,16
@@
default value."
(defun mime-entity-filename (entity)
"Return filename of ENTITY."
(or (mime-entity-uu-filename entity)
(defun mime-entity-filename (entity)
"Return filename of ENTITY."
(or (mime-entity-uu-filename entity)
- (mime-content-disposition-filename
- (mime-entity-content-disposition entity))
+ (let ((ret (mime-content-disposition-filename
+ (mime-entity-content-disposition entity))))
+ (if (and mime-header-accept-quoted-encoded-words
+ ret)
+ (eword-decode-string ret)
+ ret))
(cdr (let ((param (mime-content-type-parameters
(mime-entity-content-type entity))))
(or (assoc "name" param)
(cdr (let ((param (mime-content-type-parameters
(mime-entity-content-type entity))))
(or (assoc "name" param)
- (assoc "x-name" param))
- ))))
+ (assoc "x-name" param))))))
(defsubst mime-entity-media-type (entity)
(defsubst mime-entity-media-type (entity)