[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/smerge-mode.el
|
From: |
Richard M . Stallman |
|
Subject: |
[Emacs-diffs] Changes to emacs/lisp/smerge-mode.el |
|
Date: |
Sun, 03 Jul 2005 12:12:14 -0400 |
Index: emacs/lisp/smerge-mode.el
diff -c emacs/lisp/smerge-mode.el:1.36 emacs/lisp/smerge-mode.el:1.37
*** emacs/lisp/smerge-mode.el:1.36 Thu Jun 16 14:34:12 2005
--- emacs/lisp/smerge-mode.el Sun Jul 3 16:12:14 2005
***************
*** 48,53 ****
--- 48,56 ----
(eval-when-compile (require 'cl))
+ ;;; The real definition comes later.
+ (defvar smerge-mode)
+
(defgroup smerge ()
"Minor mode to resolve diff3 conflicts."
:group 'tools
- [Emacs-diffs] Changes to emacs/lisp/smerge-mode.el,
Richard M . Stallman <=