(derived-mode-p): Function moved to subr.el.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1821419e66660182c3116bce27b2b6c8f7cf3b75..d505d475b044f277122da6a259e4091b0acb88c5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2001-12-11  Richard M. Stallman  <rms@gnu.org>
 
+       * derived.el (derived-mode-p): Function moved to subr.el.
+
+       * subr.el (derived-mode-p): Moved here from derived.el.
+
        * international/mule.el (set-auto-coding): Use set-auto-mode-1.
 
        * files.el (set-auto-mode-1): New subroutine, broken out of

diff --git a/lisp/derived.el b/lisp/derived.el
index 3e899c09fea20d673c7bb1b80288715429afb0fa..3586affe216448ac04b093d779833ae6b6786fbe 100644 (file)
--- a/lisp/derived.el
+++ b/lisp/derived.el
@@ -203,17 +203,6 @@ been generated automatically, with a reference to the keymap."
                                        ; Run the hooks, if any.
         (run-mode-hooks ',hook)))))
 
-;; PUBLIC: find if the current mode derives from another.
-
-;;;###autoload
-(defun derived-mode-p (&rest modes)
-  "Non-nil if the current major mode is derived from one of MODES.
-Uses the `derived-mode-parent' property of the symbol to trace backwards."
-  (let ((parent major-mode))
-    (while (and (not (memq parent modes))
-               (setq parent (get parent 'derived-mode-parent))))
-    parent))
-
 ;; PUBLIC: find the ultimate class of a derived mode.
 
 (defun derived-mode-class (mode)