Update copyright year to 2016

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

diff --git a/lisp/obsolete/pgg-gpg.el b/lisp/obsolete/pgg-gpg.el
index 35d806568719d78fa0801874109642ee1b83a9f7..77de1bbfd5f86d4d8bce82471c944b0e65f02693 100644 (file)
--- a/lisp/obsolete/pgg-gpg.el
+++ b/lisp/obsolete/pgg-gpg.el
@@ -1,7 +1,6 @@
 ;;; pgg-gpg.el --- GnuPG support for PGG.
 
-;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2000, 2002-2016 Free Software Foundation, Inc.
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Symmetric encryption and gpg-agent support added by:
@@ -29,8 +28,9 @@
 ;;; Code:
 
 (eval-when-compile
-  (require 'cl)                                ; for gpg macros
-  (require 'pgg))
+  (require 'cl))
+
+(require 'pgg)
 
 (defgroup pgg-gpg ()
   "GnuPG interface."
@@ -122,7 +122,7 @@
                  (insert-file-contents output-file-name)))
            (set-buffer errors-buffer)
            (if (memq status '(stop signal))
-               (error "%s exited abnormally: '%s'" program exit-status))
+               (error "%s exited abnormally: `%s'" program exit-status))
            (if (= 127 exit-status)
                (error "%s could not be found" program))))
       (if passphrase-with-newline
@@ -385,7 +385,7 @@ passphrase cache or user."
     (pgg-process-when-success)))
 
 (defun pgg-gpg-update-agent ()
-  "Try to connet to gpg-agent and send UPDATESTARTUPTTY."
+  "Try to connect to gpg-agent and send UPDATESTARTUPTTY."
   (if (fboundp 'make-network-process)
       (let* ((agent-info (getenv "GPG_AGENT_INFO"))
             (socket (and agent-info