aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Ingebrigtsen2019-10-30 21:26:22 +0100
committerLars Ingebrigtsen2019-10-30 21:26:22 +0100
commit77d4491391be50bb88c3b45a2dda30a0a3addd2b (patch)
tree5f415f435d3442389a252f8470f5c08a6166ffc3
parentf7673c147c8c31564dcc19eda12d9c759acee93e (diff)
downloademacs-77d4491391be50bb88c3b45a2dda30a0a3addd2b.tar.gz
emacs-77d4491391be50bb88c3b45a2dda30a0a3addd2b.zip
Revert "Move description of value to syntax-ppss function."
This reverts commit 305dbc7e2be05748039aacb1a3d697f6f64bed4c. Both of the functions in question are used a lot in the sources, so move it back to the more basic function.
-rw-r--r--lisp/emacs-lisp/syntax.el20
-rw-r--r--src/syntax.c20
2 files changed, 19 insertions, 21 deletions
diff --git a/lisp/emacs-lisp/syntax.el b/lisp/emacs-lisp/syntax.el
index 9dde325923d..16a76da5188 100644
--- a/lisp/emacs-lisp/syntax.el
+++ b/lisp/emacs-lisp/syntax.el
@@ -510,26 +510,6 @@ run from `point-min' to POS except that values at positions 2 and 6
510in the returned list (counting from 0) cannot be relied upon. 510in the returned list (counting from 0) cannot be relied upon.
511Point is at POS when this function returns. 511Point is at POS when this function returns.
512 512
513Value is a list of elements describing final state of parsing:
514 0. depth in parens.
515 1. character address of start of innermost containing list; nil if none.
516 2. character address of start of last complete sexp terminated.
517 3. non-nil if inside a string.
518 (it is the character that will terminate the string,
519 or t if the string should be terminated by a generic string delimiter.)
520 4. nil if outside a comment, t if inside a non-nestable comment,
521 else an integer (the current comment nesting).
522 5. t if following a quote character.
523 6. the minimum paren-depth encountered during this scan.
524 7. style of comment, if any.
525 8. character address of start of comment or string; nil if not in one.
526 9. List of positions of currently open parens, outermost first.
52710. When the last position scanned holds the first character of a
528 (potential) two character construct, the syntax of that position,
529 otherwise nil. That construct can be a two character comment
530 delimiter or an Escaped or Char-quoted character.
53111..... Possible further internal information used by ‘parse-partial-sexp’.
532
533It is necessary to call `syntax-ppss-flush-cache' explicitly if 513It is necessary to call `syntax-ppss-flush-cache' explicitly if
534this function is called while `before-change-functions' is 514this function is called while `before-change-functions' is
535temporarily let-bound, or if the buffer is modified without 515temporarily let-bound, or if the buffer is modified without
diff --git a/src/syntax.c b/src/syntax.c
index 850921353d6..edfdae22590 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -3530,7 +3530,25 @@ Parsing stops at TO or when certain criteria are met;
3530If fifth arg OLDSTATE is omitted or nil, 3530If fifth arg OLDSTATE is omitted or nil,
3531 parsing assumes that FROM is the beginning of a function. 3531 parsing assumes that FROM is the beginning of a function.
3532 3532
3533See `syntax-ppss' for a description of the return value. 3533Value is a list of elements describing final state of parsing:
3534 0. depth in parens.
3535 1. character address of start of innermost containing list; nil if none.
3536 2. character address of start of last complete sexp terminated.
3537 3. non-nil if inside a string.
3538 (it is the character that will terminate the string,
3539 or t if the string should be terminated by a generic string delimiter.)
3540 4. nil if outside a comment, t if inside a non-nestable comment,
3541 else an integer (the current comment nesting).
3542 5. t if following a quote character.
3543 6. the minimum paren-depth encountered during this scan.
3544 7. style of comment, if any.
3545 8. character address of start of comment or string; nil if not in one.
3546 9. List of positions of currently open parens, outermost first.
354710. When the last position scanned holds the first character of a
3548 (potential) two character construct, the syntax of that position,
3549 otherwise nil. That construct can be a two character comment
3550 delimiter or an Escaped or Char-quoted character.
355111..... Possible further internal information used by `parse-partial-sexp'.
3534 3552
3535If third arg TARGETDEPTH is non-nil, parsing stops if the depth 3553If third arg TARGETDEPTH is non-nil, parsing stops if the depth
3536in parentheses becomes equal to TARGETDEPTH. 3554in parentheses becomes equal to TARGETDEPTH.