mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-29 19:48:19 +00:00
Code Issues Releases Activity

Previous change was bogus. Something odd in pcl-cvs...

Browse Source
This commit is contained in:
Dave Love 2003-10-06 16:34:59 +00:00
parent f73c072cbf
commit 8f6cea29d7
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lisp/smerge-mode.el
View File

@ -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