Merge from trunk.

3 files changed, 15 insertions, 3 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index f90e180b128..acdd1033933 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-29  Daniel Dehennin  <daniel.dehennin@baby-gnu.org>
+
+        * mm-decode.el (mm-dissect-buffer): Add a default content-disposition
+        in mm handle if none is specified.
+
 2011-07-24  Andrew Cohen  <cohen@andy.bu.edu>
 
         * nnimap.el (nnimap-make-thread-query): Quote message-ids for gmail.
diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el
index a51c6630ac5..692175d471f 100644
--- a/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/mm-decode.el
@@ -564,7 +564,13 @@ Postpone undisplaying of viewers for types in
           (setq ct (mail-fetch-field "content-type")
                 ctl (and ct (mail-header-parse-content-type ct))
                 cte (mail-fetch-field "content-transfer-encoding")
-                cd (mail-fetch-field "content-disposition")
+                cd (or (mail-fetch-field "content-disposition")
+                       (when (and ctl
+                                  (eq 'mm-inline-text
+                                      (cadr (mm-assoc-string-match
+                                             mm-inline-media-tests
+                                             (car ctl)))))
+                         "inline"))
                 ;; Newlines in description should be stripped so as
                 ;; not to break the MIME tag into two or more lines.
                 description (message-fetch-field "content-description")
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 6af95d39ae2..0822f313ac4 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -3293,9 +3293,10 @@
         * org-capture.el (org-capture-fill-template): fix bug with the
         display of interactive prompt in templates expansion.
 
-2011-07-28  Reiner Steib  <reinersteib+gmane@imap.cc>
+2011-07-28  Reiner Steib  <reiner.steib@gmx.de>
 
-        * org-clock.el (org-clock-display): docstring fiw.
+        * org-clock.el (org-clock-display): Document how to remove subtree
+        times.
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>