From 1a5432bc0480ab64dd7ac5d57d1025bdc3f0402b Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Fri, 7 Sep 2012 22:15:59 +0800 Subject: [PATCH] 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). --- doc/lispref/ChangeLog | 3 +++ doc/lispref/variables.texi | 7 ++++--- src/ChangeLog | 4 ++++ src/data.c | 12 ++++++------ 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 9a747838c26..4bd7210d7d6 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,5 +1,8 @@ 2012-09-07 Chong Yidong + * 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 3b078e7e19f..c5b66757ace 100644 --- 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 e4c94a2616b..829586dc59e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2012-09-07 Chong Yidong + + * data.c (Flocal_variable_if_set_p): Doc fix (Bug#10713). + 2012-09-07 Paul Eggert More signal-handler cleanup (Bug#12327). diff --git a/src/data.c b/src/data.c index 5fbf43e424e..de107fc04a5 100644 --- 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; -- 2.39.2