diff options
author | Stefan Monnier <[email protected]> | 2007-06-14 21:25:12 +0000 |
---|---|---|
committer | Stefan Monnier <[email protected]> | 2007-06-14 21:25:12 +0000 |
commit | 3ab6a7ae0503d07bf4aca37d877c7e2f46c85f42 (patch) | |
tree | 9b835c5714682d5f6cfdd8789d7ccd1cc912cce1 | |
parent | 33af2b6ea3180a689702d5bf05d40ea7a0f100de (diff) |
(byte-compile-current-group, byte-compile-nogroup-warn, byte-compile-file):
Revert part of last change. Apparently the "warning even if the group is
implicit" is a feature rather than a bug.
-rw-r--r-- | lisp/ChangeLog | 13 | ||||
-rw-r--r-- | lisp/emacs-lisp/bytecomp.el | 39 |
2 files changed, 24 insertions, 28 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index aa55ba8d0c..c6e9a0a2dc 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,9 +1,16 @@ +2007-06-14 Stefan Monnier <[email protected]> + + * emacs-lisp/bytecomp.el (byte-compile-current-group) + (byte-compile-nogroup-warn, byte-compile-file): Revert part of last + change. Apparently the "warning even if the group is implicit" is + a feature rather than a bug. + 2007-06-14 Michael Kifer <[email protected]> - + * viper.el (viper-describe-key-ad, viper-describe-key-briefly-ad): - different advices for Emacs and XEmacs. Compile them conditionally. + different advices for Emacs and XEmacs. Compile them conditionally. (viper-version): belated version change. - + 2007-06-14 Juanma Barranquero <[email protected]> * follow.el (follow-all-followers, follow-generic-filter): diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index 6a9381d787..8760f36775 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -879,7 +879,6 @@ Each function's symbol gets added to `byte-compile-noruntime-functions'." (defvar byte-compile-current-form nil) (defvar byte-compile-dest-file nil) (defvar byte-compile-current-file nil) -(defvar byte-compile-current-group nil) (defvar byte-compile-current-buffer nil) ;; Log something that isn't a warning. @@ -1281,29 +1280,20 @@ extra args." ;; Warn if a custom definition fails to specify :group. (defun byte-compile-nogroup-warn (form) - (if (and (memq (car form) '(custom-declare-face custom-declare-variable)) - byte-compile-current-group) - ;; The group will be provided implicitly. - nil - (let ((keyword-args (cdr (cdr (cdr (cdr form))))) - (name (cadr form))) - (or (not (eq (car-safe name) 'quote)) - (and (eq (car form) 'custom-declare-group) - (equal name ''emacs)) - (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))) - ;; Update the current group, if needed. - (if (and byte-compile-current-file ;Only when byte-compiling a whole file. - (eq (car form) 'custom-declare-group) - (eq (car-safe name) 'quote)) - (setq byte-compile-current-group (cadr name)))))) + (let ((keyword-args (cdr (cdr (cdr (cdr form))))) + (name (cadr form))) + (or (not (eq (car-safe name) 'quote)) + (and (eq (car form) 'custom-declare-group) + (equal name ''emacs)) + (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. @@ -1665,7 +1655,6 @@ The value is non-nil if there were no errors, nil if errors." ;; Force logging of the file name for each file compiled. (setq byte-compile-last-logged-file nil) (let ((byte-compile-current-file filename) - (byte-compile-current-group nil) (set-auto-coding-for-load t) target-file input-buffer output-buffer byte-compile-dest-file) |