From 883888594666128e531e9d5aee3bcd98b4b48554 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Tue, 10 Jul 2001 03:45:08 +0000 Subject: [PATCH] Synch with Oort Gnus. --- lisp/ChangeLog | 10 +++++++++- lisp/mm-decode.el | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b36579f..17739d8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,12 @@ +2001-07-09 19:00:00 ShengHuo ZHU + + * mm-decode.el (mm-attachment-override-p): Fix typo. + +2001-03-19 05:28:00 Katsumi Yamaoka + + * gnus-kill.el (gnus-execute): Work with the extra headers. + * gnus-sum.el (gnus-summary-execute-command): Ditto. + 2001-07-09 17:00:00 ShengHuo ZHU * mm-view.el (mm-inline-text): w3-coding-system-for-mime-charset @@ -116,7 +125,6 @@ * nntp.el (nntp-send-command-nodelete): ditto. * nntp.el (nntp-send-command-and-decode): ditto. ->>>>>>> 6.485 2001-06-30 YAGI Tatsuya * gnus-start.el (gnus-check-first-time-used): Use `if' instead of diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el index 9b2312a..78d0cb1 100644 --- a/lisp/mm-decode.el +++ b/lisp/mm-decode.el @@ -803,7 +803,7 @@ external if displayed external." (catch 'found (while (setq ty (pop types)) (when (and (string-match ty type) - (mm-inlinable-p ty)) + (mm-inlinable-p handle)) (throw 'found t)))))) (defun mm-inline-override-p (handle) -- 1.7.10.4