aboutsummaryrefslogtreecommitdiffstats
path: root/src/Makefile.in
diff options
context:
space:
mode:
authorRobert Pluim2021-09-20 12:41:15 +0200
committerRobert Pluim2021-09-20 22:35:34 +0200
commitde289d58a4efff4a8625f100eabdc56da98e2e07 (patch)
tree56930d855a0e926dd92350440cb5362912b5ad48 /src/Makefile.in
parent0b98ea5fbe276c67206896dca111c000f984ee0f (diff)
downloademacs-de289d58a4efff4a8625f100eabdc56da98e2e07.tar.gz
emacs-de289d58a4efff4a8625f100eabdc56da98e2e07.zip
Support for Unicode emoji sequences
This covers both sequences using Zero-Width-Joiner codepoints and those without. Bug#39799, I hope. * .gitignore: Add emoji-zwj.el * admin/notes/unicode: Add emoji-zwj-sequences.txt and emoji-sequences.txt references. Describe how to test after updating to a newer Unicode version. * admin/unidata/Makefile.in (all): add emoji-zwj.el as a dependency. (emoji-zwj.el): Add target plus rules for building. (gen-clean): Add emoji-zwj.el. * admin/unidata/README: Add emoji-zwj-sequences.txt and emoji-sequences.txt references. * admin/unidata/blocks.awk: Force emoji script to be used for certain codepoints that are used by the Unicode sequences. * admin/unidata/emoji-sequences.txt: New file. * admin/unidata/emoji-zwj-sequences.txt: New file. * admin/unidata/emoji-zwj.awk: New file. Derives composition-function-table rules from emoji-zwj-sequences.txt, plus hardcodes some derived manually from emoji-sequences.txt. * etc/NEWS: Announce change. * lisp/international/characters.el: Load the generated emoji-zwj.el * src/Makefile.in (emoji-zwj): New target. (temacs): Add emoji-zwj as a dependency.
Diffstat (limited to 'src/Makefile.in')
-rw-r--r--src/Makefile.in8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/Makefile.in b/src/Makefile.in
index bb69a657077..c11d96d2c4e 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -545,7 +545,11 @@ charscript = ${lispintdir}/charscript.el
545${charscript}: FORCE 545${charscript}: FORCE
546 $(MAKE) -C ../admin/unidata $(notdir $@) 546 $(MAKE) -C ../admin/unidata $(notdir $@)
547 547
548${lispintdir}/characters.elc: ${charscript:.el=.elc} 548emoji-zwj = ${lispintdir}/emoji-zwj.el
549${emoji-zwj}: FORCE
550 $(MAKE) -C ../admin/unidata $(notdir $@)
551
552${lispintdir}/characters.elc: ${charscript:.el=.elc} ${emoji-zwj:.el=.elc}
549 553
550SYSTEM_TYPE = @SYSTEM_TYPE@ 554SYSTEM_TYPE = @SYSTEM_TYPE@
551 555
@@ -634,7 +638,7 @@ endif
634## This goes on to affect various things, and the emacs binary fails 638## This goes on to affect various things, and the emacs binary fails
635## to start if Vinstallation_directory has the wrong value. 639## to start if Vinstallation_directory has the wrong value.
636temacs$(EXEEXT): $(LIBXMENU) $(ALLOBJS) $(LIBEGNU_ARCHIVE) $(EMACSRES) \ 640temacs$(EXEEXT): $(LIBXMENU) $(ALLOBJS) $(LIBEGNU_ARCHIVE) $(EMACSRES) \
637 $(charsets) $(charscript) $(MAKE_PDUMPER_FINGERPRINT) 641 $(charsets) $(charscript) ${emoji-zwj} $(MAKE_PDUMPER_FINGERPRINT)
638 $(AM_V_CCLD)$(CC) -o $@.tmp \ 642 $(AM_V_CCLD)$(CC) -o $@.tmp \
639 $(ALL_CFLAGS) $(TEMACS_LDFLAGS) $(LDFLAGS) \ 643 $(ALL_CFLAGS) $(TEMACS_LDFLAGS) $(LDFLAGS) \
640 $(ALLOBJS) $(LIBEGNU_ARCHIVE) $(W32_RES_LINK) $(LIBES) 644 $(ALLOBJS) $(LIBEGNU_ARCHIVE) $(W32_RES_LINK) $(LIBES)