(byte-compile-nogroup-warn): Warn only when name to be defined is quoted.

diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index e5b429604c730a490dde3fcc823a532e57816e13..3948dae610b0b6192c97365adc99ef8172ad6507 100644 (file)
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -1248,15 +1248,15 @@ extra args."
 (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)))))
+    (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.