diff options
| author | Richard M. Stallman <rms@gnu.org> | 2005-07-03 16:12:14 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 2005-07-03 16:12:14 +0000 |
| commit | 7f84c46eb8576cc8351060ffd5075ac3516c0ce6 (patch) | |
| tree | 3e7697d8f2414d2a6f250d1fbccf807ff56979a3 | |
| parent | f4f2bca3ded5b0cbd2b85a3e93c60ead3c9dca17 (diff) | |
| download | emacs-7f84c46eb8576cc8351060ffd5075ac3516c0ce6.tar.gz emacs-7f84c46eb8576cc8351060ffd5075ac3516c0ce6.tar.bz2 emacs-7f84c46eb8576cc8351060ffd5075ac3516c0ce6.zip | |
(smerge-mode): Add duplicate defvar near top.
| -rw-r--r-- | lisp/smerge-mode.el | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el index 55000391777..9e129c3571d 100644 --- a/lisp/smerge-mode.el +++ b/lisp/smerge-mode.el @@ -48,6 +48,9 @@ (eval-when-compile (require 'cl)) +;;; The real definition comes later. +(defvar smerge-mode) + (defgroup smerge () "Minor mode to resolve diff3 conflicts." :group 'tools |