nnmaildir.el (nnmaildir-flag-mark-mapping): Add "P"

[gnus] / lisp / mml1991.el

diff --git a/lisp/mml1991.el b/lisp/mml1991.el
index c523dcc..47d4407 100644 (file)
--- a/lisp/mml1991.el
+++ b/lisp/mml1991.el
@@ -1,11 +1,10 @@
 ;;; mml1991.el --- Old PGP message format (RFC 1991) support for MML
 
-;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-;;   2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 1998-2015 Free Software Foundation, Inc.
 
-;; Author: Sascha Lüdecke <sascha@meta-x.de>,
+;; Author: Sascha Lüdecke <sascha@meta-x.de>,
 ;;     Simon Josefsson <simon@josefsson.org> (Mailcrypt interface, Gnus glue)
-;; Keywords PGP
+;; Keywords: PGP
 
 ;; This file is part of GNU Emacs.
 
@@ -26,9 +25,10 @@
 
 ;;; Code:
 
-;; For Emacs < 22.2.
 (eval-and-compile
-  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
+  (if (locate-library "password-cache")
+      (require 'password-cache)
+    (require 'password)))
 
 (eval-when-compile
   (require 'cl)
@@ -47,23 +47,20 @@
 (autoload 'message-options-get "message")
 (autoload 'message-options-set "message")
 
+(require 'mml2015)
+
 (defvar mml1991-use mml2015-use
   "The package used for PGP.")
 
 (defvar mml1991-function-alist
   '((mailcrypt mml1991-mailcrypt-sign
               mml1991-mailcrypt-encrypt)
-    (gpg mml1991-gpg-sign
-        mml1991-gpg-encrypt)
     (pgg mml1991-pgg-sign
         mml1991-pgg-encrypt)
     (epg mml1991-epg-sign
         mml1991-epg-encrypt))
   "Alist of PGP functions.")
 
-(defvar mml1991-verbose mml-secure-verbose
-  "If non-nil, ask the user about the current operation more verbosely.")
-
 (defvar mml1991-cache-passphrase mml-secure-cache-passphrase