diff options
author | Eli Zaretskii <eliz@gnu.org> | 2022-01-01 07:03:03 -0500 |
---|---|---|
committer | Eli Zaretskii <eliz@gnu.org> | 2022-01-01 07:03:03 -0500 |
commit | dcd76bd48df678d8234b904d7b13c997228519a3 (patch) | |
tree | 17b11e7d3aa1aa9d32d6be874cbbfb1e5882a2c5 /lwlib | |
parent | 84a8f656d344cc69bce3a922b99182896a4e1285 (diff) | |
parent | 836be7a112191cac8abd187e337c477ff5f05037 (diff) | |
download | emacs-dcd76bd48df678d8234b904d7b13c997228519a3.tar.gz |
Merge from origin/emacs-28
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
Diffstat (limited to 'lwlib')
-rw-r--r-- | lwlib/ChangeLog.1 | 2 | ||||
-rw-r--r-- | lwlib/Makefile.in | 2 | ||||
-rw-r--r-- | lwlib/deps.mk | 2 | ||||
-rw-r--r-- | lwlib/lwlib-Xaw.c | 2 | ||||
-rw-r--r-- | lwlib/lwlib-Xlw.c | 2 | ||||
-rw-r--r-- | lwlib/lwlib-Xm.c | 2 | ||||
-rw-r--r-- | lwlib/lwlib-int.h | 2 | ||||
-rw-r--r-- | lwlib/lwlib-utils.c | 2 | ||||
-rw-r--r-- | lwlib/lwlib-widget.h | 2 | ||||
-rw-r--r-- | lwlib/lwlib.c | 2 | ||||
-rw-r--r-- | lwlib/lwlib.h | 2 | ||||
-rw-r--r-- | lwlib/xlwmenu.c | 2 | ||||
-rw-r--r-- | lwlib/xlwmenu.h | 2 | ||||
-rw-r--r-- | lwlib/xlwmenuP.h | 2 |
14 files changed, 14 insertions, 14 deletions
diff --git a/lwlib/ChangeLog.1 b/lwlib/ChangeLog.1 index bf839cf7091..4dac7763b92 100644 --- a/lwlib/ChangeLog.1 +++ b/lwlib/ChangeLog.1 @@ -1964,7 +1964,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 1995-1999, 2001-2021 Free Software Foundation, Inc. + Copyright (C) 1995-1999, 2001-2022 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lwlib/Makefile.in b/lwlib/Makefile.in index fb0ae0e1c21..d58c7bf6ac5 100644 --- a/lwlib/Makefile.in +++ b/lwlib/Makefile.in @@ -1,7 +1,7 @@ ### @configure_input@ # Copyright (C) 1992, 1993 Lucid, Inc. -# Copyright (C) 1994, 2001-2021 Free Software Foundation, Inc. +# Copyright (C) 1994, 2001-2022 Free Software Foundation, Inc. # # This file is part of the Lucid Widget Library. # diff --git a/lwlib/deps.mk b/lwlib/deps.mk index 66c464f8f92..6a7eb1e0cab 100644 --- a/lwlib/deps.mk +++ b/lwlib/deps.mk @@ -1,7 +1,7 @@ ### deps.mk --- lwlib/Makefile fragment for GNU Emacs # Copyright (C) 1992, 1993 Lucid, Inc. -# Copyright (C) 1994, 2001-2021 Free Software Foundation, Inc. +# Copyright (C) 1994, 2001-2022 Free Software Foundation, Inc. # # This file is part of the Lucid Widget Library. # diff --git a/lwlib/lwlib-Xaw.c b/lwlib/lwlib-Xaw.c index 8806d3f700a..d17acae728b 100644 --- a/lwlib/lwlib-Xaw.c +++ b/lwlib/lwlib-Xaw.c @@ -1,7 +1,7 @@ /* The lwlib interface to Athena widgets. Copyright (C) 1993 Chuck Thompson <cthomp@cs.uiuc.edu> -Copyright (C) 1994, 2001-2021 Free Software Foundation, Inc. +Copyright (C) 1994, 2001-2022 Free Software Foundation, Inc. This file is part of the Lucid Widget Library. diff --git a/lwlib/lwlib-Xlw.c b/lwlib/lwlib-Xlw.c index 54dc06f52ac..e3b596369eb 100644 --- a/lwlib/lwlib-Xlw.c +++ b/lwlib/lwlib-Xlw.c @@ -1,7 +1,7 @@ /* The lwlib interface to "xlwmenu" menus. Copyright (C) 1992 Lucid, Inc. -Copyright (C) 1994, 2000-2021 Free Software Foundation, Inc. +Copyright (C) 1994, 2000-2022 Free Software Foundation, Inc. This file is part of the Lucid Widget Library. diff --git a/lwlib/lwlib-Xm.c b/lwlib/lwlib-Xm.c index 525465fa998..fa60fc89d08 100644 --- a/lwlib/lwlib-Xm.c +++ b/lwlib/lwlib-Xm.c @@ -1,6 +1,6 @@ /* The lwlib interface to Motif widgets. -Copyright (C) 1994-1997, 1999-2021 Free Software Foundation, Inc. +Copyright (C) 1994-1997, 1999-2022 Free Software Foundation, Inc. Copyright (C) 1992 Lucid, Inc. This file is part of the Lucid Widget Library. diff --git a/lwlib/lwlib-int.h b/lwlib/lwlib-int.h index ef76d67bfc5..100e2ece698 100644 --- a/lwlib/lwlib-int.h +++ b/lwlib/lwlib-int.h @@ -1,6 +1,6 @@ /* Copyright (C) 1992 Lucid, Inc. -Copyright (C) 2000-2021 Free Software Foundation, Inc. +Copyright (C) 2000-2022 Free Software Foundation, Inc. This file is part of the Lucid Widget Library. diff --git a/lwlib/lwlib-utils.c b/lwlib/lwlib-utils.c index 3c700e0c5fc..ff86886c955 100644 --- a/lwlib/lwlib-utils.c +++ b/lwlib/lwlib-utils.c @@ -1,7 +1,7 @@ /* Defines some widget utility functions. Copyright (C) 1992 Lucid, Inc. -Copyright (C) 1994, 2001-2021 Free Software Foundation, Inc. +Copyright (C) 1994, 2001-2022 Free Software Foundation, Inc. This file is part of the Lucid Widget Library. diff --git a/lwlib/lwlib-widget.h b/lwlib/lwlib-widget.h index 2fd84c043f2..5226db5f63f 100644 --- a/lwlib/lwlib-widget.h +++ b/lwlib/lwlib-widget.h @@ -1,6 +1,6 @@ /* Copyright (C) 1992, 1993 Lucid, Inc. -Copyright (C) 1994, 1999-2021 Free Software Foundation, Inc. +Copyright (C) 1994, 1999-2022 Free Software Foundation, Inc. This file is part of the Lucid Widget Library. diff --git a/lwlib/lwlib.c b/lwlib/lwlib.c index 820538f738b..30546b60e51 100644 --- a/lwlib/lwlib.c +++ b/lwlib/lwlib.c @@ -1,7 +1,7 @@ /* A general interface to the widgets of different toolkits. Copyright (C) 1992, 1993 Lucid, Inc. -Copyright (C) 1994-1996, 1999-2021 Free Software Foundation, Inc. +Copyright (C) 1994-1996, 1999-2022 Free Software Foundation, Inc. This file is part of the Lucid Widget Library. diff --git a/lwlib/lwlib.h b/lwlib/lwlib.h index ab48d85890a..86b1c60a5de 100644 --- a/lwlib/lwlib.h +++ b/lwlib/lwlib.h @@ -1,6 +1,6 @@ /* Copyright (C) 1992, 1993 Lucid, Inc. -Copyright (C) 1994, 1999-2021 Free Software Foundation, Inc. +Copyright (C) 1994, 1999-2022 Free Software Foundation, Inc. This file is part of the Lucid Widget Library. diff --git a/lwlib/xlwmenu.c b/lwlib/xlwmenu.c index 68b0a2f5fe4..369162c7fec 100644 --- a/lwlib/xlwmenu.c +++ b/lwlib/xlwmenu.c @@ -1,7 +1,7 @@ /* Implements a lightweight menubar widget. Copyright (C) 1992 Lucid, Inc. -Copyright (C) 1994-1995, 1997, 1999-2021 Free Software Foundation, Inc. +Copyright (C) 1994-1995, 1997, 1999-2022 Free Software Foundation, Inc. This file is part of the Lucid Widget Library. diff --git a/lwlib/xlwmenu.h b/lwlib/xlwmenu.h index 89e548bc8da..7f4bf35939a 100644 --- a/lwlib/xlwmenu.h +++ b/lwlib/xlwmenu.h @@ -1,6 +1,6 @@ /* Interface of a lightweight menubar widget. -Copyright (C) 2002-2021 Free Software Foundation, Inc. +Copyright (C) 2002-2022 Free Software Foundation, Inc. Copyright (C) 1992 Lucid, Inc. This file is part of the Lucid Widget Library. diff --git a/lwlib/xlwmenuP.h b/lwlib/xlwmenuP.h index bb37b0dee2f..455ecdbce01 100644 --- a/lwlib/xlwmenuP.h +++ b/lwlib/xlwmenuP.h @@ -1,6 +1,6 @@ /* Internals of a lightweight menubar widget. -Copyright (C) 2002-2021 Free Software Foundation, Inc. +Copyright (C) 2002-2022 Free Software Foundation, Inc. Copyright (C) 1992 Lucid, Inc. This file is part of the Lucid Widget Library. |