[Emacs-diffs] Changes to emacs/lisp/generic.el

[Lute Kamstra]

Index: emacs/lisp/generic.el
diff -c emacs/lisp/generic.el:1.35 emacs/lisp/generic.el:1.36
*** emacs/lisp/generic.el:1.35  Tue Apr  5 14:44:34 2005
--- emacs/lisp/generic.el       Tue Apr  5 18:32:59 2005
***************
*** 226,232 ****
  
  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))
           (indent 1))
  
    ;; Backward compatibility.
--- 226,232 ----
  
  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] &rest [keywordp form]))
           (indent 1))
  
    ;; Backward compatibility.
***************
*** 239,258 ****
      (push docstring custom-keyword-args)
      (setq docstring nil))
  
!   (let* ((mode-name (symbol-name mode))
         (pretty-name (capitalize (replace-regexp-in-string
!                                  "-mode\\'" "" mode-name)))
!        (mode-hook (intern (concat mode-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)))))
  
      `(progn
         ;; Add a new entry.
!        (add-to-list 'generic-mode-list ,mode-name)
  
         ;; Add it to auto-mode-alist
         (dolist (re ,auto-mode-list)
--- 239,258 ----
      (push docstring custom-keyword-args)
      (setq docstring nil))
  
!   (let* ((name (symbol-name mode))
         (pretty-name (capitalize (replace-regexp-in-string
!                                  "-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\\'" "" name)))))
  
      `(progn
         ;; Add a new entry.
!        (add-to-list 'generic-mode-list ,name)
  
         ;; Add it to auto-mode-alist
         (dolist (re ,auto-mode-list)
***************
*** 275,284 ****
  (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))
         (pretty-name (capitalize (replace-regexp-in-string
!                                  "-mode\\'" "" mode-name)))
!        (mode-hook (intern (concat mode-name "-hook"))))
  
      (kill-all-local-variables)
  
--- 275,284 ----
  (defun generic-mode-internal (mode comment-list keyword-list
                                   font-lock-list function-list)
    "Go into the generic mode MODE."
!   (let* ((name (symbol-name mode))
         (pretty-name (capitalize (replace-regexp-in-string
!                                  "-mode\\'" "" name)))
!        (mode-hook (intern (concat name "-hook"))))
  
      (kill-all-local-variables)