aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--etc/NEWS3
-rw-r--r--lisp/emacs-lisp/syntax.el1
2 files changed, 3 insertions, 1 deletions
diff --git a/etc/NEWS b/etc/NEWS
index 01b3ed3f2c1..5cb1af99b56 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -867,7 +867,8 @@ a typographically-correct documents.
867 867
868* Incompatible Lisp Changes in Emacs 25.1 868* Incompatible Lisp Changes in Emacs 25.1
869 869
870** Removed font-lock-beginning-of-syntax-function and the SYNTAX-BEGIN 870** `syntax-begin-function' is declared obsolete.
871Removed font-lock-beginning-of-syntax-function and the SYNTAX-BEGIN
871slot in font-lock-defaults. 872slot in font-lock-defaults.
872 873
873+++ 874+++
diff --git a/lisp/emacs-lisp/syntax.el b/lisp/emacs-lisp/syntax.el
index fee62149b38..95ed775f6b4 100644
--- a/lisp/emacs-lisp/syntax.el
+++ b/lisp/emacs-lisp/syntax.el
@@ -374,6 +374,7 @@ from each other, to avoid keeping too much useless info.")
374 "Function to move back outside of any comment/string/paren. 374 "Function to move back outside of any comment/string/paren.
375This function should move the cursor back to some syntactically safe 375This function should move the cursor back to some syntactically safe
376point (where the PPSS is equivalent to nil).") 376point (where the PPSS is equivalent to nil).")
377(make-obsolete-variable 'syntax-begin-function nil "25.1")
377 378
378(defvar syntax-ppss-cache nil 379(defvar syntax-ppss-cache nil
379 "List of (POS . PPSS) pairs, in decreasing POS order.") 380 "List of (POS . PPSS) pairs, in decreasing POS order.")