summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuanma Barranquero <lekktu@gmail.com>2005-08-26 10:46:08 +0000
committerJuanma Barranquero <lekktu@gmail.com>2005-08-26 10:46:08 +0000
commit34e0a517a5e24a2cd3fb2038ac6b2a392bf1548d (patch)
treed5ab532636da6b59303b855e274f3555f222dccd
parentc953ec6445e1852981182f36b644f8593c4b5341 (diff)
downloademacs-34e0a517a5e24a2cd3fb2038ac6b2a392bf1548d.tar.gz
emerge.el: Move the `defvar's to the top level.
-rw-r--r--lisp/emerge.el16
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