Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
emacs
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
4
Issues
4
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
emacs
emacs
Commits
01f44d5a
Commit
01f44d5a
authored
Mar 16, 2011
by
Paul Eggert
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* syntax.c (Fforward_comment, scan_lists): Rename locals to avoid
shadowing.
parent
0902fe45
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
8 deletions
+10
-8
src/ChangeLog
src/ChangeLog
+3
-0
src/syntax.c
src/syntax.c
+7
-8
No files found.
src/ChangeLog
View file @
01f44d5a
2011-03-16 Paul Eggert <eggert@cs.ucla.edu>
* syntax.c (Fforward_comment, scan_lists): Rename locals to avoid
shadowing.
* character.h (FETCH_STRING_CHAR_ADVANCE_NO_CHECK, BUF_INC_POS):
Rename locals to avoid shadowing.
src/syntax.c
View file @
01f44d5a
...
...
@@ -554,7 +554,7 @@ back_comment (EMACS_INT from, EMACS_INT from_byte, EMACS_INT stop, int comnested
com2end
=
(
SYNTAX_FLAGS_COMEND_FIRST
(
syntax
)
&&
SYNTAX_FLAGS_COMEND_SECOND
(
prev_syntax
));
comstart
=
(
com2start
||
code
==
Scomment
);
/* Nasty cases with overlapping 2-char comment markers:
- snmp-mode: -- c -- foo -- c --
--- c --
...
...
@@ -2363,7 +2363,7 @@ between them, return t; otherwise return nil. */)
if
(
code
==
Scomment_fence
)
{
/* Skip until first preceding unquoted comment_fence. */
int
found
=
0
;
int
f
ence_f
ound
=
0
;
EMACS_INT
ini
=
from
,
ini_byte
=
from_byte
;
while
(
1
)
...
...
@@ -2374,13 +2374,13 @@ between them, return t; otherwise return nil. */)
if
(
SYNTAX
(
c
)
==
Scomment_fence
&&
!
char_quoted
(
from
,
from_byte
))
{
found
=
1
;
f
ence_f
ound
=
1
;
break
;
}
else
if
(
from
==
stop
)
break
;
}
if
(
found
==
0
)
if
(
f
ence_f
ound
==
0
)
{
from
=
ini
;
/* Set point to ini + 1. */
from_byte
=
ini_byte
;
...
...
@@ -2669,12 +2669,12 @@ scan_lists (register EMACS_INT from, EMACS_INT count, EMACS_INT depth, int sexpf
/* We must record the comment style encountered so that
later, we can match only the proper comment begin
sequence of the same style. */
int
c
1
,
other_syntax
;
int
c
2
,
other_syntax
;
DEC_BOTH
(
from
,
from_byte
);
UPDATE_SYNTAX_TABLE_BACKWARD
(
from
);
code
=
Sendcomment
;
c
1
=
FETCH_CHAR_AS_MULTIBYTE
(
from_byte
);
other_syntax
=
SYNTAX_WITH_FLAGS
(
c
1
);
c
2
=
FETCH_CHAR_AS_MULTIBYTE
(
from_byte
);
other_syntax
=
SYNTAX_WITH_FLAGS
(
c
2
);
comstyle
=
SYNTAX_FLAGS_COMMENT_STYLE
(
other_syntax
,
syntax
);
comnested
=
comnested
||
SYNTAX_FLAGS_COMMENT_NESTED
(
other_syntax
);
...
...
@@ -3528,4 +3528,3 @@ In both cases, LIMIT bounds the search. */);
defsubr
(
&
Sbackward_prefix_chars
);
defsubr
(
&
Sparse_partial_sexp
);
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment