diff lisp/generic.el @ 34814:ce9ed5ad8fa2

(generic-read-type): Undo last change, inline into `generic-mode' and then remove. (generic-mode): Inline generic-read-type. (define-generic-mode): Push the symbol name rather than the symbol onto generic-mode-list.

--- a/lisp/generic.el	Thu Dec 21 23:22:16 2000 +0000
+++ b/lisp/generic.el	Thu Dec 21 23:25:57 2000 +0000
@@ -167,16 +167,6 @@
   )
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Inline functions
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defsubst generic-read-type ()
-  (completing-read
-   "Generic Type: "
-   (mapcar (lambda (elt) (list (symbol-name (car elt))))
-   nil t))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Functions
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
@@ -216,7 +206,7 @@
 
   ;; Add a new entry
   (unless (assq name generic-mode-list)
-    (push (list name) generic-mode-list))
+    (push (list (symbol-name name)) generic-mode-list))
 
   ;; Add it to auto-mode-alist
   (dolist (re auto-mode-list)
@@ -275,7 +265,7 @@
 To define a generic-mode, use the function `define-generic-mode'.
 Some generic modes are defined in `generic-x.el'."
   (interactive
-   (list (generic-read-type)))
+   (list (completing-read "Generic Type: " generic-mode-list nil t)))
   (funcall (intern type)))
 
 ;;; Comment Functionality