emacs/make-dist, branch scratch/jsonrpc-things Emacs is the extensible, customizable, self-documenting real-time display editor. Merge from origin/emacs-29 2023-09-30T17:50:07+00:00 Eli Zaretskii 2023-09-30T17:50:07+00:00 46978fa1eff286ea15248ee358fe62608ca070c5 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 
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
Support regeneration of ja-dic.el under '--with-small-ja-dic' 2023-09-24T12:30:01+00:00 Eli Zaretskii 2023-09-24T12:30:01+00:00 7d5fee0feaa5740f3fbbfc6d5f13855bf58b9c25 * lisp/international/ja-dic-cnv.el (skkdic-convert): Record the value of SMALL_JA_DIC option used to produce ja-dic.el. * leim/Makefile.in (small-ja-dic-option): New target, triggers regeneration of ja-dic.el when the value of SMALL_JA_DIC option changes by the configure script. Suggested by Ulrich Mueller <ulm@gentoo.org>. (${leimdir}/ja-dic/ja-dic.el): Depend on 'small-ja-dic-option'. (Bug#66125) * make-dist (possibly_non_vc_files): * .gitignore: Add 'leim/small-ja-dic-option'. 
* lisp/international/ja-dic-cnv.el (skkdic-convert): Record the
value of SMALL_JA_DIC option used to produce ja-dic.el.
* leim/Makefile.in (small-ja-dic-option): New target, triggers
regeneration of ja-dic.el when the value of SMALL_JA_DIC option
changes by the configure script.  Suggested by Ulrich Mueller
<ulm@gentoo.org>.
(${leimdir}/ja-dic/ja-dic.el): Depend on 'small-ja-dic-option'.
(Bug#66125)

* make-dist (possibly_non_vc_files):
* .gitignore: Add 'leim/small-ja-dic-option'.
* make-dist (possibly_non_vc_files): Add Android-specific files. 2023-05-18T11:44:16+00:00 Po Lu 2023-05-18T11:44:16+00:00 f59fd5fb27f8bd30f0fb81c47f941b3b0749216b 






; Add 2023 to copyright years.
2023-01-01T10:31:12+00:00

Eli Zaretskii

2023-01-01T10:31:12+00:00

cae528457cb862dc886a34240c9d4c73035b6659












Adjust better to Autoconf quoting style change
2022-07-06T04:27:17+00:00

Paul Eggert

2022-07-06T04:25:44+00:00

54e0b14a6981a317210493f0fead1e2c5b6508ea

* admin/gitmerge.el (gitmerge-emacs-version):
* admin/nt/dist-build/build-zips.sh (ACTUAL_VERSION):
* admin/quick-install-emacs (VERSION):
* lisp/cedet/ede/emacs.el (ede-emacs-version):
Adjust to change in configure.ac’s Autoconf quoting style.
* etc/srecode/ede-autoconf.srt:
* test/lisp/progmodes/autoconf-tests.el:
(autoconf-tests-current-defun-function-define)
(autoconf-tests-current-defun-function-subst):
Use better Autoconf quoting.
* make-dist (version): Simplify.





* admin/gitmerge.el (gitmerge-emacs-version):
* admin/nt/dist-build/build-zips.sh (ACTUAL_VERSION):
* admin/quick-install-emacs (VERSION):
* lisp/cedet/ede/emacs.el (ede-emacs-version):
Adjust to change in configure.ac’s Autoconf quoting style.
* etc/srecode/ede-autoconf.srt:
* test/lisp/progmodes/autoconf-tests.el:
(autoconf-tests-current-defun-function-define)
(autoconf-tests-current-defun-function-subst):
Use better Autoconf quoting.
* make-dist (version): Simplify.







* make-dist: Fix after recent configure.ac quoting changes.
2022-07-05T21:50:17+00:00

Glenn Morris

2022-07-05T21:50:17+00:00

0463368a7b70dfc7914e5c5577c9690f8d0c4f7c












Port distribution tarball to Solaris 10
2022-06-25T20:28:10+00:00

Paul Eggert

2022-06-25T19:51:28+00:00

4410f5d86997b6b238ff05c2ece338b28e1163b1

* make-dist (taropt): Use 'tar -H ustar' to generate a portable
tar file format instead of a GNU-specific format.  Needed now that
Emacs tarballs contain file names longer than 100 bytes, e.g.:
emacs-28.1/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/C072AF82DCCCB9A7F1B85FFA10B802DC4ED16703.key
emacs-28.1/test/lisp/emacs-lisp/bytecomp-resources/error-lexical-var-with-run-hook-with-args-until-success.el
Without this patch, extracting a tarball on Solaris 10 fails with
many diagnostics like “tar: ././@LongLink: typeflag 'L' not
recognized, converting to regular file”.





* make-dist (taropt): Use 'tar -H ustar' to generate a portable
tar file format instead of a GNU-specific format.  Needed now that
Emacs tarballs contain file names longer than 100 bytes, e.g.:
emacs-28.1/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/C072AF82DCCCB9A7F1B85FFA10B802DC4ED16703.key
emacs-28.1/test/lisp/emacs-lisp/bytecomp-resources/error-lexical-var-with-run-hook-with-args-until-success.el
Without this patch, extracting a tarball on Solaris 10 fails with
many diagnostics like “tar: ././@LongLink: typeflag 'L' not
recognized, converting to regular file”.







; Add 2022 to copyright years.
2022-01-01T07:45:51+00:00

Eli Zaretskii

2022-01-01T07:45:51+00:00

19dcb237b5b02b36580294ab309124f346a66024












* make-dist: Don't run "make --question info".  (Bug#52322)
2021-12-14T02:08:37+00:00

Stefan Kangas

2021-12-14T02:08:37+00:00

9de8eec3bc9be2f6e7debf26159c1761c47df909












* make-dist (manifest): Filter out msdos/autogen/* files.
2021-12-12T18:20:51+00:00

Eli Zaretskii

2021-12-12T18:20:51+00:00

ea8422204f1fbd354e4d25b8c99fd4916db87296