merge from trunk

2 files changed, 5 insertions, 2 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index d2e86c25cc1..d27f58c0efa 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2013-08-26  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * variables.texi (File Local Variables): Don't recommend quoting!  Ever!
+
 2013-08-20  Eli Zaretskii  <eliz@gnu.org>
 
         * files.texi (Information about Files): Mention file names with
diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi
index 557add738ba..866f3774999 100644
--- a/doc/lispref/variables.texi
+++ b/doc/lispref/variables.texi
@@ -1649,8 +1649,7 @@ non-@code{nil} given that value.  Many commonly-encountered file
 variables have @code{safe-local-variable} properties; these include
 @code{fill-column}, @code{fill-prefix}, and @code{indent-tabs-mode}.
 For boolean-valued variables that are safe, use @code{booleanp} as the
-property value.  Lambda expressions should be quoted so that
-@code{describe-variable} can display the predicate.
+property value.
 
   When defining a user option using @code{defcustom}, you can set its
 @code{safe-local-variable} property by adding the arguments