emacs/m4/include_next.m4, branch feature/margin-columns Emacs is the extensible, customizable, self-documenting real-time display editor. Update copyright year to 2025 2025-01-01T07:39:17+00:00 Paul Eggert 2025-01-01T07:39:17+00:00 4da38c632161867e914b3a13dc760f8019255f94 Run "TZ=UTC0 admin/update-copyright". 
Run "TZ=UTC0 admin/update-copyright".
Update from Gnulib by running admin/merge-gnulib 2024-12-17T22:13:54+00:00 Paul Eggert 2024-12-17T22:02:41+00:00 b1e5f6d6ef8432a9cce0664238de72d387730bd1 * admin/merge-gnulib (AVOIDED_MODULES): Avoid gnulib-i18n. * lib/stdlib.c, m4/selinux-selinux-h.m4: New files, taken from Gnulib. 
* admin/merge-gnulib (AVOIDED_MODULES): Avoid gnulib-i18n.
* lib/stdlib.c, m4/selinux-selinux-h.m4:
New files, taken from Gnulib.
Update from Gnulib by running admin/merge-gnulib 2024-05-12T01:46:26+00:00 Paul Eggert 2024-05-11T20:16:48+00:00 7ae091d933b03d0a1e1e0b39a949c2811c4c3618 






Update from Gnulib by running admin/merge-gnulib
2024-01-20T19:45:38+00:00

Paul Eggert

2024-01-20T19:45:04+00:00

3add626f1405739aa430adcc0b4c27e587a7c561












; Add 2024 to copyright years
2024-01-02T01:47:10+00:00

Po Lu

2024-01-02T01:47:10+00:00

8e1c56ae46754dd7baedff49a464f078f0e9912d












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

Eli Zaretskii

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

cae528457cb862dc886a34240c9d4c73035b6659












Merge from origin/emacs-28
2022-01-01T12:03:03+00:00

Eli Zaretskii

2022-01-01T12:03:03+00:00

dcd76bd48df678d8234b904d7b13c997228519a3

836be7a112 ; * etc/refcards/ru-refcard.tex: Update Copyright year.
86cbc6ee4a * lisp/net/tramp-sh.el: Adapt copyright year
ebe8772f65 ; Minor fixes related to copyright years
23c1ee6989 ; * test/manual/etags/ETAGS.good_N: Adjust to copyright ye...
8d3fc7ec89 * src/xfaces.c (face_for_font): Make 'hash' be uintptr_t.
19dcb237b5 ; Add 2022 to copyright years.

# Conflicts:
#	etc/NEWS
#	etc/refcards/ru-refcard.tex
#	lib/cdefs.h
#	lisp/erc/erc-dcc.el
#	lisp/erc/erc-imenu.el
#	lisp/erc/erc-replace.el
#	lisp/image-dired.el
#	lisp/progmodes/xref.el
#	m4/alloca.m4
#	m4/byteswap.m4
#	m4/errno_h.m4
#	m4/getopt.m4
#	m4/gnulib-common.m4
#	m4/inttypes.m4
#	m4/stddef_h.m4
#	m4/stdint.m4
#	m4/sys_socket_h.m4





836be7a112 ; * etc/refcards/ru-refcard.tex: Update Copyright year.
86cbc6ee4a * lisp/net/tramp-sh.el: Adapt copyright year
ebe8772f65 ; Minor fixes related to copyright years
23c1ee6989 ; * test/manual/etags/ETAGS.good_N: Adjust to copyright ye...
8d3fc7ec89 * src/xfaces.c (face_for_font): Make 'hash' be uintptr_t.
19dcb237b5 ; Add 2022 to copyright years.

# Conflicts:
#	etc/NEWS
#	etc/refcards/ru-refcard.tex
#	lib/cdefs.h
#	lisp/erc/erc-dcc.el
#	lisp/erc/erc-imenu.el
#	lisp/erc/erc-replace.el
#	lisp/image-dired.el
#	lisp/progmodes/xref.el
#	m4/alloca.m4
#	m4/byteswap.m4
#	m4/errno_h.m4
#	m4/getopt.m4
#	m4/gnulib-common.m4
#	m4/inttypes.m4
#	m4/stddef_h.m4
#	m4/stdint.m4
#	m4/sys_socket_h.m4







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

Eli Zaretskii

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

19dcb237b5b02b36580294ab309124f346a66024












Update from gnulib
2021-12-19T00:15:49+00:00

Paul Eggert

2021-12-19T00:12:38+00:00

f05a93e8232e6f56458ac16d733b03e96a63e930

Make the following changes by hand, and run ‘admin/merge-gnulib’.
* configure.ac (AM_CONDITIONAL): Adjust to new Gnulib convention.





Make the following changes by hand, and run ‘admin/merge-gnulib’.
* configure.ac (AM_CONDITIONAL): Adjust to new Gnulib convention.







Update copyright year to 2021
2021-01-01T09:13:56+00:00

Paul Eggert

2021-01-01T09:13:56+00:00

ba05d005e5a81bc123ad8da928b1bccb6b160e7a

Run "TZ=UTC0 admin/update-copyright".





Run "TZ=UTC0 admin/update-copyright".