diff options
Diffstat (limited to 'lisp/emerge.el')
| -rw-r--r-- | lisp/emerge.el | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/lisp/emerge.el b/lisp/emerge.el index 1f105163f46..447e45f14f3 100644 --- a/lisp/emerge.el +++ b/lisp/emerge.el @@ -44,6 +44,18 @@ ;;;###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) |