Mercurial > emacs
diff lisp/emerge.el @ 90225:a3716f7538f2
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-79
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 519-530)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 106-111)
- Merge from emacs--cvs-trunk--0
- Update from CVS
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Tue, 06 Sep 2005 00:25:20 +0000 |
| parents | 2d92f5c9d6ae 2fe9e9280f25 |
| children | 14c4a6aac623 |
line wrap: on
line diff
--- a/lisp/emerge.el Fri Aug 26 09:51:52 2005 +0000 +++ b/lisp/emerge.el Tue Sep 06 00:25:20 2005 +0000 @@ -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)) +;; 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