commit 01615b24da97bdb5cc4eaec5792da8238dab9942 (HEAD, refs/remotes/origin/master) Author: Po Lu Date: Sun Jan 2 15:13:37 2022 +0800 Fix mouse wheel scroll direction on pgtk * src/pgtkterm.c (scroll_event): Fix scroll modifiers when `mwheel-coalesce-scroll-events' is nil. diff --git a/src/pgtkterm.c b/src/pgtkterm.c index 74614eae6e..3093083a82 100644 --- a/src/pgtkterm.c +++ b/src/pgtkterm.c @@ -6264,9 +6264,9 @@ scroll_event (GtkWidget * widget, GdkEvent * event, gpointer * user_data) ? HORIZ_WHEEL_EVENT : WHEEL_EVENT); inev.ie.modifiers |= (inev.ie.kind == HORIZ_WHEEL_EVENT - ? (delta_x >= 0 ? down_modifier : up_modifier) + ? (delta_x >= 0 ? up_modifier : down_modifier) : (delta_y >= 0 ? down_modifier : up_modifier)); - inev.ie.arg = list3 (Qnil, make_float (delta_x * 100), + inev.ie.arg = list3 (Qnil, make_float (-delta_x * 100), make_float (-delta_y * 100)); } else commit ad125a99273c7bd81d02d388af3c69125dfe27ee Merge: 96212e1a27 efb1c7ec37 Author: Stefan Kangas Date: Sun Jan 2 06:31:44 2022 +0100 Merge from origin/emacs-28 efb1c7ec37 ; * admin/notes/years: More known problems. f475c5823a ; Copyright year fixes 2684def348 ; Run set-copyright from admin.el 2558b37b5e ; * admin/notes/years: Mention known problems with 'update... commit 96212e1a270d9ba665bf33aec8a404979afb896b Author: Po Lu Date: Sun Jan 2 11:02:49 2022 +0800 Fix XRegisterIMInstantiateCallback function argument configure test * configure.ac: Use XIDProc where XIMProc was mistakenly used. diff --git a/configure.ac b/configure.ac index 66cc94e3ea..3a04724a2c 100644 --- a/configure.ac +++ b/configure.ac @@ -3419,7 +3419,7 @@ if test "${HAVE_XIM}" != "no"; then XrmDatabase db; char *res_name; char *res_class; -XIMProc callback; +XIDProc *callback; XPointer *client_data; #ifndef __GNUC__ /* If we're not using GCC, it's probably not XFree86, and this is commit a6952f78f3962ac2d9a5add580a130f0abd31429 Author: Po Lu Date: Sun Jan 2 11:02:02 2022 +0800 Stop sending touch-end events if coalescing scroll events * src/xterm.c (handle_one_xevent): Don't generate touch-end events if mwheel_coalesce_scroll_events is non-nil. diff --git a/src/xterm.c b/src/xterm.c index 3c35c275ba..c344331755 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -10173,12 +10173,12 @@ handle_one_xevent (struct x_display_info *dpyinfo, val->emacs_value += delta; if (mwheel_coalesce_scroll_events - && (fabs (val->emacs_value) < 1) - && (fabs (delta) > 0)) + && (fabs (val->emacs_value) < 1)) continue; bool s = signbit (val->emacs_value); - inev.ie.kind = (fabs (delta) > 0 + inev.ie.kind = ((mwheel_coalesce_scroll_events + || fabs (delta) > 0) ? (val->horizontal ? HORIZ_WHEEL_EVENT : WHEEL_EVENT) commit 5bdf413b1902c8bbebdef774a701fa1badce9e32 Author: Po Lu Date: Sun Jan 2 02:37:21 2022 +0000 Fix mouse face problems when moving between two frames on Haiku * src/haiku_support.cc (movement_locker): New locker. (MouseMoved): Lock that locker. (BWindow_new): (BWindow_quit): Use LockLooper instead of Lock. * src/haikuterm.c (haiku_read_socket): Clear mouse face if a motion event is received for a frame other than the one that is currently displaying the mouse face. diff --git a/src/haiku_support.cc b/src/haiku_support.cc index 8bd7c04ee8..64f9aa8a55 100644 --- a/src/haiku_support.cc +++ b/src/haiku_support.cc @@ -92,6 +92,26 @@ static BLocker key_map_lock; static BLocker child_frame_lock; +/* A LeaveNotify event (well, the closest equivalent on Haiku, which + is a B_MOUSE_MOVED event with `transit' set to B_EXITED_VIEW) might + be sent out-of-order with regards to motion events from other + windows, such as when the mouse pointer rapidly moves from an + undecorated child frame to its parent. This can cause a failure to + clear the mouse face on the former if an event for the latter is + read by Emacs first and ends up showing the mouse face there. + + While this lock doesn't really ensure that the events will be + delivered in the correct order, it makes them arrive in the correct + order "most of the time" on my machine, which is good enough and + preferable to adding a lot of extra complexity to the event + handling code to sort motion events by their timestamps. + + Obviously this depends on the number of execution units that are + available, and the scheduling priority of each thread involved in + the input handling, but it will be good enough for most people. */ + +static BLocker movement_locker; + extern "C" { extern _Noreturn void emacs_abort (void); @@ -1181,7 +1201,11 @@ class EmacsView : public BView ToolTip ()->SetMouseRelativeLocation (BPoint (-(point.x - tt_absl_pos.x), -(point.y - tt_absl_pos.y))); - haiku_write (MOUSE_MOTION, &rq); + if (movement_locker.Lock ()) + { + haiku_write (MOUSE_MOTION, &rq); + movement_locker.Unlock (); + } } void @@ -1570,7 +1594,7 @@ BWindow_new (void *_view) if (!vw) { *v = NULL; - window->Lock (); + window->LockLooper (); window->Quit (); return NULL; } @@ -1590,7 +1614,7 @@ BWindow_new (void *_view) void BWindow_quit (void *window) { - ((BWindow *) window)->Lock (); + ((BWindow *) window)->LockLooper (); ((BWindow *) window)->Quit (); } diff --git a/src/haikuterm.c b/src/haikuterm.c index 044249f792..5447683a6e 100644 --- a/src/haikuterm.c +++ b/src/haikuterm.c @@ -2798,6 +2798,27 @@ haiku_read_socket (struct terminal *terminal, struct input_event *hold_quit) previous_help_echo_string = help_echo_string; help_echo_string = Qnil; + /* A LeaveNotify event (well, the closest equivalent on Haiku, which + is a B_MOUSE_MOVED event with `transit' set to B_EXITED_VIEW) might + be sent out-of-order with regards to motion events from other + windows, such as when the mouse pointer rapidly moves from an + undecorated child frame to its parent. This can cause a failure to + clear the mouse face on the former if an event for the latter is + read by Emacs first and ends up showing the mouse face there. + + In case the `movement_locker' (also see the comment + there) doesn't take care of the problem, work + around it by clearing the mouse face now, if it is + currently shown on a different frame. */ + + if (hlinfo->mouse_face_hidden + || (f != hlinfo->mouse_face_mouse_frame + && !NILP (hlinfo->mouse_face_window))) + { + hlinfo->mouse_face_hidden = 0; + clear_mouse_face (hlinfo); + } + if (f != dpyinfo->last_mouse_glyph_frame || b->x < r.x || b->x >= r.x + r.width || b->y < r.y || b->y >= r.y + r.height) @@ -2812,12 +2833,6 @@ haiku_read_socket (struct terminal *terminal, struct input_event *hold_quit) help_echo_object, help_echo_pos); } - if (MOUSE_HL_INFO (f)->mouse_face_hidden) - { - MOUSE_HL_INFO (f)->mouse_face_hidden = 0; - clear_mouse_face (MOUSE_HL_INFO (f)); - } - if (!NILP (Vmouse_autoselect_window)) { static Lisp_Object last_mouse_window; commit af729b1dfd235de400f6a0998a968222417596bf Author: Po Lu Date: Sun Jan 2 00:43:54 2022 +0000 Make quitting actually work in Haiku file dialogs * src/haiku_support.h: (be_popup_file_dialog) * src/haiku_support.cc (be_popup_file_dialog): New parameter `maybe_quit_function'. * src/haikufns.c (Fhaiku_read_file_name): Pass `maybe_quit' as the maybe_quit_function. diff --git a/src/haiku_support.cc b/src/haiku_support.cc index 211d37b8e1..8bd7c04ee8 100644 --- a/src/haiku_support.cc +++ b/src/haiku_support.cc @@ -2624,7 +2624,8 @@ char * be_popup_file_dialog (int open_p, const char *default_dir, int must_match_p, int dir_only_p, void *window, const char *save_text, const char *prompt, void (*block_input_function) (void), - void (*unblock_input_function) (void)) + void (*unblock_input_function) (void), + void (*maybe_quit_function) (void)) { ptrdiff_t idx = c_specpdl_idx_from_cxx (); /* setjmp/longjmp is UB with automatic objects. */ @@ -2635,7 +2636,6 @@ be_popup_file_dialog (int open_p, const char *default_dir, int must_match_p, int BMessage *msg = new BMessage ('FPSE'); BFilePanel *panel = new BFilePanel (open_p ? B_OPEN_PANEL : B_SAVE_PANEL, NULL, NULL, mode); - unblock_input_function (); struct popup_file_dialog_data dat; dat.entry = path; @@ -2660,6 +2660,7 @@ be_popup_file_dialog (int open_p, const char *default_dir, int must_match_p, int panel->Show (); panel->Window ()->Show (); + unblock_input_function (); void *buf = alloca (200); while (1) @@ -2669,19 +2670,26 @@ be_popup_file_dialog (int open_p, const char *default_dir, int must_match_p, int if (!haiku_read_with_timeout (&type, buf, 200, 100000)) { + block_input_function (); if (type != FILE_PANEL_EVENT) haiku_write (type, buf); else if (!ptr) ptr = (char *) ((struct haiku_file_panel_event *) buf)->ptr; + unblock_input_function (); + + maybe_quit_function (); } ssize_t b_s; + block_input_function (); haiku_read_size (&b_s); - if (!b_s || b_s == -1 || ptr || panel->Window ()->IsHidden ()) + if (!b_s || ptr || panel->Window ()->IsHidden ()) { c_unbind_to_nil_from_cxx (idx); + unblock_input_function (); return ptr; } + unblock_input_function (); } } diff --git a/src/haiku_support.h b/src/haiku_support.h index 0377376a02..dd5e168d14 100644 --- a/src/haiku_support.h +++ b/src/haiku_support.h @@ -740,7 +740,8 @@ extern "C" int dir_only_p, void *window, const char *save_text, const char *prompt, void (*block_input_function) (void), - void (*unblock_input_function) (void)); + void (*unblock_input_function) (void), + void (*maybe_quit_function) (void)); extern void record_c_unwind_protect_from_cxx (void (*) (void *), void *); diff --git a/src/haikufns.c b/src/haikufns.c index bf0bf8e525..743ecf1aef 100644 --- a/src/haikufns.c +++ b/src/haikufns.c @@ -2236,7 +2236,7 @@ Optional arg SAVE_TEXT, if non-nil, specifies some text to show in the entry fie FRAME_HAIKU_WINDOW (f), !NILP (save_text) ? SSDATA (ENCODE_UTF_8 (save_text)) : NULL, SSDATA (ENCODE_UTF_8 (prompt)), - block_input, unblock_input); + block_input, unblock_input, maybe_quit); unbind_to (idx, Qnil); commit efb1c7ec379430f560c5b801969ae43023c52734 Author: Eli Zaretskii Date: Sat Jan 1 22:21:46 2022 +0200 ; * admin/notes/years: More known problems. diff --git a/admin/notes/years b/admin/notes/years index e9376f5d5a..3df8139f9b 100644 --- a/admin/notes/years +++ b/admin/notes/years @@ -9,16 +9,26 @@ results for plausibility, then commit them. A few known problems with the build-aux/update-copyright script: - . it doesn't update config.bat and etc/tutorials/TUTORIAL.he because - the "Copyright" statement begins in these two files after a prefix - that is more than 5 characters long + . it doesn't update config.bat, msdos/depfiles.bat, + nt/configure.bat, etc/tutorials/TUTORIAL.cn, and + etc/tutorials/TUTORIAL.he because the "Copyright" statement begins + in these files after a prefix that is more than 5 characters long + . it doesn't update etc/tutorials/TUTORIAL.nl and + etc/tutorials/TUTORIAL.ro for some reason . it doesn't update the second Copyright notice, the one that gets output into PDF and PS, in etc/refcards/ru-refcard.tex - . it doesn't update etc/refcards/gnus-refcard.tex because its - Copyright statement has a non-standard format + . it doesn't update etc/refcards/gnus-refcard.tex and + doc/misc/org.org because their Copyright statements have a + non-standard format + . several README and XPM files under etc/images/, and also + etc/refcards/README, msdos/README, and nt/icons/README aren't + updated either These files need to be updated by hand. +Next, run "M-x set-copyright" from admin.el, which updates several +copyright notices in the Emacs sources. + You should also run the etags test suite in test/manual/etags/. It will most probably fail because the contents of the test files changes due to copyright years update, so you need to move each ETAGS and commit f475c5823a409356721e49577116521467680ff4 Author: Glenn Morris Date: Sat Jan 1 10:02:17 2022 -0800 ; Copyright year fixes diff --git a/doc/misc/org.org b/doc/misc/org.org index adf24da1c3..60af81ea2c 100644 --- a/doc/misc/org.org +++ b/doc/misc/org.org @@ -21601,7 +21601,7 @@ that are mentioned in the manual. For a more complete list, use This manual is for Org version {{{version}}}. -Copyright \copy 2004--2021 Free Software Foundation, Inc. +Copyright \copy 2004--2022 Free Software Foundation, Inc. #+begin_quote Permission is granted to copy, distribute and/or modify this document diff --git a/etc/images/README b/etc/images/README index bb1cefea19..d87c884b0a 100644 --- a/etc/images/README +++ b/etc/images/README @@ -31,15 +31,15 @@ File: mh-logo.xpm Files: gnus.pbm Author: Luis Fernandes - Copyright (C) 2001-2021 Free Software Foundation, Inc. + Copyright (C) 2001-2022 Free Software Foundation, Inc. Files: splash.png, splash.svg, splash.pbm, splash.xpm Author: Francesc Rocher - Copyright (C) 2008-2021 Free Software Foundation, Inc. + Copyright (C) 2008-2022 Free Software Foundation, Inc. Files: checked.xpm, unchecked.xpm Author: Chong Yidong - Copyright (C) 2010-2021 Free Software Foundation, Inc. + Copyright (C) 2010-2022 Free Software Foundation, Inc. * The following icons are from GTK+ 2.x. They are not part of Emacs, but diff --git a/etc/images/checked.xpm b/etc/images/checked.xpm index 3e7e76f254..aefa9dd5da 100644 --- a/etc/images/checked.xpm +++ b/etc/images/checked.xpm @@ -1,5 +1,5 @@ /* XPM */ -/* Copyright (C) 2010-2021 Free Software Foundation, Inc. +/* Copyright (C) 2010-2022 Free Software Foundation, Inc. * * Author: Chong Yidong * diff --git a/etc/images/gnus/README b/etc/images/gnus/README index 092b6cce2e..db039d792d 100644 --- a/etc/images/gnus/README +++ b/etc/images/gnus/README @@ -21,11 +21,11 @@ Files: catchup.pbm catchup.xpm cu-exit.pbm cu-exit.xpm unsubscribe.pbm unsubscribe.xpm uu-decode.pbm uu-decode.xpm uu-post.pbm uu-post.xpm Author: Luis Fernandes -Copyright (C) 2001-2021 Free Software Foundation, Inc. +Copyright (C) 2001-2022 Free Software Foundation, Inc. Files: gnus.png, gnus.svg Author: Francesc Rocher - Copyright (C) 2008-2021 Free Software Foundation, Inc. + Copyright (C) 2008-2022 Free Software Foundation, Inc. * The following icons are from GNOME 2.x. They are not part of Emacs, diff --git a/etc/images/icons/README b/etc/images/icons/README index 514797a737..ca2d3733ed 100644 --- a/etc/images/icons/README +++ b/etc/images/icons/README @@ -14,7 +14,7 @@ Files: hicolor/16x16/apps/emacs23.png hicolor/24x24/apps/emacs23.png hicolor/128x128/apps/emacs23.png hicolor/scalable/apps/emacs23.svg Author: Kentaro Ohkouchi -Copyright (C) 2007-2021 Free Software Foundation, Inc. +Copyright (C) 2007-2022 Free Software Foundation, Inc. License: GNU General Public License version 3 or later (see COPYING) @@ -22,7 +22,7 @@ Files: hicolor/16x16/apps/emacs22.png hicolor/24x24/apps/emacs22.png hicolor/32x32/apps/emacs22.png hicolor/48x48/apps/emacs22.png Author: Andrew Zhilin -Copyright (C) 2005-2021 Free Software Foundation, Inc. +Copyright (C) 2005-2022 Free Software Foundation, Inc. License: GNU General Public License version 3 or later (see COPYING) Files: allout-widgets-dark-bg/closed.png @@ -71,5 +71,5 @@ Files: allout-widgets-dark-bg/closed.png allout-widgets-light-bg/through-descender.xpm Author: Ken Manheimer -Copyright (C) 2011-2021 Free Software Foundation, Inc. +Copyright (C) 2011-2022 Free Software Foundation, Inc. License: GNU General Public License version 3 or later (see COPYING) diff --git a/etc/images/mh-logo.xpm b/etc/images/mh-logo.xpm index fd7598d5a6..846859e058 100644 --- a/etc/images/mh-logo.xpm +++ b/etc/images/mh-logo.xpm @@ -1,7 +1,7 @@ /* XPM */ /* MH-E Logo * - * Copyright (C) 2003-2021 Free Software Foundation, Inc. + * Copyright (C) 2003-2022 Free Software Foundation, Inc. * * Author: Satyaki Das * diff --git a/etc/images/unchecked.xpm b/etc/images/unchecked.xpm index 5e18534e77..b758346b96 100644 --- a/etc/images/unchecked.xpm +++ b/etc/images/unchecked.xpm @@ -1,5 +1,5 @@ /* XPM */ -/* Copyright (C) 2010-2021 Free Software Foundation, Inc. +/* Copyright (C) 2010-2022 Free Software Foundation, Inc. * * Author: Chong Yidong * diff --git a/etc/refcards/README b/etc/refcards/README index 1cdcc91cc8..8e5eb5c89c 100644 --- a/etc/refcards/README +++ b/etc/refcards/README @@ -77,7 +77,7 @@ it is reproduced here for convenience. File: gnus-logo.eps, gnus-logo.pdf Author: Luis Fernandes - Copyright (C) 2001-2021 Free Software Foundation, Inc. + Copyright (C) 2001-2022 Free Software Foundation, Inc. License: GNU General Public License version 3 or later (see COPYING) diff --git a/etc/tutorials/TUTORIAL.cn b/etc/tutorials/TUTORIAL.cn index 4b820fdf5a..5d03014e41 100644 --- a/etc/tutorials/TUTORIAL.cn +++ b/etc/tutorials/TUTORIAL.cn @@ -1026,7 +1026,7 @@ using, writing, and sharing free software! 本篇指南是 GNU Emacs 的一部分,并允许在下列条件的约束下发行其拷贝: - Copyright (C) 1985, 1996, 1998, 2001-2021 Free Software Foundation, + Copyright (C) 1985, 1996, 1998, 2001-2022 Free Software Foundation, Inc. 本文件为 GNU Emacs 的一部分。 diff --git a/etc/tutorials/TUTORIAL.nl b/etc/tutorials/TUTORIAL.nl index b5edab0ea2..2ec3fac11b 100644 --- a/etc/tutorials/TUTORIAL.nl +++ b/etc/tutorials/TUTORIAL.nl @@ -1239,7 +1239,7 @@ Engels origineel van de copyrightmelding en condities: This version of the tutorial is a part of GNU Emacs. It is copyrighted and comes with permission to distribute copies on certain conditions: - Copyright (C) 1985, 1996, 1998, 2001-2021 Free Software Foundation, Inc. + Copyright (C) 1985, 1996, 1998, 2001-2022 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/etc/tutorials/TUTORIAL.ro b/etc/tutorials/TUTORIAL.ro index e0c293657b..1f1dc32560 100644 --- a/etc/tutorials/TUTORIAL.ro +++ b/etc/tutorials/TUTORIAL.ro @@ -1082,7 +1082,7 @@ continuare noţita de copyright originală în limba engleză. This version of the tutorial, like GNU Emacs, is copyrighted, and comes with permission to distribute copies on certain conditions: -Copyright (C) 1998, 2001-2021 Free Software Foundation, Inc. +Copyright (C) 1998, 2001-2022 Free Software Foundation, Inc. Permission is granted to anyone to make or distribute verbatim copies of this document as received, in any medium, provided that the diff --git a/msdos/README b/msdos/README index 90a0c58ee6..cdda15f00d 100644 --- a/msdos/README +++ b/msdos/README @@ -10,7 +10,7 @@ The files emacs.ico and emacs.pif are for using the DJGPP version on Windows 3.X. Since these are binary files, their copyright notice is reproduced here: -# Copyright (C) 1993, 2002-2021 Free Software Foundation, Inc. +# Copyright (C) 1993, 2002-2022 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/msdos/depfiles.bat b/msdos/depfiles.bat index 131f2fc04d..8c36fbcdef 100644 --- a/msdos/depfiles.bat +++ b/msdos/depfiles.bat @@ -1,7 +1,7 @@ @echo off rem ---------------------------------------------------------------------- rem Auxiliary script for MSDOS, run by ../config.bat -rem Copyright (C) 2011-2021 Free Software Foundation, Inc. +rem Copyright (C) 2011-2022 Free Software Foundation, Inc. rem This file is part of GNU Emacs. diff --git a/nt/configure.bat b/nt/configure.bat index 0cb1a632e2..60682a7a81 100755 --- a/nt/configure.bat +++ b/nt/configure.bat @@ -1,7 +1,7 @@ @echo off rem ---------------------------------------------------------------------- rem This was the old configuration script for MS Windows operating systems -rem Copyright (C) 1999-2021 Free Software Foundation, Inc. +rem Copyright (C) 1999-2022 Free Software Foundation, Inc. rem This file is part of GNU Emacs. diff --git a/nt/icons/README b/nt/icons/README index 4006146d35..4d9fb15e52 100644 --- a/nt/icons/README +++ b/nt/icons/README @@ -8,7 +8,7 @@ License: GNU General Public License version 3 or later File: emacs22.ico Author: Andrew Zhilin -Copyright (C) 2005-2021 Free Software Foundation, Inc. +Copyright (C) 2005-2022 Free Software Foundation, Inc. License: GNU General Public License version 3 or later (see COPYING) @@ -17,7 +17,7 @@ Files: gnu2a32.ico gnu2a32t.ico gnu2b48.ico gnu2b48t.ico gnu5w32.ico gnu5w32t.ico gnu6w48.ico gnu6w48t.ico gnu7.ico gnu8.ico gnu9.ico Author: Rob Davenport -Copyright (C) 1999, 2001-2021 Free Software Foundation, Inc. +Copyright (C) 1999, 2001-2022 Free Software Foundation, Inc. License: GNU General Public License version 3 or later (see COPYING) diff --git a/test/lisp/emacs-lisp/lisp-mnt-tests.el b/test/lisp/emacs-lisp/lisp-mnt-tests.el index d77804fbe6..200be7354a 100644 --- a/test/lisp/emacs-lisp/lisp-mnt-tests.el +++ b/test/lisp/emacs-lisp/lisp-mnt-tests.el @@ -1,6 +1,6 @@ ;;; lisp-mnt-tests.el --- Tests for lisp-mnt -*- lexical-binding: t; -*- -;; Copyright (C) 2021 2020-2021 Free Software Foundation, Inc. +;; Copyright (C) 2021-2022 Free Software Foundation, Inc. ;; Author: Stefan Monnier commit 2684def3480b030400205be0f93caf4b46aca17a Author: Glenn Morris Date: Sat Jan 1 09:52:06 2022 -0800 ; Run set-copyright from admin.el diff --git a/configure.ac b/configure.ac index ee3fcd1613..e5ab98dbfb 100644 --- a/configure.ac +++ b/configure.ac @@ -5440,7 +5440,7 @@ fi version=$PACKAGE_VERSION -copyright="Copyright (C) 2021 Free Software Foundation, Inc." +copyright="Copyright (C) 2022 Free Software Foundation, Inc." AC_DEFINE_UNQUOTED(COPYRIGHT, ["$copyright"], [Short copyright string for this version of Emacs.]) AC_SUBST(copyright) diff --git a/lib-src/rcs2log b/lib-src/rcs2log index d2dc7aca92..bc7875cfdd 100755 --- a/lib-src/rcs2log +++ b/lib-src/rcs2log @@ -20,7 +20,7 @@ # along with this program. If not, see . -Copyright='Copyright (C) 2021 Free Software Foundation, Inc. +Copyright='Copyright (C) 2022 Free Software Foundation, Inc. This program comes with NO WARRANTY, to the extent permitted by law. You may redistribute copies of this program under the terms of the GNU General Public License. diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp index 521084aced..b59052aca5 100644 --- a/msdos/sed2v2.inp +++ b/msdos/sed2v2.inp @@ -27,7 +27,7 @@ #ifndef MSDOS\ #define MSDOS\ #endif -/^#undef COPYRIGHT *$/s/^.*$/#define COPYRIGHT "Copyright (C) 2021 Free Software Foundation, Inc."/ +/^#undef COPYRIGHT *$/s/^.*$/#define COPYRIGHT "Copyright (C) 2022 Free Software Foundation, Inc."/ /^#undef DIRECTORY_SEP *$/s!^.*$!#define DIRECTORY_SEP '/'! /^#undef DOS_NT *$/s/^.*$/#define DOS_NT/ /^#undef FLOAT_CHECK_DOMAIN *$/s/^.*$/#define FLOAT_CHECK_DOMAIN/ commit 2558b37b5e6fd437c93c9f1be5661512d2f1a629 Author: Eli Zaretskii Date: Sat Jan 1 17:11:32 2022 +0200 ; * admin/notes/years: Mention known problems with 'update-copyright'. diff --git a/admin/notes/years b/admin/notes/years index 4f1d29ef02..e9376f5d5a 100644 --- a/admin/notes/years +++ b/admin/notes/years @@ -7,6 +7,18 @@ checkout, redirecting its output to a file, so that you could later examine the files that don't have copyright notices. Inspect the results for plausibility, then commit them. +A few known problems with the build-aux/update-copyright script: + + . it doesn't update config.bat and etc/tutorials/TUTORIAL.he because + the "Copyright" statement begins in these two files after a prefix + that is more than 5 characters long + . it doesn't update the second Copyright notice, the one that gets + output into PDF and PS, in etc/refcards/ru-refcard.tex + . it doesn't update etc/refcards/gnus-refcard.tex because its + Copyright statement has a non-standard format + +These files need to be updated by hand. + You should also run the etags test suite in test/manual/etags/. It will most probably fail because the contents of the test files changes due to copyright years update, so you need to move each ETAGS and commit 1d3020908b4e4ff398c3faed9321aa4932fbaad1 Merge: 31fefef4a2 58b0ada20b Author: Eli Zaretskii Date: Sat Jan 1 08:38:36 2022 -0500 Merge from origin/emacs-28 58b0ada20b Update more copyright years commit 31fefef4a2f8536a23df94df46ecb4b5b4ff1efe Author: Stefan Kangas Date: Sat Jan 1 14:23:11 2022 +0100 elide-head: Support more licenses * lisp/elide-head.el (elide-head-headers-to-hide): Add support for the Expat License, and more variants of the BSD-2-Clause License. Add old FSF address. This fixes a bug reported in 2003: https://lists.gnu.org/r/bug-gnu-emacs/2003-01/msg00142.html diff --git a/lisp/elide-head.el b/lisp/elide-head.el index d2e3ac6a99..30772fa514 100644 --- a/lisp/elide-head.el +++ b/lisp/elide-head.el @@ -50,13 +50,16 @@ :group 'tools) (defcustom elide-head-headers-to-hide - '(("is free software[:;] you can redistribute it" . ; GNU boilerplate - "\\(Boston, MA 0211\\(1-1307\\|0-1301\\), USA\\|\ -If not, see \\)\\.") - ("The Regents of the University of California\\. All rights reserved\\." . - "SUCH DAMAGE\\.") ; BSD - ("Permission is hereby granted, free of charge" . ; X11 - "authorization from the X Consortium\\.")) + `(("is free software[:;] you can redistribute it" . ; GNU boilerplate + "\\(If not, see \\|\ +Boston, MA 0211\\(1-1307\\|0-1301\\), USA\\|\ +675 Mass Ave, Cambridge, MA 02139, USA\\)\\.") + (,(rx (or "The Regents of the University of California. All rights reserved." + "Redistribution and use in source and binary")) + . "THE POSSIBILITY OF SUCH DAMAGE\\.") ; BSD + ("Permission is hereby granted, free of charge" . + ,(rx (or "authorization from the X Consortium." ; X11 + "THE USE OR OTHER DEALINGS IN THE SOFTWARE.")))) ; Expat "Alist of regexps defining start and end of text to elide. The cars of elements of the list are searched for in order. Text is @@ -64,7 +67,8 @@ elided with an invisible overlay from the end of the line where the first match is found to the end of the match for the corresponding cdr." :type '(alist :key-type (regexp :tag "Start regexp") - :value-type (regexp :tag "End regexp"))) + :value-type (regexp :tag "End regexp")) + :version "29.1") (defvar-local elide-head-overlay nil) commit 58b0ada20b60c4600a036fdb27e1aae738c32cc2 Author: Eli Zaretskii Date: Sat Jan 1 14:20:37 2022 +0200 Update more copyright years * etc/tutorials/TUTORIAL.he (זכויות שימוש): * config.bat: Update Copyright years. diff --git a/config.bat b/config.bat index e4332cd326..29742eec52 100644 --- a/config.bat +++ b/config.bat @@ -1,7 +1,7 @@ @echo off rem ---------------------------------------------------------------------- rem Configuration script for MSDOS -rem Copyright (C) 1994-1999, 2001-2021 Free Software Foundation, Inc. +rem Copyright (C) 1994-1999, 2001-2022 Free Software Foundation, Inc. rem This file is part of GNU Emacs. diff --git a/etc/tutorials/TUTORIAL.he b/etc/tutorials/TUTORIAL.he index 2ee4f74c32..08b946dbe0 100644 --- a/etc/tutorials/TUTORIAL.he +++ b/etc/tutorials/TUTORIAL.he @@ -1004,7 +1004,7 @@ find-file. גירסה זו של השיעור הינה חלק מחבילת GNU Emacs. היא מוגנת בזכויות יוצרים וניתנת להעתקה והפצת עותקים בתנאים מסויימים כדלקמן: - Copyright (C) 2010-2021 Free Software Foundation, Inc. + Copyright (C) 2010-2022 Free Software Foundation, Inc. ‏GNU Emacs הינו תכנה חפשית; זכותכם להפיצו ו\או לשנותו בכפוף לתנאי הרשיון GNU General Public License, כפי שהוא יוצא לאור ע״י Free commit 823b6b8d260e6e5bc0c428c9b3d92b6822624761 Author: Eli Zaretskii Date: Sat Jan 1 07:07:15 2022 -0500 ; Add 2022 to copyright years. diff --git a/doc/emacs/haiku.texi b/doc/emacs/haiku.texi index d2b7eb8408..0c76990cae 100644 --- a/doc/emacs/haiku.texi +++ b/doc/emacs/haiku.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 2021 Free Software Foundation, Inc. +@c Copyright (C) 2021--2022 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Haiku @appendix Emacs and Haiku diff --git a/etc/NEWS b/etc/NEWS index ca6a716ccd..29e329edc9 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -1,6 +1,6 @@ GNU Emacs NEWS -- history of user-visible changes. -Copyright (C) 2021 Free Software Foundation, Inc. +Copyright (C) 2021-2022 Free Software Foundation, Inc. See the end of the file for license conditions. Please send Emacs bug reports to 'bug-gnu-emacs@gnu.org'. diff --git a/etc/org.gnu.emacs.defaults.gschema.xml b/etc/org.gnu.emacs.defaults.gschema.xml index 7c700ac0b6..d4299c25c9 100644 --- a/etc/org.gnu.emacs.defaults.gschema.xml +++ b/etc/org.gnu.emacs.defaults.gschema.xml @@ -1,5 +1,5 @@ - + diff --git a/lib-src/be_resources.cc b/lib-src/be_resources.cc index e6a14f037b..d18fe30dd7 100644 --- a/lib-src/be_resources.cc +++ b/lib-src/be_resources.cc @@ -1,5 +1,5 @@ /* Haiku window system support - Copyright (C) 2021 Free Software Foundation, Inc. + Copyright (C) 2021-2022 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lisp/emacs-lisp/multisession.el b/lisp/emacs-lisp/multisession.el index c58a9abe02..e6a2424c51 100644 --- a/lisp/emacs-lisp/multisession.el +++ b/lisp/emacs-lisp/multisession.el @@ -1,6 +1,6 @@ ;;; multisession.el --- Multisession storage for variables -*- lexical-binding: t; -*- -;; Copyright (C) 2021 Free Software Foundation, Inc. +;; Copyright (C) 2021-2022 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/lisp/gnus/gnus-rmail.el b/lisp/gnus/gnus-rmail.el index f9dcc286a6..15ead1add4 100644 --- a/lisp/gnus/gnus-rmail.el +++ b/lisp/gnus/gnus-rmail.el @@ -1,6 +1,6 @@ ;;; gnus-rmail.el --- Saving to rmail/babyl files -*- lexical-binding: t; -*- -;; Copyright (C) 2021 Free Software Foundation, Inc. +;; Copyright (C) 2021-2022 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/lisp/international/emoji.el b/lisp/international/emoji.el index b78e122aa1..264a1f09dc 100644 --- a/lisp/international/emoji.el +++ b/lisp/international/emoji.el @@ -1,6 +1,6 @@ ;;; emoji.el --- Inserting emojis -*- lexical-binding:t -*- -;; Copyright (C) 2021 Free Software Foundation, Inc. +;; Copyright (C) 2021-2022 Free Software Foundation, Inc. ;; Author: Lars Ingebrigtsen ;; Keywords: fun diff --git a/lisp/keymap.el b/lisp/keymap.el index 25288013cf..a60efe18e1 100644 --- a/lisp/keymap.el +++ b/lisp/keymap.el @@ -1,6 +1,6 @@ ;;; keymap.el --- Keymap functions -*- lexical-binding: t; -*- -;; Copyright (C) 2021 Free Software Foundation, Inc. +;; Copyright (C) 2021-2022 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/lisp/progmodes/erts-mode.el b/lisp/progmodes/erts-mode.el index a12c964c25..31a8bded8a 100644 --- a/lisp/progmodes/erts-mode.el +++ b/lisp/progmodes/erts-mode.el @@ -1,6 +1,6 @@ ;;; erts-mode.el --- major mode to edit erts files -*- lexical-binding: t; -*- -;; Copyright (C) 2021 Free Software Foundation, Inc. +;; Copyright (C) 2021-2022 Free Software Foundation, Inc. ;; Keywords: tools diff --git a/lisp/sqlite-mode.el b/lisp/sqlite-mode.el index 082eb8276e..ba1b81ef7e 100644 --- a/lisp/sqlite-mode.el +++ b/lisp/sqlite-mode.el @@ -1,6 +1,6 @@ ;;; sqlite-mode.el --- Mode for examining sqlite3 database files -*- lexical-binding: t; -*- -;; Copyright (C) 2021 Free Software Foundation, Inc. +;; Copyright (C) 2021-2022 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/lisp/sqlite.el b/lisp/sqlite.el index 6d32a0468f..6a8a53a699 100644 --- a/lisp/sqlite.el +++ b/lisp/sqlite.el @@ -1,6 +1,6 @@ ;;; sqlite.el --- Functions for interacting with sqlite3 databases -*- lexical-binding: t; -*- -;; Copyright (C) 2021 Free Software Foundation, Inc. +;; Copyright (C) 2021-2022 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/lisp/term/haiku-win.el b/lisp/term/haiku-win.el index 3c4d00f7f9..c219ab2944 100644 --- a/lisp/term/haiku-win.el +++ b/lisp/term/haiku-win.el @@ -1,6 +1,6 @@ ;;; haiku-win.el --- set up windowing on Haiku -*- lexical-binding: t -*- -;; Copyright (C) 2021 Free Software Foundation, Inc. +;; Copyright (C) 2021-2022 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/lisp/term/pgtk-win.el b/lisp/term/pgtk-win.el index bd925a0129..0f5b9031db 100644 --- a/lisp/term/pgtk-win.el +++ b/lisp/term/pgtk-win.el @@ -1,6 +1,6 @@ ;;; xterm.el --- define function key sequences and standard colors for xterm -*- lexical-binding: t -*- -;; Copyright (C) 1995, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1995, 2001-2020, 2022 Free Software Foundation, Inc. ;; Author: FSF ;; Keywords: terminals diff --git a/lisp/textmodes/glyphless-mode.el b/lisp/textmodes/glyphless-mode.el index 177ba42c9c..4d48d90b56 100644 --- a/lisp/textmodes/glyphless-mode.el +++ b/lisp/textmodes/glyphless-mode.el @@ -1,6 +1,6 @@ ;;; glyphless-mode.el --- minor mode for displaying glyphless characters -*- lexical-binding: t; -*- -;; Copyright (C) 2021 Free Software Foundation, Inc. +;; Copyright (C) 2021-2022 Free Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/textmodes/pixel-fill.el b/lisp/textmodes/pixel-fill.el index 0a0f0eb8b6..418d6a37c9 100644 --- a/lisp/textmodes/pixel-fill.el +++ b/lisp/textmodes/pixel-fill.el @@ -1,6 +1,6 @@ ;;; pixel-fill.el --- variable pitch filling functions -*- lexical-binding: t; -*- -;; Copyright (C) 2021 Free Software Foundation, Inc. +;; Copyright (C) 2021-2022 Free Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org ;; Keywords: filling diff --git a/lisp/yank-media.el b/lisp/yank-media.el index decab3b362..9836082fb2 100644 --- a/lisp/yank-media.el +++ b/lisp/yank-media.el @@ -1,6 +1,6 @@ ;;; yank-media.el --- Yanking images and HTML -*- lexical-binding:t -*- -;; Copyright (C) 2021 Free Software Foundation, Inc. +;; Copyright (C) 2021-2022 Free Software Foundation, Inc. ;; Author: Lars Ingebrigtsen ;; Keywords: utility diff --git a/src/haiku.c b/src/haiku.c index 485d86983c..1c78601255 100644 --- a/src/haiku.c +++ b/src/haiku.c @@ -1,5 +1,5 @@ /* Haiku subroutines that are general to the Haiku operating system. - Copyright (C) 2021 Free Software Foundation, Inc. + Copyright (C) 2021-2022 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/haiku_draw_support.cc b/src/haiku_draw_support.cc index 0f0f0a34f1..b0bc786ccf 100644 --- a/src/haiku_draw_support.cc +++ b/src/haiku_draw_support.cc @@ -1,5 +1,5 @@ /* Haiku window system support. Hey, Emacs, this is -*- C++ -*- - Copyright (C) 2021 Free Software Foundation, Inc. + Copyright (C) 2021-2022 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/haiku_font_support.cc b/src/haiku_font_support.cc index 9ac0400969..298bc73f29 100644 --- a/src/haiku_font_support.cc +++ b/src/haiku_font_support.cc @@ -1,5 +1,5 @@ /* Haiku window system support. Hey, Emacs, this is -*- C++ -*- - Copyright (C) 2021 Free Software Foundation, Inc. + Copyright (C) 2021-2022 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/haiku_io.c b/src/haiku_io.c index c152d9b086..cb7750634c 100644 --- a/src/haiku_io.c +++ b/src/haiku_io.c @@ -1,5 +1,5 @@ /* Haiku window system support. - Copyright (C) 2021 Free Software Foundation, Inc. + Copyright (C) 2021-2022 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/haiku_select.cc b/src/haiku_select.cc index 6cd6ee879e..041e244f3e 100644 --- a/src/haiku_select.cc +++ b/src/haiku_select.cc @@ -1,5 +1,5 @@ /* Haiku window system selection support. Hey Emacs, this is -*- C++ -*- - Copyright (C) 2021 Free Software Foundation, Inc. + Copyright (C) 2021-2022 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/haiku_support.cc b/src/haiku_support.cc index b89a08663a..211d37b8e1 100644 --- a/src/haiku_support.cc +++ b/src/haiku_support.cc @@ -1,5 +1,5 @@ /* Haiku window system support. Hey, Emacs, this is -*- C++ -*- - Copyright (C) 2021 Free Software Foundation, Inc. + Copyright (C) 2021-2022 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/haiku_support.h b/src/haiku_support.h index b08a561def..0377376a02 100644 --- a/src/haiku_support.h +++ b/src/haiku_support.h @@ -1,5 +1,5 @@ /* Haiku window system support. Hey Emacs, this is -*- C++ -*- - Copyright (C) 2021 Free Software Foundation, Inc. + Copyright (C) 2021-2022 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/haikufns.c b/src/haikufns.c index b9198e9d44..bf0bf8e525 100644 --- a/src/haikufns.c +++ b/src/haikufns.c @@ -1,5 +1,5 @@ /* Haiku window system support - Copyright (C) 2021 Free Software Foundation, Inc. + Copyright (C) 2021-2022 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/haikufont.c b/src/haikufont.c index 811fa62a84..1e5c1cb352 100644 --- a/src/haikufont.c +++ b/src/haikufont.c @@ -1,6 +1,6 @@ /* Font support for Haiku windowing -Copyright (C) 2021 Free Software Foundation, Inc. +Copyright (C) 2021-2022 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/haikugui.h b/src/haikugui.h index cfc693fb55..b744885a42 100644 --- a/src/haikugui.h +++ b/src/haikugui.h @@ -1,5 +1,5 @@ /* Haiku window system support - Copyright (C) 2021 Free Software Foundation, Inc. + Copyright (C) 2021-2022 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/haikuimage.c b/src/haikuimage.c index 138e5b84e6..4ffa214f1c 100644 --- a/src/haikuimage.c +++ b/src/haikuimage.c @@ -1,5 +1,5 @@ /* Haiku window system support. - Copyright (C) 2021 Free Software Foundation, Inc. + Copyright (C) 2021-2022 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/haikumenu.c b/src/haikumenu.c index 2ce0aed146..bff6bd8a48 100644 --- a/src/haikumenu.c +++ b/src/haikumenu.c @@ -1,5 +1,5 @@ /* Haiku window system support - Copyright (C) 2021 Free Software Foundation, Inc. + Copyright (C) 2021-2022 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/haikuselect.c b/src/haikuselect.c index 38cceb1de7..1b94fb97e6 100644 --- a/src/haikuselect.c +++ b/src/haikuselect.c @@ -1,5 +1,5 @@ /* Haiku window system selection support. - Copyright (C) 2021 Free Software Foundation, Inc. + Copyright (C) 2021-2022 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/haikuselect.h b/src/haikuselect.h index 1a3a945f98..80f33c6ed2 100644 --- a/src/haikuselect.h +++ b/src/haikuselect.h @@ -1,5 +1,5 @@ /* Haiku window system selection support. Hey Emacs, this is -*- C++ -*- - Copyright (C) 2021 Free Software Foundation, Inc. + Copyright (C) 2021-2022 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/haikuterm.c b/src/haikuterm.c index 676c2e2148..044249f792 100644 --- a/src/haikuterm.c +++ b/src/haikuterm.c @@ -1,5 +1,5 @@ /* Haiku window system support - Copyright (C) 2021 Free Software Foundation, Inc. + Copyright (C) 2021-2022 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/haikuterm.h b/src/haikuterm.h index 7ed7485ef5..3e39403ab4 100644 --- a/src/haikuterm.h +++ b/src/haikuterm.h @@ -1,5 +1,5 @@ /* Haiku window system support - Copyright (C) 2021 Free Software Foundation, Inc. + Copyright (C) 2021-2022 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/pgtkfns.c b/src/pgtkfns.c index c782efe395..c2e5942dfb 100644 --- a/src/pgtkfns.c +++ b/src/pgtkfns.c @@ -1,6 +1,6 @@ /* Functions for the pure Gtk+-3. -Copyright (C) 1989, 1992-1994, 2005-2006, 2008-2020 Free Software +Copyright (C) 1989, 1992-1994, 2005-2006, 2008-2020, 2022 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/pgtkgui.h b/src/pgtkgui.h index 9703fe6a02..389052631c 100644 --- a/src/pgtkgui.h +++ b/src/pgtkgui.h @@ -1,5 +1,5 @@ /* Definitions and headers for communication on the pure Gtk+3. - Copyright (C) 1995, 2005, 2008-2021 Free Software Foundation, Inc. + Copyright (C) 1995, 2005, 2008-2022 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/pgtkim.c b/src/pgtkim.c index a38599c5a9..8577ba2116 100644 --- a/src/pgtkim.c +++ b/src/pgtkim.c @@ -1,6 +1,6 @@ /* Pure Gtk+-3 communication module. -Copyright (C) 1989, 1993-1994, 2005-2006, 2008-2021 Free Software +Copyright (C) 1989, 1993-1994, 2005-2006, 2008-2022 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/pgtkmenu.c b/src/pgtkmenu.c index dbab2f9645..d1b1bfffb3 100644 --- a/src/pgtkmenu.c +++ b/src/pgtkmenu.c @@ -1,5 +1,5 @@ /* Pure GTK3 menu and toolbar module. - Copyright (C) 2019-2021 Free Software Foundation, Inc. + Copyright (C) 2019-2022 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/pgtkselect.c b/src/pgtkselect.c index 2a96caf032..23a79895d5 100644 --- a/src/pgtkselect.c +++ b/src/pgtkselect.c @@ -1,5 +1,5 @@ /* Gtk selection processing for emacs. - Copyright (C) 1993-1994, 2005-2006, 2008-2021 Free Software + Copyright (C) 1993-1994, 2005-2006, 2008-2022 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/pgtkselect.h b/src/pgtkselect.h index 294eefc11d..0509c83bde 100644 --- a/src/pgtkselect.h +++ b/src/pgtkselect.h @@ -1,5 +1,5 @@ /* Definitions and headers for selection of pure Gtk+3. - Copyright (C) 1989, 1993, 2005, 2008-2021 Free Software Foundation, + Copyright (C) 1989, 1993, 2005, 2008-2022 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/pgtkterm.c b/src/pgtkterm.c index c2e684272f..74614eae6e 100644 --- a/src/pgtkterm.c +++ b/src/pgtkterm.c @@ -1,6 +1,6 @@ /* Pure Gtk+-3 communication module. -*- coding: utf-8 -*- -Copyright (C) 1989, 1993-1994, 2005-2006, 2008-2021 Free Software +Copyright (C) 1989, 1993-1994, 2005-2006, 2008-2022 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/pgtkterm.h b/src/pgtkterm.h index 22ebadf559..42b03e315e 100644 --- a/src/pgtkterm.h +++ b/src/pgtkterm.h @@ -1,5 +1,5 @@ /* Definitions and headers for communication with pure Gtk+3. - Copyright (C) 1989, 1993, 2005, 2008-2021 Free Software Foundation, + Copyright (C) 1989, 1993, 2005, 2008-2022 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/sqlite.c b/src/sqlite.c index 428b84b21e..649cb38294 100644 --- a/src/sqlite.c +++ b/src/sqlite.c @@ -1,5 +1,5 @@ /* -Copyright (C) 2021 Free Software Foundation, Inc. +Copyright (C) 2021-2022 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/test/infra/Makefile.in b/test/infra/Makefile.in index 368be7392b..c251578e6a 100644 --- a/test/infra/Makefile.in +++ b/test/infra/Makefile.in @@ -1,6 +1,6 @@ ### @configure_input@ -# Copyright (C) 2021 Free Software Foundation, Inc. +# Copyright (C) 2021-2022 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/test/lisp/edmacro-tests.el b/test/lisp/edmacro-tests.el index 974f506a36..b5809ad0b7 100644 --- a/test/lisp/edmacro-tests.el +++ b/test/lisp/edmacro-tests.el @@ -1,6 +1,6 @@ ;;; edmacro-tests.el --- Tests for edmacro.el -*- lexical-binding:t -*- -;; Copyright (C) 2021 Free Software Foundation, Inc. +;; Copyright (C) 2021-2022 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/emacs-lisp/macroexp-resources/vk.el b/test/lisp/emacs-lisp/macroexp-resources/vk.el index 2dee1306a2..d9ca33671e 100644 --- a/test/lisp/emacs-lisp/macroexp-resources/vk.el +++ b/test/lisp/emacs-lisp/macroexp-resources/vk.el @@ -1,6 +1,6 @@ ;;; vk.el --- test code for macroexp-tests -*- lexical-binding: t -*- -;; Copyright (C) 2021 Free Software Foundation, Inc. +;; Copyright (C) 2021-2022 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/emacs-lisp/multisession-tests.el b/test/lisp/emacs-lisp/multisession-tests.el index 17457d9be2..5807c27bd2 100644 --- a/test/lisp/emacs-lisp/multisession-tests.el +++ b/test/lisp/emacs-lisp/multisession-tests.el @@ -1,6 +1,6 @@ ;;; multisession-tests.el --- Tests for multisession.el -*- lexical-binding: t; -*- -;; Copyright (C) 2021 Free Software Foundation, Inc. +;; Copyright (C) 2021-2022 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/gnus/gnus-group-tests.el b/test/lisp/gnus/gnus-group-tests.el index ee1e01be4b..4ae5fea3eb 100644 --- a/test/lisp/gnus/gnus-group-tests.el +++ b/test/lisp/gnus/gnus-group-tests.el @@ -1,6 +1,6 @@ ;;; gnus-group-tests.el --- Tests for gnus-group.el -*- lexical-binding: t; -*- -;; Copyright (C) 2021 Free Software Foundation, Inc. +;; Copyright (C) 2021-2022 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/image-dired-tests.el b/test/lisp/image-dired-tests.el index 3f0304ee40..00df72487f 100644 --- a/test/lisp/image-dired-tests.el +++ b/test/lisp/image-dired-tests.el @@ -1,6 +1,6 @@ ;;; image-dired-tests.el --- Tests for image-dired.el -*- lexical-binding: t -*- -;; Copyright (C) 2021 Free Software Foundation, Inc. +;; Copyright (C) 2021-2022 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/info-tests.el b/test/lisp/info-tests.el index 3e2aa3e089..11ac25555d 100644 --- a/test/lisp/info-tests.el +++ b/test/lisp/info-tests.el @@ -1,6 +1,6 @@ ;;; info-tests.el --- Tests for info.el -*- lexical-binding: t; -*- -;; Copyright (C) 2021 Free Software Foundation, Inc. +;; Copyright (C) 2021-2022 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/mh-e/mh-thread-tests.el b/test/lisp/mh-e/mh-thread-tests.el index 4f09677e53..84f59e5d30 100644 --- a/test/lisp/mh-e/mh-thread-tests.el +++ b/test/lisp/mh-e/mh-thread-tests.el @@ -1,6 +1,6 @@ ;;; mh-thread-tests.el --- tests for mh-thread.el -*- lexical-binding: t -*- -;; Copyright (C) 2021 Free Software Foundation, Inc. +;; Copyright (C) 2021-2022 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/progmodes/bug-reference-tests.el b/test/lisp/progmodes/bug-reference-tests.el index 7a3ab5fbda..fa06d7a1cd 100644 --- a/test/lisp/progmodes/bug-reference-tests.el +++ b/test/lisp/progmodes/bug-reference-tests.el @@ -1,6 +1,6 @@ ;;; bug-reference-tests.el --- Tests for bug-reference.el -*- lexical-binding: t; -*- -;; Copyright (C) 2021 Free Software Foundation, Inc. +;; Copyright (C) 2021-2022 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/textmodes/texinfo-tests.el b/test/lisp/textmodes/texinfo-tests.el index fa0c4de005..48cc5fece2 100644 --- a/test/lisp/textmodes/texinfo-tests.el +++ b/test/lisp/textmodes/texinfo-tests.el @@ -1,6 +1,6 @@ ;;; texinfo-tests.el --- Tests for texinfo.el -*- lexical-binding: t; -*- -;; Copyright (C) 2021 Free Software Foundation, Inc. +;; Copyright (C) 2021-2022 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/vc/vc-git-tests.el b/test/lisp/vc/vc-git-tests.el index 997ab3c4b5..dc9641ed46 100644 --- a/test/lisp/vc/vc-git-tests.el +++ b/test/lisp/vc/vc-git-tests.el @@ -1,6 +1,6 @@ ;;; vc-git-tests.el --- tests for vc/vc-git.el -*- lexical-binding:t -*- -;; Copyright (C) 2016-2021 Free Software Foundation, Inc. +;; Copyright (C) 2016-2022 Free Software Foundation, Inc. ;; Author: Justin Schell ;; Maintainer: emacs-devel@gnu.org diff --git a/test/src/image-tests.el b/test/src/image-tests.el index e54d0df71f..3885981e0b 100644 --- a/test/src/image-tests.el +++ b/test/src/image-tests.el @@ -1,6 +1,6 @@ ;;; image-tests.el --- Tests for image.c -*- lexical-binding: t -*- -;; Copyright (C) 2021 Free Software Foundation, Inc. +;; Copyright (C) 2021-2022 Free Software Foundation, Inc. ;; Author: Stefan Kangas diff --git a/test/src/sqlite-tests.el b/test/src/sqlite-tests.el index d7100537a4..6e44300f3a 100644 --- a/test/src/sqlite-tests.el +++ b/test/src/sqlite-tests.el @@ -1,6 +1,6 @@ ;;; sqlite-tests.el --- Tests for sqlite.el -*- lexical-binding: t; -*- -;; Copyright (C) 2021 Free Software Foundation, Inc. +;; Copyright (C) 2021-2022 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. commit dcd76bd48df678d8234b904d7b13c997228519a3 Merge: 84a8f656d3 836be7a112 Author: Eli Zaretskii Date: Sat Jan 1 07:03:03 2022 -0500 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 commit 84a8f656d344cc69bce3a922b99182896a4e1285 Merge: 4dce09db18 8a08af20a8 Author: Eli Zaretskii Date: Sat Jan 1 06:51:57 2022 -0500 ; Merge from origin/emacs-28 The following commit was skipped: 8a08af20a8 ; Auto-commit of loaddefs files. commit 836be7a112191cac8abd187e337c477ff5f05037 Author: Eli Zaretskii Date: Sat Jan 1 13:43:00 2022 +0200 ; * etc/refcards/ru-refcard.tex: Update Copyright year. diff --git a/etc/refcards/ru-refcard.tex b/etc/refcards/ru-refcard.tex index fccf10d825..001bd7d216 100644 --- a/etc/refcards/ru-refcard.tex +++ b/etc/refcards/ru-refcard.tex @@ -41,7 +41,7 @@ \setlength{\ColThreeWidth}{25mm} \newcommand{\versionemacs}[0]{28} % version of Emacs this is for -\newcommand{\cyear}[0]{2021} % copyright year +\newcommand{\cyear}[0]{2022} % copyright year \newcommand\shortcopyrightnotice[0]{\vskip 1ex plus 2 fill \centerline{\footnotesize \copyright\ \cyear\ Free Software Foundation, Inc. commit 4dce09db18a6f1a0e3d8a4b6f55b694af1a218ad Author: Po Lu Date: Sat Jan 1 19:33:01 2022 +0800 Increase size of precision scrolling momentum ring * lisp/pixel-scroll.el (pixel-scroll-precision-initial-velocity-factor): Fix calculation of last timestamp. (pixel-scroll-precision): (pixel-scroll-kinetic-state): (pixel-scroll-accumulate-velocity): (pixel-scroll-start-momentum): (pixel-scroll-calculate-velocity): Increase default ring size to 30. diff --git a/lisp/pixel-scroll.el b/lisp/pixel-scroll.el index e3a1729521..d54cbfdb05 100644 --- a/lisp/pixel-scroll.el +++ b/lisp/pixel-scroll.el @@ -150,7 +150,7 @@ This is only effective if supported by your mouse or touchpad." :type 'float :version "29.1") -(defcustom pixel-scroll-precision-initial-velocity-factor 0.25 +(defcustom pixel-scroll-precision-initial-velocity-factor (/ 0.0335 4) "Factor applied to the initial velocity before momentum scrolling begins." :group 'mouse :type 'float @@ -662,7 +662,7 @@ wheel." (ring-empty-p ring))))) (progn (let ((kin-state (pixel-scroll-kinetic-state))) - (aset kin-state 0 (make-ring 10)) + (aset kin-state 0 (make-ring 30)) (aset kin-state 1 nil)) (pixel-scroll-precision-interpolate delta)) (condition-case nil @@ -683,7 +683,7 @@ wheel." It is a vector of the form [ VELOCITY TIME SIGN ]." (or (window-parameter nil 'kinetic-state) (set-window-parameter nil 'kinetic-state - (vector (make-ring 10) nil nil)))) + (vector (make-ring 30) nil nil)))) (defun pixel-scroll-accumulate-velocity (delta) "Accumulate DELTA into the current window's kinetic scroll state." @@ -694,7 +694,7 @@ It is a vector of the form [ VELOCITY TIME SIGN ]." (and (not (ring-empty-p ring)) (not (eq (< delta 0) (aref state 2))))) - (aset state 0 (make-ring 10))) + (aset state 0 (make-ring 30))) (aset state 2 (< delta 0)) (ring-insert (aref state 0) (cons (aset state 1 (float-time)) @@ -707,8 +707,8 @@ It is a vector of the form [ VELOCITY TIME SIGN ]." (total 0)) (dolist (tem elts) (setq total (+ total (cdr tem)))) - (/ total (* (- (float-time) (caar elts)) - 100)))) + (* (/ total (- (float-time) (caar (last elts)))) + pixel-scroll-precision-initial-velocity-factor))) (defun pixel-scroll-start-momentum (event) "Start kinetic scrolling for the touch event EVENT." @@ -720,45 +720,49 @@ It is a vector of the form [ VELOCITY TIME SIGN ]." (setq state (pixel-scroll-kinetic-state)) (when (and (aref state 1) (listp (aref state 0))) - (while-no-input - (unwind-protect (progn - (aset state 0 (pixel-scroll-calculate-velocity state)) - (when (> (abs (aref state 0)) - pixel-scroll-precision-momentum-min-velocity) - (let* ((velocity (* (aref state 0) - pixel-scroll-precision-initial-velocity-factor)) - (original-velocity velocity) - (time-spent 0)) - (if (> velocity 0) - (while (and (> velocity 0) + (condition-case nil + (while-no-input + (unwind-protect (progn + (aset state 0 (pixel-scroll-calculate-velocity state)) + (when (> (abs (aref state 0)) + pixel-scroll-precision-momentum-min-velocity) + (let* ((velocity (aref state 0)) + (original-velocity velocity) + (time-spent 0)) + (if (> velocity 0) + (while (and (> velocity 0) + (<= time-spent + pixel-scroll-precision-momentum-seconds)) + (when (> (round velocity) 0) + (pixel-scroll-precision-scroll-up (round velocity))) + (setq velocity (- velocity + (/ original-velocity + (/ pixel-scroll-precision-momentum-seconds + pixel-scroll-precision-momentum-tick)))) + (redisplay t) + (sit-for pixel-scroll-precision-momentum-tick) + (setq time-spent (+ time-spent + pixel-scroll-precision-momentum-tick)))) + (while (and (< velocity 0) (<= time-spent pixel-scroll-precision-momentum-seconds)) - (when (> (round velocity) 0) - (pixel-scroll-precision-scroll-up (round velocity))) - (setq velocity (- velocity - (/ original-velocity + (when (> (round (abs velocity)) 0) + (pixel-scroll-precision-scroll-down (round + (abs velocity)))) + (setq velocity (+ velocity + (/ (abs original-velocity) (/ pixel-scroll-precision-momentum-seconds pixel-scroll-precision-momentum-tick)))) (redisplay t) (sit-for pixel-scroll-precision-momentum-tick) (setq time-spent (+ time-spent - pixel-scroll-precision-momentum-tick)))) - (while (and (< velocity 0) - (<= time-spent - pixel-scroll-precision-momentum-seconds)) - (when (> (round (abs velocity)) 0) - (pixel-scroll-precision-scroll-down (round - (abs velocity)))) - (setq velocity (+ velocity - (/ (abs original-velocity) - (/ pixel-scroll-precision-momentum-seconds - pixel-scroll-precision-momentum-tick)))) - (redisplay t) - (sit-for pixel-scroll-precision-momentum-tick) - (setq time-spent (+ time-spent - pixel-scroll-precision-momentum-tick)))))) - (aset state 0 (make-ring 10)) - (aset state 1 nil)))))))) + pixel-scroll-precision-momentum-tick)))))) + (aset state 0 (make-ring 30)) + (aset state 1 nil))) + (beginning-of-buffer + (message (error-message-string '(beginning-of-buffer)))) + (end-of-buffer + (message (error-message-string '(end-of-buffer)))))))))) (defun pixel-scroll-interpolate-down () "Interpolate a scroll downwards by one page." commit 86cbc6ee4a07bf4cfb99d6c0163ec61ac29f2524 Author: Michael Albinus Date: Sat Jan 1 12:22:15 2022 +0100 * lisp/net/tramp-sh.el: Adapt copyright year diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 226f96619a..b3694a6a8d 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -739,7 +739,7 @@ characters need to be doubled.") (defconst tramp-perl-encode "%p -e ' # This script contributed by Juanma Barranquero . -# Copyright (C) 2002-2021 Free Software Foundation, Inc. +# Copyright (C) 2002-2022 Free Software Foundation, Inc. use strict; my %%trans = do { @@ -778,7 +778,7 @@ characters need to be doubled.") (defconst tramp-perl-decode "%p -e ' # This script contributed by Juanma Barranquero . -# Copyright (C) 2002-2021 Free Software Foundation, Inc. +# Copyright (C) 2002-2022 Free Software Foundation, Inc. use strict; my %%trans = do { commit ebe8772f657c6fb393254ee87ae188ee93c9bb9b Author: Eli Zaretskii Date: Sat Jan 1 13:01:44 2022 +0200 ; Minor fixes related to copyright years * admin/notes/years: Advise redirecting output of update-copyright to a file. * etc/refcards/gnus-refcard.tex (Copyright): Update years. diff --git a/admin/notes/years b/admin/notes/years index 19c72c3918..4f1d29ef02 100644 --- a/admin/notes/years +++ b/admin/notes/years @@ -3,7 +3,9 @@ HOW TO MAINTAIN COPYRIGHT YEARS FOR GNU EMACS Maintaining copyright years is now very simple: every time a new year rolls around, add that year to every FSF (and AIST) copyright notice. Do this by running the 'admin/update-copyright' script on a fresh repo -checkout. Inspect the results for plausibility, then commit them. +checkout, redirecting its output to a file, so that you could later +examine the files that don't have copyright notices. Inspect the +results for plausibility, then commit them. You should also run the etags test suite in test/manual/etags/. It will most probably fail because the contents of the test files changes diff --git a/etc/refcards/gnus-refcard.tex b/etc/refcards/gnus-refcard.tex index 4a1760c1b2..93191f23af 100644 --- a/etc/refcards/gnus-refcard.tex +++ b/etc/refcards/gnus-refcard.tex @@ -120,7 +120,7 @@ %% Gnus logo by Luis Fernandes. \newcommand{\Copyright}{% \begin{center} - Copyright \copyright\ 1995, 2000, 2002--2021 Free Software Foundation, Inc.\\* + Copyright \copyright\ 1995, 2000, 2002--2022 Free Software Foundation, Inc.\\* \end{center} Released under the terms of the GNU General Public License version 3 or later. commit 748e670d5dc841824b42ccf83f5b8fd75bd20b81 Author: Po Lu Date: Sat Jan 1 10:29:44 2022 +0000 Make last change compile * src/haiku_support.cc (EmacsShow): Fix last change. (TearDownDoubleBuffering): Likewise. (Draw): Draw normally if not double buffered even if shown_flag is true. diff --git a/src/haiku_support.cc b/src/haiku_support.cc index e1aaf83568..b89a08663a 100644 --- a/src/haiku_support.cc +++ b/src/haiku_support.cc @@ -739,7 +739,7 @@ class EmacsWindow : public BWindow was_shown_p = true; } - if (this->parent && offscreen_draw_view) + if (this->parent) shown_flag = 1; Show (); if (this->parent) @@ -994,8 +994,6 @@ class EmacsView : public BView offscreen_draw_view = NULL; delete offscreen_draw_bitmap_1; offscreen_draw_bitmap_1 = NULL; - - shown_flag = 0; } } @@ -1058,7 +1056,7 @@ class EmacsView : public BView return; } - if (w->shown_flag) + if (w->shown_flag && offscreen_draw_view) { PushState (); SetDrawingMode (B_OP_ERASE); commit 141a06334ecd92286b731125589832f161f03e11 Author: Po Lu Date: Sat Jan 1 10:24:38 2022 +0000 Fix expose events in non-double-buffered child frames on Haiku * src/haiku_support.cc (EmacsShow): Set shown_flag to 1 only if this view is double buffered. (TearDownDoubleBuffering): Clear shown_flag. diff --git a/src/haiku_support.cc b/src/haiku_support.cc index 6a270d338a..e1aaf83568 100644 --- a/src/haiku_support.cc +++ b/src/haiku_support.cc @@ -739,7 +739,7 @@ class EmacsWindow : public BWindow was_shown_p = true; } - if (this->parent) + if (this->parent && offscreen_draw_view) shown_flag = 1; Show (); if (this->parent) @@ -994,6 +994,8 @@ class EmacsView : public BView offscreen_draw_view = NULL; delete offscreen_draw_bitmap_1; offscreen_draw_bitmap_1 = NULL; + + shown_flag = 0; } } commit 23c1ee69892256dab0920ff7f955b34d8970b326 Author: Eli Zaretskii Date: Sat Jan 1 05:19:17 2022 -0500 ; * test/manual/etags/ETAGS.good_N: Adjust to copyright years change. diff --git a/test/manual/etags/ETAGS.good_1 b/test/manual/etags/ETAGS.good_1 index 4eae68b5c2..1b4f80ceaa 100644 --- a/test/manual/etags/ETAGS.good_1 +++ b/test/manual/etags/ETAGS.good_1 @@ -2202,73 +2202,73 @@ el-src/emacs/lisp/progmodes/etags.el,5069 (defun visit-tags-table-buffer 543,22204 (defun tags-reset-tags-tables 712,28514 (defun file-of-tag 731,29171 -(defun tags-table-files 740,29520 -(defun tags-included-tables 749,29870 -(defun tags-completion-table 755,30116 -(defun tags-lazy-completion-table 783,31310 -(defun tags-completion-at-point-function 799,31945 -(defun find-tag-tag 818,32695 -(defvar last-tag 837,33368 -(defun find-tag-interactive 840,33427 -(defvar find-tag-history 852,33842 -(defun find-tag-noselect 860,34012 -(defun find-tag 932,37126 -(defun find-tag-other-window 959,38342 -(defun find-tag-other-frame 1000,40270 -(defun find-tag-regexp 1025,41444 -(defalias 'pop-tag-mark pop-tag-mark1049,42606 -(defvar tag-lines-already-matched 1052,42657 -(defun find-tag-in-order 1055,42764 -(defun tag-find-file-of-tag-noselect 1167,47110 -(defun tag-find-file-of-tag 1200,48956 -(defun etags-recognize-tags-table 1208,49182 -(defun etags-verify-tags-table 1241,50813 -(defun etags-file-of-tag 1246,51011 -(defun etags-tags-completion-table 1256,51346 -(defun etags-snarf-tag 1286,52552 -(defun etags-goto-tag-location 1324,54121 -(defun etags-list-tags 1388,56564 -(defmacro tags-with-face 1423,57839 -(defun etags-tags-apropos-additional 1431,58172 -(defun etags-tags-apropos 1465,59409 -(defun etags-tags-table-files 1527,61618 -(defun etags-tags-included-tables 1542,62054 -(defun tags-recognize-empty-tags-table 1559,62594 -(defun tag-exact-file-name-match-p 1587,63740 -(defun tag-file-name-match-p 1596,64133 -(defun tag-exact-match-p 1609,64689 -(defun tag-implicit-name-match-p 1620,65257 -(defun tag-symbol-match-p 1633,65857 -(defun tag-word-match-p 1643,66293 -(defun tag-partial-file-name-match-p 1652,66691 -(defun tag-any-match-p 1662,67135 -(defun tag-re-match-p 1667,67319 -(defcustom tags-loop-revert-buffers 1675,67568 -(defun next-file 1685,67977 -(defvar tags-loop-operate 1760,70891 -(defvar tags-loop-scan1763,70985 -(defun tags-loop-eval 1771,71314 -(defun tags-loop-continue 1782,71643 -(defun tags-search 1850,73949 -(defun tags-query-replace 1871,74775 -(defun tags-complete-tags-table-file 1896,75999 -(defun list-tags 1906,76378 -(defun tags-apropos 1934,77331 -(define-button-type 'tags-select-tags-tabletags-select-tags-table1957,78157 -(defun select-tags-table 1964,78396 -(defvar select-tags-table-mode-map 2019,80523 -(define-derived-mode select-tags-table-mode 2030,80906 -(defun select-tags-table-select 2034,81090 -(defun select-tags-table-quit 2043,81456 -(defun complete-tag 2049,81611 -(defconst etags--xref-limit 2074,82552 -(defvar etags-xref-find-definitions-tag-order 2076,82587 -(defun etags-xref-find 2082,82877 -(defun etags--xref-find-definitions 2096,83406 -(defclass xref-etags-location 2129,85120 -(defun xref-make-etags-location 2135,85343 -(cl-defmethod xref-location-marker 2139,85498 -(cl-defmethod xref-location-line 2146,85742 +(defun tags-table-files 740,29521 +(defun tags-included-tables 749,29871 +(defun tags-completion-table 755,30117 +(defun tags-lazy-completion-table 783,31311 +(defun tags-completion-at-point-function 799,31946 +(defun find-tag-tag 818,32696 +(defvar last-tag 837,33369 +(defun find-tag-interactive 840,33428 +(defvar find-tag-history 852,33843 +(defun find-tag-noselect 860,34013 +(defun find-tag 932,37127 +(defun find-tag-other-window 959,38343 +(defun find-tag-other-frame 1000,40271 +(defun find-tag-regexp 1025,41445 +(defalias 'pop-tag-mark pop-tag-mark1049,42607 +(defvar tag-lines-already-matched 1052,42658 +(defun find-tag-in-order 1055,42765 +(defun tag-find-file-of-tag-noselect 1167,47111 +(defun tag-find-file-of-tag 1200,48957 +(defun etags-recognize-tags-table 1208,49183 +(defun etags-verify-tags-table 1241,50814 +(defun etags-file-of-tag 1246,51012 +(defun etags-tags-completion-table 1256,51347 +(defun etags-snarf-tag 1286,52553 +(defun etags-goto-tag-location 1324,54122 +(defun etags-list-tags 1388,56565 +(defmacro tags-with-face 1423,57840 +(defun etags-tags-apropos-additional 1431,58173 +(defun etags-tags-apropos 1465,59410 +(defun etags-tags-table-files 1527,61619 +(defun etags-tags-included-tables 1542,62055 +(defun tags-recognize-empty-tags-table 1559,62595 +(defun tag-exact-file-name-match-p 1587,63741 +(defun tag-file-name-match-p 1596,64134 +(defun tag-exact-match-p 1609,64690 +(defun tag-implicit-name-match-p 1620,65258 +(defun tag-symbol-match-p 1633,65858 +(defun tag-word-match-p 1643,66294 +(defun tag-partial-file-name-match-p 1652,66692 +(defun tag-any-match-p 1662,67136 +(defun tag-re-match-p 1667,67320 +(defcustom tags-loop-revert-buffers 1675,67569 +(defun next-file 1685,67978 +(defvar tags-loop-operate 1760,70892 +(defvar tags-loop-scan1763,70986 +(defun tags-loop-eval 1771,71315 +(defun tags-loop-continue 1782,71644 +(defun tags-search 1850,73950 +(defun tags-query-replace 1871,74776 +(defun tags-complete-tags-table-file 1896,76000 +(defun list-tags 1906,76379 +(defun tags-apropos 1934,77332 +(define-button-type 'tags-select-tags-tabletags-select-tags-table1957,78158 +(defun select-tags-table 1964,78397 +(defvar select-tags-table-mode-map 2019,80524 +(define-derived-mode select-tags-table-mode 2030,80907 +(defun select-tags-table-select 2034,81091 +(defun select-tags-table-quit 2043,81457 +(defun complete-tag 2049,81612 +(defconst etags--xref-limit 2074,82553 +(defvar etags-xref-find-definitions-tag-order 2076,82588 +(defun etags-xref-find 2082,82878 +(defun etags--xref-find-definitions 2096,83407 +(defclass xref-etags-location 2129,85121 +(defun xref-make-etags-location 2135,85344 +(cl-defmethod xref-location-marker 2139,85499 +(cl-defmethod xref-location-line 2146,85743 erl-src/gs_dialog.erl,98 -define(VERSION2,32 diff --git a/test/manual/etags/ETAGS.good_2 b/test/manual/etags/ETAGS.good_2 index 45979d6a76..124aa7fc1c 100644 --- a/test/manual/etags/ETAGS.good_2 +++ b/test/manual/etags/ETAGS.good_2 @@ -2771,76 +2771,76 @@ el-src/emacs/lisp/progmodes/etags.el,5188 (defun visit-tags-table-buffer 543,22204 (defun tags-reset-tags-tables 712,28514 (defun file-of-tag 731,29171 -(defun tags-table-files 740,29520 -(defun tags-included-tables 749,29870 -(defun tags-completion-table 755,30116 -(defun tags-lazy-completion-table 783,31310 -(defun tags-completion-at-point-function 799,31945 -(defun find-tag-tag 818,32695 -(defvar last-tag 837,33368 -(defun find-tag-interactive 840,33427 -(defvar find-tag-history 852,33842 -(defvar etags-case-fold-search)855,33907 -(defvar etags-syntax-table)856,33939 -(defvar local-find-tag-hook)857,33967 -(defun find-tag-noselect 860,34012 -(defun find-tag 932,37126 -(defun find-tag-other-window 959,38342 -(defun find-tag-other-frame 1000,40270 -(defun find-tag-regexp 1025,41444 -(defalias 'pop-tag-mark pop-tag-mark1049,42606 -(defvar tag-lines-already-matched 1052,42657 -(defun find-tag-in-order 1055,42764 -(defun tag-find-file-of-tag-noselect 1167,47110 -(defun tag-find-file-of-tag 1200,48956 -(defun etags-recognize-tags-table 1208,49182 -(defun etags-verify-tags-table 1241,50813 -(defun etags-file-of-tag 1246,51011 -(defun etags-tags-completion-table 1256,51346 -(defun etags-snarf-tag 1286,52552 -(defun etags-goto-tag-location 1324,54121 -(defun etags-list-tags 1388,56564 -(defmacro tags-with-face 1423,57839 -(defun etags-tags-apropos-additional 1431,58172 -(defun etags-tags-apropos 1465,59409 -(defun etags-tags-table-files 1527,61618 -(defun etags-tags-included-tables 1542,62054 -(defun tags-recognize-empty-tags-table 1559,62594 -(defun tag-exact-file-name-match-p 1587,63740 -(defun tag-file-name-match-p 1596,64133 -(defun tag-exact-match-p 1609,64689 -(defun tag-implicit-name-match-p 1620,65257 -(defun tag-symbol-match-p 1633,65857 -(defun tag-word-match-p 1643,66293 -(defun tag-partial-file-name-match-p 1652,66691 -(defun tag-any-match-p 1662,67135 -(defun tag-re-match-p 1667,67319 -(defcustom tags-loop-revert-buffers 1675,67568 -(defun next-file 1685,67977 -(defvar tags-loop-operate 1760,70891 -(defvar tags-loop-scan1763,70985 -(defun tags-loop-eval 1771,71314 -(defun tags-loop-continue 1782,71643 -(defun tags-search 1850,73949 -(defun tags-query-replace 1871,74775 -(defun tags-complete-tags-table-file 1896,75999 -(defun list-tags 1906,76378 -(defun tags-apropos 1934,77331 -(define-button-type 'tags-select-tags-tabletags-select-tags-table1957,78157 -(defun select-tags-table 1964,78396 -(defvar select-tags-table-mode-map 2019,80523 -(define-derived-mode select-tags-table-mode 2030,80906 -(defun select-tags-table-select 2034,81090 -(defun select-tags-table-quit 2043,81456 -(defun complete-tag 2049,81611 -(defconst etags--xref-limit 2074,82552 -(defvar etags-xref-find-definitions-tag-order 2076,82587 -(defun etags-xref-find 2082,82877 -(defun etags--xref-find-definitions 2096,83406 -(defclass xref-etags-location 2129,85120 -(defun xref-make-etags-location 2135,85343 -(cl-defmethod xref-location-marker 2139,85498 -(cl-defmethod xref-location-line 2146,85742 +(defun tags-table-files 740,29521 +(defun tags-included-tables 749,29871 +(defun tags-completion-table 755,30117 +(defun tags-lazy-completion-table 783,31311 +(defun tags-completion-at-point-function 799,31946 +(defun find-tag-tag 818,32696 +(defvar last-tag 837,33369 +(defun find-tag-interactive 840,33428 +(defvar find-tag-history 852,33843 +(defvar etags-case-fold-search)855,33908 +(defvar etags-syntax-table)856,33940 +(defvar local-find-tag-hook)857,33968 +(defun find-tag-noselect 860,34013 +(defun find-tag 932,37127 +(defun find-tag-other-window 959,38343 +(defun find-tag-other-frame 1000,40271 +(defun find-tag-regexp 1025,41445 +(defalias 'pop-tag-mark pop-tag-mark1049,42607 +(defvar tag-lines-already-matched 1052,42658 +(defun find-tag-in-order 1055,42765 +(defun tag-find-file-of-tag-noselect 1167,47111 +(defun tag-find-file-of-tag 1200,48957 +(defun etags-recognize-tags-table 1208,49183 +(defun etags-verify-tags-table 1241,50814 +(defun etags-file-of-tag 1246,51012 +(defun etags-tags-completion-table 1256,51347 +(defun etags-snarf-tag 1286,52553 +(defun etags-goto-tag-location 1324,54122 +(defun etags-list-tags 1388,56565 +(defmacro tags-with-face 1423,57840 +(defun etags-tags-apropos-additional 1431,58173 +(defun etags-tags-apropos 1465,59410 +(defun etags-tags-table-files 1527,61619 +(defun etags-tags-included-tables 1542,62055 +(defun tags-recognize-empty-tags-table 1559,62595 +(defun tag-exact-file-name-match-p 1587,63741 +(defun tag-file-name-match-p 1596,64134 +(defun tag-exact-match-p 1609,64690 +(defun tag-implicit-name-match-p 1620,65258 +(defun tag-symbol-match-p 1633,65858 +(defun tag-word-match-p 1643,66294 +(defun tag-partial-file-name-match-p 1652,66692 +(defun tag-any-match-p 1662,67136 +(defun tag-re-match-p 1667,67320 +(defcustom tags-loop-revert-buffers 1675,67569 +(defun next-file 1685,67978 +(defvar tags-loop-operate 1760,70892 +(defvar tags-loop-scan1763,70986 +(defun tags-loop-eval 1771,71315 +(defun tags-loop-continue 1782,71644 +(defun tags-search 1850,73950 +(defun tags-query-replace 1871,74776 +(defun tags-complete-tags-table-file 1896,76000 +(defun list-tags 1906,76379 +(defun tags-apropos 1934,77332 +(define-button-type 'tags-select-tags-tabletags-select-tags-table1957,78158 +(defun select-tags-table 1964,78397 +(defvar select-tags-table-mode-map 2019,80524 +(define-derived-mode select-tags-table-mode 2030,80907 +(defun select-tags-table-select 2034,81091 +(defun select-tags-table-quit 2043,81457 +(defun complete-tag 2049,81612 +(defconst etags--xref-limit 2074,82553 +(defvar etags-xref-find-definitions-tag-order 2076,82588 +(defun etags-xref-find 2082,82878 +(defun etags--xref-find-definitions 2096,83407 +(defclass xref-etags-location 2129,85121 +(defun xref-make-etags-location 2135,85344 +(cl-defmethod xref-location-marker 2139,85499 +(cl-defmethod xref-location-line 2146,85743 erl-src/gs_dialog.erl,98 -define(VERSION2,32 diff --git a/test/manual/etags/ETAGS.good_3 b/test/manual/etags/ETAGS.good_3 index 36edc38961..9dca0084de 100644 --- a/test/manual/etags/ETAGS.good_3 +++ b/test/manual/etags/ETAGS.good_3 @@ -2579,73 +2579,73 @@ el-src/emacs/lisp/progmodes/etags.el,5069 (defun visit-tags-table-buffer 543,22204 (defun tags-reset-tags-tables 712,28514 (defun file-of-tag 731,29171 -(defun tags-table-files 740,29520 -(defun tags-included-tables 749,29870 -(defun tags-completion-table 755,30116 -(defun tags-lazy-completion-table 783,31310 -(defun tags-completion-at-point-function 799,31945 -(defun find-tag-tag 818,32695 -(defvar last-tag 837,33368 -(defun find-tag-interactive 840,33427 -(defvar find-tag-history 852,33842 -(defun find-tag-noselect 860,34012 -(defun find-tag 932,37126 -(defun find-tag-other-window 959,38342 -(defun find-tag-other-frame 1000,40270 -(defun find-tag-regexp 1025,41444 -(defalias 'pop-tag-mark pop-tag-mark1049,42606 -(defvar tag-lines-already-matched 1052,42657 -(defun find-tag-in-order 1055,42764 -(defun tag-find-file-of-tag-noselect 1167,47110 -(defun tag-find-file-of-tag 1200,48956 -(defun etags-recognize-tags-table 1208,49182 -(defun etags-verify-tags-table 1241,50813 -(defun etags-file-of-tag 1246,51011 -(defun etags-tags-completion-table 1256,51346 -(defun etags-snarf-tag 1286,52552 -(defun etags-goto-tag-location 1324,54121 -(defun etags-list-tags 1388,56564 -(defmacro tags-with-face 1423,57839 -(defun etags-tags-apropos-additional 1431,58172 -(defun etags-tags-apropos 1465,59409 -(defun etags-tags-table-files 1527,61618 -(defun etags-tags-included-tables 1542,62054 -(defun tags-recognize-empty-tags-table 1559,62594 -(defun tag-exact-file-name-match-p 1587,63740 -(defun tag-file-name-match-p 1596,64133 -(defun tag-exact-match-p 1609,64689 -(defun tag-implicit-name-match-p 1620,65257 -(defun tag-symbol-match-p 1633,65857 -(defun tag-word-match-p 1643,66293 -(defun tag-partial-file-name-match-p 1652,66691 -(defun tag-any-match-p 1662,67135 -(defun tag-re-match-p 1667,67319 -(defcustom tags-loop-revert-buffers 1675,67568 -(defun next-file 1685,67977 -(defvar tags-loop-operate 1760,70891 -(defvar tags-loop-scan1763,70985 -(defun tags-loop-eval 1771,71314 -(defun tags-loop-continue 1782,71643 -(defun tags-search 1850,73949 -(defun tags-query-replace 1871,74775 -(defun tags-complete-tags-table-file 1896,75999 -(defun list-tags 1906,76378 -(defun tags-apropos 1934,77331 -(define-button-type 'tags-select-tags-tabletags-select-tags-table1957,78157 -(defun select-tags-table 1964,78396 -(defvar select-tags-table-mode-map 2019,80523 -(define-derived-mode select-tags-table-mode 2030,80906 -(defun select-tags-table-select 2034,81090 -(defun select-tags-table-quit 2043,81456 -(defun complete-tag 2049,81611 -(defconst etags--xref-limit 2074,82552 -(defvar etags-xref-find-definitions-tag-order 2076,82587 -(defun etags-xref-find 2082,82877 -(defun etags--xref-find-definitions 2096,83406 -(defclass xref-etags-location 2129,85120 -(defun xref-make-etags-location 2135,85343 -(cl-defmethod xref-location-marker 2139,85498 -(cl-defmethod xref-location-line 2146,85742 +(defun tags-table-files 740,29521 +(defun tags-included-tables 749,29871 +(defun tags-completion-table 755,30117 +(defun tags-lazy-completion-table 783,31311 +(defun tags-completion-at-point-function 799,31946 +(defun find-tag-tag 818,32696 +(defvar last-tag 837,33369 +(defun find-tag-interactive 840,33428 +(defvar find-tag-history 852,33843 +(defun find-tag-noselect 860,34013 +(defun find-tag 932,37127 +(defun find-tag-other-window 959,38343 +(defun find-tag-other-frame 1000,40271 +(defun find-tag-regexp 1025,41445 +(defalias 'pop-tag-mark pop-tag-mark1049,42607 +(defvar tag-lines-already-matched 1052,42658 +(defun find-tag-in-order 1055,42765 +(defun tag-find-file-of-tag-noselect 1167,47111 +(defun tag-find-file-of-tag 1200,48957 +(defun etags-recognize-tags-table 1208,49183 +(defun etags-verify-tags-table 1241,50814 +(defun etags-file-of-tag 1246,51012 +(defun etags-tags-completion-table 1256,51347 +(defun etags-snarf-tag 1286,52553 +(defun etags-goto-tag-location 1324,54122 +(defun etags-list-tags 1388,56565 +(defmacro tags-with-face 1423,57840 +(defun etags-tags-apropos-additional 1431,58173 +(defun etags-tags-apropos 1465,59410 +(defun etags-tags-table-files 1527,61619 +(defun etags-tags-included-tables 1542,62055 +(defun tags-recognize-empty-tags-table 1559,62595 +(defun tag-exact-file-name-match-p 1587,63741 +(defun tag-file-name-match-p 1596,64134 +(defun tag-exact-match-p 1609,64690 +(defun tag-implicit-name-match-p 1620,65258 +(defun tag-symbol-match-p 1633,65858 +(defun tag-word-match-p 1643,66294 +(defun tag-partial-file-name-match-p 1652,66692 +(defun tag-any-match-p 1662,67136 +(defun tag-re-match-p 1667,67320 +(defcustom tags-loop-revert-buffers 1675,67569 +(defun next-file 1685,67978 +(defvar tags-loop-operate 1760,70892 +(defvar tags-loop-scan1763,70986 +(defun tags-loop-eval 1771,71315 +(defun tags-loop-continue 1782,71644 +(defun tags-search 1850,73950 +(defun tags-query-replace 1871,74776 +(defun tags-complete-tags-table-file 1896,76000 +(defun list-tags 1906,76379 +(defun tags-apropos 1934,77332 +(define-button-type 'tags-select-tags-tabletags-select-tags-table1957,78158 +(defun select-tags-table 1964,78397 +(defvar select-tags-table-mode-map 2019,80524 +(define-derived-mode select-tags-table-mode 2030,80907 +(defun select-tags-table-select 2034,81091 +(defun select-tags-table-quit 2043,81457 +(defun complete-tag 2049,81612 +(defconst etags--xref-limit 2074,82553 +(defvar etags-xref-find-definitions-tag-order 2076,82588 +(defun etags-xref-find 2082,82878 +(defun etags--xref-find-definitions 2096,83407 +(defclass xref-etags-location 2129,85121 +(defun xref-make-etags-location 2135,85344 +(cl-defmethod xref-location-marker 2139,85499 +(cl-defmethod xref-location-line 2146,85743 erl-src/gs_dialog.erl,98 -define(VERSION2,32 diff --git a/test/manual/etags/ETAGS.good_4 b/test/manual/etags/ETAGS.good_4 index e726a993a9..8527ed726e 100644 --- a/test/manual/etags/ETAGS.good_4 +++ b/test/manual/etags/ETAGS.good_4 @@ -2364,73 +2364,73 @@ el-src/emacs/lisp/progmodes/etags.el,5069 (defun visit-tags-table-buffer 543,22204 (defun tags-reset-tags-tables 712,28514 (defun file-of-tag 731,29171 -(defun tags-table-files 740,29520 -(defun tags-included-tables 749,29870 -(defun tags-completion-table 755,30116 -(defun tags-lazy-completion-table 783,31310 -(defun tags-completion-at-point-function 799,31945 -(defun find-tag-tag 818,32695 -(defvar last-tag 837,33368 -(defun find-tag-interactive 840,33427 -(defvar find-tag-history 852,33842 -(defun find-tag-noselect 860,34012 -(defun find-tag 932,37126 -(defun find-tag-other-window 959,38342 -(defun find-tag-other-frame 1000,40270 -(defun find-tag-regexp 1025,41444 -(defalias 'pop-tag-mark pop-tag-mark1049,42606 -(defvar tag-lines-already-matched 1052,42657 -(defun find-tag-in-order 1055,42764 -(defun tag-find-file-of-tag-noselect 1167,47110 -(defun tag-find-file-of-tag 1200,48956 -(defun etags-recognize-tags-table 1208,49182 -(defun etags-verify-tags-table 1241,50813 -(defun etags-file-of-tag 1246,51011 -(defun etags-tags-completion-table 1256,51346 -(defun etags-snarf-tag 1286,52552 -(defun etags-goto-tag-location 1324,54121 -(defun etags-list-tags 1388,56564 -(defmacro tags-with-face 1423,57839 -(defun etags-tags-apropos-additional 1431,58172 -(defun etags-tags-apropos 1465,59409 -(defun etags-tags-table-files 1527,61618 -(defun etags-tags-included-tables 1542,62054 -(defun tags-recognize-empty-tags-table 1559,62594 -(defun tag-exact-file-name-match-p 1587,63740 -(defun tag-file-name-match-p 1596,64133 -(defun tag-exact-match-p 1609,64689 -(defun tag-implicit-name-match-p 1620,65257 -(defun tag-symbol-match-p 1633,65857 -(defun tag-word-match-p 1643,66293 -(defun tag-partial-file-name-match-p 1652,66691 -(defun tag-any-match-p 1662,67135 -(defun tag-re-match-p 1667,67319 -(defcustom tags-loop-revert-buffers 1675,67568 -(defun next-file 1685,67977 -(defvar tags-loop-operate 1760,70891 -(defvar tags-loop-scan1763,70985 -(defun tags-loop-eval 1771,71314 -(defun tags-loop-continue 1782,71643 -(defun tags-search 1850,73949 -(defun tags-query-replace 1871,74775 -(defun tags-complete-tags-table-file 1896,75999 -(defun list-tags 1906,76378 -(defun tags-apropos 1934,77331 -(define-button-type 'tags-select-tags-tabletags-select-tags-table1957,78157 -(defun select-tags-table 1964,78396 -(defvar select-tags-table-mode-map 2019,80523 -(define-derived-mode select-tags-table-mode 2030,80906 -(defun select-tags-table-select 2034,81090 -(defun select-tags-table-quit 2043,81456 -(defun complete-tag 2049,81611 -(defconst etags--xref-limit 2074,82552 -(defvar etags-xref-find-definitions-tag-order 2076,82587 -(defun etags-xref-find 2082,82877 -(defun etags--xref-find-definitions 2096,83406 -(defclass xref-etags-location 2129,85120 -(defun xref-make-etags-location 2135,85343 -(cl-defmethod xref-location-marker 2139,85498 -(cl-defmethod xref-location-line 2146,85742 +(defun tags-table-files 740,29521 +(defun tags-included-tables 749,29871 +(defun tags-completion-table 755,30117 +(defun tags-lazy-completion-table 783,31311 +(defun tags-completion-at-point-function 799,31946 +(defun find-tag-tag 818,32696 +(defvar last-tag 837,33369 +(defun find-tag-interactive 840,33428 +(defvar find-tag-history 852,33843 +(defun find-tag-noselect 860,34013 +(defun find-tag 932,37127 +(defun find-tag-other-window 959,38343 +(defun find-tag-other-frame 1000,40271 +(defun find-tag-regexp 1025,41445 +(defalias 'pop-tag-mark pop-tag-mark1049,42607 +(defvar tag-lines-already-matched 1052,42658 +(defun find-tag-in-order 1055,42765 +(defun tag-find-file-of-tag-noselect 1167,47111 +(defun tag-find-file-of-tag 1200,48957 +(defun etags-recognize-tags-table 1208,49183 +(defun etags-verify-tags-table 1241,50814 +(defun etags-file-of-tag 1246,51012 +(defun etags-tags-completion-table 1256,51347 +(defun etags-snarf-tag 1286,52553 +(defun etags-goto-tag-location 1324,54122 +(defun etags-list-tags 1388,56565 +(defmacro tags-with-face 1423,57840 +(defun etags-tags-apropos-additional 1431,58173 +(defun etags-tags-apropos 1465,59410 +(defun etags-tags-table-files 1527,61619 +(defun etags-tags-included-tables 1542,62055 +(defun tags-recognize-empty-tags-table 1559,62595 +(defun tag-exact-file-name-match-p 1587,63741 +(defun tag-file-name-match-p 1596,64134 +(defun tag-exact-match-p 1609,64690 +(defun tag-implicit-name-match-p 1620,65258 +(defun tag-symbol-match-p 1633,65858 +(defun tag-word-match-p 1643,66294 +(defun tag-partial-file-name-match-p 1652,66692 +(defun tag-any-match-p 1662,67136 +(defun tag-re-match-p 1667,67320 +(defcustom tags-loop-revert-buffers 1675,67569 +(defun next-file 1685,67978 +(defvar tags-loop-operate 1760,70892 +(defvar tags-loop-scan1763,70986 +(defun tags-loop-eval 1771,71315 +(defun tags-loop-continue 1782,71644 +(defun tags-search 1850,73950 +(defun tags-query-replace 1871,74776 +(defun tags-complete-tags-table-file 1896,76000 +(defun list-tags 1906,76379 +(defun tags-apropos 1934,77332 +(define-button-type 'tags-select-tags-tabletags-select-tags-table1957,78158 +(defun select-tags-table 1964,78397 +(defvar select-tags-table-mode-map 2019,80524 +(define-derived-mode select-tags-table-mode 2030,80907 +(defun select-tags-table-select 2034,81091 +(defun select-tags-table-quit 2043,81457 +(defun complete-tag 2049,81612 +(defconst etags--xref-limit 2074,82553 +(defvar etags-xref-find-definitions-tag-order 2076,82588 +(defun etags-xref-find 2082,82878 +(defun etags--xref-find-definitions 2096,83407 +(defclass xref-etags-location 2129,85121 +(defun xref-make-etags-location 2135,85344 +(cl-defmethod xref-location-marker 2139,85499 +(cl-defmethod xref-location-line 2146,85743 erl-src/gs_dialog.erl,98 -define(VERSION2,32 diff --git a/test/manual/etags/ETAGS.good_5 b/test/manual/etags/ETAGS.good_5 index 5133cc9e2b..6d2e44fbfe 100644 --- a/test/manual/etags/ETAGS.good_5 +++ b/test/manual/etags/ETAGS.good_5 @@ -3310,76 +3310,76 @@ el-src/emacs/lisp/progmodes/etags.el,5188 (defun visit-tags-table-buffer 543,22204 (defun tags-reset-tags-tables 712,28514 (defun file-of-tag 731,29171 -(defun tags-table-files 740,29520 -(defun tags-included-tables 749,29870 -(defun tags-completion-table 755,30116 -(defun tags-lazy-completion-table 783,31310 -(defun tags-completion-at-point-function 799,31945 -(defun find-tag-tag 818,32695 -(defvar last-tag 837,33368 -(defun find-tag-interactive 840,33427 -(defvar find-tag-history 852,33842 -(defvar etags-case-fold-search)855,33907 -(defvar etags-syntax-table)856,33939 -(defvar local-find-tag-hook)857,33967 -(defun find-tag-noselect 860,34012 -(defun find-tag 932,37126 -(defun find-tag-other-window 959,38342 -(defun find-tag-other-frame 1000,40270 -(defun find-tag-regexp 1025,41444 -(defalias 'pop-tag-mark pop-tag-mark1049,42606 -(defvar tag-lines-already-matched 1052,42657 -(defun find-tag-in-order 1055,42764 -(defun tag-find-file-of-tag-noselect 1167,47110 -(defun tag-find-file-of-tag 1200,48956 -(defun etags-recognize-tags-table 1208,49182 -(defun etags-verify-tags-table 1241,50813 -(defun etags-file-of-tag 1246,51011 -(defun etags-tags-completion-table 1256,51346 -(defun etags-snarf-tag 1286,52552 -(defun etags-goto-tag-location 1324,54121 -(defun etags-list-tags 1388,56564 -(defmacro tags-with-face 1423,57839 -(defun etags-tags-apropos-additional 1431,58172 -(defun etags-tags-apropos 1465,59409 -(defun etags-tags-table-files 1527,61618 -(defun etags-tags-included-tables 1542,62054 -(defun tags-recognize-empty-tags-table 1559,62594 -(defun tag-exact-file-name-match-p 1587,63740 -(defun tag-file-name-match-p 1596,64133 -(defun tag-exact-match-p 1609,64689 -(defun tag-implicit-name-match-p 1620,65257 -(defun tag-symbol-match-p 1633,65857 -(defun tag-word-match-p 1643,66293 -(defun tag-partial-file-name-match-p 1652,66691 -(defun tag-any-match-p 1662,67135 -(defun tag-re-match-p 1667,67319 -(defcustom tags-loop-revert-buffers 1675,67568 -(defun next-file 1685,67977 -(defvar tags-loop-operate 1760,70891 -(defvar tags-loop-scan1763,70985 -(defun tags-loop-eval 1771,71314 -(defun tags-loop-continue 1782,71643 -(defun tags-search 1850,73949 -(defun tags-query-replace 1871,74775 -(defun tags-complete-tags-table-file 1896,75999 -(defun list-tags 1906,76378 -(defun tags-apropos 1934,77331 -(define-button-type 'tags-select-tags-tabletags-select-tags-table1957,78157 -(defun select-tags-table 1964,78396 -(defvar select-tags-table-mode-map 2019,80523 -(define-derived-mode select-tags-table-mode 2030,80906 -(defun select-tags-table-select 2034,81090 -(defun select-tags-table-quit 2043,81456 -(defun complete-tag 2049,81611 -(defconst etags--xref-limit 2074,82552 -(defvar etags-xref-find-definitions-tag-order 2076,82587 -(defun etags-xref-find 2082,82877 -(defun etags--xref-find-definitions 2096,83406 -(defclass xref-etags-location 2129,85120 -(defun xref-make-etags-location 2135,85343 -(cl-defmethod xref-location-marker 2139,85498 -(cl-defmethod xref-location-line 2146,85742 +(defun tags-table-files 740,29521 +(defun tags-included-tables 749,29871 +(defun tags-completion-table 755,30117 +(defun tags-lazy-completion-table 783,31311 +(defun tags-completion-at-point-function 799,31946 +(defun find-tag-tag 818,32696 +(defvar last-tag 837,33369 +(defun find-tag-interactive 840,33428 +(defvar find-tag-history 852,33843 +(defvar etags-case-fold-search)855,33908 +(defvar etags-syntax-table)856,33940 +(defvar local-find-tag-hook)857,33968 +(defun find-tag-noselect 860,34013 +(defun find-tag 932,37127 +(defun find-tag-other-window 959,38343 +(defun find-tag-other-frame 1000,40271 +(defun find-tag-regexp 1025,41445 +(defalias 'pop-tag-mark pop-tag-mark1049,42607 +(defvar tag-lines-already-matched 1052,42658 +(defun find-tag-in-order 1055,42765 +(defun tag-find-file-of-tag-noselect 1167,47111 +(defun tag-find-file-of-tag 1200,48957 +(defun etags-recognize-tags-table 1208,49183 +(defun etags-verify-tags-table 1241,50814 +(defun etags-file-of-tag 1246,51012 +(defun etags-tags-completion-table 1256,51347 +(defun etags-snarf-tag 1286,52553 +(defun etags-goto-tag-location 1324,54122 +(defun etags-list-tags 1388,56565 +(defmacro tags-with-face 1423,57840 +(defun etags-tags-apropos-additional 1431,58173 +(defun etags-tags-apropos 1465,59410 +(defun etags-tags-table-files 1527,61619 +(defun etags-tags-included-tables 1542,62055 +(defun tags-recognize-empty-tags-table 1559,62595 +(defun tag-exact-file-name-match-p 1587,63741 +(defun tag-file-name-match-p 1596,64134 +(defun tag-exact-match-p 1609,64690 +(defun tag-implicit-name-match-p 1620,65258 +(defun tag-symbol-match-p 1633,65858 +(defun tag-word-match-p 1643,66294 +(defun tag-partial-file-name-match-p 1652,66692 +(defun tag-any-match-p 1662,67136 +(defun tag-re-match-p 1667,67320 +(defcustom tags-loop-revert-buffers 1675,67569 +(defun next-file 1685,67978 +(defvar tags-loop-operate 1760,70892 +(defvar tags-loop-scan1763,70986 +(defun tags-loop-eval 1771,71315 +(defun tags-loop-continue 1782,71644 +(defun tags-search 1850,73950 +(defun tags-query-replace 1871,74776 +(defun tags-complete-tags-table-file 1896,76000 +(defun list-tags 1906,76379 +(defun tags-apropos 1934,77332 +(define-button-type 'tags-select-tags-tabletags-select-tags-table1957,78158 +(defun select-tags-table 1964,78397 +(defvar select-tags-table-mode-map 2019,80524 +(define-derived-mode select-tags-table-mode 2030,80907 +(defun select-tags-table-select 2034,81091 +(defun select-tags-table-quit 2043,81457 +(defun complete-tag 2049,81612 +(defconst etags--xref-limit 2074,82553 +(defvar etags-xref-find-definitions-tag-order 2076,82588 +(defun etags-xref-find 2082,82878 +(defun etags--xref-find-definitions 2096,83407 +(defclass xref-etags-location 2129,85121 +(defun xref-make-etags-location 2135,85344 +(cl-defmethod xref-location-marker 2139,85499 +(cl-defmethod xref-location-line 2146,85743 erl-src/gs_dialog.erl,98 -define(VERSION2,32 diff --git a/test/manual/etags/ETAGS.good_6 b/test/manual/etags/ETAGS.good_6 index 75047951a8..9a38e20dce 100644 --- a/test/manual/etags/ETAGS.good_6 +++ b/test/manual/etags/ETAGS.good_6 @@ -3310,76 +3310,76 @@ el-src/emacs/lisp/progmodes/etags.el,5188 (defun visit-tags-table-buffer 543,22204 (defun tags-reset-tags-tables 712,28514 (defun file-of-tag 731,29171 -(defun tags-table-files 740,29520 -(defun tags-included-tables 749,29870 -(defun tags-completion-table 755,30116 -(defun tags-lazy-completion-table 783,31310 -(defun tags-completion-at-point-function 799,31945 -(defun find-tag-tag 818,32695 -(defvar last-tag 837,33368 -(defun find-tag-interactive 840,33427 -(defvar find-tag-history 852,33842 -(defvar etags-case-fold-search)855,33907 -(defvar etags-syntax-table)856,33939 -(defvar local-find-tag-hook)857,33967 -(defun find-tag-noselect 860,34012 -(defun find-tag 932,37126 -(defun find-tag-other-window 959,38342 -(defun find-tag-other-frame 1000,40270 -(defun find-tag-regexp 1025,41444 -(defalias 'pop-tag-mark pop-tag-mark1049,42606 -(defvar tag-lines-already-matched 1052,42657 -(defun find-tag-in-order 1055,42764 -(defun tag-find-file-of-tag-noselect 1167,47110 -(defun tag-find-file-of-tag 1200,48956 -(defun etags-recognize-tags-table 1208,49182 -(defun etags-verify-tags-table 1241,50813 -(defun etags-file-of-tag 1246,51011 -(defun etags-tags-completion-table 1256,51346 -(defun etags-snarf-tag 1286,52552 -(defun etags-goto-tag-location 1324,54121 -(defun etags-list-tags 1388,56564 -(defmacro tags-with-face 1423,57839 -(defun etags-tags-apropos-additional 1431,58172 -(defun etags-tags-apropos 1465,59409 -(defun etags-tags-table-files 1527,61618 -(defun etags-tags-included-tables 1542,62054 -(defun tags-recognize-empty-tags-table 1559,62594 -(defun tag-exact-file-name-match-p 1587,63740 -(defun tag-file-name-match-p 1596,64133 -(defun tag-exact-match-p 1609,64689 -(defun tag-implicit-name-match-p 1620,65257 -(defun tag-symbol-match-p 1633,65857 -(defun tag-word-match-p 1643,66293 -(defun tag-partial-file-name-match-p 1652,66691 -(defun tag-any-match-p 1662,67135 -(defun tag-re-match-p 1667,67319 -(defcustom tags-loop-revert-buffers 1675,67568 -(defun next-file 1685,67977 -(defvar tags-loop-operate 1760,70891 -(defvar tags-loop-scan1763,70985 -(defun tags-loop-eval 1771,71314 -(defun tags-loop-continue 1782,71643 -(defun tags-search 1850,73949 -(defun tags-query-replace 1871,74775 -(defun tags-complete-tags-table-file 1896,75999 -(defun list-tags 1906,76378 -(defun tags-apropos 1934,77331 -(define-button-type 'tags-select-tags-tabletags-select-tags-table1957,78157 -(defun select-tags-table 1964,78396 -(defvar select-tags-table-mode-map 2019,80523 -(define-derived-mode select-tags-table-mode 2030,80906 -(defun select-tags-table-select 2034,81090 -(defun select-tags-table-quit 2043,81456 -(defun complete-tag 2049,81611 -(defconst etags--xref-limit 2074,82552 -(defvar etags-xref-find-definitions-tag-order 2076,82587 -(defun etags-xref-find 2082,82877 -(defun etags--xref-find-definitions 2096,83406 -(defclass xref-etags-location 2129,85120 -(defun xref-make-etags-location 2135,85343 -(cl-defmethod xref-location-marker 2139,85498 -(cl-defmethod xref-location-line 2146,85742 +(defun tags-table-files 740,29521 +(defun tags-included-tables 749,29871 +(defun tags-completion-table 755,30117 +(defun tags-lazy-completion-table 783,31311 +(defun tags-completion-at-point-function 799,31946 +(defun find-tag-tag 818,32696 +(defvar last-tag 837,33369 +(defun find-tag-interactive 840,33428 +(defvar find-tag-history 852,33843 +(defvar etags-case-fold-search)855,33908 +(defvar etags-syntax-table)856,33940 +(defvar local-find-tag-hook)857,33968 +(defun find-tag-noselect 860,34013 +(defun find-tag 932,37127 +(defun find-tag-other-window 959,38343 +(defun find-tag-other-frame 1000,40271 +(defun find-tag-regexp 1025,41445 +(defalias 'pop-tag-mark pop-tag-mark1049,42607 +(defvar tag-lines-already-matched 1052,42658 +(defun find-tag-in-order 1055,42765 +(defun tag-find-file-of-tag-noselect 1167,47111 +(defun tag-find-file-of-tag 1200,48957 +(defun etags-recognize-tags-table 1208,49183 +(defun etags-verify-tags-table 1241,50814 +(defun etags-file-of-tag 1246,51012 +(defun etags-tags-completion-table 1256,51347 +(defun etags-snarf-tag 1286,52553 +(defun etags-goto-tag-location 1324,54122 +(defun etags-list-tags 1388,56565 +(defmacro tags-with-face 1423,57840 +(defun etags-tags-apropos-additional 1431,58173 +(defun etags-tags-apropos 1465,59410 +(defun etags-tags-table-files 1527,61619 +(defun etags-tags-included-tables 1542,62055 +(defun tags-recognize-empty-tags-table 1559,62595 +(defun tag-exact-file-name-match-p 1587,63741 +(defun tag-file-name-match-p 1596,64134 +(defun tag-exact-match-p 1609,64690 +(defun tag-implicit-name-match-p 1620,65258 +(defun tag-symbol-match-p 1633,65858 +(defun tag-word-match-p 1643,66294 +(defun tag-partial-file-name-match-p 1652,66692 +(defun tag-any-match-p 1662,67136 +(defun tag-re-match-p 1667,67320 +(defcustom tags-loop-revert-buffers 1675,67569 +(defun next-file 1685,67978 +(defvar tags-loop-operate 1760,70892 +(defvar tags-loop-scan1763,70986 +(defun tags-loop-eval 1771,71315 +(defun tags-loop-continue 1782,71644 +(defun tags-search 1850,73950 +(defun tags-query-replace 1871,74776 +(defun tags-complete-tags-table-file 1896,76000 +(defun list-tags 1906,76379 +(defun tags-apropos 1934,77332 +(define-button-type 'tags-select-tags-tabletags-select-tags-table1957,78158 +(defun select-tags-table 1964,78397 +(defvar select-tags-table-mode-map 2019,80524 +(define-derived-mode select-tags-table-mode 2030,80907 +(defun select-tags-table-select 2034,81091 +(defun select-tags-table-quit 2043,81457 +(defun complete-tag 2049,81612 +(defconst etags--xref-limit 2074,82553 +(defvar etags-xref-find-definitions-tag-order 2076,82588 +(defun etags-xref-find 2082,82878 +(defun etags--xref-find-definitions 2096,83407 +(defclass xref-etags-location 2129,85121 +(defun xref-make-etags-location 2135,85344 +(cl-defmethod xref-location-marker 2139,85499 +(cl-defmethod xref-location-line 2146,85743 erl-src/gs_dialog.erl,98 -define(VERSION2,32 commit 8d3fc7ec897b1da7691c65e5a38f54cbb8156a9d Author: Zhehao Lin Date: Sat Jan 1 16:19:49 2022 +0800 * src/xfaces.c (face_for_font): Make 'hash' be uintptr_t. Copyright-paperwork-exempt: yes diff --git a/src/xfaces.c b/src/xfaces.c index 2bf24da7fc..b9fb7c0ac1 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -4824,7 +4824,7 @@ face_for_font (struct frame *f, Lisp_Object font_object, struct face *base_face) { struct face_cache *cache = FRAME_FACE_CACHE (f); - unsigned hash; + uintptr_t hash; int i; struct face *face; commit ab3c6c799ea6973ba8496eae3827e8fa2c5caae0 Author: Po Lu Date: Sat Jan 1 09:56:14 2022 +0000 Fix some more off-by-one errors in Haiku image code * src/haiku_draw_support.cc (BView_DrawBitmapWithEraseOp): (BView_DrawMask): (BBitmap_transform_bitmap): * src/haiku_support.cc (AttachCairoSurface): Adjust calculations to take account of BRect width and height functions returning (start - end) instead of the actual width and height of the rectangle. diff --git a/src/haiku_draw_support.cc b/src/haiku_draw_support.cc index 5b1eccfbe6..0f0f0a34f1 100644 --- a/src/haiku_draw_support.cc +++ b/src/haiku_draw_support.cc @@ -310,9 +310,9 @@ BView_DrawBitmapWithEraseOp (void *view, void *bitmap, int x, if (bm->ColorSpace () == B_GRAY1) { rgb_color low_color = vw->LowColor (); - for (int y = 0; y <= bc.Bounds ().Height (); ++y) + for (int y = 0; y <= bc.Bounds ().Height () + 1; ++y) { - for (int x = 0; x <= bc.Bounds ().Width (); ++x) + for (int x = 0; x <= bc.Bounds ().Width () + 1; ++x) { if (bits[y * (stride / 4) + x] == 0xFF000000) bits[y * (stride / 4) + x] = RGB_COLOR_UINT32 (low_color); @@ -338,9 +338,9 @@ BView_DrawMask (void *src, void *view, BBitmap bm (source->Bounds (), B_RGBA32); if (bm.InitCheck () != B_OK) return; - for (int y = 0; y <= bm.Bounds ().Height (); ++y) + for (int y = 0; y <= bm.Bounds ().IntegerHeight (); ++y) { - for (int x = 0; x <= bm.Bounds ().Width (); ++x) + for (int x = 0; x <= bm.Bounds ().IntegerWidth (); ++x) { int bit = haiku_get_pixel ((void *) source, x, y); @@ -443,8 +443,8 @@ BBitmap_transform_bitmap (void *bitmap, void *mask, uint32_t m_color, vw.DrawBitmap (bm, n); if (mk) BView_DrawMask ((void *) mk, (void *) &vw, - 0, 0, mk->Bounds ().Width (), - mk->Bounds ().Height (), + 0, 0, mk->Bounds ().Width () + 1, + mk->Bounds ().Height () + 1, 0, 0, desw, desh, m_color); vw.Sync (); vw.RemoveSelf (); diff --git a/src/haiku_support.cc b/src/haiku_support.cc index 6a7a043fe0..6a270d338a 100644 --- a/src/haiku_support.cc +++ b/src/haiku_support.cc @@ -960,8 +960,9 @@ class EmacsView : public BView gui_abort ("Trying to attach cr surface when one already exists"); cr_surface = cairo_image_surface_create_for_data ((unsigned char *) offscreen_draw_bitmap_1->Bits (), - CAIRO_FORMAT_ARGB32, offscreen_draw_bitmap_1->Bounds ().Width (), - offscreen_draw_bitmap_1->Bounds ().Height (), + CAIRO_FORMAT_ARGB32, + offscreen_draw_bitmap_1->Bounds ().IntegerWidth () + 1, + offscreen_draw_bitmap_1->Bounds ().IntegerHeight () + 1, offscreen_draw_bitmap_1->BytesPerRow ()); if (!cr_surface) gui_abort ("Cr surface allocation failed for double-buffered view"); commit c6d83707d6c5b9af67f69d34034a60719584b805 Author: Po Lu Date: Sat Jan 1 09:33:15 2022 +0000 Fix deadlocks with invisible frames and threads in Haiku * src/haiku_support.cc (class EmacsWindow): New field `was_shown_p'. (EmacsShow): Lock looper if the window wasn't ever visible. (BWindow_new): Unlock window looper after creating it. diff --git a/src/haiku_support.cc b/src/haiku_support.cc index 2a74d0bd51..6a7a043fe0 100644 --- a/src/haiku_support.cc +++ b/src/haiku_support.cc @@ -245,6 +245,7 @@ class EmacsWindow : public BWindow int fullscreen_p = 0; int zoomed_p = 0; int shown_flag = 0; + volatile int was_shown_p = 0; EmacsWindow () : BWindow (BRect (0, 0, 0, 0), "", B_TITLED_WINDOW_LOOK, B_NORMAL_WINDOW_FEEL, B_NO_SERVER_SIDE_WINDOW_MODIFIERS) @@ -726,6 +727,18 @@ class EmacsWindow : public BWindow if (!child_frame_lock.Lock ()) gui_abort ("Failed to lock child frame state lock"); + if (!was_shown_p) + { + /* This window is being shown for the first time, which means + Show will unlock the looper. In this case, it should be + locked again, since the looper is unlocked when the window + is first created. */ + + if (!LockLooper ()) + gui_abort ("Failed to lock looper during first window show"); + was_shown_p = true; + } + if (this->parent) shown_flag = 1; Show (); @@ -1560,6 +1573,14 @@ BWindow_new (void *_view) window->Quit (); return NULL; } + + /* Windows are created locked by the current thread, but calling + Show for the first time causes them to be unlocked. To avoid a + deadlock when a frame is created invisible in one thread, and + another thread later tries to lock it, the window is unlocked + here, and EmacsShow will lock it manually if it's being shown for + the first time. */ + window->UnlockLooper (); window->AddChild (vw); *v = vw; return window; commit 19dcb237b5b02b36580294ab309124f346a66024 Author: Eli Zaretskii Date: Sat Jan 1 02:45:51 2022 -0500 ; Add 2022 to copyright years. diff --git a/.gitattributes b/.gitattributes index a99cf12af5..43b73635a5 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,6 +1,6 @@ # Attributes of Emacs files in the Git repository. -# Copyright 2015-2021 Free Software Foundation, Inc. +# Copyright 2015-2022 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/.gitignore b/.gitignore index c7a6ec56d0..2254b8a9c8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ # Files that Git should ignore in the Emacs source directory. -# Copyright 2009-2021 Free Software Foundation, Inc. +# Copyright 2009-2022 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3138f4184e..9c2f3038c6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -# Copyright (C) 2021 Free Software Foundation, Inc. +# Copyright (C) 2021-2022 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/ChangeLog.1 b/ChangeLog.1 index 756dce3e47..cd31aacafb 100644 --- a/ChangeLog.1 +++ b/ChangeLog.1 @@ -14700,7 +14700,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 1993-1999, 2001-2021 Free Software Foundation, Inc. + Copyright (C) 1993-1999, 2001-2022 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/ChangeLog.2 b/ChangeLog.2 index 3e227675e0..cf19abaa13 100644 --- a/ChangeLog.2 +++ b/ChangeLog.2 @@ -35787,7 +35787,7 @@ See ChangeLog.1 for earlier changes. ;; coding: utf-8 ;; End: - Copyright (C) 2015-2021 Free Software Foundation, Inc. + Copyright (C) 2015-2022 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/ChangeLog.3 b/ChangeLog.3 index b149c8295b..177321dc45 100644 --- a/ChangeLog.3 +++ b/ChangeLog.3 @@ -233420,7 +233420,7 @@ See ChangeLog.2 for earlier changes. ;; coding: utf-8 ;; End: - Copyright (C) 2015-2021 Free Software Foundation, Inc. + Copyright (C) 2015-2022 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/GNUmakefile b/GNUmakefile index 5155487de2..248f047ffd 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -1,6 +1,6 @@ # Build Emacs from a fresh tarball or version-control checkout. -# Copyright (C) 2011-2021 Free Software Foundation, Inc. +# Copyright (C) 2011-2022 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/INSTALL b/INSTALL index 6207f43cec..a3f12c5244 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ GNU Emacs Installation Guide -Copyright (C) 1992, 1994, 1996-1997, 2000-2021 Free Software Foundation, +Copyright (C) 1992, 1994, 1996-1997, 2000-2022 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/INSTALL.REPO b/INSTALL.REPO index da56d7611b..5f6b7498bb 100644 --- a/INSTALL.REPO +++ b/INSTALL.REPO @@ -83,7 +83,7 @@ never platform-specific. -Copyright (C) 2002-2021 Free Software Foundation, Inc. +Copyright (C) 2002-2022 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/Makefile.in b/Makefile.in index c36882d5be..c902b46ced 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,6 +1,6 @@ ### @configure_input@ -# Copyright (C) 1992-2021 Free Software Foundation, Inc. +# Copyright (C) 1992-2022 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/README b/README index 83382f1b28..b2e748c7e7 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -Copyright (C) 2001-2021 Free Software Foundation, Inc. +Copyright (C) 2001-2022 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/admin/ChangeLog.1 b/admin/ChangeLog.1 index f3de691325..9409a608cc 100644 --- a/admin/ChangeLog.1 +++ b/admin/ChangeLog.1 @@ -2577,7 +2577,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 2001-2021 Free Software Foundation, Inc. + Copyright (C) 2001-2022 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/admin/README b/admin/README index b0336f91ff..89cdbbbfaf 100644 --- a/admin/README +++ b/admin/README @@ -1,4 +1,4 @@ -Copyright (C) 2001-2021 Free Software Foundation, Inc. +Copyright (C) 2001-2022 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/admin/admin.el b/admin/admin.el index ad4208beef..aa963be820 100644 --- a/admin/admin.el +++ b/admin/admin.el @@ -1,6 +1,6 @@ ;;; admin.el --- utilities for Emacs administration -*- lexical-binding: t; -*- -;; Copyright (C) 2001-2021 Free Software Foundation, Inc. +;; Copyright (C) 2001-2022 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/admin/alloc-colors.c b/admin/alloc-colors.c index ea5b750236..4db447332b 100644 --- a/admin/alloc-colors.c +++ b/admin/alloc-colors.c @@ -1,6 +1,6 @@ /* Allocate X colors. Used for testing with dense colormaps. -Copyright (C) 2001-2021 Free Software Foundation, Inc. +Copyright (C) 2001-2022 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/admin/authors.el b/admin/authors.el index adf6d22a88..8f768a83be 100644 --- a/admin/authors.el +++ b/admin/authors.el @@ -1,6 +1,6 @@ ;;; authors.el --- utility for maintaining Emacs's AUTHORS file -*- lexical-binding: t; -*- -;; Copyright (C) 2000-2021 Free Software Foundation, Inc. +;; Copyright (C) 2000-2022 Free Software Foundation, Inc. ;; Author: Gerd Moellmann ;; Maintainer: emacs-devel@gnu.org diff --git a/admin/automerge b/admin/automerge index 61570587d6..c591d98c2d 100755 --- a/admin/automerge +++ b/admin/automerge @@ -1,7 +1,7 @@ #!/bin/bash ### automerge - automatically merge the Emacs release branch to master -## Copyright (C) 2018-2021 Free Software Foundation, Inc. +## Copyright (C) 2018-2022 Free Software Foundation, Inc. ## Author: Glenn Morris ## Maintainer: emacs-devel@gnu.org diff --git a/admin/build-configs b/admin/build-configs index 2e04e0008e..05e70786b3 100755 --- a/admin/build-configs +++ b/admin/build-configs @@ -1,7 +1,7 @@ #! /usr/bin/perl # Build Emacs in several different configurations. -# Copyright (C) 2001-2021 Free Software Foundation, Inc. +# Copyright (C) 2001-2022 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/admin/charsets/Makefile.in b/admin/charsets/Makefile.in index f043077e31..572e352f4a 100644 --- a/admin/charsets/Makefile.in +++ b/admin/charsets/Makefile.in @@ -1,6 +1,6 @@ ### @configure_input@ -# Copyright (C) 2015-2021 Free Software Foundation, Inc. +# Copyright (C) 2015-2022 Free Software Foundation, Inc. # Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 # National Institute of Advanced Industrial Science and Technology (AIST) diff --git a/admin/charsets/mapconv b/admin/charsets/mapconv index f933c34ffc..9898d36e74 100755 --- a/admin/charsets/mapconv +++ b/admin/charsets/mapconv @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2015-2021 Free Software Foundation, Inc. +# Copyright (C) 2015-2022 Free Software Foundation, Inc. # Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 # National Institute of Advanced Industrial Science and Technology (AIST) diff --git a/admin/charsets/mapfiles/README b/admin/charsets/mapfiles/README index fb078269d6..0380df9ad7 100644 --- a/admin/charsets/mapfiles/README +++ b/admin/charsets/mapfiles/README @@ -1,4 +1,4 @@ -Copyright (C) 2009-2021 Free Software Foundation, Inc. +Copyright (C) 2009-2022 Free Software Foundation, Inc. Copyright (C) 2009, 2010, 2011 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H13PRO009 diff --git a/admin/cus-test.el b/admin/cus-test.el index 30b5f65561..8f0914ff69 100644 --- a/admin/cus-test.el +++ b/admin/cus-test.el @@ -1,6 +1,6 @@ ;;; cus-test.el --- tests for custom types and load problems -*- lexical-binding: t; -*- -;; Copyright (C) 1998, 2000, 2002-2021 Free Software Foundation, Inc. +;; Copyright (C) 1998, 2000, 2002-2022 Free Software Foundation, Inc. ;; Author: Markus Rost ;; Created: 13 Sep 1998 diff --git a/admin/diff-tar-files b/admin/diff-tar-files index 2fe15401d0..6ab39eab2f 100755 --- a/admin/diff-tar-files +++ b/admin/diff-tar-files @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (C) 2001-2021 Free Software Foundation, Inc. +# Copyright (C) 2001-2022 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/admin/find-gc.el b/admin/find-gc.el index 1cce54ef14..1c3c419c56 100644 --- a/admin/find-gc.el +++ b/admin/find-gc.el @@ -1,6 +1,6 @@ ;;; find-gc.el --- detect functions that call the garbage collector -*- lexical-binding: t; -*- -;; Copyright (C) 1992, 2001-2021 Free Software Foundation, Inc. +;; Copyright (C) 1992, 2001-2022 Free Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org diff --git a/admin/gitmerge.el b/admin/gitmerge.el index 851212c7bb..25c5fbef63 100644 --- a/admin/gitmerge.el +++ b/admin/gitmerge.el @@ -1,6 +1,6 @@ ;;; gitmerge.el --- help merge one Emacs branch into another -*- lexical-binding: t; -*- -;; Copyright (C) 2010-2021 Free Software Foundation, Inc. +;; Copyright (C) 2010-2022 Free Software Foundation, Inc. ;; Authors: David Engster ;; Stefan Monnier diff --git a/admin/grammars/Makefile.in b/admin/grammars/Makefile.in index aaf95c0897..83ac2ef46e 100644 --- a/admin/grammars/Makefile.in +++ b/admin/grammars/Makefile.in @@ -1,6 +1,6 @@ ### @configure_input@ -## Copyright (C) 2013-2021 Free Software Foundation, Inc. +## Copyright (C) 2013-2022 Free Software Foundation, Inc. ## This file is part of GNU Emacs. diff --git a/admin/grammars/c.by b/admin/grammars/c.by index 289081e3ce..2395e747fd 100644 --- a/admin/grammars/c.by +++ b/admin/grammars/c.by @@ -1,5 +1,5 @@ ;;; c.by -- LL grammar for C/C++ language specification -;; Copyright (C) 1999-2021 Free Software Foundation, Inc. +;; Copyright (C) 1999-2022 Free Software Foundation, Inc. ;; ;; Author: Eric M. Ludlam ;; David Ponce diff --git a/admin/grammars/grammar.wy b/admin/grammars/grammar.wy index 35fb7e832e..1180dc28eb 100644 --- a/admin/grammars/grammar.wy +++ b/admin/grammars/grammar.wy @@ -1,6 +1,6 @@ ;;; semantic-grammar.wy -- LALR grammar of Semantic input grammars ;; -;; Copyright (C) 2002-2021 Free Software Foundation, Inc. +;; Copyright (C) 2002-2022 Free Software Foundation, Inc. ;; ;; Author: David Ponce ;; Created: 26 Aug 2002 diff --git a/admin/grammars/java-tags.wy b/admin/grammars/java-tags.wy index 486924b799..138adb2082 100644 --- a/admin/grammars/java-tags.wy +++ b/admin/grammars/java-tags.wy @@ -1,6 +1,6 @@ ;;; java-tags.wy -- Semantic LALR grammar for Java -;; Copyright (C) 2002-2021 Free Software Foundation, Inc. +;; Copyright (C) 2002-2022 Free Software Foundation, Inc. ;; ;; Author: David Ponce ;; Created: 26 Aug 2002 diff --git a/admin/grammars/js.wy b/admin/grammars/js.wy index e85db1572c..2357153ccb 100644 --- a/admin/grammars/js.wy +++ b/admin/grammars/js.wy @@ -1,6 +1,6 @@ ;;; javascript-jv.wy -- LALR grammar for Javascript -;; Copyright (C) 2005-2021 Free Software Foundation, Inc. +;; Copyright (C) 2005-2022 Free Software Foundation, Inc. ;; Copyright (C) 1998-2011 Ecma International. ;; Author: Joakim Verona diff --git a/admin/grammars/make.by b/admin/grammars/make.by index f66585e70e..193ad77fa9 100644 --- a/admin/grammars/make.by +++ b/admin/grammars/make.by @@ -1,6 +1,6 @@ ;;; make.by -- BY notation for Makefiles. -;; Copyright (C) 1999-2021 Free Software Foundation, Inc. +;; Copyright (C) 1999-2022 Free Software Foundation, Inc. ;; ;; Author: Eric M. Ludlam ;; David Ponce diff --git a/admin/grammars/python.wy b/admin/grammars/python.wy index 2539d1bec8..17d87e711a 100644 --- a/admin/grammars/python.wy +++ b/admin/grammars/python.wy @@ -1,6 +1,6 @@ ;;; python.wy -- LALR grammar for Python -;; Copyright (C) 2002-2021 Free Software Foundation, Inc. +;; Copyright (C) 2002-2022 Free Software Foundation, Inc. ;; Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, ;; 2009, 2010 Python Software Foundation; All Rights Reserved diff --git a/admin/grammars/scheme.by b/admin/grammars/scheme.by index c3abb5a28e..fcf3007ae7 100644 --- a/admin/grammars/scheme.by +++ b/admin/grammars/scheme.by @@ -1,6 +1,6 @@ ;;; scheme.by -- Scheme BNF language specification -;; Copyright (C) 2001-2021 Free Software Foundation, Inc. +;; Copyright (C) 2001-2022 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/admin/grammars/srecode-template.wy b/admin/grammars/srecode-template.wy index 868a81cf18..c3531ebd54 100644 --- a/admin/grammars/srecode-template.wy +++ b/admin/grammars/srecode-template.wy @@ -1,6 +1,6 @@ ;;; srecode-template.wy --- Semantic Recoder Template parser -;; Copyright (C) 2005-2021 Free Software Foundation, Inc. +;; Copyright (C) 2005-2022 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam ;; Keywords: syntax diff --git a/admin/last-chance.el b/admin/last-chance.el index e8021129e3..30d6a25a28 100644 --- a/admin/last-chance.el +++ b/admin/last-chance.el @@ -1,6 +1,6 @@ ;;; last-chance.el --- dangling deterrence -*- lexical-binding: t; -*- -;; Copyright (C) 2016-2021 Free Software Foundation, Inc. +;; Copyright (C) 2016-2022 Free Software Foundation, Inc. ;; Author: Thien-Thi Nguyen ;; Maintainer: emacs-devel@gnu.org diff --git a/admin/make-emacs b/admin/make-emacs index fa7880b566..06d5608092 100755 --- a/admin/make-emacs +++ b/admin/make-emacs @@ -2,7 +2,7 @@ # Build Emacs with various options for profiling, debugging, # with and without warnings enabled etc. -# Copyright (C) 2001-2021 Free Software Foundation, Inc. +# Copyright (C) 2001-2022 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/admin/make-manuals b/admin/make-manuals index f133949520..8085412cc8 100755 --- a/admin/make-manuals +++ b/admin/make-manuals @@ -1,7 +1,7 @@ #!/bin/bash ### make-manuals - create the Emacs manuals to upload to the gnu.org website -## Copyright 2018-2021 Free Software Foundation, Inc. +## Copyright 2018-2022 Free Software Foundation, Inc. ## Author: Glenn Morris ## Maintainer: emacs-devel@gnu.org diff --git a/admin/merge-gnulib b/admin/merge-gnulib index c9fe3b2f95..73b3d39049 100755 --- a/admin/merge-gnulib +++ b/admin/merge-gnulib @@ -4,7 +4,7 @@ # # admin/merge-gnulib -# Copyright 2012-2021 Free Software Foundation, Inc. +# Copyright 2012-2022 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/admin/merge-pkg-config b/admin/merge-pkg-config index 1136a304dd..2f785729a6 100755 --- a/admin/merge-pkg-config +++ b/admin/merge-pkg-config @@ -4,7 +4,7 @@ # # admin/merge-pkg-config -# Copyright 2014-2021 Free Software Foundation, Inc. +# Copyright 2014-2022 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/admin/notes/copyright b/admin/notes/copyright index 5b00c82ce9..6f7cb15334 100644 --- a/admin/notes/copyright +++ b/admin/notes/copyright @@ -1,4 +1,4 @@ -Copyright (C) 2007-2021 Free Software Foundation, Inc. +Copyright (C) 2007-2022 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/admin/notes/emba b/admin/notes/emba index 36b126e773..52e356e3dc 100644 --- a/admin/notes/emba +++ b/admin/notes/emba @@ -1,6 +1,6 @@ -*- mode: outline; coding: utf-8 -*- -Copyright (C) 2019-2021 Free Software Foundation, Inc. +Copyright (C) 2019-2022 Free Software Foundation, Inc. See the end of the file for license conditions. NOTES FOR EMACS CONTINUOUS BUILD ON EMBA diff --git a/admin/notes/hydra b/admin/notes/hydra index 62ad7ebf9c..0987e7be82 100644 --- a/admin/notes/hydra +++ b/admin/notes/hydra @@ -1,6 +1,6 @@ -*- mode: outline; coding: utf-8 -*- -Copyright (C) 2013-2021 Free Software Foundation, Inc. +Copyright (C) 2013-2022 Free Software Foundation, Inc. See the end of the file for license conditions. NOTES FOR EMACS CONTINUOUS BUILD ON HYDRA diff --git a/admin/notes/multi-tty b/admin/notes/multi-tty index fa4df820ae..9b3f1606a1 100644 --- a/admin/notes/multi-tty +++ b/admin/notes/multi-tty @@ -1,6 +1,6 @@ -*- coding: utf-8; mode: text; -*- -Copyright (C) 2007-2021 Free Software Foundation, Inc. +Copyright (C) 2007-2022 Free Software Foundation, Inc. See the end of the file for license conditions. From README.multi-tty in the multi-tty branch. diff --git a/admin/notes/unicode b/admin/notes/unicode index c41b9a6d26..7b86a36a14 100644 --- a/admin/notes/unicode +++ b/admin/notes/unicode @@ -1,6 +1,6 @@ -*-mode: text; coding: utf-8;-*- -Copyright (C) 2002-2021 Free Software Foundation, Inc. +Copyright (C) 2002-2022 Free Software Foundation, Inc. See the end of the file for license conditions. Importing a new Unicode Standard version into Emacs diff --git a/admin/notes/www b/admin/notes/www index 524b908d0e..61a80e3d19 100644 --- a/admin/notes/www +++ b/admin/notes/www @@ -1,6 +1,6 @@ -*- outline -*- -Copyright (C) 2013-2021 Free Software Foundation, Inc. +Copyright (C) 2013-2022 Free Software Foundation, Inc. See the end of the file for license conditions. NOTES FOR EMACS WWW PAGES diff --git a/admin/nt/README-UNDUMP.W32 b/admin/nt/README-UNDUMP.W32 index aaaea3b91f..c42b7b6494 100644 --- a/admin/nt/README-UNDUMP.W32 +++ b/admin/nt/README-UNDUMP.W32 @@ -1,4 +1,4 @@ -Copyright (C) 2001-2021 Free Software Foundation, Inc. +Copyright (C) 2001-2022 Free Software Foundation, Inc. See the end of the file for license conditions. Emacs for Windows diff --git a/admin/nt/dist-build/README-windows-binaries b/admin/nt/dist-build/README-windows-binaries index b6f6e55d8c..475612ac80 100644 --- a/admin/nt/dist-build/README-windows-binaries +++ b/admin/nt/dist-build/README-windows-binaries @@ -1,4 +1,4 @@ -Copyright (C) 2001-2021 Free Software Foundation, Inc. +Copyright (C) 2001-2022 Free Software Foundation, Inc. See the end of the file for license conditions. Precompiled Distributions of diff --git a/admin/nt/dist-build/build-dep-zips.py b/admin/nt/dist-build/build-dep-zips.py index 19168e7ff2..c27045a001 100755 --- a/admin/nt/dist-build/build-dep-zips.py +++ b/admin/nt/dist-build/build-dep-zips.py @@ -1,6 +1,6 @@ #!/usr/bin/python3 -## Copyright (C) 2017-2021 Free Software Foundation, Inc. +## Copyright (C) 2017-2022 Free Software Foundation, Inc. ## This file is part of GNU Emacs. diff --git a/admin/nt/dist-build/build-zips.sh b/admin/nt/dist-build/build-zips.sh index 4c3a52af6a..77d20a5a7b 100755 --- a/admin/nt/dist-build/build-zips.sh +++ b/admin/nt/dist-build/build-zips.sh @@ -1,6 +1,6 @@ #!/bin/bash -## Copyright (C) 2017-2021 Free Software Foundation, Inc. +## Copyright (C) 2017-2022 Free Software Foundation, Inc. ## This file is part of GNU Emacs. diff --git a/admin/quick-install-emacs b/admin/quick-install-emacs index 475658ae93..9a73cf5a40 100755 --- a/admin/quick-install-emacs +++ b/admin/quick-install-emacs @@ -1,7 +1,7 @@ #!/bin/sh ### quick-install-emacs --- do a halfway-decent job of installing emacs quickly -## Copyright (C) 2001-2021 Free Software Foundation, Inc. +## Copyright (C) 2001-2022 Free Software Foundation, Inc. ## Author: Miles Bader diff --git a/admin/unidata/Makefile.in b/admin/unidata/Makefile.in index a953044a11..2b0215dde4 100644 --- a/admin/unidata/Makefile.in +++ b/admin/unidata/Makefile.in @@ -1,6 +1,6 @@ ### @configure_input@ -# Copyright (C) 2012-2021 Free Software Foundation, Inc. +# Copyright (C) 2012-2022 Free Software Foundation, Inc. # Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 # National Institute of Advanced Industrial Science and Technology (AIST) diff --git a/admin/unidata/blocks.awk b/admin/unidata/blocks.awk index 314ac3e939..48d8c873c7 100755 --- a/admin/unidata/blocks.awk +++ b/admin/unidata/blocks.awk @@ -1,6 +1,6 @@ #!/usr/bin/awk -f -## Copyright (C) 2015-2021 Free Software Foundation, Inc. +## Copyright (C) 2015-2022 Free Software Foundation, Inc. ## Author: Glenn Morris ## Maintainer: emacs-devel@gnu.org diff --git a/admin/unidata/emoji-zwj.awk b/admin/unidata/emoji-zwj.awk index d4e2944ca3..56287ac106 100644 --- a/admin/unidata/emoji-zwj.awk +++ b/admin/unidata/emoji-zwj.awk @@ -1,6 +1,6 @@ #!/usr/bin/awk -f -## Copyright (C) 2020 Free Software Foundation, Inc. +## Copyright (C) 2020, 2022 Free Software Foundation, Inc. ## Author: Robert Pluim diff --git a/admin/unidata/unidata-gen.el b/admin/unidata/unidata-gen.el index abd41e34a4..d6b5a476bb 100644 --- a/admin/unidata/unidata-gen.el +++ b/admin/unidata/unidata-gen.el @@ -1,6 +1,6 @@ ;;; unidata-gen.el --- Create files containing character property data -*- lexical-binding:t -*- -;; Copyright (C) 2008-2021 Free Software Foundation, Inc. +;; Copyright (C) 2008-2022 Free Software Foundation, Inc. ;; Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) diff --git a/admin/unidata/uvs.el b/admin/unidata/uvs.el index 0141b638fb..5a4b8e71a2 100644 --- a/admin/unidata/uvs.el +++ b/admin/unidata/uvs.el @@ -1,6 +1,6 @@ ;;; uvs.el --- utility for UVS (format 14) cmap subtables in OpenType fonts -*- lexical-binding:t -*- -;; Copyright (C) 2014-2021 Free Software Foundation, Inc. +;; Copyright (C) 2014-2022 Free Software Foundation, Inc. ;; Author: YAMAMOTO Mitsuharu diff --git a/admin/update-copyright b/admin/update-copyright index 86953838bd..5a04847a66 100755 --- a/admin/update-copyright +++ b/admin/update-copyright @@ -7,7 +7,7 @@ # By default, this script uses the local-time calendar year. # Set the UPDATE_COPYRIGHT_YEAR environment variable to override the default. -# Copyright 2013-2021 Free Software Foundation, Inc. +# Copyright 2013-2022 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/admin/update_autogen b/admin/update_autogen index 11c4313ae3..5923bee22b 100755 --- a/admin/update_autogen +++ b/admin/update_autogen @@ -1,7 +1,7 @@ #!/usr/bin/env bash ### update_autogen - update some auto-generated files in the Emacs tree -## Copyright (C) 2011-2021 Free Software Foundation, Inc. +## Copyright (C) 2011-2022 Free Software Foundation, Inc. ## Author: Glenn Morris ## Maintainer: emacs-devel@gnu.org diff --git a/admin/upload-manuals b/admin/upload-manuals index 52999c2997..1fa9865e65 100755 --- a/admin/upload-manuals +++ b/admin/upload-manuals @@ -2,7 +2,7 @@ ### upload-manuals - upload the Emacs manuals to the gnu.org website -## Copyright 2018-2021 Free Software Foundation, Inc. +## Copyright 2018-2022 Free Software Foundation, Inc. ## Author: Glenn Morris ## Maintainer: emacs-devel@gnu.org diff --git a/autogen.sh b/autogen.sh index 531e5775f9..03f647e576 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,7 +1,7 @@ #!/bin/sh ### autogen.sh - tool to help build Emacs from a repository checkout -## Copyright (C) 2011-2021 Free Software Foundation, Inc. +## Copyright (C) 2011-2022 Free Software Foundation, Inc. ## Author: Glenn Morris ## Maintainer: emacs-devel@gnu.org diff --git a/build-aux/config.guess b/build-aux/config.guess index e81d3ae7c2..7158ef319e 100755 --- a/build-aux/config.guess +++ b/build-aux/config.guess @@ -1,6 +1,6 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2021 Free Software Foundation, Inc. +# Copyright 1992-2022 Free Software Foundation, Inc. # shellcheck disable=SC2006,SC2268 # see below for rationale diff --git a/build-aux/config.sub b/build-aux/config.sub index d74fb6deac..01a9a3d5cd 100755 --- a/build-aux/config.sub +++ b/build-aux/config.sub @@ -1,6 +1,6 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2021 Free Software Foundation, Inc. +# Copyright 1992-2022 Free Software Foundation, Inc. # shellcheck disable=SC2006,SC2268 # see below for rationale diff --git a/build-aux/git-hooks/commit-msg b/build-aux/git-hooks/commit-msg index cf0f74c644..bb4f358c5e 100755 --- a/build-aux/git-hooks/commit-msg +++ b/build-aux/git-hooks/commit-msg @@ -1,7 +1,7 @@ #!/bin/sh # Check the format of GNU Emacs change log entries. -# Copyright 2014-2021 Free Software Foundation, Inc. +# Copyright 2014-2022 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/build-aux/git-hooks/pre-commit b/build-aux/git-hooks/pre-commit index 719bfefc50..a55004680f 100755 --- a/build-aux/git-hooks/pre-commit +++ b/build-aux/git-hooks/pre-commit @@ -1,7 +1,7 @@ #!/bin/sh # Check file names in git commits for GNU Emacs. -# Copyright 2014-2021 Free Software Foundation, Inc. +# Copyright 2014-2022 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/build-aux/git-hooks/prepare-commit-msg b/build-aux/git-hooks/prepare-commit-msg index dd8434479d..7dc36f2219 100755 --- a/build-aux/git-hooks/prepare-commit-msg +++ b/build-aux/git-hooks/prepare-commit-msg @@ -1,7 +1,7 @@ #!/bin/sh # Check the format of GNU Emacs change log entries. -# Copyright 2019-2021 Free Software Foundation, Inc. +# Copyright 2019-2022 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/build-aux/gitlog-to-changelog b/build-aux/gitlog-to-changelog index 9ff15f6019..1c6847ae3b 100755 --- a/build-aux/gitlog-to-changelog +++ b/build-aux/gitlog-to-changelog @@ -3,7 +3,7 @@ # Convert git log output to ChangeLog format. -# Copyright (C) 2008-2021 Free Software Foundation, Inc. +# Copyright (C) 2008-2022 Free Software Foundation, Inc. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/build-aux/gitlog-to-emacslog b/build-aux/gitlog-to-emacslog index 30b2d78659..2ea2026171 100755 --- a/build-aux/gitlog-to-emacslog +++ b/build-aux/gitlog-to-emacslog @@ -2,7 +2,7 @@ # Convert git log output to ChangeLog format for GNU Emacs. -# Copyright (C) 2014-2021 Free Software Foundation, Inc. +# Copyright (C) 2014-2022 Free Software Foundation, Inc. # Author: Paul Eggert diff --git a/build-aux/make-info-dir b/build-aux/make-info-dir index 256c9f025c..c29ea5088b 100755 --- a/build-aux/make-info-dir +++ b/build-aux/make-info-dir @@ -2,7 +2,7 @@ ### make-info-dir - create info/dir, for systems without install-info -## Copyright (C) 2013-2021 Free Software Foundation, Inc. +## Copyright (C) 2013-2022 Free Software Foundation, Inc. ## Author: Glenn Morris ## Maintainer: emacs-devel@gnu.org diff --git a/build-aux/move-if-change b/build-aux/move-if-change index e85e90af50..9f7379a603 100755 --- a/build-aux/move-if-change +++ b/build-aux/move-if-change @@ -8,7 +8,7 @@ VERSION='2018-03-07 03:47'; # UTC # If you change this file with Emacs, please let the write hook # do its job. Otherwise, update this string manually. -# Copyright (C) 2002-2021 Free Software Foundation, Inc. +# Copyright (C) 2002-2022 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/build-aux/msys-to-w32 b/build-aux/msys-to-w32 index e4e5e08641..2e5df8252d 100755 --- a/build-aux/msys-to-w32 +++ b/build-aux/msys-to-w32 @@ -2,7 +2,7 @@ # Convert a MSYS path list to Windows-native format. # Status is zero if successful, nonzero otherwise. -# Copyright (C) 2013-2021 Free Software Foundation, Inc. +# Copyright (C) 2013-2022 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/build-aux/update-copyright b/build-aux/update-copyright index fae3a5fb33..51b25dd0a5 100755 --- a/build-aux/update-copyright +++ b/build-aux/update-copyright @@ -3,7 +3,7 @@ # Update an FSF copyright year list to include the current year. -# Copyright (C) 2009-2021 Free Software Foundation, Inc. +# Copyright (C) 2009-2022 Free Software Foundation, Inc. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/build-aux/update-subdirs b/build-aux/update-subdirs index e56eea44de..95cf06bb5c 100755 --- a/build-aux/update-subdirs +++ b/build-aux/update-subdirs @@ -1,7 +1,7 @@ #!/bin/sh # Write into $1/subdirs.el a list of subdirs of directory $1. -# Copyright (C) 1994-1995, 1997, 1999, 2001-2021 Free Software +# Copyright (C) 1994-1995, 1997, 1999, 2001-2022 Free Software # Foundation, Inc. # This file is part of GNU Emacs. diff --git a/configure.ac b/configure.ac index 357d2538e6..ee3fcd1613 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl autoconf dnl in the directory containing this script. dnl If you changed any AC_DEFINES, also run autoheader. dnl -dnl Copyright (C) 1994-1996, 1999-2021 Free Software Foundation, Inc. +dnl Copyright (C) 1994-1996, 1999-2022 Free Software Foundation, Inc. dnl dnl This file is part of GNU Emacs. dnl diff --git a/doc/emacs/ChangeLog.1 b/doc/emacs/ChangeLog.1 index bc4dbd4705..c1c5f5407d 100644 --- a/doc/emacs/ChangeLog.1 +++ b/doc/emacs/ChangeLog.1 @@ -10919,7 +10919,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 1993-1999, 2001-2021 Free Software Foundation, Inc. + Copyright (C) 1993-1999, 2001-2022 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/doc/emacs/Makefile.in b/doc/emacs/Makefile.in index 69d39efa8b..8bde875e60 100644 --- a/doc/emacs/Makefile.in +++ b/doc/emacs/Makefile.in @@ -1,6 +1,6 @@ ### @configure_input@ -# Copyright (C) 1994, 1996-2021 Free Software Foundation, Inc. +# Copyright (C) 1994, 1996-2022 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/doc/emacs/abbrevs.texi b/doc/emacs/abbrevs.texi index c83da8aaec..c2e8b4cae0 100644 --- a/doc/emacs/abbrevs.texi +++ b/doc/emacs/abbrevs.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985--1987, 1993--1995, 1997, 2001--2021 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 2001--2022 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @node Abbrevs diff --git a/doc/emacs/ack.texi b/doc/emacs/ack.texi index d771393ffa..d0f2cc343b 100644 --- a/doc/emacs/ack.texi +++ b/doc/emacs/ack.texi @@ -1,6 +1,6 @@ @c -*- coding: utf-8 -*- @c This is part of the Emacs manual. -@c Copyright (C) 1994--1997, 1999--2021 Free Software Foundation, Inc. +@c Copyright (C) 1994--1997, 1999--2022 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @c @node Acknowledgments diff --git a/doc/emacs/anti.texi b/doc/emacs/anti.texi index 3b02187b5c..bb88fddc04 100644 --- a/doc/emacs/anti.texi +++ b/doc/emacs/anti.texi @@ -1,6 +1,6 @@ @c -*- coding: utf-8 -*- @c This is part of the Emacs manual. -@c Copyright (C) 2005--2021 Free Software Foundation, Inc. +@c Copyright (C) 2005--2022 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Antinews diff --git a/doc/emacs/arevert-xtra.texi b/doc/emacs/arevert-xtra.texi index 5dede6246c..a384e562e8 100644 --- a/doc/emacs/arevert-xtra.texi +++ b/doc/emacs/arevert-xtra.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 2004--2021 Free Software Foundation, Inc. +@c Copyright (C) 2004--2022 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @c @c This file is included either in emacs-xtra.texi (when producing the diff --git a/doc/emacs/back.texi b/doc/emacs/back.texi index dc4e218d37..85d79913af 100644 --- a/doc/emacs/back.texi +++ b/doc/emacs/back.texi @@ -1,6 +1,6 @@ \input texinfo @c -*-texinfo-*- @c This is part of the Emacs manual. -@c Copyright (C) 1985--1987, 1993--1995, 1997, 2001--2021 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 2001--2022 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @c diff --git a/doc/emacs/basic.texi b/doc/emacs/basic.texi index c4fa0d64ed..196a28be5a 100644 --- a/doc/emacs/basic.texi +++ b/doc/emacs/basic.texi @@ -1,6 +1,6 @@ @c -*- coding: utf-8 -*- @c This is part of the Emacs manual. -@c Copyright (C) 1985--1987, 1993--1995, 1997, 2000--2021 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 2000--2022 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @node Basic diff --git a/doc/emacs/buffers.texi b/doc/emacs/buffers.texi index c4e5bc32b7..8a8584689f 100644 --- a/doc/emacs/buffers.texi +++ b/doc/emacs/buffers.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985--1987, 1993--1995, 1997, 2000--2021 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 2000--2022 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @node Buffers diff --git a/doc/emacs/building.texi b/doc/emacs/building.texi index f9ea1b390f..5b68b1ef9f 100644 --- a/doc/emacs/building.texi +++ b/doc/emacs/building.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985--1987, 1993--1995, 1997, 2000--2021 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 2000--2022 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @node Building diff --git a/doc/emacs/cal-xtra.texi b/doc/emacs/cal-xtra.texi index aec2e6cc5a..7c41adf029 100644 --- a/doc/emacs/cal-xtra.texi +++ b/doc/emacs/cal-xtra.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -*- coding: utf-8 -*- -@c Copyright (C) 2004--2021 Free Software Foundation, Inc. +@c Copyright (C) 2004--2022 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @c @c This file is included either in emacs-xtra.texi (when producing the diff --git a/doc/emacs/calendar.texi b/doc/emacs/calendar.texi index 18de721e28..0ba8b2cbd0 100644 --- a/doc/emacs/calendar.texi +++ b/doc/emacs/calendar.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -*- coding: utf-8 -*- -@c Copyright (C) 1985--1987, 1993--1995, 1997, 2000--2021 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 2000--2022 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @node Calendar/Diary diff --git a/doc/emacs/cmdargs.texi b/doc/emacs/cmdargs.texi index 687a5caf71..797b3eaa4b 100644 --- a/doc/emacs/cmdargs.texi +++ b/doc/emacs/cmdargs.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985--1987, 1993--1995, 1997, 2001--2021 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 2001--2022 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @node Emacs Invocation diff --git a/doc/emacs/commands.texi b/doc/emacs/commands.texi index f56f820b39..431cc2e5ce 100644 --- a/doc/emacs/commands.texi +++ b/doc/emacs/commands.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985--1987, 1993--1995, 1997, 2001--2021 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 2001--2022 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @iftex diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi index a3d8a779b8..094b8b11f6 100644 --- a/doc/emacs/custom.texi +++ b/doc/emacs/custom.texi @@ -1,6 +1,6 @@ @c -*- coding: utf-8 -*- @c This is part of the Emacs manual. -@c Copyright (C) 1985--1987, 1993--1995, 1997, 2000--2021 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 2000--2022 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @node Customization diff --git a/doc/emacs/dired-xtra.texi b/doc/emacs/dired-xtra.texi index fc8130d8e6..454abcae4c 100644 --- a/doc/emacs/dired-xtra.texi +++ b/doc/emacs/dired-xtra.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 2004--2021 Free Software Foundation, Inc. +@c Copyright (C) 2004--2022 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @c @c This file is included either in emacs-xtra.texi (when producing the diff --git a/doc/emacs/dired.texi b/doc/emacs/dired.texi index 9cdd4b805e..f6c3e93d10 100644 --- a/doc/emacs/dired.texi +++ b/doc/emacs/dired.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985--1987, 1993--1995, 1997, 2000--2021 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 2000--2022 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @node Dired diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi index 7ea754612e..29902c1d97 100644 --- a/doc/emacs/display.texi +++ b/doc/emacs/display.texi @@ -1,6 +1,6 @@ @c -*- coding: utf-8 -*- @c This is part of the Emacs manual. -@c Copyright (C) 1985--1987, 1993--1995, 1997, 2000--2021 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 2000--2022 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. diff --git a/doc/emacs/emacs-xtra.texi b/doc/emacs/emacs-xtra.texi index 2d511bffbc..fbc1e1228e 100644 --- a/doc/emacs/emacs-xtra.texi +++ b/doc/emacs/emacs-xtra.texi @@ -16,7 +16,7 @@ @copying This manual describes specialized features of Emacs. -Copyright @copyright{} 2004--2021 Free Software Foundation, Inc. +Copyright @copyright{} 2004--2022 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi index 83847fb8f1..2433001657 100644 --- a/doc/emacs/emacs.texi +++ b/doc/emacs/emacs.texi @@ -20,7 +20,7 @@ This is the @cite{GNU Emacs Manual}, @end ifclear updated for Emacs version @value{EMACSVER}. -Copyright @copyright{} 1985--1987, 1993--2021 Free Software Foundation, +Copyright @copyright{} 1985--1987, 1993--2022 Free Software Foundation, Inc. @quotation diff --git a/doc/emacs/emerge-xtra.texi b/doc/emacs/emerge-xtra.texi index 7bf24151e5..d7d94c8b84 100644 --- a/doc/emacs/emerge-xtra.texi +++ b/doc/emacs/emerge-xtra.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 2004--2021 Free Software Foundation, Inc. +@c Copyright (C) 2004--2022 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @c @c This file is included either in emacs-xtra.texi (when producing the diff --git a/doc/emacs/entering.texi b/doc/emacs/entering.texi index 0476466da5..6069da0380 100644 --- a/doc/emacs/entering.texi +++ b/doc/emacs/entering.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985--1987, 1993--1995, 2001--2021 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 2001--2022 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @iftex diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi index 65a57ccd31..3c62be677e 100644 --- a/doc/emacs/files.texi +++ b/doc/emacs/files.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985--1987, 1993--1995, 1997, 1999--2021 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 1999--2022 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @node Files diff --git a/doc/emacs/fixit.texi b/doc/emacs/fixit.texi index 7feebddee8..d2704e25d6 100644 --- a/doc/emacs/fixit.texi +++ b/doc/emacs/fixit.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985--1987, 1993--1995, 1997, 2001--2021 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 2001--2022 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @node Fixit diff --git a/doc/emacs/fortran-xtra.texi b/doc/emacs/fortran-xtra.texi index c8efd56c37..fc20d8ea35 100644 --- a/doc/emacs/fortran-xtra.texi +++ b/doc/emacs/fortran-xtra.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 2004--2021 Free Software Foundation, Inc. +@c Copyright (C) 2004--2022 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @c @c This file is included either in emacs-xtra.texi (when producing the diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi index c14ada2957..ce43408101 100644 --- a/doc/emacs/frames.texi +++ b/doc/emacs/frames.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985--1987, 1993--1995, 1997, 1999--2021 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 1999--2022 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @node Frames diff --git a/doc/emacs/glossary.texi b/doc/emacs/glossary.texi index 9c06bcc4af..7e0c84d723 100644 --- a/doc/emacs/glossary.texi +++ b/doc/emacs/glossary.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985--1987, 1993--1995, 1997, 2001--2021 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 2001--2022 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @node Glossary diff --git a/doc/emacs/gnu.texi b/doc/emacs/gnu.texi index 4d48dcdb8e..58cc6bb664 100644 --- a/doc/emacs/gnu.texi +++ b/doc/emacs/gnu.texi @@ -1,4 +1,4 @@ -@c Copyright (C) 1985--1987, 1993, 1995, 2001--2021 Free Software +@c Copyright (C) 1985--1987, 1993, 1995, 2001--2022 Free Software @c Foundation, Inc. @c @c Permission is granted to anyone to make or distribute verbatim copies diff --git a/doc/emacs/help.texi b/doc/emacs/help.texi index 7d6c3085cb..7dcd09b3a1 100644 --- a/doc/emacs/help.texi +++ b/doc/emacs/help.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985--1987, 1993--1995, 1997, 2000--2021 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 2000--2022 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @node Help diff --git a/doc/emacs/indent.texi b/doc/emacs/indent.texi index d989f34556..058d313c2d 100644 --- a/doc/emacs/indent.texi +++ b/doc/emacs/indent.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985--1987, 1993--1995, 1997, 2001--2021 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 2001--2022 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @node Indentation diff --git a/doc/emacs/killing.texi b/doc/emacs/killing.texi index 37243b6cd2..4369eaab34 100644 --- a/doc/emacs/killing.texi +++ b/doc/emacs/killing.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985--1987, 1993--1995, 1997, 2000--2021 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 2000--2022 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. diff --git a/doc/emacs/kmacro.texi b/doc/emacs/kmacro.texi index 78964bb903..fbbceb7d5e 100644 --- a/doc/emacs/kmacro.texi +++ b/doc/emacs/kmacro.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985--1987, 1993--1995, 1997, 2000--2021 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 2000--2022 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @node Keyboard Macros diff --git a/doc/emacs/m-x.texi b/doc/emacs/m-x.texi index 4e95e03aae..e8c7faebd5 100644 --- a/doc/emacs/m-x.texi +++ b/doc/emacs/m-x.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985--1987, 1993--1995, 1997, 2001--2021 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 2001--2022 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @node M-x diff --git a/doc/emacs/macos.texi b/doc/emacs/macos.texi index 99c67ed09e..ab143707fd 100644 --- a/doc/emacs/macos.texi +++ b/doc/emacs/macos.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 2000--2021 Free Software Foundation, Inc. +@c Copyright (C) 2000--2022 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Mac OS / GNUstep @appendix Emacs and macOS / GNUstep diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi index 05e5a5d5ec..7581fd83c9 100644 --- a/doc/emacs/maintaining.texi +++ b/doc/emacs/maintaining.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual., Abbrevs, This is part of the Emacs manual., Top -@c Copyright (C) 1985--1987, 1993--1995, 1997, 1999--2021 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 1999--2022 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @node Maintaining diff --git a/doc/emacs/mark.texi b/doc/emacs/mark.texi index 2461cb0f6a..91c44d527b 100644 --- a/doc/emacs/mark.texi +++ b/doc/emacs/mark.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985--1987, 1993--1995, 1997, 2001--2021 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 2001--2022 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @node Mark diff --git a/doc/emacs/mini.texi b/doc/emacs/mini.texi index 56222bb6e1..979be34fac 100644 --- a/doc/emacs/mini.texi +++ b/doc/emacs/mini.texi @@ -1,6 +1,6 @@ @c -*- coding: utf-8 -*- @c This is part of the Emacs manual. -@c Copyright (C) 1985--1987, 1993--1995, 1997, 2000--2021 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 2000--2022 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @node Minibuffer diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi index 5123a716dc..08c86e7a16 100644 --- a/doc/emacs/misc.texi +++ b/doc/emacs/misc.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985--1987, 1993--1995, 1997, 2000--2021 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 2000--2022 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @iftex diff --git a/doc/emacs/modes.texi b/doc/emacs/modes.texi index 9014221edf..c348130807 100644 --- a/doc/emacs/modes.texi +++ b/doc/emacs/modes.texi @@ -1,6 +1,6 @@ @c -*- coding: utf-8 -*- @c This is part of the Emacs manual. -@c Copyright (C) 1985--1987, 1993--1995, 1997, 2000--2021 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 2000--2022 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @node Modes diff --git a/doc/emacs/msdos-xtra.texi b/doc/emacs/msdos-xtra.texi index fce6ae46f8..9cf04ea8a9 100644 --- a/doc/emacs/msdos-xtra.texi +++ b/doc/emacs/msdos-xtra.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 2004--2021 Free Software Foundation, Inc. +@c Copyright (C) 2004--2022 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @c @c This file is included either in emacs-xtra.texi (when producing the diff --git a/doc/emacs/msdos.texi b/doc/emacs/msdos.texi index 0f8f429b3f..74497b6eab 100644 --- a/doc/emacs/msdos.texi +++ b/doc/emacs/msdos.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985--1987, 1993--1995, 1997, 2000--2021 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 2000--2022 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @node Microsoft Windows diff --git a/doc/emacs/mule.texi b/doc/emacs/mule.texi index 81aabfb57d..f87c1252d3 100644 --- a/doc/emacs/mule.texi +++ b/doc/emacs/mule.texi @@ -1,6 +1,6 @@ @c -*- coding: utf-8 -*- @c This is part of the Emacs manual. -@c Copyright (C) 1997, 1999--2021 Free Software Foundation, Inc. +@c Copyright (C) 1997, 1999--2022 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node International @chapter International Character Set Support diff --git a/doc/emacs/package.texi b/doc/emacs/package.texi index 570afd5be2..caa65bf33b 100644 --- a/doc/emacs/package.texi +++ b/doc/emacs/package.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985--1987, 1993--1995, 1997, 2000--2021 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 2000--2022 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @node Packages diff --git a/doc/emacs/picture-xtra.texi b/doc/emacs/picture-xtra.texi index a04b72d38d..f5c827ea17 100644 --- a/doc/emacs/picture-xtra.texi +++ b/doc/emacs/picture-xtra.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 2004--2021 Free Software Foundation, Inc. +@c Copyright (C) 2004--2022 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @c @c This file is included either in emacs-xtra.texi (when producing the diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi index 51a48df2e2..c3a70a5fc9 100644 --- a/doc/emacs/programs.texi +++ b/doc/emacs/programs.texi @@ -1,6 +1,6 @@ @c -*- coding: utf-8 -*- @c This is part of the Emacs manual. -@c Copyright (C) 1985--1987, 1993--1995, 1997, 1999--2021 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 1999--2022 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @node Programs diff --git a/doc/emacs/regs.texi b/doc/emacs/regs.texi index 59fa0ff0a1..665e944323 100644 --- a/doc/emacs/regs.texi +++ b/doc/emacs/regs.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985--1987, 1993--1995, 1997, 2001--2021 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 2001--2022 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @node Registers diff --git a/doc/emacs/rmail.texi b/doc/emacs/rmail.texi index e7ca2ae48b..e38bde036a 100644 --- a/doc/emacs/rmail.texi +++ b/doc/emacs/rmail.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985--1987, 1993--1995, 1997, 2001--2021 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 2001--2022 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @node Rmail diff --git a/doc/emacs/screen.texi b/doc/emacs/screen.texi index 2ff808e040..954d7a1c83 100644 --- a/doc/emacs/screen.texi +++ b/doc/emacs/screen.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985--1987, 1993--1995, 1997, 2001--2021 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 2001--2022 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @node Screen diff --git a/doc/emacs/search.texi b/doc/emacs/search.texi index fbbb1f6e68..4bf6832e2a 100644 --- a/doc/emacs/search.texi +++ b/doc/emacs/search.texi @@ -1,6 +1,6 @@ @c -*- coding: utf-8 -*- @c This is part of the Emacs manual. -@c Copyright (C) 1985--1987, 1993--1995, 1997, 2000--2021 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 2000--2022 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @node Search diff --git a/doc/emacs/sending.texi b/doc/emacs/sending.texi index 174e52ac9a..ea87e0a77b 100644 --- a/doc/emacs/sending.texi +++ b/doc/emacs/sending.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985--1987, 1993--1995, 1997, 2000--2021 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 2000--2022 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @node Sending Mail diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi index d711636ecf..8c09f62677 100644 --- a/doc/emacs/text.texi +++ b/doc/emacs/text.texi @@ -1,6 +1,6 @@ @c -*- coding: utf-8 -*- @c This is part of the Emacs manual. -@c Copyright (C) 1985--1987, 1993--1995, 1997, 2000--2021 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 2000--2022 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @node Text diff --git a/doc/emacs/trouble.texi b/doc/emacs/trouble.texi index 027086cab5..e966565f00 100644 --- a/doc/emacs/trouble.texi +++ b/doc/emacs/trouble.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985--1987, 1993--1995, 1997, 2001--2021 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 2001--2022 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @iftex diff --git a/doc/emacs/vc-xtra.texi b/doc/emacs/vc-xtra.texi index 51b9d66778..1ed2d62566 100644 --- a/doc/emacs/vc-xtra.texi +++ b/doc/emacs/vc-xtra.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 2004--2021 Free Software Foundation, Inc. +@c Copyright (C) 2004--2022 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @c @c This file is included in emacs-xtra.texi when producing the printed diff --git a/doc/emacs/vc1-xtra.texi b/doc/emacs/vc1-xtra.texi index 4cd00cba6c..2d984f4b92 100644 --- a/doc/emacs/vc1-xtra.texi +++ b/doc/emacs/vc1-xtra.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 2004--2021 Free Software Foundation, Inc. +@c Copyright (C) 2004--2022 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @c @c This file is included either in vc-xtra.texi (when producing the diff --git a/doc/emacs/windows.texi b/doc/emacs/windows.texi index 27c754133f..5a52b0ccb7 100644 --- a/doc/emacs/windows.texi +++ b/doc/emacs/windows.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985--1987, 1993--1995, 1997, 2000--2021 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 2000--2022 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @node Windows diff --git a/doc/emacs/xresources.texi b/doc/emacs/xresources.texi index 00fa6c0aa3..0c41524f5a 100644 --- a/doc/emacs/xresources.texi +++ b/doc/emacs/xresources.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1987, 1993--1995, 1997, 2001--2021 Free Software +@c Copyright (C) 1987, 1993--1995, 1997, 2001--2022 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @node X Resources diff --git a/doc/lispintro/ChangeLog.1 b/doc/lispintro/ChangeLog.1 index bb4323a773..a581faa73b 100644 --- a/doc/lispintro/ChangeLog.1 +++ b/doc/lispintro/ChangeLog.1 @@ -782,7 +782,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 2001-2021 Free Software Foundation, Inc. + Copyright (C) 2001-2022 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/doc/lispintro/Makefile.in b/doc/lispintro/Makefile.in index 294b310d67..d554f3d7a6 100644 --- a/doc/lispintro/Makefile.in +++ b/doc/lispintro/Makefile.in @@ -1,6 +1,6 @@ ### @configure_input@ -# Copyright (C) 1994-1999, 2001-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-1999, 2001-2022 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/doc/lispintro/README b/doc/lispintro/README index eca19c76a4..b6dc23bb90 100644 --- a/doc/lispintro/README +++ b/doc/lispintro/README @@ -1,4 +1,4 @@ -Copyright (C) 2001-2021 Free Software Foundation, Inc. +Copyright (C) 2001-2022 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/doc/lispintro/cons-1.eps b/doc/lispintro/cons-1.eps index 4877df7135..f2e445b851 100644 --- a/doc/lispintro/cons-1.eps +++ b/doc/lispintro/cons-1.eps @@ -4,7 +4,7 @@ %%CreationDate: Wed Mar 8 14:26:58 1995 %%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu) -% Copyright (C) 1995, 1997, 2001-2021 Free Software Foundation, Inc. +% Copyright (C) 1995, 1997, 2001-2022 Free Software Foundation, Inc. % % This file is part of GNU Emacs. % diff --git a/doc/lispintro/cons-2.eps b/doc/lispintro/cons-2.eps index 48fdc7e876..fd607021e7 100644 --- a/doc/lispintro/cons-2.eps +++ b/doc/lispintro/cons-2.eps @@ -4,7 +4,7 @@ %%CreationDate: Wed Mar 8 14:26:39 1995 %%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu) -% Copyright (C) 1995, 1997, 2001-2021 Free Software Foundation, Inc. +% Copyright (C) 1995, 1997, 2001-2022 Free Software Foundation, Inc. % % This file is part of GNU Emacs. % diff --git a/doc/lispintro/cons-2a.eps b/doc/lispintro/cons-2a.eps index 81053d3f26..23051ef7fc 100644 --- a/doc/lispintro/cons-2a.eps +++ b/doc/lispintro/cons-2a.eps @@ -4,7 +4,7 @@ %%CreationDate: Tue Mar 14 15:09:30 1995 %%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu) -% Copyright (C) 1995, 1997, 2001-2021 Free Software Foundation, Inc. +% Copyright (C) 1995, 1997, 2001-2022 Free Software Foundation, Inc. % % This file is part of GNU Emacs. % diff --git a/doc/lispintro/cons-3.eps b/doc/lispintro/cons-3.eps index e6a80f1c8b..24fb0e1100 100644 --- a/doc/lispintro/cons-3.eps +++ b/doc/lispintro/cons-3.eps @@ -4,7 +4,7 @@ %%CreationDate: Wed Mar 8 14:25:41 1995 %%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu) -% Copyright (C) 1995, 1997, 2001-2021 Free Software Foundation, Inc. +% Copyright (C) 1995, 1997, 2001-2022 Free Software Foundation, Inc. % % This file is part of GNU Emacs. % diff --git a/doc/lispintro/cons-4.eps b/doc/lispintro/cons-4.eps index c1aac9c09b..70a82103f5 100644 --- a/doc/lispintro/cons-4.eps +++ b/doc/lispintro/cons-4.eps @@ -4,7 +4,7 @@ %%CreationDate: Wed Mar 8 14:25:06 1995 %%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu) -% Copyright (C) 1995, 1997, 2001-2021 Free Software Foundation, Inc. +% Copyright (C) 1995, 1997, 2001-2022 Free Software Foundation, Inc. % % This file is part of GNU Emacs. % diff --git a/doc/lispintro/cons-5.eps b/doc/lispintro/cons-5.eps index a0918a92c5..03391127b0 100644 --- a/doc/lispintro/cons-5.eps +++ b/doc/lispintro/cons-5.eps @@ -4,7 +4,7 @@ %%CreationDate: Wed Mar 8 14:27:28 1995 %%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu) -% Copyright (C) 1995, 1997, 2001-2021 Free Software Foundation, Inc. +% Copyright (C) 1995, 1997, 2001-2022 Free Software Foundation, Inc. % % This file is part of GNU Emacs. % diff --git a/doc/lispintro/drawers.eps b/doc/lispintro/drawers.eps index 725bd9723c..7e3c83deb6 100644 --- a/doc/lispintro/drawers.eps +++ b/doc/lispintro/drawers.eps @@ -9,7 +9,7 @@ %%EndComments %%BeginProlog -% Copyright (C) 2001-2021 Free Software Foundation, Inc. +% Copyright (C) 2001-2022 Free Software Foundation, Inc. % % This file is part of GNU Emacs. % diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi index bd5decff66..8caf107a4c 100644 --- a/doc/lispintro/emacs-lisp-intro.texi +++ b/doc/lispintro/emacs-lisp-intro.texi @@ -117,7 +117,7 @@ Edition @value{edition-number}, @value{update-date} @sp 1 Distributed with Emacs version @value{EMACSVER}. @sp 1 -Copyright @copyright{} 1990--1995, 1997, 2001--2021 Free Software +Copyright @copyright{} 1990--1995, 1997, 2001--2022 Free Software Foundation, Inc. @sp 1 diff --git a/doc/lispintro/lambda-1.eps b/doc/lispintro/lambda-1.eps index 43b2d08aed..a9adeae357 100644 --- a/doc/lispintro/lambda-1.eps +++ b/doc/lispintro/lambda-1.eps @@ -4,7 +4,7 @@ %%CreationDate: Wed Mar 8 14:31:53 1995 %%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu) -% Copyright (C) 1995, 1997, 2001-2021 Free Software Foundation, Inc. +% Copyright (C) 1995, 1997, 2001-2022 Free Software Foundation, Inc. % % This file is part of GNU Emacs. % diff --git a/doc/lispintro/lambda-2.eps b/doc/lispintro/lambda-2.eps index c6c71f2b77..05cf437b1e 100644 --- a/doc/lispintro/lambda-2.eps +++ b/doc/lispintro/lambda-2.eps @@ -4,7 +4,7 @@ %%CreationDate: Wed Mar 8 14:33:09 1995 %%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu) -% Copyright (C) 1995, 1997, 2001-2021 Free Software Foundation, Inc. +% Copyright (C) 1995, 1997, 2001-2022 Free Software Foundation, Inc. % % This file is part of GNU Emacs. % diff --git a/doc/lispintro/lambda-3.eps b/doc/lispintro/lambda-3.eps index ae939d537f..8ff4c7c4fc 100644 --- a/doc/lispintro/lambda-3.eps +++ b/doc/lispintro/lambda-3.eps @@ -4,7 +4,7 @@ %%CreationDate: Wed Mar 8 14:33:49 1995 %%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu) -% Copyright (C) 1995, 1997, 2001-2021 Free Software Foundation, Inc. +% Copyright (C) 1995, 1997, 2001-2022 Free Software Foundation, Inc. % % This file is part of GNU Emacs. % diff --git a/doc/lispref/ChangeLog.1 b/doc/lispref/ChangeLog.1 index bd7a9c4e79..7c7d49967c 100644 --- a/doc/lispref/ChangeLog.1 +++ b/doc/lispref/ChangeLog.1 @@ -13989,7 +13989,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 1998-2021 Free Software Foundation, Inc. + Copyright (C) 1998-2022 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/doc/lispref/Makefile.in b/doc/lispref/Makefile.in index a7701c5f98..8a61adf232 100644 --- a/doc/lispref/Makefile.in +++ b/doc/lispref/Makefile.in @@ -1,6 +1,6 @@ ### @configure_input@ -# Copyright (C) 1990-1996, 1998-2021 Free Software Foundation, Inc. +# Copyright (C) 1990-1996, 1998-2022 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/doc/lispref/README b/doc/lispref/README index 9b99837130..70c0242123 100644 --- a/doc/lispref/README +++ b/doc/lispref/README @@ -1,4 +1,4 @@ -Copyright (C) 2001-2021 Free Software Foundation, Inc. -*- outline -*- +Copyright (C) 2001-2022 Free Software Foundation, Inc. -*- outline -*- See the end of the file for license conditions. diff --git a/doc/lispref/abbrevs.texi b/doc/lispref/abbrevs.texi index 71fac1ae3b..a366e9c7bc 100644 --- a/doc/lispref/abbrevs.texi +++ b/doc/lispref/abbrevs.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990--1994, 1999, 2001--2021 Free Software Foundation, +@c Copyright (C) 1990--1994, 1999, 2001--2022 Free Software Foundation, @c Inc. @c See the file elisp.texi for copying conditions. @node Abbrevs diff --git a/doc/lispref/anti.texi b/doc/lispref/anti.texi index 45cbff61e0..09103cbeab 100644 --- a/doc/lispref/anti.texi +++ b/doc/lispref/anti.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1999, 2002--2021 Free Software Foundation, Inc. +@c Copyright (C) 1999, 2002--2022 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @c This node must have no pointers. diff --git a/doc/lispref/back.texi b/doc/lispref/back.texi index c238863833..d0f56f49bc 100644 --- a/doc/lispref/back.texi +++ b/doc/lispref/back.texi @@ -1,6 +1,6 @@ \input texinfo @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 2001--2021 Free Software Foundation, Inc. +@c Copyright (C) 2001--2022 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @c @c %**start of header diff --git a/doc/lispref/backups.texi b/doc/lispref/backups.texi index 85a4f9e0ac..d99487368b 100644 --- a/doc/lispref/backups.texi +++ b/doc/lispref/backups.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990--1995, 1999, 2001--2021 Free Software Foundation, +@c Copyright (C) 1990--1995, 1999, 2001--2022 Free Software Foundation, @c Inc. @c See the file elisp.texi for copying conditions. @node Backups and Auto-Saving diff --git a/doc/lispref/buffers.texi b/doc/lispref/buffers.texi index 6a0095dca9..1fe5a60b35 100644 --- a/doc/lispref/buffers.texi +++ b/doc/lispref/buffers.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990--1995, 1998--1999, 2001--2021 Free Software +@c Copyright (C) 1990--1995, 1998--1999, 2001--2022 Free Software @c Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Buffers diff --git a/doc/lispref/commands.texi b/doc/lispref/commands.texi index 2f3d6148f6..0d13408e3f 100644 --- a/doc/lispref/commands.texi +++ b/doc/lispref/commands.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990--1995, 1998--1999, 2001--2021 Free Software +@c Copyright (C) 1990--1995, 1998--1999, 2001--2022 Free Software @c Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Command Loop diff --git a/doc/lispref/compile.texi b/doc/lispref/compile.texi index 1ca1f66b95..2b6ec849d2 100644 --- a/doc/lispref/compile.texi +++ b/doc/lispref/compile.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990--1994, 2001--2021 Free Software Foundation, Inc. +@c Copyright (C) 1990--1994, 2001--2022 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Byte Compilation @chapter Byte Compilation diff --git a/doc/lispref/control.texi b/doc/lispref/control.texi index 30676f0fb1..92cd67c126 100644 --- a/doc/lispref/control.texi +++ b/doc/lispref/control.texi @@ -1,6 +1,6 @@ @c -*- mode: texinfo; coding: utf-8 -*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990--1995, 1998--1999, 2001--2021 Free Software +@c Copyright (C) 1990--1995, 1998--1999, 2001--2022 Free Software @c Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Control Structures diff --git a/doc/lispref/customize.texi b/doc/lispref/customize.texi index b93b8bc015..9c635baccf 100644 --- a/doc/lispref/customize.texi +++ b/doc/lispref/customize.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1997--2021 Free Software Foundation, Inc. +@c Copyright (C) 1997--2022 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Customization @chapter Customization Settings diff --git a/doc/lispref/debugging.texi b/doc/lispref/debugging.texi index 6548437817..469ff2d943 100644 --- a/doc/lispref/debugging.texi +++ b/doc/lispref/debugging.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990--1994, 1998--1999, 2001--2021 Free Software +@c Copyright (C) 1990--1994, 1998--1999, 2001--2022 Free Software @c Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Debugging diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index b1fb9f8b95..66823c6556 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi @@ -1,6 +1,6 @@ @c -*- mode: texinfo; coding: utf-8 -*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990--1995, 1998--2021 Free Software Foundation, Inc. +@c Copyright (C) 1990--1995, 1998--2022 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Display @chapter Emacs Display diff --git a/doc/lispref/edebug.texi b/doc/lispref/edebug.texi index 7d67cc3af1..ed57802bed 100644 --- a/doc/lispref/edebug.texi +++ b/doc/lispref/edebug.texi @@ -1,6 +1,6 @@ @comment -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1992--1994, 1998--1999, 2001--2021 Free Software +@c Copyright (C) 1992--1994, 1998--1999, 2001--2022 Free Software @c Foundation, Inc. @c See the file elisp.texi for copying conditions. diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi index 6057691239..70cdaee292 100644 --- a/doc/lispref/elisp.texi +++ b/doc/lispref/elisp.texi @@ -99,7 +99,7 @@ This is the @cite{GNU Emacs Lisp Reference Manual} @end ifclear corresponding to Emacs version @value{EMACSVER}. -Copyright @copyright{} 1990--1996, 1998--2021 Free Software Foundation, +Copyright @copyright{} 1990--1996, 1998--2022 Free Software Foundation, Inc. @quotation diff --git a/doc/lispref/errors.texi b/doc/lispref/errors.texi index f848218e26..7e5372765f 100644 --- a/doc/lispref/errors.texi +++ b/doc/lispref/errors.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990--1993, 1999, 2001--2021 Free Software Foundation, +@c Copyright (C) 1990--1993, 1999, 2001--2022 Free Software Foundation, @c Inc. @c See the file elisp.texi for copying conditions. @node Standard Errors diff --git a/doc/lispref/eval.texi b/doc/lispref/eval.texi index e1998842cf..e94e222e6a 100644 --- a/doc/lispref/eval.texi +++ b/doc/lispref/eval.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990--1994, 1998, 2001--2021 Free Software Foundation, +@c Copyright (C) 1990--1994, 1998, 2001--2022 Free Software Foundation, @c Inc. @c See the file elisp.texi for copying conditions. @node Evaluation diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi index 1e05153f3c..08677f789a 100644 --- a/doc/lispref/files.texi +++ b/doc/lispref/files.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990--1995, 1998--1999, 2001--2021 Free Software +@c Copyright (C) 1990--1995, 1998--1999, 2001--2022 Free Software @c Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Files diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi index 3aab940842..fa033add0d 100644 --- a/doc/lispref/frames.texi +++ b/doc/lispref/frames.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990--1995, 1998--1999, 2001--2021 Free Software +@c Copyright (C) 1990--1995, 1998--1999, 2001--2022 Free Software @c Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Frames diff --git a/doc/lispref/functions.texi b/doc/lispref/functions.texi index c8f3b12080..06d5031179 100644 --- a/doc/lispref/functions.texi +++ b/doc/lispref/functions.texi @@ -1,6 +1,6 @@ @c -*- mode: texinfo; coding: utf-8 -*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990--1995, 1998--1999, 2001--2021 Free Software +@c Copyright (C) 1990--1995, 1998--1999, 2001--2022 Free Software @c Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Functions diff --git a/doc/lispref/hash.texi b/doc/lispref/hash.texi index 12c6a65907..a566d89824 100644 --- a/doc/lispref/hash.texi +++ b/doc/lispref/hash.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1999, 2001--2021 Free Software Foundation, Inc. +@c Copyright (C) 1999, 2001--2022 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Hash Tables @chapter Hash Tables diff --git a/doc/lispref/help.texi b/doc/lispref/help.texi index a48571838c..fb0d3c203c 100644 --- a/doc/lispref/help.texi +++ b/doc/lispref/help.texi @@ -1,6 +1,6 @@ @c -*- mode: texinfo; coding: utf-8 -*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990--1995, 1998--1999, 2001--2021 Free Software +@c Copyright (C) 1990--1995, 1998--1999, 2001--2022 Free Software @c Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Documentation diff --git a/doc/lispref/hooks.texi b/doc/lispref/hooks.texi index e9d1e270d8..107d036202 100644 --- a/doc/lispref/hooks.texi +++ b/doc/lispref/hooks.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990--1993, 1998, 2001--2021 Free Software Foundation, +@c Copyright (C) 1990--1993, 1998, 2001--2022 Free Software Foundation, @c Inc. @c See the file elisp.texi for copying conditions. @node Standard Hooks diff --git a/doc/lispref/internals.texi b/doc/lispref/internals.texi index d3edd63317..33664d949a 100644 --- a/doc/lispref/internals.texi +++ b/doc/lispref/internals.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990--1993, 1998--1999, 2001--2021 Free Software +@c Copyright (C) 1990--1993, 1998--1999, 2001--2022 Free Software @c Foundation, Inc. @c See the file elisp.texi for copying conditions. @node GNU Emacs Internals diff --git a/doc/lispref/intro.texi b/doc/lispref/intro.texi index c2ed96472b..5afd2f4ecf 100644 --- a/doc/lispref/intro.texi +++ b/doc/lispref/intro.texi @@ -1,6 +1,6 @@ @c -*-coding: utf-8-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990--1994, 2001--2021 Free Software Foundation, Inc. +@c Copyright (C) 1990--1994, 2001--2022 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Introduction diff --git a/doc/lispref/keymaps.texi b/doc/lispref/keymaps.texi index 4097c86f07..bda9301ffc 100644 --- a/doc/lispref/keymaps.texi +++ b/doc/lispref/keymaps.texi @@ -1,6 +1,6 @@ @c -*- mode: texinfo; coding: utf-8 -*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990--1994, 1998--2021 Free Software Foundation, Inc. +@c Copyright (C) 1990--1994, 1998--2022 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Keymaps @chapter Keymaps diff --git a/doc/lispref/lay-flat.texi b/doc/lispref/lay-flat.texi index 4ea58e6172..77820ed68e 100644 --- a/doc/lispref/lay-flat.texi +++ b/doc/lispref/lay-flat.texi @@ -1,6 +1,6 @@ \input texinfo @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 2001--2021 Free Software Foundation, Inc. +@c Copyright (C) 2001--2022 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @c @comment %**start of header diff --git a/doc/lispref/lists.texi b/doc/lispref/lists.texi index f98ae76da9..4a862ab0de 100644 --- a/doc/lispref/lists.texi +++ b/doc/lispref/lists.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990--1995, 1998--1999, 2001--2021 Free Software +@c Copyright (C) 1990--1995, 1998--1999, 2001--2022 Free Software @c Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Lists diff --git a/doc/lispref/loading.texi b/doc/lispref/loading.texi index 4d683da1ad..18c22142fe 100644 --- a/doc/lispref/loading.texi +++ b/doc/lispref/loading.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990--1995, 1998--1999, 2001--2021 Free Software +@c Copyright (C) 1990--1995, 1998--1999, 2001--2022 Free Software @c Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Loading diff --git a/doc/lispref/macros.texi b/doc/lispref/macros.texi index cf23ecb9d4..26a611613c 100644 --- a/doc/lispref/macros.texi +++ b/doc/lispref/macros.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990--1995, 1998, 2001--2021 Free Software Foundation, +@c Copyright (C) 1990--1995, 1998, 2001--2022 Free Software Foundation, @c Inc. @c See the file elisp.texi for copying conditions. @node Macros diff --git a/doc/lispref/maps.texi b/doc/lispref/maps.texi index 59c6e6f57a..90497728a1 100644 --- a/doc/lispref/maps.texi +++ b/doc/lispref/maps.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990--1993, 1999, 2001--2021 Free Software Foundation, +@c Copyright (C) 1990--1993, 1999, 2001--2022 Free Software Foundation, @c Inc. @c See the file elisp.texi for copying conditions. @node Standard Keymaps diff --git a/doc/lispref/markers.texi b/doc/lispref/markers.texi index 80f79b67e5..8362799b62 100644 --- a/doc/lispref/markers.texi +++ b/doc/lispref/markers.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990--1995, 1998--1999, 2001--2021 Free Software +@c Copyright (C) 1990--1995, 1998--1999, 2001--2022 Free Software @c Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Markers diff --git a/doc/lispref/minibuf.texi b/doc/lispref/minibuf.texi index 281e987e7f..f05f087ba7 100644 --- a/doc/lispref/minibuf.texi +++ b/doc/lispref/minibuf.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990--1995, 1998--1999, 2001--2021 Free Software +@c Copyright (C) 1990--1995, 1998--1999, 2001--2022 Free Software @c Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Minibuffers diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi index 5df3a74e78..1fafacb057 100644 --- a/doc/lispref/modes.texi +++ b/doc/lispref/modes.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990--1995, 1998--1999, 2001--2021 Free Software +@c Copyright (C) 1990--1995, 1998--1999, 2001--2022 Free Software @c Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Modes diff --git a/doc/lispref/nonascii.texi b/doc/lispref/nonascii.texi index 24117b5001..f495910fcd 100644 --- a/doc/lispref/nonascii.texi +++ b/doc/lispref/nonascii.texi @@ -1,6 +1,6 @@ @c -*- mode: texinfo; coding: utf-8 -*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1998--1999, 2001--2021 Free Software Foundation, Inc. +@c Copyright (C) 1998--1999, 2001--2022 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Non-ASCII Characters @chapter Non-@acronym{ASCII} Characters diff --git a/doc/lispref/numbers.texi b/doc/lispref/numbers.texi index d28e15869a..fdcda328d8 100644 --- a/doc/lispref/numbers.texi +++ b/doc/lispref/numbers.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990--1995, 1998--1999, 2001--2021 Free Software +@c Copyright (C) 1990--1995, 1998--1999, 2001--2022 Free Software @c Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Numbers diff --git a/doc/lispref/objects.texi b/doc/lispref/objects.texi index 0551bb5673..b8e2dc5ab9 100644 --- a/doc/lispref/objects.texi +++ b/doc/lispref/objects.texi @@ -1,6 +1,6 @@ @c -*- mode: texinfo; coding: utf-8 -*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990--1995, 1998--1999, 2001--2021 Free Software +@c Copyright (C) 1990--1995, 1998--1999, 2001--2022 Free Software @c Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Lisp Data Types diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi index db986178dd..a08af89878 100644 --- a/doc/lispref/os.texi +++ b/doc/lispref/os.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990--1995, 1998--1999, 2001--2021 Free Software +@c Copyright (C) 1990--1995, 1998--1999, 2001--2022 Free Software @c Foundation, Inc. @c See the file elisp.texi for copying conditions. @node System Interface diff --git a/doc/lispref/package.texi b/doc/lispref/package.texi index aeb455bb25..a503a7edde 100644 --- a/doc/lispref/package.texi +++ b/doc/lispref/package.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 2010--2021 Free Software Foundation, Inc. +@c Copyright (C) 2010--2022 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Packaging @chapter Preparing Lisp code for distribution diff --git a/doc/lispref/positions.texi b/doc/lispref/positions.texi index 769aeed75f..ca1166caac 100644 --- a/doc/lispref/positions.texi +++ b/doc/lispref/positions.texi @@ -1,6 +1,6 @@ @c -*- mode: texinfo; coding: utf-8 -*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990--1995, 1998--2021 Free Software Foundation, Inc. +@c Copyright (C) 1990--1995, 1998--2022 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Positions @chapter Positions diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi index 8a9cb2a8f8..3fa6c844ae 100644 --- a/doc/lispref/processes.texi +++ b/doc/lispref/processes.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990--1995, 1998--1999, 2001--2021 Free Software +@c Copyright (C) 1990--1995, 1998--1999, 2001--2022 Free Software @c Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Processes diff --git a/doc/lispref/records.texi b/doc/lispref/records.texi index 573caf1672..1408485100 100644 --- a/doc/lispref/records.texi +++ b/doc/lispref/records.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 2017--2021 Free Software Foundation, Inc. +@c Copyright (C) 2017--2022 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Records @chapter Records diff --git a/doc/lispref/searching.texi b/doc/lispref/searching.texi index ce79765b73..86f418442d 100644 --- a/doc/lispref/searching.texi +++ b/doc/lispref/searching.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990--1995, 1998--1999, 2001--2021 Free Software +@c Copyright (C) 1990--1995, 1998--1999, 2001--2022 Free Software @c Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Searching and Matching diff --git a/doc/lispref/sequences.texi b/doc/lispref/sequences.texi index 4a48d62f6d..c3f4cff301 100644 --- a/doc/lispref/sequences.texi +++ b/doc/lispref/sequences.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990--1995, 1998--1999, 2001--2021 Free Software +@c Copyright (C) 1990--1995, 1998--1999, 2001--2022 Free Software @c Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Sequences Arrays Vectors diff --git a/doc/lispref/streams.texi b/doc/lispref/streams.texi index 535fc958f2..c6b3397ae1 100644 --- a/doc/lispref/streams.texi +++ b/doc/lispref/streams.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990--1994, 1998--1999, 2001--2021 Free Software +@c Copyright (C) 1990--1994, 1998--1999, 2001--2022 Free Software @c Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Read and Print diff --git a/doc/lispref/strings.texi b/doc/lispref/strings.texi index 7212677d83..6a6b756fbe 100644 --- a/doc/lispref/strings.texi +++ b/doc/lispref/strings.texi @@ -1,6 +1,6 @@ @c -*- mode: texinfo; coding: utf-8 -*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990--1995, 1998--1999, 2001--2021 Free Software +@c Copyright (C) 1990--1995, 1998--1999, 2001--2022 Free Software @c Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Strings and Characters diff --git a/doc/lispref/symbols.texi b/doc/lispref/symbols.texi index b30a16927e..a951e9be8a 100644 --- a/doc/lispref/symbols.texi +++ b/doc/lispref/symbols.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990--1995, 1998--1999, 2001--2021 Free Software +@c Copyright (C) 1990--1995, 1998--1999, 2001--2022 Free Software @c Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Symbols diff --git a/doc/lispref/syntax.texi b/doc/lispref/syntax.texi index 87ade73c2a..9120e63727 100644 --- a/doc/lispref/syntax.texi +++ b/doc/lispref/syntax.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990--1995, 1998--1999, 2001--2021 Free Software +@c Copyright (C) 1990--1995, 1998--1999, 2001--2022 Free Software @c Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Syntax Tables diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi index f66cdfdbd1..013050c2ad 100644 --- a/doc/lispref/text.texi +++ b/doc/lispref/text.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990--1995, 1998--2021 Free Software Foundation, Inc. +@c Copyright (C) 1990--1995, 1998--2022 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Text @chapter Text diff --git a/doc/lispref/threads.texi b/doc/lispref/threads.texi index a06bd3e801..35513f7262 100644 --- a/doc/lispref/threads.texi +++ b/doc/lispref/threads.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 2012--2021 Free Software Foundation, Inc. +@c Copyright (C) 2012--2022 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Threads @chapter Threads diff --git a/doc/lispref/tips.texi b/doc/lispref/tips.texi index fa764f18b5..e15ed0cb7c 100644 --- a/doc/lispref/tips.texi +++ b/doc/lispref/tips.texi @@ -1,6 +1,6 @@ @c -*- mode: texinfo; coding: utf-8 -*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990--1993, 1995, 1998--1999, 2001--2021 Free Software +@c Copyright (C) 1990--1993, 1995, 1998--1999, 2001--2022 Free Software @c Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Tips diff --git a/doc/lispref/two-volume-cross-refs.txt b/doc/lispref/two-volume-cross-refs.txt index ad13d98dd9..e7bd4706c6 100644 --- a/doc/lispref/two-volume-cross-refs.txt +++ b/doc/lispref/two-volume-cross-refs.txt @@ -1,4 +1,4 @@ -Copyright (C) 2001-2021 Free Software Foundation, Inc. +Copyright (C) 2001-2022 Free Software Foundation, Inc. See end for copying conditions. Two Volume Cross References diff --git a/doc/lispref/two-volume.make b/doc/lispref/two-volume.make index cf612b1257..aaad040dc0 100644 --- a/doc/lispref/two-volume.make +++ b/doc/lispref/two-volume.make @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2021 Free Software Foundation, Inc. +# Copyright (C) 2007-2022 Free Software Foundation, Inc. # See end for copying conditions. # although it would be nice to use tex rather than pdftex to avoid diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi index a1d1919b4b..07979b0d91 100644 --- a/doc/lispref/variables.texi +++ b/doc/lispref/variables.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990--1995, 1998--2021 Free Software Foundation, Inc. +@c Copyright (C) 1990--1995, 1998--2022 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Variables @chapter Variables diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi index d988a0ff11..368059a718 100644 --- a/doc/lispref/windows.texi +++ b/doc/lispref/windows.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990--1995, 1998--1999, 2001--2021 Free Software +@c Copyright (C) 1990--1995, 1998--1999, 2001--2022 Free Software @c Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Windows diff --git a/doc/man/ChangeLog.1 b/doc/man/ChangeLog.1 index 9ad144a457..ff675d8947 100644 --- a/doc/man/ChangeLog.1 +++ b/doc/man/ChangeLog.1 @@ -176,7 +176,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 2007-2021 Free Software Foundation, Inc. + Copyright (C) 2007-2022 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/doc/man/ebrowse.1 b/doc/man/ebrowse.1 index 7bb32b80d4..7bacdbd93e 100644 --- a/doc/man/ebrowse.1 +++ b/doc/man/ebrowse.1 @@ -82,7 +82,7 @@ should give you access to the complete manual. was written by Gerd Moellmann. . .SH COPYING -Copyright 2008-2021 Free Software Foundation, Inc. +Copyright 2008-2022 Free Software Foundation, Inc. .PP Permission is granted to make and distribute verbatim copies of this document provided the copyright notice and this permission notice are diff --git a/doc/man/emacs.1.in b/doc/man/emacs.1.in index b2be8bb07b..9fdf65e0ff 100644 --- a/doc/man/emacs.1.in +++ b/doc/man/emacs.1.in @@ -660,7 +660,7 @@ For detailed credits and acknowledgments, see the GNU Emacs manual. . . .SH COPYING -Copyright 1995, 1999-2021 Free Software Foundation, Inc. +Copyright 1995, 1999-2022 Free Software Foundation, Inc. .PP Permission is granted to make and distribute verbatim copies of this document provided the copyright notice and this permission notice are diff --git a/doc/man/etags.1 b/doc/man/etags.1 index cbd3c1a646..d345b8bd73 100644 --- a/doc/man/etags.1 +++ b/doc/man/etags.1 @@ -288,7 +288,7 @@ Stallman. .BR vi ( 1 ). .SH COPYING -Copyright 1992, 1999, 2001-2021 Free Software Foundation, Inc. +Copyright 1992, 1999, 2001-2022 Free Software Foundation, Inc. .PP Permission is granted to make and distribute verbatim copies of this document provided the copyright notice and this permission notice are diff --git a/doc/misc/ChangeLog.1 b/doc/misc/ChangeLog.1 index be2a7cad1b..1ee3c14fb9 100644 --- a/doc/misc/ChangeLog.1 +++ b/doc/misc/ChangeLog.1 @@ -12116,7 +12116,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 1993-1999, 2001-2021 Free Software Foundation, Inc. + Copyright (C) 1993-1999, 2001-2022 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in index 7982c0dc5a..fab4edcc32 100644 --- a/doc/misc/Makefile.in +++ b/doc/misc/Makefile.in @@ -1,6 +1,6 @@ ### @configure_input@ -# Copyright (C) 1994, 1996-2021 Free Software Foundation, Inc. +# Copyright (C) 1994, 1996-2022 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/doc/misc/auth.texi b/doc/misc/auth.texi index 034004d1df..e4254faabb 100644 --- a/doc/misc/auth.texi +++ b/doc/misc/auth.texi @@ -9,7 +9,7 @@ @copying This file describes the Emacs auth-source library. -Copyright @copyright{} 2008--2021 Free Software Foundation, Inc. +Copyright @copyright{} 2008--2022 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/autotype.texi b/doc/misc/autotype.texi index 5f9dc01d33..a3b0f16df9 100644 --- a/doc/misc/autotype.texi +++ b/doc/misc/autotype.texi @@ -11,7 +11,7 @@ @c @cindex autotypist @copying -Copyright @copyright{} 1994--1995, 1999, 2001--2021 Free Software +Copyright @copyright{} 1994--1995, 1999, 2001--2022 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/bovine.texi b/doc/misc/bovine.texi index 9bfb117d1a..9d9aa48488 100644 --- a/doc/misc/bovine.texi +++ b/doc/misc/bovine.texi @@ -24,7 +24,7 @@ @c %**end of header @copying -Copyright @copyright{} 1999--2004, 2012--2021 Free Software Foundation, +Copyright @copyright{} 1999--2004, 2012--2022 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi index c77ccf766f..d83edc15f3 100644 --- a/doc/misc/calc.texi +++ b/doc/misc/calc.texi @@ -95,7 +95,7 @@ This file documents Calc, the GNU Emacs calculator, included with GNU Emacs @value{EMACSVER}. @end ifnotinfo -Copyright @copyright{} 1990--1991, 2001--2021 Free Software Foundation, +Copyright @copyright{} 1990--1991, 2001--2022 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi index 98ded68e71..9da18cd920 100644 --- a/doc/misc/cc-mode.texi +++ b/doc/misc/cc-mode.texi @@ -167,7 +167,7 @@ CC Mode @copying This manual is for CC Mode in Emacs. -Copyright @copyright{} 1995--2021 Free Software Foundation, Inc. +Copyright @copyright{} 1995--2022 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/cl.texi b/doc/misc/cl.texi index 0ec02495d5..9bace48df4 100644 --- a/doc/misc/cl.texi +++ b/doc/misc/cl.texi @@ -7,7 +7,7 @@ @copying This file documents the GNU Emacs Common Lisp emulation package. -Copyright @copyright{} 1993, 2001--2021 Free Software Foundation, Inc. +Copyright @copyright{} 1993, 2001--2022 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/dbus.texi b/doc/misc/dbus.texi index 6463687793..0b4f53ba13 100644 --- a/doc/misc/dbus.texi +++ b/doc/misc/dbus.texi @@ -10,7 +10,7 @@ @syncodeindex fn cp @copying -Copyright @copyright{} 2007--2021 Free Software Foundation, Inc. +Copyright @copyright{} 2007--2022 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/dired-x.texi b/doc/misc/dired-x.texi index 87a127c4f3..754ccf4065 100644 --- a/doc/misc/dired-x.texi +++ b/doc/misc/dired-x.texi @@ -20,7 +20,7 @@ @comment %**end of header (This is for running Texinfo on a region.) @copying -Copyright @copyright{} 1994--1995, 1999, 2001--2021 Free Software +Copyright @copyright{} 1994--1995, 1999, 2001--2022 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/ebrowse.texi b/doc/misc/ebrowse.texi index 8962f7c8cf..a2be0aedbc 100644 --- a/doc/misc/ebrowse.texi +++ b/doc/misc/ebrowse.texi @@ -11,7 +11,7 @@ @copying This file documents Ebrowse, a C++ class browser for GNU Emacs. -Copyright @copyright{} 2000--2021 Free Software Foundation, Inc. +Copyright @copyright{} 2000--2022 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/ede.texi b/doc/misc/ede.texi index 5e9c3d7eef..518b30fea8 100644 --- a/doc/misc/ede.texi +++ b/doc/misc/ede.texi @@ -6,7 +6,7 @@ @copying This file describes EDE, the Emacs Development Environment. -Copyright @copyright{} 1998--2001, 2004--2005, 2008--2021 Free Software +Copyright @copyright{} 1998--2001, 2004--2005, 2008--2022 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/ediff.texi b/doc/misc/ediff.texi index 8162a84f61..d81ba158a1 100644 --- a/doc/misc/ediff.texi +++ b/doc/misc/ediff.texi @@ -26,7 +26,7 @@ This file documents Ediff, a comprehensive visual interface to Unix diff and patch utilities. -Copyright @copyright{} 1995--2021 Free Software Foundation, Inc. +Copyright @copyright{} 1995--2022 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/edt.texi b/doc/misc/edt.texi index b4dabdb938..8b4ac0da5d 100644 --- a/doc/misc/edt.texi +++ b/doc/misc/edt.texi @@ -6,7 +6,7 @@ @copying This file documents the EDT emulation package for Emacs. -Copyright @copyright{} 1986, 1992, 1994--1995, 1999--2021 Free Software +Copyright @copyright{} 1986, 1992, 1994--1995, 1999--2022 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/efaq-w32.texi b/doc/misc/efaq-w32.texi index a5b5251d6e..20dcb07ed7 100644 --- a/doc/misc/efaq-w32.texi +++ b/doc/misc/efaq-w32.texi @@ -15,7 +15,7 @@ Answers to Frequently asked Questions about using Emacs on Microsoft Windows. @include emacsver.texi @copying -Copyright @copyright{} 2008, 2010--2021 Free Software Foundation, Inc. +Copyright @copyright{} 2008, 2010--2022 Free Software Foundation, Inc. @quotation This list of frequently asked questions about GNU Emacs on MS Windows diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi index 24bee6ad04..c1fd002bcb 100644 --- a/doc/misc/efaq.texi +++ b/doc/misc/efaq.texi @@ -8,7 +8,7 @@ @include emacsver.texi @copying -Copyright @copyright{} 2001--2021 Free Software Foundation, Inc.@* +Copyright @copyright{} 2001--2022 Free Software Foundation, Inc.@* Copyright @copyright{} 1994, 1995, 1996, 1997, 1998, 1999, 2000 Reuven M. Lerner@* Copyright @copyright{} 1992, 1993 Steven Byrnes@* diff --git a/doc/misc/eieio.texi b/doc/misc/eieio.texi index 63b4282731..a367a83eae 100644 --- a/doc/misc/eieio.texi +++ b/doc/misc/eieio.texi @@ -12,7 +12,7 @@ @copying This manual documents EIEIO, an object framework for Emacs Lisp. -Copyright @copyright{} 2007--2021 Free Software Foundation, Inc. +Copyright @copyright{} 2007--2022 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/emacs-gnutls.texi b/doc/misc/emacs-gnutls.texi index fbc4443c0a..1b9f5e1040 100644 --- a/doc/misc/emacs-gnutls.texi +++ b/doc/misc/emacs-gnutls.texi @@ -9,7 +9,7 @@ @copying This file describes the Emacs GnuTLS integration. -Copyright @copyright{} 2012--2021 Free Software Foundation, Inc. +Copyright @copyright{} 2012--2022 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/emacs-mime.texi b/doc/misc/emacs-mime.texi index 7cd3e5f582..ed9cccf489 100644 --- a/doc/misc/emacs-mime.texi +++ b/doc/misc/emacs-mime.texi @@ -10,7 +10,7 @@ @copying This file documents the Emacs MIME interface functionality. -Copyright @copyright{} 1998--2021 Free Software Foundation, Inc. +Copyright @copyright{} 1998--2022 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/epa.texi b/doc/misc/epa.texi index e777771cf7..70bfc0462b 100644 --- a/doc/misc/epa.texi +++ b/doc/misc/epa.texi @@ -10,7 +10,7 @@ @copying This file describes EasyPG Assistant @value{VERSION}. -Copyright @copyright{} 2007--2021 Free Software Foundation, Inc. +Copyright @copyright{} 2007--2022 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi index 73e24a4b36..46a465aaf4 100644 --- a/doc/misc/erc.texi +++ b/doc/misc/erc.texi @@ -10,7 +10,7 @@ @copying This manual is for ERC as distributed with Emacs @value{EMACSVER}. -Copyright @copyright{} 2005--2021 Free Software Foundation, Inc. +Copyright @copyright{} 2005--2022 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/ert.texi b/doc/misc/ert.texi index 5153829e2d..aeae6aef8c 100644 --- a/doc/misc/ert.texi +++ b/doc/misc/ert.texi @@ -15,7 +15,7 @@ @end direntry @copying -Copyright @copyright{} 2008, 2010--2021 Free Software Foundation, Inc. +Copyright @copyright{} 2008, 2010--2022 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/eshell.texi b/doc/misc/eshell.texi index c01ceb5fb9..4f1d8c15da 100644 --- a/doc/misc/eshell.texi +++ b/doc/misc/eshell.texi @@ -10,7 +10,7 @@ @copying This manual is for Eshell, the Emacs shell. -Copyright @copyright{} 1999--2021 Free Software Foundation, Inc. +Copyright @copyright{} 1999--2022 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/eudc.texi b/doc/misc/eudc.texi index b40277003c..e9cf4cfade 100644 --- a/doc/misc/eudc.texi +++ b/doc/misc/eudc.texi @@ -14,7 +14,7 @@ This file documents EUDC version 1.40.0. EUDC is the Emacs Unified Directory Client, a common interface to directory servers and contact information. -Copyright @copyright{} 1998, 2000--2021 Free Software Foundation, Inc. +Copyright @copyright{} 1998, 2000--2022 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/eww.texi b/doc/misc/eww.texi index ca752ec11b..248bd63e87 100644 --- a/doc/misc/eww.texi +++ b/doc/misc/eww.texi @@ -8,7 +8,7 @@ @copying This file documents the GNU Emacs Web Wowser (EWW) package. -Copyright @copyright{} 2014--2021 Free Software Foundation, Inc. +Copyright @copyright{} 2014--2022 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/flymake.texi b/doc/misc/flymake.texi index f741ee5d72..451d6c76c4 100644 --- a/doc/misc/flymake.texi +++ b/doc/misc/flymake.texi @@ -13,7 +13,7 @@ @copying This manual is for GNU Flymake (version @value{VERSION}, @value{UPDATED}). -Copyright @copyright{} 2004--2021 Free Software Foundation, Inc. +Copyright @copyright{} 2004--2022 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/forms.texi b/doc/misc/forms.texi index 15fcd97c5b..8c814b9c85 100644 --- a/doc/misc/forms.texi +++ b/doc/misc/forms.texi @@ -20,7 +20,7 @@ @copying This file documents Forms mode, a form-editing major mode for GNU Emacs. -Copyright @copyright{} 1989, 1997, 2001--2021 Free Software Foundation, +Copyright @copyright{} 1989, 1997, 2001--2022 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/gnus-coding.texi b/doc/misc/gnus-coding.texi index 94d952b423..0858432acf 100644 --- a/doc/misc/gnus-coding.texi +++ b/doc/misc/gnus-coding.texi @@ -8,7 +8,7 @@ @syncodeindex pg cp @copying -Copyright @copyright{} 2004--2005, 2007--2021 Free Software Foundation, +Copyright @copyright{} 2004--2005, 2007--2022 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/gnus-faq.texi b/doc/misc/gnus-faq.texi index 36c402ab35..14a8c4c12d 100644 --- a/doc/misc/gnus-faq.texi +++ b/doc/misc/gnus-faq.texi @@ -1,7 +1,7 @@ @c \input texinfo @c -*-texinfo-*- @c Uncomment 1st line before texing this file alone. @c %**start of header -@c Copyright (C) 1995, 2001--2021 Free Software Foundation, Inc. +@c Copyright (C) 1995, 2001--2022 Free Software Foundation, Inc. @c @c @setfilename gnus-faq.info @c @settitle Frequently Asked Questions diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index 6c892bc80a..479e7d9482 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -8,7 +8,7 @@ @syncodeindex pg cp @copying -Copyright @copyright{} 1995--2021 Free Software Foundation, Inc. +Copyright @copyright{} 1995--2022 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/htmlfontify.texi b/doc/misc/htmlfontify.texi index 1674565cda..71b594b108 100644 --- a/doc/misc/htmlfontify.texi +++ b/doc/misc/htmlfontify.texi @@ -10,7 +10,7 @@ This manual documents Htmlfontify, a source code -> crosslinked + formatted + syntax colorized html transformer. -Copyright @copyright{} 2002--2003, 2013--2021 Free Software Foundation, +Copyright @copyright{} 2002--2003, 2013--2022 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/idlwave.texi b/doc/misc/idlwave.texi index 3cd53c71da..46fe62693a 100644 --- a/doc/misc/idlwave.texi +++ b/doc/misc/idlwave.texi @@ -23,7 +23,7 @@ Emacs, and interacting with an IDL shell run as a subprocess. This is edition @value{EDITION} of the IDLWAVE User Manual for IDLWAVE @value{VERSION}. -Copyright @copyright{} 1999--2021 Free Software Foundation, Inc. +Copyright @copyright{} 1999--2022 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/ido.texi b/doc/misc/ido.texi index 1c960940a0..9e0f8dc877 100644 --- a/doc/misc/ido.texi +++ b/doc/misc/ido.texi @@ -7,7 +7,7 @@ @copying This file documents the Ido package for GNU Emacs. -Copyright @copyright{} 2013--2021 Free Software Foundation, Inc. +Copyright @copyright{} 2013--2022 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/info.texi b/doc/misc/info.texi index 27c00f3925..98e0dceb5a 100644 --- a/doc/misc/info.texi +++ b/doc/misc/info.texi @@ -15,7 +15,7 @@ This file describes how to use Info, the menu-driven GNU documentation system. -Copyright @copyright{} 1989, 1992, 1996--2021 Free Software Foundation, +Copyright @copyright{} 1989, 1992, 1996--2022 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/mairix-el.texi b/doc/misc/mairix-el.texi index d0ec552145..4414528f3b 100644 --- a/doc/misc/mairix-el.texi +++ b/doc/misc/mairix-el.texi @@ -5,7 +5,7 @@ @include docstyle.texi @copying -Copyright @copyright{} 2008--2021 Free Software Foundation, Inc. +Copyright @copyright{} 2008--2022 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/message.texi b/doc/misc/message.texi index 4136ad859f..b0510f0037 100644 --- a/doc/misc/message.texi +++ b/doc/misc/message.texi @@ -9,7 +9,7 @@ @copying This file documents Message, the Emacs message composition mode. -Copyright @copyright{} 1996--2021 Free Software Foundation, Inc. +Copyright @copyright{} 1996--2022 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/mh-e.texi b/doc/misc/mh-e.texi index bc788ebae0..d42f71a022 100644 --- a/doc/misc/mh-e.texi +++ b/doc/misc/mh-e.texi @@ -25,7 +25,7 @@ This is version @value{VERSION}@value{EDITION} of @cite{The MH-E Manual}, last updated @value{UPDATED}. -Copyright @copyright{} 1995, 2001--2003, 2005--2021 Free Software +Copyright @copyright{} 1995, 2001--2003, 2005--2022 Free Software Foundation, Inc. @c This dual license has been agreed upon by the FSF. diff --git a/doc/misc/modus-themes.org b/doc/misc/modus-themes.org index 9674a12e69..2c49cbdd72 100644 --- a/doc/misc/modus-themes.org +++ b/doc/misc/modus-themes.org @@ -42,7 +42,7 @@ Current development target is {{{development-version}}}. :custom_id: h:b14c3fcb-13dd-4144-9d92-2c58b3ed16d3 :end: -Copyright (C) 2020-2021 Free Software Foundation, Inc. +Copyright (C) 2020-2022 Free Software Foundation, Inc. #+begin_quote Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/newsticker.texi b/doc/misc/newsticker.texi index 5d052cc27d..92dba55c01 100644 --- a/doc/misc/newsticker.texi +++ b/doc/misc/newsticker.texi @@ -15,7 +15,7 @@ This manual documents Newsticker, a feed reader for Emacs. It corresponds to Emacs version @value{EMACSVER}. @noindent -Copyright @copyright{} 2004--2021 Free Software Foundation, Inc. +Copyright @copyright{} 2004--2022 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/nxml-mode.texi b/doc/misc/nxml-mode.texi index 4ca223d46c..206da82335 100644 --- a/doc/misc/nxml-mode.texi +++ b/doc/misc/nxml-mode.texi @@ -9,7 +9,7 @@ This manual documents nXML mode, an Emacs major mode for editing XML with RELAX NG support. -Copyright @copyright{} 2007--2021 Free Software Foundation, Inc. +Copyright @copyright{} 2007--2022 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/octave-mode.texi b/doc/misc/octave-mode.texi index e330606015..58fb8a49b6 100644 --- a/doc/misc/octave-mode.texi +++ b/doc/misc/octave-mode.texi @@ -6,7 +6,7 @@ @c %**end of header @copying -Copyright @copyright{} 1996--2021 Free Software Foundation, Inc. +Copyright @copyright{} 1996--2022 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/org-setup.org b/doc/misc/org-setup.org index d0392f10a2..88474538e5 100644 --- a/doc/misc/org-setup.org +++ b/doc/misc/org-setup.org @@ -1,6 +1,6 @@ # SETUPFILE for Org manual -# Copyright (C) 2021 Free Software Foundation, Inc. +# Copyright (C) 2021-2022 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/doc/misc/pcl-cvs.texi b/doc/misc/pcl-cvs.texi index 4ba067fd81..87807b5bda 100644 --- a/doc/misc/pcl-cvs.texi +++ b/doc/misc/pcl-cvs.texi @@ -7,7 +7,7 @@ @c %**end of header @copying -Copyright @copyright{} 1991--2021 Free Software Foundation, Inc. +Copyright @copyright{} 1991--2022 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/pgg.texi b/doc/misc/pgg.texi index e796da6da3..304c9c8ec8 100644 --- a/doc/misc/pgg.texi +++ b/doc/misc/pgg.texi @@ -10,7 +10,7 @@ This file describes PGG @value{VERSION}, an Emacs interface to various PGP implementations. -Copyright @copyright{} 2001, 2003--2021 Free Software Foundation, Inc. +Copyright @copyright{} 2001, 2003--2022 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/rcirc.texi b/doc/misc/rcirc.texi index 603bf42e0c..da214958d5 100644 --- a/doc/misc/rcirc.texi +++ b/doc/misc/rcirc.texi @@ -6,7 +6,7 @@ @c %**end of header @copying -Copyright @copyright{} 2006--2021 Free Software Foundation, Inc. +Copyright @copyright{} 2006--2022 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/reftex.texi b/doc/misc/reftex.texi index 8bde241e18..c3b7b0b0f6 100644 --- a/doc/misc/reftex.texi +++ b/doc/misc/reftex.texi @@ -46,7 +46,7 @@ This manual documents @RefTeX{} (version @value{VERSION}), a package to do labels, references, citations and indices for LaTeX documents with Emacs. -Copyright @copyright{} 1997--2021 Free Software Foundation, Inc. +Copyright @copyright{} 1997--2022 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/remember.texi b/doc/misc/remember.texi index 91e67a8798..a980c39616 100644 --- a/doc/misc/remember.texi +++ b/doc/misc/remember.texi @@ -10,7 +10,7 @@ @copying This manual is for Remember Mode, as distributed with Emacs @value{EMACSVER}. -Copyright @copyright{} 2001, 2004--2005, 2007--2021 Free Software +Copyright @copyright{} 2001, 2004--2005, 2007--2022 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/sasl.texi b/doc/misc/sasl.texi index 847ad5ed76..4ead5a5563 100644 --- a/doc/misc/sasl.texi +++ b/doc/misc/sasl.texi @@ -9,7 +9,7 @@ @copying This file describes the Emacs SASL library, version @value{VERSION}. -Copyright @copyright{} 2000, 2004--2021 Free Software Foundation, Inc. +Copyright @copyright{} 2000, 2004--2022 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/sc.texi b/doc/misc/sc.texi index 3f5b5917a0..3f6dcd022a 100644 --- a/doc/misc/sc.texi +++ b/doc/misc/sc.texi @@ -15,7 +15,7 @@ This document describes Supercite, an Emacs package for citing and attributing replies to mail and news messages. -Copyright @copyright{} 1993, 2001--2021 Free Software Foundation, Inc. +Copyright @copyright{} 1993, 2001--2022 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/sem-user.texi b/doc/misc/sem-user.texi index 70a19484e8..70ccdf4a61 100644 --- a/doc/misc/sem-user.texi +++ b/doc/misc/sem-user.texi @@ -1,5 +1,5 @@ @c This is part of the Semantic manual. -@c Copyright (C) 1999--2005, 2007, 2009--2021 Free Software Foundation, +@c Copyright (C) 1999--2005, 2007, 2009--2022 Free Software Foundation, @c Inc. @c See file semantic.texi for copying conditions. diff --git a/doc/misc/semantic.texi b/doc/misc/semantic.texi index 3c4f2f0c0e..eb5c7e0e67 100644 --- a/doc/misc/semantic.texi +++ b/doc/misc/semantic.texi @@ -25,7 +25,7 @@ @copying This manual documents the Semantic library and utilities. -Copyright @copyright{} 1999--2005, 2007, 2009--2021 Free Software +Copyright @copyright{} 1999--2005, 2007, 2009--2022 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/ses.texi b/doc/misc/ses.texi index b529f0b836..0acb7bf3f1 100644 --- a/doc/misc/ses.texi +++ b/doc/misc/ses.texi @@ -12,7 +12,7 @@ @copying This file documents @acronym{SES}: the Simple Emacs Spreadsheet. -Copyright @copyright{} 2002--2021 Free Software Foundation, Inc. +Copyright @copyright{} 2002--2022 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/sieve.texi b/doc/misc/sieve.texi index c30409fc32..df03dd0144 100644 --- a/doc/misc/sieve.texi +++ b/doc/misc/sieve.texi @@ -10,7 +10,7 @@ @copying This file documents the Emacs Sieve package, for server-side mail filtering. -Copyright @copyright{} 2001--2021 Free Software Foundation, Inc. +Copyright @copyright{} 2001--2022 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/smtpmail.texi b/doc/misc/smtpmail.texi index f5d567533b..2e0381138f 100644 --- a/doc/misc/smtpmail.texi +++ b/doc/misc/smtpmail.texi @@ -4,7 +4,7 @@ @include docstyle.texi @syncodeindex vr fn @copying -Copyright @copyright{} 2003--2021 Free Software Foundation, Inc. +Copyright @copyright{} 2003--2022 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/speedbar.texi b/doc/misc/speedbar.texi index 70d4b05416..8368f198a3 100644 --- a/doc/misc/speedbar.texi +++ b/doc/misc/speedbar.texi @@ -5,7 +5,7 @@ @syncodeindex fn cp @copying -Copyright @copyright{} 1999--2021 Free Software Foundation, Inc. +Copyright @copyright{} 1999--2022 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/srecode.texi b/doc/misc/srecode.texi index 1f7473c151..9b1578ec0e 100644 --- a/doc/misc/srecode.texi +++ b/doc/misc/srecode.texi @@ -16,7 +16,7 @@ @c %**end of header @copying -Copyright @copyright{} 2007--2021 Free Software Foundation, Inc. +Copyright @copyright{} 2007--2022 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/texinfo.tex b/doc/misc/texinfo.tex index e48383defc..0d86b25dc4 100644 --- a/doc/misc/texinfo.tex +++ b/doc/misc/texinfo.tex @@ -5,7 +5,7 @@ % \def\texinfoversion{2021-04-25.21} % -% Copyright 1985, 1986, 1988, 1990-2021 Free Software Foundation, Inc. +% Copyright 1985--1986, 1988, 1990--2022 Free Software Foundation, Inc. % % This texinfo.tex file is free software: you can redistribute it and/or % modify it under the terms of the GNU General Public License as diff --git a/doc/misc/todo-mode.texi b/doc/misc/todo-mode.texi index b3ea652a7e..85603cf593 100644 --- a/doc/misc/todo-mode.texi +++ b/doc/misc/todo-mode.texi @@ -9,7 +9,7 @@ @c %**end of header @copying -Copyright @copyright{} 2013--2021 Free Software Foundation, Inc. +Copyright @copyright{} 2013--2022 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi index 27ad912523..ae7031e798 100644 --- a/doc/misc/tramp.texi +++ b/doc/misc/tramp.texi @@ -12,7 +12,7 @@ @footnotestyle end @copying -Copyright @copyright{} 1999--2021 Free Software Foundation, Inc. +Copyright @copyright{} 1999--2022 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/trampver.texi b/doc/misc/trampver.texi index e9fbacc792..ac44c27b0d 100644 --- a/doc/misc/trampver.texi +++ b/doc/misc/trampver.texi @@ -2,7 +2,7 @@ @c texi/trampver.texi. Generated from trampver.texi.in by configure. @c This is part of the Emacs manual. -@c Copyright (C) 2003--2021 Free Software Foundation, Inc. +@c Copyright (C) 2003--2022 Free Software Foundation, Inc. @c See file doclicense.texi for copying conditions. @c In the Tramp GIT, the version numbers are auto-frobbed from diff --git a/doc/misc/url.texi b/doc/misc/url.texi index 90e38e5d30..a9d06d7f5b 100644 --- a/doc/misc/url.texi +++ b/doc/misc/url.texi @@ -21,7 +21,7 @@ @copying This is the manual for the @code{url} Emacs Lisp library. -Copyright @copyright{} 1993--1999, 2002, 2004--2021 Free Software +Copyright @copyright{} 1993--1999, 2002, 2004--2022 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/vhdl-mode.texi b/doc/misc/vhdl-mode.texi index fef98a7463..75e8747412 100644 --- a/doc/misc/vhdl-mode.texi +++ b/doc/misc/vhdl-mode.texi @@ -10,7 +10,7 @@ @copying This file documents VHDL Mode, an Emacs mode for editing VHDL code. -Copyright @copyright{} 1995--2008, 2010, 2012, 2015--2021 Free Software +Copyright @copyright{} 1995--2008, 2010, 2012, 2015--2022 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/vip.texi b/doc/misc/vip.texi index 92c76ad251..df65d70cb1 100644 --- a/doc/misc/vip.texi +++ b/doc/misc/vip.texi @@ -4,7 +4,7 @@ @include docstyle.texi @copying -Copyright @copyright{} 1987, 2001--2021 Free Software Foundation, Inc. +Copyright @copyright{} 1987, 2001--2022 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/viper.texi b/doc/misc/viper.texi index e127f62bb5..b0deb31d10 100644 --- a/doc/misc/viper.texi +++ b/doc/misc/viper.texi @@ -8,7 +8,7 @@ @include docstyle.texi @copying -Copyright @copyright{} 1995--1997, 2001--2021 Free Software Foundation, +Copyright @copyright{} 1995--1997, 2001--2022 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/widget.texi b/doc/misc/widget.texi index 7fd9212d71..c84b49a038 100644 --- a/doc/misc/widget.texi +++ b/doc/misc/widget.texi @@ -9,7 +9,7 @@ @c %**end of header @copying -Copyright @copyright{} 2000--2021 Free Software Foundation, Inc. +Copyright @copyright{} 2000--2022 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/wisent.texi b/doc/misc/wisent.texi index c0bb7b10a4..07240e5dd3 100644 --- a/doc/misc/wisent.texi +++ b/doc/misc/wisent.texi @@ -24,7 +24,7 @@ @c %**end of header @copying -Copyright @copyright{} 1988--1993, 1995, 1998--2004, 2007, 2012--2021 +Copyright @copyright{} 1988--1993, 1995, 1998--2004, 2007, 2012--2022 Free Software Foundation, Inc. @c Since we are both GNU manuals, we do not need to ack each other here. diff --git a/doc/misc/woman.texi b/doc/misc/woman.texi index 33b3a33f0f..d300cd3a3d 100644 --- a/doc/misc/woman.texi +++ b/doc/misc/woman.texi @@ -15,7 +15,7 @@ This file documents WoMan: A program to browse Unix manual pages ``W.O. (without) man''. -Copyright @copyright{} 2001--2021 Free Software Foundation, Inc. +Copyright @copyright{} 2001--2022 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/etc/CALC-NEWS b/etc/CALC-NEWS index da9ed66f15..217e16c108 100644 --- a/etc/CALC-NEWS +++ b/etc/CALC-NEWS @@ -1,4 +1,4 @@ -Copyright (C) 2001-2021 Free Software Foundation, Inc. +Copyright (C) 2001-2022 Free Software Foundation, Inc. See the end of the file for license conditions. Calc is an advanced desk calculator for GNU Emacs. diff --git a/etc/ChangeLog.1 b/etc/ChangeLog.1 index 629ab0b1fd..32ae5cf3bc 100644 --- a/etc/ChangeLog.1 +++ b/etc/ChangeLog.1 @@ -6891,7 +6891,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 1993-1999, 2001-2021 Free Software Foundation, Inc. + Copyright (C) 1993-1999, 2001-2022 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/etc/DEBUG b/etc/DEBUG index a05aeef160..dd33b42f19 100644 --- a/etc/DEBUG +++ b/etc/DEBUG @@ -1,6 +1,6 @@ Debugging GNU Emacs -Copyright (C) 1985, 2000-2021 Free Software Foundation, Inc. +Copyright (C) 1985, 2000-2022 Free Software Foundation, Inc. See the end of the file for license conditions. ** Preliminaries diff --git a/etc/DISTRIB b/etc/DISTRIB index 3dd1bf3d98..a60d140aa6 100644 --- a/etc/DISTRIB +++ b/etc/DISTRIB @@ -1,7 +1,7 @@ -*- text -*- GNU Emacs availability information -Copyright (C) 1986-1993, 1995, 1998, 2000-2021 Free Software Foundation, +Copyright (C) 1986-1993, 1995, 1998, 2000-2022 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/etc/ERC-NEWS b/etc/ERC-NEWS index f533c58aa4..a345bdf952 100644 --- a/etc/ERC-NEWS +++ b/etc/ERC-NEWS @@ -1,6 +1,6 @@ ERC NEWS -*- outline -*- -Copyright (C) 2006-2021 Free Software Foundation, Inc. +Copyright (C) 2006-2022 Free Software Foundation, Inc. See the end of the file for license conditions. Please send ERC bug reports to 'bug-gnu-emacs@gnu.org', diff --git a/etc/ETAGS.EBNF b/etc/ETAGS.EBNF index c72ac6f721..ac89e7436a 100644 --- a/etc/ETAGS.EBNF +++ b/etc/ETAGS.EBNF @@ -94,7 +94,7 @@ those. ===================== end of discussion of tag names ===================== -Copyright (C) 2002-2021 Free Software Foundation, Inc. +Copyright (C) 2002-2022 Free Software Foundation, Inc. COPYING PERMISSIONS: diff --git a/etc/ETAGS.README b/etc/ETAGS.README index 3c56021524..af1bf10566 100644 --- a/etc/ETAGS.README +++ b/etc/ETAGS.README @@ -28,7 +28,7 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -Copyright (C) 1984, 1987-1989, 1993-1995, 1998-2021 Free Software +Copyright (C) 1984, 1987-1989, 1993-1995, 1998-2022 Free Software Foundation, Inc. This file is not considered part of GNU Emacs. diff --git a/etc/HELLO b/etc/HELLO index 8bd489fb40..5b2002ff93 100644 --- a/etc/HELLO +++ b/etc/HELLO @@ -96,7 +96,7 @@ Vietnamese (tiếng Việt) Chào bạn -Copyright (C) 2001-2021 Free Software Foundation, Inc. +Copyright (C) 2001-2022 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/etc/MACHINES b/etc/MACHINES index d8d0b86fb4..012002da5f 100644 --- a/etc/MACHINES +++ b/etc/MACHINES @@ -1,6 +1,6 @@ Emacs machines list -Copyright (C) 1989-1990, 1992-1993, 1998, 2001-2021 Free Software +Copyright (C) 1989-1990, 1992-1993, 1998, 2001-2022 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/etc/MH-E-NEWS b/etc/MH-E-NEWS index 29c48c7214..9bcfc40af2 100644 --- a/etc/MH-E-NEWS +++ b/etc/MH-E-NEWS @@ -1,6 +1,6 @@ * COPYRIGHT -Copyright (C) 2001-2021 Free Software Foundation, Inc. +Copyright (C) 2001-2022 Free Software Foundation, Inc. See the end of the file for license conditions. * Changes in MH-E 8.6 diff --git a/etc/NEWS b/etc/NEWS index f1bf2fe67d..f007c00b89 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -1,6 +1,6 @@ GNU Emacs NEWS -- history of user-visible changes. -Copyright (C) 2019-2021 Free Software Foundation, Inc. +Copyright (C) 2019-2022 Free Software Foundation, Inc. See the end of the file for license conditions. Please send Emacs bug reports to 'bug-gnu-emacs@gnu.org'. diff --git a/etc/NEWS.1-17 b/etc/NEWS.1-17 index 42a3ced1c3..ee6fa82b29 100644 --- a/etc/NEWS.1-17 +++ b/etc/NEWS.1-17 @@ -1,6 +1,6 @@ GNU Emacs NEWS -- history of user-visible changes. 26-Mar-1986 -Copyright (C) 1985-1986, 2006-2021 Free Software Foundation, Inc. +Copyright (C) 1985-1986, 2006-2022 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/etc/NEWS.18 b/etc/NEWS.18 index b11a189c30..78d63e5db7 100644 --- a/etc/NEWS.18 +++ b/etc/NEWS.18 @@ -1,6 +1,6 @@ GNU Emacs NEWS -- history of user-visible changes. 17-Aug-1988 -Copyright (C) 1988, 2006-2021 Free Software Foundation, Inc. +Copyright (C) 1988, 2006-2022 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/etc/NEWS.19 b/etc/NEWS.19 index fd91c0842f..7eb4deaeba 100644 --- a/etc/NEWS.19 +++ b/etc/NEWS.19 @@ -1,6 +1,6 @@ GNU Emacs NEWS -- history of user-visible changes. 1992. -Copyright (C) 1993-1995, 2001, 2006-2021 Free Software Foundation, Inc. +Copyright (C) 1993-1995, 2001, 2006-2022 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/etc/NEWS.20 b/etc/NEWS.20 index efd0e5d5c2..2a9b0b2d25 100644 --- a/etc/NEWS.20 +++ b/etc/NEWS.20 @@ -1,6 +1,6 @@ GNU Emacs NEWS -- history of user-visible changes. 2006-05-31 -Copyright (C) 1999-2001, 2006-2021 Free Software Foundation, Inc. +Copyright (C) 1999-2001, 2006-2022 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/etc/NEWS.21 b/etc/NEWS.21 index b9d59594a4..52d2eb6c52 100644 --- a/etc/NEWS.21 +++ b/etc/NEWS.21 @@ -1,6 +1,6 @@ GNU Emacs NEWS -- history of user-visible changes. 2006-05-31 -Copyright (C) 2000-2021 Free Software Foundation, Inc. +Copyright (C) 2000-2022 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/etc/NEWS.22 b/etc/NEWS.22 index 1f03dc3a13..be3167dace 100644 --- a/etc/NEWS.22 +++ b/etc/NEWS.22 @@ -1,6 +1,6 @@ GNU Emacs NEWS -- history of user-visible changes. -Copyright (C) 2001-2021 Free Software Foundation, Inc. +Copyright (C) 2001-2022 Free Software Foundation, Inc. See the end of the file for license conditions. Please send Emacs bug reports to bug-gnu-emacs@gnu.org. diff --git a/etc/NEWS.23 b/etc/NEWS.23 index 8611ba53d2..da483c3e7b 100644 --- a/etc/NEWS.23 +++ b/etc/NEWS.23 @@ -1,6 +1,6 @@ GNU Emacs NEWS -- history of user-visible changes. -Copyright (C) 2007-2021 Free Software Foundation, Inc. +Copyright (C) 2007-2022 Free Software Foundation, Inc. See the end of the file for license conditions. Please send Emacs bug reports to bug-gnu-emacs@gnu.org. diff --git a/etc/NEWS.24 b/etc/NEWS.24 index acf6219f74..0fd4037ed0 100644 --- a/etc/NEWS.24 +++ b/etc/NEWS.24 @@ -1,6 +1,6 @@ GNU Emacs NEWS -- history of user-visible changes. -Copyright (C) 2010-2021 Free Software Foundation, Inc. +Copyright (C) 2010-2022 Free Software Foundation, Inc. See the end of the file for license conditions. Please send Emacs bug reports to bug-gnu-emacs@gnu.org. diff --git a/etc/NEWS.25 b/etc/NEWS.25 index c533f27709..21fcd052dc 100644 --- a/etc/NEWS.25 +++ b/etc/NEWS.25 @@ -1,6 +1,6 @@ GNU Emacs NEWS -- history of user-visible changes. -Copyright (C) 2014-2021 Free Software Foundation, Inc. +Copyright (C) 2014-2022 Free Software Foundation, Inc. See the end of the file for license conditions. Please send Emacs bug reports to bug-gnu-emacs@gnu.org. diff --git a/etc/NEWS.26 b/etc/NEWS.26 index 05e8672625..a78baaea5f 100644 --- a/etc/NEWS.26 +++ b/etc/NEWS.26 @@ -1,6 +1,6 @@ GNU Emacs NEWS -- history of user-visible changes. -Copyright (C) 2016-2021 Free Software Foundation, Inc. +Copyright (C) 2016-2022 Free Software Foundation, Inc. See the end of the file for license conditions. Please send Emacs bug reports to 'bug-gnu-emacs@gnu.org'. diff --git a/etc/NEWS.27 b/etc/NEWS.27 index e47f408be9..6e116533c5 100644 --- a/etc/NEWS.27 +++ b/etc/NEWS.27 @@ -1,6 +1,6 @@ GNU Emacs NEWS -- history of user-visible changes. -Copyright (C) 2017-2021 Free Software Foundation, Inc. +Copyright (C) 2017-2022 Free Software Foundation, Inc. See the end of the file for license conditions. Please send Emacs bug reports to 'bug-gnu-emacs@gnu.org'. diff --git a/etc/NEXTSTEP b/etc/NEXTSTEP index 5dd2e646ed..dacbed2045 100644 --- a/etc/NEXTSTEP +++ b/etc/NEXTSTEP @@ -1,4 +1,4 @@ -Copyright (C) 2008-2021 Free Software Foundation, Inc. +Copyright (C) 2008-2022 Free Software Foundation, Inc. See the end of the file for license conditions. This file contains information about GNU Emacs on "Nextstep" platforms. diff --git a/etc/NXML-NEWS b/etc/NXML-NEWS index cdce6e72ba..b5301ee2cf 100644 --- a/etc/NXML-NEWS +++ b/etc/NXML-NEWS @@ -1,4 +1,4 @@ -Copyright (C) 2007-2021 Free Software Foundation, Inc. +Copyright (C) 2007-2022 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS index 5e7813ca7f..e4bb706e08 100644 --- a/etc/ORG-NEWS +++ b/etc/ORG-NEWS @@ -6,7 +6,7 @@ ORG NEWS -- history of user-visible changes. -*- mode: org; coding: utf-8 -*- #+LINK: msg https://list.orgmode.org/%s/ #+LINK: git https://git.savannah.gnu.org/cgit/emacs/org-mode.git/commit/?id=%s -Copyright (C) 2012-2021 Free Software Foundation, Inc. +Copyright (C) 2012-2022 Free Software Foundation, Inc. See the end of the file for license conditions. Please send Org bug reports to mailto:emacs-orgmode@gnu.org. diff --git a/etc/PROBLEMS b/etc/PROBLEMS index f94d8492d5..eb685e5bfb 100644 --- a/etc/PROBLEMS +++ b/etc/PROBLEMS @@ -1,6 +1,6 @@ Known Problems with GNU Emacs -Copyright (C) 1987-1989, 1993-1999, 2001-2021 Free Software Foundation, +Copyright (C) 1987-1989, 1993-1999, 2001-2022 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/etc/README b/etc/README index 6d7a15a6f2..d343160b50 100644 --- a/etc/README +++ b/etc/README @@ -7,5 +7,5 @@ COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES File: emacs.icon Author: Sun Microsystems, Inc - Copyright (C) 1999, 2001-2021 Free Software Foundation, Inc. + Copyright (C) 1999, 2001-2022 Free Software Foundation, Inc. License: GNU General Public License version 3 or later (see COPYING) diff --git a/etc/TERMS b/etc/TERMS index 80b39c80e9..ed7d0d09de 100644 --- a/etc/TERMS +++ b/etc/TERMS @@ -1,4 +1,4 @@ -Copyright (C) 1999, 2001-2021 Free Software Foundation, Inc. +Copyright (C) 1999, 2001-2022 Free Software Foundation, Inc. See the end of the file for copying permissions. This file describes what you must or might want to do to termcap entries diff --git a/etc/TODO b/etc/TODO index cd06b1ea26..a2c08d394d 100644 --- a/etc/TODO +++ b/etc/TODO @@ -1,6 +1,6 @@ Emacs TODO List -*-outline-*- -Copyright (C) 2001-2021 Free Software Foundation, Inc. +Copyright (C) 2001-2022 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/etc/charsets/README b/etc/charsets/README index 96cba7c613..e513fcb815 100644 --- a/etc/charsets/README +++ b/etc/charsets/README @@ -1,6 +1,6 @@ # README file for charset mapping files in this directory. -# Copyright (C) 2003-2021 Free Software Foundation, Inc. +# Copyright (C) 2003-2022 Free Software Foundation, Inc. # Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 # National Institute of Advanced Industrial Science and Technology (AIST) # Registration Number H13PRO009 diff --git a/etc/compilation.txt b/etc/compilation.txt index 01d4df1b09..b74a275043 100644 --- a/etc/compilation.txt +++ b/etc/compilation.txt @@ -676,7 +676,7 @@ Compilation segmentation fault at Thu Jul 13 10:55:49 Compilation finished at Thu Jul 21 15:02:15 -Copyright (C) 2004-2021 Free Software Foundation, Inc. +Copyright (C) 2004-2022 Free Software Foundation, Inc. COPYING PERMISSIONS: diff --git a/etc/edt-user.el b/etc/edt-user.el index 8e1a599f0d..fbeadc8789 100644 --- a/etc/edt-user.el +++ b/etc/edt-user.el @@ -1,6 +1,6 @@ ;;; edt-user.el --- Sample user customizations for Emacs EDT emulation -*- lexical-binding: t -*- -;; Copyright (C) 1986, 1992-1993, 2000-2021 Free Software Foundation, +;; Copyright (C) 1986, 1992-1993, 2000-2022 Free Software Foundation, ;; Inc. ;; Author: Kevin Gallagher diff --git a/etc/emacs-buffer.gdb b/etc/emacs-buffer.gdb index 41af836599..96320b157a 100644 --- a/etc/emacs-buffer.gdb +++ b/etc/emacs-buffer.gdb @@ -1,6 +1,6 @@ # emacs-buffer.gdb --- gdb macros for recovering buffers from emacs coredumps -# Copyright (C) 2005-2021 Free Software Foundation, Inc. +# Copyright (C) 2005-2022 Free Software Foundation, Inc. # Author: Noah Friedman # Created: 2005-04-28 diff --git a/etc/emacs.metainfo.xml b/etc/emacs.metainfo.xml index 7467b88e73..11df8a7159 100644 --- a/etc/emacs.metainfo.xml +++ b/etc/emacs.metainfo.xml @@ -1,5 +1,5 @@ - + org.gnu.emacs GFDL-1.3+ diff --git a/etc/enriched.txt b/etc/enriched.txt index dd269e313c..5c74c610ae 100644 --- a/etc/enriched.txt +++ b/etc/enriched.txt @@ -253,7 +253,7 @@ it. -Copyright (C) 1995, 1997, 2001-2021 Free Software Foundation, Inc. +Copyright (C) 1995, 1997, 2001-2022 Free Software Foundation, Inc. COPYING PERMISSIONS: diff --git a/etc/forms/forms-d2.el b/etc/forms/forms-d2.el index cd4231cf2d..a333441f34 100644 --- a/etc/forms/forms-d2.el +++ b/etc/forms/forms-d2.el @@ -1,6 +1,6 @@ ;;; forms-d2.el --- demo forms-mode -*- lexical-binding:t -*- -;; Copyright (C) 1991, 1994-1997, 2001-2021 Free Software Foundation, +;; Copyright (C) 1991, 1994-1997, 2001-2022 Free Software Foundation, ;; Inc. ;; Author: Johan Vromans diff --git a/etc/gnus-tut.txt b/etc/gnus-tut.txt index 27e868b79c..8ab718f5d2 100644 --- a/etc/gnus-tut.txt +++ b/etc/gnus-tut.txt @@ -24,7 +24,7 @@ was done by moi, yours truly, your humble servant, Lars Magne Ingebrigtsen. If you have a WWW browser, you can investigate to your heart's delight at . -;; Copyright (C) 1995, 2001-2021 Free Software Foundation, Inc. +;; Copyright (C) 1995, 2001-2022 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news diff --git a/etc/grep.txt b/etc/grep.txt index 0370ae4e2c..ff90553d88 100644 --- a/etc/grep.txt +++ b/etc/grep.txt @@ -104,7 +104,7 @@ grep -nH -e "xyzxyz" ../info/* * Miscellaneous -Copyright (C) 2005-2021 Free Software Foundation, Inc. +Copyright (C) 2005-2022 Free Software Foundation, Inc. COPYING PERMISSIONS: diff --git a/etc/images/README b/etc/images/README index 9bbe796cc9..bb1cefea19 100644 --- a/etc/images/README +++ b/etc/images/README @@ -27,7 +27,7 @@ COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES File: mh-logo.xpm Author: Satyaki Das - Copyright (C) 2003-2021 Free Software Foundation, Inc. + Copyright (C) 2003-2022 Free Software Foundation, Inc. Files: gnus.pbm Author: Luis Fernandes diff --git a/etc/images/custom/README b/etc/images/custom/README index fc9cd8d7f1..4238d3d133 100644 --- a/etc/images/custom/README +++ b/etc/images/custom/README @@ -6,5 +6,5 @@ COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES Files: down.xpm down-pushed.xpm right.xpm right-pushed.xpm Author: Juri Linkov -Copyright (C) 2008-2021 Free Software Foundation, Inc. +Copyright (C) 2008-2022 Free Software Foundation, Inc. License: GNU General Public License version 3 or later (see COPYING) diff --git a/etc/images/ezimage/README b/etc/images/ezimage/README index 865ce5b4c0..80f128ae99 100644 --- a/etc/images/ezimage/README +++ b/etc/images/ezimage/README @@ -7,5 +7,5 @@ Files: bits.xpm bitsbang.xpm box-minus.xpm box-plus.xpm tag-gt.xpm tag-minus.xpm tag-plus.xpm tag-type.xpm tag-v.xpm tag.xpm unlock.xpm Author: Eric M. Ludlam -Copyright (C) 1999-2021 Free Software Foundation, Inc. +Copyright (C) 1999-2022 Free Software Foundation, Inc. License: GNU General Public License version 3 or later (see COPYING) diff --git a/etc/images/gnus/README b/etc/images/gnus/README index 4acfc0c7db..092b6cce2e 100644 --- a/etc/images/gnus/README +++ b/etc/images/gnus/README @@ -7,7 +7,7 @@ COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES Files: important.xpm, unimportant.xpm Author: Simon Josefsson -Copyright (C) 2001-2021 Free Software Foundation, Inc. +Copyright (C) 2001-2022 Free Software Foundation, Inc. Files: catchup.pbm catchup.xpm cu-exit.pbm cu-exit.xpm describe-group.pbm describe-group.xpm exit-gnus.pbm exit-gnus.xpm diff --git a/etc/images/gnus/gnus.svg b/etc/images/gnus/gnus.svg index 362dc16cb6..1733af900b 100644 --- a/etc/images/gnus/gnus.svg +++ b/etc/images/gnus/gnus.svg @@ -1,7 +1,7 @@