aboutsummaryrefslogtreecommitdiffstats
path: root/src/syntax.c
diff options
context:
space:
mode:
authorDaniel Colascione2012-10-07 14:31:58 -0800
committerDaniel Colascione2012-10-07 14:31:58 -0800
commit36a305a723c63fd345be65c536c52fe9765c14be (patch)
treefb89d9e103552863214c60297a65320917109357 /src/syntax.c
parent2ab329f3b5d52a39f0a45c3d9c129f1c19560142 (diff)
parent795b1482a9e314cda32d62ac2988f573d359366e (diff)
downloademacs-36a305a723c63fd345be65c536c52fe9765c14be.tar.gz
emacs-36a305a723c63fd345be65c536c52fe9765c14be.zip
Merge from trunk
Diffstat (limited to 'src/syntax.c')
-rw-r--r--src/syntax.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/syntax.c b/src/syntax.c
index 91ef4e66663..d3cafcc472e 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -151,7 +151,7 @@ static void scan_sexps_forward (struct lisp_parse_state *,
151static int in_classes (int, Lisp_Object); 151static int in_classes (int, Lisp_Object);
152 152
153/* This setter is used only in this file, so it can be private. */ 153/* This setter is used only in this file, so it can be private. */
154static inline void 154static void
155bset_syntax_table (struct buffer *b, Lisp_Object val) 155bset_syntax_table (struct buffer *b, Lisp_Object val)
156{ 156{
157 b->INTERNAL_FIELD (syntax_table) = val; 157 b->INTERNAL_FIELD (syntax_table) = val;
@@ -372,7 +372,7 @@ char_quoted (ptrdiff_t charpos, ptrdiff_t bytepos)
372/* Return the bytepos one character before BYTEPOS. 372/* Return the bytepos one character before BYTEPOS.
373 We assume that BYTEPOS is not at the start of the buffer. */ 373 We assume that BYTEPOS is not at the start of the buffer. */
374 374
375static inline ptrdiff_t 375static ptrdiff_t
376dec_bytepos (ptrdiff_t bytepos) 376dec_bytepos (ptrdiff_t bytepos)
377{ 377{
378 if (NILP (BVAR (current_buffer, enable_multibyte_characters))) 378 if (NILP (BVAR (current_buffer, enable_multibyte_characters)))