Merge from origin/emacs-24

[gnu-emacs] / lisp / obsolete / pgg-gpg.el

diff --git a/lisp/obsolete/pgg-gpg.el b/lisp/obsolete/pgg-gpg.el
index 2eafc631e9895b6c18d1f8634eea1a1b4ccd0d02..5b405e40c2ca93187533f955d8f78979cddf2761 100644 (file)
--- a/lisp/obsolete/pgg-gpg.el
+++ b/lisp/obsolete/pgg-gpg.el
@@ -1,6 +1,6 @@
 ;;; pgg-gpg.el --- GnuPG support for PGG.
 
-;; Copyright (C) 1999-2000, 2002-2011 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2000, 2002-2015 Free Software Foundation, Inc.
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Symmetric encryption and gpg-agent support added by:
@@ -28,8 +28,9 @@
 ;;; Code:
 
 (eval-when-compile
-  (require 'cl)                                ; for gpg macros
-  (require 'pgg))
+  (require 'cl))
+
+(require 'pgg)
 
 (defgroup pgg-gpg ()
   "GnuPG interface."