From: Richard M. Stallman <rms@gnu.org>
Date: Mon, 30 May 2005 06:49:18 +0000 (+0000)
Subject: (byte-compile-nogroup-warn): Warn only when name to be defined is quoted.
X-Git-Tag: emacs-pretest-22.0.90~9424
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cbd87c94ac75cbc30b069dd56af48b30ab2952b0;p=emacs.git

(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 e5b429604c7..3948dae610b 100644
--- 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.