emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

emacs-27 30305b5: Make lisp/progmodes/js.el dependent on CC Mode in the


From: Alan Mackenzie
Subject: emacs-27 30305b5: Make lisp/progmodes/js.el dependent on CC Mode in the Makefile.
Date: Fri, 16 Oct 2020 12:31:01 -0400 (EDT)

branch: emacs-27
commit 30305b543d04f5d888c6d63e314d596ca0f3baa8
Author: Alan Mackenzie <acm@muc.de>
Commit: Alan Mackenzie <acm@muc.de>

    Make lisp/progmodes/js.el dependent on CC Mode in the Makefile.
    
    This will prevent version mismatches between compile time and runtime
    versions.  This fixes bug #43037.
    
    * lisp/Makefile.in: Make js.el dependent on cc-{defs,engine,mode}.elc.
---
 lisp/Makefile.in | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 57527bb..dac62ce 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -525,4 +525,10 @@ $(lisp)/progmodes/cc-mode.elc: 
$(lisp)/progmodes/cc-langs.elc \
 $(lisp)/progmodes/cc-styles.elc: $(lisp)/progmodes/cc-vars.elc \
    $(lisp)/progmodes/cc-align.elc
 
+# https://debbugs.gnu.org/43037
+# js.elc (like all modes using CC Mode's compile time macros) needs to
+# be compiled under the same version of CC Mode it will run with.
+$(lisp)/progmodes/js.elc: $(lisp)/progmodes/cc-defs.elc \
+   $(lisp)/progmodes/cc-engine.elc $(lisp)/progmodes/cc-mode.elc
+
 # Makefile ends here.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]