diff options
| author | Glenn Morris <rgm@gnu.org> | 2020-10-17 09:48:54 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2020-10-17 09:48:54 -0700 |
| commit | 3ac3a6503ebcf40ae6e179d92e1d168a4d440ea1 (patch) | |
| tree | 48987d8f445159691efbf8b060e59731d43d8bb5 /lisp/Makefile.in | |
| parent | 2f45054208ccc3fbd53b7f4d6bbaba92afa075c1 (diff) | |
| parent | 65078e0a760950783e56f6765465a59bd642e8e4 (diff) | |
| download | emacs-3ac3a6503ebcf40ae6e179d92e1d168a4d440ea1.tar.gz | |
Merge from origin/emacs-27
65078e0a76 * lisp/info.el (Info-hide-note-references): Doc fix. (Bug...
30305b543d Make lisp/progmodes/js.el dependent on CC Mode in the Make...
c37b2a9b42 Yet another fix for 'set-minibuffer-message'
72dd911981 Fix posn-at-x-y in builds --without-x
ace25f2066 Clarify the seq-reduce documentation
7d598e281d Make tramp-completion-reread-directory-timeout obsolete (B...
2c31ce18ea Fix 'message' when there's active minibuffer on another frame
# Conflicts:
# doc/misc/tramp.texi
# etc/NEWS
Diffstat (limited to 'lisp/Makefile.in')
| -rw-r--r-- | lisp/Makefile.in | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lisp/Makefile.in b/lisp/Makefile.in index 84c5733918a..7c86e89ca99 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in @@ -524,4 +524,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. |