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

[Richard M . Stallman]

Index: emacs/lisp/emacs-lisp/bytecomp.el
diff -c emacs/lisp/emacs-lisp/bytecomp.el:2.166 
emacs/lisp/emacs-lisp/bytecomp.el:2.167
*** emacs/lisp/emacs-lisp/bytecomp.el:2.166     Sun May 22 02:30:41 2005
--- emacs/lisp/emacs-lisp/bytecomp.el   Mon May 30 06:49:18 2005
***************
*** 1248,1262 ****
  (defun byte-compile-nogroup-warn (form)
    (let ((keyword-args (cdr (cdr (cdr (cdr form)))))
        (name (cadr form)))
!     (unless (plist-get keyword-args :group)
!       (byte-compile-warn
!        "%s for `%s' fails to specify containing group"
!        (cdr (assq (car form)
!                 '((custom-declare-group . defgroup)
!                   (custom-declare-face . defface)
!                   (custom-declare-variable . defcustom))))
!        (if (and (consp name) (eq (car name) 'quote))
!          (cadr name) name)))))
  
  ;; Warn if the function or macro is being redefined with a different
  ;; number of arguments.
--- 1248,1262 ----
  (defun byte-compile-nogroup-warn (form)
    (let ((keyword-args (cdr (cdr (cdr (cdr form)))))
        (name (cadr form)))
!     (or (plist-get keyword-args :group)
!       (not (and (consp name) (eq (car name) 'quote)))
!       (byte-compile-warn
!        "%s for `%s' fails to specify containing group"
!        (cdr (assq (car form)
!                   '((custom-declare-group . defgroup)
!                     (custom-declare-face . defface)
!                     (custom-declare-variable . defcustom))))
!        (cadr name)))))
  
  ;; Warn if the function or macro is being redefined with a different
  ;; number of arguments.