44 |
;;;###autoload (define-key menu-bar-emerge-menu [emerge-buffers] |
;;;###autoload (define-key menu-bar-emerge-menu [emerge-buffers] |
45 |
;;;###autoload '("Buffers..." . emerge-buffers)) |
;;;###autoload '("Buffers..." . emerge-buffers)) |
46 |
|
|
47 |
|
(eval-when-compile |
48 |
|
;; There aren't really global variables, just dynamic bindings |
49 |
|
(defvar merge-begin) (defvar merge-end) (defvar template) |
50 |
|
(defvar A-begin) (defvar A-end) (defvar B-begin) (defvar B-end) |
51 |
|
(defvar diff) (defvar diff-vector) (defvar valid-diff)) |
52 |
|
|
53 |
;;; Macros |
;;; Macros |
54 |
|
|
55 |
(defmacro emerge-eval-in-buffer (buffer &rest forms) |
(defmacro emerge-eval-in-buffer (buffer &rest forms) |