diff options
| author | Stefan Monnier | 2001-03-07 00:16:29 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2001-03-07 00:16:29 +0000 |
| commit | f5cd98c0d4ccb5a10c139bf54d72901668b3bc82 (patch) | |
| tree | 465abac3a57ad02a93fa5450bede7d3953b86fc7 | |
| parent | 3212cc84cdc50b300a0f4648f8f2a1c831c506a9 (diff) | |
| download | emacs-f5cd98c0d4ccb5a10c139bf54d72901668b3bc82.tar.gz emacs-f5cd98c0d4ccb5a10c139bf54d72901668b3bc82.zip | |
(font-lock-keywords, font-lock-mode): Don't bind, just declare.
| -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 @@ | |||
| 4 | 4 | ||
| 5 | ;; Author: Stefan Monnier <monnier@cs.yale.edu> | 5 | ;; Author: Stefan Monnier <monnier@cs.yale.edu> |
| 6 | ;; Keywords: merge diff3 cvs conflict | 6 | ;; Keywords: merge diff3 cvs conflict |
| 7 | ;; Revision: $Id: smerge-mode.el,v 1.10 2000/12/23 20:54:14 monnier Exp $ | 7 | ;; Revision: $Id: smerge-mode.el,v 1.11 2001/01/25 15:36:32 monnier Exp $ |
| 8 | 8 | ||
| 9 | ;; This file is part of GNU Emacs. | 9 | ;; This file is part of GNU Emacs. |
| 10 | 10 | ||
| @@ -181,8 +181,8 @@ Can be nil if the style is undecided, or else: | |||
| 181 | - `diff3-A'") | 181 | - `diff3-A'") |
| 182 | 182 | ||
| 183 | ;; Compiler pacifiers | 183 | ;; Compiler pacifiers |
| 184 | (defvar font-lock-mode nil) | 184 | (defvar font-lock-mode) |
| 185 | (defvar font-lock-keywords nil) | 185 | (defvar font-lock-keywords) |
| 186 | (eval-when-compile | 186 | (eval-when-compile |
| 187 | (unless (fboundp 'font-lock-fontify-region) | 187 | (unless (fboundp 'font-lock-fontify-region) |
| 188 | (autoload 'font-lock-fontify-region "font-lock"))) | 188 | (autoload 'font-lock-fontify-region "font-lock"))) |