Merge from mainline.

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

diff --git a/lisp/obsolete/pgg-pgp5.el b/lisp/obsolete/pgg-pgp5.el
index dd662c21d25733c26e1fc83ba83689d2d7a0e288..c453ce3e08e4d4700c4808309e117906a6980e1d 100644 (file)
--- a/lisp/obsolete/pgg-pgp5.el
+++ b/lisp/obsolete/pgg-pgp5.el
@@ -1,7 +1,6 @@
 ;;; pgg-pgp5.el --- PGP 5.* support for PGG.
 
-;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2000, 2002-2013 Free Software Foundation, Inc.
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Created: 1999/11/02
@@ -27,8 +26,9 @@
 ;;; Code:
 
 (eval-when-compile
-  (require 'cl)                                ; for pgg macros
-  (require 'pgg))
+  (require 'cl))
+
+(require 'pgg)
 
 (defgroup pgg-pgp5 ()
   "PGP 5.* interface."