[Emacs-diffs] Changes to emacs/lisp/emerge.el

[Juanma Barranquero]

Index: emacs/lisp/emerge.el
diff -c emacs/lisp/emerge.el:1.52 emacs/lisp/emerge.el:1.53
*** emacs/lisp/emerge.el:1.52   Mon May 16 11:33:46 2005
--- emacs/lisp/emerge.el        Wed Aug 24 11:35:31 2005
***************
*** 44,49 ****
--- 44,55 ----
  ;;;###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))
+ 
  ;;; Macros
  
  (defmacro emerge-eval-in-buffer (buffer &rest forms)