]> code.delx.au - gnu-emacs/blobdiff - lisp/emerge.el
*** empty log message ***
[gnu-emacs] / lisp / emerge.el
index 1f105163f468ec58aa484120afc002b1f3e1340a..447e45f14f3eb72e647134fb18b8b13f4f0a97ca 100644 (file)
 ;;;###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
 
 (defmacro emerge-eval-in-buffer (buffer &rest forms)