# HG changeset patch # User Juanma Barranquero # Date 1124883331 0 # Node ID 6805ffc891370c5ba56d2b004919b7ce91edfecf # Parent b4238c551ea788b1823be4a4914caf048a6b00be (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. diff -r b4238c551ea7 -r 6805ffc89137 lisp/emerge.el --- a/lisp/emerge.el Wed Aug 24 11:34:39 2005 +0000 +++ b/lisp/emerge.el Wed Aug 24 11:35:31 2005 +0000 @@ -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)