[Emacs-diffs] /srv/bzr/emacs/trunk r110773: Decouple "noruntime" and "cl-functions" bytecomp warnings

[Glenn Morris]

------------------------------------------------------------
revno: 110773
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2012-11-02 18:35:01 -0400
message:
  Decouple "noruntime" and "cl-functions" bytecomp warnings
  
  * lisp/emacs-lisp/bytecomp.el (byte-compile-eval):
  Decouple "noruntime" and "cl-functions" warnings.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/bytecomp.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-11-01 02:25:08 +0000
+++ b/lisp/ChangeLog    2012-11-02 22:35:01 +0000
@@ -1,3 +1,8 @@
+2012-11-02  Glenn Morris  <address@hidden>
+
+       * emacs-lisp/bytecomp.el (byte-compile-eval):
+       Decouple "noruntime" and "cl-functions" warnings.
+
 2012-11-01  Stephen Berman  <address@hidden>
 
        * play/gomoku.el (gomoku-display-statistics): Update mode line

=== modified file 'lisp/emacs-lisp/bytecomp.el'
--- a/lisp/emacs-lisp/bytecomp.el       2012-10-11 20:08:38 +0000
+++ b/lisp/emacs-lisp/bytecomp.el       2012-11-02 22:35:01 +0000
@@ -863,16 +863,7 @@
            (let ((xs (pop hist-new))
                  old-autoloads)
              ;; Make sure the file was not already loaded before.
-             (unless (or (assoc (car xs) hist-orig)
-                         ;; Don't give both the "noruntime" and
-                         ;; "cl-functions" warning for the same function.
-                         ;; FIXME This seems incorrect - these are two
-                         ;; independent warnings.  For example, you may be
-                         ;; choosing to see the cl warnings but ignore them.
-                         ;; You probably don't want to ignore noruntime in the
-                         ;; same way.
-                         (and (byte-compile-warning-enabled-p 'cl-functions)
-                              (byte-compile-cl-file-p (car xs))))
+             (unless (assoc (car xs) hist-orig)
                (dolist (s xs)
                  (cond
                   ((and (consp s) (eq t (car s)))