emacs/admin/automerge, branch master Emacs is the extensible, customizable, self-documenting real-time display editor. ; Add 2026 to copyright years. 2026-01-01T12:54:34+00:00 Sean Whitton 2026-01-01T12:54:34+00:00 c31f6adc31d48076c63ad82b83b2970e1b0d7b9b 






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".







; 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












Add admin/emacs-shell-lib for shared bash code
2022-10-19T11:26:54+00:00

Stefan Kangas

2022-10-19T11:26:54+00:00

a9111d8670b48f473e968a0e75d83782dbf74425

* admin/emacs-shell-lib: New file for shared bash code.
* admin/automerge:
* admin/diff-tar-files:
* admin/emacs-shell-lib:
* admin/make-manuals:
* admin/update_autogen:
* admin/upload-manuals: Simplify and improve using above new library.





* admin/emacs-shell-lib: New file for shared bash code.
* admin/automerge:
* admin/diff-tar-files:
* admin/emacs-shell-lib:
* admin/make-manuals:
* admin/update_autogen:
* admin/upload-manuals: Simplify and improve using above new library.







Use "set -o nounset" in bash scripts
2022-09-20T08:34:13+00:00

Stefan Kangas

2022-09-20T08:27:10+00:00

98a89dd0fa340e852f7a5633d2d68885c0e52219

* admin/automerge:
* admin/make-manuals:
* admin/update-copyright:
* admin/update_autogen:
* admin/upload-manuals: Use "set -o nounset".





* admin/automerge:
* admin/make-manuals:
* admin/update-copyright:
* admin/update_autogen:
* admin/upload-manuals: Use "set -o nounset".







; Normalize my email
2022-08-16T11:41:08+00:00

Stefan Kangas

2022-08-16T11:41:08+00:00

5e5c56f1487c3c23476ac87d9a779cc387a0fb8a












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












; * admin/automerge: Maintain.
2021-11-17T06:37:38+00:00

Stefan Kangas

2021-11-17T06:37:38+00:00

6f52a1ba2c756ae60609d9c56fa7dc5160b3bcd2