From 92e96a117525885bc2c725600aca3683e4b28b7a Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Thu, 20 Feb 2025 02:46:43 +0100 Subject: [PATCH 1/2] ; Delete troff markers from ChangeLog files --- ChangeLog.1 | 2 +- ChangeLog.2 | 2 +- ChangeLog.3 | 2 +- ChangeLog.4 | 2 +- admin/ChangeLog.1 | 2 +- doc/emacs/ChangeLog.1 | 2 +- doc/lispintro/ChangeLog.1 | 2 +- doc/lispref/ChangeLog.1 | 2 +- doc/man/ChangeLog.1 | 2 +- doc/misc/ChangeLog.1 | 2 +- etc/ChangeLog.1 | 2 +- leim/ChangeLog.1 | 2 +- lib-src/ChangeLog.1 | 2 +- lisp/ChangeLog.1 | 2 +- lisp/ChangeLog.2 | 2 +- lisp/ChangeLog.3 | 2 +- lisp/ChangeLog.4 | 2 +- lisp/ChangeLog.5 | 2 +- lisp/ChangeLog.6 | 2 +- lisp/ChangeLog.7 | 2 +- lisp/ChangeLog.8 | 2 +- lisp/ChangeLog.9 | 2 +- lisp/cedet/ChangeLog.1 | 2 +- lisp/erc/ChangeLog.1 | 2 +- lisp/erc/ChangeLog.2 | 2 +- lisp/gnus/ChangeLog.1 | 2 +- lisp/gnus/ChangeLog.2 | 2 +- lisp/gnus/ChangeLog.3 | 2 +- lisp/mh-e/ChangeLog.1 | 2 +- lisp/mh-e/ChangeLog.2 | 2 +- lisp/org/ChangeLog.1 | 2 +- lisp/url/ChangeLog.1 | 2 +- lwlib/ChangeLog.1 | 2 +- msdos/ChangeLog.1 | 2 +- nextstep/ChangeLog.1 | 2 +- nt/ChangeLog.1 | 2 +- oldXMenu/ChangeLog.1 | 2 +- src/ChangeLog.1 | 2 +- src/ChangeLog.2 | 2 +- src/ChangeLog.3 | 2 +- src/ChangeLog.4 | 2 +- src/ChangeLog.5 | 2 +- src/ChangeLog.6 | 2 +- src/ChangeLog.7 | 2 +- src/ChangeLog.8 | 2 +- src/ChangeLog.9 | 2 +- test/ChangeLog.1 | 2 +- 47 files changed, 47 insertions(+), 47 deletions(-) diff --git a/ChangeLog.1 b/ChangeLog.1 index 030c83fdda4..076c33837d7 100644 --- a/ChangeLog.1 +++ b/ChangeLog.1 @@ -14700,7 +14700,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 1993\(en1999, 2001\(en2025 Free Software Foundation, + Copyright (C) 1993-1999, 2001-2025 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/ChangeLog.2 b/ChangeLog.2 index 129cc40deb8..56848194267 100644 --- a/ChangeLog.2 +++ b/ChangeLog.2 @@ -35788,7 +35788,7 @@ See ChangeLog.1 for earlier changes. ;; coding: utf-8 ;; End: - Copyright (C) 2015\(en2025 Free Software Foundation, Inc. + Copyright (C) 2015-2025 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/ChangeLog.3 b/ChangeLog.3 index 8fcec8da85b..9fae518d9b0 100644 --- a/ChangeLog.3 +++ b/ChangeLog.3 @@ -237356,7 +237356,7 @@ See ChangeLog.2 for earlier changes. ;; coding: utf-8 ;; End: - Copyright (C) 2015\(en2025 Free Software Foundation, Inc. + Copyright (C) 2015-2025 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/ChangeLog.4 b/ChangeLog.4 index 41c88397245..8eaed786a75 100644 --- a/ChangeLog.4 +++ b/ChangeLog.4 @@ -203587,7 +203587,7 @@ See ChangeLog.3 for earlier changes. ;; coding: utf-8 ;; End: - Copyright (C) 2022\(en2025 Free Software Foundation, Inc. + Copyright (C) 2022-2025 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/admin/ChangeLog.1 b/admin/ChangeLog.1 index bfb482133b0..beb5974c1fc 100644 --- a/admin/ChangeLog.1 +++ b/admin/ChangeLog.1 @@ -2577,7 +2577,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 2001\(en2025 Free Software Foundation, Inc. + Copyright (C) 2001-2025 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/doc/emacs/ChangeLog.1 b/doc/emacs/ChangeLog.1 index 0493bb8ea8f..f4dfbb7bc08 100644 --- a/doc/emacs/ChangeLog.1 +++ b/doc/emacs/ChangeLog.1 @@ -10919,7 +10919,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 1993\(en1999, 2001\(en2025 Free Software Foundation, + Copyright (C) 1993-1999, 2001-2025 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/doc/lispintro/ChangeLog.1 b/doc/lispintro/ChangeLog.1 index cf48ef8663b..badacd6c1aa 100644 --- a/doc/lispintro/ChangeLog.1 +++ b/doc/lispintro/ChangeLog.1 @@ -782,7 +782,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 2001\(en2025 Free Software Foundation, Inc. + Copyright (C) 2001-2025 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/doc/lispref/ChangeLog.1 b/doc/lispref/ChangeLog.1 index af800e33c57..2acde16f79e 100644 --- a/doc/lispref/ChangeLog.1 +++ b/doc/lispref/ChangeLog.1 @@ -13989,7 +13989,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 1998\(en2025 Free Software Foundation, Inc. + Copyright (C) 1998-2025 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/doc/man/ChangeLog.1 b/doc/man/ChangeLog.1 index e10913e79de..5e58b9681e2 100644 --- a/doc/man/ChangeLog.1 +++ b/doc/man/ChangeLog.1 @@ -176,7 +176,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 2007\(en2025 Free Software Foundation, Inc. + Copyright (C) 2007-2025 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/doc/misc/ChangeLog.1 b/doc/misc/ChangeLog.1 index 28d5ee6be2c..ef964fce81c 100644 --- a/doc/misc/ChangeLog.1 +++ b/doc/misc/ChangeLog.1 @@ -12110,7 +12110,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 1993\(en1999, 2001\(en2025 Free Software Foundation, + Copyright (C) 1993-1999, 2001-2025 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/etc/ChangeLog.1 b/etc/ChangeLog.1 index 8f7702f5138..849222c3a63 100644 --- a/etc/ChangeLog.1 +++ b/etc/ChangeLog.1 @@ -6891,7 +6891,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 1993\(en1999, 2001\(en2025 Free Software Foundation, + Copyright (C) 1993-1999, 2001-2025 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/leim/ChangeLog.1 b/leim/ChangeLog.1 index 613631f8830..3a5ec38cf3b 100644 --- a/leim/ChangeLog.1 +++ b/leim/ChangeLog.1 @@ -2578,7 +2578,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 1997\(en1999, 2001\(en2025 Free Software Foundation, + Copyright (C) 1997-1999, 2001-2025 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lib-src/ChangeLog.1 b/lib-src/ChangeLog.1 index db158801a91..de6aaebba6c 100644 --- a/lib-src/ChangeLog.1 +++ b/lib-src/ChangeLog.1 @@ -8609,7 +8609,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 1988\(en1999, 2001\(en2025 Free Software Foundation, + Copyright (C) 1988-1999, 2001-2025 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lisp/ChangeLog.1 b/lisp/ChangeLog.1 index 0a634736e79..e02e6467035 100644 --- a/lisp/ChangeLog.1 +++ b/lisp/ChangeLog.1 @@ -3244,7 +3244,7 @@ Set current buffer variables from defaults in case user's init file has changed them. - Copyright (C) 1985\(en1986, 2001\(en2025 Free Software Foundation, + Copyright (C) 1985-1986, 2001-2025 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lisp/ChangeLog.2 b/lisp/ChangeLog.2 index 931ebb651fc..2bf38c0361b 100644 --- a/lisp/ChangeLog.2 +++ b/lisp/ChangeLog.2 @@ -3992,7 +3992,7 @@ See ChangeLog.1 for earlier changes. - Copyright (C) 1986\(en1988, 2001\(en2025 Free Software Foundation, + Copyright (C) 1986-1988, 2001-2025 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lisp/ChangeLog.3 b/lisp/ChangeLog.3 index 84a46fe507c..5e8f9035fd3 100644 --- a/lisp/ChangeLog.3 +++ b/lisp/ChangeLog.3 @@ -12433,7 +12433,7 @@ See ChangeLog.2 for earlier changes. ;; coding: utf-8 ;; End: - Copyright (C) 1989, 1993, 2001\(en2025 Free Software Foundation, + Copyright (C) 1989, 1993, 2001-2025 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lisp/ChangeLog.4 b/lisp/ChangeLog.4 index 70b2cab3636..2d6565165e1 100644 --- a/lisp/ChangeLog.4 +++ b/lisp/ChangeLog.4 @@ -8935,7 +8935,7 @@ See ChangeLog.3 for earlier changes. ;; coding: utf-8 ;; End: - Copyright (C) 1993\(en1994, 2001\(en2025 Free Software Foundation, + Copyright (C) 1993-1994, 2001-2025 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lisp/ChangeLog.5 b/lisp/ChangeLog.5 index deed2e205d5..8510939c0e9 100644 --- a/lisp/ChangeLog.5 +++ b/lisp/ChangeLog.5 @@ -9268,7 +9268,7 @@ See ChangeLog.4 for earlier changes. ;; coding: utf-8 ;; End: - Copyright (C) 1994\(en1995, 2001\(en2025 Free Software Foundation, + Copyright (C) 1994-1995, 2001-2025 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lisp/ChangeLog.6 b/lisp/ChangeLog.6 index 83574d2ef8b..3fc9cdccbb6 100644 --- a/lisp/ChangeLog.6 +++ b/lisp/ChangeLog.6 @@ -8021,7 +8021,7 @@ See ChangeLog.5 for earlier changes. ;; coding: utf-8 ;; End: - Copyright (C) 1995\(en1996, 2001\(en2025 Free Software Foundation, + Copyright (C) 1995-1996, 2001-2025 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lisp/ChangeLog.7 b/lisp/ChangeLog.7 index 1d3b3c12aef..ac69eac01c8 100644 --- a/lisp/ChangeLog.7 +++ b/lisp/ChangeLog.7 @@ -23111,7 +23111,7 @@ See ChangeLog.6 for earlier changes. ;; coding: utf-8 ;; End: - Copyright (C) 1997\(en1998, 2001\(en2025 Free Software + Copyright (C) 1997-1998, 2001-2025 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lisp/ChangeLog.8 b/lisp/ChangeLog.8 index aac5a2fd320..6987f647ae8 100644 --- a/lisp/ChangeLog.8 +++ b/lisp/ChangeLog.8 @@ -9993,7 +9993,7 @@ See ChangeLog.7 for earlier changes. ;; add-log-time-zone-rule: t ;; End: - Copyright (C) 1999, 2001\(en2025 Free Software Foundation, Inc. + Copyright (C) 1999, 2001-2025 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lisp/ChangeLog.9 b/lisp/ChangeLog.9 index 7e739b70be3..b9ca1d2ed6a 100644 --- a/lisp/ChangeLog.9 +++ b/lisp/ChangeLog.9 @@ -20685,7 +20685,7 @@ See ChangeLog.8 for earlier changes. ;; coding: utf-8 ;; End: - Copyright (C) 2000\(en2011, 2013\(en2025 Free Software Foundation, + Copyright (C) 2000-2011, 2013-2025 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lisp/cedet/ChangeLog.1 b/lisp/cedet/ChangeLog.1 index 0a371dee3c2..c0524c4b248 100644 --- a/lisp/cedet/ChangeLog.1 +++ b/lisp/cedet/ChangeLog.1 @@ -3459,7 +3459,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 2009\(en2025 Free Software Foundation, Inc. + Copyright (C) 2009-2025 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lisp/erc/ChangeLog.1 b/lisp/erc/ChangeLog.1 index 573395768ca..220ea2f09e6 100644 --- a/lisp/erc/ChangeLog.1 +++ b/lisp/erc/ChangeLog.1 @@ -11703,7 +11703,7 @@ * erc-speak.el, erc.el: New file. - Copyright (C) 2001\(en2025 Free Software Foundation, Inc. + Copyright (C) 2001-2025 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lisp/erc/ChangeLog.2 b/lisp/erc/ChangeLog.2 index 2da79fce620..c3c301b9a6f 100644 --- a/lisp/erc/ChangeLog.2 +++ b/lisp/erc/ChangeLog.2 @@ -757,7 +757,7 @@ See ChangeLog.1 for earlier changes. - Copyright (C) 2009\(en2025 Free Software Foundation, Inc. + Copyright (C) 2009-2025 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lisp/gnus/ChangeLog.1 b/lisp/gnus/ChangeLog.1 index ec2adbaff56..843cb5a2edc 100644 --- a/lisp/gnus/ChangeLog.1 +++ b/lisp/gnus/ChangeLog.1 @@ -3702,7 +3702,7 @@ * gnus.el: Quassia Gnus v0.1 is released. - Copyright (C) 1997\(en2025 Free Software Foundation, Inc. + Copyright (C) 1997-2025 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lisp/gnus/ChangeLog.2 b/lisp/gnus/ChangeLog.2 index eff11711fdf..2eef2f3e02b 100644 --- a/lisp/gnus/ChangeLog.2 +++ b/lisp/gnus/ChangeLog.2 @@ -18538,7 +18538,7 @@ See ChangeLog.1 for earlier changes. - Copyright (C) 2000\(en2002, 2004\(en2025 Free Software Foundation, + Copyright (C) 2000-2002, 2004-2025 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lisp/gnus/ChangeLog.3 b/lisp/gnus/ChangeLog.3 index ef86627a5a4..0058331c2fc 100644 --- a/lisp/gnus/ChangeLog.3 +++ b/lisp/gnus/ChangeLog.3 @@ -26326,7 +26326,7 @@ See ChangeLog.2 for earlier changes. - Copyright (C) 2004\(en2025 Free Software Foundation, Inc. + Copyright (C) 2004-2025 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lisp/mh-e/ChangeLog.1 b/lisp/mh-e/ChangeLog.1 index 40c1cccce62..b62de6e4134 100644 --- a/lisp/mh-e/ChangeLog.1 +++ b/lisp/mh-e/ChangeLog.1 @@ -11419,7 +11419,7 @@ (dist): Leave release in current directory. - Copyright (C) 2003\(en2025 Free Software Foundation, Inc. + Copyright (C) 2003-2025 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lisp/mh-e/ChangeLog.2 b/lisp/mh-e/ChangeLog.2 index 5f1fd2e4cf5..028624cac82 100644 --- a/lisp/mh-e/ChangeLog.2 +++ b/lisp/mh-e/ChangeLog.2 @@ -3673,7 +3673,7 @@ See ChangeLog.1 for earlier changes. - Copyright (C) 2005\(en2025 Free Software Foundation, Inc. + Copyright (C) 2005-2025 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lisp/org/ChangeLog.1 b/lisp/org/ChangeLog.1 index 7362ff99e0b..a2f9ff6e162 100644 --- a/lisp/org/ChangeLog.1 +++ b/lisp/org/ChangeLog.1 @@ -32832,7 +32832,7 @@ ;; add-log-time-zone-rule: t ;; End: - Copyright (C) 2008\(en2025 Free Software Foundation, Inc. + Copyright (C) 2008-2025 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lisp/url/ChangeLog.1 b/lisp/url/ChangeLog.1 index c4d9f9c7401..5f5dbbc6d69 100644 --- a/lisp/url/ChangeLog.1 +++ b/lisp/url/ChangeLog.1 @@ -3068,7 +3068,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 1999, 2001\(en2002, 2004\(en2025 Free Software + Copyright (C) 1999, 2001-2002, 2004-2025 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lwlib/ChangeLog.1 b/lwlib/ChangeLog.1 index 0c677f6ab3b..d401cbc334d 100644 --- a/lwlib/ChangeLog.1 +++ b/lwlib/ChangeLog.1 @@ -1964,7 +1964,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 1995\(en1999, 2001\(en2025 Free Software Foundation, + Copyright (C) 1995-1999, 2001-2025 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/msdos/ChangeLog.1 b/msdos/ChangeLog.1 index 79661985cf4..7cc20a717dc 100644 --- a/msdos/ChangeLog.1 +++ b/msdos/ChangeLog.1 @@ -1550,7 +1550,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 1994\(en1999, 2001\(en2025 Free Software Foundation, + Copyright (C) 1994-1999, 2001-2025 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nextstep/ChangeLog.1 b/nextstep/ChangeLog.1 index 7d70d272d57..2e783e1428d 100644 --- a/nextstep/ChangeLog.1 +++ b/nextstep/ChangeLog.1 @@ -312,7 +312,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 2008\(en2025 Free Software Foundation, Inc. + Copyright (C) 2008-2025 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nt/ChangeLog.1 b/nt/ChangeLog.1 index 55d1a2adcee..52f64bf1348 100644 --- a/nt/ChangeLog.1 +++ b/nt/ChangeLog.1 @@ -3548,7 +3548,7 @@ ;; add-log-time-zone-rule: t ;; End: - Copyright (C) 1995\(en1999, 2001\(en2025 Free Software Foundation, + Copyright (C) 1995-1999, 2001-2025 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/oldXMenu/ChangeLog.1 b/oldXMenu/ChangeLog.1 index 2053ca8a391..4c4fe8b84c6 100644 --- a/oldXMenu/ChangeLog.1 +++ b/oldXMenu/ChangeLog.1 @@ -712,7 +712,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 1993\(en1999, 2001\(en2025 Free Software Foundation, + Copyright (C) 1993-1999, 2001-2025 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/ChangeLog.1 b/src/ChangeLog.1 index d2fc8cc7fb2..5bfb2e87464 100644 --- a/src/ChangeLog.1 +++ b/src/ChangeLog.1 @@ -3521,7 +3521,7 @@ * minibuf.c: Don't allow entry to minibuffer while minibuffer is selected. - Copyright (C) 1985\(en1986, 2001\(en2025 Free Software Foundation, + Copyright (C) 1985-1986, 2001-2025 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/ChangeLog.2 b/src/ChangeLog.2 index eb2e86eaf59..9e3164fed28 100644 --- a/src/ChangeLog.2 +++ b/src/ChangeLog.2 @@ -4771,7 +4771,7 @@ See ChangeLog.1 for earlier changes. - Copyright (C) 1986\(en1988, 2001\(en2025 Free Software Foundation, + Copyright (C) 1986-1988, 2001-2025 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/ChangeLog.3 b/src/ChangeLog.3 index 259bd1836f4..5162519148d 100644 --- a/src/ChangeLog.3 +++ b/src/ChangeLog.3 @@ -16503,7 +16503,7 @@ See ChangeLog.2 for earlier changes. ;; coding: utf-8 ;; End: - Copyright (C) 1993, 2001\(en2025 Free Software Foundation, Inc. + Copyright (C) 1993, 2001-2025 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/ChangeLog.4 b/src/ChangeLog.4 index 07e62673a00..9cbb5138e43 100644 --- a/src/ChangeLog.4 +++ b/src/ChangeLog.4 @@ -6906,7 +6906,7 @@ See ChangeLog.3 for earlier changes. ;; coding: utf-8 ;; End: - Copyright (C) 1993\(en1994, 2001\(en2025 Free Software Foundation, + Copyright (C) 1993-1994, 2001-2025 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/ChangeLog.5 b/src/ChangeLog.5 index 82662da042c..59f82d5e669 100644 --- a/src/ChangeLog.5 +++ b/src/ChangeLog.5 @@ -7148,7 +7148,7 @@ See ChangeLog.4 for earlier changes. ;; coding: utf-8 ;; End: - Copyright (C) 1994\(en1995, 2001\(en2025 Free Software Foundation, + Copyright (C) 1994-1995, 2001-2025 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/ChangeLog.6 b/src/ChangeLog.6 index 2a7a2e1e6aa..486a6651e26 100644 --- a/src/ChangeLog.6 +++ b/src/ChangeLog.6 @@ -5358,7 +5358,7 @@ See ChangeLog.5 for earlier changes. ;; coding: utf-8 ;; End: - Copyright (C) 1995\(en1996, 2001\(en2025 Free Software Foundation, + Copyright (C) 1995-1996, 2001-2025 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/ChangeLog.7 b/src/ChangeLog.7 index 3f612d2a91b..f8dc737c2e8 100644 --- a/src/ChangeLog.7 +++ b/src/ChangeLog.7 @@ -11091,7 +11091,7 @@ See ChangeLog.6 for earlier changes. ;; coding: utf-8 ;; End: - Copyright (C) 1997\(en1998, 2001\(en2025 Free Software Foundation, + Copyright (C) 1997-1998, 2001-2025 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/ChangeLog.8 b/src/ChangeLog.8 index 737240e7758..236c0b4c9c5 100644 --- a/src/ChangeLog.8 +++ b/src/ChangeLog.8 @@ -13979,7 +13979,7 @@ See ChangeLog.7 for earlier changes. - Copyright (C) 1999, 2001\(en2025 Free Software Foundation, Inc. + Copyright (C) 1999, 2001-2025 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/ChangeLog.9 b/src/ChangeLog.9 index bf29d7eac75..c7c25b08b6e 100644 --- a/src/ChangeLog.9 +++ b/src/ChangeLog.9 @@ -13294,7 +13294,7 @@ See ChangeLog.8 for earlier changes. ;; coding: utf-8 ;; End: - Copyright (C) 2001\(en2025 Free Software Foundation, Inc. + Copyright (C) 2001-2025 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/test/ChangeLog.1 b/test/ChangeLog.1 index 5681bad105e..9e204f90354 100644 --- a/test/ChangeLog.1 +++ b/test/ChangeLog.1 @@ -2952,7 +2952,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 2008\(en2025 Free Software Foundation, Inc. + Copyright (C) 2008-2025 Free Software Foundation, Inc. This file is part of GNU Emacs. From 25ba2536091dea39c690169784fa9771296eefec Mon Sep 17 00:00:00 2001 From: Po Lu Date: Fri, 21 Feb 2025 13:28:52 +0800 Subject: [PATCH 2/2] Fix reported Haiku build error in emacs-30.1-rc1 * src/haiku_support.cc (keysym_from_raw_char): Don't define duplicate cases on the previous release. --- src/haiku_support.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/haiku_support.cc b/src/haiku_support.cc index d83b5c145d6..782e9a3c566 100644 --- a/src/haiku_support.cc +++ b/src/haiku_support.cc @@ -350,7 +350,7 @@ keysym_from_raw_char (int32 raw, int32 key, unsigned *code) #if B_HAIKU_VERSION >= B_HAIKU_VERSION_1_PRE_BETA_6 case B_HANGUL_HANJA_KEY: #else /* B_HAIKU_VERSION < B_HAIKU_VERSION_1_PRE_BETA_6 */ - case B_HANGUL: + case B_HANGUL_HANJA: #endif /* B_HAIKU_VERSION >= B_HAIKU_VERSION_1_PRE_BETA_6 */ *code = KEY_HANGUL_HANJA; break;