Mercurial > emacs

changeset 52778:7558bb6529f9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Comment.
author Dave Love <fx@gnu.org>
date Mon, 06 Oct 2003 16:33:13 +0000
parents 575eb554f88e
children 3bc7b9f71e34
files lisp/smerge-mode.el lisp/strokes.el
diffstat 2 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/smerge-mode.el	Mon Oct 06 16:31:17 2003 +0000
+++ b/lisp/smerge-mode.el	Mon Oct 06 16:33:13 2003 +0000
@@ -4,7 +4,7 @@
 
 ;; Author: Stefan Monnier <monnier@cs.yale.edu>
 ;; Keywords: merge diff3 cvs conflict
-;; Revision: $Id: smerge-mode.el,v 1.21 2003/02/04 12:05:02 lektu Exp $
+;; Revision: $Id: smerge-mode.el,v 1.22 2003/09/01 15:45:14 miles Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -182,8 +182,9 @@
 - `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")))
 
 ;;;;
 ;;;; Actual code
--- a/lisp/strokes.el	Mon Oct 06 16:31:17 2003 +0000
+++ b/lisp/strokes.el	Mon Oct 06 16:33:13 2003 +0000
@@ -173,6 +173,8 @@
 ;; Other: I always have the most beta version of strokes, so if you
 ;;        want it just let me know.
 
+;; Fixme: Use pbm instead of xpm for pixmaps to work generally.
+
 ;;; Code:
 
 ;;; Requirements and provisions...