aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/syntax.c10
2 files changed, 9 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 40647d79589..ec6e39ad0b5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12012-09-08 Chong Yidong <cyd@gnu.org>
2
3 * syntax.c (Fstring_to_syntax): Doc fix.
4
12012-09-08 Jan Djärv <jan.h.d@swipnet.se> 52012-09-08 Jan Djärv <jan.h.d@swipnet.se>
2 6
3 * nsterm.m (ns_clip_to_row): Remove code that deals with drawing fringe 7 * nsterm.m (ns_clip_to_row): Remove code that deals with drawing fringe
diff --git a/src/syntax.c b/src/syntax.c
index f995b8f2cac..fdd9353bb87 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -921,11 +921,11 @@ DEFUN ("matching-paren", Fmatching_paren, Smatching_paren, 1, 1, 0,
921} 921}
922 922
923DEFUN ("string-to-syntax", Fstring_to_syntax, Sstring_to_syntax, 1, 1, 0, 923DEFUN ("string-to-syntax", Fstring_to_syntax, Sstring_to_syntax, 1, 1, 0,
924 doc: /* Convert a syntax specification STRING into syntax cell form. 924 doc: /* Convert a syntax descriptor STRING into a raw syntax descriptor.
925STRING should be a string as it is allowed as argument of 925STRING should be a string of the form allowed as argument of
926`modify-syntax-entry'. Value is the equivalent cons cell 926`modify-syntax-entry'. The return value is a raw syntax descriptor: a
927\(CODE . MATCHING-CHAR) that can be used as value of a `syntax-table' 927cons cell \(CODE . MATCHING-CHAR) which can be used, for example, as
928text property. */) 928the value of a `syntax-table' text property. */)
929 (Lisp_Object string) 929 (Lisp_Object string)
930{ 930{
931 register const unsigned char *p; 931 register const unsigned char *p;