aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJuanma Barranquero2008-06-01 04:24:43 +0000
committerJuanma Barranquero2008-06-01 04:24:43 +0000
commit518c0b8331e95a5e7f41e7ac9da62839f8e3b3a5 (patch)
tree271736b24648a83ea6d0ce5c557bc6c2f59502e4 /src
parent3f715d17fef56ee78a3df7ebb00d4e8b1aec37de (diff)
downloademacs-518c0b8331e95a5e7f41e7ac9da62839f8e3b3a5.tar.gz
emacs-518c0b8331e95a5e7f41e7ac9da62839f8e3b3a5.zip
(syms_of_textprop) <text-property-default-nonsticky>:
(Fremove_text_properties): Fix typos in docstrings.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/textprop.c6
2 files changed, 8 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 34a825d0720..c8cbaf174dd 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12008-06-01 Juanma Barranquero <lekktu@gmail.com>
2
3 * textprop.c (syms_of_textprop) <text-property-default-nonsticky>:
4 (Fremove_text_properties): Fix typos in docstrings.
5
12008-05-31 Kenichi Handa <handa@m17n.org> 62008-05-31 Kenichi Handa <handa@m17n.org>
2 7
3 * font.c (font_list_entities): Fix the car part of data to be 8 * font.c (font_list_entities): Fix the car part of data to be
diff --git a/src/textprop.c b/src/textprop.c
index 75e804467d9..6bc1938fadf 100644
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -1504,7 +1504,7 @@ the current buffer), START and END are buffer positions (integers or
1504markers). If OBJECT is a string, START and END are 0-based indices into it. 1504markers). If OBJECT is a string, START and END are 0-based indices into it.
1505Return t if any property was actually removed, nil otherwise. 1505Return t if any property was actually removed, nil otherwise.
1506 1506
1507Use set-text-properties if you want to remove all text properties. */) 1507Use `set-text-properties' if you want to remove all text properties. */)
1508 (start, end, properties, object) 1508 (start, end, properties, object)
1509 Lisp_Object start, end, properties, object; 1509 Lisp_Object start, end, properties, object;
1510{ 1510{
@@ -2294,8 +2294,8 @@ Each element has the form (PROPERTY . NONSTICKINESS).
2294 2294
2295If a character in a buffer has PROPERTY, new text inserted adjacent to 2295If a character in a buffer has PROPERTY, new text inserted adjacent to
2296the character doesn't inherit PROPERTY if NONSTICKINESS is non-nil, 2296the character doesn't inherit PROPERTY if NONSTICKINESS is non-nil,
2297inherits it if NONSTICKINESS is nil. The front-sticky and 2297inherits it if NONSTICKINESS is nil. The `front-sticky' and
2298rear-nonsticky properties of the character overrides NONSTICKINESS. */); 2298`rear-nonsticky' properties of the character override NONSTICKINESS. */);
2299 /* Text property `syntax-table' should be nonsticky by default. */ 2299 /* Text property `syntax-table' should be nonsticky by default. */
2300 Vtext_property_default_nonsticky 2300 Vtext_property_default_nonsticky
2301 = Fcons (Fcons (intern ("syntax-table"), Qt), Qnil); 2301 = Fcons (Fcons (intern ("syntax-table"), Qt), Qnil);