(font-lock-defaults): Remove defvar as it's already defined in font-core.el.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2273e72b1186251674fa6c585604b2469d3a8923..21d9cbca88c3c78ad23e51acd4112ed1f827008f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2005-05-23  Lute Kamstra  <lute@gnu.org>
+
+       * subr.el (font-lock-defaults): Remove defvar as it's already
+       defined in font-core.el.
+
+       * font-lock.el (font-lock-beginning-of-syntax-function): Fix
+       docstring.
+
 2005-05-22  Luc Teirlinck  <teirllm@auburn.edu>
 
        * font-core.el: Update comment.

diff --git a/lisp/subr.el b/lisp/subr.el
index 8f9b51c56c784a6dfc6a58f072f0f9ca0d426c83..41116c2839cd254686d2efd3e6dac1f605959692 100644 (file)
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1458,10 +1458,6 @@ BEG and END default respectively to the beginning and end of buffer."
 \f
 ;;;; Miscellanea.
 
-;; A number of major modes set this locally.
-;; Give it a global value to avoid compiler warnings.
-(defvar font-lock-defaults nil)
-
 (defvar suspend-hook nil
   "Normal hook run by `suspend-emacs', before suspending.")