summaryrefslogtreecommitdiff
path: root/lisp/emerge.el
diff options
context:
space:
mode:
authorJuanma Barranquero <lekktu@gmail.com>2005-08-24 11:36:27 +0000
committerJuanma Barranquero <lekktu@gmail.com>2005-08-24 11:36:27 +0000
commitbbf40036a9d95bb8e4204d89e83372af297102c5 (patch)
treec0a3b34cc2ff0c26b2a8a5d492bdaf04a0b5a6e2 /lisp/emerge.el
parent63f0a16643b6e7d0fa0707a955bc27f46e8e7f36 (diff)
downloademacs-bbf40036a9d95bb8e4204d89e83372af297102c5.tar.gz
(merge-begin, merge-end, template, A-begin, A-end, B-begin, B-end, diff,
diff-vector, valid-diff): Defvar at compile time to silence the byte-compiler.
Diffstat (limited to 'lisp/emerge.el')
-rw-r--r--lisp/emerge.el6
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)