2 files changed, 4 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6b55cb97ab2..0d1d4d59110 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2007-05-25  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * emacs-lisp/derived.el (define-derived-mode): Remove bogus
+        compatibiity code.
+
         * emacs-lisp/copyright.el (copyright-names-regexp): New var.
         (copyright-update-year): Use it.
 
diff --git a/lisp/emacs-lisp/derived.el b/lisp/emacs-lisp/derived.el
index 2b2cffc5a35..5fc60cf516f 100644
--- a/lisp/emacs-lisp/derived.el
+++ b/lisp/emacs-lisp/derived.el
@@ -254,11 +254,7 @@ No problems result if this variable is not bound.
           ,@body
           )
          ;; Run the hooks, if any.
-         ;; Make the generated code work in older Emacs versions
-         ;; that do not yet have run-mode-hooks.
-         (if (fboundp 'run-mode-hooks)
-             (run-mode-hooks ',hook)
-           (run-hooks ',hook))))))
+         (run-mode-hooks ',hook)))))
 
 ;; PUBLIC: find the ultimate class of a derived mode.