[Emacs-diffs] /srv/bzr/emacs/trunk r106823: Merge changes from emacs-23 branch

[Chong Yidong]

------------------------------------------------------------
revno: 106823 [merge]
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Mon 2012-01-09 13:29:45 +0800
message:
  Merge changes from emacs-23 branch
modified:
  doc/lispref/ChangeLog
  doc/lispref/variables.texi

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2012-01-07 05:48:06 +0000
+++ b/doc/lispref/ChangeLog     2012-01-09 05:29:45 +0000
@@ -1,3 +1,8 @@
+2011-12-27  Stefan Monnier  <address@hidden>
+
+       * variables.texi (Creating Buffer-Local): Warn against misuses of
+       make-variable-buffer-local (bug#10258).
+
 2012-01-07  Lars Magne Ingebrigtsen  <address@hidden>
 
        * macros.texi (Defining Macros): Document `doc-string' (bug#9668).

=== modified file 'doc/lispref/variables.texi'
--- a/doc/lispref/variables.texi        2012-01-06 10:53:41 +0000
+++ b/doc/lispref/variables.texi        2012-01-09 05:29:45 +0000
@@ -1351,7 +1351,10 @@
 @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
address@hidden, 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