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

[Lute Kamstra]

Index: emacs/lisp/generic.el
diff -c emacs/lisp/generic.el:1.34 emacs/lisp/generic.el:1.35
*** emacs/lisp/generic.el:1.34  Sun Apr  3 20:32:22 2005
--- emacs/lisp/generic.el       Tue Apr  5 14:44:34 2005
***************
*** 219,226 ****
  
  The optional CUSTOM-KEYWORD-ARGS are pairs of keywords and
  values.  They will be passed to the generated `defcustom' form of
! the mode hook variable MODE-hook.  You can specify keyword
! arguments without specifying a docstring.
  
  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
--- 219,228 ----
  
  The optional CUSTOM-KEYWORD-ARGS are pairs of keywords and
  values.  They will be passed to the generated `defcustom' form of
! the mode hook variable MODE-hook.  Defaults to MODE without the
! possible trailing \"-mode\".  (This default may not be a valid
! customization group defined with `defgroup'.  Make sure it is.)
! You can specify keyword arguments without specifying a docstring.
  
  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
***************
*** 245,253 ****
      (unless (plist-get custom-keyword-args :group)
        (setq custom-keyword-args
            (plist-put custom-keyword-args 
!                      :group `(or (custom-current-group)
!                                  ',(intern (replace-regexp-in-string
!                                             "-mode\\'" "" mode-name))))))
  
      `(progn
         ;; Add a new entry.
--- 247,254 ----
      (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.