# HG changeset patch
# User Lute Kamstra <lute@gnu.org>
# Date 1112725979 0
# Node ID 3b2c29df4165198be72cd5622da42e23fd34cd9d
# Parent  1f1b8a1bcc8abb6777ffc7b97af2ac543f386170
(generic-mode-internal): Fix 2005-03-31 change.
(define-generic-mode): Ditto.  Fix debug declaration.

diff -r 1f1b8a1bcc8a -r 3b2c29df4165 lisp/generic.el
--- a/lisp/generic.el	Tue Apr 05 15:52:48 2005 +0000
+++ b/lisp/generic.el	Tue Apr 05 18:32:59 2005 +0000
@@ -226,7 +226,7 @@
 
 See the file generic-x.el for some examples of `define-generic-mode'."
   (declare (debug (sexp def-form def-form def-form form def-form
-			&optional stringp))
+			[&optional stringp] &rest [keywordp form]))
 	   (indent 1))
 
   ;; Backward compatibility.
@@ -239,20 +239,20 @@
     (push docstring custom-keyword-args)
     (setq docstring nil))
 
-  (let* ((mode-name (symbol-name mode))
+  (let* ((name (symbol-name mode))
 	 (pretty-name (capitalize (replace-regexp-in-string
-				   "-mode\\'" "" mode-name)))
-	 (mode-hook (intern (concat mode-name "-hook"))))
+				   "-mode\\'" "" name)))
+	 (mode-hook (intern (concat name "-hook"))))
 
     (unless (plist-get custom-keyword-args :group)
       (setq custom-keyword-args
 	    (plist-put custom-keyword-args 
 		       :group `',(intern (replace-regexp-in-string
-					  "-mode\\'" "" mode-name)))))
+					  "-mode\\'" "" name)))))
 
     `(progn
        ;; Add a new entry.
-       (add-to-list 'generic-mode-list ,mode-name)
+       (add-to-list 'generic-mode-list ,name)
 
        ;; Add it to auto-mode-alist
        (dolist (re ,auto-mode-list)
@@ -275,10 +275,10 @@
 (defun generic-mode-internal (mode comment-list keyword-list
 				   font-lock-list function-list)
   "Go into the generic mode MODE."
-  (let* ((mode-name (symbol-name mode))
+  (let* ((name (symbol-name mode))
 	 (pretty-name (capitalize (replace-regexp-in-string
-				   "-mode\\'" "" mode-name)))
-	 (mode-hook (intern (concat mode-name "-hook"))))
+				   "-mode\\'" "" name)))
+	 (mode-hook (intern (concat name "-hook"))))
 
     (kill-all-local-variables)