Mercurial > emacs
changeset 81427:9445d2ed7385
(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.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Thu, 14 Jun 2007 21:25:12 +0000 |
| parents | 588659946874 |
| children | fd3f2f0bf986 |
| files | lisp/ChangeLog lisp/emacs-lisp/bytecomp.el |
| diffstat | 2 files changed, 24 insertions(+), 28 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu Jun 14 19:30:34 2007 +0000 +++ b/lisp/ChangeLog Thu Jun 14 21:25:12 2007 +0000 @@ -1,9 +1,16 @@ +2007-06-14 Stefan Monnier <monnier@iro.umontreal.ca> + + * 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 <kifer@cs.stonybrook.edu> - + * 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 <lekktu@gmail.com> * follow.el (follow-all-followers, follow-generic-filter):
--- a/lisp/emacs-lisp/bytecomp.el Thu Jun 14 19:30:34 2007 +0000 +++ b/lisp/emacs-lisp/bytecomp.el Thu Jun 14 21:25:12 2007 +0000 @@ -879,7 +879,6 @@ (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 @@ ;; 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 @@ ;; 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)