summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChong Yidong <cyd@gnu.org>2012-01-09 13:29:45 +0800
committerChong Yidong <cyd@gnu.org>2012-01-09 13:29:45 +0800
commit6a43ef8e8508df7d732e639ec75f657f4363e27a (patch)
tree687df010502f24d55598198ea3b961a27cfdf960
parent9d5a8f0b3c3fe959d307d5b2f106943aa970c59b (diff)
parent9ca4c014c87716b8712f710cbc8bbdf1421a08fc (diff)
downloademacs-6a43ef8e8508df7d732e639ec75f657f4363e27a.tar.gz
Merge changes from emacs-23 branch
-rw-r--r--doc/lispref/ChangeLog5
-rw-r--r--doc/lispref/variables.texi5
2 files changed, 9 insertions, 1 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 3758c3e97b0..f69eeeaadd4 100644
--- 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 5bc9c1157e2..b0a6795021b 100644
--- 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