merge from trunk

2 files changed, 14 insertions, 9 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 636e09cbe73..53fd1274937 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-08-26  Tassilo Horn  <tsdh@gnu.org>
+
+        * epa-hook.el (epa-file-encrypt-to): Quote `safe-local-variable'
+        lambda expression in order to have `describe-variable' display it.
+
 2013-08-26  Michael Albinus  <michael.albinus@gmx.de>
 
         * net/tramp-sh.el (tramp-sh-handle-verify-visited-file-modtime):
diff --git a/lisp/epa-hook.el b/lisp/epa-hook.el
index fc0aa3677bf..f320823a5ab 100644
--- a/lisp/epa-hook.el
+++ b/lisp/epa-hook.el
@@ -53,15 +53,15 @@ does that automatically."
 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)