diff options
| author | Dave Love <fx@gnu.org> | 2003-10-06 16:34:59 +0000 |
|---|---|---|
| committer | Dave Love <fx@gnu.org> | 2003-10-06 16:34:59 +0000 |
| commit | 8f6cea29d788f4432e0ca46957da122a49aeb85f (patch) | |
| tree | b43cf7eab12829a0b852b8164e4da3c98a426ebd /lisp/smerge-mode.el | |
| parent | f73c072cbf8e1cb8573c1376f50b0fed1f809849 (diff) | |
| download | emacs-8f6cea29d788f4432e0ca46957da122a49aeb85f.tar.gz | |
Previous change was bogus. Something odd in pcl-cvs...
Diffstat (limited to 'lisp/smerge-mode.el')
| -rw-r--r-- | lisp/smerge-mode.el | 7 |
1 files changed, 3 insertions, 4 deletions
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 |