summaryrefslogtreecommitdiff
path: root/lisp/font-lock.el
diff options
context:
space:
mode:
authorJuanma Barranquero <lekktu@gmail.com>2010-09-14 16:41:53 +0200
committerJuanma Barranquero <lekktu@gmail.com>2010-09-14 16:41:53 +0200
commit6664fc59a8f296117ea98b943f062c0cc0e907c1 (patch)
treeb8e0bf218492291433d00a71122bc8cd2c662ea9 /lisp/font-lock.el
parent74769e8b4c73f24e8f3356bd281a56a30000c648 (diff)
parentf3a30a50fab486dcaafb9d897797794fe4c3c4b3 (diff)
downloademacs-6664fc59a8f296117ea98b943f062c0cc0e907c1.tar.gz
Merge changes from emacs-23 branch.
Diffstat (limited to 'lisp/font-lock.el')
-rw-r--r--lisp/font-lock.el2
1 files changed, 2 insertions, 0 deletions
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 92c62010848..6c316f5f958 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -564,6 +564,8 @@ outside of any comment, string, or sexp. This variable is semi-obsolete;
we recommend setting `syntax-begin-function' instead.
This is normally set via `font-lock-defaults'.")
+(make-obsolete-variable 'font-lock-beginning-of-syntax-function
+ 'syntax-begin-function "23.3")
(defvar font-lock-mark-block-function nil
"*Non-nil means use this function to mark a block of text.