Commit 60ef4154 authored by Glenn Morris's avatar Glenn Morris

Add declare-function compatibility definition.

Require gnus-util.
(gnus-configure-windows): Declare as a function.
(mm-remove-part): Only call delete-annotation on XEmacs.
(mm-view-pkcs7): Autoload.
parent f72f1503
...@@ -26,9 +26,14 @@ ...@@ -26,9 +26,14 @@
;;; Code: ;;; Code:
;; For Emacs < 22.2.
(eval-and-compile
(unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
(require 'mail-parse) (require 'mail-parse)
(require 'mailcap) (require 'mailcap)
(require 'mm-bodies) (require 'mm-bodies)
(require 'gnus-util)
(eval-when-compile (require 'cl) (eval-when-compile (require 'cl)
(require 'term)) (require 'term))
...@@ -733,6 +738,8 @@ external if displayed external." ...@@ -733,6 +738,8 @@ external if displayed external."
(mm-display-external (mm-display-external
handle 'mailcap-save-binary-file))))))))) handle 'mailcap-save-binary-file)))))))))
(declare-function gnus-configure-windows "gnus-win" (setting &optional force))
(defun mm-display-external (handle method) (defun mm-display-external (handle method)
"Display HANDLE using METHOD." "Display HANDLE using METHOD."
(let ((outbuf (current-buffer))) (let ((outbuf (current-buffer)))
...@@ -990,7 +997,8 @@ external if displayed external." ...@@ -990,7 +997,8 @@ external if displayed external."
(cond (cond
;; Internally displayed part. ;; Internally displayed part.
((mm-annotationp object) ((mm-annotationp object)
(delete-annotation object)) (if (featurep 'xemacs)
(delete-annotation object)))
((or (functionp object) ((or (functionp object)
(and (listp object) (and (listp object)
(eq (car object) 'lambda))) (eq (car object) 'lambda)))
...@@ -1490,6 +1498,8 @@ If RECURSIVE, search recursively." ...@@ -1490,6 +1498,8 @@ If RECURSIVE, search recursively."
(put-text-property 0 (length (car handle)) parameter value (put-text-property 0 (length (car handle)) parameter value
(car handle)))) (car handle))))
(autoload 'mm-view-pkcs7 "mm-view")
(defun mm-possibly-verify-or-decrypt (parts ctl) (defun mm-possibly-verify-or-decrypt (parts ctl)
(let ((type (car ctl)) (let ((type (car ctl))
(subtype (cadr (split-string (car ctl) "/"))) (subtype (cadr (split-string (car ctl) "/")))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment