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

[Juanma Barranquero]

Index: emacs/lisp/newcomment.el
diff -c emacs/lisp/newcomment.el:1.82 emacs/lisp/newcomment.el:1.83
*** emacs/lisp/newcomment.el:1.82       Sat Oct 16 15:32:14 2004
--- emacs/lisp/newcomment.el    Thu May 19 19:06:18 2005
***************
*** 90,96 ****
  
  (defcustom comment-fill-column nil
    "Column to use for `comment-indent'.  If nil, use `fill-column' instead."
!   :type '(choice (const nil) integer))
  
  ;;;###autoload
  (defcustom comment-column 32
--- 90,97 ----
  
  (defcustom comment-fill-column nil
    "Column to use for `comment-indent'.  If nil, use `fill-column' instead."
!   :type '(choice (const nil) integer)
!   :group 'comment)
  
  ;;;###autoload
  (defcustom comment-column 32
***************
*** 99,105 ****
  can set the value for a particular mode using that mode's hook.
  Comments might be indented to a value smaller than this in order
  not to go beyond `comment-fill-column'."
!   :type 'integer)
  (make-variable-buffer-local 'comment-column)
  
  ;;;###autoload
--- 100,107 ----
  can set the value for a particular mode using that mode's hook.
  Comments might be indented to a value smaller than this in order
  not to go beyond `comment-fill-column'."
!   :type 'integer
!   :group 'comment)
  (make-variable-buffer-local 'comment-column)
  
  ;;;###autoload
***************
*** 201,207 ****
  See `comment-styles' for a list of available styles."
    :type (if (boundp 'comment-styles)
            `(choice ,@(mapcar (lambda (s) `(const ,(car s))) comment-styles))
!         'symbol))
  
  ;;;###autoload
  (defcustom comment-padding " "
--- 203,210 ----
  See `comment-styles' for a list of available styles."
    :type (if (boundp 'comment-styles)
            `(choice ,@(mapcar (lambda (s) `(const ,(car s))) comment-styles))
!         'symbol)
!   :group 'comment)
  
  ;;;###autoload
  (defcustom comment-padding " "
***************
*** 211,217 ****
  
  Extra spacing between the comment characters and the comment text
  makes the comment easier to read.  Default is 1.  nil means 0."
!   :type '(choice string integer (const nil)))
  
  ;;;###autoload
  (defcustom comment-multi-line nil
--- 214,221 ----
  
  Extra spacing between the comment characters and the comment text
  makes the comment easier to read.  Default is 1.  nil means 0."
!   :type '(choice string integer (const nil))
!   :group 'comment)
  
  ;;;###autoload
  (defcustom comment-multi-line nil
***************
*** 222,228 ****
  
  It also affects \\[indent-new-comment-line].  However, if you want this
  behavior for explicit filling, you might as well use \\[newline-and-indent]."
!   :type 'boolean)
  
  (defcustom comment-empty-lines nil
    "If nil, `comment-region' does not comment out empty lines.
--- 226,233 ----
  
  It also affects \\[indent-new-comment-line].  However, if you want this
  behavior for explicit filling, you might as well use \\[newline-and-indent]."
!   :type 'boolean
!   :group 'comment)
  
  (defcustom comment-empty-lines nil
    "If nil, `comment-region' does not comment out empty lines.
***************
*** 231,237 ****
  terminated by the end of line (i.e. `comment-end' is empty)."
    :type '(choice (const :tag "Never" nil)
          (const :tag "Always" t)
!         (const :tag "EOl-terminated" 'eol)))
  
  ;;;;
  ;;;; Helpers
--- 236,243 ----
  terminated by the end of line (i.e. `comment-end' is empty)."
    :type '(choice (const :tag "Never" nil)
          (const :tag "Always" t)
!         (const :tag "EOl-terminated" 'eol))
!   :group 'comment)
  
  ;;;;
  ;;;; Helpers
***************
*** 1091,1097 ****
  (defcustom comment-auto-fill-only-comments nil
    "Non-nil means to only auto-fill inside comments.
  This has no effect in modes that do not define a comment syntax."
!   :type 'boolean)
  
  (defun comment-valid-prefix-p (prefix compos)
    (or
--- 1097,1104 ----
  (defcustom comment-auto-fill-only-comments nil
    "Non-nil means to only auto-fill inside comments.
  This has no effect in modes that do not define a comment syntax."
!   :type 'boolean
!   :group 'comment)
  
  (defun comment-valid-prefix-p (prefix compos)
    (or