Mercurial > emacs
comparison lisp/smerge-mode.el @ 52778:7558bb6529f9
Comment.
author | Dave Love <fx@gnu.org> |
---|---|
date | Mon, 06 Oct 2003 16:33:13 +0000 |
parents | 695cf19ef79e |
children | 3bc7b9f71e34 |
comparison
equal
deleted
inserted
replaced
52777:575eb554f88e | 52778:7558bb6529f9 |
---|---|
2 | 2 |
3 ;; Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc. | 3 ;; Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc. |
4 | 4 |
5 ;; Author: Stefan Monnier <monnier@cs.yale.edu> | 5 ;; Author: Stefan Monnier <monnier@cs.yale.edu> |
6 ;; Keywords: merge diff3 cvs conflict | 6 ;; Keywords: merge diff3 cvs conflict |
7 ;; Revision: $Id: smerge-mode.el,v 1.21 2003/02/04 12:05:02 lektu Exp $ | 7 ;; Revision: $Id: smerge-mode.el,v 1.22 2003/09/01 15:45:14 miles Exp $ |
8 | 8 |
9 ;; This file is part of GNU Emacs. | 9 ;; This file is part of GNU Emacs. |
10 | 10 |
11 ;; GNU Emacs is free software; you can redistribute it and/or modify | 11 ;; GNU Emacs is free software; you can redistribute it and/or modify |
12 ;; it under the terms of the GNU General Public License as published by | 12 ;; it under the terms of the GNU General Public License as published by |
180 Can be nil if the style is undecided, or else: | 180 Can be nil if the style is undecided, or else: |
181 - `diff3-E' | 181 - `diff3-E' |
182 - `diff3-A'") | 182 - `diff3-A'") |
183 | 183 |
184 ;; Compiler pacifiers | 184 ;; Compiler pacifiers |
185 (defvar font-lock-mode) | 185 (eval-when-compile |
186 (defvar font-lock-keywords) | 186 (unless (fboundp 'font-lock-fontify-region) |
187 (autoload 'font-lock-fontify-region "font-lock"))) | |
187 | 188 |
188 ;;;; | 189 ;;;; |
189 ;;;; Actual code | 190 ;;;; Actual code |
190 ;;;; | 191 ;;;; |
191 | 192 |