aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorXue Fuqiao2013-10-04 22:46:31 +0800
committerXue Fuqiao2013-10-04 22:46:31 +0800
commit63bd7f352faa51c6da920d0e41d0e4afc4768f77 (patch)
treef1345fe13712f16e97c4697d74343d0abe37a2c9 /lisp
parentcd30a8e09c1bf7c64132eba5d27cb26583596b98 (diff)
downloademacs-63bd7f352faa51c6da920d0e41d0e4afc4768f77.tar.gz
emacs-63bd7f352faa51c6da920d0e41d0e4afc4768f77.zip
* lisp/emacs-lisp/syntax.el (syntax-ppss): Doc fix.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/emacs-lisp/syntax.el9
2 files changed, 11 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bb4b89adea2..ecf943eac56 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12013-10-04 Xue Fuqiao <xfq.free@gmail.com>
2
3 * emacs-lisp/syntax.el (syntax-ppss): Doc fix.
4
12013-10-04 Michael Albinus <michael.albinus@gmx.de> 52013-10-04 Michael Albinus <michael.albinus@gmx.de>
2 6
3 * net/secrets.el (secrets-create-collection): Add optional 7 * net/secrets.el (secrets-create-collection): Add optional
diff --git a/lisp/emacs-lisp/syntax.el b/lisp/emacs-lisp/syntax.el
index 3e850320133..6b169d3a18c 100644
--- a/lisp/emacs-lisp/syntax.el
+++ b/lisp/emacs-lisp/syntax.el
@@ -405,9 +405,14 @@ point (where the PPSS is equivalent to nil).")
405(defun syntax-ppss (&optional pos) 405(defun syntax-ppss (&optional pos)
406 "Parse-Partial-Sexp State at POS, defaulting to point. 406 "Parse-Partial-Sexp State at POS, defaulting to point.
407The returned value is the same as that of `parse-partial-sexp' 407The returned value is the same as that of `parse-partial-sexp'
408run from point-min to POS except that values at positions 2 and 6 408run from `point-min' to POS except that values at positions 2 and 6
409in the returned list (counting from 0) cannot be relied upon. 409in the returned list (counting from 0) cannot be relied upon.
410Point is at POS when this function returns." 410Point is at POS when this function returns.
411
412It is necessary to call `syntax-ppss-flush-cache' explicitly if
413this function is called while `before-change-functions' is
414temporarily let-bound, or if the buffer is modified without
415running the hook."
411 ;; Default values. 416 ;; Default values.
412 (unless pos (setq pos (point))) 417 (unless pos (setq pos (point)))
413 (syntax-propertize pos) 418 (syntax-propertize pos)