aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2011-04-24 19:28:57 +0300
committerEli Zaretskii2011-04-24 19:28:57 +0300
commite2ad650c71e9f0477163532e708e1054452fa34f (patch)
tree201026b846a10ce0a534333456b9e9edbaef0d8b
parent1b2de274591d07480256539c4be65299d1dde3e9 (diff)
downloademacs-e2ad650c71e9f0477163532e708e1054452fa34f.tar.gz
emacs-e2ad650c71e9f0477163532e708e1054452fa34f.zip
Minor cleanup in src/textprop.c.
src/textprop.c (syms_of_textprop): Remove dead code. (copy_text_properties): Delete obsolete commentary about an interface that was deleted long ago. Fix typos in the description of arguments.
-rw-r--r--src/ChangeLog5
-rw-r--r--src/textprop.c12
2 files changed, 7 insertions, 10 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 7efd8dad6cc..f4dd3492001 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,10 @@
12011-04-24 Eli Zaretskii <eliz@gnu.org> 12011-04-24 Eli Zaretskii <eliz@gnu.org>
2 2
3 * textprop.c (syms_of_textprop): Remove dead code.
4 (copy_text_properties): Delete obsolete commentary about an
5 interface that was deleted long ago. Fix typos in the description
6 of arguments.
7
3 * msdos.c (XMenuActivate, XMenuAddSelection): Adjust argument list 8 * msdos.c (XMenuActivate, XMenuAddSelection): Adjust argument list
4 to changes in oldXMenu/XMenu.h from 2011-04-16. 9 to changes in oldXMenu/XMenu.h from 2011-04-16.
5 <menu_help_message, prev_menu_help_message>: Constify. 10 <menu_help_message, prev_menu_help_message>: Constify.
diff --git a/src/textprop.c b/src/textprop.c
index 1c56dfc0cf0..a224c121e21 100644
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -1756,15 +1756,9 @@ text_property_stickiness (Lisp_Object prop, Lisp_Object pos, Lisp_Object buffer)
1756} 1756}
1757 1757
1758 1758
1759/* I don't think this is the right interface to export; how often do you 1759/* Copying properties between objects. */
1760 want to do something like this, other than when you're copying objects
1761 around?
1762 1760
1763 I think it would be better to have a pair of functions, one which 1761/* Add properties from START to END of SRC, starting at POS in DEST.
1764 returns the text properties of a region as a list of ranges and
1765 plists, and another which applies such a list to another object. */
1766
1767/* Add properties from SRC to SRC of SRC, starting at POS in DEST.
1768 SRC and DEST may each refer to strings or buffers. 1762 SRC and DEST may each refer to strings or buffers.
1769 Optional sixth argument PROP causes only that property to be copied. 1763 Optional sixth argument PROP causes only that property to be copied.
1770 Properties are copied to DEST as if by `add-text-properties'. 1764 Properties are copied to DEST as if by `add-text-properties'.
@@ -2304,6 +2298,4 @@ inherits it if NONSTICKINESS is nil. The `front-sticky' and
2304 defsubr (&Sremove_list_of_text_properties); 2298 defsubr (&Sremove_list_of_text_properties);
2305 defsubr (&Stext_property_any); 2299 defsubr (&Stext_property_any);
2306 defsubr (&Stext_property_not_all); 2300 defsubr (&Stext_property_not_all);
2307/* defsubr (&Serase_text_properties); */
2308/* defsubr (&Scopy_text_properties); */
2309} 2301}