aboutsummaryrefslogtreecommitdiffstats
path: root/src/syntax.c
diff options
context:
space:
mode:
authorPaul Eggert2011-03-16 14:43:38 -0700
committerPaul Eggert2011-03-16 14:43:38 -0700
commit01f44d5a68abccff781109300abf0616949b99c5 (patch)
tree5f23961e37da8145079502fec6629a1869c8ea49 /src/syntax.c
parent0902fe454066bb22a1c3874bb8d58693f39b78df (diff)
downloademacs-01f44d5a68abccff781109300abf0616949b99c5.tar.gz
emacs-01f44d5a68abccff781109300abf0616949b99c5.zip
* syntax.c (Fforward_comment, scan_lists): Rename locals to avoid
shadowing.
Diffstat (limited to 'src/syntax.c')
-rw-r--r--src/syntax.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/src/syntax.c b/src/syntax.c
index 707c2c19f31..1a615d735e4 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -554,7 +554,7 @@ back_comment (EMACS_INT from, EMACS_INT from_byte, EMACS_INT stop, int comnested
554 com2end = (SYNTAX_FLAGS_COMEND_FIRST (syntax) 554 com2end = (SYNTAX_FLAGS_COMEND_FIRST (syntax)
555 && SYNTAX_FLAGS_COMEND_SECOND (prev_syntax)); 555 && SYNTAX_FLAGS_COMEND_SECOND (prev_syntax));
556 comstart = (com2start || code == Scomment); 556 comstart = (com2start || code == Scomment);
557 557
558 /* Nasty cases with overlapping 2-char comment markers: 558 /* Nasty cases with overlapping 2-char comment markers:
559 - snmp-mode: -- c -- foo -- c -- 559 - snmp-mode: -- c -- foo -- c --
560 --- c -- 560 --- c --
@@ -2363,7 +2363,7 @@ between them, return t; otherwise return nil. */)
2363 if (code == Scomment_fence) 2363 if (code == Scomment_fence)
2364 { 2364 {
2365 /* Skip until first preceding unquoted comment_fence. */ 2365 /* Skip until first preceding unquoted comment_fence. */
2366 int found = 0; 2366 int fence_found = 0;
2367 EMACS_INT ini = from, ini_byte = from_byte; 2367 EMACS_INT ini = from, ini_byte = from_byte;
2368 2368
2369 while (1) 2369 while (1)
@@ -2374,13 +2374,13 @@ between them, return t; otherwise return nil. */)
2374 if (SYNTAX (c) == Scomment_fence 2374 if (SYNTAX (c) == Scomment_fence
2375 && !char_quoted (from, from_byte)) 2375 && !char_quoted (from, from_byte))
2376 { 2376 {
2377 found = 1; 2377 fence_found = 1;
2378 break; 2378 break;
2379 } 2379 }
2380 else if (from == stop) 2380 else if (from == stop)
2381 break; 2381 break;
2382 } 2382 }
2383 if (found == 0) 2383 if (fence_found == 0)
2384 { 2384 {
2385 from = ini; /* Set point to ini + 1. */ 2385 from = ini; /* Set point to ini + 1. */
2386 from_byte = ini_byte; 2386 from_byte = ini_byte;
@@ -2669,12 +2669,12 @@ scan_lists (register EMACS_INT from, EMACS_INT count, EMACS_INT depth, int sexpf
2669 /* We must record the comment style encountered so that 2669 /* We must record the comment style encountered so that
2670 later, we can match only the proper comment begin 2670 later, we can match only the proper comment begin
2671 sequence of the same style. */ 2671 sequence of the same style. */
2672 int c1, other_syntax; 2672 int c2, other_syntax;
2673 DEC_BOTH (from, from_byte); 2673 DEC_BOTH (from, from_byte);
2674 UPDATE_SYNTAX_TABLE_BACKWARD (from); 2674 UPDATE_SYNTAX_TABLE_BACKWARD (from);
2675 code = Sendcomment; 2675 code = Sendcomment;
2676 c1 = FETCH_CHAR_AS_MULTIBYTE (from_byte); 2676 c2 = FETCH_CHAR_AS_MULTIBYTE (from_byte);
2677 other_syntax = SYNTAX_WITH_FLAGS (c1); 2677 other_syntax = SYNTAX_WITH_FLAGS (c2);
2678 comstyle = SYNTAX_FLAGS_COMMENT_STYLE (other_syntax, syntax); 2678 comstyle = SYNTAX_FLAGS_COMMENT_STYLE (other_syntax, syntax);
2679 comnested 2679 comnested
2680 = comnested || SYNTAX_FLAGS_COMMENT_NESTED (other_syntax); 2680 = comnested || SYNTAX_FLAGS_COMMENT_NESTED (other_syntax);
@@ -3528,4 +3528,3 @@ In both cases, LIMIT bounds the search. */);
3528 defsubr (&Sbackward_prefix_chars); 3528 defsubr (&Sbackward_prefix_chars);
3529 defsubr (&Sparse_partial_sexp); 3529 defsubr (&Sparse_partial_sexp);
3530} 3530}
3531