procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Move description of value to syntax-ppss function."

Browse source 
This reverts commit 305dbc7e2b.

Both of the functions in question are used a lot in the sources, so move it back to the more basic function.
This commit is contained in:
Lars Ingebrigtsen 2019-10-30 21:26:22 +01:00
parent f7673c147c
commit 77d4491391
2 changed files with 19 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

20
lisp/emacs-lisp/syntax.el
View file

@ -510,26 +510,6 @@ run from `point-min' to POS except that values at positions 2 and 6
in the returned list (counting from 0) cannot be relied upon. in the returned list (counting from 0) cannot be relied upon.
Point is at POS when this function returns. Point is at POS when this function returns.
Value is a list of elements describing final state of parsing:
0. depth in parens.
1. character address of start of innermost containing list; nil if none.
2. character address of start of last complete sexp terminated.
3. non-nil if inside a string.
(it is the character that will terminate the string,
or t if the string should be terminated by a generic string delimiter.)
4. nil if outside a comment, t if inside a non-nestable comment,
else an integer (the current comment nesting).
5. t if following a quote character.
6. the minimum paren-depth encountered during this scan.
7. style of comment, if any.
8. character address of start of comment or string; nil if not in one.
9. List of positions of currently open parens, outermost first.
10. When the last position scanned holds the first character of a
(potential) two character construct, the syntax of that position,
otherwise nil. That construct can be a two character comment
delimiter or an Escaped or Char-quoted character.
11..... Possible further internal information used by ‘parse-partial-sexp’.
It is necessary to call `syntax-ppss-flush-cache' explicitly if It is necessary to call `syntax-ppss-flush-cache' explicitly if
this function is called while `before-change-functions' is this function is called while `before-change-functions' is
temporarily let-bound, or if the buffer is modified without temporarily let-bound, or if the buffer is modified without

20
src/syntax.c
View file

@ -3530,7 +3530,25 @@ Parsing stops at TO or when certain criteria are met;
If fifth arg OLDSTATE is omitted or nil, If fifth arg OLDSTATE is omitted or nil,
parsing assumes that FROM is the beginning of a function. parsing assumes that FROM is the beginning of a function.
See `syntax-ppss' for a description of the return value. Value is a list of elements describing final state of parsing:
0. depth in parens.
1. character address of start of innermost containing list; nil if none.
2. character address of start of last complete sexp terminated.
3. non-nil if inside a string.
(it is the character that will terminate the string,
or t if the string should be terminated by a generic string delimiter.)
4. nil if outside a comment, t if inside a non-nestable comment,
else an integer (the current comment nesting).
5. t if following a quote character.
6. the minimum paren-depth encountered during this scan.
7. style of comment, if any.
8. character address of start of comment or string; nil if not in one.
9. List of positions of currently open parens, outermost first.
10. When the last position scanned holds the first character of a
(potential) two character construct, the syntax of that position,
otherwise nil. That construct can be a two character comment
delimiter or an Escaped or Char-quoted character.
11..... Possible further internal information used by `parse-partial-sexp'.
If third arg TARGETDEPTH is non-nil, parsing stops if the depth If third arg TARGETDEPTH is non-nil, parsing stops if the depth
in parentheses becomes equal to TARGETDEPTH. in parentheses becomes equal to TARGETDEPTH.