[Emacs-diffs] Changes to emacs/lisp/gnus/mm-decode.el,v

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       07/12/11 05:41:13

Index: mm-decode.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/gnus/mm-decode.el,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- mm-decode.el        16 Nov 2007 16:50:32 -0000      1.46
+++ mm-decode.el        11 Dec 2007 05:41:13 -0000      1.47
@@ -26,9 +26,14 @@
 
 ;;; Code:
 
+;; For Emacs < 22.2.
+(eval-and-compile
+  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
+
 (require 'mail-parse)
 (require 'mailcap)
 (require 'mm-bodies)
+(require 'gnus-util)
 (eval-when-compile (require 'cl)
                   (require 'term))
 
@@ -733,6 +738,8 @@
                (mm-display-external
                 handle 'mailcap-save-binary-file)))))))))
 
+(declare-function gnus-configure-windows "gnus-win" (setting &optional force))
+
 (defun mm-display-external (handle method)
   "Display HANDLE using METHOD."
   (let ((outbuf (current-buffer)))
@@ -990,7 +997,8 @@
        (cond
         ;; Internally displayed part.
         ((mm-annotationp object)
-         (delete-annotation object))
+          (if (featurep 'xemacs)
+              (delete-annotation object)))
         ((or (functionp object)
              (and (listp object)
                   (eq (car object) 'lambda)))
@@ -1490,6 +1498,8 @@
     (put-text-property 0 (length (car handle)) parameter value
                       (car handle))))
 
+(autoload 'mm-view-pkcs7 "mm-view")
+
 (defun mm-possibly-verify-or-decrypt (parts ctl)
   (let ((type (car ctl))
        (subtype (cadr (split-string (car ctl) "/")))