Merge changes from emacs-23 branch

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 3758c3e..f69eeea 100644 (file)
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-27  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * variables.texi (Creating Buffer-Local): Warn against misuses of
+       make-variable-buffer-local (bug#10258).
+
 2012-01-07  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * macros.texi (Defining Macros): Document `doc-string' (bug#9668).

diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi
index 5bc9c11..b0a6795 100644 (file)
--- a/doc/lispref/variables.texi
+++ b/doc/lispref/variables.texi
@@ -1351,7 +1351,10 @@ needed if you use the @var{local} argument to @code{add-hook} or
 @deffn Command make-variable-buffer-local variable
 This function marks @var{variable} (a symbol) automatically
 buffer-local, so that any subsequent attempt to set it will make it
-local to the current buffer at the time.
+local to the current buffer at the time.  Unlike
+@code{make-local-variable}, with which it is often confused, this
+cannot be undone, and affects the behavior of the variable in all
+buffers.
 
 A peculiar wrinkle of this feature is that binding the variable (with
 @code{let} or other binding constructs) does not create a buffer-local