changeset 29223:8abed1831e4f

Fix keywords. (define-derived-mode): Only define if needed.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Fri, 26 May 2000 00:42:30 +0000
parents 10f869e6566b
children c4ed562f1556
files lisp/derived.el
diffstat 1 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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.