diff options
author | Glenn Morris <rgm@gnu.org> | 2020-03-23 09:48:15 -0700 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2020-03-23 09:48:15 -0700 |
commit | 5d5d5d492c0f1cc500713b133b1ad3e205031714 (patch) | |
tree | 958a27c2c2408caf042d83d3652f24631dd44e9b /nt | |
parent | 7832e6192de1256e37f04ec172ba3633e5e49b91 (diff) | |
parent | d66331aea4d86db17da2a4965e020274e623fda0 (diff) | |
download | emacs-5d5d5d492c0f1cc500713b133b1ad3e205031714.tar.gz |
Merge from origin/emacs-27
d66331aea4 (origin/emacs-27) Don't build the Gnulib 'utimens' module ...
f2351a689b Add Harfbuzz dependency
8944310d7c Don't signal during backtrace unrewind (Bug#40088)
8709aaddd8 Fix a couple of problems in changelog generating functions
9ab85f087f Fix cl-concatenate (Bug#40180)
561e9fb91b Improve documentation of project.el commands
b28a9a6cc3 Make svg images with links valid
7515252cce * lisp/tab-line.el (tab-line-new-button-show): New defcustom.
# Conflicts:
# etc/NEWS
# nt/gnulib-cfg.mk
Diffstat (limited to 'nt')
-rw-r--r-- | nt/gnulib-cfg.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/nt/gnulib-cfg.mk b/nt/gnulib-cfg.mk index e3b945720d6..b84626d903d 100644 --- a/nt/gnulib-cfg.mk +++ b/nt/gnulib-cfg.mk @@ -63,6 +63,7 @@ OMIT_GNULIB_MODULE_sys_time = true OMIT_GNULIB_MODULE_sys_types = true OMIT_GNULIB_MODULE_unistd = true OMIT_GNULIB_MODULE_canonicalize-lgpl = true +OMIT_GNULIB_MODULE_utimens = true OMIT_GNULIB_MODULE_fchmodat = true OMIT_GNULIB_MODULE_lchmod = true OMIT_GNULIB_MODULE_futimens = true |