mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-25 03:17:13 +00:00
0199c3a3d4
This reverts commit 5514e1e7d7.
This resolves conflicts between staging-next and master after #367148
is merged into master. In addition, this patch does not need to go
through a staging cycle. We can reapply it directly to master and it
will probably reach users sooner.
31 lines
1.4 KiB
Diff
31 lines
1.4 KiB
Diff
From: Lin Jian <me@linj.tech>
|
|
Bug: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=67916
|
|
|
|
Inhibit lexical cookie warning for *-pkg.el files (bug#67916)
|
|
|
|
Users may use byte-compile-error-on-warn to turn compilation warnings
|
|
into errors to make sure their Emacs lisp packages are warning-free.
|
|
Emacs bug 67916 makes that difficult because the Emacs-generated file
|
|
*-pkg.el emits a compilation warning about missing lexical cookie.
|
|
|
|
There is an upstream patch to fix this. That patch makes Emacs also
|
|
generate the needed lexical cookie when generating *-pkg.el files.
|
|
However, that patch has stalled.
|
|
|
|
This patch takes an easier but less accurate approach by inhibiting
|
|
lexical cookie warning for *-pkg.el files. Given that not all
|
|
*-pkg.el files are generated by Emacs, to reduce impact, this patch
|
|
also checks no-byte-compile.
|
|
|
|
--- a/lisp/emacs-lisp/bytecomp.el
|
|
+++ b/lisp/emacs-lisp/bytecomp.el
|
|
@@ -2266,6 +2266,8 @@ See also `emacs-lisp-byte-compile-and-load'."
|
|
filename buffer-file-name))
|
|
;; Don't inherit lexical-binding from caller (bug#12938).
|
|
(unless (or (local-variable-p 'lexical-binding)
|
|
+ (and (string-suffix-p "-pkg.el" filename)
|
|
+ (with-current-buffer input-buffer no-byte-compile))
|
|
bytecomp--inhibit-lexical-cookie-warning)
|
|
(let ((byte-compile-current-buffer (current-buffer)))
|
|
(displaying-byte-compile-warnings
|