summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2010-08-08 17:15:44 -0400
committerChong Yidong <cyd@stupidchicken.com>2010-08-08 17:15:44 -0400
commitcc36ae609d01e7922c662c78866300d57b34b07e (patch)
tree2fc2af92520d09b2fb9cf4014187496cf35793df /lisp/emacs-lisp
parent675e2c697bc8a0ff827fcb33297f63f4cc7ecad3 (diff)
parent7815fe1985833c57457882b415a29358991dabdc (diff)
downloademacs-cc36ae609d01e7922c662c78866300d57b34b07e.tar.gz
emacs-cc36ae609d01e7922c662c78866300d57b34b07e.tar.bz2
emacs-cc36ae609d01e7922c662c78866300d57b34b07e.zip
Merge changes from emacs-23 branch.
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/syntax.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/syntax.el b/lisp/emacs-lisp/syntax.el
index a3110f8d8c5..5cc89596ef5 100644
--- a/lisp/emacs-lisp/syntax.el
+++ b/lisp/emacs-lisp/syntax.el
@@ -52,7 +52,7 @@
(defun syntax-ppss-toplevel-pos (ppss)
"Get the latest syntactically outermost position found in a syntactic scan.
-PPSS is a scan state, as returned by `partial-parse-sexp' or `syntax-ppss'.
+PPSS is a scan state, as returned by `parse-partial-sexp' or `syntax-ppss'.
An \"outermost position\" means one that it is outside of any syntactic entity:
outside of any parentheses, comments, or strings encountered in the scan.
If no such position is recorded in PPSS (because the end of the scan was