[Emacs-diffs] Changes to emacs/lisp/smerge-mode.el

[Dave Love]

Index: emacs/lisp/smerge-mode.el
diff -c emacs/lisp/smerge-mode.el:1.23 emacs/lisp/smerge-mode.el:1.24
*** emacs/lisp/smerge-mode.el:1.23      Mon Oct  6 12:32:31 2003
--- emacs/lisp/smerge-mode.el   Mon Oct  6 12:34:59 2003
***************
*** 4,10 ****
  
  ;; Author: Stefan Monnier <address@hidden>
  ;; Keywords: merge diff3 cvs conflict
! ;; Revision: $Id: smerge-mode.el,v 1.23 2003/10/06 16:32:31 fx Exp $
  
  ;; This file is part of GNU Emacs.
  
--- 4,10 ----
  
  ;; Author: Stefan Monnier <address@hidden>
  ;; Keywords: merge diff3 cvs conflict
! ;; Revision: $Id: smerge-mode.el,v 1.24 2003/10/06 16:34:59 fx Exp $
  
  ;; This file is part of GNU Emacs.
  
***************
*** 182,190 ****
  - `diff3-A'")
  
  ;; Compiler pacifiers
! (eval-when-compile
!   (unless (fboundp 'font-lock-fontify-region)
!     (autoload 'font-lock-fontify-region "font-lock")))
  
  ;;;;
  ;;;; Actual code
--- 182,189 ----
  - `diff3-A'")
  
  ;; Compiler pacifiers
! (defvar font-lock-mode)
! (defvar font-lock-keywords)
  
  ;;;;
  ;;;; Actual code