summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/syntax.el
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2011-06-20 17:59:02 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2011-06-20 17:59:02 -0700
commit51cab52b054aaf178743aa7775ae29e934eeba9c (patch)
tree0160ac7e20237f3a337fc35c9ba368762ef9203c /lisp/emacs-lisp/syntax.el
parent171e2a582e4c7d6bfd6d6ff0373720b59568bcb2 (diff)
parentca5307394f6861fc825434c268e0a44adf8a3252 (diff)
downloademacs-51cab52b054aaf178743aa7775ae29e934eeba9c.tar.gz
emacs-51cab52b054aaf178743aa7775ae29e934eeba9c.tar.bz2
emacs-51cab52b054aaf178743aa7775ae29e934eeba9c.zip
Merge from trunk.
Diffstat (limited to 'lisp/emacs-lisp/syntax.el')
-rw-r--r--lisp/emacs-lisp/syntax.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/syntax.el b/lisp/emacs-lisp/syntax.el
index 7ba7b13af44..200b3a6389b 100644
--- a/lisp/emacs-lisp/syntax.el
+++ b/lisp/emacs-lisp/syntax.el
@@ -398,8 +398,9 @@ point (where the PPSS is equivalent to nil).")
(defun syntax-ppss (&optional pos)
"Parse-Partial-Sexp State at POS, defaulting to point.
-The returned value is the same as `parse-partial-sexp' except that
-values 2 and 6 values of the returned state cannot be relied upon.
+The returned value is the same as that of `parse-partial-sexp'
+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.
Point is at POS when this function returns."
;; Default values.
(unless pos (setq pos (point)))