X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/be520aca79dd429d55012a1916bdc97f06773fc5..acaf905b1130aae80fa59d2c861ffd4c8eb75486:/lisp/emacs-lisp/syntax.el diff --git a/lisp/emacs-lisp/syntax.el b/lisp/emacs-lisp/syntax.el index c012e48b59..611a766922 100644 --- a/lisp/emacs-lisp/syntax.el +++ b/lisp/emacs-lisp/syntax.el @@ -1,6 +1,6 @@ ;;; syntax.el --- helper functions to find syntactic context -;; Copyright (C) 2000-2011 Free Software Foundation, Inc. +;; Copyright (C) 2000-2012 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: internal @@ -56,7 +56,7 @@ ;; syntax-ppss-flush-cache since that would not only flush the cache but also ;; reset syntax-propertize--done which should not be done in this case). "Mode-specific function to apply the syntax-table properties. -Called with 2 arguments: START and END. +Called with two arguments: START and END. This function can call `syntax-ppss' on any position before END, but it should not call `syntax-ppss-flush-cache', which means that it should not call `syntax-ppss' on some position and later modify the buffer on some @@ -100,7 +100,7 @@ Put first the functions more likely to cause a change and cheaper to compute.") (cons beg end)) (defvar syntax-propertize--done -1 - "Position upto which syntax-table properties have been set.") + "Position up to which syntax-table properties have been set.") (make-variable-buffer-local 'syntax-propertize--done) (defun syntax-propertize--shift-groups (re n) @@ -248,7 +248,7 @@ Note: back-references in REGEXPs do not work." (if syntax (put-text-property mb me 'syntax-table syntax)))))))) - + (if (or (not (cddr rule)) (zerop gn)) (setq code (nconc (nreverse thiscode) code)) (push `(if (match-beginning ,gn) @@ -283,7 +283,7 @@ The return value is a function suitable for `syntax-propertize-function'." (setq keywords font-lock-syntactic-keywords)))))) (defun syntax-propertize (pos) - "Ensure that syntax-table properties are set upto POS." + "Ensure that syntax-table properties are set until POS." (when (and syntax-propertize-function (< syntax-propertize--done pos)) ;; (message "Needs to syntax-propertize from %s to %s" @@ -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 -the 2nd and 6th 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)))