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

[Juanma Barranquero]

Index: emacs/lisp/emerge.el
diff -c emacs/lisp/emerge.el:1.53 emacs/lisp/emerge.el:1.54
*** emacs/lisp/emerge.el:1.53   Wed Aug 24 11:35:31 2005
--- emacs/lisp/emerge.el        Fri Aug 26 10:46:08 2005
***************
*** 44,54 ****
  ;;;###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
  
--- 44,60 ----
  ;;;###autoload (define-key menu-bar-emerge-menu [emerge-buffers]
  ;;;###autoload   '("Buffers..." . emerge-buffers))
  
! ;; 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