Fix doc of local-variable-if-set-p.

* doc/lispref/variables.texi (Creating Buffer-Local): Fix description of
local-variable-if-set-p.

* src/data.c (Flocal_variable_if_set_p): Doc fix (Bug#10713).

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 9a747838c2694b5e291d4aad48fcaa4d533f7f5f..4bd7210d7d64a23dd533c17db7683767947979d7 100644 (file)
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,5 +1,8 @@
 2012-09-07  Chong Yidong  <cyd@gnu.org>
 
+       * variables.texi (Creating Buffer-Local): Fix description of
+       local-variable-if-set-p (Bug#10713).
+
        * eval.texi (Intro Eval): Add index entry for sexp (Bug#12233).
 
        * windows.texi (Display Action Functions)

diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi
index 3b078e7e19f2388bd5e17fe73166dd5c23225f6c..c5b66757ace59a54c92469763b6397164ab51d9c 100644 (file)
--- a/doc/lispref/variables.texi
+++ b/doc/lispref/variables.texi
@@ -1302,9 +1302,10 @@ This returns @code{t} if @var{variable} is buffer-local in buffer
 @end defun
 
 @defun local-variable-if-set-p variable &optional buffer
-This returns @code{t} if @var{variable} will become buffer-local in
-buffer @var{buffer} (which defaults to the current buffer) if it is
-set there.
+This returns @code{t} if @var{variable} either has a buffer-local
+value in buffer @var{buffer}, or is automatically buffer-local.
+Otherwise, it returns @code{nil}.  If omitted or @code{nil},
+@var{buffer} defaults to the current buffer.
 @end defun
 
 @defun buffer-local-value variable buffer

diff --git a/src/ChangeLog b/src/ChangeLog
index e4c94a2616b5decf94e401b186be12dd4c6f53f5..829586dc59e6d2853aebc4fd08234e73fdda0192 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2012-09-07  Chong Yidong  <cyd@gnu.org>
+
+       * data.c (Flocal_variable_if_set_p): Doc fix (Bug#10713).
+
 2012-09-07  Paul Eggert  <eggert@cs.ucla.edu>
 
        More signal-handler cleanup (Bug#12327).

diff --git a/src/data.c b/src/data.c
index 5fbf43e424e7e4939dfe9819ae1aa0d3beb6596f..de107fc04a5d1b7aa56b2d1d9caa9bde7230d1ff 100644 (file)
--- a/src/data.c
+++ b/src/data.c
@@ -1882,12 +1882,12 @@ BUFFER defaults to the current buffer.  */)
 
 DEFUN ("local-variable-if-set-p", Flocal_variable_if_set_p, Slocal_variable_if_set_p,
        1, 2, 0,
-       doc: /* Non-nil if VARIABLE will be local in buffer BUFFER when set there.
-More precisely, this means that setting the variable \(with `set' or`setq'),
-while it does not have a `let'-style binding that was made in BUFFER,
-will produce a buffer local binding.  See Info node
-`(elisp)Creating Buffer-Local'.
-BUFFER defaults to the current buffer.  */)
+       doc: /* Non-nil if VARIABLE is local in buffer BUFFER when set there.
+BUFFER defaults to the current buffer.
+
+More precisely, return non-nil if either VARIABLE already has a local
+value in BUFFER, or if VARIABLE is automatically buffer-local (see
+`make-variable-buffer-local').  */)
   (register Lisp_Object variable, Lisp_Object buffer)
 {
   struct Lisp_Symbol *sym;