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