1 files changed, 11 insertions, 5 deletions

diff --git a/lisp/emerge.el b/lisp/emerge.el
index e55a75ef2fc..447e45f14f3 100644
--- a/lisp/emerge.el
+++ b/lisp/emerge.el
@@ -44,11 +44,17 @@
 ;;;###autoload (define-key menu-bar-emerge-menu [emerge-buffers]
 ;;;###autoload   '("Buffers..." . emerge-buffers))
 
-(eval-when-compile
-  ;; There aren't really global variables, just dynamic bindings
-  (defvar merge-begin) (defvar merge-end) (defvar template)
-  (defvar A-begin) (defvar A-end) (defvar B-begin) (defvar B-end)
-  (defvar diff) (defvar diff-vector) (defvar valid-diff))
+;; There aren't really global variables, just dynamic bindings
+(defvar A-begin)
+(defvar A-end)
+(defvar B-begin)
+(defvar B-end)
+(defvar diff)
+(defvar diff-vector)
+(defvar merge-begin)
+(defvar merge-end)
+(defvar template)
+(defvar valid-diff)
 
 ;;; Macros