From 0304b9c787d3c09e84563a5a770dd42d38026b79 Mon Sep 17 00:00:00 2001 From: Gerd Moellmann Date: Tue, 31 Jul 2001 08:28:43 +0000 Subject: [PATCH] (smerge-mode): Check if `font-lock-mode' is bound before accessing it. --- lisp/smerge-mode.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el index 5c8af81b492..f561992fb24 100644 --- a/lisp/smerge-mode.el +++ b/lisp/smerge-mode.el @@ -1,10 +1,10 @@ ;;; smerge-mode.el --- Minor mode to resolve diff3 conflicts -;; Copyright (C) 1999, 2000 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc. ;; Author: Stefan Monnier ;; Keywords: merge diff3 cvs conflict -;; Revision: $Id: smerge-mode.el,v 1.12 2001/03/07 00:16:29 monnier Exp $ +;; Revision: $Id: smerge-mode.el,v 1.13 2001/07/31 08:26:47 gerd Exp $ ;; This file is part of GNU Emacs. @@ -465,7 +465,7 @@ The point is moved to the end of the conflict." "Minor mode to simplify editing output from the diff3 program. \\{smerge-mode-map}" nil " SMerge" nil - (when font-lock-mode + (when (and (boundp 'font-lock-mode) font-lock-mode) (set (make-local-variable 'font-lock-multiline) t) (save-excursion (if smerge-mode -- 2.39.2