(Fbuffer_substring): Doc fix.

[gnu-emacs] / lisp / generic.el

diff --git a/lisp/generic.el b/lisp/generic.el
index e08b4ad371c380e1f9cc94f72c1d090f19b0e561..497a90956de9fd1fd27f62d3d1d1cf54162ac9bf 100644 (file)
--- a/lisp/generic.el
+++ b/lisp/generic.el
@@ -166,16 +166,6 @@ Used to determine if files in fundamental mode should be put into
   :type  'regexp
   )
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Inline functions
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defsubst generic-read-type ()
-  (completing-read
-   "Generic Type: "
-   generic-mode-list
-   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