X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/7c82f3e23e37cc848a38b1f8be7149fd672a6393..5deebc3c914c86e84d11661a7877c00b2d7fddd1:/lisp/epa-hook.el

diff --git a/lisp/epa-hook.el b/lisp/epa-hook.el
index 594f482b57..cd9c3d38e5 100644
--- a/lisp/epa-hook.el
+++ b/lisp/epa-hook.el
@@ -1,5 +1,5 @@
-;;; epa-hook.el --- preloaded code to enable epa-file.el
-;; Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;;; epa-hook.el --- preloaded code to enable epa-file.el -*- lexical-binding: t -*-
+;; Copyright (C) 2006-2016 Free Software Foundation, Inc.
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Keywords: PGP, GnuPG
@@ -49,19 +49,19 @@ does that automatically."
   :group 'epa-file)
 
 (defvar epa-file-encrypt-to nil
-  "*Recipient(s) used for encrypting files.
+  "Recipient(s) used for encrypting files.
 May either be a string or a list of strings.")
 
 (put 'epa-file-encrypt-to 'safe-local-variable
-     (lambda (val)
-       (or (stringp val)
-	   (and (listp val)
-		(catch 'safe
-		  (mapc (lambda (elt)
-			  (unless (stringp elt)
-			    (throw 'safe nil)))
-			val)
-		  t)))))
+     #'(lambda (val)
+	 (or (stringp val)
+	     (and (listp val)
+		  (catch 'safe
+		    (mapc (lambda (elt)
+			    (unless (stringp elt)
+			      (throw 'safe nil)))
+			  val)
+		    t)))))
 
 (put 'epa-file-encrypt-to 'permanent-local t)
 
@@ -83,9 +83,10 @@ May either be a string or a list of strings.")
       (auto-save-mode 0)))
 
 (define-minor-mode auto-encryption-mode
-  "Toggle automatic file encryption and decryption.
-With prefix argument ARG, turn auto encryption on if positive, else off.
-Return the new status of auto encryption (non-nil means on)."
+  "Toggle automatic file encryption/decryption (Auto Encryption mode).
+With a prefix argument ARG, enable Auto Encryption mode if ARG is
+positive, and disable it otherwise.  If called from Lisp, enable
+the mode if ARG is omitted or nil."
   :global t :init-value t :group 'epa-file :version "23.1"
   ;; We'd like to use custom-initialize-set here so the setup is done
   ;; before dumping, but at the point where the defcustom is evaluated,