Commit 2a8bed1c authored by Glenn Morris's avatar Glenn Morris

cc-bytecomp tweaks for sake of byte-compiler

* lisp/progmodes/cc-bytecomp.el (cc-bytecomp-noruntime-functions): New.
(cc-require): Suppress spurious "noruntime" warnings.
(cc-require-when-compile): Use fboundp, for sake of compiler.
parent d6d236e2
2013-05-30 Glenn Morris <rgm@gnu.org>
* progmodes/cc-bytecomp.el (cc-bytecomp-noruntime-functions): New.
(cc-require): Suppress spurious "noruntime" warnings.
(cc-require-when-compile): Use fboundp, for sake of compiler.
* progmodes/cc-mode.el: Move load of cc-vars before that of
cc-langs (which in turn loads cc-vars), to quieten compiler.
......
......@@ -232,6 +232,9 @@ perhaps a `cc-bytecomp-restore-environment' is forgotten somewhere"))
(cc-bytecomp-setup-environment)
t))))
(defvar cc-bytecomp-noruntime-functions nil
"Saved value of `byte-compile-noruntime-functions'.")
(defmacro cc-require (cc-part)
"Force loading of the corresponding .el file in the current directory
during compilation, but compile in a `require'. Don't use within
......@@ -240,7 +243,16 @@ during compilation, but compile in a `require'. Don't use within
Having cyclic cc-require's will result in infinite recursion. That's
somewhat intentional."
`(progn
(eval-when-compile (cc-bytecomp-load (symbol-name ,cc-part)))
(eval-when-compile
(setq cc-bytecomp-noruntime-functions byte-compile-noruntime-functions)
(cc-bytecomp-load (symbol-name ,cc-part)))
;; Hack to suppress spurious "might not be defined at runtime" warnings.
;; The basic issue is that
;; (eval-when-compile (require 'foo))
;; (require 'foo)
;; produces bogus noruntime warnings about functions from foo.
(eval-when-compile
(setq byte-compile-noruntime-functions cc-bytecomp-noruntime-functions))
(require ,cc-part)))
(defmacro cc-provide (feature)
......@@ -266,7 +278,7 @@ somewhat intentional."
during compilation, but do a compile time `require' otherwise. Don't
use within `eval-when-compile'."
`(eval-when-compile
(if (and (featurep 'cc-bytecomp)
(if (and (fboundp 'cc-bytecomp-is-compiling)
(cc-bytecomp-is-compiling))
(if (or (not load-in-progress)
(not (featurep ,cc-part)))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment