diff options
| author | Paul Eggert | 2011-12-10 16:56:50 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-12-10 16:56:50 -0800 |
| commit | 8f50130c565eaf0ad7c49e4ad044c3291ecdfa71 (patch) | |
| tree | c8129448cbbf387fe82667ccac02983592c688f1 /src/textprop.c | |
| parent | 85a83e2e2585a1906dec5168ed96ad521b5849ed (diff) | |
| parent | 7b9d523a07395ecea505be88f45c33d73aea7038 (diff) | |
| download | emacs-8f50130c565eaf0ad7c49e4ad044c3291ecdfa71.tar.gz emacs-8f50130c565eaf0ad7c49e4ad044c3291ecdfa71.zip | |
Merge from trunk.
Diffstat (limited to 'src/textprop.c')
| -rw-r--r-- | src/textprop.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/textprop.c b/src/textprop.c index a877e2a67ae..1a635444b00 100644 --- a/src/textprop.c +++ b/src/textprop.c | |||
| @@ -1625,7 +1625,7 @@ Return t if any property was actually removed, nil otherwise. */) | |||
| 1625 | 1625 | ||
| 1626 | DEFUN ("text-property-any", Ftext_property_any, | 1626 | DEFUN ("text-property-any", Ftext_property_any, |
| 1627 | Stext_property_any, 4, 5, 0, | 1627 | Stext_property_any, 4, 5, 0, |
| 1628 | doc: /* Check text from START to END for property PROPERTY equalling VALUE. | 1628 | doc: /* Check text from START to END for property PROPERTY equaling VALUE. |
| 1629 | If so, return the position of the first character whose property PROPERTY | 1629 | If so, return the position of the first character whose property PROPERTY |
| 1630 | is `eq' to VALUE. Otherwise return nil. | 1630 | is `eq' to VALUE. Otherwise return nil. |
| 1631 | If the optional fifth argument OBJECT is a buffer (or nil, which means | 1631 | If the optional fifth argument OBJECT is a buffer (or nil, which means |
| @@ -1661,7 +1661,7 @@ markers). If OBJECT is a string, START and END are 0-based indices into it. */ | |||
| 1661 | 1661 | ||
| 1662 | DEFUN ("text-property-not-all", Ftext_property_not_all, | 1662 | DEFUN ("text-property-not-all", Ftext_property_not_all, |
| 1663 | Stext_property_not_all, 4, 5, 0, | 1663 | Stext_property_not_all, 4, 5, 0, |
| 1664 | doc: /* Check text from START to END for property PROPERTY not equalling VALUE. | 1664 | doc: /* Check text from START to END for property PROPERTY not equaling VALUE. |
| 1665 | If so, return the position of the first character whose property PROPERTY | 1665 | If so, return the position of the first character whose property PROPERTY |
| 1666 | is not `eq' to VALUE. Otherwise, return nil. | 1666 | is not `eq' to VALUE. Otherwise, return nil. |
| 1667 | If the optional fifth argument OBJECT is a buffer (or nil, which means | 1667 | If the optional fifth argument OBJECT is a buffer (or nil, which means |