Commit 0304b9c7 authored by Gerd Moellmann's avatar Gerd Moellmann
Browse files

(smerge-mode): Check if `font-lock-mode' is bound

before accessing it.
parent d004e96a
;;; 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.
nil " SMerge" nil
(when font-lock-mode
(when (and (boundp 'font-lock-mode) font-lock-mode)
(set (make-local-variable 'font-lock-multiline) t)
(if smerge-mode
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment