Merge from emacs-23; up to 2010-06-01T01:49:15Z!monnier@iro.umontreal.ca

1 files changed, 2 insertions, 0 deletions

diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi
index 5b5f3365978..0cdcaa84d58 100644
--- a/doc/lispref/variables.texi
+++ b/doc/lispref/variables.texi
@@ -1407,6 +1407,8 @@ subsequent major mode.  @xref{Hooks}.
 @cindex permanent local variable
 A buffer-local variable is @dfn{permanent} if the variable name (a
 symbol) has a @code{permanent-local} property that is non-@code{nil}.
+Such variables are unaffected by @code{kill-all-local-variables}, and
+their local bindings are therefore not cleared by changing major modes.
 Permanent locals are appropriate for data pertaining to where the file
 came from or how to save it, rather than with how to edit the contents.