diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2001-03-07 00:16:29 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2001-03-07 00:16:29 +0000 |
| commit | f5cd98c0d4ccb5a10c139bf54d72901668b3bc82 (patch) | |
| tree | 465abac3a57ad02a93fa5450bede7d3953b86fc7 /lisp/smerge-mode.el | |
| parent | 3212cc84cdc50b300a0f4648f8f2a1c831c506a9 (diff) | |
| download | emacs-f5cd98c0d4ccb5a10c139bf54d72901668b3bc82.tar.gz | |
(font-lock-keywords, font-lock-mode): Don't bind, just declare.
Diffstat (limited to 'lisp/smerge-mode.el')
| -rw-r--r-- | lisp/smerge-mode.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el index 96132f35932..538ff11519a 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.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 @@ Can be nil if the style is undecided, or else: - `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"))) |