diff options
| author | Chong Yidong <cyd@gnu.org> | 2012-09-07 22:45:28 +0800 |
|---|---|---|
| committer | Chong Yidong <cyd@gnu.org> | 2012-09-07 22:45:28 +0800 |
| commit | b4f5313e931a577f5db487ff9bd9c03d3a3c37a7 (patch) | |
| tree | 680d01f63f3e6170975711a037d5c5f4e3a11d80 /src | |
| parent | 1a5432bc0480ab64dd7ac5d57d1025bdc3f0402b (diff) | |
| download | emacs-b4f5313e931a577f5db487ff9bd9c03d3a3c37a7.tar.gz | |
* src/textprop.c (Fget_text_property): Minor doc fix.
Fixes: debbugs:12323
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/textprop.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 829586dc59e..bdbc97fdb1c 100644 --- 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 b6895fc426a..2a9efba1c45 100644 --- 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) { |