projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gnus-sum.el (gnus-summary-toggle-header): Display header attachment buttons
[gnus]
/
lisp
/
mml2015.el
diff --git
a/lisp/mml2015.el
b/lisp/mml2015.el
index
3efa5c2
..
a533829
100644
(file)
--- a/
lisp/mml2015.el
+++ b/
lisp/mml2015.el
@@
-1,6
+1,6
@@
;;; mml2015.el --- MIME Security with Pretty Good Privacy (PGP)
;;; mml2015.el --- MIME Security with Pretty Good Privacy (PGP)
-;; Copyright (C) 2000-201
3
Free Software Foundation, Inc.
+;; Copyright (C) 2000-201
4
Free Software Foundation, Inc.
;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
;; Keywords: PGP MIME MML
;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
;; Keywords: PGP MIME MML
@@
-28,9
+28,6
@@
;;; Code:
(eval-and-compile
;;; Code:
(eval-and-compile
- ;; For Emacs <22.2 and XEmacs.
- (unless (fboundp 'declare-function) (defmacro declare-function (&rest r)))
-
(if (locate-library "password-cache")
(require 'password-cache)
(require 'password)))
(if (locate-library "password-cache")
(require 'password-cache)
(require 'password)))
@@
-51,12
+48,10
@@
;; Then mml1991 would not need to require mml2015, and mml1991-use
;; could be removed.
(defvar mml2015-use (or
;; Then mml1991 would not need to require mml2015, and mml1991-use
;; could be removed.
(defvar mml2015-use (or
- (condition-case nil
- (progn
- (require 'epg-config)
- (epg-check-configuration (epg-configuration))
- 'epg)
- (error))
+ (progn
+ (ignore-errors (require 'epg-config))
+ (and (fboundp 'epg-check-configuration)
+ 'epg))
(progn
(let ((abs-file (locate-library "pgg")))
;; Don't load PGG if it is marked as obsolete
(progn
(let ((abs-file (locate-library "pgg")))
;; Don't load PGG if it is marked as obsolete
@@
-866,6
+861,8
@@
If set, it overrides the setting of `mml2015-sign-with-sender'."
(setq secret-keys (cdr secret-keys))))
secret-key))
(setq secret-keys (cdr secret-keys))))
secret-key))
+(autoload 'gnus-create-image "gnus-ems")
+
(defun mml2015-epg-key-image (key-id)
"Return the image of a key, if any"
(with-temp-buffer
(defun mml2015-epg-key-image (key-id)
"Return the image of a key, if any"
(with-temp-buffer