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 |
;; There aren't really global variables, just dynamic bindings |
48 |
;; There aren't really global variables, just dynamic bindings |
(defvar A-begin) |
49 |
(defvar merge-begin) (defvar merge-end) (defvar template) |
(defvar A-end) |
50 |
(defvar A-begin) (defvar A-end) (defvar B-begin) (defvar B-end) |
(defvar B-begin) |
51 |
(defvar diff) (defvar diff-vector) (defvar valid-diff)) |
(defvar B-end) |
52 |
|
(defvar diff) |
53 |
|
(defvar diff-vector) |
54 |
|
(defvar merge-begin) |
55 |
|
(defvar merge-end) |
56 |
|
(defvar template) |
57 |
|
(defvar valid-diff) |
58 |
|
|
59 |
;;; Macros |
;;; Macros |
60 |
|
|