Mercurial > emacs

changeset 52779:3bc7b9f71e34

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Previous change was bogus. Something odd in pcl-cvs...
author Dave Love <fx@gnu.org>
date Mon, 06 Oct 2003 16:34:59 +0000
parents 7558bb6529f9
children 47bf5f5df3c9
files lisp/smerge-mode.el
diffstat 1 files changed, 3 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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