diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2023-09-30 13:50:07 -0400 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2023-09-30 13:50:07 -0400 |
| commit | 46978fa1eff286ea15248ee358fe62608ca070c5 (patch) | |
| tree | a9cce889b60229e11006585e276a018719e5fdad /make-dist | |
| parent | e6dd64aaba55b93340de1d7e0d6783da6de2af2f (diff) | |
| parent | 4776d90c31b3d5bc4117ca7ecde95444adf402ac (diff) | |
| download | emacs-46978fa1eff286ea15248ee358fe62608ca070c5.tar.gz | |
Merge from origin/emacs-29
4776d90c31b Add new Tramp test
ca5b48fd76d Fix tmm-mid-prompt :type (Bug#66179)
7447d3df94e Fix tree-sitter indentation conflict with multiple languages
bee18e52737 Fix bug#66093 in Tramp
7d5fee0feaa Support regeneration of ja-dic.el under '--with-small-ja-...
Conflicts:
make-dist
Diffstat (limited to 'make-dist')
| -rwxr-xr-x | make-dist | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/make-dist b/make-dist index a3b7219af3a..2c4b6a79500 100755 --- a/make-dist +++ b/make-dist @@ -356,8 +356,9 @@ possibly_non_vc_files=" $top_level_ChangeLog MANIFEST aclocal.m4 configure admin/charsets/jisx2131-filter - src/config.in exec/configure - exec/config.h.in + src/config.in + exec/configure exec/config.h.in + leim/small-ja-dic-option "$( find admin doc etc lisp \ \( -name '*.el' -o -name '*.elc' -o -name '*.map' -o -name '*.stamp' \ |