From: Dave Love <fx@gnu.org>
Date: Mon, 6 Oct 2003 16:34:59 +0000 (+0000)
Subject: Previous change was bogus.  Something odd in pcl-cvs...
X-Git-Tag: ttn-vms-21-2-B4~8604
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8f6cea29d788f4432e0ca46957da122a49aeb85f;p=emacs.git

Previous change was bogus.  Something odd in pcl-cvs...
---

diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el
index 44dec95e035..320c9eb1734 100644
--- a/lisp/smerge-mode.el
+++ b/lisp/smerge-mode.el
@@ -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 @@ Can be nil if the style is undecided, or else:
 - `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