From: Richard M. Stallman <rms@gnu.org>
Date: Sun, 3 Jul 2005 16:12:14 +0000 (+0000)
Subject: (smerge-mode): Add duplicate defvar near top.
X-Git-Tag: emacs-pretest-22.0.90~8501
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7f84c46eb8576cc8351060ffd5075ac3516c0ce6;p=emacs.git

(smerge-mode): Add duplicate defvar near top.
---

diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el
index 55000391777..9e129c3571d 100644
--- a/lisp/smerge-mode.el
+++ b/lisp/smerge-mode.el
@@ -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