From: Dave Love <fx@gnu.org>
Date: Fri, 10 Nov 2000 22:36:26 +0000 (+0000)
Subject: (state-or-merge): Defvar when compiling.
X-Git-Tag: emacs-pretest-21.0.90~142
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3b90e5b829f2856f2850faf7c86f6f8770023855;p=emacs.git

(state-or-merge): Defvar when compiling.
---

diff --git a/lisp/ediff-merg.el b/lisp/ediff-merg.el
index 92788ae968f..89e16791076 100644
--- a/lisp/ediff-merg.el
+++ b/lisp/ediff-merg.el
@@ -348,7 +348,8 @@ Combining is done according to the specifications in variable
 
 	(reverse delim-regs-list)
 	)))
-	
+
+(eval-when-compile (defvar state-of-merge)) ; dynamic var
 
 ;; Check if the non-preferred merge has been modified since originally set.
 ;; This affects only the regions that are marked as default-A/B or combined.