Mercurial > emacs
changeset 33394:237411236185
(state-or-merge): Defvar when compiling.
| author | Dave Love <fx@gnu.org> |
|---|---|
| date | Fri, 10 Nov 2000 22:36:26 +0000 |
| parents | a0ee9eabfff3 |
| children | 83221012a4f7 |
| files | lisp/ediff-merg.el |
| diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ediff-merg.el Fri Nov 10 22:36:02 2000 +0000 +++ b/lisp/ediff-merg.el Fri Nov 10 22:36:26 2000 +0000 @@ -348,7 +348,8 @@ (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.