emerge.el: Move the `defvar's to the top level.
This commit is contained in:
parent
20dc22152e
commit
3945a3a386
1 changed files with 11 additions and 5 deletions
|
|
@ -44,11 +44,17 @@
|
|||
;;;###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))
|
||||
(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
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue