# HG changeset patch
# User Dave Love <fx@gnu.org>
# Date 1065458099 0
# Node ID 3bc7b9f71e34f035e58d6badb622273a754d7c3e
# Parent  7558bb6529f9195f2a28bb8415e7f0ef83e11392
Previous change was bogus.  Something odd in pcl-cvs...

diff -r 7558bb6529f9 -r 3bc7b9f71e34 lisp/smerge-mode.el
--- a/lisp/smerge-mode.el	Mon Oct 06 16:33:13 2003 +0000
+++ b/lisp/smerge-mode.el	Mon Oct 06 16:34:59 2003 +0000
@@ -4,7 +4,7 @@
 
 ;; Author: Stefan Monnier <monnier@cs.yale.edu>
 ;; Keywords: merge diff3 cvs conflict
-;; Revision: $Id: smerge-mode.el,v 1.22 2003/09/01 15:45:14 miles Exp $
+;; Revision: $Id$
 
 ;; This file is part of GNU Emacs.
 
@@ -182,9 +182,8 @@
 - `diff3-A'")
 
 ;; Compiler pacifiers
-(eval-when-compile
-  (unless (fboundp 'font-lock-fontify-region)
-    (autoload 'font-lock-fontify-region "font-lock")))
+(defvar font-lock-mode)
+(defvar font-lock-keywords)
 
 ;;;;
 ;;;; Actual code