From: Dave Love <fx@gnu.org>
Date: Mon, 6 Oct 2003 16:33:13 +0000 (+0000)
Subject: Comment.
X-Git-Tag: ttn-vms-21-2-B4~8605
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f73c072cbf8e1cb8573c1376f50b0fed1f809849;p=emacs.git

Comment.
---

diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el
index b43303a65b4..44dec95e035 100644
--- a/lisp/smerge-mode.el
+++ b/lisp/smerge-mode.el
@@ -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 @@ Can be nil if the style is undecided, or else:
 - `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
diff --git a/lisp/strokes.el b/lisp/strokes.el
index fe8d17b40d0..c6ad0c6d55a 100644
--- a/lisp/strokes.el
+++ b/lisp/strokes.el
@@ -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...