diff options
| author | Dave Love <fx@gnu.org> | 2000-11-10 22:36:26 +0000 |
|---|---|---|
| committer | Dave Love <fx@gnu.org> | 2000-11-10 22:36:26 +0000 |
| commit | 3b90e5b829f2856f2850faf7c86f6f8770023855 (patch) | |
| tree | 06fd70c76a12be7f4fbc55fccb38286887bfc5e5 /lisp/ediff-merg.el | |
| parent | 2acc9e43c3d6184d1948d14ee2047802a00a4329 (diff) | |
| download | emacs-3b90e5b829f2856f2850faf7c86f6f8770023855.tar.gz emacs-3b90e5b829f2856f2850faf7c86f6f8770023855.tar.bz2 emacs-3b90e5b829f2856f2850faf7c86f6f8770023855.zip | |
(state-or-merge): Defvar when compiling.
Diffstat (limited to 'lisp/ediff-merg.el')
| -rw-r--r-- | lisp/ediff-merg.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/ediff-merg.el b/lisp/ediff-merg.el index 92788ae968f..89e16791076 100644 --- a/lisp/ediff-merg.el +++ b/lisp/ediff-merg.el @@ -348,7 +348,8 @@ Combining is done according to the specifications in variable (reverse delim-regs-list) ))) - + +(eval-when-compile (defvar state-of-merge)) ; dynamic var ;; Check if the non-preferred merge has been modified since originally set. ;; This affects only the regions that are marked as default-A/B or combined. |