# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 983924189 0
# Node ID c0360458748f9b3f41604657670df354c55f9f95
# Parent  0598c5e629d2983185cf526cf75928704f7c5da0
(font-lock-keywords, font-lock-mode): Don't bind, just declare.

diff -r 0598c5e629d2 -r c0360458748f lisp/smerge-mode.el
--- a/lisp/smerge-mode.el	Wed Mar 07 00:12:59 2001 +0000
+++ b/lisp/smerge-mode.el	Wed Mar 07 00:16:29 2001 +0000
@@ -4,7 +4,7 @@
 
 ;; Author: Stefan Monnier <monnier@cs.yale.edu>
 ;; Keywords: merge diff3 cvs conflict
-;; Revision: $Id: smerge-mode.el,v 1.10 2000/12/23 20:54:14 monnier Exp $
+;; Revision: $Id: smerge-mode.el,v 1.11 2001/01/25 15:36:32 monnier Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -181,8 +181,8 @@
 - `diff3-A'")
 
 ;; Compiler pacifiers
-(defvar font-lock-mode nil)
-(defvar font-lock-keywords nil)
+(defvar font-lock-mode)
+(defvar font-lock-keywords)
 (eval-when-compile
   (unless (fboundp 'font-lock-fontify-region)
     (autoload 'font-lock-fontify-region "font-lock")))