diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2019-05-08 15:18:32 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2019-05-08 15:18:32 -0400 |
| commit | f97628f58e520c13b70ff618dda34e66da3dc81b (patch) | |
| tree | ae8f6b2dc547c16b19be25b93b68c9392ee18e3c | |
| parent | caa28f031b65ff6512e777f8996d7f3c3144c17a (diff) | |
| download | emacs-f97628f58e520c13b70ff618dda34e66da3dc81b.tar.gz | |
* lisp/emacs-lisp/syntax.el (syntax-propertize): `ignore` is like nil
(syntax-ppss-after-change-function): Mark it as obsolete.
* lisp/font-lock.el (font-lock-apply-syntactic-highlight):
Use syntax-ppss-flush-cache instead.
| -rw-r--r-- | lisp/emacs-lisp/syntax.el | 5 | ||||
| -rw-r--r-- | lisp/font-lock.el | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lisp/emacs-lisp/syntax.el b/lisp/emacs-lisp/syntax.el index d09d6c12254..f1904e64efb 100644 --- a/lisp/emacs-lisp/syntax.el +++ b/lisp/emacs-lisp/syntax.el @@ -286,7 +286,7 @@ END) suitable for `syntax-propertize-function'." (defun syntax-propertize (pos) "Ensure that syntax-table properties are set until POS (a buffer point)." (when (< syntax-propertize--done pos) - (if (null syntax-propertize-function) + (if (memq syntax-propertize-function '(nil ignore)) (setq syntax-propertize--done (max (point-max) pos)) ;; (message "Needs to syntax-propertize from %s to %s" ;; syntax-propertize--done pos) @@ -404,7 +404,8 @@ These are valid when the buffer has no restriction.") (defvar-local syntax-ppss-narrow-start nil "Start position of the narrowing for `syntax-ppss-narrow'.") -(defalias 'syntax-ppss-after-change-function 'syntax-ppss-flush-cache) +(define-obsolete-function-alias 'syntax-ppss-after-change-function + #'syntax-ppss-flush-cache "27.1") (defun syntax-ppss-flush-cache (beg &rest ignored) "Flush the cache of `syntax-ppss' starting at position BEG." ;; Set syntax-propertize to refontify anything past beg. diff --git a/lisp/font-lock.el b/lisp/font-lock.el index d0f7096ab8b..7ff4e606fa6 100644 --- a/lisp/font-lock.el +++ b/lisp/font-lock.el @@ -1501,7 +1501,7 @@ see `font-lock-syntactic-keywords'." ;; Flush the syntax-cache. I believe this is not necessary for ;; font-lock's use of syntax-ppss, but I'm not 100% sure and it can ;; still be necessary for other users of syntax-ppss anyway. - (syntax-ppss-after-change-function start) + (syntax-ppss-flush-cache start) (cond ((not override) ;; Cannot override existing fontification. |