[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/smerge-mode.el
From: |
Dave Love |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/smerge-mode.el |
Date: |
Mon, 06 Oct 2003 12:32:32 -0400 |
Index: emacs/lisp/smerge-mode.el
diff -c emacs/lisp/smerge-mode.el:1.22 emacs/lisp/smerge-mode.el:1.23
*** emacs/lisp/smerge-mode.el:1.22 Mon Sep 1 11:45:14 2003
--- emacs/lisp/smerge-mode.el Mon Oct 6 12:32:31 2003
***************
*** 4,10 ****
;; Author: Stefan Monnier <address@hidden>
;; Keywords: merge diff3 cvs conflict
! ;; Revision: $Id: smerge-mode.el,v 1.22 2003/09/01 15:45:14 miles 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.23 2003/10/06 16:32:31 fx Exp $
;; This file is part of GNU Emacs.
***************
*** 182,189 ****
- `diff3-A'")
;; Compiler pacifiers
! (defvar font-lock-mode)
! (defvar font-lock-keywords)
;;;;
;;;; Actual code
--- 182,190 ----
- `diff3-A'")
;; Compiler pacifiers
! (eval-when-compile
! (unless (fboundp 'font-lock-fontify-region)
! (autoload 'font-lock-fontify-region "font-lock")))
;;;;
;;;; Actual code
- [Emacs-diffs] Changes to emacs/lisp/smerge-mode.el,
Dave Love <=