[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
smerge fix
From: |
Dave Love |
Subject: |
smerge fix |
Date: |
21 Aug 2002 18:55:29 +0100 |
User-agent: |
Gnus/5.09 (Gnus v5.9.0) Emacs/21.2 |
This fixes font-lock variables appearing to be loaded from smerge-mode
according to loadhist. It's confusing anyhow, but disastrous if you
unload smerge-mode.
*** smerge-mode.el.~1.14.4.1.~ Fri Nov 30 18:57:07 2001
--- smerge-mode.el Sun Aug 18 23:26:31 2002
***************
*** 181,188 ****
- `diff3-A'")
;; Compiler pacifiers
! (defvar font-lock-mode)
! (defvar font-lock-keywords)
(eval-when-compile
(unless (fboundp 'font-lock-fontify-region)
(autoload 'font-lock-fontify-region "font-lock")))
--- 181,189 ----
- `diff3-A'")
;; Compiler pacifiers
! (eval-when-compile
! (defvar font-lock-mode)
! (defvar font-lock-keywords))
(eval-when-compile
(unless (fboundp 'font-lock-fontify-region)
(autoload 'font-lock-fontify-region "font-lock")))
[Prev in Thread] |
Current Thread |
[Next in Thread] |