summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/gnus/ChangeLog6
-rw-r--r--lisp/gnus/gnus-art.el1
-rw-r--r--lisp/gnus/mml1991.el3
-rw-r--r--lisp/obsolete/pgg-def.el (renamed from lisp/pgg-def.el)0
-rw-r--r--lisp/obsolete/pgg-gpg.el (renamed from lisp/pgg-gpg.el)0
-rw-r--r--lisp/obsolete/pgg-parse.el (renamed from lisp/pgg-parse.el)0
-rw-r--r--lisp/obsolete/pgg-pgp.el (renamed from lisp/pgg-pgp.el)0
-rw-r--r--lisp/obsolete/pgg-pgp5.el (renamed from lisp/pgg-pgp5.el)0
-rw-r--r--lisp/obsolete/pgg.el (renamed from lisp/pgg.el)5
10 files changed, 16 insertions, 5 deletions
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 <ueno@unixuser.org>
+
+ * 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 <sdl.web@gmail.com>
* 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 <ueno@unixuser.org>
+
+ * 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 <larsi@gnus.org>
* 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
index d1b78ccb30b..d1b78ccb30b 100644
--- a/lisp/pgg-def.el
+++ b/lisp/obsolete/pgg-def.el
diff --git a/lisp/pgg-gpg.el b/lisp/obsolete/pgg-gpg.el
index 97b3b3e3d42..97b3b3e3d42 100644
--- a/lisp/pgg-gpg.el
+++ b/lisp/obsolete/pgg-gpg.el
diff --git a/lisp/pgg-parse.el b/lisp/obsolete/pgg-parse.el
index 72f8729de77..72f8729de77 100644
--- a/lisp/pgg-parse.el
+++ b/lisp/obsolete/pgg-parse.el
diff --git a/lisp/pgg-pgp.el b/lisp/obsolete/pgg-pgp.el
index dfa02d78353..dfa02d78353 100644
--- a/lisp/pgg-pgp.el
+++ b/lisp/obsolete/pgg-pgp.el
diff --git a/lisp/pgg-pgp5.el b/lisp/obsolete/pgg-pgp5.el
index 49731190946..49731190946 100644
--- a/lisp/pgg-pgp5.el
+++ b/lisp/obsolete/pgg-pgp5.el
diff --git a/lisp/pgg.el b/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 <http://www.gnu.org/licenses/>.
-;;; Commentary:
-
-;; This file is on its way to obsolescence, waiting for allout.el to
-;; switch to EPG.
-
;;; Code:
(require 'pgg-def)