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

diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el
index 55000391777539f2ddb101cf3f69a02bd9ba3d69..9e129c3571d83d8fc0d7f107372511552e7ad09b 100644 (file)
--- 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