Mercurial > emacs

changeset 63936:1eb58fde25d4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(smerge-mode): Add duplicate defvar near top.
author Richard M. Stallman <rms@gnu.org>
date Sun, 03 Jul 2005 16:12:14 +0000
parents 9eca51cb6ae3
children fa8a3545cd6b
files lisp/smerge-mode.el
diffstat 1 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/smerge-mode.el	Sun Jul 03 16:11:30 2005 +0000
+++ b/lisp/smerge-mode.el	Sun Jul 03 16:12:14 2005 +0000
@@ -48,6 +48,9 @@
 (eval-when-compile (require 'cl))
 
 
+;;; The real definition comes later.
+(defvar smerge-mode)
+
 (defgroup smerge ()
   "Minor mode to resolve diff3 conflicts."
   :group 'tools