# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 959301750 0
# Node ID 8abed1831e4f18c07f7309214ae2d0c9cf09de6a
# Parent  10f869e6566bb3ce57351a4b6f2a11d9086f06a9
Fix keywords.
(define-derived-mode): Only define if needed.

diff -r 10f869e6566b -r 8abed1831e4f lisp/derived.el
--- a/lisp/derived.el	Thu May 25 21:06:28 2000 +0000
+++ b/lisp/derived.el	Fri May 26 00:42:30 2000 +0000
@@ -28,8 +28,8 @@
 
 ;; Obsolete.
 ;; Use the `derived-major-mode' provided by easy-mmode.el instead.
-;; It is only kept for backward compatibility with byte-compiled files
-;; which refer to `derived-mode-init-mode-variables' and other functions.
+;; It is only kept for backward compatibility with Emacs-20 byte-compiled
+;; files that refer to `derived-mode-init-mode-variables' and other functions.
 
 
 
@@ -104,6 +104,8 @@
 ;; PUBLIC: define a new major mode which inherits from an existing one.
 
 ;; ;;;###autoload
+;; Don't override the definition provided by easy-mmode.el
+(unless (fboundp 'define-derived-mode)
 (defmacro define-derived-mode (child parent name &optional docstring &rest body)
   "Create a new mode as a variant of an existing mode.
 
@@ -168,7 +170,7 @@
 ;;;					; obsolete.
 ;;;	 (derived-mode-run-setup-function (quote ,child))
 					; Run the hooks, if any.
-       (derived-mode-run-hooks (quote ,child)))))
+       (derived-mode-run-hooks (quote ,child))))))
 
 
 ;; PUBLIC: find the ultimate class of a derived mode.