[Emacs-diffs] Changes to emacs/lisp/ediff-merg.el,v

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       08/06/07 02:44:11

Index: ediff-merg.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/ediff-merg.el,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- ediff-merg.el       6 May 2008 07:57:32 -0000       1.39
+++ ediff-merg.el       7 Jun 2008 02:44:10 -0000       1.40
@@ -352,7 +352,7 @@
        (reverse delim-regs-list)
        )))
 
-(eval-when-compile (defvar state-of-merge)) ; dynamic var
+(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.