* src/textprop.c (Fget_text_property): Minor doc fix.

Fixes: debbugs:12323

diff --git a/src/ChangeLog b/src/ChangeLog
index 829586dc59e6d2853aebc4fd08234e73fdda0192..bdbc97fdb1c447f00438b20f36b268d8e31d4108 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2012-09-07  Chong Yidong  <cyd@gnu.org>
 
+       * textprop.c (Fget_text_property): Minor doc fix (Bug#12323).
+
        * data.c (Flocal_variable_if_set_p): Doc fix (Bug#10713).
 
 2012-09-07  Paul Eggert  <eggert@cs.ucla.edu>

diff --git a/src/textprop.c b/src/textprop.c
index b6895fc426a0ad8dc7e73c2669a2cf0768705ccd..2a9efba1c45ae4bd2b017ae2f9bd82ce5bb4f6ec 100644 (file)
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -556,7 +556,8 @@ If POSITION is at the end of OBJECT, the value is nil.  */)
 
 DEFUN ("get-text-property", Fget_text_property, Sget_text_property, 2, 3, 0,
        doc: /* Return the value of POSITION's property PROP, in OBJECT.
-OBJECT is optional and defaults to the current buffer.
+OBJECT should be a buffer or a string; if omitted or nil, it defaults
+to the current buffer.
 If POSITION is at the end of OBJECT, the value is nil.  */)
   (Lisp_Object position, Lisp_Object prop, Lisp_Object object)
 {