(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.

2 files changed, 10 insertions, 12 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ec93d294a33..bd9b2e31406 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2000-12-21  Stefan Monnier  <monnier@cs.yale.edu>
+
+        * generic.el (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.
+
 2000-12-21  Gerd Moellmann  <gerd@gnu.org>
 
         * generic.el (generic-read-type): Build an alist for
diff --git a/lisp/generic.el b/lisp/generic.el
index f17e2c0814d..497a90956de 100644
--- a/lisp/generic.el
+++ b/lisp/generic.el
@@ -167,16 +167,6 @@ Used to determine if files in fundamental mode should be put into
   )
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; 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 @@ See the file generic-x.el for some examples of `define-generic-mode'."
 
   ;; 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 @@ comment characters, keywords, and the like.)
 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