From 9d9cfd53c830eec3052c30a8f1c13b12743d5c89 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Tue, 21 Dec 2010 11:30:36 +0900 Subject: [PATCH] Mark PGG obsolete. * obsolete/pgg-parse.el, obsolete/pgg-pgp5.el, obsolete/pgg-pgp.el, * obsolete/pgg-gpg.el, obsolete/pgg-def.el, obsolete/pgg.el: Move from lisp/. * gnus/mml1991.el (pgg-sign-region, pgg-encrypt-region): * gnus/gnus-art.el (pgg-snarf-keys-region): Autoload since PGG is now obsolete in Emacs. --- lisp/ChangeLog | 6 ++++++ lisp/gnus/ChangeLog | 6 ++++++ lisp/gnus/gnus-art.el | 1 + lisp/gnus/mml1991.el | 3 +++ lisp/{ => obsolete}/pgg-def.el | 0 lisp/{ => obsolete}/pgg-gpg.el | 0 lisp/{ => obsolete}/pgg-parse.el | 0 lisp/{ => obsolete}/pgg-pgp.el | 0 lisp/{ => obsolete}/pgg-pgp5.el | 0 lisp/{ => obsolete}/pgg.el | 5 ----- 10 files changed, 16 insertions(+), 5 deletions(-) rename lisp/{ => obsolete}/pgg-def.el (100%) rename lisp/{ => obsolete}/pgg-gpg.el (100%) rename lisp/{ => obsolete}/pgg-parse.el (100%) rename lisp/{ => obsolete}/pgg-pgp.el (100%) rename lisp/{ => obsolete}/pgg-pgp5.el (100%) rename lisp/{ => obsolete}/pgg.el (99%) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8b60f871d78..e39cfc83d0c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2010-12-21 Daiki Ueno + + * obsolete/pgg-parse.el, obsolete/pgg-pgp5.el, obsolete/pgg-pgp.el, + * obsolete/pgg-gpg.el, obsolete/pgg-def.el, obsolete/pgg.el: Move + from lisp/. + 2010-12-20 Leo * dnd.el (dnd-get-local-file-name): Unhex of file name shall diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 42327335286..4cfe8b7b517 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,9 @@ +2010-12-21 Daiki Ueno + + * mml1991.el (pgg-sign-region, pgg-encrypt-region): + * gnus-art.el (pgg-snarf-keys-region): Autoload since PGG is now + obsolete in Emacs. + 2010-12-17 Lars Magne Ingebrigtsen * gnus-group.el (gnus-group-delete-articles): New command. diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el index 8d8aaa0e36e..bf1b1b5b365 100644 --- a/lisp/gnus/gnus-art.el +++ b/lisp/gnus/gnus-art.el @@ -8086,6 +8086,7 @@ url is put as the `gnus-button-url' overlay property on the button." (Info-index-next 1))) nil))) +(autoload 'pgg-snarf-keys-region "pgg") ;; Called after pgg-snarf-keys-region, which autoloads pgg.el. (declare-function pgg-display-output-buffer "pgg" (start end status)) diff --git a/lisp/gnus/mml1991.el b/lisp/gnus/mml1991.el index 98e7903b015..b093ec26da9 100644 --- a/lisp/gnus/mml1991.el +++ b/lisp/gnus/mml1991.el @@ -168,6 +168,9 @@ Whether the passphrase is cached at all is controlled by ;; pgg wrapper +(autoload 'pgg-sign-region "pgg") +(autoload 'pgg-encrypt-region "pgg") + (defvar pgg-default-user-id) (defvar pgg-errors-buffer) (defvar pgg-output-buffer) diff --git a/lisp/pgg-def.el b/lisp/obsolete/pgg-def.el similarity index 100% rename from lisp/pgg-def.el rename to lisp/obsolete/pgg-def.el diff --git a/lisp/pgg-gpg.el b/lisp/obsolete/pgg-gpg.el similarity index 100% rename from lisp/pgg-gpg.el rename to lisp/obsolete/pgg-gpg.el diff --git a/lisp/pgg-parse.el b/lisp/obsolete/pgg-parse.el similarity index 100% rename from lisp/pgg-parse.el rename to lisp/obsolete/pgg-parse.el diff --git a/lisp/pgg-pgp.el b/lisp/obsolete/pgg-pgp.el similarity index 100% rename from lisp/pgg-pgp.el rename to lisp/obsolete/pgg-pgp.el diff --git a/lisp/pgg-pgp5.el b/lisp/obsolete/pgg-pgp5.el similarity index 100% rename from lisp/pgg-pgp5.el rename to lisp/obsolete/pgg-pgp5.el diff --git a/lisp/pgg.el b/lisp/obsolete/pgg.el similarity index 99% rename from lisp/pgg.el rename to lisp/obsolete/pgg.el index f654f3dc35e..f851903a3e1 100644 --- a/lisp/pgg.el +++ b/lisp/obsolete/pgg.el @@ -23,11 +23,6 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs. If not, see . -;;; Commentary: - -;; This file is on its way to obsolescence, waiting for allout.el to -;; switch to EPG. - ;;; Code: (require 'pgg-def) -- 2.39.5