(defgroup edt): Arrange that definition starts at beginning of line.

2 files changed, 13 insertions, 9 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a62d7a4a76c..d20ad6927b9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2002-11-12   Markus Rost  <rost@math.ohio-state.edu>
 
+        * emulation/edt.el (defgroup edt): Arrange that definition starts
+        at beginning of line.
+
         * ls-lisp.el (defgroup ls-lisp): Remove autoload cookie.
 
         * hi-lock.el (defgroup hi-lock-interactive-text-highlighting):
@@ -16,8 +19,8 @@
         (custom-make-dependencies):  Handle :version also for autoloaded
         options.
 
-        * winner.el (defgroup winner): Handle Emacs 19 compatibility so
-        that definition starts at beginning of line.
+        * winner.el (defgroup winner): Arrange that definition starts at
+        beginning of line.
 
         * emulation/edt.el: Simplify Emacs 19 compatibility.
 
diff --git a/lisp/emulation/edt.el b/lisp/emulation/edt.el
index 43b7b9ec6c1..ecb53bdffbf 100644
--- a/lisp/emulation/edt.el
+++ b/lisp/emulation/edt.el
@@ -166,13 +166,14 @@
 ;;;; VARIABLES and CONSTANTS
 ;;;;
 
-;; For backward compatibility to Emacs 19, skip this if defgroup is
-;; not defined.
-(if (fboundp 'defgroup)
-    (defgroup edt nil
-      "Emacs emulating EDT."
-      :prefix "edt-"
-      :group 'emulations))
+;; For backward compatibility to Emacs 19.
+(or (fboundp 'defgroup)
+    (defmacro defgroup (&rest rest)))
+
+(defgroup edt nil
+  "Emacs emulating EDT."
+  :prefix "edt-"
+  :group 'emulations)
 
 ;;;
 ;;;  Version Information