(report_file_error): String pointer args now point to

[gnu-emacs] / lisp / derived.el

diff --git a/lisp/derived.el b/lisp/derived.el
index 13e18548321028bd2c9acf40ba022010ed5b5593..994509855e42ffec883c87e21ea082a879ea8646 100644 (file)
--- a/lisp/derived.el
+++ b/lisp/derived.el
@@ -161,8 +161,8 @@ been generated automatically, with a reference to the keymap."
     `(progn
        (defvar ,map (make-sparse-keymap))
        (defvar ,syntax (make-syntax-table))
-       (defvar ,abbrev)
-       (define-abbrev-table ',abbrev nil)
+       (defvar ,abbrev
+        (progn (define-abbrev-table ',abbrev nil) ,abbrev))
        (put ',child 'derived-mode-parent ',parent)
 
        (defun ,child ()
@@ -178,8 +178,9 @@ been generated automatically, with a reference to the keymap."
                                        ; Identify special modes.
          ,(when parent
             `(progn
-               (if (get (quote ,parent) 'special)
-                   (put (quote ,child) 'special t))
+               (if (get (quote ,parent) 'mode-class)
+                   (put (quote ,child) 'mode-class
+                        (get (quote ,parent) 'mode-class)))
                                        ; Set up maps and tables.
                (unless (keymap-parent ,map)
                  (set-keymap-parent ,map (current-local-map)))
@@ -203,28 +204,18 @@ 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)
   "Find the class of a major MODE.
 A mode's class is the first ancestor which is NOT a derived mode.
 Use the `derived-mode-parent' property of the symbol to trace backwards.
-Since major-modes might derive from each other and from `fundamental-mode',
-this function is not very useful.  Use `derived-mode-p' instead."
+Since major-modes might all derive from `fundamental-mode', this function
+is not very useful."
   (while (get mode 'derived-mode-parent)
     (setq mode (get mode 'derived-mode-parent)))
   mode)
+(make-obsolete 'derived-mode-class 'derived-mode-p "21.4")
 
 \f
 ;;; PRIVATE