diff options
| author | Andrea Corallo <akrl@sdf.org> | 2021-01-02 10:11:15 +0100 |
|---|---|---|
| committer | Andrea Corallo <akrl@sdf.org> | 2021-01-02 10:11:15 +0100 |
| commit | 5db5064395c251a822e429e19ddecb74a974b6ef (patch) | |
| tree | 2e04729a03d5fc68d0caef3a16e00349b6d413fc | |
| parent | 9420ea6e0840bffcb140d3677dfdabb9251c1f63 (diff) | |
| parent | 0f561ee55348ff451600cc6027db5940ee14606f (diff) | |
| download | emacs-5db5064395c251a822e429e19ddecb74a974b6ef.tar.gz | |
Merge remote-tracking branch 'savannah/master' into HEAD
2921 files changed, 7118 insertions, 5572 deletions
diff --git a/.gitattributes b/.gitattributes index 00f434da7ce..a99cf12af5e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,6 +1,6 @@ # Attributes of Emacs files in the Git repository. -# Copyright 2015-2020 Free Software Foundation, Inc. +# Copyright 2015-2021 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/.gitignore b/.gitignore index e4379d0bef6..4c7c1ad61b7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ # Files that Git should ignore in the Emacs source directory. -# Copyright 2009-2020 Free Software Foundation, Inc. +# Copyright 2009-2021 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bc099a720a8..bd012bf395f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -# Copyright (C) 2017-2020 Free Software Foundation, Inc. +# Copyright (C) 2017-2021 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/ChangeLog.1 b/ChangeLog.1 index b01a316f741..82e0ad5c2b8 100644 --- a/ChangeLog.1 +++ b/ChangeLog.1 @@ -14700,7 +14700,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 1993-1999, 2001-2020 Free Software Foundation, Inc. + Copyright (C) 1993-1999, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/ChangeLog.2 b/ChangeLog.2 index 5e9b8b901e0..7b40c54dc64 100644 --- a/ChangeLog.2 +++ b/ChangeLog.2 @@ -35787,7 +35787,7 @@ See ChangeLog.1 for earlier changes. ;; coding: utf-8 ;; End: - Copyright (C) 2015-2020 Free Software Foundation, Inc. + Copyright (C) 2015-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/ChangeLog.3 b/ChangeLog.3 index 0f363100794..22b45cb5a30 100644 --- a/ChangeLog.3 +++ b/ChangeLog.3 @@ -142485,7 +142485,7 @@ See ChangeLog.2 for earlier changes. ;; coding: utf-8 ;; End: - Copyright (C) 2015-2020 Free Software Foundation, Inc. + Copyright (C) 2015-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/GNUmakefile b/GNUmakefile index c6407d04918..f27163840b7 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -1,6 +1,6 @@ # Build Emacs from a fresh tarball or version-control checkout. -# Copyright (C) 2011-2020 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # @@ -1,5 +1,5 @@ GNU Emacs Installation Guide -Copyright (C) 1992, 1994, 1996-1997, 2000-2020 Free Software Foundation, +Copyright (C) 1992, 1994, 1996-1997, 2000-2021 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/INSTALL.REPO b/INSTALL.REPO index da0c220c2bd..da56d7611b2 100644 --- a/INSTALL.REPO +++ b/INSTALL.REPO @@ -83,7 +83,7 @@ never platform-specific. -Copyright (C) 2002-2020 Free Software Foundation, Inc. +Copyright (C) 2002-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/Makefile.in b/Makefile.in index 8a9c23c9013..e2a656e5fe1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,6 +1,6 @@ ### @configure_input@ -# Copyright (C) 1992-2020 Free Software Foundation, Inc. +# Copyright (C) 1992-2021 Free Software Foundation, Inc. # This file is part of GNU Emacs. @@ -1,4 +1,4 @@ -Copyright (C) 2001-2020 Free Software Foundation, Inc. +Copyright (C) 2001-2021 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/admin/ChangeLog.1 b/admin/ChangeLog.1 index 64c65bdd12c..f3de691325b 100644 --- a/admin/ChangeLog.1 +++ b/admin/ChangeLog.1 @@ -2577,7 +2577,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 2001-2020 Free Software Foundation, Inc. + Copyright (C) 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/admin/README b/admin/README index 67f51a34133..312f09839ea 100644 --- a/admin/README +++ b/admin/README @@ -1,4 +1,4 @@ -Copyright (C) 2001-2020 Free Software Foundation, Inc. +Copyright (C) 2001-2021 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/admin/admin.el b/admin/admin.el index 22d29673fb5..fa96b7e5cac 100644 --- a/admin/admin.el +++ b/admin/admin.el @@ -1,6 +1,6 @@ ;;; admin.el --- utilities for Emacs administration -;; Copyright (C) 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 2001-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/admin/alloc-colors.c b/admin/alloc-colors.c index 203605cc58d..ea5b7502363 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-2020 Free Software Foundation, Inc. +Copyright (C) 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/admin/authors.el b/admin/authors.el index ced0e56810a..0180ffea250 100644 --- a/admin/authors.el +++ b/admin/authors.el @@ -1,6 +1,6 @@ ;;; authors.el --- utility for maintaining Emacs's AUTHORS file -;; Copyright (C) 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 2000-2021 Free Software Foundation, Inc. ;; Author: Gerd Moellmann <gerd@gnu.org> ;; Maintainer: emacs-devel@gnu.org diff --git a/admin/automerge b/admin/automerge index cd0f22c3f25..61570587d6b 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-2020 Free Software Foundation, Inc. +## Copyright (C) 2018-2021 Free Software Foundation, Inc. ## Author: Glenn Morris <rgm@gnu.org> ## Maintainer: emacs-devel@gnu.org diff --git a/admin/build-configs b/admin/build-configs index dfd037cacec..2e04e0008e7 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-2020 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/admin/charsets/Makefile.in b/admin/charsets/Makefile.in index 3af0f028164..0fd130d346e 100644 --- a/admin/charsets/Makefile.in +++ b/admin/charsets/Makefile.in @@ -1,6 +1,6 @@ ### @configure_input@ -# Copyright (C) 2015-2020 Free Software Foundation, Inc. +# Copyright (C) 2015-2021 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 ad62f3cb64d..f933c34ffc6 100755 --- a/admin/charsets/mapconv +++ b/admin/charsets/mapconv @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2015-2020 Free Software Foundation, Inc. +# Copyright (C) 2015-2021 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 c3205672d19..60f09125a91 100644 --- a/admin/charsets/mapfiles/README +++ b/admin/charsets/mapfiles/README @@ -1,4 +1,4 @@ -Copyright (C) 2009-2020 Free Software Foundation, Inc. +Copyright (C) 2009-2021 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 b4e4b426515..aca7b68aa7a 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 -;; Copyright (C) 1998, 2000, 2002-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998, 2000, 2002-2021 Free Software Foundation, Inc. ;; Author: Markus Rost <rost@math.uni-bielefeld.de> ;; Created: 13 Sep 1998 diff --git a/admin/diff-tar-files b/admin/diff-tar-files index cbcec862329..cdcc512ae6b 100755 --- a/admin/diff-tar-files +++ b/admin/diff-tar-files @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (C) 2001-2020 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # This file is part of GNU Emacs. @@ -35,7 +35,7 @@ old_tmp=/tmp/old.$$ new_tmp=/tmp/new.$$ trap "rm -f $old_tmp $new_tmp; exit 1" 1 2 15 -tar tzf $old_tar | sed -e 's,^[^/]*,,' | sort > $old_tmp -tar tzf $new_tar | sed -e 's,^[^/]*,,' | sort > $new_tmp +tar tzf "$old_tar" | sed -e 's,^[^/]*,,' | sort > $old_tmp +tar tzf "$new_tar" | sed -e 's,^[^/]*,,' | sort > $new_tmp diff -u $old_tmp $new_tmp rm -f $new_tmp $old_tmp diff --git a/admin/find-gc.el b/admin/find-gc.el index 7de2474b828..c70a051bfb5 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 -;; Copyright (C) 1992, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1992, 2001-2021 Free Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org diff --git a/admin/gitmerge.el b/admin/gitmerge.el index 18da466aaa1..1364bdc67ac 100644 --- a/admin/gitmerge.el +++ b/admin/gitmerge.el @@ -1,6 +1,6 @@ ;;; gitmerge.el --- help merge one Emacs branch into another -;; Copyright (C) 2010-2020 Free Software Foundation, Inc. +;; Copyright (C) 2010-2021 Free Software Foundation, Inc. ;; Authors: David Engster <deng@randomsample.de> ;; Stefan Monnier <monnier@iro.umontreal.ca> diff --git a/admin/grammars/Makefile.in b/admin/grammars/Makefile.in index a170e089246..98c9c623abc 100644 --- a/admin/grammars/Makefile.in +++ b/admin/grammars/Makefile.in @@ -1,6 +1,6 @@ ### @configure_input@ -## Copyright (C) 2013-2020 Free Software Foundation, Inc. +## Copyright (C) 2013-2021 Free Software Foundation, Inc. ## This file is part of GNU Emacs. diff --git a/admin/grammars/c.by b/admin/grammars/c.by index d12e6f95cb4..2d04c999aca 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-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; ;; Author: Eric M. Ludlam <zappo@gnu.org> ;; David Ponce <david@dponce.com> diff --git a/admin/grammars/grammar.wy b/admin/grammars/grammar.wy index 1ae2a903bdf..054e85bf70d 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-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002-2021 Free Software Foundation, Inc. ;; ;; Author: David Ponce <david@dponce.com> ;; Created: 26 Aug 2002 diff --git a/admin/grammars/java-tags.wy b/admin/grammars/java-tags.wy index 678b36cd0ae..486924b7990 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-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002-2021 Free Software Foundation, Inc. ;; ;; Author: David Ponce <david@dponce.com> ;; Created: 26 Aug 2002 diff --git a/admin/grammars/js.wy b/admin/grammars/js.wy index 94837baf7c2..e85db1572c6 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-2020 Free Software Foundation, Inc. +;; Copyright (C) 2005-2021 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 7573d0cf9ec..f66585e70e9 100644 --- a/admin/grammars/make.by +++ b/admin/grammars/make.by @@ -1,6 +1,6 @@ ;;; make.by -- BY notation for Makefiles. -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; ;; Author: Eric M. Ludlam <zappo@gnu.org> ;; David Ponce <david@dponce.com> diff --git a/admin/grammars/python.wy b/admin/grammars/python.wy index 5790461c73c..aaa25ced202 100644 --- a/admin/grammars/python.wy +++ b/admin/grammars/python.wy @@ -1,6 +1,6 @@ ;;; python.wy -- LALR grammar for Python -;; Copyright (C) 2002-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002-2021 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 572cf564d75..c3abb5a28e2 100644 --- a/admin/grammars/scheme.by +++ b/admin/grammars/scheme.by @@ -1,6 +1,6 @@ ;;; scheme.by -- Scheme BNF language specification -;; Copyright (C) 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 2001-2021 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 c8d1492af23..868a81cf18a 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-2020 Free Software Foundation, Inc. +;; Copyright (C) 2005-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> ;; Keywords: syntax diff --git a/admin/last-chance.el b/admin/last-chance.el index 8ee6af5a66d..fd5b8e9bd7a 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-2020 Free Software Foundation, Inc. +;; Copyright (C) 2016-2021 Free Software Foundation, Inc. ;; Author: Thien-Thi Nguyen <ttn@gnu.org> ;; Maintainer: emacs-devel@gnu.org diff --git a/admin/make-emacs b/admin/make-emacs index 634c226ac84..fa7880b5664 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-2020 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/admin/make-manuals b/admin/make-manuals index 13a8148bb3c..f1339495208 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-2020 Free Software Foundation, Inc. +## Copyright 2018-2021 Free Software Foundation, Inc. ## Author: Glenn Morris <rgm@gnu.org> ## Maintainer: emacs-devel@gnu.org diff --git a/admin/merge-gnulib b/admin/merge-gnulib index 880dc5eef53..1c8b4427000 100755 --- a/admin/merge-gnulib +++ b/admin/merge-gnulib @@ -4,7 +4,7 @@ # # admin/merge-gnulib -# Copyright 2012-2020 Free Software Foundation, Inc. +# Copyright 2012-2021 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/admin/merge-pkg-config b/admin/merge-pkg-config index 6ec54ce9edf..1136a304dd7 100755 --- a/admin/merge-pkg-config +++ b/admin/merge-pkg-config @@ -4,7 +4,7 @@ # # admin/merge-pkg-config -# Copyright 2014-2020 Free Software Foundation, Inc. +# Copyright 2014-2021 Free Software Foundation, Inc. # This file is part of GNU Emacs. @@ -60,4 +60,4 @@ test -d m4 || { printf >&2 '%s\n' "$0: copying $dir/pkg.m4 to m4/pkg.m4" -cp $dir/pkg.m4 m4 +cp "$dir"/pkg.m4 m4 diff --git a/admin/notes/copyright b/admin/notes/copyright index 156eec04cd6..5b00c82ce93 100644 --- a/admin/notes/copyright +++ b/admin/notes/copyright @@ -1,4 +1,4 @@ -Copyright (C) 2007-2020 Free Software Foundation, Inc. +Copyright (C) 2007-2021 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/admin/notes/emba b/admin/notes/emba index 76b0d3c5993..adebcefcf3e 100644 --- a/admin/notes/emba +++ b/admin/notes/emba @@ -1,6 +1,6 @@ -*- mode: outline; coding: utf-8 -*- -Copyright (C) 2019-2020 Free Software Foundation, Inc. +Copyright (C) 2019-2021 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 1b7d915c7a3..62ad7ebf9c5 100644 --- a/admin/notes/hydra +++ b/admin/notes/hydra @@ -1,6 +1,6 @@ -*- mode: outline; coding: utf-8 -*- -Copyright (C) 2013-2020 Free Software Foundation, Inc. +Copyright (C) 2013-2021 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 dee816ddb35..1a337b9d799 100644 --- a/admin/notes/multi-tty +++ b/admin/notes/multi-tty @@ -1,6 +1,6 @@ -*- coding: utf-8; mode: text; -*- -Copyright (C) 2007-2020 Free Software Foundation, Inc. +Copyright (C) 2007-2021 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 1e418590a68..45455d897f3 100644 --- a/admin/notes/unicode +++ b/admin/notes/unicode @@ -1,6 +1,6 @@ -*-mode: text; coding: utf-8;-*- -Copyright (C) 2002-2020 Free Software Foundation, Inc. +Copyright (C) 2002-2021 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 cfc23ace017..524b908d0e7 100644 --- a/admin/notes/www +++ b/admin/notes/www @@ -1,6 +1,6 @@ -*- outline -*- -Copyright (C) 2013-2020 Free Software Foundation, Inc. +Copyright (C) 2013-2021 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 7937d65a51a..aaaea3b91f7 100644 --- a/admin/nt/README-UNDUMP.W32 +++ b/admin/nt/README-UNDUMP.W32 @@ -1,4 +1,4 @@ -Copyright (C) 2001-2020 Free Software Foundation, Inc. +Copyright (C) 2001-2021 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 01f7ed9da13..001bdd73f7b 100644 --- a/admin/nt/dist-build/README-windows-binaries +++ b/admin/nt/dist-build/README-windows-binaries @@ -1,4 +1,4 @@ -Copyright (C) 2001-2020 Free Software Foundation, Inc. +Copyright (C) 2001-2021 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 bc5f65f0853..47185dbb1ba 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-2020 Free Software Foundation, Inc. +## Copyright (C) 2017-2021 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 8eaa3a909bd..809cbc65cac 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-2020 Free Software Foundation, Inc. +## Copyright (C) 2017-2021 Free Software Foundation, Inc. ## This file is part of GNU Emacs. diff --git a/admin/quick-install-emacs b/admin/quick-install-emacs index 0439c77d016..475658ae93e 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-2020 Free Software Foundation, Inc. +## Copyright (C) 2001-2021 Free Software Foundation, Inc. ## Author: Miles Bader <miles@gnu.org> diff --git a/admin/unidata/Makefile.in b/admin/unidata/Makefile.in index f3e1c786114..f31e1bb09fd 100644 --- a/admin/unidata/Makefile.in +++ b/admin/unidata/Makefile.in @@ -1,6 +1,6 @@ ### @configure_input@ -# Copyright (C) 2012-2020 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 70e96ed802d..986d299e666 100755 --- a/admin/unidata/blocks.awk +++ b/admin/unidata/blocks.awk @@ -1,6 +1,6 @@ #!/usr/bin/awk -f -## Copyright (C) 2015-2020 Free Software Foundation, Inc. +## Copyright (C) 2015-2021 Free Software Foundation, Inc. ## Author: Glenn Morris <rgm@gnu.org> ## Maintainer: emacs-devel@gnu.org diff --git a/admin/unidata/unidata-gen.el b/admin/unidata/unidata-gen.el index 510bb7959f1..3918853088f 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-2020 Free Software Foundation, Inc. +;; Copyright (C) 2008-2021 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 6b8909ce66a..0141b638fb2 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-2020 Free Software Foundation, Inc. +;; Copyright (C) 2014-2021 Free Software Foundation, Inc. ;; Author: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> diff --git a/admin/update-copyright b/admin/update-copyright index a70d7a3ff93..86953838bdd 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-2020 Free Software Foundation, Inc. +# Copyright 2013-2021 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/admin/update_autogen b/admin/update_autogen index d60984e13f6..35c391da19e 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-2020 Free Software Foundation, Inc. +## Copyright (C) 2011-2021 Free Software Foundation, Inc. ## Author: Glenn Morris <rgm@gnu.org> ## Maintainer: emacs-devel@gnu.org diff --git a/admin/upload-manuals b/admin/upload-manuals index b7187971df0..52999c2997a 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-2020 Free Software Foundation, Inc. +## Copyright 2018-2021 Free Software Foundation, Inc. ## Author: Glenn Morris <rgm@gnu.org> ## Maintainer: emacs-devel@gnu.org diff --git a/autogen.sh b/autogen.sh index c5e14900d68..531e5775f96 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-2020 Free Software Foundation, Inc. +## Copyright (C) 2011-2021 Free Software Foundation, Inc. ## Author: Glenn Morris <rgm@gnu.org> ## Maintainer: emacs-devel@gnu.org diff --git a/build-aux/git-hooks/commit-msg b/build-aux/git-hooks/commit-msg index e84be4cbafe..cf0f74c6441 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-2020 Free Software Foundation, Inc. +# Copyright 2014-2021 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 59fdaf58c1a..719bfefc50a 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-2020 Free Software Foundation, Inc. +# Copyright 2014-2021 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 dbb1264b495..dd8434479d4 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-2020 Free Software Foundation, Inc. +# Copyright 2019-2021 Free Software Foundation, Inc. # This file is part of GNU Emacs. @@ -24,9 +24,9 @@ SHA1=$3 # Prefer gawk if available, as it handles NUL bytes properly. if type gawk >/dev/null 2>&1; then - awk=gawk + awk="gawk" else - awk=awk + awk="awk" fi exec $awk ' diff --git a/build-aux/gitlog-to-changelog b/build-aux/gitlog-to-changelog index be8082e7ffd..de76f658d48 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-2020 Free Software Foundation, Inc. +# Copyright (C) 2008-2021 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 23702807efc..30b2d78659d 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-2020 Free Software Foundation, Inc. +# Copyright (C) 2014-2021 Free Software Foundation, Inc. # Author: Paul Eggert diff --git a/build-aux/make-info-dir b/build-aux/make-info-dir index ee2197beb34..ea26479cd96 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-2020 Free Software Foundation, Inc. +## Copyright (C) 2013-2021 Free Software Foundation, Inc. ## Author: Glenn Morris <rgm@gnu.org> ## Maintainer: emacs-devel@gnu.org diff --git a/build-aux/move-if-change b/build-aux/move-if-change index 653dc981599..e85e90af501 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-2020 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 4e0b2aaebad..e4e5e086415 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-2020 Free Software Foundation, Inc. +# Copyright (C) 2013-2021 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 d9b7f683a08..fae3a5fb33b 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-2020 Free Software Foundation, Inc. +# Copyright (C) 2009-2021 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 c0ecb848105..e56eea44def 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-2020 Free Software +# Copyright (C) 1994-1995, 1997, 1999, 2001-2021 Free Software # Foundation, Inc. # This file is part of GNU Emacs. diff --git a/config.bat b/config.bat index 6938e556711..cba73360992 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-2020 Free Software Foundation, Inc.
+rem Copyright (C) 1994-1999, 2001-2021 Free Software Foundation, Inc.
rem This file is part of GNU Emacs.
diff --git a/configure.ac b/configure.ac index d04a6fee4db..255fec9a8be 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-2020 Free Software Foundation, Inc. +dnl Copyright (C) 1994-1996, 1999-2021 Free Software Foundation, Inc. dnl dnl This file is part of GNU Emacs. dnl @@ -3294,7 +3294,12 @@ fi # Check for XRender HAVE_XRENDER=no if test "${HAVE_X11}" = "yes"; then - AC_CHECK_HEADER([X11/extensions/Xrender.h], + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[#include <X11/Intrinsic.h> + #include <X11/extensions/Xrender.h> + ]], + [[return !XRenderQueryExtension;]])], [AC_CHECK_LIB([Xrender], [XRenderQueryExtension], [HAVE_XRENDER=yes])]) if test $HAVE_XRENDER = yes; then XRENDER_LIBS="-lXrender" @@ -5032,7 +5037,7 @@ case $opsys in AC_DEFINE(FIRST_PTY_LETTER, ['z']) AC_DEFINE(PTY_NAME_SPRINTF, [strcpy (pty_name, "/dev/ptmx");]) dnl Push various streams modules onto a PTY channel. Used in process.c. - AC_DEFINE(SETUP_SLAVE_PTY, [if (ioctl (forkin, I_PUSH, "ptem") == -1) fatal ("ioctl I_PUSH ptem"); if (ioctl (forkin, I_PUSH, "ldterm") == -1) fatal ("ioctl I_PUSH ldterm"); if (ioctl (forkin, I_PUSH, "ttcompat") == -1) fatal ("ioctl I_PUSH ttcompat");], [How to set up a slave PTY, if needed.]) + AC_DEFINE(SETUP_SLAVE_PTY, [if (ioctl (std_in, I_PUSH, "ptem") == -1) fatal ("ioctl I_PUSH ptem"); if (ioctl (std_in, I_PUSH, "ldterm") == -1) fatal ("ioctl I_PUSH ldterm"); if (ioctl (std_in, I_PUSH, "ttcompat") == -1) fatal ("ioctl I_PUSH ttcompat");], [How to set up a slave PTY, if needed.]) ;; esac @@ -5321,7 +5326,7 @@ fi version=$PACKAGE_VERSION -copyright="Copyright (C) 2020 Free Software Foundation, Inc." +copyright="Copyright (C) 2021 Free Software Foundation, Inc." AC_DEFINE_UNQUOTED(COPYRIGHT, ["$copyright"], [Short copyright string for this version of Emacs.]) AC_SUBST(copyright) @@ -5598,7 +5603,7 @@ case "$opsys" in if test "$HAVE_NS" = "yes"; then libs_nsgui="-framework AppKit" if test "$NS_IMPL_COCOA" = "yes"; then - libs_nsgui="$libs_nsgui -framework IOKit -framework Carbon" + libs_nsgui="$libs_nsgui -framework IOKit -framework Carbon -framework IOSurface" fi else libs_nsgui= @@ -5696,7 +5701,7 @@ AC_SUBST(WINDOW_SYSTEM_OBJ) AH_TOP([/* GNU Emacs site configuration template file. -Copyright (C) 1988, 1993-1994, 1999-2002, 2004-2020 +Copyright (C) 1988, 1993-1994, 1999-2002, 2004-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/doc/emacs/ChangeLog.1 b/doc/emacs/ChangeLog.1 index cf641beec1f..bc4dbd47052 100644 --- a/doc/emacs/ChangeLog.1 +++ b/doc/emacs/ChangeLog.1 @@ -10919,7 +10919,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 1993-1999, 2001-2020 Free Software Foundation, Inc. + Copyright (C) 1993-1999, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/doc/emacs/Makefile.in b/doc/emacs/Makefile.in index 53b7d074512..2a3f53f740d 100644 --- a/doc/emacs/Makefile.in +++ b/doc/emacs/Makefile.in @@ -1,6 +1,6 @@ ### @configure_input@ -# Copyright (C) 1994, 1996-2020 Free Software Foundation, Inc. +# Copyright (C) 1994, 1996-2021 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/doc/emacs/abbrevs.texi b/doc/emacs/abbrevs.texi index e3766aae9e8..c83da8aaec6 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--2020 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 2001--2021 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 4658cd4723e..d771393ffa1 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--2020 Free Software Foundation, Inc. +@c Copyright (C) 1994--1997, 1999--2021 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 d1e67e66560..49da473fa51 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--2020 Free Software Foundation, Inc. +@c Copyright (C) 2005--2021 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 ef42fb2a7c0..5dede6246cc 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--2020 Free Software Foundation, Inc. +@c Copyright (C) 2004--2021 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/basic.texi b/doc/emacs/basic.texi index 77c80547462..444b28f24be 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--2020 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 2000--2021 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 537c6536085..9cdfa493ed4 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--2020 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 2000--2021 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 91c749aa2d5..7194eb90ca9 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--2020 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 2000--2021 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 3f1198987d9..aec2e6cc5a8 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--2020 Free Software Foundation, Inc. +@c Copyright (C) 2004--2021 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 e5ee7e94bcf..3750e78e709 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--2020 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 2000--2021 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 a828eee076f..b7f0bda7851 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--2020 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 2001--2021 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 ad0cbc6f659..82a917ce7d1 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--2020 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 2001--2021 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 fb60caa773b..ccf5f1932f9 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--2020 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 2000--2021 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 25cffe49161..fc8130d8e6f 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--2020 Free Software Foundation, Inc. +@c Copyright (C) 2004--2021 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 fdc4703e86f..34d12acc349 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--2020 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 2000--2021 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 7dadb0966f2..f4b18541429 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--2020 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 2000--2021 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 544b808c7d4..2d511bffbc6 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--2020 Free Software Foundation, Inc. +Copyright @copyright{} 2004--2021 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 bd40e10052d..4054b094def 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--2020 Free Software Foundation, +Copyright @copyright{} 1985--1987, 1993--2021 Free Software Foundation, Inc. @quotation diff --git a/doc/emacs/emerge-xtra.texi b/doc/emacs/emerge-xtra.texi index d5759650c23..7bf24151e57 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--2020 Free Software Foundation, Inc. +@c Copyright (C) 2004--2021 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 4cd5c65df57..0476466da5d 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--2020 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 2001--2021 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 eb4353b6784..ede382c146c 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--2020 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 1999--2021 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 db77ae4ec26..6b41849ccc8 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--2020 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 2001--2021 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 11222e532eb..c8efd56c37f 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--2020 Free Software Foundation, Inc. +@c Copyright (C) 2004--2021 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 f5e2e8d1720..e1a4e64a7d4 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--2020 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 1999--2021 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 4d622ec0e3f..35df06591eb 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--2020 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 2001--2021 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 0028b484c95..4d48dcdb8ed 100644 --- a/doc/emacs/gnu.texi +++ b/doc/emacs/gnu.texi @@ -1,4 +1,4 @@ -@c Copyright (C) 1985--1987, 1993, 1995, 2001--2020 Free Software +@c Copyright (C) 1985--1987, 1993, 1995, 2001--2021 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 c5b59e54928..81cdeb4be54 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--2020 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 2000--2021 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 e8b46506335..df9e67fee68 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--2020 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 2001--2021 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 0bd18fd0d77..9bc786dc47b 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--2020 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 2000--2021 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 7b1d365ff04..adb2ab8d561 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--2020 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 2000--2021 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 b18c334acf4..865220fb218 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--2020 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 2001--2021 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 00daa8b35d3..cd1db1a7bab 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--2020 Free Software Foundation, Inc. +@c Copyright (C) 2000--2021 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 aa4513e3175..415815473e5 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--2020 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 1999--2021 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 97aeed896a0..20cb8ee2c65 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--2020 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 2001--2021 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 ede95a28d4e..c7c8fb30ac6 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--2020 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 2000--2021 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 54fafae5654..fbb8122a1b8 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--2020 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 2000--2021 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 c9c175d51e8..cc25d3e1e33 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--2020 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 2000--2021 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 045ac6c4605..fce6ae46f81 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--2020 Free Software Foundation, Inc. +@c Copyright (C) 2004--2021 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 48492ab2f22..4b58f6aa2f7 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--2020 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 2000--2021 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 bf7088d8db1..922eec7426e 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--2020 Free Software Foundation, Inc. +@c Copyright (C) 1997, 1999--2021 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 4981dd50c75..038a31a35b9 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--2020 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 2000--2021 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 9decda30daa..a04b72d38d3 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--2020 Free Software Foundation, Inc. +@c Copyright (C) 2004--2021 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 f0dd62dad45..fe3ee57ac0a 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--2020 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 1999--2021 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 d1b9ea8f679..59fa0ff0a1c 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--2020 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 2001--2021 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 0c47812449b..e7ca2ae48bd 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--2020 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 2001--2021 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 5c5a5da5511..2ff808e0400 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--2020 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 2001--2021 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 77a4e8097e9..637867b8115 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--2020 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 2000--2021 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 e3f9fbec071..174e52ac9a8 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--2020 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 2000--2021 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 c77dcf7fbce..54e16698a74 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--2020 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 2000--2021 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 dbd1a075573..4da3d4a3e89 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--2020 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 2001--2021 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 37804242eaf..51b9d667784 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--2020 Free Software Foundation, Inc. +@c Copyright (C) 2004--2021 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 26199924d58..4cd00cba6c3 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--2020 Free Software Foundation, Inc. +@c Copyright (C) 2004--2021 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 07f826933db..e851f1b1b58 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--2020 Free Software +@c Copyright (C) 1985--1987, 1993--1995, 1997, 2000--2021 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 730cf304e2b..00fa6c0aa31 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--2020 Free Software +@c Copyright (C) 1987, 1993--1995, 1997, 2001--2021 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 75f5872dc3c..bb4323a7734 100644 --- a/doc/lispintro/ChangeLog.1 +++ b/doc/lispintro/ChangeLog.1 @@ -782,7 +782,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 2001-2020 Free Software Foundation, Inc. + Copyright (C) 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/doc/lispintro/Makefile.in b/doc/lispintro/Makefile.in index 7a2b6f0a580..d8b909c9c10 100644 --- a/doc/lispintro/Makefile.in +++ b/doc/lispintro/Makefile.in @@ -1,6 +1,6 @@ ### @configure_input@ -# Copyright (C) 1994-1999, 2001-2020 Free Software Foundation, Inc. +# Copyright (C) 1994-1999, 2001-2021 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/doc/lispintro/README b/doc/lispintro/README index 6361f5a65ce..eca19c76a42 100644 --- a/doc/lispintro/README +++ b/doc/lispintro/README @@ -1,4 +1,4 @@ -Copyright (C) 2001-2020 Free Software Foundation, Inc. +Copyright (C) 2001-2021 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 c5d414c7589..4877df7135e 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-2020 Free Software Foundation, Inc. +% Copyright (C) 1995, 1997, 2001-2021 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 f6d97c7cc09..48fdc7e8768 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-2020 Free Software Foundation, Inc. +% Copyright (C) 1995, 1997, 2001-2021 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 57b96eba163..81053d3f26c 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-2020 Free Software Foundation, Inc. +% Copyright (C) 1995, 1997, 2001-2021 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 e51c2c4008b..e6a80f1c8ba 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-2020 Free Software Foundation, Inc. +% Copyright (C) 1995, 1997, 2001-2021 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 1cbf44fab02..c1aac9c09bc 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-2020 Free Software Foundation, Inc. +% Copyright (C) 1995, 1997, 2001-2021 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 85a553bcbce..a0918a92c53 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-2020 Free Software Foundation, Inc. +% Copyright (C) 1995, 1997, 2001-2021 Free Software Foundation, Inc. % % This file is part of GNU Emacs. % diff --git a/doc/lispintro/drawers.eps b/doc/lispintro/drawers.eps index b71bdb82aee..725bd9723ce 100644 --- a/doc/lispintro/drawers.eps +++ b/doc/lispintro/drawers.eps @@ -9,7 +9,7 @@ %%EndComments %%BeginProlog -% Copyright (C) 2001-2020 Free Software Foundation, Inc. +% Copyright (C) 2001-2021 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 b13b16285c7..d5c280b7924 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--2020 Free Software +Copyright @copyright{} 1990--1995, 1997, 2001--2021 Free Software Foundation, Inc. @sp 1 diff --git a/doc/lispintro/lambda-1.eps b/doc/lispintro/lambda-1.eps index 08bd6007b79..43b2d08aedc 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-2020 Free Software Foundation, Inc. +% Copyright (C) 1995, 1997, 2001-2021 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 6ccf9993e33..c6c71f2b776 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-2020 Free Software Foundation, Inc. +% Copyright (C) 1995, 1997, 2001-2021 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 aac0392c4ba..ae939d537f4 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-2020 Free Software Foundation, Inc. +% Copyright (C) 1995, 1997, 2001-2021 Free Software Foundation, Inc. % % This file is part of GNU Emacs. % diff --git a/doc/lispref/ChangeLog.1 b/doc/lispref/ChangeLog.1 index 8d92a943d57..bd7a9c4e793 100644 --- a/doc/lispref/ChangeLog.1 +++ b/doc/lispref/ChangeLog.1 @@ -13989,7 +13989,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 1998-2020 Free Software Foundation, Inc. + Copyright (C) 1998-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/doc/lispref/Makefile.in b/doc/lispref/Makefile.in index bd650091116..271f06edddc 100644 --- a/doc/lispref/Makefile.in +++ b/doc/lispref/Makefile.in @@ -1,6 +1,6 @@ ### @configure_input@ -# Copyright (C) 1990-1996, 1998-2020 Free Software Foundation, Inc. +# Copyright (C) 1990-1996, 1998-2021 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/doc/lispref/README b/doc/lispref/README index ac0c2b554eb..9b998371303 100644 --- a/doc/lispref/README +++ b/doc/lispref/README @@ -1,4 +1,4 @@ -Copyright (C) 2001-2020 Free Software Foundation, Inc. -*- outline -*- +Copyright (C) 2001-2021 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 575be187d3f..71fac1ae3b6 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--2020 Free Software Foundation, +@c Copyright (C) 1990--1994, 1999, 2001--2021 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 a134e883588..ced8082f6a4 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--2020 Free Software Foundation, Inc. +@c Copyright (C) 1999, 2002--2021 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 817249ee01a..c238863833d 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--2020 Free Software Foundation, Inc. +@c Copyright (C) 2001--2021 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 c20ef6830ad..c0a4065bdbf 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--2020 Free Software Foundation, +@c Copyright (C) 1990--1995, 1999, 2001--2021 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 33eb23984dd..69733f91c4a 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--2020 Free Software +@c Copyright (C) 1990--1995, 1998--1999, 2001--2021 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 15d7e4e3a71..6c68f70482a 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--2020 Free Software +@c Copyright (C) 1990--1995, 1998--1999, 2001--2021 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 51a4b04486a..66242343157 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--2020 Free Software Foundation, Inc. +@c Copyright (C) 1990--1994, 2001--2021 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 d2419f415bf..55bcddb31aa 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--2020 Free Software +@c Copyright (C) 1990--1995, 1998--1999, 2001--2021 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 85912470795..8fd12f79026 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--2020 Free Software Foundation, Inc. +@c Copyright (C) 1997--2021 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 661961f9379..1e779ac7054 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--2020 Free Software +@c Copyright (C) 1990--1994, 1998--1999, 2001--2021 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 949fd8987c2..b149a665fed 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--2020 Free Software Foundation, Inc. +@c Copyright (C) 1990--1995, 1998--2021 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 b4c631b4493..569545d83f1 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--2020 Free Software +@c Copyright (C) 1992--1994, 1998--1999, 2001--2021 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 9a6796790c4..fa548b503aa 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--2020 Free Software Foundation, +Copyright @copyright{} 1990--1996, 1998--2021 Free Software Foundation, Inc. @quotation diff --git a/doc/lispref/errors.texi b/doc/lispref/errors.texi index a386a41bd3d..9ec12714991 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--2020 Free Software Foundation, +@c Copyright (C) 1990--1993, 1999, 2001--2021 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 39f342a798b..80e038c96d9 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--2020 Free Software Foundation, +@c Copyright (C) 1990--1994, 1998, 2001--2021 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 6949ca29c6e..4110c51099d 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--2020 Free Software +@c Copyright (C) 1990--1995, 1998--1999, 2001--2021 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 e3d0fdeb277..7f2a6f75422 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--2020 Free Software +@c Copyright (C) 1990--1995, 1998--1999, 2001--2021 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 222a17fad4c..414035f684b 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--2020 Free Software +@c Copyright (C) 1990--1995, 1998--1999, 2001--2021 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 12781c6cb95..8781fad30cd 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--2020 Free Software Foundation, Inc. +@c Copyright (C) 1999, 2001--2021 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 90406df9c19..2fd05b73917 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--2020 Free Software +@c Copyright (C) 1990--1995, 1998--1999, 2001--2021 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 a8b4d5619d3..b1c7e613719 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--2020 Free Software Foundation, +@c Copyright (C) 1990--1993, 1998, 2001--2021 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 0adbef33cac..4150a2b21b8 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--2020 Free Software +@c Copyright (C) 1990--1993, 1998--1999, 2001--2021 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 a4b479597ea..35f852b7e4b 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--2020 Free Software Foundation, Inc. +@c Copyright (C) 1990--1994, 2001--2021 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 9daeb2c77f9..37bab7ea9bc 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--2020 Free Software Foundation, Inc. +@c Copyright (C) 1990--1994, 1998--2021 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 3cca5189b1b..4ea58e61726 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--2020 Free Software Foundation, Inc. +@c Copyright (C) 2001--2021 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 ae793d5e15e..c54496f6168 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--2020 Free Software +@c Copyright (C) 1990--1995, 1998--1999, 2001--2021 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 e5364152d52..22f0dde593a 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--2020 Free Software +@c Copyright (C) 1990--1995, 1998--1999, 2001--2021 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 eeb4152a5ba..e56a85c7478 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--2020 Free Software Foundation, +@c Copyright (C) 1990--1995, 1998, 2001--2021 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 1e84f9b3bb1..aea02424086 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--2020 Free Software Foundation, +@c Copyright (C) 1990--1993, 1999, 2001--2021 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 686b87771fd..cdd0938b458 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--2020 Free Software +@c Copyright (C) 1990--1995, 1998--1999, 2001--2021 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 48f068ee604..81139b9e746 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--2020 Free Software +@c Copyright (C) 1990--1995, 1998--1999, 2001--2021 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 98aa94e90d4..9d38fe6af95 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--2020 Free Software +@c Copyright (C) 1990--1995, 1998--1999, 2001--2021 Free Software @c Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Modes @@ -1930,6 +1930,17 @@ This function also forces an update of the menu bar and frame title. color using the face @code{mode-line}. Other windows' mode lines appear in the face @code{mode-line-inactive} instead. @xref{Faces}. +@vindex mode-line-compact + Some modes put a lot of data in the mode line, pushing elements at +the end of the mode line off to the right. Emacs can ``compress'' the +mode line if the @code{mode-line-compact} variable is non-@code{nil} +by turning stretches of spaces into a single space. If this variable +is @code{long}, this is only done when the mode line is wider than the +currently selected window. (This computation is approximate, based on +the number of characters, and not their displayed width.) This +variable can be buffer-local to only compress mode-lines in certain +buffers. + @node Mode Line Data @subsection The Data Structure of the Mode Line @cindex mode line construct @@ -1982,9 +1993,15 @@ variables without prompting the user.) @item (@var{string} @var{rest}@dots{}) @itemx (@var{list} @var{rest}@dots{}) -A list whose first element is a string or list means to process all the -elements recursively and concatenate the results. This is the most -common form of mode line construct. +A list whose first element is a string or list means to process all +the elements recursively and concatenate the results. This is the +most common form of mode line construct. (Note that text properties +are handled specially (for reasons of efficiency) when displaying +strings in the mode line: Only the text property on the first +character of the string are considered, and they are then used over +the entire string. If you need a string with different text +properties, you have to use the special @code{:propertize} mode line +construct.) @item (:eval @var{form}) A list whose first element is the symbol @code{:eval} says to evaluate @@ -2439,7 +2456,7 @@ line: @enumerate @item Put a string with a text property directly into the mode line data -structure. +structure, but see @ref{Mode Line Data} for caveats for that. @item Put a text property on a mode line %-construct such as @samp{%12b}; then diff --git a/doc/lispref/nonascii.texi b/doc/lispref/nonascii.texi index 97bc85f152e..84f5d2f0819 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--2020 Free Software Foundation, Inc. +@c Copyright (C) 1998--1999, 2001--2021 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 9a5bff5a5b2..63e3e0bace5 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--2020 Free Software +@c Copyright (C) 1990--1995, 1998--1999, 2001--2021 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 83066744121..64e7d53d935 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--2020 Free Software +@c Copyright (C) 1990--1995, 1998--1999, 2001--2021 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 85f930d1897..37fde0a953d 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--2020 Free Software +@c Copyright (C) 1990--1995, 1998--1999, 2001--2021 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 af87479c7d2..e8aaa3ae1d1 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--2020 Free Software Foundation, Inc. +@c Copyright (C) 2010--2021 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 751adcff5a8..dc0c7442d8d 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--2020 Free Software Foundation, Inc. +@c Copyright (C) 1990--1995, 1998--2021 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 5fefab99d4c..535cebed7a8 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--2020 Free Software +@c Copyright (C) 1990--1995, 1998--1999, 2001--2021 Free Software @c Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Processes @@ -3111,7 +3111,8 @@ signaled. Call @code{puny-encode-domain} on @var{name} first if you wish to lookup internationalized hostnames. If successful it returns a list of Lisp representations of network -addresses, otherwise it returns @code{nil}. +addresses, otherwise it returns @code{nil}. In the latter case, it +also displays the error message hopefully explaining what went wrong. By default both IPv4 and IPv6 lookups are attempted. The optional argument @var{family} controls this behavior, specifying the symbol diff --git a/doc/lispref/records.texi b/doc/lispref/records.texi index f7a21a4b8c6..573caf1672d 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--2020 Free Software Foundation, Inc. +@c Copyright (C) 2017--2021 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 35a518805c3..16a8e56e90a 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--2020 Free Software +@c Copyright (C) 1990--1995, 1998--1999, 2001--2021 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 57b49847e7f..0c74dbe2aa4 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--2020 Free Software +@c Copyright (C) 1990--1995, 1998--1999, 2001--2021 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 5b4be832507..535fc958f26 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--2020 Free Software +@c Copyright (C) 1990--1994, 1998--1999, 2001--2021 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 1e5f52ddfdd..897b424b187 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--2020 Free Software +@c Copyright (C) 1990--1995, 1998--1999, 2001--2021 Free Software @c Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Strings and Characters @@ -120,7 +120,10 @@ character (i.e., an integer), @code{nil} otherwise. @cindex string creation The following functions create strings, either from scratch, or by -putting strings together, or by taking them apart. +putting strings together, or by taking them apart. (For functions that +create strings based on searching the contents of other strings (like +@code{string-replace} and @code{replace-regexp-in-string}), see +@ref{Search and Replace}.) @defun make-string count character &optional multibyte This function returns a string made up of @var{count} repetitions of @@ -1213,7 +1216,7 @@ The function @code{format-spec} described in this section performs a similar function to @code{format}, except it operates on format control strings that use arbitrary specification characters. -@defun format-spec template spec-alist &optional ignore-missing +@defun format-spec template spec-alist &optional ignore-missing split This function returns a string produced from the format string @var{template} according to conversions specified in @var{spec-alist}, which is an alist (@pxref{Association Lists}) of the form @@ -1255,6 +1258,16 @@ any; if it is @code{delete}, those format specifications are removed from the output; any other non-@code{nil} value is handled like @code{ignore}, but any occurrences of @samp{%%} are also left verbatim in the output. + +If the optional argument @var{split} is non-@code{nil}, instead of +returning a single string, @code{format-spec} will split the result +into a list of strings, based on where the substitutions were +performed. For instance: + +@example +(format-spec "foo %b bar" '((?b . "zot")) nil t) + @result{} ("foo " "zot" " bar") +@end example @end defun The syntax of format specifications accepted by @code{format-spec} is diff --git a/doc/lispref/symbols.texi b/doc/lispref/symbols.texi index d6b0494d1ad..ed36f5139a8 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--2020 Free Software +@c Copyright (C) 1990--1995, 1998--1999, 2001--2021 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 b99b5de0b31..b4bd48771f0 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--2020 Free Software +@c Copyright (C) 1990--1995, 1998--1999, 2001--2021 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 b712768a213..0b567d82c61 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--2020 Free Software Foundation, Inc. +@c Copyright (C) 1990--1995, 1998--2021 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 de19c0604c2..a06bd3e801b 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--2020 Free Software Foundation, Inc. +@c Copyright (C) 2012--2021 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 c9a43e0cdeb..4a7793a976d 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--2020 Free Software +@c Copyright (C) 1990--1993, 1995, 1998--1999, 2001--2021 Free Software @c Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Tips @@ -989,7 +989,7 @@ explains these conventions, starting with an example: @group ;;; foo.el --- Support for the Foo programming language -*- lexical-binding: t; -*- -;; Copyright (C) 2010-2020 Your Name +;; Copyright (C) 2010-2021 Your Name @end group ;; Author: Your Name <yourname@@example.com> diff --git a/doc/lispref/two-volume-cross-refs.txt b/doc/lispref/two-volume-cross-refs.txt index 63f55634649..ad13d98dd97 100644 --- a/doc/lispref/two-volume-cross-refs.txt +++ b/doc/lispref/two-volume-cross-refs.txt @@ -1,4 +1,4 @@ -Copyright (C) 2001-2020 Free Software Foundation, Inc. +Copyright (C) 2001-2021 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 133c50be23e..cf612b12573 100644 --- a/doc/lispref/two-volume.make +++ b/doc/lispref/two-volume.make @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2020 Free Software Foundation, Inc. +# Copyright (C) 2007-2021 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 9447e8d04c6..63438170d1a 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--2020 Free Software Foundation, Inc. +@c Copyright (C) 1990--1995, 1998--2021 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 db80b49507f..b0906acbad5 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--2020 Free Software +@c Copyright (C) 1990--1995, 1998--1999, 2001--2021 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 5e23bb3e305..9ad144a457a 100644 --- a/doc/man/ChangeLog.1 +++ b/doc/man/ChangeLog.1 @@ -176,7 +176,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 2007-2020 Free Software Foundation, Inc. + Copyright (C) 2007-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/doc/man/ebrowse.1 b/doc/man/ebrowse.1 index 330c1ea523e..7bb32b80d46 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-2020 Free Software Foundation, Inc. +Copyright 2008-2021 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 3a5758e1aaa..da912bd5112 100644 --- a/doc/man/emacs.1.in +++ b/doc/man/emacs.1.in @@ -657,7 +657,7 @@ For detailed credits and acknowledgments, see the GNU Emacs manual. . . .SH COPYING -Copyright 1995, 1999-2020 Free Software Foundation, Inc. +Copyright 1995, 1999-2021 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 8053e863fce..c5c15fb1826 100644 --- a/doc/man/etags.1 +++ b/doc/man/etags.1 @@ -281,7 +281,7 @@ Stallman. .BR vi ( 1 ). .SH COPYING -Copyright 1992, 1999, 2001-2020 Free Software Foundation, Inc. +Copyright 1992, 1999, 2001-2021 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 f74e51f400e..c050e5d4cb8 100644 --- a/doc/misc/ChangeLog.1 +++ b/doc/misc/ChangeLog.1 @@ -12116,7 +12116,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 1993-1999, 2001-2020 Free Software Foundation, Inc. + Copyright (C) 1993-1999, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in index f4fb7d2ee64..d627055ae1d 100644 --- a/doc/misc/Makefile.in +++ b/doc/misc/Makefile.in @@ -1,6 +1,6 @@ ### @configure_input@ -# Copyright (C) 1994, 1996-2020 Free Software Foundation, Inc. +# Copyright (C) 1994, 1996-2021 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/doc/misc/auth.texi b/doc/misc/auth.texi index f8fcb642901..d810f15c802 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--2020 Free Software Foundation, Inc. +Copyright @copyright{} 2008--2021 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 7b7f8827a79..72ba73697d3 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--2020 Free Software +Copyright @copyright{} 1994--1995, 1999, 2001--2021 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/bovine.texi b/doc/misc/bovine.texi index 8ee985046d9..780f0addb59 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--2020 Free Software Foundation, +Copyright @copyright{} 1999--2004, 2012--2021 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi index 1fa13e98b3c..c4ccea3caf4 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--2020 Free Software Foundation, +Copyright @copyright{} 1990--1991, 2001--2021 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi index adc233d99dd..24ab4b773c6 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--2020 Free Software Foundation, Inc. +Copyright @copyright{} 1995--2021 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document @@ -197,7 +197,7 @@ modify this GNU manual.'' @titlepage @sp 10 -@center @titlefont{CC Mode 5.34} +@center @titlefont{CC Mode 5.35} @sp 2 @center A GNU Emacs mode for editing C and C-like languages @sp 2 @@ -388,7 +388,7 @@ was added in version 5.30. This manual describes @ccmode{} @comment The following line must appear on its own, so that the -version 5.34. +version 5.35. @comment Release.py script can update the version number automatically @ccmode{} supports the editing of C, C++, Objective-C, diff --git a/doc/misc/cl.texi b/doc/misc/cl.texi index 742be28fe34..7464ba2eb1d 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--2020 Free Software Foundation, Inc. +Copyright @copyright{} 1993, 2001--2021 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 5a1dd55248d..e8e99db76ba 100644 --- a/doc/misc/dbus.texi +++ b/doc/misc/dbus.texi @@ -10,7 +10,7 @@ @syncodeindex fn cp @copying -Copyright @copyright{} 2007--2020 Free Software Foundation, Inc. +Copyright @copyright{} 2007--2021 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 243b59b242a..87a127c4f39 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--2020 Free Software +Copyright @copyright{} 1994--1995, 1999, 2001--2021 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/ebrowse.texi b/doc/misc/ebrowse.texi index 98c1a790bb2..8962f7c8cf1 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--2020 Free Software Foundation, Inc. +Copyright @copyright{} 2000--2021 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 63e3595a509..a53f879c961 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--2020 Free Software +Copyright @copyright{} 1998--2001, 2004--2005, 2008--2021 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/ediff.texi b/doc/misc/ediff.texi index 1ef13716b11..8162a84f61a 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--2020 Free Software Foundation, Inc. +Copyright @copyright{} 1995--2021 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 b0200b47456..b4dabdb938d 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--2020 Free Software +Copyright @copyright{} 1986, 1992, 1994--1995, 1999--2021 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/efaq-w32.texi b/doc/misc/efaq-w32.texi index c875d58ef16..2abde2c2843 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--2020 Free Software Foundation, Inc. +Copyright @copyright{} 2008, 2010--2021 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 c31de0ba9a5..f26ae637788 100644 --- a/doc/misc/efaq.texi +++ b/doc/misc/efaq.texi @@ -12,7 +12,7 @@ @c appreciate a notice if you do). @copying -Copyright @copyright{} 2001--2020 Free Software Foundation, Inc.@* +Copyright @copyright{} 2001--2021 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 8dd394cb848..4952e909902 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--2020 Free Software Foundation, Inc. +Copyright @copyright{} 2007--2021 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 bb13ebdf238..fbc4443c0ad 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--2020 Free Software Foundation, Inc. +Copyright @copyright{} 2012--2021 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 316a1baf576..0cf5ba96506 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--2020 Free Software Foundation, Inc. +Copyright @copyright{} 1998--2021 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 fa1833a3da6..cca0d300fa7 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--2020 Free Software Foundation, Inc. +Copyright @copyright{} 2007--2021 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 c39d2f98dc4..d635cac5abb 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--2020 Free Software Foundation, Inc. +Copyright @copyright{} 2005--2021 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 bc56a4af99f..a4e2cb506a3 100644 --- a/doc/misc/ert.texi +++ b/doc/misc/ert.texi @@ -15,7 +15,7 @@ @end direntry @copying -Copyright @copyright{} 2008, 2010--2020 Free Software Foundation, Inc. +Copyright @copyright{} 2008, 2010--2021 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 0c5501f36bc..e106f39cdd9 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--2020 Free Software Foundation, Inc. +Copyright @copyright{} 1999--2021 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 69a8512f175..b40277003c3 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--2020 Free Software Foundation, Inc. +Copyright @copyright{} 1998, 2000--2021 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 a2a21f031d5..6e82a97030e 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--2020 Free Software Foundation, Inc. +Copyright @copyright{} 2014--2021 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 8f2954bdf4f..9c838a8341a 100644 --- a/doc/misc/flymake.texi +++ b/doc/misc/flymake.texi @@ -14,7 +14,7 @@ This manual is for GNU Flymake (version @value{VERSION}, @value{UPDATED}), which is a universal on-the-fly syntax checker for GNU Emacs. -Copyright @copyright{} 2004--2020 Free Software Foundation, Inc. +Copyright @copyright{} 2004--2021 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document @@ -213,6 +213,13 @@ This section summarizes customization variables used for the configuration of the Flymake user interface. @vtable @code +@item flymake-mode-line-format +Format to use for the Flymake mode line indicator. + +@item flymake-mode-line-counter-format +Mode-line construct for formatting Flymake diagnostic counters inside +the Flymake mode line indicator. + @item flymake-no-changes-timeout If any changes are made to the buffer, syntax check is automatically started after this many seconds, unless the user makes another change, diff --git a/doc/misc/forms.texi b/doc/misc/forms.texi index 20b0904ad1a..3d7ac96cc24 100644 --- a/doc/misc/forms.texi +++ b/doc/misc/forms.texi @@ -19,7 +19,7 @@ @copying This file documents Forms mode, a form-editing major mode for GNU Emacs. -Copyright @copyright{} 1989, 1997, 2001--2020 Free Software Foundation, +Copyright @copyright{} 1989, 1997, 2001--2021 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/gnus-coding.texi b/doc/misc/gnus-coding.texi index 9a14a95f797..94d952b423d 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--2020 Free Software Foundation, +Copyright @copyright{} 2004--2005, 2007--2021 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/gnus-faq.texi b/doc/misc/gnus-faq.texi index c30e80ff565..4c29976c05e 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--2020 Free Software Foundation, Inc. +@c Copyright (C) 1995, 2001--2021 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 3743b497da8..797315d5b81 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -8,7 +8,7 @@ @syncodeindex pg cp @copying -Copyright @copyright{} 1995--2020 Free Software Foundation, Inc. +Copyright @copyright{} 1995--2021 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 fc4f32020e9..1674565cdac 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--2020 Free Software Foundation, +Copyright @copyright{} 2002--2003, 2013--2021 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/idlwave.texi b/doc/misc/idlwave.texi index 538c088282b..3cd53c71daf 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--2020 Free Software Foundation, Inc. +Copyright @copyright{} 1999--2021 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 7cc4edd2865..1c960940a0b 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--2020 Free Software Foundation, Inc. +Copyright @copyright{} 2013--2021 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 85e04a99608..27c00f39257 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--2020 Free Software Foundation, +Copyright @copyright{} 1989, 1992, 1996--2021 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/mairix-el.texi b/doc/misc/mairix-el.texi index 30f5f006775..a571c744870 100644 --- a/doc/misc/mairix-el.texi +++ b/doc/misc/mairix-el.texi @@ -5,7 +5,7 @@ @include docstyle.texi @copying -Copyright @copyright{} 2008--2020 Free Software Foundation, Inc. +Copyright @copyright{} 2008--2021 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 b192822fac6..f2680b4a797 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--2020 Free Software Foundation, Inc. +Copyright @copyright{} 1996--2021 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 962f22af5d2..308ea3f34c9 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--2020 Free Software +Copyright @copyright{} 1995, 2001--2003, 2005--2021 Free Software Foundation, Inc. @c This dual license has been agreed upon by the FSF. diff --git a/doc/misc/modus-themes.texi b/doc/misc/modus-themes.texi index de3ccd27c4b..b16aece2ee5 100644 --- a/doc/misc/modus-themes.texi +++ b/doc/misc/modus-themes.texi @@ -33,7 +33,7 @@ released on 2020-10-08. Any reference to a newer feature which does not yet form part of the latest tagged commit, is explicitly marked as such. -Copyright (C) 2020 Free Software Foundation, Inc. +Copyright (C) 2020--2021 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this diff --git a/doc/misc/newsticker.texi b/doc/misc/newsticker.texi index f144975451c..5d052cc27dc 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--2020 Free Software Foundation, Inc. +Copyright @copyright{} 2004--2021 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 1741222d4b0..3671ac8f3d2 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--2020 Free Software Foundation, Inc. +Copyright @copyright{} 2007--2021 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 2005a8e181d..1adc2689697 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--2020 Free Software Foundation, Inc. +Copyright @copyright{} 1996--2021 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/org.texi b/doc/misc/org.texi index 2f1781657d9..5eeb098cc72 100644 --- a/doc/misc/org.texi +++ b/doc/misc/org.texi @@ -15,7 +15,7 @@ @copying This manual is for Org version 9.4. -Copyright @copyright{} 2004--2020 Free Software Foundation, Inc. +Copyright @copyright{} 2004--2021 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/pcl-cvs.texi b/doc/misc/pcl-cvs.texi index d1951f581c9..0d4f9769115 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--2020 Free Software Foundation, Inc. +Copyright @copyright{} 1991--2021 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 261897b735c..82495275fca 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--2020 Free Software Foundation, Inc. +Copyright @copyright{} 2001, 2003--2021 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 2054ca5860d..ff8133b2a1f 100644 --- a/doc/misc/rcirc.texi +++ b/doc/misc/rcirc.texi @@ -6,7 +6,7 @@ @c %**end of header @copying -Copyright @copyright{} 2006--2020 Free Software Foundation, Inc. +Copyright @copyright{} 2006--2021 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 0dab5241517..599252fabf7 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--2020 Free Software Foundation, Inc. +Copyright @copyright{} 1997--2021 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 df845372f4d..80065be0a16 100644 --- a/doc/misc/remember.texi +++ b/doc/misc/remember.texi @@ -9,7 +9,7 @@ @copying This manual is for Remember Mode, version 2.0 -Copyright @copyright{} 2001, 2004--2005, 2007--2020 Free Software +Copyright @copyright{} 2001, 2004--2005, 2007--2021 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/sasl.texi b/doc/misc/sasl.texi index a25f98566c7..847ad5ed763 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--2020 Free Software Foundation, Inc. +Copyright @copyright{} 2000, 2004--2021 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 ccf5b9efb05..3f5b5917a0b 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--2020 Free Software Foundation, Inc. +Copyright @copyright{} 1993, 2001--2021 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 d151cee02cc..c37291ac143 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--2020 Free Software Foundation, +@c Copyright (C) 1999--2005, 2007, 2009--2021 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 c2b2be2282e..3c4f2f0c0e5 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--2020 Free Software +Copyright @copyright{} 1999--2005, 2007, 2009--2021 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/ses.texi b/doc/misc/ses.texi index 6edd6a65762..b529f0b836c 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--2020 Free Software Foundation, Inc. +Copyright @copyright{} 2002--2021 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 0813caebd0f..c30409fc32c 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--2020 Free Software Foundation, Inc. +Copyright @copyright{} 2001--2021 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 f4367b35377..dd481d2101e 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--2020 Free Software Foundation, Inc. +Copyright @copyright{} 2003--2021 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 c9c3daf963b..9991917b3fd 100644 --- a/doc/misc/speedbar.texi +++ b/doc/misc/speedbar.texi @@ -5,7 +5,7 @@ @syncodeindex fn cp @copying -Copyright @copyright{} 1999--2020 Free Software Foundation, Inc. +Copyright @copyright{} 1999--2021 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 79734685e9d..a0e999b6812 100644 --- a/doc/misc/srecode.texi +++ b/doc/misc/srecode.texi @@ -16,7 +16,7 @@ @c %**end of header @copying -Copyright @copyright{} 2007--2020 Free Software Foundation, Inc. +Copyright @copyright{} 2007--2021 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/todo-mode.texi b/doc/misc/todo-mode.texi index 428df56f6ea..dbd7f3d02f7 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--2020 Free Software Foundation, Inc. +Copyright @copyright{} 2013--2021 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 2133dfec35a..358f6fc542e 100644 --- a/doc/misc/tramp.texi +++ b/doc/misc/tramp.texi @@ -12,7 +12,7 @@ @footnotestyle end @copying -Copyright @copyright{} 1999--2020 Free Software Foundation, Inc. +Copyright @copyright{} 1999--2021 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 dbebbc36812..6970c46aef4 100644 --- a/doc/misc/trampver.texi +++ b/doc/misc/trampver.texi @@ -2,13 +2,13 @@ @c texi/trampver.texi. Generated from trampver.texi.in by configure. @c This is part of the Emacs manual. -@c Copyright (C) 2003--2020 Free Software Foundation, Inc. +@c Copyright (C) 2003--2021 Free Software Foundation, Inc. @c See file doclicense.texi for copying conditions. @c In the Tramp GIT, the version numbers are auto-frobbed from @c tramp.el, and the bug report address is auto-frobbed from @c configure.ac. -@set trampver 2.5.0-pre +@set trampver 2.5.0 @set trampurl https://www.gnu.org/software/tramp/ @set tramp-bug-report-address tramp-devel@@gnu.org @set emacsver 25.1 diff --git a/doc/misc/url.texi b/doc/misc/url.texi index 0304ff4b9f1..8f15e11007e 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--2020 Free Software +Copyright @copyright{} 1993--1999, 2002, 2004--2021 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/vhdl-mode.texi b/doc/misc/vhdl-mode.texi index 527302e0cb0..fef98a74636 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--2020 Free Software +Copyright @copyright{} 1995--2008, 2010, 2012, 2015--2021 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/vip.texi b/doc/misc/vip.texi index fe50309dd90..92c76ad2518 100644 --- a/doc/misc/vip.texi +++ b/doc/misc/vip.texi @@ -4,7 +4,7 @@ @include docstyle.texi @copying -Copyright @copyright{} 1987, 2001--2020 Free Software Foundation, Inc. +Copyright @copyright{} 1987, 2001--2021 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 661eb7c947a..e127f62bb5d 100644 --- a/doc/misc/viper.texi +++ b/doc/misc/viper.texi @@ -8,7 +8,7 @@ @include docstyle.texi @copying -Copyright @copyright{} 1995--1997, 2001--2020 Free Software Foundation, +Copyright @copyright{} 1995--1997, 2001--2021 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/widget.texi b/doc/misc/widget.texi index 83a6c4c8d21..b0254e0824c 100644 --- a/doc/misc/widget.texi +++ b/doc/misc/widget.texi @@ -9,7 +9,7 @@ @c %**end of header @copying -Copyright @copyright{} 2000--2020 Free Software Foundation, Inc. +Copyright @copyright{} 2000--2021 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 8b6929be273..dc5b8e4d205 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--2020 +Copyright @copyright{} 1988--1993, 1995, 1998--2004, 2007, 2012--2021 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 a114415e3a8..4470afcad20 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--2020 Free Software Foundation, Inc. +Copyright @copyright{} 2001--2021 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 a0b9cdf696e..da9ed66f15d 100644 --- a/etc/CALC-NEWS +++ b/etc/CALC-NEWS @@ -1,4 +1,4 @@ -Copyright (C) 2001-2020 Free Software Foundation, Inc. +Copyright (C) 2001-2021 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 5a7cd59c979..629ab0b1fd4 100644 --- a/etc/ChangeLog.1 +++ b/etc/ChangeLog.1 @@ -6891,7 +6891,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 1993-1999, 2001-2020 Free Software Foundation, Inc. + Copyright (C) 1993-1999, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/etc/DEBUG b/etc/DEBUG index 7fb7e447583..fae87261865 100644 --- a/etc/DEBUG +++ b/etc/DEBUG @@ -1,6 +1,6 @@ Debugging GNU Emacs -Copyright (C) 1985, 2000-2020 Free Software Foundation, Inc. +Copyright (C) 1985, 2000-2021 Free Software Foundation, Inc. See the end of the file for license conditions. ** Preliminaries diff --git a/etc/DISTRIB b/etc/DISTRIB index 767dac6a2ff..610c347289e 100644 --- a/etc/DISTRIB +++ b/etc/DISTRIB @@ -1,7 +1,7 @@ -*- text -*- GNU Emacs availability information -Copyright (C) 1986-1993, 1995, 1998, 2000-2020 Free Software Foundation, +Copyright (C) 1986-1993, 1995, 1998, 2000-2021 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/etc/ERC-NEWS b/etc/ERC-NEWS index 78cb5401772..8c9306b5cac 100644 --- a/etc/ERC-NEWS +++ b/etc/ERC-NEWS @@ -1,6 +1,6 @@ ERC NEWS -*- outline -*- -Copyright (C) 2006-2020 Free Software Foundation, Inc. +Copyright (C) 2006-2021 Free Software Foundation, Inc. See the end of the file for license conditions. * For changes after ERC 5.3, see the main Emacs NEWS file diff --git a/etc/ETAGS.EBNF b/etc/ETAGS.EBNF index 04db4e3dc8a..c72ac6f721f 100644 --- a/etc/ETAGS.EBNF +++ b/etc/ETAGS.EBNF @@ -94,7 +94,7 @@ those. ===================== end of discussion of tag names ===================== -Copyright (C) 2002-2020 Free Software Foundation, Inc. +Copyright (C) 2002-2021 Free Software Foundation, Inc. COPYING PERMISSIONS: diff --git a/etc/ETAGS.README b/etc/ETAGS.README index 314e3215ab3..3c56021524f 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-2020 Free Software +Copyright (C) 1984, 1987-1989, 1993-1995, 1998-2021 Free Software Foundation, Inc. This file is not considered part of GNU Emacs. diff --git a/etc/HELLO b/etc/HELLO index 9ea7ebc2de3..dec3a775afb 100644 --- a/etc/HELLO +++ b/etc/HELLO @@ -103,7 +103,7 @@ Vietnamese (tiếng Việt) Chào bạn -Copyright (C) 2001-2020 Free Software Foundation, Inc. +Copyright (C) 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/etc/MACHINES b/etc/MACHINES index 78e9cef0fd7..97995777370 100644 --- a/etc/MACHINES +++ b/etc/MACHINES @@ -1,6 +1,6 @@ Emacs machines list -Copyright (C) 1989-1990, 1992-1993, 1998, 2001-2020 Free Software +Copyright (C) 1989-1990, 1992-1993, 1998, 2001-2021 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 420ddd026f4..29c48c72147 100644 --- a/etc/MH-E-NEWS +++ b/etc/MH-E-NEWS @@ -1,6 +1,6 @@ * COPYRIGHT -Copyright (C) 2001-2020 Free Software Foundation, Inc. +Copyright (C) 2001-2021 Free Software Foundation, Inc. See the end of the file for license conditions. * Changes in MH-E 8.6 @@ -1,6 +1,6 @@ GNU Emacs NEWS -- history of user-visible changes. -Copyright (C) 2017-2020 Free Software Foundation, Inc. +Copyright (C) 2017-2021 Free Software Foundation, Inc. See the end of the file for license conditions. Please send Emacs bug reports to 'bug-gnu-emacs@gnu.org'. @@ -85,6 +85,8 @@ useful on systems such as FreeBSD which ships only with "etc/termcap". * Changes in Emacs 28.1 +** The new NonGNU ELPA archive is enabled by default alongside GNU ELPA + ** Minibuffer scrolling is now conservative by default. This is controlled by the new variable 'scroll-minibuffer-conservatively'. @@ -230,8 +232,9 @@ forms, but this command has now been changed to work more like ** Standalone 'M-y' uses the minibuffer to complete previous kills. When 'M-y' is typed not after a yank command, it activates the minibuffer where you can browse previous kills using the minibuffer history or -completion. In Isearch 'C-s M-y' uses the minibuffer with completion -on previous kills to read a string and append it to the search string. +completion. In Isearch, you can bind 'C-s M-y' to the command +`isearch-yank-pop' that uses the minibuffer with completion on +previous kills to read a string and append it to the search string. --- ** New user options 'copy-region-blink-delay' and 'delete-pair-blink-delay'. @@ -1295,6 +1298,19 @@ searches. These commands are bound respectively to 'P' and 'N', and navigate to the first item of the previous or next group in the "*xref*" buffer. +*** New alternative value for 'xref-show-definitions-function': +'xref-show-definitions-completing-read'. + +*** The two existing alternatives for 'xref-show-definitions-function' +have been renamed to have "proper" public names and documented +('xref-show-definitions-buffer' and +'xref-show-definitions-buffer-at-bottom'). + +--- +*** New value 'project-relative' for 'xref-file-name-display' +If chosen, file names in *xref* buffers will be displayed relative +to the 'project-root' of the current project, when available. + ** json.el --- @@ -1471,6 +1487,9 @@ that makes it a valid button. ** Miscellaneous +++ +*** 'add-to-ordered-list' can now take a test predicate. + ++++ *** New predicate functions 'length<', 'length>' and 'length='. Using these functions may be more efficient than using 'length' (if the length of a (long) list is being computed just to compare this @@ -1609,6 +1628,12 @@ the column number format (when 'column-number-mode' is on), and both modes are on). +++ +*** New user option 'mode-line-compact'. +If non-nil, repeating spaces are compressed into a single space. If +'long', this is only done when the mode line is longer than the +current window width (in characters). + ++++ *** New command 'submit-emacs-patch'. This works like 'report-emacs-bug', but is more geared towards sending patches to the Emacs issue tracker. @@ -1726,6 +1751,19 @@ height of lines or width of chars. When non-nil, use a new xwidget webkit session after bookmark jump. Otherwise, it will use 'xwidget-webkit-last-session'. +** Flymake mode + ++++ +*** New user options to customize Flymake's mode-line. + +The new customization variable 'flymake-mode-line-format' is a mix of +strings and symbols like 'flymake-mode-line-title' , +'flymake-mode-line-exception' and 'flymake-mode-line-counters'. The +new customization variable 'flymake-mode-line-counter-format' is a mix +of strings and symbols like 'flymake-mode-line-error-counter', +'flymake-mode-line-warning-counter' and +'flymake-mode-line-note-counter'. + ** Flyspell mode +++ @@ -1903,11 +1941,6 @@ This is no longer supported, and setting this variable has no effect. ** The macro 'with-displayed-buffer-window' is now obsolete. Use macro 'with-current-buffer-window' with action alist entry 'body-function'. -+++ -** 'byte-compile-file' optional argument LOAD is now obsolete. -To load the file after byte-compiling, add a call to 'load' from Lisp -or use 'M-x emacs-lisp-byte-compile-and-load' interactively. - --- ** The metamail.el library is now marked obsolete. @@ -2012,6 +2045,11 @@ If you bind 'help-form' to a non-nil value while calling these functions, then pressing 'C-h' ('help-char') causes the function to evaluate 'help-form' and display the result. +--- +** New variables 'read-char-choice-use-read-key' and 'y-or-n-p-use-read-key'. +When non-nil, then functions 'read-char-choice' and 'y-or-n-p' (respectively) +use the function 'read-key' to read a character instead of using the minibuffer. + +++ ** 'set-window-configuration' now takes an optional 'dont-set-frame' parameter which, when non-nil, instructs the function not to select @@ -2173,6 +2211,11 @@ In order for the two functions to behave more consistently, length, and also supports format specifications that include a truncating precision field, such as "%.2a". ++++ +** 'format-spec' now takes an optional SPLIT parameter. +If non-nil, 'format-spec' will split the resulting string into a list +of strings, based on where the format specs (and expansions) were. + --- ** New function 'color-values-from-color-spec'. This can be used to parse RGB color specs in several formats and @@ -2194,17 +2237,29 @@ menu handling. +++ ** 'inhibit-nul-byte-detection' is renamed to 'inhibit-null-byte-detection'. +** Byte compiler + +++ -** New byte-compiler check for missing dynamic variable declarations. +*** New byte-compiler check for missing dynamic variable declarations. It is meant as an (experimental) aid for converting Emacs Lisp code to lexical binding, where dynamic (special) variables bound in one file can affect code in another. For details, see the manual section "(Elisp) Converting to Lexical Binding". +++ -** 'byte-recompile-directory' can now compile symlinked ".el" files. +*** 'byte-recompile-directory' can now compile symlinked ".el" files. This is achieved by giving a non-nil FOLLOW-SYMLINKS parameter. +*** The byte-compiler now warns about too wide documentation strings. +By default, it will warn if a documentation string is wider than the +largest of 80 characters or 'fill-column'. This is controlled by the +new user option 'byte-compile-docstring-max-column'. + ++++ +*** 'byte-compile-file' optional argument LOAD is now obsolete. +To load the file after byte-compiling, add a call to 'load' from Lisp +or use 'M-x emacs-lisp-byte-compile-and-load' interactively. + --- ** 'unload-feature' now also tries to undo additions to buffer-local hooks. diff --git a/etc/NEWS.1-17 b/etc/NEWS.1-17 index c4ff83bb706..42a3ced1c3a 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-2020 Free Software Foundation, Inc. +Copyright (C) 1985-1986, 2006-2021 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/etc/NEWS.18 b/etc/NEWS.18 index e044f663c45..b11a189c30f 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-2020 Free Software Foundation, Inc. +Copyright (C) 1988, 2006-2021 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/etc/NEWS.19 b/etc/NEWS.19 index d919608d270..43235e0e154 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-2020 Free Software Foundation, Inc. +Copyright (C) 1993-1995, 2001, 2006-2021 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/etc/NEWS.20 b/etc/NEWS.20 index 69ce24a301a..efd0e5d5c26 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-2020 Free Software Foundation, Inc. +Copyright (C) 1999-2001, 2006-2021 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/etc/NEWS.21 b/etc/NEWS.21 index 1228984fe8c..b9d59594a4f 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-2020 Free Software Foundation, Inc. +Copyright (C) 2000-2021 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/etc/NEWS.22 b/etc/NEWS.22 index 4df1792fbc7..1f03dc3a134 100644 --- a/etc/NEWS.22 +++ b/etc/NEWS.22 @@ -1,6 +1,6 @@ GNU Emacs NEWS -- history of user-visible changes. -Copyright (C) 2001-2020 Free Software Foundation, Inc. +Copyright (C) 2001-2021 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 331ed281a37..8611ba53d2e 100644 --- a/etc/NEWS.23 +++ b/etc/NEWS.23 @@ -1,6 +1,6 @@ GNU Emacs NEWS -- history of user-visible changes. -Copyright (C) 2007-2020 Free Software Foundation, Inc. +Copyright (C) 2007-2021 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 60c2b4dfc66..acf6219f74f 100644 --- a/etc/NEWS.24 +++ b/etc/NEWS.24 @@ -1,6 +1,6 @@ GNU Emacs NEWS -- history of user-visible changes. -Copyright (C) 2010-2020 Free Software Foundation, Inc. +Copyright (C) 2010-2021 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 8c04d940907..c533f277091 100644 --- a/etc/NEWS.25 +++ b/etc/NEWS.25 @@ -1,6 +1,6 @@ GNU Emacs NEWS -- history of user-visible changes. -Copyright (C) 2014-2020 Free Software Foundation, Inc. +Copyright (C) 2014-2021 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 c6306a6d45c..05e86726251 100644 --- a/etc/NEWS.26 +++ b/etc/NEWS.26 @@ -1,6 +1,6 @@ GNU Emacs NEWS -- history of user-visible changes. -Copyright (C) 2016-2020 Free Software Foundation, Inc. +Copyright (C) 2016-2021 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 4855cd3b61d..9232a308c57 100644 --- a/etc/NEWS.27 +++ b/etc/NEWS.27 @@ -1,6 +1,6 @@ GNU Emacs NEWS -- history of user-visible changes. -Copyright (C) 2017-2020 Free Software Foundation, Inc. +Copyright (C) 2017-2021 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 5ac3b6b1741..5dd2e646ed4 100644 --- a/etc/NEXTSTEP +++ b/etc/NEXTSTEP @@ -1,4 +1,4 @@ -Copyright (C) 2008-2020 Free Software Foundation, Inc. +Copyright (C) 2008-2021 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 5df9790c2f4..cdce6e72bab 100644 --- a/etc/NXML-NEWS +++ b/etc/NXML-NEWS @@ -1,4 +1,4 @@ -Copyright (C) 2007-2020 Free Software Foundation, Inc. +Copyright (C) 2007-2021 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS index 0c094411ab0..2cae8b92ace 100644 --- a/etc/ORG-NEWS +++ b/etc/ORG-NEWS @@ -5,7 +5,7 @@ ORG NEWS -- history of user-visible changes. -*- mode: org; coding: utf-8 -*- #+LINK: doc https://orgmode.org/worg/doc.html#%s #+LINK: git https://code.orgmode.org/bzg/org-mode/commit/%s -Copyright (C) 2012-2020 Free Software Foundation, Inc. +Copyright (C) 2012-2021 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 f24c6f03c8e..25e129bcd99 100644 --- a/etc/PROBLEMS +++ b/etc/PROBLEMS @@ -1,6 +1,6 @@ Known Problems with GNU Emacs -Copyright (C) 1987-1989, 1993-1999, 2001-2020 Free Software Foundation, +Copyright (C) 1987-1989, 1993-1999, 2001-2021 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/etc/README b/etc/README index b9b4bc4f0e7..6d7a15a6f2d 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-2020 Free Software Foundation, Inc. + Copyright (C) 1999, 2001-2021 Free Software Foundation, Inc. License: GNU General Public License version 3 or later (see COPYING) diff --git a/etc/TERMS b/etc/TERMS index 20c0a9a68c4..80b39c80e9f 100644 --- a/etc/TERMS +++ b/etc/TERMS @@ -1,4 +1,4 @@ -Copyright (C) 1999, 2001-2020 Free Software Foundation, Inc. +Copyright (C) 1999, 2001-2021 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 @@ -1,6 +1,6 @@ Emacs TODO List -*-outline-*- -Copyright (C) 2001-2020 Free Software Foundation, Inc. +Copyright (C) 2001-2021 Free Software Foundation, Inc. See the end of the file for license conditions. @@ -638,8 +638,6 @@ Do this for some or all errors associated with using subprocesses. ** Maybe reinterpret 'parse-error' as a category of errors Put some other errors under it. -** Make byte-compiler warn when a doc string is too wide - ** Make byte-optimization warnings issue accurate line numbers ** Record the sxhash of the default value for customized variables diff --git a/etc/charsets/README b/etc/charsets/README index 3312367f29e..0045a0f638e 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-2020 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 7e406389d44..e56d3b68476 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-2020 Free Software Foundation, Inc. +Copyright (C) 2004-2021 Free Software Foundation, Inc. COPYING PERMISSIONS: diff --git a/etc/edt-user.el b/etc/edt-user.el index 2852f936f22..8e1a599f0d1 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-2020 Free Software Foundation, +;; Copyright (C) 1986, 1992-1993, 2000-2021 Free Software Foundation, ;; Inc. ;; Author: Kevin Gallagher <kevin.gal@verizon.net> diff --git a/etc/emacs-buffer.gdb b/etc/emacs-buffer.gdb index e2377424077..41af836599b 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-2020 Free Software Foundation, Inc. +# Copyright (C) 2005-2021 Free Software Foundation, Inc. # Author: Noah Friedman <friedman@splode.com> # Created: 2005-04-28 diff --git a/etc/emacs.appdata.xml b/etc/emacs.appdata.xml index 1b5d7f9aae9..ca6233a59ae 100644 --- a/etc/emacs.appdata.xml +++ b/etc/emacs.appdata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (C) 2014-2020 Free Software Foundation, Inc. --> +<!-- Copyright (C) 2014-2021 Free Software Foundation, Inc. --> <component type="desktop-application"> <id>org.gnu.emacs</id> <metadata_license>GFDL-1.3+</metadata_license> diff --git a/etc/enriched.txt b/etc/enriched.txt index 1e1dc46c410..dd269e313cb 100644 --- a/etc/enriched.txt +++ b/etc/enriched.txt @@ -253,7 +253,7 @@ it.</indent> -Copyright (C) 1995, 1997, 2001-2020 Free Software Foundation, Inc. +Copyright (C) 1995, 1997, 2001-2021 Free Software Foundation, Inc. COPYING PERMISSIONS: diff --git a/etc/forms/forms-d2.el b/etc/forms/forms-d2.el index 1b0d6426e03..cd4231cf2de 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-2020 Free Software Foundation, +;; Copyright (C) 1991, 1994-1997, 2001-2021 Free Software Foundation, ;; Inc. ;; Author: Johan Vromans <jvromans@squirrel.nl> diff --git a/etc/gnus-tut.txt b/etc/gnus-tut.txt index 2001b913d24..27e868b79cb 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 <URL:http://www.ifi.uio.no/~larsi/larsi.html>. -;; Copyright (C) 1995, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1995, 2001-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@ifi.uio.no> ;; Keywords: news diff --git a/etc/grep.txt b/etc/grep.txt index 3dc4aac3c89..b5b78459b5c 100644 --- a/etc/grep.txt +++ b/etc/grep.txt @@ -103,7 +103,7 @@ grep -nH -e "xyzxyz" ../info/* -Copyright (C) 2005-2020 Free Software Foundation, Inc. +Copyright (C) 2005-2021 Free Software Foundation, Inc. COPYING PERMISSIONS: diff --git a/etc/images/README b/etc/images/README index 2cee207e246..00aac4f510a 100644 --- a/etc/images/README +++ b/etc/images/README @@ -27,19 +27,19 @@ COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES File: mh-logo.xpm Author: Satyaki Das - Copyright (C) 2003-2020 Free Software Foundation, Inc. + Copyright (C) 2003-2021 Free Software Foundation, Inc. Files: gnus.pbm Author: Luis Fernandes <elf@ee.ryerson.ca> - Copyright (C) 2001-2020 Free Software Foundation, Inc. + Copyright (C) 2001-2021 Free Software Foundation, Inc. Files: splash.png, splash.svg, splash.pbm, splash.xpm Author: Francesc Rocher <francesc.rocher@gmail.com> - Copyright (C) 2008-2020 Free Software Foundation, Inc. + Copyright (C) 2008-2021 Free Software Foundation, Inc. Files: checked.xpm, unchecked.xpm Author: Chong Yidong <cyd@stupidchicken.com> - Copyright (C) 2010-2020 Free Software Foundation, Inc. + Copyright (C) 2010-2021 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 9f60b368422..3e7e76f254e 100644 --- a/etc/images/checked.xpm +++ b/etc/images/checked.xpm @@ -1,5 +1,5 @@ /* XPM */ -/* Copyright (C) 2010-2020 Free Software Foundation, Inc. +/* Copyright (C) 2010-2021 Free Software Foundation, Inc. * * Author: Chong Yidong <cyd@stupidchicken.com> * diff --git a/etc/images/custom/README b/etc/images/custom/README index 7eb87c44000..fc9cd8d7f12 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-2020 Free Software Foundation, Inc. +Copyright (C) 2008-2021 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 2aef056abe6..865ce5b4c07 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-2020 Free Software Foundation, Inc. +Copyright (C) 1999-2021 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 f9c51f02c7b..4acfc0c7db9 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 <simon@josefsson.org> -Copyright (C) 2001-2020 Free Software Foundation, Inc. +Copyright (C) 2001-2021 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 @@ -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 <elf@ee.ryerson.ca> -Copyright (C) 2001-2020 Free Software Foundation, Inc. +Copyright (C) 2001-2021 Free Software Foundation, Inc. Files: gnus.png, gnus.svg Author: Francesc Rocher <rocher@member.fsf.org> - Copyright (C) 2008-2020 Free Software Foundation, Inc. + Copyright (C) 2008-2021 Free Software Foundation, Inc. * The following icons are from GNOME 2.x. They are not part of Emacs, diff --git a/etc/images/gnus/gnus.svg b/etc/images/gnus/gnus.svg index 7514f344631..362dc16cb6f 100644 --- a/etc/images/gnus/gnus.svg +++ b/etc/images/gnus/gnus.svg @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- Gnu Emacs Logo - Copyright (C) 2008-2020 Free Software Foundation, Inc. + Copyright (C) 2008-2021 Free Software Foundation, Inc. Author: Francesc Rocher <f.rocher@member.fsf.org> diff --git a/etc/images/gud/README b/etc/images/gud/README index 4bf11eca8f5..0ef5258b9a8 100644 --- a/etc/images/gud/README +++ b/etc/images/gud/README @@ -1,7 +1,7 @@ COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES The following icons were created by Nick Roberts <nickrob@snap.net.nz>. -Copyright (C) 2002-2020 Free Software Foundation, Inc. +Copyright (C) 2002-2021 Free Software Foundation, Inc. License: GNU General Public License version 3 or later (see COPYING) break.pbm, nexti.pbm, go.pbm, pp.pbm, print.pbm, pstar.pbm, remove.pbm @@ -31,7 +31,7 @@ their copyright assignment included the icons. The following icons are converted from the Insight Windows style icon set in src/gdb/gdbtk/library/images2. -Copyright (C) 2002-2020 Free Software Foundation, Inc. +Copyright (C) 2002-2021 Free Software Foundation, Inc. License: GNU General Public License version 3 or later (see COPYING) cont.pbm and cont.xpm were converted from continue.gif @@ -47,7 +47,7 @@ License: GNU General Public License version 3 or later (see COPYING) The following icons are created from the Insight Windows style icon set in src/gdb/gdbtk/library/images2. -Copyright (C) 2002-2020 Free Software Foundation, Inc. +Copyright (C) 2002-2021 Free Software Foundation, Inc. License: GNU General Public License version 3 or later (see COPYING) rcont.xpm rfinish.xpm diff --git a/etc/images/icons/README b/etc/images/icons/README index ee25f4ab92c..a0a2e9303d5 100644 --- a/etc/images/icons/README +++ b/etc/images/icons/README @@ -6,7 +6,7 @@ Files: hicolor/16x16/apps/emacs.png hicolor/24x24/apps/emacs.png hicolor/scalable/mimetypes/emacs-document.svg Author: Nicolas Petton <nicolas@petton.fr> -Copyright (C) 2015-2020 Free Software Foundation, Inc. +Copyright (C) 2015-2021 Free Software Foundation, Inc. License: GNU General Public License version 3 or later (see COPYING) Files: hicolor/16x16/apps/emacs23.png hicolor/24x24/apps/emacs23.png @@ -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 <nanasess@fsm.ne.jp> -Copyright (C) 2007-2020 Free Software Foundation, Inc. +Copyright (C) 2007-2021 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 <andrew_zhilin@yahoo.com> -Copyright (C) 2005-2020 Free Software Foundation, Inc. +Copyright (C) 2005-2021 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 <ken.manheimer@gmail.com> -Copyright (C) 2011-2020 Free Software Foundation, Inc. +Copyright (C) 2011-2021 Free Software Foundation, Inc. License: GNU General Public License version 3 or later (see COPYING) diff --git a/etc/images/icons/hicolor/scalable/apps/emacs.svg b/etc/images/icons/hicolor/scalable/apps/emacs.svg index 902ee9db7eb..a2bc4412475 100644 --- a/etc/images/icons/hicolor/scalable/apps/emacs.svg +++ b/etc/images/icons/hicolor/scalable/apps/emacs.svg @@ -15,7 +15,7 @@ id="metadata70"><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><!-- Gnu Emacs Icon - Copyright (C) 2008-2020 Free Software Foundation, Inc. + Copyright (C) 2008-2021 Free Software Foundation, Inc. Author: Nicolas Petton <nicolas@petton.fr> diff --git a/etc/images/icons/hicolor/scalable/apps/emacs23.svg b/etc/images/icons/hicolor/scalable/apps/emacs23.svg index 6365a4dec22..31db7b9cef4 100644 --- a/etc/images/icons/hicolor/scalable/apps/emacs23.svg +++ b/etc/images/icons/hicolor/scalable/apps/emacs23.svg @@ -10,7 +10,7 @@ id="svg4768" xml:space="preserve"> <!-- Gnu Emacs Icon - Copyright (C) 2008-2020 Free Software Foundation, Inc. + Copyright (C) 2008-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/etc/images/icons/hicolor/scalable/mimetypes/emacs-document23.svg b/etc/images/icons/hicolor/scalable/mimetypes/emacs-document23.svg index bd3f0c0abd9..b11c5bd0524 100644 --- a/etc/images/icons/hicolor/scalable/mimetypes/emacs-document23.svg +++ b/etc/images/icons/hicolor/scalable/mimetypes/emacs-document23.svg @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- Gnu Emacs Document Icon - Copyright (C) 2008-2020 Free Software Foundation, Inc. + Copyright (C) 2008-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/etc/images/mh-logo.xpm b/etc/images/mh-logo.xpm index 97848e06ce9..fd7598d5a6b 100644 --- a/etc/images/mh-logo.xpm +++ b/etc/images/mh-logo.xpm @@ -1,7 +1,7 @@ /* XPM */ /* MH-E Logo * - * Copyright (C) 2003-2020 Free Software Foundation, Inc. + * Copyright (C) 2003-2021 Free Software Foundation, Inc. * * Author: Satyaki Das * diff --git a/etc/images/mpc/README b/etc/images/mpc/README index 709ae07a5c5..30e9ac0cf29 100644 --- a/etc/images/mpc/README +++ b/etc/images/mpc/README @@ -2,5 +2,5 @@ COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES Files: add.xpm ffwd.xpm next.xpm pause.xpm play.xpm prev.xpm rewind.xpm stop.xpm Author: Stefan Monnier <monnier@iro.umontreal.ca> -Copyright (C) 2009-2020 Free Software Foundation, Inc. +Copyright (C) 2009-2021 Free Software Foundation, Inc. License: GNU General Public License version 3 or later (see COPYING) diff --git a/etc/images/newsticker/README b/etc/images/newsticker/README index 3adf691a370..30ecabb639f 100644 --- a/etc/images/newsticker/README +++ b/etc/images/newsticker/README @@ -4,5 +4,5 @@ Files: browse-url.xpm get-all.xpm mark-immortal.xpm mark-read.xpm narrow.xpm next-feed.xpm next-item.xpm prev-feed.xpm prev-item.xpm rss-feed.png rss-feed.svg update.xpm Author: Ulf Jasper -Copyright (C) 2011-2020 Free Software Foundation, Inc. +Copyright (C) 2011-2021 Free Software Foundation, Inc. License: GNU General Public License version 3 or later (see COPYING) diff --git a/etc/images/smilies/README b/etc/images/smilies/README index 1563845dd98..9fddcfb9e7a 100644 --- a/etc/images/smilies/README +++ b/etc/images/smilies/README @@ -3,5 +3,5 @@ Files: blink.pbm blink.xpm braindamaged.xpm cry.xpm dead.xpm evil.xpm sad.xpm smile.pbm smile.xpm wry.pbm wry.xpm Authors: Reiner Steib, Simon Josefsson, Kai Grossjohann, Alex Schroeder, Oliver Scholz, Per Abrahamsen, Kim F. Storm. -Copyright (C) 1999-2020 Free Software Foundation, Inc. +Copyright (C) 1999-2021 Free Software Foundation, Inc. License: GNU General Public License version 3 or later (see COPYING) diff --git a/etc/images/smilies/grayscale/README b/etc/images/smilies/grayscale/README index c2b0949b0aa..5d15f3cfbfd 100644 --- a/etc/images/smilies/grayscale/README +++ b/etc/images/smilies/grayscale/README @@ -3,5 +3,5 @@ Files: blink.xpm braindamaged.xpm cry.xpm dead.xpm evil.xpm forced.xpm frown.xpm grin.xpm indifferent.xpm reverse-smile.xpm sad.xpm smile.xpm wry.xpm Author: Adam Sjøgren -Copyright (C) 2007-2020 Free Software Foundation, Inc. +Copyright (C) 2007-2021 Free Software Foundation, Inc. License: GNU General Public License version 3 or later (see COPYING) diff --git a/etc/images/smilies/medium/README b/etc/images/smilies/medium/README index c2b0949b0aa..5d15f3cfbfd 100644 --- a/etc/images/smilies/medium/README +++ b/etc/images/smilies/medium/README @@ -3,5 +3,5 @@ Files: blink.xpm braindamaged.xpm cry.xpm dead.xpm evil.xpm forced.xpm frown.xpm grin.xpm indifferent.xpm reverse-smile.xpm sad.xpm smile.xpm wry.xpm Author: Adam Sjøgren -Copyright (C) 2007-2020 Free Software Foundation, Inc. +Copyright (C) 2007-2021 Free Software Foundation, Inc. License: GNU General Public License version 3 or later (see COPYING) diff --git a/etc/images/splash.svg b/etc/images/splash.svg index 5e3ac09c308..387ffad7c7a 100644 --- a/etc/images/splash.svg +++ b/etc/images/splash.svg @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- Gnu Emacs Logo - Copyright (C) 2008-2020 Free Software Foundation, Inc. + Copyright (C) 2008-2021 Free Software Foundation, Inc. Author: Francesc Rocher <francesc.rocher@gmail.com> Based on the original work by Luis Fernandes <elf@ee.ryerson.ca> diff --git a/etc/images/tabs/README b/etc/images/tabs/README index da149af94c6..f1429ef16f0 100644 --- a/etc/images/tabs/README +++ b/etc/images/tabs/README @@ -4,5 +4,5 @@ COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES Files: close.xpm new.xpm left-arrow.xpm right-arrow.xpm Author: Juri Linkov <juri@linkov.net> -Copyright (C) 2019-2020 Free Software Foundation, Inc. +Copyright (C) 2019-2021 Free Software Foundation, Inc. License: GNU General Public License version 3 or later (see COPYING) diff --git a/etc/images/tree-widget/default/README b/etc/images/tree-widget/default/README index 2a7772e0337..a0c9c8e48dc 100644 --- a/etc/images/tree-widget/default/README +++ b/etc/images/tree-widget/default/README @@ -5,5 +5,5 @@ Files: close.png close.xpm empty.png empty.xpm end-guide.png end-guide.xpm no-guide.png no-guide.xpm no-handle.png no-handle.xpm open.png open.xpm Author: David Ponce <david.ponce@wanadoo.fr> -Copyright (C) 2004-2020 Free Software Foundation, Inc. +Copyright (C) 2004-2021 Free Software Foundation, Inc. License: GNU General Public License version 3 or later (see COPYING) diff --git a/etc/images/tree-widget/folder/README b/etc/images/tree-widget/folder/README index 5af0e9b28ca..2a9c8a211b4 100644 --- a/etc/images/tree-widget/folder/README +++ b/etc/images/tree-widget/folder/README @@ -5,5 +5,5 @@ Files: close.png close.xpm empty.png empty.xpm end-guide.png leaf.png leaf.xpm no-guide.png no-guide.xpm no-handle.png no-handle.xpm open.png open.xpm Author: David Ponce <david.ponce@wanadoo.fr> -Copyright (C) 2004-2020 Free Software Foundation, Inc. +Copyright (C) 2004-2021 Free Software Foundation, Inc. License: GNU General Public License version 3 or later (see COPYING) diff --git a/etc/images/unchecked.xpm b/etc/images/unchecked.xpm index 128fcd1b47c..5e18534e77e 100644 --- a/etc/images/unchecked.xpm +++ b/etc/images/unchecked.xpm @@ -1,5 +1,5 @@ /* XPM */ -/* Copyright (C) 2010-2020 Free Software Foundation, Inc. +/* Copyright (C) 2010-2021 Free Software Foundation, Inc. * * Author: Chong Yidong <cyd@stupidchicken.com> * diff --git a/etc/org/README b/etc/org/README index 100c577e194..07126fc31ba 100644 --- a/etc/org/README +++ b/etc/org/README @@ -1,7 +1,7 @@ The files OrgOdtContentTemplate.xml and OrgOdtStyles.xml have the following copyright information: -Copyright (C) 2010-2020 Free Software Foundation, Inc. +Copyright (C) 2010-2021 Free Software Foundation, Inc. These files are part of GNU Emacs. diff --git a/etc/ps-prin0.ps b/etc/ps-prin0.ps index d5f8a5e0609..72046666460 100644 --- a/etc/ps-prin0.ps +++ b/etc/ps-prin0.ps @@ -1,7 +1,7 @@ % === BEGIN ps-print prologue 0 % version: 6.0 -% Copyright (C) 2000-2020 Free Software Foundation, Inc. +% Copyright (C) 2000-2021 Free Software Foundation, Inc. % This file is part of GNU Emacs. diff --git a/etc/ps-prin1.ps b/etc/ps-prin1.ps index f68174b991e..d565e33d3ba 100644 --- a/etc/ps-prin1.ps +++ b/etc/ps-prin1.ps @@ -1,7 +1,7 @@ % === BEGIN ps-print prologue 1 % version: 6.1 -% Copyright (C) 2000-2020 Free Software Foundation, Inc. +% Copyright (C) 2000-2021 Free Software Foundation, Inc. % This file is part of GNU Emacs. diff --git a/etc/refcards/Makefile b/etc/refcards/Makefile index c0f0233f921..ce2c534a93b 100644 --- a/etc/refcards/Makefile +++ b/etc/refcards/Makefile @@ -1,6 +1,6 @@ ### Makefile for Emacs refcards -## Copyright (C) 1993-1994, 2001-2020 Free Software Foundation, Inc. +## Copyright (C) 1993-1994, 2001-2021 Free Software Foundation, Inc. ## This file is part of GNU Emacs. # diff --git a/etc/refcards/README b/etc/refcards/README index f3de99f9610..30c82bc7140 100644 --- a/etc/refcards/README +++ b/etc/refcards/README @@ -1,4 +1,4 @@ -Copyright (C) 2013-2020 Free Software Foundation, Inc. +Copyright (C) 2013-2021 Free Software Foundation, Inc. See the end of the file for license conditions. @@ -32,7 +32,7 @@ it is reproduced here for convenience. File: gnus-logo.eps, gnus-logo.pdf Author: Luis Fernandes <elf@ee.ryerson.ca> - Copyright (C) 2001-2020 Free Software Foundation, Inc. + Copyright (C) 2001-2021 Free Software Foundation, Inc. License: GNU General Public License version 3 or later (see COPYING) diff --git a/etc/refcards/calccard.tex b/etc/refcards/calccard.tex index a562f1e9446..02607621cd4 100644 --- a/etc/refcards/calccard.tex +++ b/etc/refcards/calccard.tex @@ -20,7 +20,7 @@ % Typical command to format: tex calccard.tex % Typical command to print (3 cols): dvips -t landscape calccard.dvi -% Copyright (C) 1987, 1992, 2001--2020 Free Software Foundation, Inc. +% Copyright (C) 1987, 1992, 2001--2021 Free Software Foundation, Inc. % This document 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/etc/refcards/cs-dired-ref.tex b/etc/refcards/cs-dired-ref.tex index 9a37f16edd3..294d11d1ca4 100644 --- a/etc/refcards/cs-dired-ref.tex +++ b/etc/refcards/cs-dired-ref.tex @@ -1,6 +1,6 @@ % Reference Card for Dired -*- coding: utf-8 -*- -% Copyright (C) 2000--2020 Free Software Foundation, Inc. +% Copyright (C) 2000--2021 Free Software Foundation, Inc. % Author: Evgeny Roubinchtein <eroubinc@u.washington.edu> % Czech translation: Pavel Janík <Pavel@Janik.cz>, March 2001 diff --git a/etc/refcards/cs-refcard.tex b/etc/refcards/cs-refcard.tex index 5a3adb80b3b..4d9a8b34aef 100644 --- a/etc/refcards/cs-refcard.tex +++ b/etc/refcards/cs-refcard.tex @@ -1,6 +1,6 @@ % Reference Card for GNU Emacs -*- coding: utf-8 -*- -% Copyright (C) 1987, 1993, 1996--1997, 2001--2020 Free Software +% Copyright (C) 1987, 1993, 1996--1997, 2001--2021 Free Software % Foundation, Inc. % Author: Stephen Gildea <stepheng+emacs@gildea.com> diff --git a/etc/refcards/cs-survival.tex b/etc/refcards/cs-survival.tex index 699dd9054d6..75a07eebd16 100644 --- a/etc/refcards/cs-survival.tex +++ b/etc/refcards/cs-survival.tex @@ -1,6 +1,6 @@ % Title: GNU Emacs Survival Card -*- coding: utf-8 -*- -% Copyright (C) 2000--2020 Free Software Foundation, Inc. +% Copyright (C) 2000--2021 Free Software Foundation, Inc. % Author: Włodek Bzyl <matwb@univ.gda.pl> % Czech translation: Pavel Janík <Pavel@Janik.cz>, March 2001 diff --git a/etc/refcards/de-refcard.tex b/etc/refcards/de-refcard.tex index 29ddf12d49f..c890acb69f4 100644 --- a/etc/refcards/de-refcard.tex +++ b/etc/refcards/de-refcard.tex @@ -1,6 +1,6 @@ % Reference Card for GNU Emacs -% Copyright (C) 1987, 1993, 1996, 2000--2020 Free Software Foundation, +% Copyright (C) 1987, 1993, 1996, 2000--2021 Free Software Foundation, % Inc. % Author: Stephen Gildea <stepheng+emacs@gildea.com> diff --git a/etc/refcards/dired-ref.tex b/etc/refcards/dired-ref.tex index 85a70524948..8d5af71b6c7 100644 --- a/etc/refcards/dired-ref.tex +++ b/etc/refcards/dired-ref.tex @@ -1,6 +1,6 @@ % Reference Card for Dired -% Copyright (C) 2000--2020 Free Software Foundation, Inc. +% Copyright (C) 2000--2021 Free Software Foundation, Inc. % Author: Evgeny Roubinchtein <eroubinc@u.washington.edu> diff --git a/etc/refcards/emacsver.tex.in b/etc/refcards/emacsver.tex.in index 2f5bfb924bb..ac80804bf1c 100644 --- a/etc/refcards/emacsver.tex.in +++ b/etc/refcards/emacsver.tex.in @@ -2,4 +2,4 @@ \def\versionemacs{@majorversion@} % major version of emacs %% This one should not be automatically updated; %% M-x set-copyright in admin.el handles it. -\def\year{2020} % latest copyright year +\def\year{2021} % latest copyright year diff --git a/etc/refcards/fr-dired-ref.tex b/etc/refcards/fr-dired-ref.tex index 968c58bb90a..fb8462f2767 100644 --- a/etc/refcards/fr-dired-ref.tex +++ b/etc/refcards/fr-dired-ref.tex @@ -1,6 +1,6 @@ % Reference Card for Dired -*- coding: utf-8 -*- -% Copyright (C) 2000--2020 Free Software Foundation, Inc. +% Copyright (C) 2000--2021 Free Software Foundation, Inc. % Author: Evgeny Roubinchtein <eroubinc@u.washington.edu> % French translation: Eric Jacoboni diff --git a/etc/refcards/fr-refcard.tex b/etc/refcards/fr-refcard.tex index fe303ee8a51..34d7ebda19e 100644 --- a/etc/refcards/fr-refcard.tex +++ b/etc/refcards/fr-refcard.tex @@ -1,6 +1,6 @@ % Reference Card for GNU Emacs -% Copyright (C) 1987, 1993, 1996--1997, 2001--2020 Free Software +% Copyright (C) 1987, 1993, 1996--1997, 2001--2021 Free Software % Foundation, Inc. % Author: Stephen Gildea <stepheng+emacs@gildea.com> diff --git a/etc/refcards/fr-survival.tex b/etc/refcards/fr-survival.tex index 1cd6852db83..e11fe175f87 100644 --- a/etc/refcards/fr-survival.tex +++ b/etc/refcards/fr-survival.tex @@ -1,7 +1,7 @@ %&tex % Title: GNU Emacs Survival Card -% Copyright (C) 2000--2020 Free Software Foundation, Inc. +% Copyright (C) 2000--2021 Free Software Foundation, Inc. % Author: Włodek Bzyl <matwb@univ.gda.pl> % French translation: \'Eric Jacoboni <jaco@teaser.fr>, November 2001 diff --git a/etc/refcards/gnus-logo.eps b/etc/refcards/gnus-logo.eps index d446b36a95f..eb774618212 100644 --- a/etc/refcards/gnus-logo.eps +++ b/etc/refcards/gnus-logo.eps @@ -1,5 +1,5 @@ %!PS-Adobe-2.0 EPSF-2.0 -% Copyright (C) 2000-2020 Free Software Foundation, Inc. +% Copyright (C) 2000-2021 Free Software Foundation, Inc. % % Author: Luis Fernandes <elf@ee.ryerson.ca> % diff --git a/etc/refcards/gnus-refcard.tex b/etc/refcards/gnus-refcard.tex index 895186decfe..4a1760c1b26 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--2020 Free Software Foundation, Inc.\\* + Copyright \copyright\ 1995, 2000, 2002--2021 Free Software Foundation, Inc.\\* \end{center} Released under the terms of the GNU General Public License version 3 or later. diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex index 5613fdd6527..dc28587b47d 100644 --- a/etc/refcards/orgcard.tex +++ b/etc/refcards/orgcard.tex @@ -17,7 +17,7 @@ \pdflayout=(0l) % Nothing else needs to be changed below this line. -% Copyright (C) 1987, 1993, 1996-1997, 2001-2020 Free Software +% Copyright (C) 1987, 1993, 1996--1997, 2001--2021 Free Software % Foundation, Inc. % This document is free software: you can redistribute it and/or modify diff --git a/etc/refcards/pdflayout.sty b/etc/refcards/pdflayout.sty index de7738c4fbd..91e67b109df 100644 --- a/etc/refcards/pdflayout.sty +++ b/etc/refcards/pdflayout.sty @@ -1,4 +1,4 @@ -% Copyright (C) 2007-2020 Free Software Foundation, Inc. +% Copyright (C) 2007-2021 Free Software Foundation, Inc. % This file is part of GNU Emacs. diff --git a/etc/refcards/pl-refcard.tex b/etc/refcards/pl-refcard.tex index 2b92fb5545d..b31b4270ab4 100644 --- a/etc/refcards/pl-refcard.tex +++ b/etc/refcards/pl-refcard.tex @@ -1,7 +1,7 @@ %&mex % Reference Card for GNU Emacs -% Copyright (C) 1999, 2001--2020 Free Software Foundation, Inc. +% Copyright (C) 1999, 2001--2021 Free Software Foundation, Inc. % Author: Stephen Gildea <stepheng+emacs@gildea.com> % Polish translation: Włodek Bzyl <matwb@univ.gda.pl> diff --git a/etc/refcards/pt-br-refcard.tex b/etc/refcards/pt-br-refcard.tex index d4e3123458f..2d6680f7931 100644 --- a/etc/refcards/pt-br-refcard.tex +++ b/etc/refcards/pt-br-refcard.tex @@ -1,6 +1,6 @@ % Reference Card for GNU Emacs -% Copyright (C) 1987, 1993, 1996--1997, 2002--2004, 2006--2020 Free +% Copyright (C) 1987, 1993, 1996--1997, 2002--2004, 2006--2021 Free % Software Foundation, Inc. % Author: Stephen Gildea <stepheng+emacs@gildea.com> diff --git a/etc/refcards/refcard.tex b/etc/refcards/refcard.tex index 6cac28fabbb..f7b5da40b05 100644 --- a/etc/refcards/refcard.tex +++ b/etc/refcards/refcard.tex @@ -1,6 +1,6 @@ % Reference Card for GNU Emacs -% Copyright (C) 1987, 1993, 1996--1997, 2001--2020 Free Software +% Copyright (C) 1987, 1993, 1996--1997, 2001--2021 Free Software % Foundation, Inc. % Author: Stephen Gildea <stepheng+emacs@gildea.com> diff --git a/etc/refcards/ru-refcard.tex b/etc/refcards/ru-refcard.tex index 165c00d309c..179be0af885 100644 --- a/etc/refcards/ru-refcard.tex +++ b/etc/refcards/ru-refcard.tex @@ -1,4 +1,4 @@ -% Copyright (C) 1997, 2002--2020 Free Software Foundation, Inc. +% Copyright (C) 1997, 2002--2021 Free Software Foundation, Inc. % Author: Stephen Gildea <stepheng+emacs@gildea.com> % Russian translation: Alex Ott <alexott@gmail.com> @@ -41,7 +41,7 @@ \setlength{\ColThreeWidth}{25mm} \newcommand{\versionemacs}[0]{28} % version of Emacs this is for -\newcommand{\cyear}[0]{2020} % copyright year +\newcommand{\cyear}[0]{2021} % copyright year \newcommand\shortcopyrightnotice[0]{\vskip 1ex plus 2 fill \centerline{\footnotesize \copyright\ \cyear\ Free Software Foundation, Inc. diff --git a/etc/refcards/sk-dired-ref.tex b/etc/refcards/sk-dired-ref.tex index 294c0e5cbe0..04db4e3fe83 100644 --- a/etc/refcards/sk-dired-ref.tex +++ b/etc/refcards/sk-dired-ref.tex @@ -1,6 +1,6 @@ % Reference Card for Dired -*- coding: utf-8 -*- -% Copyright (C) 2000--2020 Free Software Foundation, Inc. +% Copyright (C) 2000--2021 Free Software Foundation, Inc. % Author: Evgeny Roubinchtein <eroubinc@u.washington.edu> % Czech translation: Pavel Janík <Pavel@Janik.cz>, March 2001 diff --git a/etc/refcards/sk-refcard.tex b/etc/refcards/sk-refcard.tex index b232ea8edf8..bda808f232b 100644 --- a/etc/refcards/sk-refcard.tex +++ b/etc/refcards/sk-refcard.tex @@ -1,6 +1,6 @@ % Reference Card for GNU Emacs -*- coding: utf-8 -*- -% Copyright (C) 1987, 1993, 1996--1997, 2001--2020 Free Software +% Copyright (C) 1987, 1993, 1996--1997, 2001--2021 Free Software % Foundation, Inc. % Author: Stephen Gildea <stepheng+emacs@gildea.com> diff --git a/etc/refcards/sk-survival.tex b/etc/refcards/sk-survival.tex index 8e5d85f4d39..9bf591a794e 100644 --- a/etc/refcards/sk-survival.tex +++ b/etc/refcards/sk-survival.tex @@ -1,6 +1,6 @@ % Title: GNU Emacs Survival Card -*- coding: utf-8 -*- -% Copyright (C) 2000--2020 Free Software Foundation, Inc. +% Copyright (C) 2000--2021 Free Software Foundation, Inc. % Author: Włodek Bzyl <matwb@univ.gda.pl> % Czech translation: Pavel Janík <Pavel@Janik.cz>, March 2001 diff --git a/etc/refcards/survival.tex b/etc/refcards/survival.tex index 24204e52006..a5cd9b7e116 100644 --- a/etc/refcards/survival.tex +++ b/etc/refcards/survival.tex @@ -1,7 +1,7 @@ %&tex % Title: GNU Emacs Survival Card -% Copyright (C) 2000--2020 Free Software Foundation, Inc. +% Copyright (C) 2000--2021 Free Software Foundation, Inc. % Author: Włodek Bzyl <matwb@univ.gda.pl> diff --git a/etc/refcards/vipcard.tex b/etc/refcards/vipcard.tex index b55612b1a87..c62988a0506 100644 --- a/etc/refcards/vipcard.tex +++ b/etc/refcards/vipcard.tex @@ -1,6 +1,6 @@ % Quick Reference Card for VIP -% Copyright (C) 1987, 2001--2020 Free Software Foundation, Inc. +% Copyright (C) 1987, 2001--2021 Free Software Foundation, Inc. % Author: Masahiko Sato <ms@sail.stanford.edu>, <masahiko@sato.riec.tohoku.junet> diff --git a/etc/refcards/viperCard.tex b/etc/refcards/viperCard.tex index 6476563bb45..24be19f14d3 100644 --- a/etc/refcards/viperCard.tex +++ b/etc/refcards/viperCard.tex @@ -1,6 +1,6 @@ % ViperCard -- The Reference Card for Viper under GNU Emacs -% Copyright (C) 1995--1997, 2001--2020 Free Software Foundation, Inc. +% Copyright (C) 1995--1997, 2001--2021 Free Software Foundation, Inc. % Author: Michael Kifer <kifer@cs.stonybrook.edu> (Viper) % Aamod Sane <sane@cs.uiuc.edu> (VIP 4.3) diff --git a/etc/schema/locate.rnc b/etc/schema/locate.rnc index d651c8291e3..697d1db11e9 100644 --- a/etc/schema/locate.rnc +++ b/etc/schema/locate.rnc @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2004, 2007-2020 Free Software Foundation, Inc. +# Copyright (C) 2003-2004, 2007-2021 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/etc/schema/relaxng.rnc b/etc/schema/relaxng.rnc index 96efe9c08e1..d3a9d96617b 100644 --- a/etc/schema/relaxng.rnc +++ b/etc/schema/relaxng.rnc @@ -1,6 +1,6 @@ # RELAX NG XML syntax expressed in RELAX NG Compact syntax. -# Copyright (C) 2003-2004, 2007-2020 Free Software Foundation, Inc. +# Copyright (C) 2003-2004, 2007-2021 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/etc/schema/schemas.xml b/etc/schema/schemas.xml index 40175b056b1..7fd91b8c72e 100644 --- a/etc/schema/schemas.xml +++ b/etc/schema/schemas.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!-- Copyright (C) 2003-2004, 2007-2020 Free Software Foundation, Inc. +<!-- Copyright (C) 2003-2004, 2007-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/etc/ses-example.ses b/etc/ses-example.ses index 2f65d1fa5d4..f73fbfba707 100644 --- a/etc/ses-example.ses +++ b/etc/ses-example.ses @@ -205,7 +205,7 @@ Sales summary - Acme fundraising ;;; ses--symbolic-formulas: (("Eastern area") ("West-district") ("North&South") ("Other")) ;;; End: -;;; Copyright (C) 2002-2020 Free Software Foundation, Inc. +;;; Copyright (C) 2002-2021 Free Software Foundation, Inc. ;;; COPYING PERMISSIONS: ;;; diff --git a/etc/srecode/c.srt b/etc/srecode/c.srt index 0942e31cc92..753d1ee01b1 100644 --- a/etc/srecode/c.srt +++ b/etc/srecode/c.srt @@ -1,6 +1,6 @@ ;;; c.srt --- SRecode templates for c-mode -;; Copyright (C) 2007-2010, 2012-2020 Free Software Foundation, Inc. +;; Copyright (C) 2007-2010, 2012-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/etc/srecode/cpp.srt b/etc/srecode/cpp.srt index aa3bec23829..3d1f9cbf92d 100644 --- a/etc/srecode/cpp.srt +++ b/etc/srecode/cpp.srt @@ -1,6 +1,6 @@ ;;; cpp.srt --- SRecode templates for c++-mode -;; Copyright (C) 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2007-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/etc/srecode/default.srt b/etc/srecode/default.srt index 8df64e0d46e..0dff66187e6 100644 --- a/etc/srecode/default.srt +++ b/etc/srecode/default.srt @@ -1,6 +1,6 @@ ;;; default.srt --- SRecode templates for srecode-template-mode -;; Copyright (C) 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2007-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/etc/srecode/doc-cpp.srt b/etc/srecode/doc-cpp.srt index ecda96a740d..0de05ff15c2 100644 --- a/etc/srecode/doc-cpp.srt +++ b/etc/srecode/doc-cpp.srt @@ -1,6 +1,6 @@ ;; doc-c.srt --- SRecode templates for "document" applications -;; Copyright (C) 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2008-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/etc/srecode/doc-default.srt b/etc/srecode/doc-default.srt index 56a0ae0a4e3..4fc00ddf9e9 100644 --- a/etc/srecode/doc-default.srt +++ b/etc/srecode/doc-default.srt @@ -1,6 +1,6 @@ ;; doc-default.srt --- SRecode templates for "document" applications -;; Copyright (C) 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2009-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/etc/srecode/doc-java.srt b/etc/srecode/doc-java.srt index 17086bc483e..b7eb0dbf2c3 100644 --- a/etc/srecode/doc-java.srt +++ b/etc/srecode/doc-java.srt @@ -1,6 +1,6 @@ ;; doc-java.srt --- SRecode templates for "document" applications -;; Copyright (C) 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2009-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/etc/srecode/ede-autoconf.srt b/etc/srecode/ede-autoconf.srt index 197a2719911..042c05aa63a 100644 --- a/etc/srecode/ede-autoconf.srt +++ b/etc/srecode/ede-autoconf.srt @@ -1,6 +1,6 @@ ;;; ede/templates/autoconf.srt --- Templates for autoconf used by EDE -;; Copyright (C) 2010, 2012-2020 Free Software Foundation, Inc. +;; Copyright (C) 2010, 2012-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/etc/srecode/ede-make.srt b/etc/srecode/ede-make.srt index 259a001e284..ba380e40903 100644 --- a/etc/srecode/ede-make.srt +++ b/etc/srecode/ede-make.srt @@ -1,6 +1,6 @@ ;; ede-make.srt --- SRecode templates for Makefiles used by EDE. -;; Copyright (C) 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2008-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/etc/srecode/el.srt b/etc/srecode/el.srt index 7d5c64c86c0..a366434c3eb 100644 --- a/etc/srecode/el.srt +++ b/etc/srecode/el.srt @@ -1,6 +1,6 @@ ;;; el.srt --- SRecode templates for Emacs Lisp mode -;; Copyright (C) 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2007-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/etc/srecode/getset-cpp.srt b/etc/srecode/getset-cpp.srt index 16c9d5f31bd..af27cb2e8cb 100644 --- a/etc/srecode/getset-cpp.srt +++ b/etc/srecode/getset-cpp.srt @@ -1,6 +1,6 @@ ;;; getset-cpp.srt --- SRecode templates for C++ class getter/setters. -;; Copyright (C) 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2007-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/etc/srecode/java.srt b/etc/srecode/java.srt index 5ff0de3566e..5d8ce88b567 100644 --- a/etc/srecode/java.srt +++ b/etc/srecode/java.srt @@ -1,6 +1,6 @@ ;; java.srt -;; Copyright (C) 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2009-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/etc/srecode/make.srt b/etc/srecode/make.srt index eb486827430..f83ecf9e125 100644 --- a/etc/srecode/make.srt +++ b/etc/srecode/make.srt @@ -1,6 +1,6 @@ ;; make.srt -;; Copyright (C) 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2009-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/etc/srecode/proj-test.srt b/etc/srecode/proj-test.srt index 65ee9797e19..6825c6b8370 100644 --- a/etc/srecode/proj-test.srt +++ b/etc/srecode/proj-test.srt @@ -1,6 +1,6 @@ ;; proj-test.srt --- SRecode template for testing project scoping. -;; Copyright (C) 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2008-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/etc/srecode/template.srt b/etc/srecode/template.srt index ac97c14b9e7..5820b1d756c 100644 --- a/etc/srecode/template.srt +++ b/etc/srecode/template.srt @@ -1,6 +1,6 @@ ;;; template.srt --- Templates for Semantic Recoders -;; Copyright (C) 2005, 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2005, 2007-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/etc/srecode/test.srt b/etc/srecode/test.srt index a9d706677cf..581c295383a 100644 --- a/etc/srecode/test.srt +++ b/etc/srecode/test.srt @@ -1,6 +1,6 @@ ;; test.srt --- SRecode templates for testing -;; Copyright (C) 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2008-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/etc/srecode/texi.srt b/etc/srecode/texi.srt index 243a53f52b4..cc4c50c780c 100644 --- a/etc/srecode/texi.srt +++ b/etc/srecode/texi.srt @@ -1,6 +1,6 @@ ;; texi.srt --- SRecode templates for Texinfo -;; Copyright (C) 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2008-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/etc/srecode/wisent.srt b/etc/srecode/wisent.srt index 445152d51eb..4e8f61bd091 100644 --- a/etc/srecode/wisent.srt +++ b/etc/srecode/wisent.srt @@ -1,6 +1,6 @@ ;; wisent.srt --- SRecode templates for Emacs/WISENT grammar files. -;; Copyright (C) 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2007-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/etc/themes/adwaita-theme.el b/etc/themes/adwaita-theme.el index 67a3b11763c..c98bec6cfa5 100644 --- a/etc/themes/adwaita-theme.el +++ b/etc/themes/adwaita-theme.el @@ -1,6 +1,6 @@ ;;; adwaita-theme.el --- Tango-based custom theme for faces -*- lexical-binding:t -*- -;; Copyright (C) 2010-2020 Free Software Foundation, Inc. +;; Copyright (C) 2010-2021 Free Software Foundation, Inc. ;; Author: William Stevenson <yhvh2000@gmail.com> diff --git a/etc/themes/deeper-blue-theme.el b/etc/themes/deeper-blue-theme.el index 2557918ed7e..cfe8a5bfb28 100644 --- a/etc/themes/deeper-blue-theme.el +++ b/etc/themes/deeper-blue-theme.el @@ -1,6 +1,6 @@ ;;; deeper-blue-theme.el --- Custom theme for faces -*- lexical-binding:t -*- -;; Copyright (C) 2011-2020 Free Software Foundation, Inc. +;; Copyright (C) 2011-2021 Free Software Foundation, Inc. ;; Author: Scott Frazer <frazer.scott@gmail.com> diff --git a/etc/themes/dichromacy-theme.el b/etc/themes/dichromacy-theme.el index 89b5a4e4525..09f4454f9b1 100644 --- a/etc/themes/dichromacy-theme.el +++ b/etc/themes/dichromacy-theme.el @@ -1,6 +1,6 @@ ;;; dichromacy-theme.el --- color theme suitable for color-blind users -*- lexical-binding:t -*- -;; Copyright (C) 2011-2020 Free Software Foundation, Inc. +;; Copyright (C) 2011-2021 Free Software Foundation, Inc. ;; Author: Chong Yidong <cyd@stupidchicken> diff --git a/etc/themes/leuven-theme.el b/etc/themes/leuven-theme.el index f104c845ff6..f643dd560cf 100644 --- a/etc/themes/leuven-theme.el +++ b/etc/themes/leuven-theme.el @@ -1,6 +1,6 @@ ;;; leuven-theme.el --- Awesome Emacs color theme on white background -*- lexical-binding:t -*- -;; Copyright (C) 2003-2020 Free Software Foundation, Inc. +;; Copyright (C) 2003-2021 Free Software Foundation, Inc. ;; Author: Fabrice Niessen <(concat "fniessen" at-sign "pirilampo.org")> ;; URL: https://github.com/fniessen/emacs-leuven-theme diff --git a/etc/themes/light-blue-theme.el b/etc/themes/light-blue-theme.el index c6d3c92bce7..62528856da0 100644 --- a/etc/themes/light-blue-theme.el +++ b/etc/themes/light-blue-theme.el @@ -1,6 +1,6 @@ ;;; light-blue-theme.el --- Custom theme for faces -*- lexical-binding:t -*- -;; Copyright (C) 2011-2020 Free Software Foundation, Inc. +;; Copyright (C) 2011-2021 Free Software Foundation, Inc. ;; Author: Drew Adams <drew.adams@oracle.com> diff --git a/etc/themes/manoj-dark-theme.el b/etc/themes/manoj-dark-theme.el index 195d40d7af6..1f4891c3168 100644 --- a/etc/themes/manoj-dark-theme.el +++ b/etc/themes/manoj-dark-theme.el @@ -1,6 +1,6 @@ ;;; manoj-dark.el --- A dark theme from Manoj -*- lexical-binding:t -*- -;; Copyright (C) 2011-2020 Free Software Foundation, Inc. +;; Copyright (C) 2011-2021 Free Software Foundation, Inc. ;; Author: Manoj Srivastava <srivasta@ieee.org> ;; Keywords: lisp, faces diff --git a/etc/themes/misterioso-theme.el b/etc/themes/misterioso-theme.el index ff9af0c7440..e7a66c5650d 100644 --- a/etc/themes/misterioso-theme.el +++ b/etc/themes/misterioso-theme.el @@ -1,6 +1,6 @@ ;;; misterioso-theme.el --- Custom face theme for Emacs -*- lexical-binding:t -*- -;; Copyright (C) 2011-2020 Free Software Foundation, Inc. +;; Copyright (C) 2011-2021 Free Software Foundation, Inc. ;; Author: Sebastian Hermida diff --git a/etc/themes/modus-operandi-theme.el b/etc/themes/modus-operandi-theme.el index db61c97b766..c7a0f72c103 100644 --- a/etc/themes/modus-operandi-theme.el +++ b/etc/themes/modus-operandi-theme.el @@ -1,6 +1,6 @@ ;;; modus-operandi-theme.el --- Accessible light theme (WCAG AAA) -*- lexical-binding:t -*- -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; Author: Protesilaos Stavrou <info@protesilaos.com> ;; URL: https://gitlab.com/protesilaos/modus-themes diff --git a/etc/themes/modus-vivendi-theme.el b/etc/themes/modus-vivendi-theme.el index d45c3ca2eed..6e71e8d8e3a 100644 --- a/etc/themes/modus-vivendi-theme.el +++ b/etc/themes/modus-vivendi-theme.el @@ -1,6 +1,6 @@ ;;; modus-vivendi-theme.el --- Accessible dark theme (WCAG AAA) -*- lexical-binding:t -*- -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; Author: Protesilaos Stavrou <info@protesilaos.com> ;; URL: https://gitlab.com/protesilaos/modus-themes diff --git a/etc/themes/tango-dark-theme.el b/etc/themes/tango-dark-theme.el index cf1a98bfee2..a8577108ed3 100644 --- a/etc/themes/tango-dark-theme.el +++ b/etc/themes/tango-dark-theme.el @@ -1,6 +1,6 @@ ;;; tango-dark-theme.el --- Tango-based custom theme for faces -*- lexical-binding:t -*- -;; Copyright (C) 2010-2020 Free Software Foundation, Inc. +;; Copyright (C) 2010-2021 Free Software Foundation, Inc. ;; Authors: Chong Yidong <cyd@stupidchicken> ;; Jan Moringen <jan.moringen@uni-bielefeld.de> diff --git a/etc/themes/tango-theme.el b/etc/themes/tango-theme.el index 6166657c145..286561eb4e2 100644 --- a/etc/themes/tango-theme.el +++ b/etc/themes/tango-theme.el @@ -1,6 +1,6 @@ ;;; tango-theme.el --- Tango-based custom theme for faces -*- lexical-binding:t -*- -;; Copyright (C) 2010-2020 Free Software Foundation, Inc. +;; Copyright (C) 2010-2021 Free Software Foundation, Inc. ;; Authors: Chong Yidong <cyd@stupidchicken> ;; Jan Moringen <jan.moringen@uni-bielefeld.de> diff --git a/etc/themes/tsdh-dark-theme.el b/etc/themes/tsdh-dark-theme.el index f3c9ced5b03..62ed7c81dc0 100644 --- a/etc/themes/tsdh-dark-theme.el +++ b/etc/themes/tsdh-dark-theme.el @@ -1,6 +1,6 @@ ;;; tsdh-dark-theme.el --- Tassilo's dark custom theme -*- lexical-binding:t -*- -;; Copyright (C) 2011-2020 Free Software Foundation, Inc. +;; Copyright (C) 2011-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/etc/themes/tsdh-light-theme.el b/etc/themes/tsdh-light-theme.el index 46443edfd49..481a8f3733b 100644 --- a/etc/themes/tsdh-light-theme.el +++ b/etc/themes/tsdh-light-theme.el @@ -1,6 +1,6 @@ ;;; tsdh-light-theme.el --- Tassilo's light custom theme -*- lexical-binding:t -*- -;; Copyright (C) 2011-2020 Free Software Foundation, Inc. +;; Copyright (C) 2011-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/etc/themes/wheatgrass-theme.el b/etc/themes/wheatgrass-theme.el index f1abdb38952..162f7975150 100644 --- a/etc/themes/wheatgrass-theme.el +++ b/etc/themes/wheatgrass-theme.el @@ -1,6 +1,6 @@ ;;; wheatgrass-theme.el --- custom theme for faces -*- lexical-binding:t -*- -;; Copyright (C) 2010-2020 Free Software Foundation, Inc. +;; Copyright (C) 2010-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/etc/themes/whiteboard-theme.el b/etc/themes/whiteboard-theme.el index ee42e4f2155..729c082a331 100644 --- a/etc/themes/whiteboard-theme.el +++ b/etc/themes/whiteboard-theme.el @@ -1,6 +1,6 @@ ;;; whiteboard-theme.el --- Custom theme for faces -*- lexical-binding:t -*- -;; Copyright (C) 2011-2020 Free Software Foundation, Inc. +;; Copyright (C) 2011-2021 Free Software Foundation, Inc. ;; Author: Scott Frazer <frazer.scott@gmail.com> diff --git a/etc/themes/wombat-theme.el b/etc/themes/wombat-theme.el index 4df5f5a3f1c..aaa7cceaf68 100644 --- a/etc/themes/wombat-theme.el +++ b/etc/themes/wombat-theme.el @@ -1,6 +1,6 @@ ;;; wombat-theme.el --- Custom face theme for Emacs -*- lexical-binding:t -*- -;; Copyright (C) 2011-2020 Free Software Foundation, Inc. +;; Copyright (C) 2011-2021 Free Software Foundation, Inc. ;; Author: Kristoffer Grönlund <krig@koru.se> diff --git a/etc/tutorials/TUTORIAL b/etc/tutorials/TUTORIAL index a5b4b76916f..6194e55ea35 100644 --- a/etc/tutorials/TUTORIAL +++ b/etc/tutorials/TUTORIAL @@ -1117,7 +1117,7 @@ starting with the one written by Stuart Cracraft for the original Emacs. 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-2020 Free Software Foundation, + Copyright (C) 1985, 1996, 1998, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/etc/tutorials/TUTORIAL.bg b/etc/tutorials/TUTORIAL.bg index 381c66ffda3..3391e9b32e2 100644 --- a/etc/tutorials/TUTORIAL.bg +++ b/etc/tutorials/TUTORIAL.bg @@ -1162,7 +1162,7 @@ Dired ви позволява да гледате списъка от файло This version of the tutorial, like GNU Emacs, is copyrighted, and comes with permission to distribute copies on certain conditions: - Copyright (C) 1985, 1996, 1998, 2001-2020 Free Software Foundation, + Copyright (C) 1985, 1996, 1998, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/etc/tutorials/TUTORIAL.cn b/etc/tutorials/TUTORIAL.cn index e7fb9e58462..742de090da8 100644 --- a/etc/tutorials/TUTORIAL.cn +++ b/etc/tutorials/TUTORIAL.cn @@ -997,7 +997,7 @@ starting with the one written by Stuart Cracraft for the original Emacs. 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-2020 Free Software Foundation, + Copyright (C) 1985, 1996, 1998, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -1026,7 +1026,7 @@ using, writing, and sharing free software! 本篇指南是 GNU Emacs 的一部分，并允许在下列条件的约束下发行其拷贝： - Copyright (C) 1985, 1996, 1998, 2001-2020 Free Software Foundation, + Copyright (C) 1985, 1996, 1998, 2001-2021 Free Software Foundation, Inc. 本文件为 GNU Emacs 的一部分。 diff --git a/etc/tutorials/TUTORIAL.cs b/etc/tutorials/TUTORIAL.cs index 161f6244d83..12c0d1e5cad 100644 --- a/etc/tutorials/TUTORIAL.cs +++ b/etc/tutorials/TUTORIAL.cs @@ -1015,7 +1015,7 @@ tutoriálem napsaným Stuartem Cracraftem pro původní Emacs. Tato verze tutoriálu je, podobně jako GNU Emacs, chráněna copyrightem a je šířena se svolením distribuovat kopie za jistých podmínek: -Copyright (C) 1985, 1996, 1998, 2001-2020 Free Software Foundation, Inc. +Copyright (C) 1985, 1996, 1998, 2001-2021 Free Software Foundation, Inc. Každému je zaručeno právo vytvářet a distribuovat přesné kopie tohoto dokumentu tak, jak jej obdržel, na jakémkoliv médiu, s tím, že bude diff --git a/etc/tutorials/TUTORIAL.de b/etc/tutorials/TUTORIAL.de index e5ac2542003..7793094dc06 100644 --- a/etc/tutorials/TUTORIAL.de +++ b/etc/tutorials/TUTORIAL.de @@ -1488,7 +1488,7 @@ Beachten Sie bitte, dass im Zweifelsfalle das englische Original dieser Urheberrechtsnotiz gültig ist (zu finden in der Datei TUTORIAL). - Copyright (C) 1985, 1996-1997, 2001-2020 Free Software Foundation, + Copyright (C) 1985, 1996-1997, 2001-2021 Free Software Foundation, Inc. Diese Datei ist ein Bestandteil von GNU Emacs. diff --git a/etc/tutorials/TUTORIAL.eo b/etc/tutorials/TUTORIAL.eo index ef3cf54b81c..a1490cb99b2 100644 --- a/etc/tutorials/TUTORIAL.eo +++ b/etc/tutorials/TUTORIAL.eo @@ -1081,7 +1081,7 @@ la dosiero verkita de Stuart Cracraft por la originala Emakso. kopirajton, kaj venas kun permeso por disdoni kopiojn se certaj kondiĉoj estas observataj: - Copyright (C) 1985, 1999, 2001-2002, 2005, 2007-2020 Free Software + Copyright (C) 1985, 1999, 2001-2002, 2005, 2007-2021 Free Software Foundation, Inc. Ĉi tiu dosiero estas parto de "GNU Emacs". diff --git a/etc/tutorials/TUTORIAL.es b/etc/tutorials/TUTORIAL.es index faecb264326..786a9f4130d 100644 --- a/etc/tutorials/TUTORIAL.es +++ b/etc/tutorials/TUTORIAL.es @@ -1204,7 +1204,7 @@ Por favor, en caso de duda, solo es válido el original en inglés de la siguiente nota de derechos de reproducción (que puede encontrar en el archivo TUTORIAL). -Copyright (C) 1985, 1996, 1998, 2001-2020 Free Software Foundation, Inc. +Copyright (C) 1985, 1996, 1998, 2001-2021 Free Software Foundation, Inc. Se permite a cualquiera hacer o distribuir copias literales de este documento como se recibe, en cualquier medio, siempre que la nota diff --git a/etc/tutorials/TUTORIAL.fr b/etc/tutorials/TUTORIAL.fr index 6dc06519026..3c1d87cda03 100644 --- a/etc/tutorials/TUTORIAL.fr +++ b/etc/tutorials/TUTORIAL.fr @@ -1202,7 +1202,7 @@ Cette version du didacticiel, comme GNU Emacs, est placée sous droit d'auteur, et vous pouvez en distribuer des copies sous certaines conditions : -Copyright (C) 1985, 1996, 2001-2020 Free Software Foundation, Inc. +Copyright (C) 1985, 1996, 2001-2021 Free Software Foundation, Inc. Chacun peut créer ou distribuer des copies de ce document tel qu'il l'a reçu, sur n'importe quel support, pourvu que la note de diff --git a/etc/tutorials/TUTORIAL.he b/etc/tutorials/TUTORIAL.he index 1478fdea735..5cd1cac8fd1 100644 --- a/etc/tutorials/TUTORIAL.he +++ b/etc/tutorials/TUTORIAL.he @@ -1004,7 +1004,7 @@ find-file. גירסה זו של השיעור הינה חלק מחבילת GNU Emacs. היא מוגנת בזכויות יוצרים וניתנת להעתקה והפצת עותקים בתנאים מסויימים כדלקמן: - Copyright (C) 2010-2020 Free Software Foundation, Inc. + Copyright (C) 2010-2021 Free Software Foundation, Inc. GNU Emacs הינו תכנה חפשית; זכותכם להפיצו ו\או לשנותו בכפוף לתנאי הרשיון GNU General Public License, כפי שהוא יוצא לאור ע״י Free diff --git a/etc/tutorials/TUTORIAL.it b/etc/tutorials/TUTORIAL.it index 448937bf17b..ac5937930bf 100644 --- a/etc/tutorials/TUTORIAL.it +++ b/etc/tutorials/TUTORIAL.it @@ -1206,7 +1206,7 @@ distribuito con il permesso di farne copie a determinate condizioni: indicativo, restando comunque inteso il fatto che è quella originale a fare fede. -Copyright (C) 2003-2020 Free Software Foundation, Inc. +Copyright (C) 2003-2021 Free Software Foundation, Inc. È permesso a chiunque copiare e distribuire attraverso ogni mezzo copie fedeli di questo documento così come viene ricevuto, a diff --git a/etc/tutorials/TUTORIAL.ja b/etc/tutorials/TUTORIAL.ja index 0dff756b138..db1e19b692b 100644 --- a/etc/tutorials/TUTORIAL.ja +++ b/etc/tutorials/TUTORIAL.ja @@ -1062,7 +1062,7 @@ starting with the one written by Stuart Cracraft for the original Emacs. This version of the tutorial, like GNU Emacs, is copyrighted, and comes with permission to distribute copies on certain conditions: -Copyright (C) 1985, 1996, 1998, 2001-2020 Free Software Foundation, Inc. +Copyright (C) 1985, 1996, 1998, 2001-2021 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/etc/tutorials/TUTORIAL.ko b/etc/tutorials/TUTORIAL.ko index 39f503baf0f..d3ec8c240cd 100644 --- a/etc/tutorials/TUTORIAL.ko +++ b/etc/tutorials/TUTORIAL.ko @@ -981,7 +981,7 @@ C-x C-s와 (META쇠나 EDIT쇠 혹은 교체쇠가 있으면) <ESC>v와 같은 GNU 이맥스와 같이 이 지침서 판은 저작권이 있으며 특정한 조건을 만족할 때에 복사본을 배포할 수 있는 허가를 갖고 나온 것이다: -Copyright (C) 1985, 1996, 2001-2020 Free Software Foundation, Inc. +Copyright (C) 1985, 1996, 2001-2021 Free Software Foundation, Inc. 이 문서는 이 저작권 공고와 허용 공고가 그대로 유지되고, 배포자가 수취자에게 이 공고에 따라 허용되는 것처럼 또 재분배하는 것을 diff --git a/etc/tutorials/TUTORIAL.nl b/etc/tutorials/TUTORIAL.nl index c6b801c1183..0853e5ffbb7 100644 --- a/etc/tutorials/TUTORIAL.nl +++ b/etc/tutorials/TUTORIAL.nl @@ -1209,7 +1209,7 @@ Deze versie van de inleiding is onderdeel van GNU Emacs. Het valt onder copyright. Je mag deze inleiding verspreiden onder bepaalde voorwaarden: - Copyright (C) 1985, 1996, 1998, 2001-2020 Free Software Foundation, + Copyright (C) 1985, 1996, 1998, 2001-2021 Free Software Foundation, Inc. Dit bestand is onderdeel van GNU Emacs. @@ -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-2020 Free Software Foundation, Inc. + Copyright (C) 1985, 1996, 1998, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/etc/tutorials/TUTORIAL.pl b/etc/tutorials/TUTORIAL.pl index f9a7b7b274d..b5ccccfad42 100644 --- a/etc/tutorials/TUTORIAL.pl +++ b/etc/tutorials/TUTORIAL.pl @@ -1209,7 +1209,7 @@ z pomocą Ryszarda Kubiaka i Janusza S. Bienia <jsbien@mail.uw.edu.pl>. Ta wersja samouczka, podobnie jak GNU Emacs, jest chroniona prawem autorskim, ale wolno ją kopiować pod następującymi warunkami: -Copyright (C) 1985, 1994, 2001-2020 Free Software Foundation, Inc. +Copyright (C) 1985, 1994, 2001-2021 Free Software Foundation, Inc. Zezwala się na wykonywanie lub rozpowszechnianie wiernych kopii tego dokumentu w otrzymanej formie, na dowolnym diff --git a/etc/tutorials/TUTORIAL.pt_BR b/etc/tutorials/TUTORIAL.pt_BR index 8b7583c15c5..65ab3b56512 100644 --- a/etc/tutorials/TUTORIAL.pt_BR +++ b/etc/tutorials/TUTORIAL.pt_BR @@ -1056,7 +1056,7 @@ Essa versão do tutorial foi originalmente traduzida por Marcelo Toledo <marcelo@gnu.org> e como o GNU Emacs, tem um copyright, e vem com uma permissão de distribuição de cópias nas seguintes condições: -Copyright (C) 2004-2020 Free Software Foundation, Inc. +Copyright (C) 2004-2021 Free Software Foundation, Inc. Permissão é garantida a qualquer um para fazer ou distribuir cópias integrais deste documento como recebido, em qualquer meio, deixando diff --git a/etc/tutorials/TUTORIAL.ro b/etc/tutorials/TUTORIAL.ro index 05d5d8a90ed..f9e67caa1ea 100644 --- a/etc/tutorials/TUTORIAL.ro +++ b/etc/tutorials/TUTORIAL.ro @@ -4,7 +4,7 @@ Mulţumiri Aidei Hulubei <aida@chang.pub.ro> pentru corecturi şi sugestii. Această versiune a fost produsă plecând de la versiunea în limba engleză, care este -Copyright (c) 1985, 2013-2020 Free Software Foundation, Inc. +Copyright (c) 1985, 2013-2021 Free Software Foundation, Inc. Citiţi acum versiunea românească a tutorialului de Emacs. @@ -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-2020 Free Software Foundation, Inc. +Copyright (C) 1998, 2001-2021 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/etc/tutorials/TUTORIAL.ru b/etc/tutorials/TUTORIAL.ru index 96a858509f9..45bee48bd43 100644 --- a/etc/tutorials/TUTORIAL.ru +++ b/etc/tutorials/TUTORIAL.ru @@ -1105,7 +1105,7 @@ Dired позволяет вам отображать список файлов (copyrighted) и приходит с ограничениями распространения копий со следующими соглашениями: -Copyright (C) 1985, 1996, 1998, 2001-2020 Free Software Foundation, Inc. +Copyright (C) 1985, 1996, 1998, 2001-2021 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/etc/tutorials/TUTORIAL.sk b/etc/tutorials/TUTORIAL.sk index 408de538fb4..525db248007 100644 --- a/etc/tutorials/TUTORIAL.sk +++ b/etc/tutorials/TUTORIAL.sk @@ -1074,7 +1074,7 @@ tútorialom napísaným Stuartom Cracraftom pre pôvodný Emacs. Táto verzia tútorialu je, podobne ako GNU Emacs, chránená copyrightom a je šírená s povolením distribuovať kópie za istých podmienok: -Copyright (C) 1985, 1996, 1998, 2001-2020 Free Software Foundation, Inc. +Copyright (C) 1985, 1996, 1998, 2001-2021 Free Software Foundation, Inc. Každému je zaručené právo vytvárať a distribuovať presné kópie tohto dokumentu tak, ako ho dostal, na akomkoľvek médiu, s tým, že bude diff --git a/etc/tutorials/TUTORIAL.sl b/etc/tutorials/TUTORIAL.sl index bb8bfe2b7f6..be87588b263 100644 --- a/etc/tutorials/TUTORIAL.sl +++ b/etc/tutorials/TUTORIAL.sl @@ -1119,7 +1119,7 @@ Emacs. V slovenščino ga je prevedel Primož Peterlin. To besedilo, kot sam GNU Emacs, je avtorsko delo, in njegovo razmnoževanje in razširjanje je dovoljeno pod naslednjimi pogoji: -Copyright © 1985, 1996, 1998, 2001-2020 Free Software Foundation, Inc. +Copyright © 1985, 1996, 1998, 2001-2021 Free Software Foundation, Inc. Ta datoteka je del paketa GNU Emacs. diff --git a/etc/tutorials/TUTORIAL.sv b/etc/tutorials/TUTORIAL.sv index fcc388f4141..1eab2670795 100644 --- a/etc/tutorials/TUTORIAL.sv +++ b/etc/tutorials/TUTORIAL.sv @@ -1139,7 +1139,7 @@ Lidell översatte den till svenska. This version of the tutorial, like GNU Emacs, is copyrighted, and comes with permission to distribute copies on certain conditions: -Copyright (C) 1985, 1996, 1998, 2001-2020 Free Software Foundation, Inc. +Copyright (C) 1985, 1996, 1998, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/etc/tutorials/TUTORIAL.th b/etc/tutorials/TUTORIAL.th index 46119c024c8..8bd4f072609 100644 --- a/etc/tutorials/TUTORIAL.th +++ b/etc/tutorials/TUTORIAL.th @@ -964,7 +964,7 @@ starting with the one written by Stuart Cracraft for the original Emacs. This version of the tutorial, like GNU Emacs, is copyrighted, and comes with permission to distribute copies on certain conditions: -Copyright (C) 1985, 1996, 2001-2020 Free Software Foundation, Inc. +Copyright (C) 1985, 1996, 2001-2021 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/etc/tutorials/TUTORIAL.zh b/etc/tutorials/TUTORIAL.zh index 3b4fb13c62e..a808cf83598 100644 --- a/etc/tutorials/TUTORIAL.zh +++ b/etc/tutorials/TUTORIAL.zh @@ -1049,7 +1049,7 @@ issue here>」。 這個版本的快速指南和 GNU Emacs 一樣都是版權化的，並且允許在某些條件下 散佈其拷貝： -Copyright (C) 1985, 1996, 1998, 2001-2020 Free Software Foundation, Inc. +Copyright (C) 1985, 1996, 1998, 2001-2021 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/etc/w32-feature.el b/etc/w32-feature.el index 3c0f74175cf..c5f2cd548ad 100644 --- a/etc/w32-feature.el +++ b/etc/w32-feature.el @@ -1,6 +1,6 @@ ;;; w32-feature.el --- Check Availability of Emacs Features -*- lexical-binding: t -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; Author: Phillip Lord <phillip.lord@russet.org.uk> diff --git a/leim/ChangeLog.1 b/leim/ChangeLog.1 index 20b23ca6d31..e2c01204452 100644 --- a/leim/ChangeLog.1 +++ b/leim/ChangeLog.1 @@ -2578,7 +2578,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 1997-1999, 2001-2020 Free Software Foundation, Inc. + Copyright (C) 1997-1999, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/leim/Makefile.in b/leim/Makefile.in index 171bc71e4d3..f3e530a11de 100644 --- a/leim/Makefile.in +++ b/leim/Makefile.in @@ -1,6 +1,6 @@ ### @configure_input@ -# Copyright (C) 1997-2020 Free Software Foundation, Inc. +# Copyright (C) 1997-2021 Free Software Foundation, Inc. # Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, # 2006, 2007, 2008, 2009, 2010, 2011 # National Institute of Advanced Industrial Science and Technology (AIST) diff --git a/leim/README b/leim/README index 6b36c4490ad..baaf6610554 100644 --- a/leim/README +++ b/leim/README @@ -1,4 +1,4 @@ -Copyright (C) 2001-2020 Free Software Foundation, Inc. +Copyright (C) 2001-2021 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/leim/leim-ext.el b/leim/leim-ext.el index 404d91c0c0e..2378f6fdb4f 100644 --- a/leim/leim-ext.el +++ b/leim/leim-ext.el @@ -1,6 +1,6 @@ ;; leim-ext.el -- extra leim configuration -*- coding:utf-8; -*- -;; Copyright (C) 2004-2020 Free Software Foundation, Inc. +;; Copyright (C) 2004-2021 Free Software Foundation, Inc. ;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H13PRO009 diff --git a/lib-src/ChangeLog.1 b/lib-src/ChangeLog.1 index 16f5142a01a..3c2698005d7 100644 --- a/lib-src/ChangeLog.1 +++ b/lib-src/ChangeLog.1 @@ -8609,7 +8609,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 1988-1999, 2001-2020 Free Software Foundation, Inc. + Copyright (C) 1988-1999, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index a2d27eab001..0a6dd826c10 100644 --- a/lib-src/Makefile.in +++ b/lib-src/Makefile.in @@ -1,6 +1,6 @@ ### @configure_input@ -# Copyright (C) 1985, 1987-1988, 1993-1994, 2001-2020 Free Software +# Copyright (C) 1985, 1987-1988, 1993-1994, 2001-2021 Free Software # Foundation, Inc. # This file is part of GNU Emacs. @@ -204,14 +204,19 @@ LIBRESOLV=@LIBRESOLV@ LIBS_MAIL=@LIBS_MAIL@ ## empty or -lrt or -lposix4 if HAVE_CLOCK_GETTIME LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@ +## empty or -lbcrypt or -ladvapi32 +LIB_GETRANDOM = @LIB_GETRANDOM@ ## Whatever libraries are needed for euidaccess LIB_EACCESS=@LIB_EACCESS@ ## empty or -lwsock2 for MinGW LIB_WSOCK32=@LIB_WSOCK32@ +## Extra libraries for etags +LIBS_ETAGS = $(LIB_CLOCK_GETTIME) $(LIB_GETRANDOM) + ## Extra libraries to use when linking movemail. LIBS_MOVE = $(LIBS_MAIL) $(KRB4LIB) $(DESLIB) $(KRB5LIB) $(CRYPTOLIB) \ - $(COM_ERRLIB) $(LIBHESIOD) $(LIBRESOLV) $(LIB_WSOCK32) + $(COM_ERRLIB) $(LIBHESIOD) $(LIBRESOLV) $(LIB_WSOCK32) $(LIBS_ETAGS) ## Extra libraries when linking emacsclient ## (empty or -lcomctl32 for MinGW) @@ -360,7 +365,7 @@ TAGS: etags${EXEEXT} ${tagsfiles} $(MAKE) -C ../lib all etags_deps = ${srcdir}/etags.c $(NTLIB) $(config_h) -etags_libs = $(NTLIB) $(LOADLIBES) +etags_libs = $(NTLIB) $(LOADLIBES) $(LIBS_ETAGS) etags${EXEEXT}: ${etags_deps} $(AM_V_CCLD)$(CC) ${ALL_CFLAGS} -o $@ $< $(etags_libs) diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c index 7d0650a4059..436b13a32c8 100644 --- a/lib-src/ebrowse.c +++ b/lib-src/ebrowse.c @@ -1,6 +1,6 @@ /* ebrowse.c --- parsing files for the ebrowse C++ browser -Copyright (C) 1992-2020 Free Software Foundation, Inc. +Copyright (C) 1992-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index 8d184e28177..12ced4aadbd 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c @@ -1,6 +1,6 @@ /* Client process that communicates with GNU Emacs acting as server. -Copyright (C) 1986-1987, 1994, 1999-2020 Free Software Foundation, Inc. +Copyright (C) 1986-1987, 1994, 1999-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lib-src/etags.c b/lib-src/etags.c index 071892ee317..b5c18e0e019 100644 --- a/lib-src/etags.c +++ b/lib-src/etags.c @@ -28,7 +28,7 @@ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -Copyright (C) 1984, 1987-1989, 1993-1995, 1998-2020 Free Software +Copyright (C) 1984, 1987-1989, 1993-1995, 1998-2021 Free Software Foundation, Inc. This file is not considered part of GNU Emacs. diff --git a/lib-src/hexl.c b/lib-src/hexl.c index b493df9689c..64866068f45 100644 --- a/lib-src/hexl.c +++ b/lib-src/hexl.c @@ -1,5 +1,5 @@ /* Convert files for Emacs Hexl mode. - Copyright (C) 1989, 2001-2020 Free Software Foundation, Inc. + Copyright (C) 1989, 2001-2021 Free Software Foundation, Inc. Author: Keith Gabryelski (according to authors.el) diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c index da58358872f..d17c28be90b 100644 --- a/lib-src/make-docfile.c +++ b/lib-src/make-docfile.c @@ -1,6 +1,6 @@ /* Generate doc-string file for GNU Emacs from source files. -Copyright (C) 1985-1986, 1992-1994, 1997, 1999-2020 Free Software +Copyright (C) 1985-1986, 1992-1994, 1997, 1999-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lib-src/make-fingerprint.c b/lib-src/make-fingerprint.c index b72ee90bbca..485dd4b919c 100644 --- a/lib-src/make-fingerprint.c +++ b/lib-src/make-fingerprint.c @@ -1,6 +1,6 @@ /* Hash inputs and generate C file with the digest. -Copyright (C) 1985-1986, 1992-1994, 1997, 1999-2016, 2018-2020 Free +Copyright (C) 1985-1986, 1992-1994, 1997, 1999-2016, 2018-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lib-src/movemail.c b/lib-src/movemail.c index 4f9abc998a3..cfdebccb8d0 100644 --- a/lib-src/movemail.c +++ b/lib-src/movemail.c @@ -1,7 +1,7 @@ /* movemail foo bar -- move file foo to file bar, locking file foo the way /bin/mail respects. -Copyright (C) 1986, 1992-1994, 1996, 1999, 2001-2020 Free Software +Copyright (C) 1986, 1992-1994, 1996, 1999, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lib-src/ntlib.c b/lib-src/ntlib.c index 8f0285591ba..bcbc0064318 100644 --- a/lib-src/ntlib.c +++ b/lib-src/ntlib.c @@ -1,6 +1,6 @@ /* Utility and Unix shadow routines for GNU Emacs support programs on NT. -Copyright (C) 1994, 2001-2020 Free Software Foundation, Inc. +Copyright (C) 1994, 2001-2021 Free Software Foundation, Inc. Author: Geoff Voelker (voelker@cs.washington.edu) Created: 10-8-94 diff --git a/lib-src/ntlib.h b/lib-src/ntlib.h index 87716030b37..d62c19f16a3 100644 --- a/lib-src/ntlib.h +++ b/lib-src/ntlib.h @@ -1,5 +1,5 @@ /* Utility and Unix shadow routines for GNU Emacs support programs on NT. - Copyright (C) 1994, 2002-2020 Free Software Foundation, Inc. + Copyright (C) 1994, 2002-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lib-src/pop.c b/lib-src/pop.c index 886aa78275d..27ed89b836e 100644 --- a/lib-src/pop.c +++ b/lib-src/pop.c @@ -1,6 +1,6 @@ /* pop.c: client routines for talking to a POP3-protocol post-office server -Copyright (C) 1991, 1993, 1996-1997, 1999, 2001-2020 Free Software +Copyright (C) 1991, 1993, 1996-1997, 1999, 2001-2021 Free Software Foundation, Inc. Author: Jonathan Kamens <jik@security.ov.com> diff --git a/lib-src/pop.h b/lib-src/pop.h index 638671f5cc7..229714b68e3 100644 --- a/lib-src/pop.h +++ b/lib-src/pop.h @@ -1,5 +1,5 @@ /* pop.h: Header file for the "pop.c" client POP3 protocol. - Copyright (C) 1991, 1993, 2001-2020 Free Software Foundation, Inc. + Copyright (C) 1991, 1993, 2001-2021 Free Software Foundation, Inc. Author: Jonathan Kamens <jik@security.ov.com> diff --git a/lib-src/rcs2log b/lib-src/rcs2log index ba99538872b..7a033672f6d 100755 --- a/lib-src/rcs2log +++ b/lib-src/rcs2log @@ -2,7 +2,7 @@ # RCS to ChangeLog generator -# Copyright (C) 1992-1998, 2001-2020 Free Software Foundation, Inc. +# Copyright (C) 1992-1998, 2001-2021 Free Software Foundation, Inc. # Author: Paul Eggert <eggert@cs.ucla.edu> @@ -20,7 +20,7 @@ # along with this program. If not, see <https://www.gnu.org/licenses/>. -Copyright='Copyright (C) 2020 Free Software Foundation, Inc. +Copyright='Copyright (C) 2021 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/lib-src/update-game-score.c b/lib-src/update-game-score.c index fc6e72838ea..f1242dfbe63 100644 --- a/lib-src/update-game-score.c +++ b/lib-src/update-game-score.c @@ -1,6 +1,6 @@ /* update-game-score.c --- Update a score file -Copyright (C) 2002-2020 Free Software Foundation, Inc. +Copyright (C) 2002-2021 Free Software Foundation, Inc. Author: Colin Walters <walters@debian.org> diff --git a/lib/Makefile.in b/lib/Makefile.in index d8dc5488f07..be398d13672 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -1,6 +1,6 @@ ### @configure_input@ -# Copyright 2017-2020 Free Software Foundation, Inc. +# Copyright 2017-2021 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/lib/_Noreturn.h b/lib/_Noreturn.h index 394ca3c2aa2..38afe1d5672 100644 --- a/lib/_Noreturn.h +++ b/lib/_Noreturn.h @@ -1,5 +1,5 @@ /* A C macro for declaring that a function does not return. - Copyright (C) 2011-2020 Free Software Foundation, Inc. + Copyright (C) 2011-2021 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 diff --git a/lib/acl-errno-valid.c b/lib/acl-errno-valid.c index cafae0b1b11..af1af82c9fc 100644 --- a/lib/acl-errno-valid.c +++ b/lib/acl-errno-valid.c @@ -1,6 +1,6 @@ /* Test whether ACLs are well supported on this system. - Copyright 2013-2020 Free Software Foundation, Inc. + Copyright 2013-2021 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/lib/acl-internal.c b/lib/acl-internal.c index 1cb77a8338b..2b212e8fc45 100644 --- a/lib/acl-internal.c +++ b/lib/acl-internal.c @@ -1,6 +1,6 @@ /* Test whether a file has a nontrivial ACL. -*- coding: utf-8 -*- - Copyright (C) 2002-2003, 2005-2020 Free Software Foundation, Inc. + Copyright (C) 2002-2003, 2005-2021 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/lib/acl-internal.h b/lib/acl-internal.h index 0e28e1a0d6d..ca302bf8cd5 100644 --- a/lib/acl-internal.h +++ b/lib/acl-internal.h @@ -1,6 +1,6 @@ /* Internal implementation of access control lists. -*- coding: utf-8 -*- - Copyright (C) 2002-2003, 2005-2020 Free Software Foundation, Inc. + Copyright (C) 2002-2003, 2005-2021 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/lib/acl.h b/lib/acl.h index 374c147e8fb..7014b82f738 100644 --- a/lib/acl.h +++ b/lib/acl.h @@ -1,6 +1,6 @@ /* acl.c - access control lists - Copyright (C) 2002, 2008-2020 Free Software Foundation, Inc. + Copyright (C) 2002, 2008-2021 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/lib/acl_entries.c b/lib/acl_entries.c index 14fca5f1732..6f70caf175e 100644 --- a/lib/acl_entries.c +++ b/lib/acl_entries.c @@ -1,6 +1,6 @@ /* Return the number of entries in an ACL. - Copyright (C) 2002-2003, 2005-2020 Free Software Foundation, Inc. + Copyright (C) 2002-2003, 2005-2021 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/lib/alloca.in.h b/lib/alloca.in.h index c71e9bfed9e..0a6137e037c 100644 --- a/lib/alloca.in.h +++ b/lib/alloca.in.h @@ -1,6 +1,6 @@ /* Memory allocation on the stack. - Copyright (C) 1995, 1999, 2001-2004, 2006-2020 Free Software Foundation, + Copyright (C) 1995, 1999, 2001-2004, 2006-2021 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it diff --git a/lib/allocator.h b/lib/allocator.h index 2b032383de2..cfa05357744 100644 --- a/lib/allocator.h +++ b/lib/allocator.h @@ -1,6 +1,6 @@ /* Memory allocators such as malloc+free. - Copyright (C) 2011-2020 Free Software Foundation, Inc. + Copyright (C) 2011-2021 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/lib/arg-nonnull.h b/lib/arg-nonnull.h index db9d9ae116a..5b81b50a87d 100644 --- a/lib/arg-nonnull.h +++ b/lib/arg-nonnull.h @@ -1,5 +1,5 @@ /* A C macro for declaring that specific arguments must not be NULL. - Copyright (C) 2009-2020 Free Software Foundation, Inc. + Copyright (C) 2009-2021 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 diff --git a/lib/at-func.c b/lib/at-func.c index 90022e05787..b6d9de754d1 100644 --- a/lib/at-func.c +++ b/lib/at-func.c @@ -1,5 +1,5 @@ /* Define at-style functions like fstatat, unlinkat, fchownat, etc. - Copyright (C) 2006, 2009-2020 Free Software Foundation, Inc. + Copyright (C) 2006, 2009-2021 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/lib/attribute.h b/lib/attribute.h index 5afcb8e81f2..82245279eb1 100644 --- a/lib/attribute.h +++ b/lib/attribute.h @@ -1,6 +1,6 @@ /* ATTRIBUTE_* macros for using attributes in GCC and similar compilers - Copyright 2020 Free Software Foundation, Inc. + Copyright 2020-2021 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 diff --git a/lib/binary-io.c b/lib/binary-io.c index e84e223fc88..f2678972ef7 100644 --- a/lib/binary-io.c +++ b/lib/binary-io.c @@ -1,5 +1,5 @@ /* Binary mode I/O. - Copyright 2017-2020 Free Software Foundation, Inc. + Copyright 2017-2021 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/lib/binary-io.h b/lib/binary-io.h index d17af7c3807..8654fd2d39f 100644 --- a/lib/binary-io.h +++ b/lib/binary-io.h @@ -1,5 +1,5 @@ /* Binary mode I/O. - Copyright (C) 2001, 2003, 2005, 2008-2020 Free Software Foundation, Inc. + Copyright (C) 2001, 2003, 2005, 2008-2021 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/lib/byteswap.in.h b/lib/byteswap.in.h index e690b3c17e0..2b7d5abe1b6 100644 --- a/lib/byteswap.in.h +++ b/lib/byteswap.in.h @@ -1,5 +1,5 @@ /* byteswap.h - Byte swapping - Copyright (C) 2005, 2007, 2009-2020 Free Software Foundation, Inc. + Copyright (C) 2005, 2007, 2009-2021 Free Software Foundation, Inc. Written by Oskar Liljeblad <oskar@osk.mine.nu>, 2005. This program is free software: you can redistribute it and/or modify diff --git a/lib/c++defs.h b/lib/c++defs.h index 01ef8140cad..39df1bc76bc 100644 --- a/lib/c++defs.h +++ b/lib/c++defs.h @@ -1,5 +1,5 @@ /* C++ compatible function declaration macros. - Copyright (C) 2010-2020 Free Software Foundation, Inc. + Copyright (C) 2010-2021 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 diff --git a/lib/c-ctype.h b/lib/c-ctype.h index fbd11b34508..bf24a88310e 100644 --- a/lib/c-ctype.h +++ b/lib/c-ctype.h @@ -5,7 +5,7 @@ <ctype.h> functions' behaviour depends on the current locale set via setlocale. - Copyright (C) 2000-2003, 2006, 2008-2020 Free Software Foundation, Inc. + Copyright (C) 2000-2003, 2006, 2008-2021 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/lib/c-strcase.h b/lib/c-strcase.h index 3b711f5aa57..089edfe7ebe 100644 --- a/lib/c-strcase.h +++ b/lib/c-strcase.h @@ -1,5 +1,5 @@ /* Case-insensitive string comparison functions in C locale. - Copyright (C) 1995-1996, 2001, 2003, 2005, 2009-2020 Free Software + Copyright (C) 1995-1996, 2001, 2003, 2005, 2009-2021 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/lib/c-strcasecmp.c b/lib/c-strcasecmp.c index f1a4b98fa55..55479d6a338 100644 --- a/lib/c-strcasecmp.c +++ b/lib/c-strcasecmp.c @@ -1,5 +1,5 @@ /* c-strcasecmp.c -- case insensitive string comparator in C locale - Copyright (C) 1998-1999, 2005-2006, 2009-2020 Free Software Foundation, Inc. + Copyright (C) 1998-1999, 2005-2006, 2009-2021 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/lib/c-strncasecmp.c b/lib/c-strncasecmp.c index 1d6e1411a67..02bc0f2ecd5 100644 --- a/lib/c-strncasecmp.c +++ b/lib/c-strncasecmp.c @@ -1,5 +1,5 @@ /* c-strncasecmp.c -- case insensitive string comparator in C locale - Copyright (C) 1998-1999, 2005-2006, 2009-2020 Free Software Foundation, Inc. + Copyright (C) 1998-1999, 2005-2006, 2009-2021 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/lib/canonicalize-lgpl.c b/lib/canonicalize-lgpl.c index 650d510f2d0..b6dc3a447ab 100644 --- a/lib/canonicalize-lgpl.c +++ b/lib/canonicalize-lgpl.c @@ -1,5 +1,5 @@ /* Return the canonical absolute name of a given file. - Copyright (C) 1996-2020 Free Software Foundation, Inc. + Copyright (C) 1996-2021 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -32,7 +32,6 @@ #include <fcntl.h> #include <limits.h> #include <stdbool.h> -#include <stddef.h> #include <string.h> #include <sys/stat.h> #include <unistd.h> @@ -40,16 +39,11 @@ #include <eloop-threshold.h> #include <filename.h> #include <idx.h> +#include <intprops.h> #include <scratch_buffer.h> #ifdef _LIBC # include <shlib-compat.h> -# include <sysdep.h> -# ifdef __ASSUME_FACCESSAT2 -# define FACCESSAT_NEVER_EOVERFLOWS __ASSUME_FACCESSAT2 -# else -# define FACCESSAT_NEVER_EOVERFLOWS true -# endif # define GCC_LINT 1 # define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__)) #else @@ -91,14 +85,15 @@ # define IF_LINT(Code) /* empty */ #endif +/* True if adding two valid object sizes might overflow idx_t. + As a practical matter, this cannot happen on 64-bit machines. */ +enum { NARROW_ADDRESSES = IDX_MAX >> 31 >> 31 == 0 }; + #ifndef DOUBLE_SLASH_IS_DISTINCT_ROOT # define DOUBLE_SLASH_IS_DISTINCT_ROOT false #endif -#ifndef FACCESSAT_NEVER_EOVERFLOWS -# define FACCESSAT_NEVER_EOVERFLOWS false -#endif -#if !FUNC_REALPATH_WORKS || defined _LIBC +#if defined _LIBC || !FUNC_REALPATH_WORKS /* Return true if FILE's existence can be shown, false (setting errno) otherwise. Follow symbolic links. */ @@ -106,14 +101,11 @@ static bool file_accessible (char const *file) { # if defined _LIBC || HAVE_FACCESSAT - int r = __faccessat (AT_FDCWD, file, F_OK, AT_EACCESS); + return __faccessat (AT_FDCWD, file, F_OK, AT_EACCESS) == 0; # else struct stat st; - int r = __stat (file, &st); + return __stat (file, &st) == 0 || errno == EOVERFLOW; # endif - - return ((!FACCESSAT_NEVER_EOVERFLOWS && r < 0 && errno == EOVERFLOW) - || r == 0); } /* True if concatenating END as a suffix to a file name means that the @@ -350,7 +342,12 @@ realpath_stk (const char *name, char *resolved, idx_t end_idx IF_LINT (= 0); if (end_in_extra_buffer) end_idx = end - extra_buf; - idx_t len = strlen (end); + size_t len = strlen (end); + if (NARROW_ADDRESSES && INT_ADD_OVERFLOW (len, n)) + { + __set_errno (ENOMEM); + goto error_nomem; + } while (extra_buffer.length <= len + n) { if (!scratch_buffer_grow_preserve (&extra_buffer)) @@ -413,24 +410,14 @@ error: error_nomem: scratch_buffer_free (&extra_buffer); scratch_buffer_free (&link_buffer); - if (failed || rname == resolved) - scratch_buffer_free (rname_buf); - - if (failed) - return NULL; - if (rname == resolved) - return rname; - idx_t rname_size = dest - rname; - if (rname == rname_on_stack) + if (failed || rname == resolved) { - rname = malloc (rname_size); - if (rname == NULL) - return NULL; - return memcpy (rname, rname_on_stack, rname_size); + scratch_buffer_free (rname_buf); + return failed ? NULL : resolved; } - char *result = realloc (rname, rname_size); - return result != NULL ? result : rname; + + return scratch_buffer_dupfree (rname_buf, dest - rname); } /* Return the canonical absolute name of file NAME. A canonical name diff --git a/lib/careadlinkat.c b/lib/careadlinkat.c index 6aaa712b9be..18cfc114b69 100644 --- a/lib/careadlinkat.c +++ b/lib/careadlinkat.c @@ -1,6 +1,6 @@ /* Read symbolic links into a buffer without size limitation, relative to fd. - Copyright (C) 2001, 2003-2004, 2007, 2009-2020 Free Software Foundation, + Copyright (C) 2001, 2003-2004, 2007, 2009-2021 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/careadlinkat.h b/lib/careadlinkat.h index a4a37b274d0..c506fac3cbe 100644 --- a/lib/careadlinkat.h +++ b/lib/careadlinkat.h @@ -1,6 +1,6 @@ /* Read symbolic links into a buffer without size limitation, relative to fd. - Copyright (C) 2011-2020 Free Software Foundation, Inc. + Copyright (C) 2011-2021 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/lib/cdefs.h b/lib/cdefs.h index 1a2805d7259..2a3dc9666b9 100644 --- a/lib/cdefs.h +++ b/lib/cdefs.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1992-2020 Free Software Foundation, Inc. +/* Copyright (C) 1992-2021 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or diff --git a/lib/cloexec.c b/lib/cloexec.c index 510be3d57ec..8363ddaa609 100644 --- a/lib/cloexec.c +++ b/lib/cloexec.c @@ -1,6 +1,6 @@ /* cloexec.c - set or clear the close-on-exec descriptor flag - Copyright (C) 1991, 2004-2006, 2009-2020 Free Software Foundation, Inc. + Copyright (C) 1991, 2004-2006, 2009-2021 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/lib/cloexec.h b/lib/cloexec.h index f14a99736d5..5ca0e6413e7 100644 --- a/lib/cloexec.h +++ b/lib/cloexec.h @@ -1,6 +1,6 @@ /* cloexec.c - set or clear the close-on-exec descriptor flag - Copyright (C) 2004, 2009-2020 Free Software Foundation, Inc. + Copyright (C) 2004, 2009-2021 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/lib/close-stream.c b/lib/close-stream.c index 04bc8009a57..86f6d6e1de2 100644 --- a/lib/close-stream.c +++ b/lib/close-stream.c @@ -1,6 +1,6 @@ /* Close a stream, with nicer error checking than fclose's. - Copyright (C) 1998-2002, 2004, 2006-2020 Free Software Foundation, Inc. + Copyright (C) 1998-2002, 2004, 2006-2021 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/lib/copy-file-range.c b/lib/copy-file-range.c index 069f1444dc2..e73c78b5aa7 100644 --- a/lib/copy-file-range.c +++ b/lib/copy-file-range.c @@ -1,5 +1,5 @@ /* Stub for copy_file_range - Copyright 2019-2020 Free Software Foundation, Inc. + Copyright 2019-2021 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/lib/count-leading-zeros.h b/lib/count-leading-zeros.h index 7cf605a5f64..575ec3b4d0e 100644 --- a/lib/count-leading-zeros.h +++ b/lib/count-leading-zeros.h @@ -1,5 +1,5 @@ /* count-leading-zeros.h -- counts the number of leading 0 bits in a word. - Copyright (C) 2012-2020 Free Software Foundation, Inc. + Copyright (C) 2012-2021 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/lib/count-one-bits.h b/lib/count-one-bits.h index a9e166aed8c..1a14f11f152 100644 --- a/lib/count-one-bits.h +++ b/lib/count-one-bits.h @@ -1,5 +1,5 @@ /* count-one-bits.h -- counts the number of 1-bits in a word. - Copyright (C) 2007-2020 Free Software Foundation, Inc. + Copyright (C) 2007-2021 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/lib/count-trailing-zeros.h b/lib/count-trailing-zeros.h index 727b21dcc56..5a8ef563ea2 100644 --- a/lib/count-trailing-zeros.h +++ b/lib/count-trailing-zeros.h @@ -1,5 +1,5 @@ /* count-trailing-zeros.h -- counts the number of trailing 0 bits in a word. - Copyright 2013-2020 Free Software Foundation, Inc. + Copyright 2013-2021 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/lib/diffseq.h b/lib/diffseq.h index 26e10bdd043..1cac430eddd 100644 --- a/lib/diffseq.h +++ b/lib/diffseq.h @@ -1,6 +1,6 @@ /* Analyze differences between two vectors. - Copyright (C) 1988-1989, 1992-1995, 2001-2004, 2006-2020 Free Software + Copyright (C) 1988-1989, 1992-1995, 2001-2004, 2006-2021 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/dirent.in.h b/lib/dirent.in.h index 23c4e055774..2e2c5119a11 100644 --- a/lib/dirent.in.h +++ b/lib/dirent.in.h @@ -1,5 +1,5 @@ /* A GNU-like <dirent.h>. - Copyright (C) 2006-2020 Free Software Foundation, Inc. + Copyright (C) 2006-2021 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/lib/dirfd.c b/lib/dirfd.c index f6539772feb..ced7531c5e0 100644 --- a/lib/dirfd.c +++ b/lib/dirfd.c @@ -1,6 +1,6 @@ /* dirfd.c -- return the file descriptor associated with an open DIR* - Copyright (C) 2001, 2006, 2008-2020 Free Software Foundation, Inc. + Copyright (C) 2001, 2006, 2008-2021 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/lib/dtotimespec.c b/lib/dtotimespec.c index 40adbe53f12..73061a3309c 100644 --- a/lib/dtotimespec.c +++ b/lib/dtotimespec.c @@ -1,6 +1,6 @@ /* Convert double to timespec. - Copyright (C) 2011-2020 Free Software Foundation, Inc. + Copyright (C) 2011-2021 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/lib/dup2.c b/lib/dup2.c index 323e19b25ec..c4a0a29fbd0 100644 --- a/lib/dup2.c +++ b/lib/dup2.c @@ -1,6 +1,6 @@ /* Duplicate an open file descriptor to a specified file descriptor. - Copyright (C) 1999, 2004-2007, 2009-2020 Free Software Foundation, Inc. + Copyright (C) 1999, 2004-2007, 2009-2021 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/lib/eloop-threshold.h b/lib/eloop-threshold.h index 5953a4cc065..27d07a72960 100644 --- a/lib/eloop-threshold.h +++ b/lib/eloop-threshold.h @@ -1,5 +1,5 @@ /* Threshold at which to diagnose ELOOP. Generic version. - Copyright (C) 2012-2020 Free Software Foundation, Inc. + Copyright (C) 2012-2021 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or diff --git a/lib/errno.in.h b/lib/errno.in.h index c27e0c7ddee..c6ab4e88e15 100644 --- a/lib/errno.in.h +++ b/lib/errno.in.h @@ -1,6 +1,6 @@ /* A POSIX-like <errno.h>. - Copyright (C) 2008-2020 Free Software Foundation, Inc. + Copyright (C) 2008-2021 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/lib/euidaccess.c b/lib/euidaccess.c index a32e3366eb8..ef65961d81d 100644 --- a/lib/euidaccess.c +++ b/lib/euidaccess.c @@ -1,6 +1,6 @@ /* euidaccess -- check if effective user id can access file - Copyright (C) 1990-1991, 1995, 1998, 2000, 2003-2006, 2008-2020 Free + Copyright (C) 1990-1991, 1995, 1998, 2000, 2003-2006, 2008-2021 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/lib/execinfo.in.h b/lib/execinfo.in.h index b2fe44e65df..790bec087e1 100644 --- a/lib/execinfo.in.h +++ b/lib/execinfo.in.h @@ -1,6 +1,6 @@ /* Information about executables. - Copyright (C) 2012-2020 Free Software Foundation, Inc. + Copyright (C) 2012-2021 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/lib/explicit_bzero.c b/lib/explicit_bzero.c index b1f5acb7771..feea4446c06 100644 --- a/lib/explicit_bzero.c +++ b/lib/explicit_bzero.c @@ -1,5 +1,5 @@ /* Erasure of sensitive data, generic implementation. - Copyright (C) 2016-2020 Free Software Foundation, Inc. + Copyright (C) 2016-2021 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or diff --git a/lib/faccessat.c b/lib/faccessat.c index 330c54a0be2..3a776466cf2 100644 --- a/lib/faccessat.c +++ b/lib/faccessat.c @@ -1,5 +1,5 @@ /* Check the access rights of a file relative to an open directory. - Copyright (C) 2009-2020 Free Software Foundation, Inc. + Copyright (C) 2009-2021 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 @@ -32,13 +32,6 @@ #include <sys/stat.h> #undef _GL_INCLUDING_UNISTD_H -#ifndef FACCESSAT_NEVER_EOVERFLOWS -# define FACCESSAT_NEVER_EOVERFLOWS 0 -#endif -#ifndef LSTAT_FOLLOWS_SLASHED_SYMLINK -# define LSTAT_FOLLOWS_SLASHED_SYMLINK 0 -#endif - #if HAVE_FACCESSAT static int orig_faccessat (int fd, char const *name, int mode, int flag) @@ -66,12 +59,7 @@ rpl_faccessat (int fd, char const *file, int mode, int flag) { int result = orig_faccessat (fd, file, mode, flag); - if (result != 0) - { - if (!FACCESSAT_NEVER_EOVERFLOWS && mode == F_OK && errno == EOVERFLOW) - return 0; - } - else if (!LSTAT_FOLLOWS_SLASHED_SYMLINK && file[strlen (file) - 1] == '/') + if (result == 0 && file[strlen (file) - 1] == '/') { struct stat st; result = fstatat (fd, file, &st, 0); diff --git a/lib/fchmodat.c b/lib/fchmodat.c index eee0a1c56e4..d27c0d7734a 100644 --- a/lib/fchmodat.c +++ b/lib/fchmodat.c @@ -1,5 +1,5 @@ /* Change the protections of file relative to an open directory. - Copyright (C) 2006, 2009-2020 Free Software Foundation, Inc. + Copyright (C) 2006, 2009-2021 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/lib/fcntl.c b/lib/fcntl.c index 59bb3ca91ea..9d6b10fa303 100644 --- a/lib/fcntl.c +++ b/lib/fcntl.c @@ -1,6 +1,6 @@ /* Provide file descriptor control. - Copyright (C) 2009-2020 Free Software Foundation, Inc. + Copyright (C) 2009-2021 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/lib/fcntl.in.h b/lib/fcntl.in.h index 11c9aae9bcc..0b14467c54d 100644 --- a/lib/fcntl.in.h +++ b/lib/fcntl.in.h @@ -1,6 +1,6 @@ /* Like <fcntl.h>, but with non-working flags defined to 0. - Copyright (C) 2006-2020 Free Software Foundation, Inc. + Copyright (C) 2006-2021 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 @@ -112,7 +112,7 @@ _GL_CXXALIASWARN (creat); /* Assume creat is always declared. */ _GL_WARN_ON_USE (creat, "creat is not always POSIX compliant - " "use gnulib module creat for portability"); -#else +#elif @GNULIB_MDA_CREAT@ /* On native Windows, map 'creat' to '_creat', so that -loldnames is not required. In C++ with GNULIB_NAMESPACE, avoid differences between platforms by defining GNULIB_NAMESPACE::creat always. */ @@ -186,7 +186,7 @@ _GL_CXXALIASWARN (open); /* Assume open is always declared. */ _GL_WARN_ON_USE (open, "open is not always POSIX compliant - " "use gnulib module open for portability"); -#else +#elif @GNULIB_MDA_OPEN@ /* On native Windows, map 'open' to '_open', so that -loldnames is not required. In C++ with GNULIB_NAMESPACE, avoid differences between platforms by defining GNULIB_NAMESPACE::open always. */ diff --git a/lib/fdopendir.c b/lib/fdopendir.c index 883c0c43ec5..451b4e1321e 100644 --- a/lib/fdopendir.c +++ b/lib/fdopendir.c @@ -1,5 +1,5 @@ /* provide a replacement fdopendir function - Copyright (C) 2004-2020 Free Software Foundation, Inc. + Copyright (C) 2004-2021 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/lib/filemode.c b/lib/filemode.c index 15e3551368b..357567281d7 100644 --- a/lib/filemode.c +++ b/lib/filemode.c @@ -1,6 +1,6 @@ /* filemode.c -- make a string describing file modes - Copyright (C) 1985, 1990, 1993, 1998-2000, 2004, 2006, 2009-2020 Free + Copyright (C) 1985, 1990, 1993, 1998-2000, 2004, 2006, 2009-2021 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/filemode.h b/lib/filemode.h index f84a491625c..a02facb757d 100644 --- a/lib/filemode.h +++ b/lib/filemode.h @@ -1,6 +1,6 @@ /* Make a string describing file modes. - Copyright (C) 1998-1999, 2003, 2006, 2009-2020 Free Software Foundation, + Copyright (C) 1998-1999, 2003, 2006, 2009-2021 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/filename.h b/lib/filename.h index 4598fb1d638..541ffec0d53 100644 --- a/lib/filename.h +++ b/lib/filename.h @@ -1,18 +1,20 @@ /* Basic filename support macros. - Copyright (C) 2001-2004, 2007-2020 Free Software Foundation, Inc. + Copyright (C) 2001-2004, 2007-2021 Free Software Foundation, Inc. + This file is part of the GNU C Library. - 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 - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public + License as published by the Free Software Foundation; either + version 3 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + The GNU C Library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program. If not, see <https://www.gnu.org/licenses/>. */ + You should have received a copy of the GNU General Public + License along with the GNU C Library; if not, see + <https://www.gnu.org/licenses/>. */ /* From Paul Eggert and Jim Meyering. */ diff --git a/lib/filevercmp.c b/lib/filevercmp.c index 9ecfe293ae8..6b7226de6c3 100644 --- a/lib/filevercmp.c +++ b/lib/filevercmp.c @@ -1,7 +1,7 @@ /* Copyright (C) 1995 Ian Jackson <iwj10@cus.cam.ac.uk> Copyright (C) 2001 Anthony Towns <aj@azure.humbug.org.au> - Copyright (C) 2008-2020 Free Software Foundation, Inc. + Copyright (C) 2008-2021 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/lib/filevercmp.h b/lib/filevercmp.h index 3d0b6a694c4..5de212f4366 100644 --- a/lib/filevercmp.h +++ b/lib/filevercmp.h @@ -1,7 +1,7 @@ /* Copyright (C) 1995 Ian Jackson <iwj10@cus.cam.ac.uk> Copyright (C) 2001 Anthony Towns <aj@azure.humbug.org.au> - Copyright (C) 2008-2020 Free Software Foundation, Inc. + Copyright (C) 2008-2021 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/lib/fingerprint.c b/lib/fingerprint.c index 2c19a5555ab..7266da9710d 100644 --- a/lib/fingerprint.c +++ b/lib/fingerprint.c @@ -1,6 +1,6 @@ /* Placeholder fingerprint for Emacs -Copyright 2019-2020 Free Software Foundation, Inc. +Copyright 2019-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lib/fingerprint.h b/lib/fingerprint.h index 2faae8d0880..6ec0c80052f 100644 --- a/lib/fingerprint.h +++ b/lib/fingerprint.h @@ -1,6 +1,6 @@ /* Header file for the Emacs build fingerprint. -Copyright (C) 2016, 2018-2020 Free Software Foundation, Inc. +Copyright (C) 2016, 2018-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lib/flexmember.h b/lib/flexmember.h index 0dc77c3c844..9f6e1bf1105 100644 --- a/lib/flexmember.h +++ b/lib/flexmember.h @@ -1,6 +1,6 @@ /* Sizes of structs with flexible array members. - Copyright 2016-2020 Free Software Foundation, Inc. + Copyright 2016-2021 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/lib/fpending.c b/lib/fpending.c index 836a3a988bf..7c61f7eea75 100644 --- a/lib/fpending.c +++ b/lib/fpending.c @@ -1,5 +1,5 @@ /* fpending.c -- return the number of pending output bytes on a stream - Copyright (C) 2000, 2004, 2006-2007, 2009-2020 Free Software Foundation, + Copyright (C) 2000, 2004, 2006-2007, 2009-2021 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/fpending.h b/lib/fpending.h index a8b8859726d..016341bab57 100644 --- a/lib/fpending.h +++ b/lib/fpending.h @@ -1,6 +1,6 @@ /* Declare __fpending. - Copyright (C) 2000, 2003, 2005-2006, 2009-2020 Free Software Foundation, + Copyright (C) 2000, 2003, 2005-2006, 2009-2021 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/free.c b/lib/free.c index 2f689a7ea32..135c3eb16bc 100644 --- a/lib/free.c +++ b/lib/free.c @@ -1,6 +1,6 @@ /* Make free() preserve errno. - Copyright (C) 2003, 2006, 2009-2020 Free Software Foundation, Inc. + Copyright (C) 2003, 2006, 2009-2021 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/lib/fstatat.c b/lib/fstatat.c index 9da12690d71..640a3754309 100644 --- a/lib/fstatat.c +++ b/lib/fstatat.c @@ -1,6 +1,6 @@ /* Work around an fstatat bug on Solaris 9. - Copyright (C) 2006, 2009-2020 Free Software Foundation, Inc. + Copyright (C) 2006, 2009-2021 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/lib/fsusage.c b/lib/fsusage.c index 85bfe0e2837..35de136cd8e 100644 --- a/lib/fsusage.c +++ b/lib/fsusage.c @@ -1,6 +1,6 @@ /* fsusage.c -- return space usage of mounted file systems - Copyright (C) 1991-1992, 1996, 1998-1999, 2002-2006, 2009-2020 Free Software + Copyright (C) 1991-1992, 1996, 1998-1999, 2002-2006, 2009-2021 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/fsusage.h b/lib/fsusage.h index 5e68709668a..e0657b3651a 100644 --- a/lib/fsusage.h +++ b/lib/fsusage.h @@ -1,6 +1,6 @@ /* fsusage.h -- declarations for file system space usage info - Copyright (C) 1991-1992, 1997, 2003-2006, 2009-2020 Free Software + Copyright (C) 1991-1992, 1997, 2003-2006, 2009-2021 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/fsync.c b/lib/fsync.c index 2298aad3db3..a5280f281cb 100644 --- a/lib/fsync.c +++ b/lib/fsync.c @@ -7,7 +7,7 @@ Written by Richard W.M. Jones <rjones.at.redhat.com> - Copyright (C) 2008-2020 Free Software Foundation, Inc. + Copyright (C) 2008-2021 Free Software Foundation, Inc. This library is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff --git a/lib/ftoastr.c b/lib/ftoastr.c index 47a83152e3f..0ee0407ec27 100644 --- a/lib/ftoastr.c +++ b/lib/ftoastr.c @@ -1,6 +1,6 @@ /* floating point to accurate string - Copyright (C) 2010-2020 Free Software Foundation, Inc. + Copyright (C) 2010-2021 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/lib/ftoastr.h b/lib/ftoastr.h index 78b569f3d97..d7ff9e05482 100644 --- a/lib/ftoastr.h +++ b/lib/ftoastr.h @@ -1,6 +1,6 @@ /* floating point to accurate string - Copyright (C) 2010-2020 Free Software Foundation, Inc. + Copyright (C) 2010-2021 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/lib/futimens.c b/lib/futimens.c index 83fb27cb6aa..99eaba95df3 100644 --- a/lib/futimens.c +++ b/lib/futimens.c @@ -1,5 +1,5 @@ /* Set the access and modification time of an open fd. - Copyright (C) 2009-2020 Free Software Foundation, Inc. + Copyright (C) 2009-2021 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/lib/get-permissions.c b/lib/get-permissions.c index e1bcd9f5298..fe376e5bb0b 100644 --- a/lib/get-permissions.c +++ b/lib/get-permissions.c @@ -1,6 +1,6 @@ /* Get permissions of a file. -*- coding: utf-8 -*- - Copyright (C) 2002-2003, 2005-2020 Free Software Foundation, Inc. + Copyright (C) 2002-2003, 2005-2021 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/lib/getdtablesize.c b/lib/getdtablesize.c index 0fe70921f9d..56eaf5d32cf 100644 --- a/lib/getdtablesize.c +++ b/lib/getdtablesize.c @@ -1,5 +1,5 @@ /* getdtablesize() function: Return maximum possible file descriptor value + 1. - Copyright (C) 2008-2020 Free Software Foundation, Inc. + Copyright (C) 2008-2021 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2008. This program is free software: you can redistribute it and/or modify diff --git a/lib/getgroups.c b/lib/getgroups.c index 4396b4d64b7..af602a74d3a 100644 --- a/lib/getgroups.c +++ b/lib/getgroups.c @@ -1,6 +1,6 @@ /* provide consistent interface to getgroups for systems that don't allow N==0 - Copyright (C) 1996, 1999, 2003, 2006-2020 Free Software Foundation, Inc. + Copyright (C) 1996, 1999, 2003, 2006-2021 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/lib/getloadavg.c b/lib/getloadavg.c index 468e2506709..d42d0cd2797 100644 --- a/lib/getloadavg.c +++ b/lib/getloadavg.c @@ -1,6 +1,6 @@ /* Get the system load averages. - Copyright (C) 1985-1989, 1991-1995, 1997, 1999-2000, 2003-2020 Free Software + Copyright (C) 1985-1989, 1991-1995, 1997, 1999-2000, 2003-2021 Free Software Foundation, Inc. NOTE: The canonical source of this file is maintained with gnulib. diff --git a/lib/getopt-cdefs.in.h b/lib/getopt-cdefs.in.h index 674838c666a..11fe536ff24 100644 --- a/lib/getopt-cdefs.in.h +++ b/lib/getopt-cdefs.in.h @@ -1,5 +1,5 @@ /* getopt-on-non-glibc compatibility macros. - Copyright (C) 1989-2020 Free Software Foundation, Inc. + Copyright (C) 1989-2021 Free Software Foundation, Inc. This file is part of gnulib. Unlike most of the getopt implementation, it is NOT shared with the GNU C Library. diff --git a/lib/getopt-core.h b/lib/getopt-core.h index d4d942ef221..05d16b07401 100644 --- a/lib/getopt-core.h +++ b/lib/getopt-core.h @@ -1,5 +1,5 @@ /* Declarations for getopt (basic, portable features only). - Copyright (C) 1989-2020 Free Software Foundation, Inc. + Copyright (C) 1989-2021 Free Software Foundation, Inc. This file is part of the GNU C Library and is also part of gnulib. Patches to this file should be submitted to both projects. diff --git a/lib/getopt-ext.h b/lib/getopt-ext.h index 05f7083ac6a..9b11b47f0fe 100644 --- a/lib/getopt-ext.h +++ b/lib/getopt-ext.h @@ -1,5 +1,5 @@ /* Declarations for getopt (GNU extensions). - Copyright (C) 1989-2020 Free Software Foundation, Inc. + Copyright (C) 1989-2021 Free Software Foundation, Inc. This file is part of the GNU C Library and is also part of gnulib. Patches to this file should be submitted to both projects. diff --git a/lib/getopt-pfx-core.h b/lib/getopt-pfx-core.h index ec545c1b51c..78990a345a7 100644 --- a/lib/getopt-pfx-core.h +++ b/lib/getopt-pfx-core.h @@ -1,5 +1,5 @@ /* getopt (basic, portable features) gnulib wrapper header. - Copyright (C) 1989-2020 Free Software Foundation, Inc. + Copyright (C) 1989-2021 Free Software Foundation, Inc. This file is part of gnulib. Unlike most of the getopt implementation, it is NOT shared with the GNU C Library. diff --git a/lib/getopt-pfx-ext.h b/lib/getopt-pfx-ext.h index 647fae63522..61ea8d2b1d3 100644 --- a/lib/getopt-pfx-ext.h +++ b/lib/getopt-pfx-ext.h @@ -1,5 +1,5 @@ /* getopt (GNU extensions) gnulib wrapper header. - Copyright (C) 1989-2020 Free Software Foundation, Inc. + Copyright (C) 1989-2021 Free Software Foundation, Inc. This file is part of gnulib. Unlike most of the getopt implementation, it is NOT shared with the GNU C Library. diff --git a/lib/getopt.c b/lib/getopt.c index a6389d8ea9b..dd96c184075 100644 --- a/lib/getopt.c +++ b/lib/getopt.c @@ -1,5 +1,5 @@ /* Getopt for GNU. - Copyright (C) 1987-2020 Free Software Foundation, Inc. + Copyright (C) 1987-2021 Free Software Foundation, Inc. This file is part of the GNU C Library and is also part of gnulib. Patches to this file should be submitted to both projects. diff --git a/lib/getopt.in.h b/lib/getopt.in.h index 36e04bb0883..541fb9da2e8 100644 --- a/lib/getopt.in.h +++ b/lib/getopt.in.h @@ -1,5 +1,5 @@ /* Declarations for getopt. - Copyright (C) 1989-2020 Free Software Foundation, Inc. + Copyright (C) 1989-2021 Free Software Foundation, Inc. This file is part of gnulib. Unlike most of the getopt implementation, it is NOT shared with the GNU C Library, which supplies a different version of diff --git a/lib/getopt1.c b/lib/getopt1.c index 0902efe68e3..ca24eb811f9 100644 --- a/lib/getopt1.c +++ b/lib/getopt1.c @@ -1,5 +1,5 @@ /* getopt_long and getopt_long_only entry points for GNU getopt. - Copyright (C) 1987-2020 Free Software Foundation, Inc. + Copyright (C) 1987-2021 Free Software Foundation, Inc. This file is part of the GNU C Library and is also part of gnulib. Patches to this file should be submitted to both projects. diff --git a/lib/getopt_int.h b/lib/getopt_int.h index afcd8a67fb2..b70ff5badf8 100644 --- a/lib/getopt_int.h +++ b/lib/getopt_int.h @@ -1,5 +1,5 @@ /* Internal declarations for getopt. - Copyright (C) 1989-2020 Free Software Foundation, Inc. + Copyright (C) 1989-2021 Free Software Foundation, Inc. This file is part of the GNU C Library and is also part of gnulib. Patches to this file should be submitted to both projects. diff --git a/lib/getrandom.c b/lib/getrandom.c index f8695abf30a..41212fb329d 100644 --- a/lib/getrandom.c +++ b/lib/getrandom.c @@ -1,6 +1,6 @@ /* Obtain a series of random bytes. - Copyright 2020 Free Software Foundation, Inc. + Copyright 2020-2021 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/lib/gettext.h b/lib/gettext.h index 0bd1e13348a..3552157efd9 100644 --- a/lib/gettext.h +++ b/lib/gettext.h @@ -1,5 +1,5 @@ /* Convenience header for conditional use of GNU <libintl.h>. - Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2020 Free Software + Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2021 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/lib/gettime.c b/lib/gettime.c index f5b8ca53b5f..fb721b2cda1 100644 --- a/lib/gettime.c +++ b/lib/gettime.c @@ -1,6 +1,6 @@ /* gettime -- get the system clock - Copyright (C) 2002, 2004-2007, 2009-2020 Free Software Foundation, Inc. + Copyright (C) 2002, 2004-2007, 2009-2021 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/lib/gettimeofday.c b/lib/gettimeofday.c index 5301e7c144a..b1c93e1c3a3 100644 --- a/lib/gettimeofday.c +++ b/lib/gettimeofday.c @@ -1,6 +1,6 @@ /* Provide gettimeofday for systems that don't have it or for which it's broken. - Copyright (C) 2001-2003, 2005-2007, 2009-2020 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2005-2007, 2009-2021 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/lib/gnulib.mk.in b/lib/gnulib.mk.in index a37f9278a31..c457ac61209 100644 --- a/lib/gnulib.mk.in +++ b/lib/gnulib.mk.in @@ -1,5 +1,5 @@ ## DO NOT EDIT! GENERATED AUTOMATICALLY! -# Copyright (C) 2002-2020 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 Free Software Foundation, Inc. # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -242,7 +242,6 @@ GETOPT_CDEFS_H = @GETOPT_CDEFS_H@ GETOPT_H = @GETOPT_H@ GFILENOTIFY_CFLAGS = @GFILENOTIFY_CFLAGS@ GFILENOTIFY_LIBS = @GFILENOTIFY_LIBS@ -GLIBC21 = @GLIBC21@ GL_COND_LIBTOOL = @GL_COND_LIBTOOL@ GL_GENERATE_ALLOCA_H = @GL_GENERATE_ALLOCA_H@ GL_GENERATE_BYTESWAP_H = @GL_GENERATE_BYTESWAP_H@ @@ -277,6 +276,13 @@ GNULIB_DUP2 = @GNULIB_DUP2@ GNULIB_DUP3 = @GNULIB_DUP3@ GNULIB_ENVIRON = @GNULIB_ENVIRON@ GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@ +GNULIB_EXECL = @GNULIB_EXECL@ +GNULIB_EXECLE = @GNULIB_EXECLE@ +GNULIB_EXECLP = @GNULIB_EXECLP@ +GNULIB_EXECV = @GNULIB_EXECV@ +GNULIB_EXECVE = @GNULIB_EXECVE@ +GNULIB_EXECVP = @GNULIB_EXECVP@ +GNULIB_EXECVPE = @GNULIB_EXECVPE@ GNULIB_EXPLICIT_BZERO = @GNULIB_EXPLICIT_BZERO@ GNULIB_FACCESSAT = @GNULIB_FACCESSAT@ GNULIB_FCHDIR = @GNULIB_FCHDIR@ @@ -362,10 +368,51 @@ GNULIB_MBSSPN = @GNULIB_MBSSPN@ GNULIB_MBSSTR = @GNULIB_MBSSTR@ GNULIB_MBSTOK_R = @GNULIB_MBSTOK_R@ GNULIB_MBTOWC = @GNULIB_MBTOWC@ +GNULIB_MDA_ACCESS = @GNULIB_MDA_ACCESS@ +GNULIB_MDA_CHDIR = @GNULIB_MDA_CHDIR@ +GNULIB_MDA_CHMOD = @GNULIB_MDA_CHMOD@ +GNULIB_MDA_CLOSE = @GNULIB_MDA_CLOSE@ +GNULIB_MDA_CREAT = @GNULIB_MDA_CREAT@ +GNULIB_MDA_DUP = @GNULIB_MDA_DUP@ +GNULIB_MDA_DUP2 = @GNULIB_MDA_DUP2@ +GNULIB_MDA_ECVT = @GNULIB_MDA_ECVT@ +GNULIB_MDA_EXECL = @GNULIB_MDA_EXECL@ +GNULIB_MDA_EXECLE = @GNULIB_MDA_EXECLE@ +GNULIB_MDA_EXECLP = @GNULIB_MDA_EXECLP@ +GNULIB_MDA_EXECV = @GNULIB_MDA_EXECV@ +GNULIB_MDA_EXECVE = @GNULIB_MDA_EXECVE@ +GNULIB_MDA_EXECVP = @GNULIB_MDA_EXECVP@ +GNULIB_MDA_EXECVPE = @GNULIB_MDA_EXECVPE@ +GNULIB_MDA_FCLOSEALL = @GNULIB_MDA_FCLOSEALL@ +GNULIB_MDA_FCVT = @GNULIB_MDA_FCVT@ +GNULIB_MDA_FDOPEN = @GNULIB_MDA_FDOPEN@ +GNULIB_MDA_FILENO = @GNULIB_MDA_FILENO@ +GNULIB_MDA_GCVT = @GNULIB_MDA_GCVT@ +GNULIB_MDA_GETCWD = @GNULIB_MDA_GETCWD@ +GNULIB_MDA_GETPID = @GNULIB_MDA_GETPID@ +GNULIB_MDA_GETW = @GNULIB_MDA_GETW@ +GNULIB_MDA_ISATTY = @GNULIB_MDA_ISATTY@ +GNULIB_MDA_LSEEK = @GNULIB_MDA_LSEEK@ +GNULIB_MDA_MEMCCPY = @GNULIB_MDA_MEMCCPY@ +GNULIB_MDA_MKDIR = @GNULIB_MDA_MKDIR@ +GNULIB_MDA_MKTEMP = @GNULIB_MDA_MKTEMP@ +GNULIB_MDA_OPEN = @GNULIB_MDA_OPEN@ +GNULIB_MDA_PUTENV = @GNULIB_MDA_PUTENV@ +GNULIB_MDA_PUTW = @GNULIB_MDA_PUTW@ +GNULIB_MDA_READ = @GNULIB_MDA_READ@ +GNULIB_MDA_RMDIR = @GNULIB_MDA_RMDIR@ +GNULIB_MDA_STRDUP = @GNULIB_MDA_STRDUP@ +GNULIB_MDA_SWAB = @GNULIB_MDA_SWAB@ +GNULIB_MDA_TEMPNAM = @GNULIB_MDA_TEMPNAM@ +GNULIB_MDA_TZSET = @GNULIB_MDA_TZSET@ +GNULIB_MDA_UMASK = @GNULIB_MDA_UMASK@ +GNULIB_MDA_UNLINK = @GNULIB_MDA_UNLINK@ +GNULIB_MDA_WRITE = @GNULIB_MDA_WRITE@ GNULIB_MEMCHR = @GNULIB_MEMCHR@ GNULIB_MEMMEM = @GNULIB_MEMMEM@ GNULIB_MEMPCPY = @GNULIB_MEMPCPY@ GNULIB_MEMRCHR = @GNULIB_MEMRCHR@ +GNULIB_MKDIR = @GNULIB_MKDIR@ GNULIB_MKDIRAT = @GNULIB_MKDIRAT@ GNULIB_MKDTEMP = @GNULIB_MKDTEMP@ GNULIB_MKFIFO = @GNULIB_MKFIFO@ @@ -567,6 +614,7 @@ HAVE_DIRENT_H = @HAVE_DIRENT_H@ HAVE_DPRINTF = @HAVE_DPRINTF@ HAVE_DUP3 = @HAVE_DUP3@ HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ +HAVE_EXECVPE = @HAVE_EXECVPE@ HAVE_EXPLICIT_BZERO = @HAVE_EXPLICIT_BZERO@ HAVE_FACCESSAT = @HAVE_FACCESSAT@ HAVE_FCHDIR = @HAVE_FCHDIR@ @@ -886,6 +934,13 @@ REPLACE_DIRFD = @REPLACE_DIRFD@ REPLACE_DPRINTF = @REPLACE_DPRINTF@ REPLACE_DUP = @REPLACE_DUP@ REPLACE_DUP2 = @REPLACE_DUP2@ +REPLACE_EXECL = @REPLACE_EXECL@ +REPLACE_EXECLE = @REPLACE_EXECLE@ +REPLACE_EXECLP = @REPLACE_EXECLP@ +REPLACE_EXECV = @REPLACE_EXECV@ +REPLACE_EXECVE = @REPLACE_EXECVE@ +REPLACE_EXECVP = @REPLACE_EXECVP@ +REPLACE_EXECVPE = @REPLACE_EXECVPE@ REPLACE_FACCESSAT = @REPLACE_FACCESSAT@ REPLACE_FCHMODAT = @REPLACE_FCHMODAT@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ @@ -1111,11 +1166,11 @@ gl_GNULIB_ENABLED_260941c0e5dc67ec9e87d1fb321c300b = @gl_GNULIB_ENABLED_260941c0 gl_GNULIB_ENABLED_5264294aa0a5557541b53c8c741f7f31 = @gl_GNULIB_ENABLED_5264294aa0a5557541b53c8c741f7f31@ gl_GNULIB_ENABLED_6099e9737f757db36c47fa9d9f02e88c = @gl_GNULIB_ENABLED_6099e9737f757db36c47fa9d9f02e88c@ gl_GNULIB_ENABLED_682e609604ccaac6be382e4ee3a4eaec = @gl_GNULIB_ENABLED_682e609604ccaac6be382e4ee3a4eaec@ +gl_GNULIB_ENABLED_925677f0343de64b89a9f0c790b4104c = @gl_GNULIB_ENABLED_925677f0343de64b89a9f0c790b4104c@ gl_GNULIB_ENABLED_a9786850e999ae65a836a6041e8e5ed1 = @gl_GNULIB_ENABLED_a9786850e999ae65a836a6041e8e5ed1@ gl_GNULIB_ENABLED_be453cec5eecf5731a274f2de7f2db36 = @gl_GNULIB_ENABLED_be453cec5eecf5731a274f2de7f2db36@ gl_GNULIB_ENABLED_cloexec = @gl_GNULIB_ENABLED_cloexec@ gl_GNULIB_ENABLED_dirfd = @gl_GNULIB_ENABLED_dirfd@ -gl_GNULIB_ENABLED_ef07dc4b3077c11ea9cef586db4e5955 = @gl_GNULIB_ENABLED_ef07dc4b3077c11ea9cef586db4e5955@ gl_GNULIB_ENABLED_euidaccess = @gl_GNULIB_ENABLED_euidaccess@ gl_GNULIB_ENABLED_getdtablesize = @gl_GNULIB_ENABLED_getdtablesize@ gl_GNULIB_ENABLED_getgroups = @gl_GNULIB_ENABLED_getgroups@ @@ -1680,6 +1735,8 @@ fcntl.h: fcntl.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) -e 's/@''GNULIB_NONBLOCKING''@/$(GNULIB_NONBLOCKING)/g' \ -e 's/@''GNULIB_OPEN''@/$(GNULIB_OPEN)/g' \ -e 's/@''GNULIB_OPENAT''@/$(GNULIB_OPENAT)/g' \ + -e 's/@''GNULIB_MDA_CREAT''@/$(GNULIB_MDA_CREAT)/g' \ + -e 's/@''GNULIB_MDA_OPEN''@/$(GNULIB_MDA_OPEN)/g' \ -e 's|@''HAVE_FCNTL''@|$(HAVE_FCNTL)|g' \ -e 's|@''HAVE_OPENAT''@|$(HAVE_OPENAT)|g' \ -e 's|@''REPLACE_CREAT''@|$(REPLACE_CREAT)|g' \ @@ -2361,7 +2418,7 @@ endif ifeq (,$(OMIT_GNULIB_MODULE_scratch_buffer)) ifneq (,$(gl_GNULIB_ENABLED_scratch_buffer)) -libgnu_a_SOURCES += malloc/scratch_buffer_grow.c malloc/scratch_buffer_grow_preserve.c malloc/scratch_buffer_set_array_size.c +libgnu_a_SOURCES += malloc/scratch_buffer_dupfree.c malloc/scratch_buffer_grow.c malloc/scratch_buffer_grow_preserve.c malloc/scratch_buffer_set_array_size.c endif EXTRA_DIST += malloc/scratch_buffer.h scratch_buffer.h @@ -2679,6 +2736,12 @@ stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) -e 's/@''GNULIB_VPRINTF_POSIX''@/$(GNULIB_VPRINTF_POSIX)/g' \ -e 's/@''GNULIB_VSNPRINTF''@/$(GNULIB_VSNPRINTF)/g' \ -e 's/@''GNULIB_VSPRINTF_POSIX''@/$(GNULIB_VSPRINTF_POSIX)/g' \ + -e 's/@''GNULIB_MDA_FCLOSEALL''@/$(GNULIB_MDA_FCLOSEALL)/g' \ + -e 's/@''GNULIB_MDA_FDOPEN''@/$(GNULIB_MDA_FDOPEN)/g' \ + -e 's/@''GNULIB_MDA_FILENO''@/$(GNULIB_MDA_FILENO)/g' \ + -e 's/@''GNULIB_MDA_GETW''@/$(GNULIB_MDA_GETW)/g' \ + -e 's/@''GNULIB_MDA_PUTW''@/$(GNULIB_MDA_PUTW)/g' \ + -e 's/@''GNULIB_MDA_TEMPNAM''@/$(GNULIB_MDA_TEMPNAM)/g' \ < $(srcdir)/stdio.in.h | \ sed -e 's|@''HAVE_DECL_FCLOSEALL''@|$(HAVE_DECL_FCLOSEALL)|g' \ -e 's|@''HAVE_DECL_FPURGE''@|$(HAVE_DECL_FPURGE)|g' \ @@ -2796,6 +2859,11 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ -e 's/@''GNULIB_UNLOCKPT''@/$(GNULIB_UNLOCKPT)/g' \ -e 's/@''GNULIB_UNSETENV''@/$(GNULIB_UNSETENV)/g' \ -e 's/@''GNULIB_WCTOMB''@/$(GNULIB_WCTOMB)/g' \ + -e 's/@''GNULIB_MDA_ECVT''@/$(GNULIB_MDA_ECVT)/g' \ + -e 's/@''GNULIB_MDA_FCVT''@/$(GNULIB_MDA_FCVT)/g' \ + -e 's/@''GNULIB_MDA_GCVT''@/$(GNULIB_MDA_GCVT)/g' \ + -e 's/@''GNULIB_MDA_MKTEMP''@/$(GNULIB_MDA_MKTEMP)/g' \ + -e 's/@''GNULIB_MDA_PUTENV''@/$(GNULIB_MDA_PUTENV)/g' \ < $(srcdir)/stdlib.in.h | \ sed -e 's|@''HAVE__EXIT''@|$(HAVE__EXIT)|g' \ -e 's|@''HAVE_ALIGNED_ALLOC''@|$(HAVE_ALIGNED_ALLOC)|g' \ @@ -2941,6 +3009,8 @@ string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's/@''GNULIB_SIGDESCR_NP''@/$(GNULIB_SIGDESCR_NP)/g' \ -e 's/@''GNULIB_STRSIGNAL''@/$(GNULIB_STRSIGNAL)/g' \ -e 's/@''GNULIB_STRVERSCMP''@/$(GNULIB_STRVERSCMP)/g' \ + -e 's/@''GNULIB_MDA_MEMCCPY''@/$(GNULIB_MDA_MEMCCPY)/g' \ + -e 's/@''GNULIB_MDA_STRDUP''@/$(GNULIB_MDA_STRDUP)/g' \ < $(srcdir)/string.in.h | \ sed -e 's|@''HAVE_EXPLICIT_BZERO''@|$(HAVE_EXPLICIT_BZERO)|g' \ -e 's|@''HAVE_FFSL''@|$(HAVE_FFSL)|g' \ @@ -3136,6 +3206,7 @@ sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNU -e 's/@''GNULIB_GETUMASK''@/$(GNULIB_GETUMASK)/g' \ -e 's/@''GNULIB_LCHMOD''@/$(GNULIB_LCHMOD)/g' \ -e 's/@''GNULIB_LSTAT''@/$(GNULIB_LSTAT)/g' \ + -e 's/@''GNULIB_MKDIR''@/$(GNULIB_MKDIR)/g' \ -e 's/@''GNULIB_MKDIRAT''@/$(GNULIB_MKDIRAT)/g' \ -e 's/@''GNULIB_MKFIFO''@/$(GNULIB_MKFIFO)/g' \ -e 's/@''GNULIB_MKFIFOAT''@/$(GNULIB_MKFIFOAT)/g' \ @@ -3144,6 +3215,9 @@ sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNU -e 's/@''GNULIB_STAT''@/$(GNULIB_STAT)/g' \ -e 's/@''GNULIB_UTIMENSAT''@/$(GNULIB_UTIMENSAT)/g' \ -e 's/@''GNULIB_OVERRIDES_STRUCT_STAT''@/$(GNULIB_OVERRIDES_STRUCT_STAT)/g' \ + -e 's/@''GNULIB_MDA_CHMOD''@/$(GNULIB_MDA_CHMOD)/g' \ + -e 's/@''GNULIB_MDA_MKDIR''@/$(GNULIB_MDA_MKDIR)/g' \ + -e 's/@''GNULIB_MDA_UMASK''@/$(GNULIB_MDA_UMASK)/g' \ -e 's|@''HAVE_FCHMODAT''@|$(HAVE_FCHMODAT)|g' \ -e 's|@''HAVE_FSTATAT''@|$(HAVE_FSTATAT)|g' \ -e 's|@''HAVE_FUTIMENS''@|$(HAVE_FUTIMENS)|g' \ @@ -3279,6 +3353,7 @@ time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $( -e 's/@''GNULIB_TIME_R''@/$(GNULIB_TIME_R)/g' \ -e 's/@''GNULIB_TIME_RZ''@/$(GNULIB_TIME_RZ)/g' \ -e 's/@''GNULIB_TZSET''@/$(GNULIB_TZSET)/g' \ + -e 's/@''GNULIB_MDA_TZSET''@/$(GNULIB_MDA_TZSET)/g' \ -e 's|@''HAVE_DECL_LOCALTIME_R''@|$(HAVE_DECL_LOCALTIME_R)|g' \ -e 's|@''HAVE_NANOSLEEP''@|$(HAVE_NANOSLEEP)|g' \ -e 's|@''HAVE_STRPTIME''@|$(HAVE_STRPTIME)|g' \ @@ -3407,6 +3482,13 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's/@''GNULIB_DUP3''@/$(GNULIB_DUP3)/g' \ -e 's/@''GNULIB_ENVIRON''@/$(GNULIB_ENVIRON)/g' \ -e 's/@''GNULIB_EUIDACCESS''@/$(GNULIB_EUIDACCESS)/g' \ + -e 's/@''GNULIB_EXECL''@/$(GNULIB_EXECL)/g' \ + -e 's/@''GNULIB_EXECLE''@/$(GNULIB_EXECLE)/g' \ + -e 's/@''GNULIB_EXECLP''@/$(GNULIB_EXECLP)/g' \ + -e 's/@''GNULIB_EXECV''@/$(GNULIB_EXECV)/g' \ + -e 's/@''GNULIB_EXECVE''@/$(GNULIB_EXECVE)/g' \ + -e 's/@''GNULIB_EXECVP''@/$(GNULIB_EXECVP)/g' \ + -e 's/@''GNULIB_EXECVPE''@/$(GNULIB_EXECVPE)/g' \ -e 's/@''GNULIB_FACCESSAT''@/$(GNULIB_FACCESSAT)/g' \ -e 's/@''GNULIB_FCHDIR''@/$(GNULIB_FCHDIR)/g' \ -e 's/@''GNULIB_FCHOWNAT''@/$(GNULIB_FCHOWNAT)/g' \ @@ -3452,11 +3534,33 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's/@''GNULIB_UNLINKAT''@/$(GNULIB_UNLINKAT)/g' \ -e 's/@''GNULIB_USLEEP''@/$(GNULIB_USLEEP)/g' \ -e 's/@''GNULIB_WRITE''@/$(GNULIB_WRITE)/g' \ + -e 's/@''GNULIB_MDA_ACCESS''@/$(GNULIB_MDA_ACCESS)/g' \ + -e 's/@''GNULIB_MDA_CHDIR''@/$(GNULIB_MDA_CHDIR)/g' \ + -e 's/@''GNULIB_MDA_CLOSE''@/$(GNULIB_MDA_CLOSE)/g' \ + -e 's/@''GNULIB_MDA_DUP''@/$(GNULIB_MDA_DUP)/g' \ + -e 's/@''GNULIB_MDA_DUP2''@/$(GNULIB_MDA_DUP2)/g' \ + -e 's/@''GNULIB_MDA_EXECL''@/$(GNULIB_MDA_EXECL)/g' \ + -e 's/@''GNULIB_MDA_EXECLE''@/$(GNULIB_MDA_EXECLE)/g' \ + -e 's/@''GNULIB_MDA_EXECLP''@/$(GNULIB_MDA_EXECLP)/g' \ + -e 's/@''GNULIB_MDA_EXECV''@/$(GNULIB_MDA_EXECV)/g' \ + -e 's/@''GNULIB_MDA_EXECVE''@/$(GNULIB_MDA_EXECVE)/g' \ + -e 's/@''GNULIB_MDA_EXECVP''@/$(GNULIB_MDA_EXECVP)/g' \ + -e 's/@''GNULIB_MDA_EXECVPE''@/$(GNULIB_MDA_EXECVPE)/g' \ + -e 's/@''GNULIB_MDA_GETCWD''@/$(GNULIB_MDA_GETCWD)/g' \ + -e 's/@''GNULIB_MDA_GETPID''@/$(GNULIB_MDA_GETPID)/g' \ + -e 's/@''GNULIB_MDA_ISATTY''@/$(GNULIB_MDA_ISATTY)/g' \ + -e 's/@''GNULIB_MDA_LSEEK''@/$(GNULIB_MDA_LSEEK)/g' \ + -e 's/@''GNULIB_MDA_READ''@/$(GNULIB_MDA_READ)/g' \ + -e 's/@''GNULIB_MDA_RMDIR''@/$(GNULIB_MDA_RMDIR)/g' \ + -e 's/@''GNULIB_MDA_SWAB''@/$(GNULIB_MDA_SWAB)/g' \ + -e 's/@''GNULIB_MDA_UNLINK''@/$(GNULIB_MDA_UNLINK)/g' \ + -e 's/@''GNULIB_MDA_WRITE''@/$(GNULIB_MDA_WRITE)/g' \ < $(srcdir)/unistd.in.h | \ sed -e 's|@''HAVE_CHOWN''@|$(HAVE_CHOWN)|g' \ -e 's|@''HAVE_COPY_FILE_RANGE''@|$(HAVE_COPY_FILE_RANGE)|g' \ -e 's|@''HAVE_DUP3''@|$(HAVE_DUP3)|g' \ -e 's|@''HAVE_EUIDACCESS''@|$(HAVE_EUIDACCESS)|g' \ + -e 's|@''HAVE_EXECVPE''@|$(HAVE_EXECVPE)|g' \ -e 's|@''HAVE_FACCESSAT''@|$(HAVE_FACCESSAT)|g' \ -e 's|@''HAVE_FCHDIR''@|$(HAVE_FCHDIR)|g' \ -e 's|@''HAVE_FCHOWNAT''@|$(HAVE_FCHOWNAT)|g' \ @@ -3505,6 +3609,13 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's|@''REPLACE_CLOSE''@|$(REPLACE_CLOSE)|g' \ -e 's|@''REPLACE_DUP''@|$(REPLACE_DUP)|g' \ -e 's|@''REPLACE_DUP2''@|$(REPLACE_DUP2)|g' \ + -e 's|@''REPLACE_EXECL''@|$(REPLACE_EXECL)|g' \ + -e 's|@''REPLACE_EXECLE''@|$(REPLACE_EXECLE)|g' \ + -e 's|@''REPLACE_EXECLP''@|$(REPLACE_EXECLP)|g' \ + -e 's|@''REPLACE_EXECV''@|$(REPLACE_EXECV)|g' \ + -e 's|@''REPLACE_EXECVE''@|$(REPLACE_EXECVE)|g' \ + -e 's|@''REPLACE_EXECVP''@|$(REPLACE_EXECVP)|g' \ + -e 's|@''REPLACE_EXECVPE''@|$(REPLACE_EXECVPE)|g' \ -e 's|@''REPLACE_FACCESSAT''@|$(REPLACE_FACCESSAT)|g' \ -e 's|@''REPLACE_FCHOWNAT''@|$(REPLACE_FCHOWNAT)|g' \ -e 's|@''REPLACE_FTRUNCATE''@|$(REPLACE_FTRUNCATE)|g' \ diff --git a/lib/group-member.c b/lib/group-member.c index 6a6fc5605ef..52159016eab 100644 --- a/lib/group-member.c +++ b/lib/group-member.c @@ -1,6 +1,6 @@ /* group-member.c -- determine whether group id is in calling user's group list - Copyright (C) 1994, 1997-1998, 2003, 2005-2006, 2009-2020 Free Software + Copyright (C) 1994, 1997-1998, 2003, 2005-2006, 2009-2021 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/idx.h b/lib/idx.h index 6a7739fa9c7..681c8c90f10 100644 --- a/lib/idx.h +++ b/lib/idx.h @@ -1,19 +1,20 @@ /* A type for indices and sizes. + Copyright (C) 2020-2021 Free Software Foundation, Inc. + This file is part of the GNU C Library. - Copyright (C) 2020 Free Software Foundation, Inc. + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public + License as published by the Free Software Foundation; either + version 3 of the License, or (at your option) any later version. - 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 - the Free Software Foundation; either version 3, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, + The GNU C Library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, see <https://www.gnu.org/licenses/>. */ + You should have received a copy of the GNU General Public + License along with the GNU C Library; if not, see + <https://www.gnu.org/licenses/>. */ #ifndef _IDX_H #define _IDX_H diff --git a/lib/ieee754.in.h b/lib/ieee754.in.h index d64bb46e9de..ce13efc918d 100644 --- a/lib/ieee754.in.h +++ b/lib/ieee754.in.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1992-2020 Free Software Foundation, Inc. +/* Copyright (C) 1992-2021 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or diff --git a/lib/ignore-value.h b/lib/ignore-value.h index ec3288f0dfc..0a3cf1e95b4 100644 --- a/lib/ignore-value.h +++ b/lib/ignore-value.h @@ -1,6 +1,6 @@ /* ignore a function return without a compiler warning. -*- coding: utf-8 -*- - Copyright (C) 2008-2020 Free Software Foundation, Inc. + Copyright (C) 2008-2021 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/lib/intprops.h b/lib/intprops.h index bc2107c9295..2a420ac8319 100644 --- a/lib/intprops.h +++ b/lib/intprops.h @@ -1,6 +1,6 @@ /* intprops.h -- properties of integer types - Copyright (C) 2001-2020 Free Software Foundation, Inc. + Copyright (C) 2001-2021 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 diff --git a/lib/inttypes.in.h b/lib/inttypes.in.h index 596a050458b..e9ee500e3e6 100644 --- a/lib/inttypes.in.h +++ b/lib/inttypes.in.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2006-2020 Free Software Foundation, Inc. +/* Copyright (C) 2006-2021 Free Software Foundation, Inc. Written by Paul Eggert, Bruno Haible, Derek Price. This file is part of gnulib. diff --git a/lib/lchmod.c b/lib/lchmod.c index 77a00609552..195304f5115 100644 --- a/lib/lchmod.c +++ b/lib/lchmod.c @@ -1,6 +1,6 @@ /* Implement lchmod on platforms where it does not work correctly. - Copyright 2020 Free Software Foundation, Inc. + Copyright 2020-2021 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/lib/libc-config.h b/lib/libc-config.h index 1300c3a2ac8..d4e29951f35 100644 --- a/lib/libc-config.h +++ b/lib/libc-config.h @@ -1,6 +1,6 @@ /* System definitions for code taken from the GNU C Library - Copyright 2017-2020 Free Software Foundation, Inc. + Copyright 2017-2021 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 diff --git a/lib/limits.in.h b/lib/limits.in.h index d25c5237060..076ab9ef548 100644 --- a/lib/limits.in.h +++ b/lib/limits.in.h @@ -1,6 +1,6 @@ /* A GNU-like <limits.h>. - Copyright 2016-2020 Free Software Foundation, Inc. + Copyright 2016-2021 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 diff --git a/lib/lstat.c b/lib/lstat.c index f74392b7319..a584c6aa069 100644 --- a/lib/lstat.c +++ b/lib/lstat.c @@ -1,6 +1,6 @@ /* Work around a bug of lstat on some systems - Copyright (C) 1997-2006, 2008-2020 Free Software Foundation, Inc. + Copyright (C) 1997-2006, 2008-2021 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/lib/malloc/scratch_buffer.h b/lib/malloc/scratch_buffer.h index b40478637c8..26e306212d1 100644 --- a/lib/malloc/scratch_buffer.h +++ b/lib/malloc/scratch_buffer.h @@ -1,5 +1,5 @@ /* Variable-sized buffer with on-stack default allocation. - Copyright (C) 2015-2020 Free Software Foundation, Inc. + Copyright (C) 2015-2021 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -132,4 +132,20 @@ scratch_buffer_set_array_size (struct scratch_buffer *buffer, (buffer, nelem, size)); } +/* Return a copy of *BUFFER's first SIZE bytes as a heap-allocated block, + deallocating *BUFFER if it was heap-allocated. SIZE must be at + most *BUFFER's size. Return NULL (setting errno) on memory + exhaustion. */ +void *__libc_scratch_buffer_dupfree (struct scratch_buffer *buffer, + size_t size); +libc_hidden_proto (__libc_scratch_buffer_dupfree) + +/* Alias for __libc_scratch_dupfree. */ +static __always_inline void * +scratch_buffer_dupfree (struct scratch_buffer *buffer, size_t size) +{ + void *r = __libc_scratch_buffer_dupfree (buffer, size); + return __glibc_likely (r != NULL) ? r : NULL; +} + #endif /* _SCRATCH_BUFFER_H */ diff --git a/lib/malloc/scratch_buffer_dupfree.c b/lib/malloc/scratch_buffer_dupfree.c new file mode 100644 index 00000000000..775bff5609f --- /dev/null +++ b/lib/malloc/scratch_buffer_dupfree.c @@ -0,0 +1,41 @@ +/* Variable-sized buffer with on-stack default allocation. + Copyright (C) 2020-2021 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public + License as published by the Free Software Foundation; either + version 3 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public + License along with the GNU C Library; if not, see + <https://www.gnu.org/licenses/>. */ + +#ifndef _LIBC +# include <libc-config.h> +#endif + +#include <scratch_buffer.h> +#include <string.h> + +void * +__libc_scratch_buffer_dupfree (struct scratch_buffer *buffer, size_t size) +{ + void *data = buffer->data; + if (data == buffer->__space.__c) + { + void *copy = malloc (size); + return copy != NULL ? memcpy (copy, data, size) : NULL; + } + else + { + void *copy = realloc (data, size); + return copy != NULL ? copy : data; + } +} +libc_hidden_def (__libc_scratch_buffer_dupfree) diff --git a/lib/malloca.c b/lib/malloca.c index 975b166daed..d68d233dcb3 100644 --- a/lib/malloca.c +++ b/lib/malloca.c @@ -1,5 +1,6 @@ /* Safe automatic memory allocation. - Copyright (C) 2003, 2006-2007, 2009-2020 Free Software Foundation, Inc. + Copyright (C) 2003, 2006-2007, 2009-2021 Free Software Foundation, + Inc. Written by Bruno Haible <bruno@clisp.org>, 2003, 2018. This program is free software; you can redistribute it and/or modify diff --git a/lib/malloca.h b/lib/malloca.h index ccc485a6a4d..a04e54593fa 100644 --- a/lib/malloca.h +++ b/lib/malloca.h @@ -1,5 +1,5 @@ /* Safe automatic memory allocation. - Copyright (C) 2003-2007, 2009-2020 Free Software Foundation, Inc. + Copyright (C) 2003-2007, 2009-2021 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2003. This program is free software; you can redistribute it and/or modify diff --git a/lib/md5.c b/lib/md5.c index 74cf2c3a0f7..e7eeeaab03f 100644 --- a/lib/md5.c +++ b/lib/md5.c @@ -1,6 +1,6 @@ /* Functions to compute MD5 message digest of files or memory blocks. according to the definition of MD5 in RFC 1321 from April 1992. - Copyright (C) 1995-1997, 1999-2001, 2005-2006, 2008-2020 Free Software + Copyright (C) 1995-1997, 1999-2001, 2005-2006, 2008-2021 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/lib/md5.h b/lib/md5.h index c728ba1b6f2..aa4b0805d58 100644 --- a/lib/md5.h +++ b/lib/md5.h @@ -1,6 +1,6 @@ /* Declaration of functions and data types used for MD5 sum computing library functions. - Copyright (C) 1995-1997, 1999-2001, 2004-2006, 2008-2020 Free Software + Copyright (C) 1995-1997, 1999-2001, 2004-2006, 2008-2021 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/lib/memmem.c b/lib/memmem.c index 6f6574211f8..87266fa87af 100644 --- a/lib/memmem.c +++ b/lib/memmem.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-1994, 1996-1998, 2000, 2004, 2007-2020 Free Software +/* Copyright (C) 1991-1994, 1996-1998, 2000, 2004, 2007-2021 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/lib/mempcpy.c b/lib/mempcpy.c index fe832d7bcfb..fea618a9e59 100644 --- a/lib/mempcpy.c +++ b/lib/mempcpy.c @@ -1,5 +1,5 @@ /* Copy memory area and return pointer after last written byte. - Copyright (C) 2003, 2007, 2009-2020 Free Software Foundation, Inc. + Copyright (C) 2003, 2007, 2009-2021 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/lib/memrchr.c b/lib/memrchr.c index 7ff32e11338..dcd24fafc6e 100644 --- a/lib/memrchr.c +++ b/lib/memrchr.c @@ -1,6 +1,6 @@ /* memrchr -- find the last occurrence of a byte in a memory block - Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2020 Free Software + Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2021 Free Software Foundation, Inc. Based on strlen implementation by Torbjorn Granlund (tege@sics.se), diff --git a/lib/mini-gmp-gnulib.c b/lib/mini-gmp-gnulib.c index e9e8a174c03..d46c2b993bc 100644 --- a/lib/mini-gmp-gnulib.c +++ b/lib/mini-gmp-gnulib.c @@ -1,6 +1,6 @@ /* Tailor mini-gmp.c for Gnulib-using applications. - Copyright 2018-2020 Free Software Foundation, Inc. + Copyright 2018-2021 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/lib/minmax.h b/lib/minmax.h index b9477767b0d..eb9fb09a540 100644 --- a/lib/minmax.h +++ b/lib/minmax.h @@ -1,5 +1,5 @@ /* MIN, MAX macros. - Copyright (C) 1995, 1998, 2001, 2003, 2005, 2009-2020 Free Software + Copyright (C) 1995, 1998, 2001, 2003, 2005, 2009-2021 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/lib/mkostemp.c b/lib/mkostemp.c index 46b58e1bcac..9d733ddd10d 100644 --- a/lib/mkostemp.c +++ b/lib/mkostemp.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998-1999, 2001, 2005-2007, 2009-2020 Free Software +/* Copyright (C) 1998-1999, 2001, 2005-2007, 2009-2021 Free Software Foundation, Inc. This file is derived from the one in the GNU C Library. diff --git a/lib/mktime.c b/lib/mktime.c index 5b4c144ecad..2c7cd7ba832 100644 --- a/lib/mktime.c +++ b/lib/mktime.c @@ -1,5 +1,5 @@ /* Convert a 'struct tm' to a time_t value. - Copyright (C) 1993-2020 Free Software Foundation, Inc. + Copyright (C) 1993-2021 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Paul Eggert <eggert@twinsun.com>. diff --git a/lib/nstrftime.c b/lib/nstrftime.c index 7d5a97f7635..8ba6975552b 100644 --- a/lib/nstrftime.c +++ b/lib/nstrftime.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-2020 Free Software Foundation, Inc. +/* Copyright (C) 1991-2021 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or diff --git a/lib/open.c b/lib/open.c index 0f7c6e9b9d3..85991853318 100644 --- a/lib/open.c +++ b/lib/open.c @@ -1,5 +1,5 @@ /* Open a descriptor to a file. - Copyright (C) 2007-2020 Free Software Foundation, Inc. + Copyright (C) 2007-2021 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/lib/openat-priv.h b/lib/openat-priv.h index 5b824f7a976..5c42d034998 100644 --- a/lib/openat-priv.h +++ b/lib/openat-priv.h @@ -1,6 +1,6 @@ /* Internals for openat-like functions. - Copyright (C) 2005-2006, 2009-2020 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2009-2021 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/lib/openat-proc.c b/lib/openat-proc.c index b5aaee8b1d3..4f8be90f146 100644 --- a/lib/openat-proc.c +++ b/lib/openat-proc.c @@ -1,6 +1,6 @@ /* Create /proc/self/fd-related names for subfiles of open directories. - Copyright (C) 2006, 2009-2020 Free Software Foundation, Inc. + Copyright (C) 2006, 2009-2021 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/lib/openat.h b/lib/openat.h index 824ce560e34..70981241b24 100644 --- a/lib/openat.h +++ b/lib/openat.h @@ -1,5 +1,5 @@ /* provide a replacement openat function - Copyright (C) 2004-2006, 2008-2020 Free Software Foundation, Inc. + Copyright (C) 2004-2006, 2008-2021 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/lib/pathmax.h b/lib/pathmax.h index 15a236fae8c..49cf4629c7c 100644 --- a/lib/pathmax.h +++ b/lib/pathmax.h @@ -1,5 +1,5 @@ /* Define PATH_MAX somehow. Requires sys/types.h. - Copyright (C) 1992, 1999, 2001, 2003, 2005, 2009-2020 Free Software + Copyright (C) 1992, 1999, 2001, 2003, 2005, 2009-2021 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/lib/pipe2.c b/lib/pipe2.c index 591e94db4ce..41493aa4307 100644 --- a/lib/pipe2.c +++ b/lib/pipe2.c @@ -1,5 +1,5 @@ /* Create a pipe, with specific opening flags. - Copyright (C) 2009-2020 Free Software Foundation, Inc. + Copyright (C) 2009-2021 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/lib/pselect.c b/lib/pselect.c index d6205240981..0fda4eef6ec 100644 --- a/lib/pselect.c +++ b/lib/pselect.c @@ -1,6 +1,6 @@ /* pselect - synchronous I/O multiplexing - Copyright 2011-2020 Free Software Foundation, Inc. + Copyright 2011-2021 Free Software Foundation, Inc. This file is part of gnulib. diff --git a/lib/pthread_sigmask.c b/lib/pthread_sigmask.c index 3eb74f2b5ec..8a692048a02 100644 --- a/lib/pthread_sigmask.c +++ b/lib/pthread_sigmask.c @@ -1,5 +1,5 @@ /* POSIX compatible signal blocking for threads. - Copyright (C) 2011-2020 Free Software Foundation, Inc. + Copyright (C) 2011-2021 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/lib/qcopy-acl.c b/lib/qcopy-acl.c index 5408b0fe6be..f274ca8d568 100644 --- a/lib/qcopy-acl.c +++ b/lib/qcopy-acl.c @@ -1,6 +1,6 @@ /* Copy access control list from one file to another. -*- coding: utf-8 -*- - Copyright (C) 2002-2003, 2005-2020 Free Software Foundation, Inc. + Copyright (C) 2002-2003, 2005-2021 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/lib/rawmemchr.c b/lib/rawmemchr.c index 04bf08415c6..bbb250feb8c 100644 --- a/lib/rawmemchr.c +++ b/lib/rawmemchr.c @@ -1,5 +1,5 @@ /* Searching in a string. - Copyright (C) 2008-2020 Free Software Foundation, Inc. + Copyright (C) 2008-2021 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/lib/rawmemchr.valgrind b/lib/rawmemchr.valgrind index 53c5b317d5f..087d5e4178d 100644 --- a/lib/rawmemchr.valgrind +++ b/lib/rawmemchr.valgrind @@ -1,6 +1,6 @@ # Suppress a valgrind message about use of uninitialized memory in rawmemchr(). -# Copyright (C) 2008-2020 Free Software Foundation, Inc. +# Copyright (C) 2008-2021 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/lib/readlink.c b/lib/readlink.c index 531913eba3e..c4b635ce712 100644 --- a/lib/readlink.c +++ b/lib/readlink.c @@ -1,5 +1,5 @@ /* Read the contents of a symbolic link. - Copyright (C) 2003-2007, 2009-2020 Free Software Foundation, Inc. + Copyright (C) 2003-2007, 2009-2021 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/lib/readlinkat.c b/lib/readlinkat.c index 7a41208ebfd..4a29f7a8bff 100644 --- a/lib/readlinkat.c +++ b/lib/readlinkat.c @@ -1,5 +1,5 @@ /* Read a symlink relative to an open directory. - Copyright (C) 2009-2020 Free Software Foundation, Inc. + Copyright (C) 2009-2021 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/lib/regcomp.c b/lib/regcomp.c index a4b95b0b2ff..0c31b0e14cb 100644 --- a/lib/regcomp.c +++ b/lib/regcomp.c @@ -1,5 +1,5 @@ /* Extended regular expression matching and search library. - Copyright (C) 2002-2020 Free Software Foundation, Inc. + Copyright (C) 2002-2021 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>. diff --git a/lib/regex.h b/lib/regex.h index 306521a3e8a..d291e38793e 100644 --- a/lib/regex.h +++ b/lib/regex.h @@ -1,6 +1,6 @@ /* Definitions for data structures and routines for the regular expression library. - Copyright (C) 1985, 1989-2020 Free Software Foundation, Inc. + Copyright (C) 1985, 1989-2021 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or diff --git a/lib/regex_internal.c b/lib/regex_internal.c index bf9439e53fd..73087c8610e 100644 --- a/lib/regex_internal.c +++ b/lib/regex_internal.c @@ -1,5 +1,5 @@ /* Extended regular expression matching and search library. - Copyright (C) 2002-2020 Free Software Foundation, Inc. + Copyright (C) 2002-2021 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>. diff --git a/lib/regex_internal.h b/lib/regex_internal.h index 7b50b478114..be2fa4fe78e 100644 --- a/lib/regex_internal.h +++ b/lib/regex_internal.h @@ -1,5 +1,5 @@ /* Extended regular expression matching and search library. - Copyright (C) 2002-2020 Free Software Foundation, Inc. + Copyright (C) 2002-2021 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>. diff --git a/lib/root-uid.h b/lib/root-uid.h index f0f77c23f15..cb74a49c1bb 100644 --- a/lib/root-uid.h +++ b/lib/root-uid.h @@ -1,6 +1,6 @@ /* The user ID that always has appropriate privileges in the POSIX sense. - Copyright 2012-2020 Free Software Foundation, Inc. + Copyright 2012-2021 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/lib/save-cwd.c b/lib/save-cwd.c index fc37d4a3087..9b625c739d1 100644 --- a/lib/save-cwd.c +++ b/lib/save-cwd.c @@ -1,6 +1,6 @@ /* save-cwd.c -- Save and restore current working directory. - Copyright (C) 1995, 1997-1998, 2003-2006, 2009-2020 Free Software + Copyright (C) 1995, 1997-1998, 2003-2006, 2009-2021 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/save-cwd.h b/lib/save-cwd.h index ec6f74cb8fc..e1e69eceaf5 100644 --- a/lib/save-cwd.h +++ b/lib/save-cwd.h @@ -1,6 +1,6 @@ /* Save and restore current working directory. - Copyright (C) 1995, 1997-1998, 2003, 2009-2020 Free Software + Copyright (C) 1995, 1997-1998, 2003, 2009-2021 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/scratch_buffer.h b/lib/scratch_buffer.h index 0b45f92c105..3e2b5ef27db 100644 --- a/lib/scratch_buffer.h +++ b/lib/scratch_buffer.h @@ -1,5 +1,5 @@ /* Variable-sized buffer with on-stack default allocation. - Copyright (C) 2017-2020 Free Software Foundation, Inc. + Copyright (C) 2017-2021 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/lib/set-permissions.c b/lib/set-permissions.c index b22ccfdd8fb..607983cb93d 100644 --- a/lib/set-permissions.c +++ b/lib/set-permissions.c @@ -1,6 +1,6 @@ /* Set permissions of a file. -*- coding: utf-8 -*- - Copyright (C) 2002-2003, 2005-2020 Free Software Foundation, Inc. + Copyright (C) 2002-2003, 2005-2021 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/lib/sha1.c b/lib/sha1.c index bacf29c4051..612d46de827 100644 --- a/lib/sha1.c +++ b/lib/sha1.c @@ -1,7 +1,7 @@ /* sha1.c - Functions to compute SHA1 message digest of files or memory blocks according to the NIST specification FIPS-180-1. - Copyright (C) 2000-2001, 2003-2006, 2008-2020 Free Software Foundation, Inc. + Copyright (C) 2000-2001, 2003-2006, 2008-2021 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 the diff --git a/lib/sha1.h b/lib/sha1.h index b76788487c3..94ccd18fda5 100644 --- a/lib/sha1.h +++ b/lib/sha1.h @@ -1,6 +1,6 @@ /* Declarations of functions and data types used for SHA1 sum library functions. - Copyright (C) 2000-2001, 2003, 2005-2006, 2008-2020 Free Software + Copyright (C) 2000-2001, 2003, 2005-2006, 2008-2021 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it diff --git a/lib/sha256.c b/lib/sha256.c index c80dea27f57..129d64b174b 100644 --- a/lib/sha256.c +++ b/lib/sha256.c @@ -1,7 +1,7 @@ /* sha256.c - Functions to compute SHA256 and SHA224 message digest of files or memory blocks according to the NIST specification FIPS-180-2. - Copyright (C) 2005-2006, 2008-2020 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2008-2021 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/lib/sha256.h b/lib/sha256.h index 750d78a2696..b4bc082267a 100644 --- a/lib/sha256.h +++ b/lib/sha256.h @@ -1,6 +1,6 @@ /* Declarations of functions and data types used for SHA256 and SHA224 sum library functions. - Copyright (C) 2005-2006, 2008-2020 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2008-2021 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/lib/sha512.c b/lib/sha512.c index 518e336b5ec..4ac3fa3e42d 100644 --- a/lib/sha512.c +++ b/lib/sha512.c @@ -1,7 +1,7 @@ /* sha512.c - Functions to compute SHA512 and SHA384 message digest of files or memory blocks according to the NIST specification FIPS-180-2. - Copyright (C) 2005-2006, 2008-2020 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2008-2021 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/lib/sha512.h b/lib/sha512.h index 21c2f580147..81b53034c7e 100644 --- a/lib/sha512.h +++ b/lib/sha512.h @@ -1,6 +1,6 @@ /* Declarations of functions and data types used for SHA512 and SHA384 sum library functions. - Copyright (C) 2005-2006, 2008-2020 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2008-2021 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/lib/sig2str.c b/lib/sig2str.c index cf7c3bb5c38..c2cc35d830c 100644 --- a/lib/sig2str.c +++ b/lib/sig2str.c @@ -1,6 +1,6 @@ /* sig2str.c -- convert between signal names and numbers - Copyright (C) 2002, 2004, 2006, 2009-2020 Free Software Foundation, Inc. + Copyright (C) 2002, 2004, 2006, 2009-2021 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/lib/sig2str.h b/lib/sig2str.h index a0b45da7c31..f736aa1b0dd 100644 --- a/lib/sig2str.h +++ b/lib/sig2str.h @@ -1,6 +1,6 @@ /* sig2str.h -- convert between signal names and numbers - Copyright (C) 2002, 2005, 2009-2020 Free Software Foundation, Inc. + Copyright (C) 2002, 2005, 2009-2021 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/lib/sigdescr_np.c b/lib/sigdescr_np.c index fc9cd3c2369..6c9bf283a8d 100644 --- a/lib/sigdescr_np.c +++ b/lib/sigdescr_np.c @@ -1,5 +1,5 @@ /* English descriptions of signals. - Copyright (C) 2020 Free Software Foundation, Inc. + Copyright (C) 2020-2021 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/lib/signal.in.h b/lib/signal.in.h index 70a2d4af6ca..ed01d672c9d 100644 --- a/lib/signal.in.h +++ b/lib/signal.in.h @@ -1,6 +1,6 @@ /* A GNU-like <signal.h>. - Copyright (C) 2006-2020 Free Software Foundation, Inc. + Copyright (C) 2006-2021 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/lib/stat-time.h b/lib/stat-time.h index 884ffd829a2..523ed21b080 100644 --- a/lib/stat-time.h +++ b/lib/stat-time.h @@ -1,6 +1,6 @@ /* stat-related time functions. - Copyright (C) 2005, 2007, 2009-2020 Free Software Foundation, Inc. + Copyright (C) 2005, 2007, 2009-2021 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/lib/stdalign.in.h b/lib/stdalign.in.h index b5b63e53f12..eae9d132215 100644 --- a/lib/stdalign.in.h +++ b/lib/stdalign.in.h @@ -1,6 +1,6 @@ /* A substitute for ISO C11 <stdalign.h>. - Copyright 2011-2020 Free Software Foundation, Inc. + Copyright 2011-2021 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/lib/stddef.in.h b/lib/stddef.in.h index 87b46d53204..ba7195a9102 100644 --- a/lib/stddef.in.h +++ b/lib/stddef.in.h @@ -1,6 +1,6 @@ /* A substitute for POSIX 2008 <stddef.h>, for platforms that have issues. - Copyright (C) 2009-2020 Free Software Foundation, Inc. + Copyright (C) 2009-2021 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/lib/stdint.in.h b/lib/stdint.in.h index 6f2235a750a..7a8f27cef7e 100644 --- a/lib/stdint.in.h +++ b/lib/stdint.in.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2002, 2004-2020 Free Software Foundation, Inc. +/* Copyright (C) 2001-2002, 2004-2021 Free Software Foundation, Inc. Written by Paul Eggert, Bruno Haible, Sam Steingold, Peter Burwood. This file is part of gnulib. diff --git a/lib/stdio-impl.h b/lib/stdio-impl.h index 15066aa59f8..2a5db74f283 100644 --- a/lib/stdio-impl.h +++ b/lib/stdio-impl.h @@ -1,5 +1,5 @@ /* Implementation details of FILE streams. - Copyright (C) 2007-2008, 2010-2020 Free Software Foundation, Inc. + Copyright (C) 2007-2008, 2010-2021 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/lib/stdio.in.h b/lib/stdio.in.h index 458036b3441..a9308405052 100644 --- a/lib/stdio.in.h +++ b/lib/stdio.in.h @@ -1,6 +1,6 @@ /* A GNU-like <stdio.h>. - Copyright (C) 2004, 2007-2020 Free Software Foundation, Inc. + Copyright (C) 2004, 2007-2021 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 @@ -229,27 +229,29 @@ _GL_WARN_ON_USE (fclose, "fclose is not always POSIX compliant - " "use gnulib module fclose for portable POSIX compliance"); #endif +#if @GNULIB_MDA_FCLOSEALL@ /* On native Windows, map 'fcloseall' to '_fcloseall', so that -loldnames is not required. In C++ with GNULIB_NAMESPACE, avoid differences between platforms by defining GNULIB_NAMESPACE::fcloseall on all platforms that have it. */ -#if defined _WIN32 && !defined __CYGWIN__ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef fcloseall -# define fcloseall _fcloseall -# endif +# if defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef fcloseall +# define fcloseall _fcloseall +# endif _GL_CXXALIAS_MDA (fcloseall, int, (void)); -#else -# if @HAVE_DECL_FCLOSEALL@ -# if defined __FreeBSD__ +# else +# if @HAVE_DECL_FCLOSEALL@ +# if defined __FreeBSD__ _GL_CXXALIAS_SYS (fcloseall, void, (void)); -# else +# else _GL_CXXALIAS_SYS (fcloseall, int, (void)); +# endif # endif # endif -#endif -#if (defined _WIN32 && !defined __CYGWIN__) || @HAVE_DECL_FCLOSEALL@ +# if (defined _WIN32 && !defined __CYGWIN__) || @HAVE_DECL_FCLOSEALL@ _GL_CXXALIASWARN (fcloseall); +# endif #endif #if @GNULIB_FDOPEN@ @@ -276,7 +278,7 @@ _GL_CXXALIASWARN (fdopen); /* Assume fdopen is always declared. */ _GL_WARN_ON_USE (fdopen, "fdopen on native Windows platforms is not POSIX compliant - " "use gnulib module fdopen for portability"); -#else +#elif @GNULIB_MDA_FDOPEN@ /* On native Windows, map 'fdopen' to '_fdopen', so that -loldnames is not required. In C++ with GNULIB_NAMESPACE, avoid differences between platforms by defining GNULIB_NAMESPACE::fdopen always. */ @@ -354,19 +356,21 @@ _GL_CXXALIASWARN (fgets); # endif #endif +#if @GNULIB_MDA_FILENO@ /* On native Windows, map 'fileno' to '_fileno', so that -loldnames is not required. In C++ with GNULIB_NAMESPACE, avoid differences between platforms by defining GNULIB_NAMESPACE::fileno always. */ -#if defined _WIN32 && !defined __CYGWIN__ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef fileno -# define fileno _fileno -# endif +# if defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef fileno +# define fileno _fileno +# endif _GL_CXXALIAS_MDA (fileno, int, (FILE *restrict stream)); -#else +# else _GL_CXXALIAS_SYS (fileno, int, (FILE *restrict stream)); -#endif +# endif _GL_CXXALIASWARN (fileno); +#endif #if @GNULIB_FOPEN@ # if @REPLACE_FOPEN@ @@ -895,19 +899,21 @@ _GL_WARN_ON_USE (getline, "getline is unportable - " _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); #endif +#if @GNULIB_MDA_GETW@ /* On native Windows, map 'getw' to '_getw', so that -loldnames is not required. In C++ with GNULIB_NAMESPACE, avoid differences between platforms by defining GNULIB_NAMESPACE::getw always. */ -#if defined _WIN32 && !defined __CYGWIN__ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef getw -# define getw _getw -# endif +# if defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef getw +# define getw _getw +# endif _GL_CXXALIAS_MDA (getw, int, (FILE *restrict stream)); -#else +# else _GL_CXXALIAS_SYS (getw, int, (FILE *restrict stream)); -#endif +# endif _GL_CXXALIASWARN (getw); +#endif #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@ struct obstack; @@ -1122,19 +1128,21 @@ _GL_CXXALIASWARN (puts); # endif #endif +#if @GNULIB_MDA_PUTW@ /* On native Windows, map 'putw' to '_putw', so that -loldnames is not required. In C++ with GNULIB_NAMESPACE, avoid differences between platforms by defining GNULIB_NAMESPACE::putw always. */ -#if defined _WIN32 && !defined __CYGWIN__ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef putw -# define putw _putw -# endif +# if defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef putw +# define putw _putw +# endif _GL_CXXALIAS_MDA (putw, int, (int w, FILE *restrict stream)); -#else +# else _GL_CXXALIAS_SYS (putw, int, (int w, FILE *restrict stream)); -#endif +# endif _GL_CXXALIASWARN (putw); +#endif #if @GNULIB_REMOVE@ # if @REPLACE_REMOVE@ @@ -1315,19 +1323,21 @@ _GL_WARN_ON_USE (sprintf, "sprintf is not always POSIX compliant - " "POSIX compliance"); #endif +#if @GNULIB_MDA_TEMPNAM@ /* On native Windows, map 'tempnam' to '_tempnam', so that -loldnames is not required. In C++ with GNULIB_NAMESPACE, avoid differences between platforms by defining GNULIB_NAMESPACE::tempnam always. */ -#if defined _WIN32 && !defined __CYGWIN__ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef tempnam -# define tempnam _tempnam -# endif +# if defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef tempnam +# define tempnam _tempnam +# endif _GL_CXXALIAS_MDA (tempnam, char *, (const char *dir, const char *prefix)); -#else +# else _GL_CXXALIAS_SYS (tempnam, char *, (const char *dir, const char *prefix)); -#endif +# endif _GL_CXXALIASWARN (tempnam); +#endif #if @GNULIB_TMPFILE@ # if @REPLACE_TMPFILE@ diff --git a/lib/stdlib.in.h b/lib/stdlib.in.h index 1964443a22f..49fc44e14a1 100644 --- a/lib/stdlib.in.h +++ b/lib/stdlib.in.h @@ -1,6 +1,6 @@ /* A GNU-like <stdlib.h>. - Copyright (C) 1995, 2001-2004, 2006-2020 Free Software Foundation, Inc. + Copyright (C) 1995, 2001-2004, 2006-2021 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 @@ -242,46 +242,50 @@ _GL_WARN_ON_USE (canonicalize_file_name, # endif #endif +#if @GNULIB_MDA_ECVT@ /* On native Windows, map 'ecvt' to '_ecvt', so that -loldnames is not required. In C++ with GNULIB_NAMESPACE, avoid differences between platforms by defining GNULIB_NAMESPACE::ecvt on all platforms that have it. */ -#if defined _WIN32 && !defined __CYGWIN__ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef ecvt -# define ecvt _ecvt -# endif +# if defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef ecvt +# define ecvt _ecvt +# endif _GL_CXXALIAS_MDA (ecvt, char *, (double number, int ndigits, int *decptp, int *signp)); -#else -# if @HAVE_DECL_ECVT@ +# else +# if @HAVE_DECL_ECVT@ _GL_CXXALIAS_SYS (ecvt, char *, (double number, int ndigits, int *decptp, int *signp)); +# endif # endif -#endif -#if (defined _WIN32 && !defined __CYGWIN__) || @HAVE_DECL_ECVT@ +# if (defined _WIN32 && !defined __CYGWIN__) || @HAVE_DECL_ECVT@ _GL_CXXALIASWARN (ecvt); +# endif #endif +#if @GNULIB_MDA_FCVT@ /* On native Windows, map 'fcvt' to '_fcvt', so that -loldnames is not required. In C++ with GNULIB_NAMESPACE, avoid differences between platforms by defining GNULIB_NAMESPACE::fcvt on all platforms that have it. */ -#if defined _WIN32 && !defined __CYGWIN__ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef fcvt -# define fcvt _fcvt -# endif +# if defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef fcvt +# define fcvt _fcvt +# endif _GL_CXXALIAS_MDA (fcvt, char *, (double number, int ndigits, int *decptp, int *signp)); -#else -# if @HAVE_DECL_FCVT@ +# else +# if @HAVE_DECL_FCVT@ _GL_CXXALIAS_SYS (fcvt, char *, (double number, int ndigits, int *decptp, int *signp)); +# endif # endif -#endif -#if (defined _WIN32 && !defined __CYGWIN__) || @HAVE_DECL_FCVT@ +# if (defined _WIN32 && !defined __CYGWIN__) || @HAVE_DECL_FCVT@ _GL_CXXALIASWARN (fcvt); +# endif #endif #if @GNULIB_FREE_POSIX@ @@ -305,23 +309,25 @@ _GL_WARN_ON_USE (free, "free is not future POSIX compliant everywhere - " "use gnulib module free for portability"); #endif +#if @GNULIB_MDA_GCVT@ /* On native Windows, map 'gcvt' to '_gcvt', so that -loldnames is not required. In C++ with GNULIB_NAMESPACE, avoid differences between platforms by defining GNULIB_NAMESPACE::gcvt on all platforms that have it. */ -#if defined _WIN32 && !defined __CYGWIN__ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef gcvt -# define gcvt _gcvt -# endif +# if defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef gcvt +# define gcvt _gcvt +# endif _GL_CXXALIAS_MDA (gcvt, char *, (double number, int ndigits, char *buf)); -#else -# if @HAVE_DECL_GCVT@ +# else +# if @HAVE_DECL_GCVT@ _GL_CXXALIAS_SYS (gcvt, char *, (double number, int ndigits, char *buf)); +# endif # endif -#endif -#if (defined _WIN32 && !defined __CYGWIN__) || @HAVE_DECL_GCVT@ +# if (defined _WIN32 && !defined __CYGWIN__) || @HAVE_DECL_GCVT@ _GL_CXXALIASWARN (gcvt); +# endif #endif #if @GNULIB_GETLOADAVG@ @@ -575,19 +581,21 @@ _GL_WARN_ON_USE (mkstemps, "mkstemps is unportable - " # endif #endif +#if @GNULIB_MDA_MKTEMP@ /* On native Windows, map 'mktemp' to '_mktemp', so that -loldnames is not required. In C++ with GNULIB_NAMESPACE, avoid differences between platforms by defining GNULIB_NAMESPACE::mktemp always. */ -#if defined _WIN32 && !defined __CYGWIN__ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef mktemp -# define mktemp _mktemp -# endif +# if defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef mktemp +# define mktemp _mktemp +# endif _GL_CXXALIAS_MDA (mktemp, char *, (char * /*template*/)); -#else +# else _GL_CXXALIAS_SYS (mktemp, char *, (char * /*template*/)); -#endif +# endif _GL_CXXALIASWARN (mktemp); +#endif /* Allocate memory with indefinite extent and specified alignment. */ #if @GNULIB_POSIX_MEMALIGN@ @@ -706,7 +714,7 @@ _GL_CXXALIAS_MDA (putenv, int, (char *string)); _GL_CXXALIAS_SYS (putenv, int, (char *string)); # endif _GL_CXXALIASWARN (putenv); -#else +#elif @GNULIB_MDA_PUTENV@ /* On native Windows, map 'putenv' to '_putenv', so that -loldnames is not required. In C++ with GNULIB_NAMESPACE, avoid differences between platforms by defining GNULIB_NAMESPACE::putenv always. */ diff --git a/lib/stpcpy.c b/lib/stpcpy.c index 58265f0b797..a4165ba4bf9 100644 --- a/lib/stpcpy.c +++ b/lib/stpcpy.c @@ -1,5 +1,5 @@ /* stpcpy.c -- copy a string and return pointer to end of new string - Copyright (C) 1992, 1995, 1997-1998, 2006, 2009-2020 Free Software + Copyright (C) 1992, 1995, 1997-1998, 2006, 2009-2021 Free Software Foundation, Inc. NOTE: The canonical source of this file is maintained with the GNU C Library. diff --git a/lib/str-two-way.h b/lib/str-two-way.h index 6ad0130fad0..005a19fb513 100644 --- a/lib/str-two-way.h +++ b/lib/str-two-way.h @@ -1,5 +1,5 @@ /* Byte-wise substring search, using the Two-Way algorithm. - Copyright (C) 2008-2020 Free Software Foundation, Inc. + Copyright (C) 2008-2021 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Eric Blake <ebb9@byu.net>, 2008. diff --git a/lib/strftime.h b/lib/strftime.h index fe0c4195a59..7284f67133c 100644 --- a/lib/strftime.h +++ b/lib/strftime.h @@ -1,6 +1,6 @@ /* declarations for strftime.c - Copyright (C) 2002, 2004, 2008-2020 Free Software Foundation, Inc. + Copyright (C) 2002, 2004, 2008-2021 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/lib/string.in.h b/lib/string.in.h index f34bfabfb99..9f68e77c767 100644 --- a/lib/string.in.h +++ b/lib/string.in.h @@ -1,6 +1,6 @@ /* A GNU-like <string.h>. - Copyright (C) 1995-1996, 2001-2020 Free Software Foundation, Inc. + Copyright (C) 1995-1996, 2001-2021 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 @@ -123,21 +123,23 @@ _GL_WARN_ON_USE (ffsll, "ffsll is not portable - use the ffsll module"); #endif +#if @GNULIB_MDA_MEMCCPY@ /* On native Windows, map 'memccpy' to '_memccpy', so that -loldnames is not required. In C++ with GNULIB_NAMESPACE, avoid differences between platforms by defining GNULIB_NAMESPACE::memccpy always. */ -#if defined _WIN32 && !defined __CYGWIN__ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef memccpy -# define memccpy _memccpy -# endif +# if defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef memccpy +# define memccpy _memccpy +# endif _GL_CXXALIAS_MDA (memccpy, void *, (void *dest, const void *src, int c, size_t n)); -#else +# else _GL_CXXALIAS_SYS (memccpy, void *, (void *dest, const void *src, int c, size_t n)); -#endif +# endif _GL_CXXALIASWARN (memccpy); +#endif /* Return the first instance of C within N bytes of S, or NULL. */ @@ -425,7 +427,7 @@ _GL_CXXALIASWARN (strdup); _GL_WARN_ON_USE (strdup, "strdup is unportable - " "use gnulib module strdup for portability"); # endif -#else +#elif @GNULIB_MDA_STRDUP@ /* On native Windows, map 'creat' to '_creat', so that -loldnames is not required. In C++ with GNULIB_NAMESPACE, avoid differences between platforms by defining GNULIB_NAMESPACE::creat always. */ diff --git a/lib/strnlen.c b/lib/strnlen.c index dcecf0820df..c27a0392c2b 100644 --- a/lib/strnlen.c +++ b/lib/strnlen.c @@ -1,5 +1,5 @@ /* Find the length of STRING, but scan at most MAXLEN characters. - Copyright (C) 2005-2007, 2009-2020 Free Software Foundation, Inc. + Copyright (C) 2005-2007, 2009-2021 Free Software Foundation, Inc. Written by Simon Josefsson. This program is free software; you can redistribute it and/or modify diff --git a/lib/strtoimax.c b/lib/strtoimax.c index a17b2f0a9d7..37a25c31d44 100644 --- a/lib/strtoimax.c +++ b/lib/strtoimax.c @@ -1,6 +1,6 @@ /* Convert string representation of a number into an intmax_t value. - Copyright (C) 1999, 2001-2004, 2006, 2009-2020 Free Software Foundation, + Copyright (C) 1999, 2001-2004, 2006, 2009-2021 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/strtol.c b/lib/strtol.c index 02aafca44ea..2f2159b6231 100644 --- a/lib/strtol.c +++ b/lib/strtol.c @@ -1,6 +1,6 @@ /* Convert string representation of a number into an integer value. - Copyright (C) 1991-1992, 1994-1999, 2003, 2005-2007, 2009-2020 Free Software + Copyright (C) 1991-1992, 1994-1999, 2003, 2005-2007, 2009-2021 Free Software Foundation, Inc. NOTE: The canonical source of this file is maintained with the GNU C diff --git a/lib/strtoll.c b/lib/strtoll.c index 3c7e8c002f0..30daefc50f6 100644 --- a/lib/strtoll.c +++ b/lib/strtoll.c @@ -1,5 +1,5 @@ /* Function to parse a 'long long int' from text. - Copyright (C) 1995-1997, 1999, 2001, 2009-2020 Free Software Foundation, + Copyright (C) 1995-1997, 1999, 2001, 2009-2021 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/lib/symlink.c b/lib/symlink.c index b1196b9ee85..2f6c0d484b8 100644 --- a/lib/symlink.c +++ b/lib/symlink.c @@ -1,5 +1,5 @@ /* Stub for symlink(). - Copyright (C) 2009-2020 Free Software Foundation, Inc. + Copyright (C) 2009-2021 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/lib/sys_random.in.h b/lib/sys_random.in.h index a82d716de2e..5b9280dda36 100644 --- a/lib/sys_random.in.h +++ b/lib/sys_random.in.h @@ -1,5 +1,5 @@ /* Substitute for <sys/random.h>. - Copyright (C) 2020 Free Software Foundation, Inc. + Copyright (C) 2020-2021 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/lib/sys_select.in.h b/lib/sys_select.in.h index ac1e93919b7..1dacb21087d 100644 --- a/lib/sys_select.in.h +++ b/lib/sys_select.in.h @@ -1,5 +1,5 @@ /* Substitute for <sys/select.h>. - Copyright (C) 2007-2020 Free Software Foundation, Inc. + Copyright (C) 2007-2021 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/lib/sys_stat.in.h b/lib/sys_stat.in.h index 3ce2a0dcf15..ccdb5cbd143 100644 --- a/lib/sys_stat.in.h +++ b/lib/sys_stat.in.h @@ -1,5 +1,5 @@ /* Provide a more complete sys/stat.h header file. - Copyright (C) 2005-2020 Free Software Foundation, Inc. + Copyright (C) 2005-2021 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 @@ -391,20 +391,22 @@ struct stat #endif +#if @GNULIB_MDA_CHMOD@ /* On native Windows, map 'chmod' to '_chmod', so that -loldnames is not required. In C++ with GNULIB_NAMESPACE, avoid differences between platforms by defining GNULIB_NAMESPACE::chmod always. */ -#if defined _WIN32 && !defined __CYGWIN__ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef chmod -# define chmod _chmod -# endif +# if defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef chmod +# define chmod _chmod +# endif /* Need to cast, because in mingw the last argument is 'int mode'. */ _GL_CXXALIAS_MDA_CAST (chmod, int, (const char *filename, mode_t mode)); -#else +# else _GL_CXXALIAS_SYS (chmod, int, (const char *filename, mode_t mode)); -#endif +# endif _GL_CXXALIASWARN (chmod); +#endif #if @GNULIB_FCHMODAT@ @@ -606,21 +608,20 @@ _GL_WARN_ON_USE (lstat, "lstat is unportable - " #endif -#if @REPLACE_MKDIR@ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef mkdir -# define mkdir rpl_mkdir -# endif +#if @GNULIB_MKDIR@ +# if @REPLACE_MKDIR@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef mkdir +# define mkdir rpl_mkdir +# endif _GL_FUNCDECL_RPL (mkdir, int, (char const *name, mode_t mode) - _GL_ARG_NONNULL ((1))); + _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (mkdir, int, (char const *name, mode_t mode)); -#else +# elif defined _WIN32 && !defined __CYGWIN__ /* mingw's _mkdir() function has 1 argument, but we pass 2 arguments. Additionally, it declares _mkdir (and depending on compile flags, an alias mkdir), only in the nonstandard includes <direct.h> and <io.h>, which are included above. */ -# if defined _WIN32 && ! defined __CYGWIN__ - # if !GNULIB_defined_rpl_mkdir static int rpl_mkdir (char const *name, mode_t mode) @@ -629,16 +630,44 @@ rpl_mkdir (char const *name, mode_t mode) } # define GNULIB_defined_rpl_mkdir 1 # endif - # if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef mkdir +# define mkdir rpl_mkdir +# endif +_GL_CXXALIAS_RPL (mkdir, int, (char const *name, mode_t mode)); +# else +_GL_CXXALIAS_SYS (mkdir, int, (char const *name, mode_t mode)); +# endif +_GL_CXXALIASWARN (mkdir); +#elif defined GNULIB_POSIXCHECK +# undef mkdir +# if HAVE_RAW_DECL_MKDIR +_GL_WARN_ON_USE (mkdir, "mkdir does not always support two parameters - " + "use gnulib module mkdir for portability"); +# endif +#elif @GNULIB_MDA_MKDIR@ +/* On native Windows, map 'mkdir' to '_mkdir', so that -loldnames is not + required. In C++ with GNULIB_NAMESPACE, avoid differences between + platforms by defining GNULIB_NAMESPACE::mkdir always. */ +# if defined _WIN32 && !defined __CYGWIN__ +# if !GNULIB_defined_rpl_mkdir +static int +rpl_mkdir (char const *name, mode_t mode) +{ + return _mkdir (name); +} +# define GNULIB_defined_rpl_mkdir 1 +# endif +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef mkdir # define mkdir rpl_mkdir # endif _GL_CXXALIAS_RPL (mkdir, int, (char const *name, mode_t mode)); # else _GL_CXXALIAS_SYS (mkdir, int, (char const *name, mode_t mode)); # endif -#endif _GL_CXXALIASWARN (mkdir); +#endif #if @GNULIB_MKDIRAT@ @@ -818,20 +847,22 @@ _GL_WARN_ON_USE (stat, "stat is unportable - " #endif +#if @GNULIB_MDA_UMASK@ /* On native Windows, map 'umask' to '_umask', so that -loldnames is not required. In C++ with GNULIB_NAMESPACE, avoid differences between platforms by defining GNULIB_NAMESPACE::umask always. */ -#if defined _WIN32 && !defined __CYGWIN__ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef umask -# define umask _umask -# endif +# if defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef umask +# define umask _umask +# endif /* Need to cast, because in mingw the last argument is 'int mode'. */ _GL_CXXALIAS_MDA_CAST (umask, mode_t, (mode_t mask)); -#else +# else _GL_CXXALIAS_SYS (umask, mode_t, (mode_t mask)); -#endif +# endif _GL_CXXALIASWARN (umask); +#endif #if @GNULIB_UTIMENSAT@ diff --git a/lib/sys_time.in.h b/lib/sys_time.in.h index 1c12d5f13d7..90a67d18426 100644 --- a/lib/sys_time.in.h +++ b/lib/sys_time.in.h @@ -1,6 +1,6 @@ /* Provide a more complete sys/time.h. - Copyright (C) 2007-2020 Free Software Foundation, Inc. + Copyright (C) 2007-2021 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/lib/sys_types.in.h b/lib/sys_types.in.h index e7e1a22ee5e..654e80335fa 100644 --- a/lib/sys_types.in.h +++ b/lib/sys_types.in.h @@ -1,6 +1,6 @@ /* Provide a more complete sys/types.h. - Copyright (C) 2011-2020 Free Software Foundation, Inc. + Copyright (C) 2011-2021 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/lib/tempname.c b/lib/tempname.c index b9f7cc8703d..3d91deef1e1 100644 --- a/lib/tempname.c +++ b/lib/tempname.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-2020 Free Software Foundation, Inc. +/* Copyright (C) 1991-2021 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or diff --git a/lib/tempname.h b/lib/tempname.h index 00dcbe4c93b..a8681fc998e 100644 --- a/lib/tempname.h +++ b/lib/tempname.h @@ -1,6 +1,6 @@ /* Create a temporary file or directory. - Copyright (C) 2006, 2009-2020 Free Software Foundation, Inc. + Copyright (C) 2006, 2009-2021 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/lib/time-internal.h b/lib/time-internal.h index 8af3c2cbf8f..63a3f9e3db1 100644 --- a/lib/time-internal.h +++ b/lib/time-internal.h @@ -1,6 +1,6 @@ /* Time internal interface - Copyright 2015-2020 Free Software Foundation, Inc. + Copyright 2015-2021 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/lib/time.in.h b/lib/time.in.h index 1b17c156eba..958dc0bd292 100644 --- a/lib/time.in.h +++ b/lib/time.in.h @@ -1,6 +1,6 @@ /* A more-standard <time.h>. - Copyright (C) 2007-2020 Free Software Foundation, Inc. + Copyright (C) 2007-2021 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 @@ -145,7 +145,7 @@ _GL_CXXALIAS_MDA (tzset, void, (void)); _GL_CXXALIAS_SYS (tzset, void, (void)); # endif _GL_CXXALIASWARN (tzset); -# else +# elif @GNULIB_MDA_TZSET@ /* On native Windows, map 'tzset' to '_tzset', so that -loldnames is not required. In C++ with GNULIB_NAMESPACE, avoid differences between platforms by defining GNULIB_NAMESPACE::tzset always. */ diff --git a/lib/time_r.c b/lib/time_r.c index e8fca2d5c44..d9089868704 100644 --- a/lib/time_r.c +++ b/lib/time_r.c @@ -1,6 +1,6 @@ /* Reentrant time functions like localtime_r. - Copyright (C) 2003, 2006-2007, 2010-2020 Free Software Foundation, Inc. + Copyright (C) 2003, 2006-2007, 2010-2021 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/lib/time_rz.c b/lib/time_rz.c index 8992c2e37e0..65e20cc5661 100644 --- a/lib/time_rz.c +++ b/lib/time_rz.c @@ -1,6 +1,6 @@ /* Time zone functions such as tzalloc and localtime_rz - Copyright 2015-2020 Free Software Foundation, Inc. + Copyright 2015-2021 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/lib/timespec-add.c b/lib/timespec-add.c index 259c2e99ba2..5460a042cc7 100644 --- a/lib/timespec-add.c +++ b/lib/timespec-add.c @@ -1,6 +1,6 @@ /* Add two struct timespec values. - Copyright (C) 2011-2020 Free Software Foundation, Inc. + Copyright (C) 2011-2021 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/lib/timespec-sub.c b/lib/timespec-sub.c index ee827a741ad..88ef69a8175 100644 --- a/lib/timespec-sub.c +++ b/lib/timespec-sub.c @@ -1,6 +1,6 @@ /* Subtract two struct timespec values. - Copyright (C) 2011-2020 Free Software Foundation, Inc. + Copyright (C) 2011-2021 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/lib/timespec.h b/lib/timespec.h index dc999f944b2..9a71e9ea893 100644 --- a/lib/timespec.h +++ b/lib/timespec.h @@ -1,6 +1,6 @@ /* timespec -- System time interface - Copyright (C) 2000, 2002, 2004-2005, 2007, 2009-2020 Free Software + Copyright (C) 2000, 2002, 2004-2005, 2007, 2009-2021 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/u64.h b/lib/u64.h index a8d4d96fc2e..ad719c84f88 100644 --- a/lib/u64.h +++ b/lib/u64.h @@ -1,6 +1,6 @@ /* uint64_t-like operations that work even on hosts lacking uint64_t - Copyright (C) 2006, 2009-2020 Free Software Foundation, Inc. + Copyright (C) 2006, 2009-2021 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/lib/unistd.in.h b/lib/unistd.in.h index 4033ffeef72..5e9b47d981e 100644 --- a/lib/unistd.in.h +++ b/lib/unistd.in.h @@ -1,5 +1,5 @@ /* Substitute for and wrapper around <unistd.h>. - Copyright (C) 2003-2020 Free Software Foundation, Inc. + Copyright (C) 2003-2021 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 @@ -287,7 +287,7 @@ _GL_WARN_ON_USE (access, "access does not always support X_OK - " "also, this function is a security risk - " "use the gnulib module faccessat instead"); # endif -#else +#elif @GNULIB_MDA_ACCESS@ /* On native Windows, map 'access' to '_access', so that -loldnames is not required. In C++ with GNULIB_NAMESPACE, avoid differences between platforms by defining GNULIB_NAMESPACE::access always. */ @@ -321,7 +321,7 @@ _GL_CXXALIASWARN (chdir); _GL_WARN_ON_USE (chown, "chdir is not always in <unistd.h> - " "use gnulib module chdir for portability"); # endif -#else +#elif @GNULIB_MDA_CHDIR@ /* On native Windows, map 'chdir' to '_chdir', so that -loldnames is not required. In C++ with GNULIB_NAMESPACE, avoid differences between platforms by defining GNULIB_NAMESPACE::chdir always. */ @@ -397,7 +397,7 @@ _GL_CXXALIASWARN (close); /* Assume close is always declared. */ _GL_WARN_ON_USE (close, "close does not portably work on sockets - " "use gnulib module close for portability"); -#else +#elif @GNULIB_MDA_CLOSE@ /* On native Windows, map 'close' to '_close', so that -loldnames is not required. In C++ with GNULIB_NAMESPACE, avoid differences between platforms by defining GNULIB_NAMESPACE::close always. */ @@ -456,7 +456,7 @@ _GL_CXXALIASWARN (dup); _GL_WARN_ON_USE (dup, "dup is unportable - " "use gnulib module dup for portability"); # endif -#else +#elif @GNULIB_MDA_DUP@ /* On native Windows, map 'dup' to '_dup', so that -loldnames is not required. In C++ with GNULIB_NAMESPACE, avoid differences between platforms by defining GNULIB_NAMESPACE::dup always. */ @@ -501,7 +501,7 @@ _GL_CXXALIASWARN (dup2); _GL_WARN_ON_USE (dup2, "dup2 is unportable - " "use gnulib module dup2 for portability"); # endif -#else +#elif @GNULIB_MDA_DUP2@ /* On native Windows, map 'dup2' to '_dup2', so that -loldnames is not required. In C++ with GNULIB_NAMESPACE, avoid differences between platforms by defining GNULIB_NAMESPACE::dup2 always. */ @@ -615,116 +615,279 @@ _GL_WARN_ON_USE (euidaccess, "euidaccess is unportable - " #endif +#if @GNULIB_EXECL@ +# if @REPLACE_EXECL@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef execl +# define execl rpl_execl +# endif +_GL_FUNCDECL_RPL (execl, int, (const char *program, const char *arg, ...) + _GL_ARG_NONNULL ((1))); +_GL_CXXALIAS_RPL (execl, int, (const char *program, const char *arg, ...)); +# else +_GL_CXXALIAS_SYS (execl, int, (const char *program, const char *arg, ...)); +# endif +_GL_CXXALIASWARN (execl); +#elif defined GNULIB_POSIXCHECK +# undef execl +# if HAVE_RAW_DECL_EXECL +_GL_WARN_ON_USE (execl, "execl behaves very differently on mingw - " + "use gnulib module execl for portability"); +# endif +#elif @GNULIB_MDA_EXECL@ /* On native Windows, map 'execl' to '_execl', so that -loldnames is not required. In C++ with GNULIB_NAMESPACE, avoid differences between platforms by defining GNULIB_NAMESPACE::execl always. */ -#if defined _WIN32 && !defined __CYGWIN__ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef execl -# define execl _execl -# endif +# if defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef execl +# define execl _execl +# endif _GL_CXXALIAS_MDA (execl, intptr_t, (const char *program, const char *arg, ...)); -#else +# else _GL_CXXALIAS_SYS (execl, int, (const char *program, const char *arg, ...)); -#endif +# endif _GL_CXXALIASWARN (execl); +#endif +#if @GNULIB_EXECLE@ +# if @REPLACE_EXECLE@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef execle +# define execle rpl_execle +# endif +_GL_FUNCDECL_RPL (execle, int, (const char *program, const char *arg, ...) + _GL_ARG_NONNULL ((1))); +_GL_CXXALIAS_RPL (execle, int, (const char *program, const char *arg, ...)); +# else +_GL_CXXALIAS_SYS (execle, int, (const char *program, const char *arg, ...)); +# endif +_GL_CXXALIASWARN (execle); +#elif defined GNULIB_POSIXCHECK +# undef execle +# if HAVE_RAW_DECL_EXECLE +_GL_WARN_ON_USE (execle, "execle behaves very differently on mingw - " + "use gnulib module execle for portability"); +# endif +#elif @GNULIB_MDA_EXECLE@ /* On native Windows, map 'execle' to '_execle', so that -loldnames is not required. In C++ with GNULIB_NAMESPACE, avoid differences between platforms by defining GNULIB_NAMESPACE::execle always. */ -#if defined _WIN32 && !defined __CYGWIN__ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef execle -# define execle _execle -# endif -_GL_CXXALIAS_MDA (execle, intptr_t, (const char *program, const char *arg, ...)); -#else +# if defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef execle +# define execle _execle +# endif +_GL_CXXALIAS_MDA (execle, intptr_t, + (const char *program, const char *arg, ...)); +# else _GL_CXXALIAS_SYS (execle, int, (const char *program, const char *arg, ...)); -#endif +# endif _GL_CXXALIASWARN (execle); +#endif +#if @GNULIB_EXECLP@ +# if @REPLACE_EXECLP@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef execlp +# define execlp rpl_execlp +# endif +_GL_FUNCDECL_RPL (execlp, int, (const char *program, const char *arg, ...) + _GL_ARG_NONNULL ((1))); +_GL_CXXALIAS_RPL (execlp, int, (const char *program, const char *arg, ...)); +# else +_GL_CXXALIAS_SYS (execlp, int, (const char *program, const char *arg, ...)); +# endif +_GL_CXXALIASWARN (execlp); +#elif defined GNULIB_POSIXCHECK +# undef execlp +# if HAVE_RAW_DECL_EXECLP +_GL_WARN_ON_USE (execlp, "execlp behaves very differently on mingw - " + "use gnulib module execlp for portability"); +# endif +#elif @GNULIB_MDA_EXECLP@ /* On native Windows, map 'execlp' to '_execlp', so that -loldnames is not required. In C++ with GNULIB_NAMESPACE, avoid differences between platforms by defining GNULIB_NAMESPACE::execlp always. */ -#if defined _WIN32 && !defined __CYGWIN__ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef execlp -# define execlp _execlp -# endif -_GL_CXXALIAS_MDA (execlp, intptr_t, (const char *program, const char *arg, ...)); -#else +# if defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef execlp +# define execlp _execlp +# endif +_GL_CXXALIAS_MDA (execlp, intptr_t, + (const char *program, const char *arg, ...)); +# else _GL_CXXALIAS_SYS (execlp, int, (const char *program, const char *arg, ...)); -#endif +# endif _GL_CXXALIASWARN (execlp); +#endif +#if @GNULIB_EXECV@ +# if @REPLACE_EXECV@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef execv +# define execv rpl_execv +# endif +_GL_FUNCDECL_RPL (execv, int, (const char *program, char * const *argv) + _GL_ARG_NONNULL ((1, 2))); +_GL_CXXALIAS_RPL (execv, int, (const char *program, char * const *argv)); +# else +_GL_CXXALIAS_SYS (execv, int, (const char *program, char * const *argv)); +# endif +_GL_CXXALIASWARN (execv); +#elif defined GNULIB_POSIXCHECK +# undef execv +# if HAVE_RAW_DECL_EXECV +_GL_WARN_ON_USE (execv, "execv behaves very differently on mingw - " + "use gnulib module execv for portability"); +# endif +#elif @GNULIB_MDA_EXECV@ /* On native Windows, map 'execv' to '_execv', so that -loldnames is not required. In C++ with GNULIB_NAMESPACE, avoid differences between platforms by defining GNULIB_NAMESPACE::execv always. */ -#if defined _WIN32 && !defined __CYGWIN__ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef execv -# define execv _execv -# endif -_GL_CXXALIAS_MDA (execv, intptr_t, - (const char *program, const char * const *argv)); -#else +# if defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef execv +# define execv _execv +# endif +_GL_CXXALIAS_MDA_CAST (execv, intptr_t, + (const char *program, char * const *argv)); +# else _GL_CXXALIAS_SYS (execv, int, (const char *program, char * const *argv)); -#endif +# endif _GL_CXXALIASWARN (execv); +#endif +#if @GNULIB_EXECVE@ +# if @REPLACE_EXECVE@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef execve +# define execve rpl_execve +# endif +_GL_FUNCDECL_RPL (execve, int, + (const char *program, char * const *argv, char * const *env) + _GL_ARG_NONNULL ((1, 2))); +_GL_CXXALIAS_RPL (execve, int, + (const char *program, char * const *argv, char * const *env)); +# else +_GL_CXXALIAS_SYS (execve, int, + (const char *program, char * const *argv, char * const *env)); +# endif +_GL_CXXALIASWARN (execve); +#elif defined GNULIB_POSIXCHECK +# undef execve +# if HAVE_RAW_DECL_EXECVE +_GL_WARN_ON_USE (execve, "execve behaves very differently on mingw - " + "use gnulib module execve for portability"); +# endif +#elif @GNULIB_MDA_EXECVE@ /* On native Windows, map 'execve' to '_execve', so that -loldnames is not required. In C++ with GNULIB_NAMESPACE, avoid differences between platforms by defining GNULIB_NAMESPACE::execve always. */ -#if defined _WIN32 && !defined __CYGWIN__ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef execve -# define execve _execve -# endif -_GL_CXXALIAS_MDA (execve, intptr_t, - (const char *program, const char * const *argv, - const char * const *env)); -#else +# if defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef execve +# define execve _execve +# endif +_GL_CXXALIAS_MDA_CAST (execve, intptr_t, + (const char *program, char * const *argv, + char * const *env)); +# else _GL_CXXALIAS_SYS (execve, int, (const char *program, char * const *argv, char * const *env)); -#endif +# endif _GL_CXXALIASWARN (execve); +#endif +#if @GNULIB_EXECVP@ +# if @REPLACE_EXECVP@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef execvp +# define execvp rpl_execvp +# endif +_GL_FUNCDECL_RPL (execvp, int, (const char *program, char * const *argv) + _GL_ARG_NONNULL ((1, 2))); +_GL_CXXALIAS_RPL (execvp, int, (const char *program, char * const *argv)); +# else +_GL_CXXALIAS_SYS (execvp, int, (const char *program, char * const *argv)); +# endif +_GL_CXXALIASWARN (execvp); +#elif defined GNULIB_POSIXCHECK +# undef execvp +# if HAVE_RAW_DECL_EXECVP +_GL_WARN_ON_USE (execvp, "execvp behaves very differently on mingw - " + "use gnulib module execvp for portability"); +# endif +#elif @GNULIB_MDA_EXECVP@ /* On native Windows, map 'execvp' to '_execvp', so that -loldnames is not required. In C++ with GNULIB_NAMESPACE, avoid differences between platforms by defining GNULIB_NAMESPACE::execvp always. */ -#if defined _WIN32 && !defined __CYGWIN__ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef execvp -# define execvp _execvp -# endif -_GL_CXXALIAS_MDA (execvp, intptr_t, - (const char *program, const char * const *argv)); -#else +# if defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef execvp +# define execvp _execvp +# endif +_GL_CXXALIAS_MDA_CAST (execvp, intptr_t, + (const char *program, char * const *argv)); +# else _GL_CXXALIAS_SYS (execvp, int, (const char *program, char * const *argv)); -#endif +# endif _GL_CXXALIASWARN (execvp); +#endif +#if @GNULIB_EXECVPE@ +# if @REPLACE_EXECVPE@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef execvpe +# define execvpe rpl_execvpe +# endif +_GL_FUNCDECL_RPL (execvpe, int, + (const char *program, char * const *argv, char * const *env) + _GL_ARG_NONNULL ((1, 2))); +_GL_CXXALIAS_RPL (execvpe, int, + (const char *program, char * const *argv, char * const *env)); +# else +# if !@HAVE_DECL_EXECVPE@ +_GL_FUNCDECL_SYS (execvpe, int, + (const char *program, char * const *argv, char * const *env) + _GL_ARG_NONNULL ((1, 2))); +# endif +_GL_CXXALIAS_SYS (execvpe, int, + (const char *program, char * const *argv, char * const *env)); +# endif +_GL_CXXALIASWARN (execvpe); +#elif defined GNULIB_POSIXCHECK +# undef execvpe +# if HAVE_RAW_DECL_EXECVPE +_GL_WARN_ON_USE (execvpe, "execvpe behaves very differently on mingw - " + "use gnulib module execvpe for portability"); +# endif +#elif @GNULIB_MDA_EXECVPE@ /* On native Windows, map 'execvpe' to '_execvpe', so that -loldnames is not required. In C++ with GNULIB_NAMESPACE, avoid differences between platforms by defining GNULIB_NAMESPACE::execvpe on all platforms that have it. */ -#if defined _WIN32 && !defined __CYGWIN__ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef execvpe -# define execvpe _execvpe -# endif -_GL_CXXALIAS_MDA (execvpe, intptr_t, - (const char *program, const char * const *argv, - const char * const *env)); -#else -# if @HAVE_DECL_EXECVPE@ +# if defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef execvpe +# define execvpe _execvpe +# endif +_GL_CXXALIAS_MDA_CAST (execvpe, intptr_t, + (const char *program, char * const *argv, + char * const *env)); +# elif @HAVE_EXECVPE@ +# if !@HAVE_DECL_EXECVPE@ +_GL_FUNCDECL_SYS (execvpe, int, + (const char *program, char * const *argv, char * const *env) + _GL_ARG_NONNULL ((1, 2))); +# endif _GL_CXXALIAS_SYS (execvpe, int, (const char *program, char * const *argv, char * const *env)); # endif -#endif -#if (defined _WIN32 && !defined __CYGWIN__) || @HAVE_DECL_EXECVPE@ +# if (defined _WIN32 && !defined __CYGWIN__) || @HAVE_EXECVPE@ _GL_CXXALIASWARN (execvpe); +# endif #endif @@ -815,7 +978,7 @@ _GL_CXXALIASWARN (fchownat); # undef fchownat # if HAVE_RAW_DECL_FCHOWNAT _GL_WARN_ON_USE (fchownat, "fchownat is not portable - " - "use gnulib module openat for portability"); + "use gnulib module fchownat for portability"); # endif #endif @@ -921,7 +1084,7 @@ _GL_CXXALIASWARN (getcwd); _GL_WARN_ON_USE (getcwd, "getcwd is unportable - " "use gnulib module getcwd for portability"); # endif -#else +#elif @GNULIB_MDA_GETCWD@ /* On native Windows, map 'getcwd' to '_getcwd', so that -loldnames is not required. In C++ with GNULIB_NAMESPACE, avoid differences between platforms by defining GNULIB_NAMESPACE::getcwd always. */ @@ -1271,19 +1434,21 @@ _GL_WARN_ON_USE (getpass, "getpass is unportable - " #endif +#if @GNULIB_MDA_GETPID@ /* On native Windows, map 'getpid' to '_getpid', so that -loldnames is not required. In C++ with GNULIB_NAMESPACE, avoid differences between platforms by defining GNULIB_NAMESPACE::getpid always. */ -#if defined _WIN32 && !defined __CYGWIN__ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef getpid -# define getpid _getpid -# endif +# if defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef getpid +# define getpid _getpid +# endif _GL_CXXALIAS_MDA (getpid, int, (void)); -#else +# else _GL_CXXALIAS_SYS (getpid, pid_t, (void)); -#endif +# endif _GL_CXXALIASWARN (getpid); +#endif #if @GNULIB_GETUSERSHELL@ @@ -1374,7 +1539,7 @@ _GL_CXXALIASWARN (isatty); _GL_WARN_ON_USE (isatty, "isatty has portability problems on native Windows - " "use gnulib module isatty for portability"); # endif -#else +#elif @GNULIB_MDA_ISATTY@ /* On native Windows, map 'isatty' to '_isatty', so that -loldnames is not required. In C++ with GNULIB_NAMESPACE, avoid differences between platforms by defining GNULIB_NAMESPACE::isatty always. */ @@ -1515,7 +1680,7 @@ _GL_CXXALIASWARN (lseek); _GL_WARN_ON_USE (lseek, "lseek does not fail with ESPIPE on pipes on some " "systems - use gnulib module lseek for portability"); # endif -#else +#elif @GNULIB_MDA_LSEEK@ /* On native Windows, map 'lseek' to '_lseek', so that -loldnames is not required. In C++ with GNULIB_NAMESPACE, avoid differences between platforms by defining GNULIB_NAMESPACE::lseek always. */ @@ -1671,7 +1836,7 @@ _GL_CXXALIAS_MDA (read, ssize_t, (int fd, void *buf, size_t count)); _GL_CXXALIAS_SYS (read, ssize_t, (int fd, void *buf, size_t count)); # endif _GL_CXXALIASWARN (read); -#else +#elif @GNULIB_MDA_READ@ /* On native Windows, map 'read' to '_read', so that -loldnames is not required. In C++ with GNULIB_NAMESPACE, avoid differences between platforms by defining GNULIB_NAMESPACE::read always. */ @@ -1787,7 +1952,7 @@ _GL_CXXALIASWARN (rmdir); _GL_WARN_ON_USE (rmdir, "rmdir is unportable - " "use gnulib module rmdir for portability"); # endif -#else +#elif @GNULIB_MDA_RMDIR@ /* On native Windows, map 'rmdir' to '_rmdir', so that -loldnames is not required. In C++ with GNULIB_NAMESPACE, avoid differences between platforms by defining GNULIB_NAMESPACE::rmdir always. */ @@ -1859,19 +2024,21 @@ _GL_WARN_ON_USE (sleep, "sleep is unportable - " #endif +#if @GNULIB_MDA_SWAB@ /* On native Windows, map 'swab' to '_swab', so that -loldnames is not required. In C++ with GNULIB_NAMESPACE, avoid differences between platforms by defining GNULIB_NAMESPACE::creat always. */ -#if defined _WIN32 && !defined __CYGWIN__ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef swab -# define swab _swab -# endif +# if defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef swab +# define swab _swab +# endif _GL_CXXALIAS_MDA (swab, void, (char *from, char *to, int n)); -#else +# else _GL_CXXALIAS_SYS (swab, void, (const void *from, void *to, ssize_t n)); -#endif +# endif _GL_CXXALIASWARN (swab); +#endif #if @GNULIB_SYMLINK@ @@ -2014,7 +2181,7 @@ _GL_CXXALIASWARN (unlink); _GL_WARN_ON_USE (unlink, "unlink is not portable - " "use gnulib module unlink for portability"); # endif -#else +#elif @GNULIB_MDA_UNLINK@ /* On native Windows, map 'unlink' to '_unlink', so that -loldnames is not required. In C++ with GNULIB_NAMESPACE, avoid differences between platforms by defining GNULIB_NAMESPACE::unlink always. */ @@ -2052,7 +2219,7 @@ _GL_CXXALIASWARN (unlinkat); # undef unlinkat # if HAVE_RAW_DECL_UNLINKAT _GL_WARN_ON_USE (unlinkat, "unlinkat is not portable - " - "use gnulib module openat for portability"); + "use gnulib module unlinkat for portability"); # endif #endif @@ -2109,7 +2276,7 @@ _GL_CXXALIAS_MDA (write, ssize_t, (int fd, const void *buf, size_t count)); _GL_CXXALIAS_SYS (write, ssize_t, (int fd, const void *buf, size_t count)); # endif _GL_CXXALIASWARN (write); -#else +#elif @GNULIB_MDA_WRITE@ /* On native Windows, map 'write' to '_write', so that -loldnames is not required. In C++ with GNULIB_NAMESPACE, avoid differences between platforms by defining GNULIB_NAMESPACE::write always. */ diff --git a/lib/unlocked-io.h b/lib/unlocked-io.h index e7f7199edae..86b91c19dd2 100644 --- a/lib/unlocked-io.h +++ b/lib/unlocked-io.h @@ -1,6 +1,6 @@ /* Prefer faster, non-thread-safe stdio functions if available. - Copyright (C) 2001-2004, 2009-2020 Free Software Foundation, Inc. + Copyright (C) 2001-2004, 2009-2021 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/lib/utimens.c b/lib/utimens.c index 3f53942081d..5bbae058132 100644 --- a/lib/utimens.c +++ b/lib/utimens.c @@ -1,6 +1,6 @@ /* Set file access and modification times. - Copyright (C) 2003-2020 Free Software Foundation, Inc. + Copyright (C) 2003-2021 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 the diff --git a/lib/utimens.h b/lib/utimens.h index fc22c8ad53f..295d3d71cca 100644 --- a/lib/utimens.h +++ b/lib/utimens.h @@ -1,6 +1,6 @@ /* Set file access and modification times. - Copyright 2012-2020 Free Software Foundation, Inc. + Copyright 2012-2021 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 the diff --git a/lib/utimensat.c b/lib/utimensat.c index 63788d56480..2cea64f6982 100644 --- a/lib/utimensat.c +++ b/lib/utimensat.c @@ -1,5 +1,5 @@ /* Set the access and modification time of a file relative to directory fd. - Copyright (C) 2009-2020 Free Software Foundation, Inc. + Copyright (C) 2009-2021 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/lib/verify.h b/lib/verify.h index fa1ed717d0e..3cdcdca5671 100644 --- a/lib/verify.h +++ b/lib/verify.h @@ -1,6 +1,6 @@ /* Compile-time assert-like macros. - Copyright (C) 2005-2006, 2009-2020 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2009-2021 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/lib/vla.h b/lib/vla.h index 4af7567ed36..333b6264200 100644 --- a/lib/vla.h +++ b/lib/vla.h @@ -1,6 +1,6 @@ /* vla.h - variable length arrays - Copyright 2014-2020 Free Software Foundation, Inc. + Copyright 2014-2021 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/lib/warn-on-use.h b/lib/warn-on-use.h index 3f728d1a9dc..5d5b17f05be 100644 --- a/lib/warn-on-use.h +++ b/lib/warn-on-use.h @@ -1,5 +1,5 @@ /* A C macro for emitting warnings if a function is used. - Copyright (C) 2010-2020 Free Software Foundation, Inc. + Copyright (C) 2010-2021 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 diff --git a/lib/xalloc-oversized.h b/lib/xalloc-oversized.h index 7cd4a74f04d..53daf59663e 100644 --- a/lib/xalloc-oversized.h +++ b/lib/xalloc-oversized.h @@ -1,6 +1,6 @@ /* xalloc-oversized.h -- memory allocation size checking - Copyright (C) 1990-2000, 2003-2004, 2006-2020 Free Software Foundation, Inc. + Copyright (C) 1990-2000, 2003-2004, 2006-2021 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/lisp/ChangeLog.1 b/lisp/ChangeLog.1 index 5ef36f4b810..9fda59b63b1 100644 --- a/lisp/ChangeLog.1 +++ b/lisp/ChangeLog.1 @@ -3244,7 +3244,7 @@ Set current buffer variables from defaults in case user's init file has changed them. - Copyright (C) 1985-1986, 2001-2020 Free Software Foundation, Inc. + Copyright (C) 1985-1986, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lisp/ChangeLog.10 b/lisp/ChangeLog.10 index 177ca08ef3b..c8b0bdabc50 100644 --- a/lisp/ChangeLog.10 +++ b/lisp/ChangeLog.10 @@ -23541,7 +23541,7 @@ See ChangeLog.9 for earlier changes. ;; coding: utf-8 ;; End: - Copyright (C) 2001-2020 Free Software Foundation, Inc. + Copyright (C) 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lisp/ChangeLog.11 b/lisp/ChangeLog.11 index 374a5668932..0c72cb4c124 100644 --- a/lisp/ChangeLog.11 +++ b/lisp/ChangeLog.11 @@ -14321,7 +14321,7 @@ See ChangeLog.10 for earlier changes. ;; coding: utf-8 ;; End: - Copyright (C) 2003-2011, 2013-2020 Free Software Foundation, Inc. + Copyright (C) 2003-2011, 2013-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lisp/ChangeLog.12 b/lisp/ChangeLog.12 index 40aa8c4dc83..5d424570d83 100644 --- a/lisp/ChangeLog.12 +++ b/lisp/ChangeLog.12 @@ -33334,7 +33334,7 @@ See ChangeLog.11 for earlier changes. ;; add-log-time-zone-rule: t ;; End: - Copyright (C) 2005-2020 Free Software Foundation, Inc. + Copyright (C) 2005-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lisp/ChangeLog.13 b/lisp/ChangeLog.13 index 1a2863afa97..d849bd88fcc 100644 --- a/lisp/ChangeLog.13 +++ b/lisp/ChangeLog.13 @@ -16697,7 +16697,7 @@ See ChangeLog.12 for earlier changes. ;; coding: utf-8 ;; End: - Copyright (C) 2007-2020 Free Software Foundation, Inc. + Copyright (C) 2007-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lisp/ChangeLog.14 b/lisp/ChangeLog.14 index e9c8a8ff8be..edd5bdb7f9c 100644 --- a/lisp/ChangeLog.14 +++ b/lisp/ChangeLog.14 @@ -20547,7 +20547,7 @@ See ChangeLog.13 for earlier changes. ;; coding: utf-8 ;; End: - Copyright (C) 2008-2020 Free Software Foundation, Inc. + Copyright (C) 2008-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lisp/ChangeLog.15 b/lisp/ChangeLog.15 index 3a578da4bc7..bd1fbe61ad1 100644 --- a/lisp/ChangeLog.15 +++ b/lisp/ChangeLog.15 @@ -22802,7 +22802,7 @@ See ChangeLog.14 for earlier changes. ;; coding: utf-8 ;; End: - Copyright (C) 2009-2020 Free Software Foundation, Inc. + Copyright (C) 2009-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lisp/ChangeLog.16 b/lisp/ChangeLog.16 index bb7389c5b71..67b62767ed4 100644 --- a/lisp/ChangeLog.16 +++ b/lisp/ChangeLog.16 @@ -25223,7 +25223,7 @@ See ChangeLog.15 for earlier changes. ;; coding: utf-8 ;; End: - Copyright (C) 2011-2020 Free Software Foundation, Inc. + Copyright (C) 2011-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lisp/ChangeLog.17 b/lisp/ChangeLog.17 index 5789445fcd6..14a6c5d06e4 100644 --- a/lisp/ChangeLog.17 +++ b/lisp/ChangeLog.17 @@ -26294,7 +26294,7 @@ See ChangeLog.16 for earlier changes. ;; coding: utf-8 ;; End: - Copyright (C) 2011-2020 Free Software Foundation, Inc. + Copyright (C) 2011-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lisp/ChangeLog.2 b/lisp/ChangeLog.2 index 274ee991911..ea6ddbb70a9 100644 --- a/lisp/ChangeLog.2 +++ b/lisp/ChangeLog.2 @@ -3992,7 +3992,7 @@ See ChangeLog.1 for earlier changes. - Copyright (C) 1986-1988, 2001-2020 Free Software Foundation, Inc. + Copyright (C) 1986-1988, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lisp/ChangeLog.3 b/lisp/ChangeLog.3 index ef0e423d145..a4470b9cfda 100644 --- a/lisp/ChangeLog.3 +++ b/lisp/ChangeLog.3 @@ -12433,7 +12433,7 @@ See ChangeLog.2 for earlier changes. ;; coding: utf-8 ;; End: - Copyright (C) 1989, 1993, 2001-2020 Free Software Foundation, Inc. + Copyright (C) 1989, 1993, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lisp/ChangeLog.4 b/lisp/ChangeLog.4 index 1f64650bfd3..47a8bfdff72 100644 --- a/lisp/ChangeLog.4 +++ b/lisp/ChangeLog.4 @@ -8934,7 +8934,7 @@ See ChangeLog.3 for earlier changes. ;; coding: utf-8 ;; End: - Copyright (C) 1993-1994, 2001-2020 Free Software Foundation, Inc. + Copyright (C) 1993-1994, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lisp/ChangeLog.5 b/lisp/ChangeLog.5 index cd092bde9e1..1a3a13c6bb0 100644 --- a/lisp/ChangeLog.5 +++ b/lisp/ChangeLog.5 @@ -9268,7 +9268,7 @@ See ChangeLog.4 for earlier changes. ;; coding: utf-8 ;; End: - Copyright (C) 1994-1995, 2001-2020 Free Software Foundation, Inc. + Copyright (C) 1994-1995, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lisp/ChangeLog.6 b/lisp/ChangeLog.6 index 87ae38b27e6..492dae18e01 100644 --- a/lisp/ChangeLog.6 +++ b/lisp/ChangeLog.6 @@ -8021,7 +8021,7 @@ See ChangeLog.5 for earlier changes. ;; coding: utf-8 ;; End: - Copyright (C) 1995-1996, 2001-2020 Free Software Foundation, Inc. + Copyright (C) 1995-1996, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lisp/ChangeLog.7 b/lisp/ChangeLog.7 index 58a7fa402ba..3de3f2f1571 100644 --- a/lisp/ChangeLog.7 +++ b/lisp/ChangeLog.7 @@ -23110,7 +23110,7 @@ See ChangeLog.6 for earlier changes. ;; coding: utf-8 ;; End: - Copyright (C) 1997-1998, 2001-2020 Free Software Foundation, + Copyright (C) 1997-1998, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lisp/ChangeLog.8 b/lisp/ChangeLog.8 index e9b2138e4ba..3027463e539 100644 --- a/lisp/ChangeLog.8 +++ b/lisp/ChangeLog.8 @@ -9992,7 +9992,7 @@ See ChangeLog.7 for earlier changes. ;; add-log-time-zone-rule: t ;; End: - Copyright (C) 1999, 2001-2020 Free Software Foundation, Inc. + Copyright (C) 1999, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lisp/ChangeLog.9 b/lisp/ChangeLog.9 index 5372b242f5f..a8ef2ffa447 100644 --- a/lisp/ChangeLog.9 +++ b/lisp/ChangeLog.9 @@ -20685,7 +20685,7 @@ See ChangeLog.8 for earlier changes. ;; coding: utf-8 ;; End: - Copyright (C) 2000-2011, 2013-2020 Free Software Foundation, Inc. + Copyright (C) 2000-2011, 2013-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lisp/Makefile.in b/lisp/Makefile.in index c6a1799e368..94de5462f2f 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in @@ -1,6 +1,6 @@ ### @configure_input@ -# Copyright (C) 2000-2020 Free Software Foundation, Inc. +# Copyright (C) 2000-2021 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/lisp/abbrev.el b/lisp/abbrev.el index f35c637eed5..65f71183856 100644 --- a/lisp/abbrev.el +++ b/lisp/abbrev.el @@ -1,6 +1,6 @@ ;;; abbrev.el --- abbrev mode commands for Emacs -*- lexical-binding: t -*- -;; Copyright (C) 1985-1987, 1992, 2001-2020 Free Software Foundation, +;; Copyright (C) 1985-1987, 1992, 2001-2021 Free Software Foundation, ;; Inc. ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/align.el b/lisp/align.el index a11d834b823..1318b735c05 100644 --- a/lisp/align.el +++ b/lisp/align.el @@ -1,6 +1,6 @@ ;;; align.el --- align text to a specific column, by regexp -*- lexical-binding:t -*- -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> ;; Maintainer: emacs-devel@gnu.org @@ -397,13 +397,12 @@ The possible settings for `align-region-separate' are: (modes . align-lisp-modes)) (open-comment - (regexp . ,(function - (lambda (end reverse) - (funcall (if reverse 're-search-backward - 're-search-forward) - (concat "[^ \t\n\\]" - (regexp-quote comment-start) - "\\(.+\\)$") end t)))) + (regexp . ,(lambda (end reverse) + (funcall (if reverse 're-search-backward + 're-search-forward) + (concat "[^ \t\n\\]" + (regexp-quote comment-start) + "\\(.+\\)$") end t))) (modes . align-open-comment-modes)) (c-macro-definition @@ -411,7 +410,7 @@ The possible settings for `align-region-separate' are: (modes . align-c++-modes)) (c-variable-declaration - (regexp . ,(concat "[*&0-9A-Za-z_]>?[&*]*\\(\\s-+[*&]*\\)" + (regexp . ,(concat "[*&0-9A-Za-z_]>?[][&*]*\\(\\s-+[*&]*\\)" "[A-Za-z_][][0-9A-Za-z:_]*\\s-*\\(\\()\\|" "=[^=\n].*\\|(.*)\\|\\(\\[.*\\]\\)*\\)" "\\s-*[;,]\\|)\\s-*$\\)")) @@ -419,17 +418,16 @@ The possible settings for `align-region-separate' are: (modes . align-c++-modes) (justify . t) (valid - . ,(function - (lambda () - (not (or (save-excursion - (goto-char (match-beginning 1)) - (backward-word 1) - (looking-at - "\\(goto\\|return\\|new\\|delete\\|throw\\)")) - (if (and (boundp 'font-lock-mode) font-lock-mode) - (eq (get-text-property (point) 'face) - 'font-lock-comment-face) - (eq (caar (c-guess-basic-syntax)) 'c)))))))) + . ,(lambda () + (not (or (save-excursion + (goto-char (match-beginning 1)) + (backward-word 1) + (looking-at + "\\(goto\\|return\\|new\\|delete\\|throw\\)")) + (if (and (boundp 'font-lock-mode) font-lock-mode) + (eq (get-text-property (point) 'face) + 'font-lock-comment-face) + (eq (caar (c-guess-basic-syntax)) 'c))))))) (c-assignment (regexp . ,(concat "[^-=!^&*+<>/| \t\n]\\(\\s-*[-=!^&*+<>/|]*\\)" @@ -465,12 +463,11 @@ The possible settings for `align-region-separate' are: (modes . align-c++-modes) (run-if . ,(lambda () current-prefix-arg))) ; (valid - ; . ,(function - ; (lambda () + ; . ,(lambda () ; (memq (caar (c-guess-basic-syntax)) ; '(brace-list-intro ; brace-list-entry - ; brace-entry-open)))))) + ; brace-entry-open))))) ;; With a prefix argument, comma delimiter will be aligned. Since ;; perl-mode doesn't give us enough syntactic information (and we @@ -486,71 +483,63 @@ The possible settings for `align-region-separate' are: (regexp . "\\(\\s-*\\)\\(//.*\\|/\\*.*\\*/\\s-*\\)$") (modes . align-c++-modes) (column . comment-column) - (valid . ,(function - (lambda () - (save-excursion - (goto-char (match-beginning 1)) - (not (bolp))))))) + (valid . ,(lambda () + (save-excursion + (goto-char (match-beginning 1)) + (not (bolp)))))) (c-chain-logic (regexp . "\\(\\s-*\\)\\(&&\\|||\\|\\<and\\>\\|\\<or\\>\\)") (modes . align-c++-modes) - (valid . ,(function - (lambda () - (save-excursion - (goto-char (match-end 2)) - (looking-at "\\s-*\\(/[*/]\\|$\\)")))))) + (valid . ,(lambda () + (save-excursion + (goto-char (match-end 2)) + (looking-at "\\s-*\\(/[*/]\\|$\\)"))))) (perl-chain-logic (regexp . "\\(\\s-*\\)\\(&&\\|||\\|\\<and\\>\\|\\<or\\>\\)") (modes . align-perl-modes) - (valid . ,(function - (lambda () - (save-excursion - (goto-char (match-end 2)) - (looking-at "\\s-*\\(#\\|$\\)")))))) + (valid . ,(lambda () + (save-excursion + (goto-char (match-end 2)) + (looking-at "\\s-*\\(#\\|$\\)"))))) (python-chain-logic (regexp . "\\(\\s-*\\)\\(\\<and\\>\\|\\<or\\>\\)") (modes . '(python-mode)) - (valid . ,(function - (lambda () - (save-excursion - (goto-char (match-end 2)) - (looking-at "\\s-*\\(#\\|$\\|\\\\\\)")))))) + (valid . ,(lambda () + (save-excursion + (goto-char (match-end 2)) + (looking-at "\\s-*\\(#\\|$\\|\\\\\\)"))))) (c-macro-line-continuation (regexp . "\\(\\s-*\\)\\\\$") (modes . align-c++-modes) (column . c-backslash-column)) ; (valid - ; . ,(function - ; (lambda () + ; . ,(lambda () ; (memq (caar (c-guess-basic-syntax)) - ; '(cpp-macro cpp-macro-cont)))))) + ; '(cpp-macro cpp-macro-cont))))) (basic-line-continuation (regexp . "\\(\\s-*\\)\\\\$") (modes . '(python-mode makefile-mode))) (tex-record-separator - (regexp . ,(function - (lambda (end reverse) - (align-match-tex-pattern "&" end reverse)))) + (regexp . ,(lambda (end reverse) + (align-match-tex-pattern "&" end reverse))) (group . (1 2)) (modes . align-tex-modes) (repeat . t)) (tex-tabbing-separator - (regexp . ,(function - (lambda (end reverse) - (align-match-tex-pattern "\\\\[=>]" end reverse)))) + (regexp . ,(lambda (end reverse) + (align-match-tex-pattern "\\\\[=>]" end reverse))) (group . (1 2)) (modes . align-tex-modes) (repeat . t) - (run-if . ,(function - (lambda () - (eq major-mode 'latex-mode))))) + (run-if . ,(lambda () + (eq major-mode 'latex-mode)))) (tex-record-break (regexp . "\\(\\s-*\\)\\\\\\\\") @@ -563,10 +552,9 @@ The possible settings for `align-region-separate' are: (group . 2) (modes . align-text-modes) (repeat . t) - (run-if . ,(function - (lambda () - (and current-prefix-arg - (not (eq '- current-prefix-arg))))))) + (run-if . ,(lambda () + (and current-prefix-arg + (not (eq '- current-prefix-arg)))))) ;; With a negative prefix argument, lists of dollar figures will ;; be aligned. @@ -574,9 +562,8 @@ The possible settings for `align-region-separate' are: (regexp . "\\$?\\(\\s-+[0-9]+\\)\\.") (modes . align-text-modes) (justify . t) - (run-if . ,(function - (lambda () - (eq '- current-prefix-arg))))) + (run-if . ,(lambda () + (eq '- current-prefix-arg)))) (css-declaration (regexp . "^\\s-*\\(?:\\w-?\\)+:\\(\\s-*\\).*;") @@ -757,13 +744,12 @@ The following attributes are meaningful: (exc-open-comment (regexp - . ,(function - (lambda (end reverse) - (funcall (if reverse 're-search-backward - 're-search-forward) - (concat "[^ \t\n\\]" - (regexp-quote comment-start) - "\\(.+\\)$") end t)))) + . ,(lambda (end reverse) + (funcall (if reverse 're-search-backward + 're-search-forward) + (concat "[^ \t\n\\]" + (regexp-quote comment-start) + "\\(.+\\)$") end t))) (modes . align-open-comment-modes)) (exc-c-comment @@ -817,10 +803,9 @@ See the variable `align-exclude-rules-list' for more details.") (regexp . "\\(others\\|[^ \t\n=<]\\)\\(\\s-*\\)=>\\(\\s-*\\)\\S-") (group . (2 3)) (valid - . ,(function - (lambda () - (not (string= (downcase (match-string 1)) - "others")))))) + . ,(lambda () + (not (string= (downcase (match-string 1)) + "others"))))) (vhdl-colon (regexp . "[^ \t\n:]\\(\\s-*\\):\\(\\s-*\\)[^=\n]") @@ -1022,21 +1007,20 @@ to be colored." (or align-mode-rules-list align-rules-list))) (unless ex-rule (or exclude-rules align-mode-exclude-rules-list align-exclude-rules-list)) - (function - (lambda (b e mode) - (if (and mode (listp mode)) - (if (equal (symbol-name (car mode)) title) - (setq face (cons align-highlight-change-face - align-highlight-nochange-face)) - (setq face nil)) - (when face - (let ((overlay (make-overlay b e))) - (setq align-highlight-overlays - (cons overlay align-highlight-overlays)) - (overlay-put overlay 'face - (if mode - (car face) - (cdr face))))))))))) + (lambda (b e mode) + (if (and mode (listp mode)) + (if (equal (symbol-name (car mode)) title) + (setq face (cons align-highlight-change-face + align-highlight-nochange-face)) + (setq face nil)) + (when face + (let ((overlay (make-overlay b e))) + (setq align-highlight-overlays + (cons overlay align-highlight-overlays)) + (overlay-put overlay 'face + (if mode + (car face) + (cdr face)))))))))) ;;;###autoload (defun align-unhighlight-rule () diff --git a/lisp/allout-widgets.el b/lisp/allout-widgets.el index 21517aea01c..d31083e4271 100644 --- a/lisp/allout-widgets.el +++ b/lisp/allout-widgets.el @@ -1,6 +1,6 @@ ;; allout-widgets.el --- Visually highlight allout outline structure. -;; Copyright (C) 2005-2020 Free Software Foundation, Inc. +;; Copyright (C) 2005-2021 Free Software Foundation, Inc. ;; Author: Ken Manheimer <ken dot manheimer at gmail...> ;; Version: 1.0 diff --git a/lisp/allout.el b/lisp/allout.el index 880098c515f..39aa29b664a 100644 --- a/lisp/allout.el +++ b/lisp/allout.el @@ -1,6 +1,6 @@ ;;; allout.el --- extensive outline mode for use alone and with other modes -;; Copyright (C) 1992-1994, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1992-1994, 2001-2021 Free Software Foundation, Inc. ;; Author: Ken Manheimer <ken dot manheimer at gmail...> ;; Created: Dec 1991 -- first release to usenet diff --git a/lisp/ansi-color.el b/lisp/ansi-color.el index d5432a60fba..e5bfccdb8ba 100644 --- a/lisp/ansi-color.el +++ b/lisp/ansi-color.el @@ -1,6 +1,6 @@ ;;; ansi-color.el --- translate ANSI escape sequences into faces -*- lexical-binding: t -*- -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: Alex Schroeder <alex@gnu.org> ;; Version: 3.4.2 diff --git a/lisp/apropos.el b/lisp/apropos.el index 97314cc489f..86cdf233be6 100644 --- a/lisp/apropos.el +++ b/lisp/apropos.el @@ -1,6 +1,6 @@ ;;; apropos.el --- apropos commands for users and programmers -*- lexical-binding: t -*- -;; Copyright (C) 1989, 1994-1995, 2001-2020 Free Software Foundation, +;; Copyright (C) 1989, 1994-1995, 2001-2021 Free Software Foundation, ;; Inc. ;; Author: Joe Wells <jbw@bigbird.bu.edu> diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el index 3516af68fc8..52908d9fb6b 100644 --- a/lisp/arc-mode.el +++ b/lisp/arc-mode.el @@ -1,6 +1,6 @@ ;;; arc-mode.el --- simple editing of archives -*- lexical-binding: t; -*- -;; Copyright (C) 1995, 1997-1998, 2001-2020 Free Software Foundation, +;; Copyright (C) 1995, 1997-1998, 2001-2021 Free Software Foundation, ;; Inc. ;; Author: Morten Welinder <terra@gnu.org> diff --git a/lisp/array.el b/lisp/array.el index de2de3ce6cb..cd8971bd266 100644 --- a/lisp/array.el +++ b/lisp/array.el @@ -1,6 +1,6 @@ ;;; array.el --- array editing commands for GNU Emacs -;; Copyright (C) 1987, 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 1987, 2000-2021 Free Software Foundation, Inc. ;; Author: David M. Brown ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/auth-source-pass.el b/lisp/auth-source-pass.el index ba66d0bb5df..39db1a710bd 100644 --- a/lisp/auth-source-pass.el +++ b/lisp/auth-source-pass.el @@ -1,6 +1,6 @@ ;;; auth-source-pass.el --- Integrate auth-source with password-store -*- lexical-binding: t -*- -;; Copyright (C) 2015, 2017-2020 Free Software Foundation, Inc. +;; Copyright (C) 2015, 2017-2021 Free Software Foundation, Inc. ;; Author: Damien Cassou <damien@cassou.me>, ;; Nicolas Petton <nicolas@petton.fr> diff --git a/lisp/auth-source.el b/lisp/auth-source.el index 27cf94d3786..ad3b690dfa6 100644 --- a/lisp/auth-source.el +++ b/lisp/auth-source.el @@ -1,6 +1,6 @@ ;;; auth-source.el --- authentication sources for Gnus and Emacs -*- lexical-binding: t -*- -;; Copyright (C) 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2008-2021 Free Software Foundation, Inc. ;; Author: Ted Zlatanov <tzz@lifelogs.com> ;; Keywords: news diff --git a/lisp/autoarg.el b/lisp/autoarg.el index d41527775f4..c2cb0c7051c 100644 --- a/lisp/autoarg.el +++ b/lisp/autoarg.el @@ -1,6 +1,6 @@ ;;; autoarg.el --- make digit keys supply prefix args -*- lexical-binding: t -*- -;; Copyright (C) 1998, 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998, 2000-2021 Free Software Foundation, Inc. ;; Author: Dave Love <fx@gnu.org> ;; Created: 1998-09-04 diff --git a/lisp/autoinsert.el b/lisp/autoinsert.el index 9bb485f55dc..0392903c332 100644 --- a/lisp/autoinsert.el +++ b/lisp/autoinsert.el @@ -1,6 +1,6 @@ ;;; autoinsert.el --- automatic mode-dependent insertion of text into new files -*- lexical-binding: t -*- -;; Copyright (C) 1985-1987, 1994-1995, 1998, 2000-2020 Free Software +;; Copyright (C) 1985-1987, 1994-1995, 1998, 2000-2021 Free Software ;; Foundation, Inc. ;; Author: Charlie Martin <crm@cs.duke.edu> diff --git a/lisp/autorevert.el b/lisp/autorevert.el index d5bb75c2f1e..1b2d68939ad 100644 --- a/lisp/autorevert.el +++ b/lisp/autorevert.el @@ -1,6 +1,6 @@ ;;; autorevert.el --- revert buffers when files on disk change -*- lexical-binding:t -*- -;; Copyright (C) 1997-1999, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997-1999, 2001-2021 Free Software Foundation, Inc. ;; Author: Anders Lindgren ;; Keywords: convenience diff --git a/lisp/avoid.el b/lisp/avoid.el index e94d5084021..b53584ba9c5 100644 --- a/lisp/avoid.el +++ b/lisp/avoid.el @@ -1,6 +1,6 @@ ;;; avoid.el --- make mouse pointer stay out of the way of editing -;; Copyright (C) 1993-1994, 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 1993-1994, 2000-2021 Free Software Foundation, Inc. ;; Author: Boris Goldowsky <boris@gnu.org> ;; Keywords: mouse diff --git a/lisp/battery.el b/lisp/battery.el index f59ad124794..77ad73d15d7 100644 --- a/lisp/battery.el +++ b/lisp/battery.el @@ -1,6 +1,6 @@ ;;; battery.el --- display battery status information -*- lexical-binding:t -*- -;; Copyright (C) 1997-1998, 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997-1998, 2000-2021 Free Software Foundation, Inc. ;; Author: Ralph Schleicher <rs@ralph-schleicher.de> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/bindings.el b/lisp/bindings.el index 250234e94c1..b68d55e73d8 100644 --- a/lisp/bindings.el +++ b/lisp/bindings.el @@ -1,6 +1,6 @@ ;;; bindings.el --- define standard key bindings and some variables -;; Copyright (C) 1985-1987, 1992-1996, 1999-2020 Free Software +;; Copyright (C) 1985-1987, 1992-1996, 1999-2021 Free Software ;; Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/bookmark.el b/lisp/bookmark.el index afcfd2e425d..c857c9ba7f0 100644 --- a/lisp/bookmark.el +++ b/lisp/bookmark.el @@ -1,6 +1,6 @@ ;;; bookmark.el --- set bookmarks, maybe annotate them, jump to them later -*- lexical-binding: t -*- -;; Copyright (C) 1993-1997, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1993-1997, 2001-2021 Free Software Foundation, Inc. ;; Author: Karl Fogel <kfogel@red-bean.com> ;; Created: July, 1993 diff --git a/lisp/bs.el b/lisp/bs.el index 337d22ecf83..9ed0ee5f0ae 100644 --- a/lisp/bs.el +++ b/lisp/bs.el @@ -1,6 +1,6 @@ ;;; bs.el --- menu for selecting and displaying buffers -*- lexical-binding: t -*- -;; Copyright (C) 1998-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998-2021 Free Software Foundation, Inc. ;; Author: Olaf Sylvester <Olaf.Sylvester@netsurf.de> ;; Maintainer: emacs-devel@gnu.org ;; Keywords: convenience diff --git a/lisp/buff-menu.el b/lisp/buff-menu.el index 5392519d718..49f8604f52e 100644 --- a/lisp/buff-menu.el +++ b/lisp/buff-menu.el @@ -1,6 +1,6 @@ ;;; buff-menu.el --- Interface for viewing and manipulating buffers -*- lexical-binding: t -*- -;; Copyright (C) 1985-1987, 1993-1995, 2000-2020 Free Software +;; Copyright (C) 1985-1987, 1993-1995, 2000-2021 Free Software ;; Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/button.el b/lisp/button.el index a6f70436f74..043de8eeb7b 100644 --- a/lisp/button.el +++ b/lisp/button.el @@ -1,6 +1,6 @@ ;;; button.el --- clickable buttons -*- lexical-binding: t -*- ;; -;; Copyright (C) 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 2001-2021 Free Software Foundation, Inc. ;; ;; Author: Miles Bader <miles@gnu.org> ;; Keywords: extensions, hypermedia diff --git a/lisp/calc/calc-aent.el b/lisp/calc/calc-aent.el index 338f0ea43e0..1e31c3cadc0 100644 --- a/lisp/calc/calc-aent.el +++ b/lisp/calc/calc-aent.el @@ -1,6 +1,6 @@ ;;; calc-aent.el --- algebraic entry functions for Calc -*- lexical-binding:t -*- -;; Copyright (C) 1990-1993, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1990-1993, 2001-2021 Free Software Foundation, Inc. ;; Author: Dave Gillespie <daveg@synaptics.com> diff --git a/lisp/calc/calc-alg.el b/lisp/calc/calc-alg.el index 53ca01d9516..1327cf0a39b 100644 --- a/lisp/calc/calc-alg.el +++ b/lisp/calc/calc-alg.el @@ -1,6 +1,6 @@ ;;; calc-alg.el --- algebraic functions for Calc -*- lexical-binding:t -*- -;; Copyright (C) 1990-1993, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1990-1993, 2001-2021 Free Software Foundation, Inc. ;; Author: David Gillespie <daveg@synaptics.com> diff --git a/lisp/calc/calc-arith.el b/lisp/calc/calc-arith.el index c11cecfd545..9787fe0d609 100644 --- a/lisp/calc/calc-arith.el +++ b/lisp/calc/calc-arith.el @@ -1,6 +1,6 @@ ;;; calc-arith.el --- arithmetic functions for Calc -*- lexical-binding:t -*- -;; Copyright (C) 1990-1993, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1990-1993, 2001-2021 Free Software Foundation, Inc. ;; Author: David Gillespie <daveg@synaptics.com> diff --git a/lisp/calc/calc-bin.el b/lisp/calc/calc-bin.el index 6d935872348..503ed777029 100644 --- a/lisp/calc/calc-bin.el +++ b/lisp/calc/calc-bin.el @@ -1,6 +1,6 @@ ;;; calc-bin.el --- binary functions for Calc -*- lexical-binding:t -*- -;; Copyright (C) 1990-1993, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1990-1993, 2001-2021 Free Software Foundation, Inc. ;; Author: David Gillespie <daveg@synaptics.com> diff --git a/lisp/calc/calc-comb.el b/lisp/calc/calc-comb.el index 0f6c40a663b..dc952213507 100644 --- a/lisp/calc/calc-comb.el +++ b/lisp/calc/calc-comb.el @@ -1,6 +1,6 @@ ;;; calc-comb.el --- combinatoric functions for Calc -*- lexical-binding:t -*- -;; Copyright (C) 1990-1993, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1990-1993, 2001-2021 Free Software Foundation, Inc. ;; Author: David Gillespie <daveg@synaptics.com> diff --git a/lisp/calc/calc-cplx.el b/lisp/calc/calc-cplx.el index 7438f63a90d..03462020ea2 100644 --- a/lisp/calc/calc-cplx.el +++ b/lisp/calc/calc-cplx.el @@ -1,6 +1,6 @@ ;;; calc-cplx.el --- Complex number functions for Calc -*- lexical-binding:t -*- -;; Copyright (C) 1990-1993, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1990-1993, 2001-2021 Free Software Foundation, Inc. ;; Author: David Gillespie <daveg@synaptics.com> diff --git a/lisp/calc/calc-embed.el b/lisp/calc/calc-embed.el index f9c5281c263..a1135726108 100644 --- a/lisp/calc/calc-embed.el +++ b/lisp/calc/calc-embed.el @@ -1,6 +1,6 @@ ;;; calc-embed.el --- embed Calc in a buffer -*- lexical-binding:t -*- -;; Copyright (C) 1990-1993, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1990-1993, 2001-2021 Free Software Foundation, Inc. ;; Author: David Gillespie <daveg@synaptics.com> diff --git a/lisp/calc/calc-ext.el b/lisp/calc/calc-ext.el index 7984c8bbaa2..7c319c4d654 100644 --- a/lisp/calc/calc-ext.el +++ b/lisp/calc/calc-ext.el @@ -1,6 +1,6 @@ ;;; calc-ext.el --- various extension functions for Calc -*- lexical-binding:t -*- -;; Copyright (C) 1990-1993, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1990-1993, 2001-2021 Free Software Foundation, Inc. ;; Author: David Gillespie <daveg@synaptics.com> diff --git a/lisp/calc/calc-fin.el b/lisp/calc/calc-fin.el index ea1ef24bb19..76bb53e7b10 100644 --- a/lisp/calc/calc-fin.el +++ b/lisp/calc/calc-fin.el @@ -1,6 +1,6 @@ ;;; calc-fin.el --- financial functions for Calc -*- lexical-binding:t -*- -;; Copyright (C) 1990-1993, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1990-1993, 2001-2021 Free Software Foundation, Inc. ;; Author: David Gillespie <daveg@synaptics.com> diff --git a/lisp/calc/calc-forms.el b/lisp/calc/calc-forms.el index 39116bfde99..ee53b94cd64 100644 --- a/lisp/calc/calc-forms.el +++ b/lisp/calc/calc-forms.el @@ -1,6 +1,6 @@ ;;; calc-forms.el --- data format conversion functions for Calc -*- lexical-binding:t -*- -;; Copyright (C) 1990-1993, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1990-1993, 2001-2021 Free Software Foundation, Inc. ;; Author: David Gillespie <daveg@synaptics.com> diff --git a/lisp/calc/calc-frac.el b/lisp/calc/calc-frac.el index 1d6895caa3a..bf3c16816db 100644 --- a/lisp/calc/calc-frac.el +++ b/lisp/calc/calc-frac.el @@ -1,6 +1,6 @@ ;;; calc-frac.el --- fraction functions for Calc -*- lexical-binding:t -*- -;; Copyright (C) 1990-1993, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1990-1993, 2001-2021 Free Software Foundation, Inc. ;; Author: David Gillespie <daveg@synaptics.com> diff --git a/lisp/calc/calc-funcs.el b/lisp/calc/calc-funcs.el index fd544f9719b..053fa2e5851 100644 --- a/lisp/calc/calc-funcs.el +++ b/lisp/calc/calc-funcs.el @@ -1,6 +1,6 @@ ;;; calc-funcs.el --- well-known functions for Calc -*- lexical-binding:t -*- -;; Copyright (C) 1990-1993, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1990-1993, 2001-2021 Free Software Foundation, Inc. ;; Author: David Gillespie <daveg@synaptics.com> diff --git a/lisp/calc/calc-graph.el b/lisp/calc/calc-graph.el index b694a826ce5..4785fb7fba2 100644 --- a/lisp/calc/calc-graph.el +++ b/lisp/calc/calc-graph.el @@ -1,6 +1,6 @@ ;;; calc-graph.el --- graph output functions for Calc -*- lexical-binding:t -*- -;; Copyright (C) 1990-1993, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1990-1993, 2001-2021 Free Software Foundation, Inc. ;; Author: David Gillespie <daveg@synaptics.com> diff --git a/lisp/calc/calc-help.el b/lisp/calc/calc-help.el index 06b4b9684e3..dd5063f27d5 100644 --- a/lisp/calc/calc-help.el +++ b/lisp/calc/calc-help.el @@ -1,6 +1,6 @@ ;;; calc-help.el --- help display functions for Calc -*- lexical-binding:t -*- -;; Copyright (C) 1990-1993, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1990-1993, 2001-2021 Free Software Foundation, Inc. ;; Author: David Gillespie <daveg@synaptics.com> diff --git a/lisp/calc/calc-incom.el b/lisp/calc/calc-incom.el index 2c7a4f0561e..e27d65092eb 100644 --- a/lisp/calc/calc-incom.el +++ b/lisp/calc/calc-incom.el @@ -1,6 +1,6 @@ ;;; calc-incom.el --- complex data type input functions for Calc -*- lexical-binding:t -*- -;; Copyright (C) 1990-1993, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1990-1993, 2001-2021 Free Software Foundation, Inc. ;; Author: David Gillespie <daveg@synaptics.com> diff --git a/lisp/calc/calc-keypd.el b/lisp/calc/calc-keypd.el index 47917dcac7e..1902a4f3f29 100644 --- a/lisp/calc/calc-keypd.el +++ b/lisp/calc/calc-keypd.el @@ -1,6 +1,6 @@ ;;; calc-keypd.el --- mouse-capable keypad input for Calc -*- lexical-binding:t -*- -;; Copyright (C) 1990-1993, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1990-1993, 2001-2021 Free Software Foundation, Inc. ;; Author: David Gillespie <daveg@synaptics.com> diff --git a/lisp/calc/calc-lang.el b/lisp/calc/calc-lang.el index 283069446e0..b4b2d4cc4f4 100644 --- a/lisp/calc/calc-lang.el +++ b/lisp/calc/calc-lang.el @@ -1,6 +1,6 @@ ;;; calc-lang.el --- calc language functions -*- lexical-binding:t -*- -;; Copyright (C) 1990-1993, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1990-1993, 2001-2021 Free Software Foundation, Inc. ;; Author: David Gillespie <daveg@synaptics.com> diff --git a/lisp/calc/calc-macs.el b/lisp/calc/calc-macs.el index a15095e3753..63258cde507 100644 --- a/lisp/calc/calc-macs.el +++ b/lisp/calc/calc-macs.el @@ -1,6 +1,6 @@ ;;; calc-macs.el --- important macros for Calc -*- lexical-binding:t -*- -;; Copyright (C) 1990-1993, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1990-1993, 2001-2021 Free Software Foundation, Inc. ;; Author: David Gillespie <daveg@synaptics.com> diff --git a/lisp/calc/calc-map.el b/lisp/calc/calc-map.el index 3e2869d146a..16a2bd89cac 100644 --- a/lisp/calc/calc-map.el +++ b/lisp/calc/calc-map.el @@ -1,6 +1,6 @@ ;;; calc-map.el --- higher-order functions for Calc -*- lexical-binding:t -*- -;; Copyright (C) 1990-1993, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1990-1993, 2001-2021 Free Software Foundation, Inc. ;; Author: David Gillespie <daveg@synaptics.com> diff --git a/lisp/calc/calc-math.el b/lisp/calc/calc-math.el index 1d0d94e992f..1c2e7bcf2bc 100644 --- a/lisp/calc/calc-math.el +++ b/lisp/calc/calc-math.el @@ -1,6 +1,6 @@ ;;; calc-math.el --- mathematical functions for Calc -*- lexical-binding:t -*- -;; Copyright (C) 1990-1993, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1990-1993, 2001-2021 Free Software Foundation, Inc. ;; Author: David Gillespie <daveg@synaptics.com> diff --git a/lisp/calc/calc-menu.el b/lisp/calc/calc-menu.el index d593eddb315..16cca055330 100644 --- a/lisp/calc/calc-menu.el +++ b/lisp/calc/calc-menu.el @@ -1,6 +1,6 @@ ;;; calc-menu.el --- a menu for Calc -*- lexical-binding:t -*- -;; Copyright (C) 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2007-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/lisp/calc/calc-misc.el b/lisp/calc/calc-misc.el index ada754a3979..b573c53f418 100644 --- a/lisp/calc/calc-misc.el +++ b/lisp/calc/calc-misc.el @@ -1,6 +1,6 @@ ;;; calc-misc.el --- miscellaneous functions for Calc -*- lexical-binding:t -*- -;; Copyright (C) 1990-1993, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1990-1993, 2001-2021 Free Software Foundation, Inc. ;; Author: David Gillespie <daveg@synaptics.com> diff --git a/lisp/calc/calc-mode.el b/lisp/calc/calc-mode.el index 358854bc93c..68c8b90ac3b 100644 --- a/lisp/calc/calc-mode.el +++ b/lisp/calc/calc-mode.el @@ -1,6 +1,6 @@ ;;; calc-mode.el --- calculator modes for Calc -*- lexical-binding:t -*- -;; Copyright (C) 1990-1993, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1990-1993, 2001-2021 Free Software Foundation, Inc. ;; Author: David Gillespie <daveg@synaptics.com> diff --git a/lisp/calc/calc-mtx.el b/lisp/calc/calc-mtx.el index bfcd61ddcd4..9a08b8cb76a 100644 --- a/lisp/calc/calc-mtx.el +++ b/lisp/calc/calc-mtx.el @@ -1,6 +1,6 @@ ;;; calc-mtx.el --- matrix functions for Calc -*- lexical-binding:t -*- -;; Copyright (C) 1990-1993, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1990-1993, 2001-2021 Free Software Foundation, Inc. ;; Author: David Gillespie <daveg@synaptics.com> diff --git a/lisp/calc/calc-nlfit.el b/lisp/calc/calc-nlfit.el index 5ed85fe7cae..11867f15e5b 100644 --- a/lisp/calc/calc-nlfit.el +++ b/lisp/calc/calc-nlfit.el @@ -1,6 +1,6 @@ ;;; calc-nlfit.el --- nonlinear curve fitting for Calc -*- lexical-binding:t -*- -;; Copyright (C) 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2007-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/lisp/calc/calc-poly.el b/lisp/calc/calc-poly.el index 5928a8ee47c..77587cc4b86 100644 --- a/lisp/calc/calc-poly.el +++ b/lisp/calc/calc-poly.el @@ -1,6 +1,6 @@ ;;; calc-poly.el --- polynomial functions for Calc -*- lexical-binding:t -*- -;; Copyright (C) 1990-1993, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1990-1993, 2001-2021 Free Software Foundation, Inc. ;; Author: David Gillespie <daveg@synaptics.com> diff --git a/lisp/calc/calc-prog.el b/lisp/calc/calc-prog.el index 781ba5c8b66..6ac554ed69c 100644 --- a/lisp/calc/calc-prog.el +++ b/lisp/calc/calc-prog.el @@ -1,6 +1,6 @@ ;;; calc-prog.el --- user programmability functions for Calc -*- lexical-binding:t -*- -;; Copyright (C) 1990-1993, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1990-1993, 2001-2021 Free Software Foundation, Inc. ;; Author: David Gillespie <daveg@synaptics.com> diff --git a/lisp/calc/calc-rewr.el b/lisp/calc/calc-rewr.el index 1528e12ae0e..e3d4852a721 100644 --- a/lisp/calc/calc-rewr.el +++ b/lisp/calc/calc-rewr.el @@ -1,6 +1,6 @@ ;;; calc-rewr.el --- rewriting functions for Calc -*- lexical-binding:t -*- -;; Copyright (C) 1990-1993, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1990-1993, 2001-2021 Free Software Foundation, Inc. ;; Author: David Gillespie <daveg@synaptics.com> diff --git a/lisp/calc/calc-rules.el b/lisp/calc/calc-rules.el index fe0e8a1e479..00080b69891 100644 --- a/lisp/calc/calc-rules.el +++ b/lisp/calc/calc-rules.el @@ -1,6 +1,6 @@ ;;; calc-rules.el --- rules for simplifying algebraic expressions in Calc -*- lexical-binding:t -*- -;; Copyright (C) 1990-1993, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1990-1993, 2001-2021 Free Software Foundation, Inc. ;; Author: David Gillespie <daveg@synaptics.com> diff --git a/lisp/calc/calc-sel.el b/lisp/calc/calc-sel.el index 23c0e01b527..e6c6337f969 100644 --- a/lisp/calc/calc-sel.el +++ b/lisp/calc/calc-sel.el @@ -1,6 +1,6 @@ ;;; calc-sel.el --- data selection functions for Calc -*- lexical-binding:t -*- -;; Copyright (C) 1990-1993, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1990-1993, 2001-2021 Free Software Foundation, Inc. ;; Author: David Gillespie <daveg@synaptics.com> diff --git a/lisp/calc/calc-stat.el b/lisp/calc/calc-stat.el index 196f743fc1a..3cf9bec8346 100644 --- a/lisp/calc/calc-stat.el +++ b/lisp/calc/calc-stat.el @@ -1,6 +1,6 @@ ;;; calc-stat.el --- statistical functions for Calc -*- lexical-binding:t -*- -;; Copyright (C) 1990-1993, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1990-1993, 2001-2021 Free Software Foundation, Inc. ;; Author: David Gillespie <daveg@synaptics.com> diff --git a/lisp/calc/calc-store.el b/lisp/calc/calc-store.el index 8f83f34d748..a5e9012dec6 100644 --- a/lisp/calc/calc-store.el +++ b/lisp/calc/calc-store.el @@ -1,6 +1,6 @@ ;;; calc-store.el --- value storage functions for Calc -*- lexical-binding:t -*- -;; Copyright (C) 1990-1993, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1990-1993, 2001-2021 Free Software Foundation, Inc. ;; Author: David Gillespie <daveg@synaptics.com> diff --git a/lisp/calc/calc-stuff.el b/lisp/calc/calc-stuff.el index 8df2ed905aa..9281666c3b6 100644 --- a/lisp/calc/calc-stuff.el +++ b/lisp/calc/calc-stuff.el @@ -1,6 +1,6 @@ ;;; calc-stuff.el --- miscellaneous functions for Calc -*- lexical-binding:t -*- -;; Copyright (C) 1990-1993, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1990-1993, 2001-2021 Free Software Foundation, Inc. ;; Author: David Gillespie <daveg@synaptics.com> diff --git a/lisp/calc/calc-trail.el b/lisp/calc/calc-trail.el index de7205ee3ca..2cf5160d5d3 100644 --- a/lisp/calc/calc-trail.el +++ b/lisp/calc/calc-trail.el @@ -1,6 +1,6 @@ ;;; calc-trail.el --- functions for manipulating the Calc "trail" -*- lexical-binding:t -*- -;; Copyright (C) 1990-1993, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1990-1993, 2001-2021 Free Software Foundation, Inc. ;; Author: David Gillespie <daveg@synaptics.com> diff --git a/lisp/calc/calc-undo.el b/lisp/calc/calc-undo.el index 47971e8ab0d..4add99a250f 100644 --- a/lisp/calc/calc-undo.el +++ b/lisp/calc/calc-undo.el @@ -1,6 +1,6 @@ ;;; calc-undo.el --- undo functions for Calc -*- lexical-binding:t -*- -;; Copyright (C) 1990-1993, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1990-1993, 2001-2021 Free Software Foundation, Inc. ;; Author: David Gillespie <daveg@synaptics.com> diff --git a/lisp/calc/calc-units.el b/lisp/calc/calc-units.el index e2ef6ee6ba6..c3adc3db02a 100644 --- a/lisp/calc/calc-units.el +++ b/lisp/calc/calc-units.el @@ -1,6 +1,6 @@ ;;; calc-units.el --- unit conversion functions for Calc -*- lexical-binding:t -*- -;; Copyright (C) 1990-1993, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1990-1993, 2001-2021 Free Software Foundation, Inc. ;; Author: David Gillespie <daveg@synaptics.com> diff --git a/lisp/calc/calc-vec.el b/lisp/calc/calc-vec.el index 036f08e276d..73783dd2c2c 100644 --- a/lisp/calc/calc-vec.el +++ b/lisp/calc/calc-vec.el @@ -1,6 +1,6 @@ ;;; calc-vec.el --- vector functions for Calc -*- lexical-binding:t -*- -;; Copyright (C) 1990-1993, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1990-1993, 2001-2021 Free Software Foundation, Inc. ;; Author: David Gillespie <daveg@synaptics.com> diff --git a/lisp/calc/calc-yank.el b/lisp/calc/calc-yank.el index 6186df718db..8267340a3ec 100644 --- a/lisp/calc/calc-yank.el +++ b/lisp/calc/calc-yank.el @@ -1,6 +1,6 @@ ;;; calc-yank.el --- kill-ring functionality for Calc -*- lexical-binding:t -*- -;; Copyright (C) 1990-1993, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1990-1993, 2001-2021 Free Software Foundation, Inc. ;; Author: David Gillespie <daveg@synaptics.com> diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el index 9b45a55aa57..68ae4685898 100644 --- a/lisp/calc/calc.el +++ b/lisp/calc/calc.el @@ -1,6 +1,6 @@ ;;; calc.el --- the GNU Emacs calculator -*- lexical-binding:t -*- -;; Copyright (C) 1990-1993, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1990-1993, 2001-2021 Free Software Foundation, Inc. ;; Author: David Gillespie <daveg@synaptics.com> ;; Keywords: convenience, extensions diff --git a/lisp/calc/calcalg2.el b/lisp/calc/calcalg2.el index bf4d6261910..fc6eb74e9f1 100644 --- a/lisp/calc/calcalg2.el +++ b/lisp/calc/calcalg2.el @@ -1,6 +1,6 @@ ;;; calcalg2.el --- more algebraic functions for Calc -*- lexical-binding:t -*- -;; Copyright (C) 1990-1993, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1990-1993, 2001-2021 Free Software Foundation, Inc. ;; Author: David Gillespie <daveg@synaptics.com> diff --git a/lisp/calc/calcalg3.el b/lisp/calc/calcalg3.el index fdcde95dae7..ee3ae0a4c1f 100644 --- a/lisp/calc/calcalg3.el +++ b/lisp/calc/calcalg3.el @@ -1,6 +1,6 @@ ;;; calcalg3.el --- more algebraic functions for Calc -*- lexical-binding:t -*- -;; Copyright (C) 1990-1993, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1990-1993, 2001-2021 Free Software Foundation, Inc. ;; Author: David Gillespie <daveg@synaptics.com> diff --git a/lisp/calc/calccomp.el b/lisp/calc/calccomp.el index 0631eb48f9f..07e70cad0a8 100644 --- a/lisp/calc/calccomp.el +++ b/lisp/calc/calccomp.el @@ -1,6 +1,6 @@ ;;; calccomp.el --- composition functions for Calc -*- lexical-binding:t -*- -;; Copyright (C) 1990-1993, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1990-1993, 2001-2021 Free Software Foundation, Inc. ;; Author: David Gillespie <daveg@synaptics.com> diff --git a/lisp/calc/calcsel2.el b/lisp/calc/calcsel2.el index d6842aa7eee..9c2ac975f0b 100644 --- a/lisp/calc/calcsel2.el +++ b/lisp/calc/calcsel2.el @@ -1,6 +1,6 @@ ;;; calcsel2.el --- selection functions for Calc -*- lexical-binding:t -*- -;; Copyright (C) 1990-1993, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1990-1993, 2001-2021 Free Software Foundation, Inc. ;; Author: David Gillespie <daveg@synaptics.com> diff --git a/lisp/calculator.el b/lisp/calculator.el index cd92f992689..b4c00753e91 100644 --- a/lisp/calculator.el +++ b/lisp/calculator.el @@ -1,6 +1,6 @@ ;;; calculator.el --- a calculator for Emacs -*- lexical-binding: t -*- -;; Copyright (C) 1998, 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998, 2000-2021 Free Software Foundation, Inc. ;; Author: Eli Barzilay <eli@barzilay.org> ;; Keywords: tools, convenience diff --git a/lisp/calendar/appt.el b/lisp/calendar/appt.el index d7bcbb02750..29bcd6de2ce 100644 --- a/lisp/calendar/appt.el +++ b/lisp/calendar/appt.el @@ -1,6 +1,6 @@ ;;; appt.el --- appointment notification functions -*- lexical-binding:t -*- -;; Copyright (C) 1989-1990, 1994, 1998, 2001-2020 Free Software +;; Copyright (C) 1989-1990, 1994, 1998, 2001-2021 Free Software ;; Foundation, Inc. ;; Author: Neil Mager <neilm@juliet.ll.mit.edu> diff --git a/lisp/calendar/cal-bahai.el b/lisp/calendar/cal-bahai.el index 4bfdf3a6cf6..22e4cdbcd52 100644 --- a/lisp/calendar/cal-bahai.el +++ b/lisp/calendar/cal-bahai.el @@ -1,6 +1,6 @@ ;;; cal-bahai.el --- calendar functions for the Bahá’í calendar. -;; Copyright (C) 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 2001-2021 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> ;; Keywords: calendar diff --git a/lisp/calendar/cal-china.el b/lisp/calendar/cal-china.el index 664d05e1e81..7e5d0c46e11 100644 --- a/lisp/calendar/cal-china.el +++ b/lisp/calendar/cal-china.el @@ -1,6 +1,6 @@ ;;; cal-china.el --- calendar functions for the Chinese calendar -;; Copyright (C) 1995, 1997, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1995, 1997, 2001-2021 Free Software Foundation, Inc. ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/calendar/cal-coptic.el b/lisp/calendar/cal-coptic.el index 9bd9b1d14ca..3461f3259b9 100644 --- a/lisp/calendar/cal-coptic.el +++ b/lisp/calendar/cal-coptic.el @@ -1,6 +1,6 @@ ;;; cal-coptic.el --- calendar functions for the Coptic/Ethiopic calendars -;; Copyright (C) 1995, 1997, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1995, 1997, 2001-2021 Free Software Foundation, Inc. ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/calendar/cal-dst.el b/lisp/calendar/cal-dst.el index 05768e10c01..9e6c2959286 100644 --- a/lisp/calendar/cal-dst.el +++ b/lisp/calendar/cal-dst.el @@ -1,6 +1,6 @@ ;;; cal-dst.el --- calendar functions for daylight saving rules -*- lexical-binding:t -*- -;; Copyright (C) 1993-1996, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1993-1996, 2001-2021 Free Software Foundation, Inc. ;; Author: Paul Eggert <eggert@cs.ucla.edu> ;; Edward M. Reingold <reingold@cs.uiuc.edu> diff --git a/lisp/calendar/cal-french.el b/lisp/calendar/cal-french.el index 4758a95a0ff..e759b5dad95 100644 --- a/lisp/calendar/cal-french.el +++ b/lisp/calendar/cal-french.el @@ -1,6 +1,6 @@ ;;; cal-french.el --- calendar functions for the French Revolutionary calendar -;; Copyright (C) 1988-1989, 1992, 1994-1995, 1997, 2001-2020 Free +;; Copyright (C) 1988-1989, 1992, 1994-1995, 1997, 2001-2021 Free ;; Software Foundation, Inc. ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu> diff --git a/lisp/calendar/cal-hebrew.el b/lisp/calendar/cal-hebrew.el index b8fbf65870f..bcc80f0877b 100644 --- a/lisp/calendar/cal-hebrew.el +++ b/lisp/calendar/cal-hebrew.el @@ -1,6 +1,6 @@ ;;; cal-hebrew.el --- calendar functions for the Hebrew calendar -;; Copyright (C) 1995, 1997, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1995, 1997, 2001-2021 Free Software Foundation, Inc. ;; Author: Nachum Dershowitz <nachum@cs.uiuc.edu> ;; Edward M. Reingold <reingold@cs.uiuc.edu> diff --git a/lisp/calendar/cal-html.el b/lisp/calendar/cal-html.el index a857cd710b6..3d7cc938437 100644 --- a/lisp/calendar/cal-html.el +++ b/lisp/calendar/cal-html.el @@ -1,6 +1,6 @@ ;;; cal-html.el --- functions for printing HTML calendars -;; Copyright (C) 2002-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002-2021 Free Software Foundation, Inc. ;; Author: Anna M. Bigatti <bigatti@dima.unige.it> ;; Keywords: calendar diff --git a/lisp/calendar/cal-islam.el b/lisp/calendar/cal-islam.el index f1c76fa0f21..d256310ba6c 100644 --- a/lisp/calendar/cal-islam.el +++ b/lisp/calendar/cal-islam.el @@ -1,6 +1,6 @@ ;;; cal-islam.el --- calendar functions for the Islamic calendar -;; Copyright (C) 1995, 1997, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1995, 1997, 2001-2021 Free Software Foundation, Inc. ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/calendar/cal-iso.el b/lisp/calendar/cal-iso.el index 4b4fee21a36..956433e4a20 100644 --- a/lisp/calendar/cal-iso.el +++ b/lisp/calendar/cal-iso.el @@ -1,6 +1,6 @@ ;;; cal-iso.el --- calendar functions for the ISO calendar -;; Copyright (C) 1995, 1997, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1995, 1997, 2001-2021 Free Software Foundation, Inc. ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/calendar/cal-julian.el b/lisp/calendar/cal-julian.el index 918995d0f9b..235b4d00900 100644 --- a/lisp/calendar/cal-julian.el +++ b/lisp/calendar/cal-julian.el @@ -1,6 +1,6 @@ ;;; cal-julian.el --- calendar functions for the Julian calendar -*- lexical-binding:t -*- -;; Copyright (C) 1995, 1997, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1995, 1997, 2001-2021 Free Software Foundation, Inc. ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/calendar/cal-mayan.el b/lisp/calendar/cal-mayan.el index 721f76076fc..8d894ebd986 100644 --- a/lisp/calendar/cal-mayan.el +++ b/lisp/calendar/cal-mayan.el @@ -1,6 +1,6 @@ ;;; cal-mayan.el --- calendar functions for the Mayan calendars -;; Copyright (C) 1992-1993, 1995, 1997, 2001-2020 Free Software +;; Copyright (C) 1992-1993, 1995, 1997, 2001-2021 Free Software ;; Foundation, Inc. ;; Author: Stewart M. Clamen <clamen@cs.cmu.edu> diff --git a/lisp/calendar/cal-menu.el b/lisp/calendar/cal-menu.el index f4d46e6cdde..a30c681a897 100644 --- a/lisp/calendar/cal-menu.el +++ b/lisp/calendar/cal-menu.el @@ -1,6 +1,6 @@ ;;; cal-menu.el --- calendar functions for menu bar and popup menu support -;; Copyright (C) 1994-1995, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1994-1995, 2001-2021 Free Software Foundation, Inc. ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu> ;; Lara Rios <lrios@coewl.cen.uiuc.edu> diff --git a/lisp/calendar/cal-move.el b/lisp/calendar/cal-move.el index 6345a02846b..710ce37ccbf 100644 --- a/lisp/calendar/cal-move.el +++ b/lisp/calendar/cal-move.el @@ -1,6 +1,6 @@ ;;; cal-move.el --- calendar functions for movement in the calendar -;; Copyright (C) 1995, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1995, 2001-2021 Free Software Foundation, Inc. ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/calendar/cal-persia.el b/lisp/calendar/cal-persia.el index 9d1432f076d..a9c99fedbdb 100644 --- a/lisp/calendar/cal-persia.el +++ b/lisp/calendar/cal-persia.el @@ -1,6 +1,6 @@ ;;; cal-persia.el --- calendar functions for the Persian calendar -;; Copyright (C) 1996-1997, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996-1997, 2001-2021 Free Software Foundation, Inc. ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/calendar/cal-tex.el b/lisp/calendar/cal-tex.el index ded065789f8..9df9f4cbedf 100644 --- a/lisp/calendar/cal-tex.el +++ b/lisp/calendar/cal-tex.el @@ -1,6 +1,6 @@ ;;; cal-tex.el --- calendar functions for printing calendars with LaTeX -;; Copyright (C) 1995, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1995, 2001-2021 Free Software Foundation, Inc. ;; Author: Steve Fisk <fisk@bowdoin.edu> ;; Edward M. Reingold <reingold@cs.uiuc.edu> diff --git a/lisp/calendar/cal-x.el b/lisp/calendar/cal-x.el index 8cefd4fd4c3..1c19a60db10 100644 --- a/lisp/calendar/cal-x.el +++ b/lisp/calendar/cal-x.el @@ -1,6 +1,6 @@ ;;; cal-x.el --- calendar windows in dedicated frames -;; Copyright (C) 1994-1995, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1994-1995, 2001-2021 Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> ;; Edward M. Reingold <reingold@cs.uiuc.edu> diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el index d262b607796..21cea212e18 100644 --- a/lisp/calendar/calendar.el +++ b/lisp/calendar/calendar.el @@ -1,6 +1,6 @@ ;;; calendar.el --- calendar functions -*- lexical-binding:t -*- -;; Copyright (C) 1988-1995, 1997, 2000-2020 Free Software Foundation, +;; Copyright (C) 1988-1995, 1997, 2000-2021 Free Software Foundation, ;; Inc. ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu> diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el index bf1e8ebf9d6..aad70161f9f 100644 --- a/lisp/calendar/diary-lib.el +++ b/lisp/calendar/diary-lib.el @@ -1,6 +1,6 @@ ;;; diary-lib.el --- diary functions -*- lexical-binding:t -*- -;; Copyright (C) 1989-1990, 1992-1995, 2001-2020 Free Software +;; Copyright (C) 1989-1990, 1992-1995, 2001-2021 Free Software ;; Foundation, Inc. ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu> @@ -73,18 +73,18 @@ are holidays." ;; follows: the first line matching "^# [tag:value]" defines the value ;; for that particular tag. (defcustom diary-face-attrs - '((" *\\[foreground:\\([-a-z]+\\)\\]$" 1 :foreground string) - (" *\\[background:\\([-a-z]+\\)\\]$" 1 :background string) - (" *\\[width:\\([-a-z]+\\)\\]$" 1 :width symbol) - (" *\\[height:\\([.0-9]+\\)\\]$" 1 :height int) - (" *\\[weight:\\([-a-z]+\\)\\]$" 1 :weight symbol) - (" *\\[slant:\\([-a-z]+\\)\\]$" 1 :slant symbol) - (" *\\[underline:\\([-a-z]+\\)\\]$" 1 :underline stringtnil) - (" *\\[overline:\\([-a-z]+\\)\\]$" 1 :overline stringtnil) - (" *\\[strike-through:\\([-a-z]+\\)\\]$" 1 :strike-through stringtnil) - (" *\\[inverse-video:\\([-a-z]+\\)\\]$" 1 :inverse-video tnil) - (" *\\[face:\\([-0-9a-z]+\\)\\]$" 1 :face string) - (" *\\[font:\\([-a-z0-9]+\\)\\]$" 1 :font string) + '((" *\\[foreground:\\([-a-z]+\\)\\] *" 1 :foreground string) + (" *\\[background:\\([-a-z]+\\)\\] *" 1 :background string) + (" *\\[width:\\([-a-z]+\\)\\] *" 1 :width symbol) + (" *\\[height:\\([.0-9]+\\)\\] *" 1 :height int) + (" *\\[weight:\\([-a-z]+\\)\\] *" 1 :weight symbol) + (" *\\[slant:\\([-a-z]+\\)\\] *" 1 :slant symbol) + (" *\\[underline:\\([-a-z]+\\)\\] *" 1 :underline stringtnil) + (" *\\[overline:\\([-a-z]+\\)\\] *" 1 :overline stringtnil) + (" *\\[strike-through:\\([-a-z]+\\)\\] *" 1 :strike-through stringtnil) + (" *\\[inverse-video:\\([-a-z]+\\)\\] *" 1 :inverse-video tnil) + (" *\\[face:\\([-0-9a-z]+\\)\\] *" 1 :face string) + (" *\\[font:\\([-a-z0-9]+\\)\\] *" 1 :font string) ;; Unsupported. ;;; (" *\\[box:\\([-a-z]+\\)\\]$" 1 :box) ;;; (" *\\[stipple:\\([-a-z]+\\)\\]$" 1 :stipple) diff --git a/lisp/calendar/holidays.el b/lisp/calendar/holidays.el index 444a0e53b95..932993beba0 100644 --- a/lisp/calendar/holidays.el +++ b/lisp/calendar/holidays.el @@ -1,6 +1,6 @@ ;;; holidays.el --- holiday functions for the calendar package -*- lexical-binding:t -*- -;; Copyright (C) 1989-1990, 1992-1994, 1997, 2001-2020 Free Software +;; Copyright (C) 1989-1990, 1992-1994, 1997, 2001-2021 Free Software ;; Foundation, Inc. ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu> diff --git a/lisp/calendar/icalendar.el b/lisp/calendar/icalendar.el index dab277487e2..1d7de4a0c5d 100644 --- a/lisp/calendar/icalendar.el +++ b/lisp/calendar/icalendar.el @@ -1,6 +1,6 @@ ;;; icalendar.el --- iCalendar implementation -*- lexical-binding: t -*- -;; Copyright (C) 2002-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002-2021 Free Software Foundation, Inc. ;; Author: Ulf Jasper <ulf.jasper@web.de> ;; Created: August 2002 diff --git a/lisp/calendar/iso8601.el b/lisp/calendar/iso8601.el index 906c29b15f4..5a109a73cd9 100644 --- a/lisp/calendar/iso8601.el +++ b/lisp/calendar/iso8601.el @@ -1,6 +1,6 @@ ;;; iso8601.el --- parse ISO 8601 date/time strings -*- lexical-binding:t -*- -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; Keywords: dates diff --git a/lisp/calendar/lunar.el b/lisp/calendar/lunar.el index 1c0f4da0f4b..dd1d923f423 100644 --- a/lisp/calendar/lunar.el +++ b/lisp/calendar/lunar.el @@ -1,6 +1,6 @@ ;;; lunar.el --- calendar functions for phases of the moon -*- lexical-binding:t -*- -;; Copyright (C) 1992-1993, 1995, 1997, 2001-2020 Free Software +;; Copyright (C) 1992-1993, 1995, 1997, 2001-2021 Free Software ;; Foundation, Inc. ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu> diff --git a/lisp/calendar/parse-time.el b/lisp/calendar/parse-time.el index b199fca2db5..ba7418faf78 100644 --- a/lisp/calendar/parse-time.el +++ b/lisp/calendar/parse-time.el @@ -1,6 +1,6 @@ ;;; parse-time.el --- parsing time strings -*- lexical-binding: t -*- -;; Copyright (C) 1996, 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996, 2000-2021 Free Software Foundation, Inc. ;; Author: Erik Naggum <erik@naggum.no> ;; Keywords: util diff --git a/lisp/calendar/solar.el b/lisp/calendar/solar.el index 07562f62240..372490db9ec 100644 --- a/lisp/calendar/solar.el +++ b/lisp/calendar/solar.el @@ -1,6 +1,6 @@ ;;; solar.el --- calendar functions for solar events -*- lexical-binding:t -*- -;; Copyright (C) 1992-1993, 1995, 1997, 2001-2020 Free Software +;; Copyright (C) 1992-1993, 1995, 1997, 2001-2021 Free Software ;; Foundation, Inc. ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu> diff --git a/lisp/calendar/time-date.el b/lisp/calendar/time-date.el index cf6c20afbd2..2df57a3c33d 100644 --- a/lisp/calendar/time-date.el +++ b/lisp/calendar/time-date.el @@ -1,6 +1,6 @@ ;;; time-date.el --- Date and time handling functions -*- lexical-binding: t -*- -;; Copyright (C) 1998-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Masanobu Umeda <umerin@mse.kyutech.ac.jp> diff --git a/lisp/calendar/timeclock.el b/lisp/calendar/timeclock.el index 48028dd07bf..0bbaa1e1ed6 100644 --- a/lisp/calendar/timeclock.el +++ b/lisp/calendar/timeclock.el @@ -1,6 +1,6 @@ ;;; timeclock.el --- mode for keeping track of how much you work -*- lexical-binding:t -*- -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> ;; Created: 25 Mar 1999 diff --git a/lisp/calendar/todo-mode.el b/lisp/calendar/todo-mode.el index 637df85f5dc..0daa1530109 100644 --- a/lisp/calendar/todo-mode.el +++ b/lisp/calendar/todo-mode.el @@ -1,6 +1,6 @@ ;;; todo-mode.el --- facilities for making and maintaining todo lists -*- lexical-binding:t -*- -;; Copyright (C) 1997, 1999, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997, 1999, 2001-2021 Free Software Foundation, Inc. ;; Author: Oliver Seidel <privat@os10000.net> ;; Stephen Berman <stephen.berman@gmx.net> diff --git a/lisp/case-table.el b/lisp/case-table.el index bdfe5c2b4d6..457e026f912 100644 --- a/lisp/case-table.el +++ b/lisp/case-table.el @@ -1,6 +1,6 @@ ;;; case-table.el --- code to extend the character set and support case tables -*- lexical-binding: t -*- -;; Copyright (C) 1988, 1994, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1988, 1994, 2001-2021 Free Software Foundation, Inc. ;; Author: Howard Gayle ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/cdl.el b/lisp/cdl.el index c8025a9f530..0f181ac6d4e 100644 --- a/lisp/cdl.el +++ b/lisp/cdl.el @@ -1,6 +1,6 @@ ;;; cdl.el --- Common Data Language (CDL) utility functions for GNU Emacs -*- lexical-binding: t -*- -;; Copyright (C) 1993, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1993, 2001-2021 Free Software Foundation, Inc. ;; Author: Ata Etemadi <ATAE@spva.physics.imperial.ac.uk> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/cedet/ChangeLog.1 b/lisp/cedet/ChangeLog.1 index a1c0e41b8da..fb3dcd23965 100644 --- a/lisp/cedet/ChangeLog.1 +++ b/lisp/cedet/ChangeLog.1 @@ -3460,7 +3460,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 2009-2020 Free Software Foundation, Inc. + Copyright (C) 2009-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lisp/cedet/cedet-cscope.el b/lisp/cedet/cedet-cscope.el index 68eb446f645..75a69db0a8c 100644 --- a/lisp/cedet/cedet-cscope.el +++ b/lisp/cedet/cedet-cscope.el @@ -1,6 +1,6 @@ ;;; cedet-cscope.el --- CScope support for CEDET -;;; Copyright (C) 2009-2020 Free Software Foundation, Inc. +;;; Copyright (C) 2009-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> ;; Package: cedet diff --git a/lisp/cedet/cedet-files.el b/lisp/cedet/cedet-files.el index 212a24f1613..31608159cc1 100644 --- a/lisp/cedet/cedet-files.el +++ b/lisp/cedet/cedet-files.el @@ -1,6 +1,6 @@ ;;; cedet-files.el --- Common routines dealing with file names. -;; Copyright (C) 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2007-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> ;; Package: cedet diff --git a/lisp/cedet/cedet-global.el b/lisp/cedet/cedet-global.el index 82751ec2d6c..5878ec1f485 100644 --- a/lisp/cedet/cedet-global.el +++ b/lisp/cedet/cedet-global.el @@ -1,6 +1,6 @@ ;;; cedet-global.el --- GNU Global support for CEDET. -;; Copyright (C) 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2008-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> ;; Package: cedet diff --git a/lisp/cedet/cedet-idutils.el b/lisp/cedet/cedet-idutils.el index 0efd7ee3053..fc5e05af88e 100644 --- a/lisp/cedet/cedet-idutils.el +++ b/lisp/cedet/cedet-idutils.el @@ -1,6 +1,6 @@ ;;; cedet-idutils.el --- ID Utils support for CEDET. -;; Copyright (C) 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2009-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> ;; Old-Version: 0.2 diff --git a/lisp/cedet/cedet.el b/lisp/cedet/cedet.el index cb520684fdd..caaec473a2c 100644 --- a/lisp/cedet/cedet.el +++ b/lisp/cedet/cedet.el @@ -1,6 +1,6 @@ ;;; cedet.el --- Setup CEDET environment -;; Copyright (C) 2002-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002-2021 Free Software Foundation, Inc. ;; Author: David Ponce <david@dponce.com> ;; Maintainer: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/data-debug.el b/lisp/cedet/data-debug.el index 8037c310f41..a062a5a5853 100644 --- a/lisp/cedet/data-debug.el +++ b/lisp/cedet/data-debug.el @@ -1,6 +1,6 @@ ;;; data-debug.el --- Data structure debugger -;; Copyright (C) 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2007-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> ;; Old-Version: 0.2 diff --git a/lisp/cedet/ede.el b/lisp/cedet/ede.el index 41252815734..14289153e81 100644 --- a/lisp/cedet/ede.el +++ b/lisp/cedet/ede.el @@ -1,6 +1,6 @@ ;;; ede.el --- Emacs Development Environment gloss -;; Copyright (C) 1998-2005, 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998-2005, 2007-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> ;; Keywords: project, make diff --git a/lisp/cedet/ede/auto.el b/lisp/cedet/ede/auto.el index 50ed4625bab..ee75e297993 100644 --- a/lisp/cedet/ede/auto.el +++ b/lisp/cedet/ede/auto.el @@ -1,6 +1,6 @@ ;;; ede/auto.el --- Autoload features for EDE -;; Copyright (C) 2010-2020 Free Software Foundation, Inc. +;; Copyright (C) 2010-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/ede/autoconf-edit.el b/lisp/cedet/ede/autoconf-edit.el index 409e35ef900..ca8535fdf23 100644 --- a/lisp/cedet/ede/autoconf-edit.el +++ b/lisp/cedet/ede/autoconf-edit.el @@ -1,6 +1,6 @@ ;;; ede/autoconf-edit.el --- Keymap for autoconf -;; Copyright (C) 1998-2000, 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998-2000, 2009-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> ;; Keywords: project diff --git a/lisp/cedet/ede/base.el b/lisp/cedet/ede/base.el index d371ad799a7..7799746e0c4 100644 --- a/lisp/cedet/ede/base.el +++ b/lisp/cedet/ede/base.el @@ -1,6 +1,6 @@ ;;; ede/base.el --- Baseclasses for EDE. -;; Copyright (C) 2010-2020 Free Software Foundation, Inc. +;; Copyright (C) 2010-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/ede/config.el b/lisp/cedet/ede/config.el index 07260f0b076..19686216cd5 100644 --- a/lisp/cedet/ede/config.el +++ b/lisp/cedet/ede/config.el @@ -1,6 +1,6 @@ ;;; ede/config.el --- Configuration Handler baseclass -;; Copyright (C) 2014-2020 Free Software Foundation, Inc. +;; Copyright (C) 2014-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/ede/cpp-root.el b/lisp/cedet/ede/cpp-root.el index f0dbccb7fc1..41f0c682892 100644 --- a/lisp/cedet/ede/cpp-root.el +++ b/lisp/cedet/ede/cpp-root.el @@ -1,6 +1,6 @@ ;;; ede/cpp-root.el --- A simple way to wrap a C++ project with a single root -;; Copyright (C) 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2007-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/ede/custom.el b/lisp/cedet/ede/custom.el index 63d8b025c6c..aada872cd0a 100644 --- a/lisp/cedet/ede/custom.el +++ b/lisp/cedet/ede/custom.el @@ -1,6 +1,6 @@ ;;; ede/custom.el --- customization of EDE projects. -;; Copyright (C) 2010-2020 Free Software Foundation, Inc. +;; Copyright (C) 2010-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/ede/detect.el b/lisp/cedet/ede/detect.el index fe23501807a..027d008ea38 100644 --- a/lisp/cedet/ede/detect.el +++ b/lisp/cedet/ede/detect.el @@ -1,6 +1,6 @@ ;;; ede/detect.el --- EDE project detection and file associations -;; Copyright (C) 2014-2020 Free Software Foundation, Inc. +;; Copyright (C) 2014-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/ede/dired.el b/lisp/cedet/ede/dired.el index e8c80275444..c85d4ee7924 100644 --- a/lisp/cedet/ede/dired.el +++ b/lisp/cedet/ede/dired.el @@ -1,6 +1,6 @@ ;;; ede/dired.el --- EDE extensions to dired. -;; Copyright (C) 1998-2000, 2003, 2009-2020 Free Software Foundation, +;; Copyright (C) 1998-2000, 2003, 2009-2021 Free Software Foundation, ;; Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/ede/emacs.el b/lisp/cedet/ede/emacs.el index a052c5c61e7..1eb4c6395a4 100644 --- a/lisp/cedet/ede/emacs.el +++ b/lisp/cedet/ede/emacs.el @@ -1,6 +1,6 @@ ;;; ede/emacs.el --- Special project for Emacs -;; Copyright (C) 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2008-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/ede/files.el b/lisp/cedet/ede/files.el index 1d6a082c5d3..cf5396ad00e 100644 --- a/lisp/cedet/ede/files.el +++ b/lisp/cedet/ede/files.el @@ -1,6 +1,6 @@ ;;; ede/files.el --- Associate projects with files and directories. -;; Copyright (C) 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2008-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/ede/generic.el b/lisp/cedet/ede/generic.el index 0f202ddfc88..3d1e1c5818e 100644 --- a/lisp/cedet/ede/generic.el +++ b/lisp/cedet/ede/generic.el @@ -1,6 +1,6 @@ ;;; ede/generic.el --- Base Support for generic build systems -;; Copyright (C) 2010-2020 Free Software Foundation, Inc. +;; Copyright (C) 2010-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/ede/linux.el b/lisp/cedet/ede/linux.el index 8ce6b5c2a4f..7a1c4c9e262 100644 --- a/lisp/cedet/ede/linux.el +++ b/lisp/cedet/ede/linux.el @@ -1,6 +1,6 @@ ;;; ede/linux.el --- Special project for Linux -;; Copyright (C) 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2008-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/ede/locate.el b/lisp/cedet/ede/locate.el index 160309ffce4..e6a89533cca 100644 --- a/lisp/cedet/ede/locate.el +++ b/lisp/cedet/ede/locate.el @@ -1,6 +1,6 @@ ;;; ede/locate.el --- Locate support -;; Copyright (C) 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2008-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/ede/make.el b/lisp/cedet/ede/make.el index 140e7387a68..863d715e4f1 100644 --- a/lisp/cedet/ede/make.el +++ b/lisp/cedet/ede/make.el @@ -1,6 +1,6 @@ ;;; ede/make.el --- General information about "make" -;;; Copyright (C) 2009-2020 Free Software Foundation, Inc. +;;; Copyright (C) 2009-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/ede/makefile-edit.el b/lisp/cedet/ede/makefile-edit.el index 218e75c0a8a..43655a5d1e3 100644 --- a/lisp/cedet/ede/makefile-edit.el +++ b/lisp/cedet/ede/makefile-edit.el @@ -1,6 +1,6 @@ ;;; makefile-edit.el --- Makefile editing/scanning commands. -;; Copyright (C) 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2009-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/ede/pconf.el b/lisp/cedet/ede/pconf.el index b85b397af2d..5bed32ff058 100644 --- a/lisp/cedet/ede/pconf.el +++ b/lisp/cedet/ede/pconf.el @@ -1,6 +1,6 @@ ;;; ede/pconf.el --- configure.ac maintenance for EDE -;;; Copyright (C) 1998-2000, 2005, 2008-2020 Free Software Foundation, +;;; Copyright (C) 1998-2000, 2005, 2008-2021 Free Software Foundation, ;;; Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/ede/pmake.el b/lisp/cedet/ede/pmake.el index 2e3256f4be5..4c948df4102 100644 --- a/lisp/cedet/ede/pmake.el +++ b/lisp/cedet/ede/pmake.el @@ -1,6 +1,6 @@ ;;; ede-pmake.el --- EDE Generic Project Makefile code generator. -;; Copyright (C) 1998-2005, 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998-2005, 2007-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> ;; Keywords: project, make diff --git a/lisp/cedet/ede/proj-archive.el b/lisp/cedet/ede/proj-archive.el index 78764e3d499..2b1e50dcea3 100644 --- a/lisp/cedet/ede/proj-archive.el +++ b/lisp/cedet/ede/proj-archive.el @@ -1,6 +1,6 @@ ;;; ede/proj-archive.el --- EDE Generic Project archive support -;; Copyright (C) 1998-2001, 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998-2001, 2009-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> ;; Keywords: project, make diff --git a/lisp/cedet/ede/proj-aux.el b/lisp/cedet/ede/proj-aux.el index 0c35647fe9a..f5bcebdd4cf 100644 --- a/lisp/cedet/ede/proj-aux.el +++ b/lisp/cedet/ede/proj-aux.el @@ -1,6 +1,6 @@ ;;; ede/proj-aux.el --- EDE Generic Project auxiliary file support -;; Copyright (C) 1998-2000, 2007, 2009-2020 Free Software Foundation, +;; Copyright (C) 1998-2000, 2007, 2009-2021 Free Software Foundation, ;; Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/ede/proj-comp.el b/lisp/cedet/ede/proj-comp.el index 5e9cf49b7ed..26aa66873a3 100644 --- a/lisp/cedet/ede/proj-comp.el +++ b/lisp/cedet/ede/proj-comp.el @@ -1,6 +1,6 @@ ;;; ede/proj-comp.el --- EDE Generic Project compiler/rule driver -;; Copyright (C) 1999-2001, 2004-2005, 2007, 2009-2020 Free Software +;; Copyright (C) 1999-2001, 2004-2005, 2007, 2009-2021 Free Software ;; Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/ede/proj-elisp.el b/lisp/cedet/ede/proj-elisp.el index 9847a367467..9ec96945c10 100644 --- a/lisp/cedet/ede/proj-elisp.el +++ b/lisp/cedet/ede/proj-elisp.el @@ -1,6 +1,6 @@ ;;; ede-proj-elisp.el --- EDE Generic Project Emacs Lisp support -;; Copyright (C) 1998-2005, 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998-2005, 2007-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> ;; Keywords: project, make diff --git a/lisp/cedet/ede/proj-info.el b/lisp/cedet/ede/proj-info.el index ee41d0cc01d..3d437016e93 100644 --- a/lisp/cedet/ede/proj-info.el +++ b/lisp/cedet/ede/proj-info.el @@ -1,6 +1,6 @@ ;;; ede-proj-info.el --- EDE Generic Project texinfo support -;;; Copyright (C) 1998-2001, 2004, 2007-2020 Free Software Foundation, +;;; Copyright (C) 1998-2001, 2004, 2007-2021 Free Software Foundation, ;;; Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/ede/proj-misc.el b/lisp/cedet/ede/proj-misc.el index a73d03f1b80..70132aff6c3 100644 --- a/lisp/cedet/ede/proj-misc.el +++ b/lisp/cedet/ede/proj-misc.el @@ -1,6 +1,6 @@ ;;; ede-proj-misc.el --- EDE Generic Project Emacs Lisp support -;; Copyright (C) 1998-2001, 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998-2001, 2008-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> ;; Keywords: project, make diff --git a/lisp/cedet/ede/proj-obj.el b/lisp/cedet/ede/proj-obj.el index 22a6cdfad47..3aa4497f932 100644 --- a/lisp/cedet/ede/proj-obj.el +++ b/lisp/cedet/ede/proj-obj.el @@ -1,6 +1,6 @@ ;;; ede/proj-obj.el --- EDE Generic Project Object code generation support -;;; Copyright (C) 1998-2000, 2005, 2008-2020 Free Software Foundation, +;;; Copyright (C) 1998-2000, 2005, 2008-2021 Free Software Foundation, ;;; Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/ede/proj-prog.el b/lisp/cedet/ede/proj-prog.el index 5a12256048f..3817cd7d40e 100644 --- a/lisp/cedet/ede/proj-prog.el +++ b/lisp/cedet/ede/proj-prog.el @@ -1,6 +1,6 @@ ;;; ede-proj-prog.el --- EDE Generic Project program support -;; Copyright (C) 1998-2001, 2005, 2008-2020 Free Software Foundation, +;; Copyright (C) 1998-2001, 2005, 2008-2021 Free Software Foundation, ;; Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/ede/proj-scheme.el b/lisp/cedet/ede/proj-scheme.el index 9afbeb17ac4..51844af5361 100644 --- a/lisp/cedet/ede/proj-scheme.el +++ b/lisp/cedet/ede/proj-scheme.el @@ -1,6 +1,6 @@ ;;; ede/proj-scheme.el --- EDE Generic Project scheme (guile) support -;; Copyright (C) 1998-2000, 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998-2000, 2009-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> ;; Keywords: project, make, scheme diff --git a/lisp/cedet/ede/proj-shared.el b/lisp/cedet/ede/proj-shared.el index 2c875394b1b..130d7b897aa 100644 --- a/lisp/cedet/ede/proj-shared.el +++ b/lisp/cedet/ede/proj-shared.el @@ -1,6 +1,6 @@ ;;; ede-proj-shared.el --- EDE Generic Project shared library support -;;; Copyright (C) 1998-2000, 2009-2020 Free Software Foundation, Inc. +;;; Copyright (C) 1998-2000, 2009-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> ;; Keywords: project, make diff --git a/lisp/cedet/ede/proj.el b/lisp/cedet/ede/proj.el index a6d47e373f2..59628ebf4c9 100644 --- a/lisp/cedet/ede/proj.el +++ b/lisp/cedet/ede/proj.el @@ -1,6 +1,6 @@ ;;; ede/proj.el --- EDE Generic Project file driver -;; Copyright (C) 1998-2003, 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998-2003, 2007-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> ;; Keywords: project, make diff --git a/lisp/cedet/ede/project-am.el b/lisp/cedet/ede/project-am.el index 9bd3babdf42..061d1b540b0 100644 --- a/lisp/cedet/ede/project-am.el +++ b/lisp/cedet/ede/project-am.el @@ -1,6 +1,6 @@ ;;; project-am.el --- A project management scheme based on automake files. -;; Copyright (C) 1998-2000, 2003, 2005, 2007-2020 Free Software +;; Copyright (C) 1998-2000, 2003, 2005, 2007-2021 Free Software ;; Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/ede/shell.el b/lisp/cedet/ede/shell.el index a99365005c8..ba36fccd0ba 100644 --- a/lisp/cedet/ede/shell.el +++ b/lisp/cedet/ede/shell.el @@ -1,6 +1,6 @@ ;;; ede/shell.el --- A shell controlled by EDE. ;; -;; Copyright (C) 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2009-2021 Free Software Foundation, Inc. ;; ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/ede/simple.el b/lisp/cedet/ede/simple.el index b1cfd6523f9..ea6162ef94f 100644 --- a/lisp/cedet/ede/simple.el +++ b/lisp/cedet/ede/simple.el @@ -1,6 +1,6 @@ ;;; ede/simple.el --- Overlay an EDE structure on an existing project -;; Copyright (C) 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2007-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/ede/source.el b/lisp/cedet/ede/source.el index eed82f7cf3b..abdb07f2d73 100644 --- a/lisp/cedet/ede/source.el +++ b/lisp/cedet/ede/source.el @@ -1,6 +1,6 @@ ;; ede/source.el --- EDE source code object -;; Copyright (C) 2000, 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2000, 2008-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> ;; Keywords: project, make diff --git a/lisp/cedet/ede/speedbar.el b/lisp/cedet/ede/speedbar.el index ed3348750f7..48c4a89c440 100644 --- a/lisp/cedet/ede/speedbar.el +++ b/lisp/cedet/ede/speedbar.el @@ -1,6 +1,6 @@ ;;; ede/speedbar.el --- Speedbar viewing of EDE projects -;; Copyright (C) 1998-2001, 2003, 2005, 2007-2020 Free Software +;; Copyright (C) 1998-2001, 2003, 2005, 2007-2021 Free Software ;; Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/ede/srecode.el b/lisp/cedet/ede/srecode.el index ed85ea97475..5dd0a7ec614 100644 --- a/lisp/cedet/ede/srecode.el +++ b/lisp/cedet/ede/srecode.el @@ -1,6 +1,6 @@ ;;; ede/srecode.el --- EDE utilities on top of SRecoder -;; Copyright (C) 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2008-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/ede/system.el b/lisp/cedet/ede/system.el index 5a78dd10c82..d83d6d1cc69 100644 --- a/lisp/cedet/ede/system.el +++ b/lisp/cedet/ede/system.el @@ -1,6 +1,6 @@ ;;; ede-system.el --- EDE working with the system (VC, FTP, ETC) -;; Copyright (C) 2001-2003, 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2001-2003, 2009-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> ;; Keywords: project, make, vc diff --git a/lisp/cedet/ede/util.el b/lisp/cedet/ede/util.el index c6da1862ff1..80cbc211fc2 100644 --- a/lisp/cedet/ede/util.el +++ b/lisp/cedet/ede/util.el @@ -1,6 +1,6 @@ ;;; ede/util.el --- EDE utilities -;; Copyright (C) 2000, 2005, 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2000, 2005, 2009-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> ;; Keywords: project, make diff --git a/lisp/cedet/inversion.el b/lisp/cedet/inversion.el index 113f4056e2c..2ef7e0df961 100644 --- a/lisp/cedet/inversion.el +++ b/lisp/cedet/inversion.el @@ -1,6 +1,6 @@ ;;; inversion.el --- When you need something in version XX.XX -;;; Copyright (C) 2002-2003, 2005-2020 Free Software Foundation, Inc. +;;; Copyright (C) 2002-2003, 2005-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> ;; Version: 1.3 diff --git a/lisp/cedet/mode-local.el b/lisp/cedet/mode-local.el index b965496cf48..d1e528c4a02 100644 --- a/lisp/cedet/mode-local.el +++ b/lisp/cedet/mode-local.el @@ -1,6 +1,6 @@ ;;; mode-local.el --- Support for mode local facilities -*- lexical-binding:t -*- ;; -;; Copyright (C) 2004-2005, 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2004-2005, 2007-2021 Free Software Foundation, Inc. ;; ;; Author: David Ponce <david@dponce.com> ;; Created: 27 Apr 2004 diff --git a/lisp/cedet/pulse.el b/lisp/cedet/pulse.el index 8649254aedd..aef4fc89057 100644 --- a/lisp/cedet/pulse.el +++ b/lisp/cedet/pulse.el @@ -1,6 +1,6 @@ ;;; pulse.el --- Pulsing Overlays -;;; Copyright (C) 2007-2020 Free Software Foundation, Inc. +;;; Copyright (C) 2007-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> ;; Version: 1.0 diff --git a/lisp/cedet/semantic.el b/lisp/cedet/semantic.el index 805582ce5e6..c64a9822c6b 100644 --- a/lisp/cedet/semantic.el +++ b/lisp/cedet/semantic.el @@ -1,6 +1,6 @@ ;;; semantic.el --- Semantic buffer evaluator. -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> ;; Keywords: syntax tools diff --git a/lisp/cedet/semantic/analyze.el b/lisp/cedet/semantic/analyze.el index f2d2279c001..c0a054dafc3 100644 --- a/lisp/cedet/semantic/analyze.el +++ b/lisp/cedet/semantic/analyze.el @@ -1,6 +1,6 @@ ;;; semantic/analyze.el --- Analyze semantic tags against local context -;; Copyright (C) 2000-2005, 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2000-2005, 2007-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/semantic/analyze/complete.el b/lisp/cedet/semantic/analyze/complete.el index 8d07958b93f..e8139ab1aea 100644 --- a/lisp/cedet/semantic/analyze/complete.el +++ b/lisp/cedet/semantic/analyze/complete.el @@ -1,6 +1,6 @@ ;;; semantic/analyze/complete.el --- Smart Completions -;; Copyright (C) 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2007-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/semantic/analyze/debug.el b/lisp/cedet/semantic/analyze/debug.el index db5b0960335..4947368757e 100644 --- a/lisp/cedet/semantic/analyze/debug.el +++ b/lisp/cedet/semantic/analyze/debug.el @@ -1,6 +1,6 @@ ;;; semantic/analyze/debug.el --- Debug the analyzer -;;; Copyright (C) 2008-2020 Free Software Foundation, Inc. +;;; Copyright (C) 2008-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/semantic/analyze/fcn.el b/lisp/cedet/semantic/analyze/fcn.el index 44394f674b0..10d11c33ebb 100644 --- a/lisp/cedet/semantic/analyze/fcn.el +++ b/lisp/cedet/semantic/analyze/fcn.el @@ -1,6 +1,6 @@ ;;; semantic/analyze/fcn.el --- Analyzer support functions. -;; Copyright (C) 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2007-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/semantic/analyze/refs.el b/lisp/cedet/semantic/analyze/refs.el index 585f1a7c754..a39ff6f6736 100644 --- a/lisp/cedet/semantic/analyze/refs.el +++ b/lisp/cedet/semantic/analyze/refs.el @@ -1,6 +1,6 @@ ;;; semantic/analyze/refs.el --- Analysis of the references between tags. -;; Copyright (C) 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2008-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> @@ -102,7 +102,8 @@ Use `semantic-analyze-current-tag' to debug this fcn." ;; into the context. (cl-defmethod semantic-analyze-refs-impl ((refs semantic-analyze-references) &optional in-buffer) "Return the implementations derived in the reference analyzer REFS. -Optional argument IN-BUFFER indicates that the returned tag should be in an active buffer." +Optional argument IN-BUFFER indicates that the returned tag +should be in an active buffer." (let ((allhits (oref refs rawsearchdata)) (tag (oref refs tag)) (impl nil) @@ -127,7 +128,8 @@ Optional argument IN-BUFFER indicates that the returned tag should be in an acti (cl-defmethod semantic-analyze-refs-proto ((refs semantic-analyze-references) &optional in-buffer) "Return the prototypes derived in the reference analyzer REFS. -Optional argument IN-BUFFER indicates that the returned tag should be in an active buffer." +Optional argument IN-BUFFER indicates that the returned tag +should be in an active buffer." (let ((allhits (oref refs rawsearchdata)) (tag (oref refs tag)) (proto nil)) diff --git a/lisp/cedet/semantic/bovine.el b/lisp/cedet/semantic/bovine.el index f999a01f1e9..034ecb5ea1c 100644 --- a/lisp/cedet/semantic/bovine.el +++ b/lisp/cedet/semantic/bovine.el @@ -1,6 +1,6 @@ ;;; semantic/bovine.el --- LL Parser/Analyzer core. -;; Copyright (C) 1999-2004, 2006-2007, 2009-2020 Free Software +;; Copyright (C) 1999-2004, 2006-2007, 2009-2021 Free Software ;; Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/semantic/bovine/c.el b/lisp/cedet/semantic/bovine/c.el index 7f0c16136ce..fb551397381 100644 --- a/lisp/cedet/semantic/bovine/c.el +++ b/lisp/cedet/semantic/bovine/c.el @@ -1,6 +1,6 @@ ;;; semantic/bovine/c.el --- Semantic details for C -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/semantic/bovine/debug.el b/lisp/cedet/semantic/bovine/debug.el index 0f5bc86ea30..8ea9ac24423 100644 --- a/lisp/cedet/semantic/bovine/debug.el +++ b/lisp/cedet/semantic/bovine/debug.el @@ -1,6 +1,6 @@ ;;; semantic/bovine/debug.el --- Debugger support for bovinator -;; Copyright (C) 2003, 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2003, 2009-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/semantic/bovine/el.el b/lisp/cedet/semantic/bovine/el.el index 2f05b99e467..dc617349021 100644 --- a/lisp/cedet/semantic/bovine/el.el +++ b/lisp/cedet/semantic/bovine/el.el @@ -1,6 +1,6 @@ ;;; semantic/bovine/el.el --- Semantic details for Emacs Lisp -;; Copyright (C) 1999-2005, 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2005, 2007-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/semantic/bovine/gcc.el b/lisp/cedet/semantic/bovine/gcc.el index 64f391d2325..1cfe5a3bac1 100644 --- a/lisp/cedet/semantic/bovine/gcc.el +++ b/lisp/cedet/semantic/bovine/gcc.el @@ -1,6 +1,6 @@ ;;; semantic/bovine/gcc.el --- gcc querying special code for the C parser -;; Copyright (C) 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2008-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/semantic/bovine/grammar.el b/lisp/cedet/semantic/bovine/grammar.el index 10afb065320..4914ec9b124 100644 --- a/lisp/cedet/semantic/bovine/grammar.el +++ b/lisp/cedet/semantic/bovine/grammar.el @@ -1,6 +1,6 @@ ;;; semantic/bovine/grammar.el --- Bovine's input grammar mode ;; -;; Copyright (C) 2002-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002-2021 Free Software Foundation, Inc. ;; ;; Author: David Ponce <david@dponce.com> ;; Created: 26 Aug 2002 diff --git a/lisp/cedet/semantic/bovine/make.el b/lisp/cedet/semantic/bovine/make.el index 3ca7dcd48e2..80895565274 100644 --- a/lisp/cedet/semantic/bovine/make.el +++ b/lisp/cedet/semantic/bovine/make.el @@ -1,6 +1,6 @@ ;;; semantic/bovine/make.el --- Makefile parsing rules. -;; Copyright (C) 2000-2004, 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2000-2004, 2008-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/semantic/bovine/scm.el b/lisp/cedet/semantic/bovine/scm.el index b2a25bf8eef..aaa86a1e36c 100644 --- a/lisp/cedet/semantic/bovine/scm.el +++ b/lisp/cedet/semantic/bovine/scm.el @@ -1,6 +1,6 @@ ;;; semantic/bovine/scm.el --- Semantic details for Scheme (guile) -;;; Copyright (C) 2001-2004, 2008-2020 Free Software Foundation, Inc. +;;; Copyright (C) 2001-2004, 2008-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/semantic/chart.el b/lisp/cedet/semantic/chart.el index a5f3699ae6d..e7848faf741 100644 --- a/lisp/cedet/semantic/chart.el +++ b/lisp/cedet/semantic/chart.el @@ -1,6 +1,6 @@ ;;; semantic/chart.el --- Utilities for use with semantic tag tables -;; Copyright (C) 1999-2001, 2003, 2005, 2008-2020 Free Software +;; Copyright (C) 1999-2001, 2003, 2005, 2008-2021 Free Software ;; Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/semantic/complete.el b/lisp/cedet/semantic/complete.el index b262ab710f6..0a80b428e8e 100644 --- a/lisp/cedet/semantic/complete.el +++ b/lisp/cedet/semantic/complete.el @@ -1,6 +1,6 @@ ;;; semantic/complete.el --- Routines for performing tag completion -;; Copyright (C) 2003-2005, 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2003-2005, 2007-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> ;; Keywords: syntax diff --git a/lisp/cedet/semantic/ctxt.el b/lisp/cedet/semantic/ctxt.el index f2387302b14..4d2defde35b 100644 --- a/lisp/cedet/semantic/ctxt.el +++ b/lisp/cedet/semantic/ctxt.el @@ -1,6 +1,6 @@ ;;; semantic/ctxt.el --- Context calculations for Semantic tools. -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> ;; Keywords: syntax diff --git a/lisp/cedet/semantic/db-debug.el b/lisp/cedet/semantic/db-debug.el index 65210ed9336..c553ab499ae 100644 --- a/lisp/cedet/semantic/db-debug.el +++ b/lisp/cedet/semantic/db-debug.el @@ -1,6 +1,6 @@ ;;; semantic/db-debug.el --- Extra level debugging routines for Semantic -;;; Copyright (C) 2008-2020 Free Software Foundation, Inc. +;;; Copyright (C) 2008-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/semantic/db-ebrowse.el b/lisp/cedet/semantic/db-ebrowse.el index d63e5bc4869..946f9ef6326 100644 --- a/lisp/cedet/semantic/db-ebrowse.el +++ b/lisp/cedet/semantic/db-ebrowse.el @@ -1,6 +1,6 @@ ;;; semantic/db-ebrowse.el --- Semanticdb backend using ebrowse. -;; Copyright (C) 2005-2020 Free Software Foundation, Inc. +;; Copyright (C) 2005-2021 Free Software Foundation, Inc. ;; Authors: Eric M. Ludlam <zappo@gnu.org> ;; Joakim Verona diff --git a/lisp/cedet/semantic/db-el.el b/lisp/cedet/semantic/db-el.el index 1706988c238..4699e722c1a 100644 --- a/lisp/cedet/semantic/db-el.el +++ b/lisp/cedet/semantic/db-el.el @@ -1,6 +1,6 @@ ;;; semantic/db-el.el --- Semantic database extensions for Emacs Lisp -;;; Copyright (C) 2002-2020 Free Software Foundation, Inc. +;;; Copyright (C) 2002-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> ;; Keywords: tags diff --git a/lisp/cedet/semantic/db-file.el b/lisp/cedet/semantic/db-file.el index 96287487106..59e9db9cc0a 100644 --- a/lisp/cedet/semantic/db-file.el +++ b/lisp/cedet/semantic/db-file.el @@ -1,6 +1,6 @@ ;;; semantic/db-file.el --- Save a semanticdb to a cache file. -;;; Copyright (C) 2000-2005, 2007-2020 Free Software Foundation, Inc. +;;; Copyright (C) 2000-2005, 2007-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> ;; Keywords: tags diff --git a/lisp/cedet/semantic/db-find.el b/lisp/cedet/semantic/db-find.el index 86ccf28ad02..14726e503d5 100644 --- a/lisp/cedet/semantic/db-find.el +++ b/lisp/cedet/semantic/db-find.el @@ -1,6 +1,6 @@ ;;; semantic/db-find.el --- Searching through semantic databases. -;; Copyright (C) 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 2000-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> ;; Keywords: tags diff --git a/lisp/cedet/semantic/db-global.el b/lisp/cedet/semantic/db-global.el index b6f7c2f379e..2f40082d53c 100644 --- a/lisp/cedet/semantic/db-global.el +++ b/lisp/cedet/semantic/db-global.el @@ -1,6 +1,6 @@ ;;; semantic/db-global.el --- Semantic database extensions for GLOBAL -;; Copyright (C) 2002-2006, 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002-2006, 2008-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> ;; Keywords: tags diff --git a/lisp/cedet/semantic/db-javascript.el b/lisp/cedet/semantic/db-javascript.el index 098ee0676bd..2b138866215 100644 --- a/lisp/cedet/semantic/db-javascript.el +++ b/lisp/cedet/semantic/db-javascript.el @@ -1,6 +1,6 @@ ;;; semantic/db-javascript.el --- Semantic database extensions for javascript -;; Copyright (C) 2002-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002-2021 Free Software Foundation, Inc. ;; Author: Joakim Verona diff --git a/lisp/cedet/semantic/db-mode.el b/lisp/cedet/semantic/db-mode.el index 16a30b6cfbc..aa4634faa98 100644 --- a/lisp/cedet/semantic/db-mode.el +++ b/lisp/cedet/semantic/db-mode.el @@ -1,6 +1,6 @@ ;;; semantic/db-mode.el --- Semanticdb Minor Mode -;; Copyright (C) 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2008-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/semantic/db-ref.el b/lisp/cedet/semantic/db-ref.el index 611275bb271..da09f9830a7 100644 --- a/lisp/cedet/semantic/db-ref.el +++ b/lisp/cedet/semantic/db-ref.el @@ -1,6 +1,6 @@ ;;; semantic/db-ref.el --- Handle cross-db file references -;;; Copyright (C) 2007-2020 Free Software Foundation, Inc. +;;; Copyright (C) 2007-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/semantic/db-typecache.el b/lisp/cedet/semantic/db-typecache.el index 3b6f70ab32a..8c394cd7fa9 100644 --- a/lisp/cedet/semantic/db-typecache.el +++ b/lisp/cedet/semantic/db-typecache.el @@ -1,6 +1,6 @@ ;;; semantic/db-typecache.el --- Manage Datatypes -;; Copyright (C) 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2007-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/semantic/db.el b/lisp/cedet/semantic/db.el index 60a65b195bc..b9b10917dc6 100644 --- a/lisp/cedet/semantic/db.el +++ b/lisp/cedet/semantic/db.el @@ -1,6 +1,6 @@ ;;; semantic/db.el --- Semantic tag database manager -*- lexical-binding:t -*- -;; Copyright (C) 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 2000-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> ;; Keywords: tags diff --git a/lisp/cedet/semantic/debug.el b/lisp/cedet/semantic/debug.el index eebdd013aae..b3e8f076d07 100644 --- a/lisp/cedet/semantic/debug.el +++ b/lisp/cedet/semantic/debug.el @@ -1,6 +1,6 @@ ;;; semantic/debug.el --- Language Debugger framework -;; Copyright (C) 2003-2005, 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2003-2005, 2008-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/semantic/decorate.el b/lisp/cedet/semantic/decorate.el index da472808ce9..53c54ab4cc8 100644 --- a/lisp/cedet/semantic/decorate.el +++ b/lisp/cedet/semantic/decorate.el @@ -1,6 +1,6 @@ ;;; semantic/decorate.el --- Utilities for decorating/highlighting tokens. -;;; Copyright (C) 1999-2003, 2005-2007, 2009-2020 Free Software +;;; Copyright (C) 1999-2003, 2005-2007, 2009-2021 Free Software ;;; Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/semantic/decorate/include.el b/lisp/cedet/semantic/decorate/include.el index 63e72a5fb6d..ee7fad1fc5f 100644 --- a/lisp/cedet/semantic/decorate/include.el +++ b/lisp/cedet/semantic/decorate/include.el @@ -1,6 +1,6 @@ ;;; semantic/decorate/include.el --- Decoration modes for include statements -;; Copyright (C) 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2008-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/semantic/decorate/mode.el b/lisp/cedet/semantic/decorate/mode.el index 293692000df..884b066d77f 100644 --- a/lisp/cedet/semantic/decorate/mode.el +++ b/lisp/cedet/semantic/decorate/mode.el @@ -1,6 +1,6 @@ ;;; semantic/decorate/mode.el --- Minor mode for decorating tags -;; Copyright (C) 2000-2005, 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2000-2005, 2007-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> ;; Keywords: syntax diff --git a/lisp/cedet/semantic/dep.el b/lisp/cedet/semantic/dep.el index 60ab6033aec..0fba2a2f091 100644 --- a/lisp/cedet/semantic/dep.el +++ b/lisp/cedet/semantic/dep.el @@ -1,6 +1,6 @@ ;;; semantic/dep.el --- Methods for tracking dependencies (include files) -;; Copyright (C) 2006-2020 Free Software Foundation, Inc. +;; Copyright (C) 2006-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> ;; Keywords: syntax diff --git a/lisp/cedet/semantic/doc.el b/lisp/cedet/semantic/doc.el index e84e99e1e8d..d4dd9286421 100644 --- a/lisp/cedet/semantic/doc.el +++ b/lisp/cedet/semantic/doc.el @@ -1,6 +1,6 @@ ;;; semantic/doc.el --- Routines for documentation strings -;; Copyright (C) 1999-2003, 2005, 2008-2020 Free Software Foundation, +;; Copyright (C) 1999-2003, 2005, 2008-2021 Free Software Foundation, ;; Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/semantic/ede-grammar.el b/lisp/cedet/semantic/ede-grammar.el index d435ff6b6e9..bd0795acbd6 100644 --- a/lisp/cedet/semantic/ede-grammar.el +++ b/lisp/cedet/semantic/ede-grammar.el @@ -1,6 +1,6 @@ ;;; semantic/ede-grammar.el --- EDE support for Semantic Grammar Files -;; Copyright (C) 2003-2004, 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2003-2004, 2007-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> ;; Keywords: project, make diff --git a/lisp/cedet/semantic/edit.el b/lisp/cedet/semantic/edit.el index e4319c7d1b3..f39cc093cc9 100644 --- a/lisp/cedet/semantic/edit.el +++ b/lisp/cedet/semantic/edit.el @@ -1,6 +1,6 @@ ;;; semantic/edit.el --- Edit Management for Semantic -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/semantic/find.el b/lisp/cedet/semantic/find.el index 02c68e7484e..706892b4861 100644 --- a/lisp/cedet/semantic/find.el +++ b/lisp/cedet/semantic/find.el @@ -1,6 +1,6 @@ ;;; semantic/find.el --- Search routines for Semantic -;; Copyright (C) 1999-2005, 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2005, 2008-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> ;; Keywords: syntax diff --git a/lisp/cedet/semantic/format.el b/lisp/cedet/semantic/format.el index e972015c6bf..f9c5365a29f 100644 --- a/lisp/cedet/semantic/format.el +++ b/lisp/cedet/semantic/format.el @@ -1,6 +1,6 @@ ;;; semantic/format.el --- Routines for formatting tags -;; Copyright (C) 1999-2005, 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2005, 2007-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> ;; Keywords: syntax diff --git a/lisp/cedet/semantic/fw.el b/lisp/cedet/semantic/fw.el index c86cd3abf3d..f034ba01a4f 100644 --- a/lisp/cedet/semantic/fw.el +++ b/lisp/cedet/semantic/fw.el @@ -1,6 +1,6 @@ ;;; semantic/fw.el --- Framework for Semantic -;;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/semantic/grammar-wy.el b/lisp/cedet/semantic/grammar-wy.el index 93fbedeff0a..12c9c047fc5 100644 --- a/lisp/cedet/semantic/grammar-wy.el +++ b/lisp/cedet/semantic/grammar-wy.el @@ -1,6 +1,6 @@ ;;; semantic/grammar-wy.el --- Generated parser support file -;; Copyright (C) 2002-2004, 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002-2004, 2009-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/lisp/cedet/semantic/grammar.el b/lisp/cedet/semantic/grammar.el index d3379462f4b..7721a834ea4 100644 --- a/lisp/cedet/semantic/grammar.el +++ b/lisp/cedet/semantic/grammar.el @@ -1,6 +1,6 @@ ;;; semantic/grammar.el --- Major mode framework for Semantic grammars -;; Copyright (C) 2002-2005, 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002-2005, 2007-2021 Free Software Foundation, Inc. ;; Author: David Ponce <david@dponce.com> diff --git a/lisp/cedet/semantic/html.el b/lisp/cedet/semantic/html.el index 537bc39a5fe..658d218a4a3 100644 --- a/lisp/cedet/semantic/html.el +++ b/lisp/cedet/semantic/html.el @@ -1,6 +1,6 @@ ;;; semantic/html.el --- Semantic details for html files -;; Copyright (C) 2004-2005, 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2004-2005, 2007-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/semantic/ia-sb.el b/lisp/cedet/semantic/ia-sb.el index baa6ade8785..b132d41cd4a 100644 --- a/lisp/cedet/semantic/ia-sb.el +++ b/lisp/cedet/semantic/ia-sb.el @@ -1,6 +1,6 @@ ;;; semantic/ia-sb.el --- Speedbar analysis display interactor -;;; Copyright (C) 2002-2004, 2006, 2008-2020 Free Software Foundation, +;;; Copyright (C) 2002-2004, 2006, 2008-2021 Free Software Foundation, ;;; Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/semantic/ia.el b/lisp/cedet/semantic/ia.el index e6711608386..6d3ec7570b5 100644 --- a/lisp/cedet/semantic/ia.el +++ b/lisp/cedet/semantic/ia.el @@ -1,6 +1,6 @@ ;;; semantic/ia.el --- Interactive Analysis functions -;;; Copyright (C) 2000-2020 Free Software Foundation, Inc. +;;; Copyright (C) 2000-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> ;; Keywords: syntax diff --git a/lisp/cedet/semantic/idle.el b/lisp/cedet/semantic/idle.el index 8301b195309..4898c85b216 100644 --- a/lisp/cedet/semantic/idle.el +++ b/lisp/cedet/semantic/idle.el @@ -1,6 +1,6 @@ ;;; idle.el --- Schedule parsing tasks in idle time -;; Copyright (C) 2003-2006, 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2003-2006, 2008-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> ;; Keywords: syntax diff --git a/lisp/cedet/semantic/imenu.el b/lisp/cedet/semantic/imenu.el index c910dc8fc6b..2898f3711a0 100644 --- a/lisp/cedet/semantic/imenu.el +++ b/lisp/cedet/semantic/imenu.el @@ -1,6 +1,6 @@ ;;; semantic/imenu.el --- Use Semantic as an imenu tag generator -;; Copyright (C) 2000-2005, 2007-2008, 2010-2020 Free Software +;; Copyright (C) 2000-2005, 2007-2008, 2010-2021 Free Software ;; Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/semantic/java.el b/lisp/cedet/semantic/java.el index cc53f69691b..f60f6e87ab7 100644 --- a/lisp/cedet/semantic/java.el +++ b/lisp/cedet/semantic/java.el @@ -1,6 +1,6 @@ ;;; semantic/java.el --- Semantic functions for Java -;;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: David Ponce <david@dponce.com> diff --git a/lisp/cedet/semantic/lex-spp.el b/lisp/cedet/semantic/lex-spp.el index e6e124eb812..8b83c09eb16 100644 --- a/lisp/cedet/semantic/lex-spp.el +++ b/lisp/cedet/semantic/lex-spp.el @@ -1,6 +1,6 @@ ;;; semantic/lex-spp.el --- Semantic Lexical Pre-processor -;; Copyright (C) 2006-2020 Free Software Foundation, Inc. +;; Copyright (C) 2006-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/semantic/lex.el b/lisp/cedet/semantic/lex.el index 809271ddccd..993c1dc14b6 100644 --- a/lisp/cedet/semantic/lex.el +++ b/lisp/cedet/semantic/lex.el @@ -1,6 +1,6 @@ ;;; semantic/lex.el --- Lexical Analyzer builder -*- lexical-binding:t -*- -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/semantic/mru-bookmark.el b/lisp/cedet/semantic/mru-bookmark.el index bd32f98233f..956eb681f2c 100644 --- a/lisp/cedet/semantic/mru-bookmark.el +++ b/lisp/cedet/semantic/mru-bookmark.el @@ -1,6 +1,6 @@ ;;; semantic/mru-bookmark.el --- Automatic bookmark tracking -;; Copyright (C) 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2007-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/semantic/sb.el b/lisp/cedet/semantic/sb.el index b038d4066a2..d7cd8e1940c 100644 --- a/lisp/cedet/semantic/sb.el +++ b/lisp/cedet/semantic/sb.el @@ -1,6 +1,6 @@ ;;; semantic/sb.el --- Semantic tag display for speedbar -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> ;; Keywords: syntax diff --git a/lisp/cedet/semantic/scope.el b/lisp/cedet/semantic/scope.el index 7939438b1b0..31576d29bc6 100644 --- a/lisp/cedet/semantic/scope.el +++ b/lisp/cedet/semantic/scope.el @@ -1,6 +1,6 @@ ;;; semantic/scope.el --- Analyzer Scope Calculations -;; Copyright (C) 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2007-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/semantic/senator.el b/lisp/cedet/semantic/senator.el index d21350749ba..6768b432f69 100644 --- a/lisp/cedet/semantic/senator.el +++ b/lisp/cedet/semantic/senator.el @@ -1,6 +1,6 @@ ;;; semantic/senator.el --- SEmantic NAvigaTOR -;; Copyright (C) 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 2000-2021 Free Software Foundation, Inc. ;; Author: David Ponce <david@dponce.com> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/cedet/semantic/sort.el b/lisp/cedet/semantic/sort.el index a565d878f15..154a56a27aa 100644 --- a/lisp/cedet/semantic/sort.el +++ b/lisp/cedet/semantic/sort.el @@ -1,6 +1,6 @@ ;;; semantic/sort.el --- Utilities for sorting and re-arranging tag tables. -;;; Copyright (C) 1999-2005, 2007-2020 Free Software Foundation, Inc. +;;; Copyright (C) 1999-2005, 2007-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> ;; Keywords: syntax diff --git a/lisp/cedet/semantic/symref.el b/lisp/cedet/semantic/symref.el index 6bdec717457..d7f91573d3d 100644 --- a/lisp/cedet/semantic/symref.el +++ b/lisp/cedet/semantic/symref.el @@ -1,6 +1,6 @@ ;;; semantic/symref.el --- Symbol Reference API -;; Copyright (C) 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2008-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> @@ -511,9 +511,10 @@ Optional OPEN-BUFFERS, when nil will use a faster version of `find-file' when a file needs to be opened. If non-nil, then normal buffer initialization will be used. This function will leave buffers loaded from a file open, but -will add buffers that must be opened to `semantic-symref-recently-opened-buffers'. -Any caller MUST deal with that variable, either clearing it, or deleting the -buffers that were opened." +will add buffers that must be opened to +`semantic-symref-recently-opened-buffers'. +Any caller MUST deal with that variable, either clearing it, or +deleting the buffers that were opened." (let* ((line (car hit)) (file (cdr hit)) (buff (find-buffer-visiting file)) diff --git a/lisp/cedet/semantic/symref/cscope.el b/lisp/cedet/semantic/symref/cscope.el index 502d59d745a..3686e519460 100644 --- a/lisp/cedet/semantic/symref/cscope.el +++ b/lisp/cedet/semantic/symref/cscope.el @@ -1,6 +1,6 @@ ;;; semantic/symref/cscope.el --- Semantic-symref support via cscope. -;;; Copyright (C) 2009-2020 Free Software Foundation, Inc. +;;; Copyright (C) 2009-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/semantic/symref/filter.el b/lisp/cedet/semantic/symref/filter.el index 19ce37463af..a40ce13f3d6 100644 --- a/lisp/cedet/semantic/symref/filter.el +++ b/lisp/cedet/semantic/symref/filter.el @@ -1,6 +1,6 @@ ;;; semantic/symref/filter.el --- Filter symbol reference hits for accuracy. -;; Copyright (C) 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2009-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/semantic/symref/global.el b/lisp/cedet/semantic/symref/global.el index 6bb0929601d..7f63e4ddbc0 100644 --- a/lisp/cedet/semantic/symref/global.el +++ b/lisp/cedet/semantic/symref/global.el @@ -1,6 +1,6 @@ ;;; semantic/symref/global.el --- Use GNU Global for symbol references -;; Copyright (C) 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2008-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/semantic/symref/grep.el b/lisp/cedet/semantic/symref/grep.el index 29e88cda125..5f9a3fa352e 100644 --- a/lisp/cedet/semantic/symref/grep.el +++ b/lisp/cedet/semantic/symref/grep.el @@ -1,6 +1,6 @@ ;;; semantic/symref/grep.el --- Symref implementation using find/grep -;; Copyright (C) 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2008-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/semantic/symref/idutils.el b/lisp/cedet/semantic/symref/idutils.el index 006cc508165..4a41355dd69 100644 --- a/lisp/cedet/semantic/symref/idutils.el +++ b/lisp/cedet/semantic/symref/idutils.el @@ -1,6 +1,6 @@ ;;; semantic/symref/idutils.el --- Symref implementation for idutils -;;; Copyright (C) 2009-2020 Free Software Foundation, Inc. +;;; Copyright (C) 2009-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/semantic/symref/list.el b/lisp/cedet/semantic/symref/list.el index d64d4dd38cd..7d3a5ddc2dc 100644 --- a/lisp/cedet/semantic/symref/list.el +++ b/lisp/cedet/semantic/symref/list.el @@ -1,6 +1,6 @@ ;;; semantic/symref/list.el --- Symref Output List UI. -;; Copyright (C) 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2008-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/semantic/tag-file.el b/lisp/cedet/semantic/tag-file.el index 23f4b29cbd6..fc5c27752a0 100644 --- a/lisp/cedet/semantic/tag-file.el +++ b/lisp/cedet/semantic/tag-file.el @@ -1,6 +1,6 @@ ;;; semantic/tag-file.el --- Routines that find files based on tags. -;; Copyright (C) 1999-2005, 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2005, 2007-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> ;; Keywords: syntax diff --git a/lisp/cedet/semantic/tag-ls.el b/lisp/cedet/semantic/tag-ls.el index d07e5652484..6cef603af35 100644 --- a/lisp/cedet/semantic/tag-ls.el +++ b/lisp/cedet/semantic/tag-ls.el @@ -1,6 +1,6 @@ ;;; semantic/tag-ls.el --- Language Specific override functions for tags -;; Copyright (C) 1999-2004, 2006-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2004, 2006-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/semantic/tag-write.el b/lisp/cedet/semantic/tag-write.el index cd77caaa208..f705c89c904 100644 --- a/lisp/cedet/semantic/tag-write.el +++ b/lisp/cedet/semantic/tag-write.el @@ -1,6 +1,6 @@ ;;; semantic/tag-write.el --- Write tags to a text stream -;; Copyright (C) 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2008-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/semantic/tag.el b/lisp/cedet/semantic/tag.el index 3dadf347736..d68ffa55d6e 100644 --- a/lisp/cedet/semantic/tag.el +++ b/lisp/cedet/semantic/tag.el @@ -1,6 +1,6 @@ ;;; semantic/tag.el --- tag creation and access -;; Copyright (C) 1999-2005, 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2005, 2007-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/semantic/texi.el b/lisp/cedet/semantic/texi.el index 8e8d362ceb5..377cec5455d 100644 --- a/lisp/cedet/semantic/texi.el +++ b/lisp/cedet/semantic/texi.el @@ -1,6 +1,6 @@ ;;; semantic/texi.el --- Semantic details for Texinfo files -;; Copyright (C) 2001-2005, 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2001-2005, 2007-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/semantic/util-modes.el b/lisp/cedet/semantic/util-modes.el index 8bfee432c3f..45eef10f005 100644 --- a/lisp/cedet/semantic/util-modes.el +++ b/lisp/cedet/semantic/util-modes.el @@ -1,6 +1,6 @@ ;;; semantic/util-modes.el --- Semantic minor modes -;; Copyright (C) 2000-2005, 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2000-2005, 2007-2021 Free Software Foundation, Inc. ;; Authors: Eric M. Ludlam <zappo@gnu.org> ;; David Ponce <david@dponce.com> diff --git a/lisp/cedet/semantic/util.el b/lisp/cedet/semantic/util.el index 7df7dfcb75f..7d33d0e0886 100644 --- a/lisp/cedet/semantic/util.el +++ b/lisp/cedet/semantic/util.el @@ -1,6 +1,6 @@ ;;; semantic/util.el --- Utilities for use with semantic tag tables -;;; Copyright (C) 1999-2005, 2007-2020 Free Software Foundation, Inc. +;;; Copyright (C) 1999-2005, 2007-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> ;; Keywords: syntax diff --git a/lisp/cedet/semantic/wisent.el b/lisp/cedet/semantic/wisent.el index 15d1313dfa4..fb4d0b074ad 100644 --- a/lisp/cedet/semantic/wisent.el +++ b/lisp/cedet/semantic/wisent.el @@ -1,6 +1,6 @@ ;;; semantic/wisent.el --- Wisent - Semantic gateway -;; Copyright (C) 2001-2007, 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2001-2007, 2009-2021 Free Software Foundation, Inc. ;; Author: David Ponce <david@dponce.com> ;; Created: 30 Aug 2001 diff --git a/lisp/cedet/semantic/wisent/comp.el b/lisp/cedet/semantic/wisent/comp.el index 42c5756b987..755d30a371b 100644 --- a/lisp/cedet/semantic/wisent/comp.el +++ b/lisp/cedet/semantic/wisent/comp.el @@ -1,6 +1,6 @@ ;;; semantic/wisent/comp.el --- GNU Bison for Emacs - Grammar compiler -;; Copyright (C) 1984, 1986, 1989, 1992, 1995, 2000-2007, 2009-2020 Free +;; Copyright (C) 1984, 1986, 1989, 1992, 1995, 2000-2007, 2009-2021 Free ;; Software Foundation, Inc. ;; Author: David Ponce <david@dponce.com> diff --git a/lisp/cedet/semantic/wisent/grammar.el b/lisp/cedet/semantic/wisent/grammar.el index 0ff9cde80ef..cfd4899186b 100644 --- a/lisp/cedet/semantic/wisent/grammar.el +++ b/lisp/cedet/semantic/wisent/grammar.el @@ -1,6 +1,6 @@ ;;; semantic/wisent/grammar.el --- Wisent's input grammar mode -;; Copyright (C) 2002-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002-2021 Free Software Foundation, Inc. ;; ;; Author: David Ponce <david@dponce.com> ;; Created: 26 Aug 2002 diff --git a/lisp/cedet/semantic/wisent/java-tags.el b/lisp/cedet/semantic/wisent/java-tags.el index 0eed98cc43c..d455c02d1b5 100644 --- a/lisp/cedet/semantic/wisent/java-tags.el +++ b/lisp/cedet/semantic/wisent/java-tags.el @@ -1,6 +1,6 @@ ;;; semantic/wisent/java-tags.el --- Java LALR parser for Emacs -;; Copyright (C) 2001-2006, 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2001-2006, 2009-2021 Free Software Foundation, Inc. ;; Author: David Ponce <david@dponce.com> ;; Created: 15 Dec 2001 diff --git a/lisp/cedet/semantic/wisent/javascript.el b/lisp/cedet/semantic/wisent/javascript.el index 90bf7fab5c1..684eea1d93d 100644 --- a/lisp/cedet/semantic/wisent/javascript.el +++ b/lisp/cedet/semantic/wisent/javascript.el @@ -1,6 +1,6 @@ ;;; semantic/wisent/javascript.el --- javascript parser support -;; Copyright (C) 2005, 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2005, 2009-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> ;; Keywords: syntax diff --git a/lisp/cedet/semantic/wisent/python.el b/lisp/cedet/semantic/wisent/python.el index 66d21f73143..7769ad1961b 100644 --- a/lisp/cedet/semantic/wisent/python.el +++ b/lisp/cedet/semantic/wisent/python.el @@ -1,6 +1,6 @@ ;;; wisent-python.el --- Semantic support for Python -;; Copyright (C) 2002, 2004, 2006-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2004, 2006-2021 Free Software Foundation, Inc. ;; Author: Richard Kim <emacs18@gmail.com> ;; Created: June 2002 diff --git a/lisp/cedet/semantic/wisent/wisent.el b/lisp/cedet/semantic/wisent/wisent.el index a0a8bed1eaf..26cf87f8425 100644 --- a/lisp/cedet/semantic/wisent/wisent.el +++ b/lisp/cedet/semantic/wisent/wisent.el @@ -1,6 +1,6 @@ ;;; semantic/wisent/wisent.el --- GNU Bison for Emacs - Runtime -;;; Copyright (C) 2002-2007, 2009-2020 Free Software Foundation, Inc. +;;; Copyright (C) 2002-2007, 2009-2021 Free Software Foundation, Inc. ;; Author: David Ponce <david@dponce.com> ;; Created: 30 January 2002 diff --git a/lisp/cedet/srecode.el b/lisp/cedet/srecode.el index 79c8afff348..aa4aa812e02 100644 --- a/lisp/cedet/srecode.el +++ b/lisp/cedet/srecode.el @@ -1,6 +1,6 @@ ;;; srecode.el --- Semantic buffer evaluator. -*- lexical-binding: t -*- -;;; Copyright (C) 2005, 2007-2020 Free Software Foundation, Inc. +;;; Copyright (C) 2005, 2007-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> ;; Keywords: codegeneration diff --git a/lisp/cedet/srecode/args.el b/lisp/cedet/srecode/args.el index 4ac5047ae08..24c5f22f2e7 100644 --- a/lisp/cedet/srecode/args.el +++ b/lisp/cedet/srecode/args.el @@ -1,6 +1,6 @@ ;;; srecode/args.el --- Provide some simple template arguments -;; Copyright (C) 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2007-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/srecode/compile.el b/lisp/cedet/srecode/compile.el index 9f81b2bccc2..7146b643836 100644 --- a/lisp/cedet/srecode/compile.el +++ b/lisp/cedet/srecode/compile.el @@ -1,6 +1,6 @@ ;;; srecode/compile --- Compilation of srecode template files. -;; Copyright (C) 2005, 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2005, 2007-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> ;; Keywords: codegeneration diff --git a/lisp/cedet/srecode/cpp.el b/lisp/cedet/srecode/cpp.el index 3e40472654e..1b9610f3f1b 100644 --- a/lisp/cedet/srecode/cpp.el +++ b/lisp/cedet/srecode/cpp.el @@ -1,6 +1,6 @@ ;;; srecode/cpp.el --- C++ specific handlers for Semantic Recoder -;; Copyright (C) 2007, 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> ;; Jan Moringen <scymtym@users.sourceforge.net> diff --git a/lisp/cedet/srecode/ctxt.el b/lisp/cedet/srecode/ctxt.el index 3d990219b82..20334f95838 100644 --- a/lisp/cedet/srecode/ctxt.el +++ b/lisp/cedet/srecode/ctxt.el @@ -1,6 +1,6 @@ ;;; srecode/ctxt.el --- Derive a context from the source buffer. -;; Copyright (C) 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2007-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/srecode/dictionary.el b/lisp/cedet/srecode/dictionary.el index 4322b09137d..c1fe4b2c34e 100644 --- a/lisp/cedet/srecode/dictionary.el +++ b/lisp/cedet/srecode/dictionary.el @@ -1,6 +1,6 @@ ;;; srecode/dictionary.el --- Dictionary code for the semantic recoder. -;; Copyright (C) 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2007-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/srecode/document.el b/lisp/cedet/srecode/document.el index fdb44695918..0d1a4c01d3c 100644 --- a/lisp/cedet/srecode/document.el +++ b/lisp/cedet/srecode/document.el @@ -1,6 +1,6 @@ ;;; srecode/document.el --- Documentation (comment) generation -;; Copyright (C) 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2008-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/srecode/el.el b/lisp/cedet/srecode/el.el index 4095b1c119c..7e9dd10fd42 100644 --- a/lisp/cedet/srecode/el.el +++ b/lisp/cedet/srecode/el.el @@ -1,6 +1,6 @@ ;;; srecode/el.el --- Emacs Lisp specific arguments -;; Copyright (C) 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2008-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/srecode/expandproto.el b/lisp/cedet/srecode/expandproto.el index e7601f5dd2b..cdb29d16b71 100644 --- a/lisp/cedet/srecode/expandproto.el +++ b/lisp/cedet/srecode/expandproto.el @@ -1,6 +1,6 @@ ;;; srecode/expandproto.el --- Expanding prototypes. -;; Copyright (C) 2007, 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/srecode/extract.el b/lisp/cedet/srecode/extract.el index 51c5fe4d184..625b854b776 100644 --- a/lisp/cedet/srecode/extract.el +++ b/lisp/cedet/srecode/extract.el @@ -1,6 +1,6 @@ ;;; srecode/extract.el --- Extract content from previously inserted macro. -;; Copyright (C) 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2008-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/srecode/fields.el b/lisp/cedet/srecode/fields.el index 87c7c684dab..71613bcc2a3 100644 --- a/lisp/cedet/srecode/fields.el +++ b/lisp/cedet/srecode/fields.el @@ -1,6 +1,6 @@ ;;; srecode/fields.el --- Handling type-in fields in a buffer. ;; -;; Copyright (C) 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2009-2021 Free Software Foundation, Inc. ;; ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/srecode/filters.el b/lisp/cedet/srecode/filters.el index ee672a5116f..4a996cf6f12 100644 --- a/lisp/cedet/srecode/filters.el +++ b/lisp/cedet/srecode/filters.el @@ -1,6 +1,6 @@ ;;; srecode/filters.el --- Filters for use in template variables. -;; Copyright (C) 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2007-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/srecode/find.el b/lisp/cedet/srecode/find.el index c6bb62b7aa4..aec73dce5a5 100644 --- a/lisp/cedet/srecode/find.el +++ b/lisp/cedet/srecode/find.el @@ -1,6 +1,6 @@ ;;;; srecode/find.el --- Tools for finding templates in the database. -;; Copyright (C) 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2007-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/srecode/getset.el b/lisp/cedet/srecode/getset.el index 2e063812ca1..1e4888655f9 100644 --- a/lisp/cedet/srecode/getset.el +++ b/lisp/cedet/srecode/getset.el @@ -1,6 +1,6 @@ ;;; srecode/getset.el --- Package for inserting new get/set methods. -;; Copyright (C) 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2007-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/srecode/insert.el b/lisp/cedet/srecode/insert.el index c28f7be03a1..ab0503c8d36 100644 --- a/lisp/cedet/srecode/insert.el +++ b/lisp/cedet/srecode/insert.el @@ -1,6 +1,6 @@ ;;; srecode/insert.el --- Insert srecode templates to an output stream -*- lexical-binding:t -*- -;; Copyright (C) 2005, 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2005, 2007-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/srecode/java.el b/lisp/cedet/srecode/java.el index fa508df0549..768d48a7c5b 100644 --- a/lisp/cedet/srecode/java.el +++ b/lisp/cedet/srecode/java.el @@ -1,6 +1,6 @@ ;;; srecode/java.el --- Srecode Java support -;; Copyright (C) 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2009-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/srecode/map.el b/lisp/cedet/srecode/map.el index dc949200968..a94db0bb8d9 100644 --- a/lisp/cedet/srecode/map.el +++ b/lisp/cedet/srecode/map.el @@ -1,6 +1,6 @@ ;;; srecode/map.el --- Manage a template file map -;; Copyright (C) 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2008-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/srecode/mode.el b/lisp/cedet/srecode/mode.el index c94c0fc034d..159dc7a999b 100644 --- a/lisp/cedet/srecode/mode.el +++ b/lisp/cedet/srecode/mode.el @@ -1,6 +1,6 @@ ;;; srecode/mode.el --- Minor mode for managing and using SRecode templates -;; Copyright (C) 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2008-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/srecode/semantic.el b/lisp/cedet/srecode/semantic.el index 5b2dd034743..21ed1f96ae6 100644 --- a/lisp/cedet/srecode/semantic.el +++ b/lisp/cedet/srecode/semantic.el @@ -1,6 +1,6 @@ ;;; srecode/semantic.el --- Semantic specific extensions to SRecode. -;; Copyright (C) 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2007-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/srecode/srt-mode.el b/lisp/cedet/srecode/srt-mode.el index d82da40de80..bbe1e5e469c 100644 --- a/lisp/cedet/srecode/srt-mode.el +++ b/lisp/cedet/srecode/srt-mode.el @@ -1,6 +1,6 @@ ;;; srecode/srt-mode.el --- Major mode for writing screcode macros -;; Copyright (C) 2005, 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2005, 2007-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/lisp/cedet/srecode/srt.el b/lisp/cedet/srecode/srt.el index ef0ef0d0fd5..e222997708b 100644 --- a/lisp/cedet/srecode/srt.el +++ b/lisp/cedet/srecode/srt.el @@ -1,6 +1,6 @@ ;;; srecode/srt.el --- argument handlers for SRT files -;; Copyright (C) 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2008-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/srecode/table.el b/lisp/cedet/srecode/table.el index 55093d655cf..60a466f89d9 100644 --- a/lisp/cedet/srecode/table.el +++ b/lisp/cedet/srecode/table.el @@ -1,6 +1,6 @@ ;;; srecode/table.el --- Tables of Semantic Recoders -;; Copyright (C) 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2007-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/cedet/srecode/template.el b/lisp/cedet/srecode/template.el index 68c2ee7b75d..e9e5115128f 100644 --- a/lisp/cedet/srecode/template.el +++ b/lisp/cedet/srecode/template.el @@ -1,6 +1,6 @@ ;;; srecode/template.el --- SRecoder template language parser support. -;; Copyright (C) 2005, 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2005, 2007-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/lisp/cedet/srecode/texi.el b/lisp/cedet/srecode/texi.el index 3aefcfd30e9..892ae4e2e31 100644 --- a/lisp/cedet/srecode/texi.el +++ b/lisp/cedet/srecode/texi.el @@ -1,6 +1,6 @@ ;;; srecode/texi.el --- Srecode texinfo support. -;; Copyright (C) 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2008-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/char-fold.el b/lisp/char-fold.el index 34561a2efe6..46a3f93d0af 100644 --- a/lisp/char-fold.el +++ b/lisp/char-fold.el @@ -1,6 +1,6 @@ ;;; char-fold.el --- match unicode to similar ASCII -*- lexical-binding: t; -*- -;; Copyright (C) 2015-2020 Free Software Foundation, Inc. +;; Copyright (C) 2015-2021 Free Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org ;; Keywords: matching diff --git a/lisp/chistory.el b/lisp/chistory.el index 98443bfa88f..589b5b5feb9 100644 --- a/lisp/chistory.el +++ b/lisp/chistory.el @@ -1,6 +1,6 @@ ;;; chistory.el --- list command history -;; Copyright (C) 1985, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1985, 2001-2021 Free Software Foundation, Inc. ;; Author: K. Shane Hartman ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/cmuscheme.el b/lisp/cmuscheme.el index 7191b933e41..772891d5d31 100644 --- a/lisp/cmuscheme.el +++ b/lisp/cmuscheme.el @@ -1,6 +1,6 @@ ;;; cmuscheme.el --- Scheme process in a buffer. Adapted from tea.el -;; Copyright (C) 1988, 1994, 1997, 2001-2020 Free Software Foundation, +;; Copyright (C) 1988, 1994, 1997, 2001-2021 Free Software Foundation, ;; Inc. ;; Author: Olin Shivers <olin.shivers@cs.cmu.edu> diff --git a/lisp/color.el b/lisp/color.el index 48f150de70c..258acbe4053 100644 --- a/lisp/color.el +++ b/lisp/color.el @@ -1,6 +1,6 @@ ;;; color.el --- Color manipulation library -*- lexical-binding:t -*- -;; Copyright (C) 2010-2020 Free Software Foundation, Inc. +;; Copyright (C) 2010-2021 Free Software Foundation, Inc. ;; Authors: Julien Danjou <julien@danjou.info> ;; Drew Adams <drew.adams@oracle.com> diff --git a/lisp/comint.el b/lisp/comint.el index 628a93ddf95..2e683a75724 100644 --- a/lisp/comint.el +++ b/lisp/comint.el @@ -1,6 +1,6 @@ ;;; comint.el --- general command interpreter in a window stuff -*- lexical-binding: t -*- -;; Copyright (C) 1988, 1990, 1992-2020 Free Software Foundation, Inc. +;; Copyright (C) 1988, 1990, 1992-2021 Free Software Foundation, Inc. ;; Author: Olin Shivers <shivers@cs.cmu.edu> ;; Simon Marshall <simon@gnu.org> diff --git a/lisp/completion.el b/lisp/completion.el index 8a4c1676145..8810a22d262 100644 --- a/lisp/completion.el +++ b/lisp/completion.el @@ -1,6 +1,6 @@ ;;; completion.el --- dynamic word-completion code -;; Copyright (C) 1990, 1993, 1995, 1997, 2001-2020 Free Software +;; Copyright (C) 1990, 1993, 1995, 1997, 2001-2021 Free Software ;; Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/composite.el b/lisp/composite.el index 0a8dcb875c9..7337605d4a9 100644 --- a/lisp/composite.el +++ b/lisp/composite.el @@ -1,6 +1,6 @@ ;;; composite.el --- support character composition -;; Copyright (C) 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 2001-2021 Free Software Foundation, Inc. ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, ;; 2008, 2009, 2010, 2011 diff --git a/lisp/cus-dep.el b/lisp/cus-dep.el index 01b804974d4..60dc0a91528 100644 --- a/lisp/cus-dep.el +++ b/lisp/cus-dep.el @@ -1,6 +1,6 @@ ;;; cus-dep.el --- find customization dependencies ;; -;; Copyright (C) 1997, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997, 2001-2021 Free Software Foundation, Inc. ;; ;; Author: Per Abrahamsen <abraham@dina.kvl.dk> ;; Keywords: internal diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el index 041f13b420b..e52df4e6a2c 100644 --- a/lisp/cus-edit.el +++ b/lisp/cus-edit.el @@ -1,6 +1,6 @@ ;;; cus-edit.el --- tools for customizing Emacs and Lisp packages -*- lexical-binding:t -*- ;; -;; Copyright (C) 1996-1997, 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996-1997, 1999-2021 Free Software Foundation, Inc. ;; ;; Author: Per Abrahamsen <abraham@dina.kvl.dk> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/cus-face.el b/lisp/cus-face.el index 199a76e5cc8..7d9d1fe13ae 100644 --- a/lisp/cus-face.el +++ b/lisp/cus-face.el @@ -1,6 +1,6 @@ ;;; cus-face.el --- customization support for faces ;; -;; Copyright (C) 1996-1997, 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996-1997, 1999-2021 Free Software Foundation, Inc. ;; ;; Author: Per Abrahamsen <abraham@dina.kvl.dk> ;; Keywords: help, faces diff --git a/lisp/cus-start.el b/lisp/cus-start.el index 04fb1dc6d06..85dd14f6282 100644 --- a/lisp/cus-start.el +++ b/lisp/cus-start.el @@ -1,6 +1,6 @@ ;;; cus-start.el --- define customization properties of builtins -*- lexical-binding:t -*- -;; Copyright (C) 1997, 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997, 1999-2021 Free Software Foundation, Inc. ;; Author: Per Abrahamsen <abraham@dina.kvl.dk> ;; Keywords: internal diff --git a/lisp/cus-theme.el b/lisp/cus-theme.el index dc463e05f92..a702fedd245 100644 --- a/lisp/cus-theme.el +++ b/lisp/cus-theme.el @@ -1,6 +1,6 @@ ;;; cus-theme.el -- custom theme creation user interface -*- lexical-binding: t -*- ;; -;; Copyright (C) 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 2001-2021 Free Software Foundation, Inc. ;; ;; Author: Alex Schroeder <alex@gnu.org> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/custom.el b/lisp/custom.el index 0b2b325bdaf..dfa8539c44f 100644 --- a/lisp/custom.el +++ b/lisp/custom.el @@ -1,6 +1,6 @@ ;;; custom.el --- tools for declaring and initializing options -*- lexical-binding: t -*- ;; -;; Copyright (C) 1996-1997, 1999, 2001-2020 Free Software Foundation, +;; Copyright (C) 1996-1997, 1999, 2001-2021 Free Software Foundation, ;; Inc. ;; ;; Author: Per Abrahamsen <abraham@dina.kvl.dk> diff --git a/lisp/dabbrev.el b/lisp/dabbrev.el index c8bb749eb38..e113cc94c33 100644 --- a/lisp/dabbrev.el +++ b/lisp/dabbrev.el @@ -1,6 +1,6 @@ ;;; dabbrev.el --- dynamic abbreviation package -*- lexical-binding: t -*- -;; Copyright (C) 1985-1986, 1992, 1994, 1996-1997, 2000-2020 Free +;; Copyright (C) 1985-1986, 1992, 1994, 1996-1997, 2000-2021 Free ;; Software Foundation, Inc. ;; Author: Don Morrison diff --git a/lisp/delim-col.el b/lisp/delim-col.el index 1d4358d7385..cd945d8de45 100644 --- a/lisp/delim-col.el +++ b/lisp/delim-col.el @@ -1,6 +1,6 @@ ;;; delim-col.el --- prettify all columns in a region or rectangle -*- lexical-binding: t; -*- -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com> ;; Old-Version: 2.1 diff --git a/lisp/delsel.el b/lisp/delsel.el index e1087fb3919..982320340d8 100644 --- a/lisp/delsel.el +++ b/lisp/delsel.el @@ -1,6 +1,6 @@ ;;; delsel.el --- delete selection if you insert -*- lexical-binding:t -*- -;; Copyright (C) 1992, 1997-1998, 2001-2020 Free Software Foundation, +;; Copyright (C) 1992, 1997-1998, 2001-2021 Free Software Foundation, ;; Inc. ;; Author: Matthieu Devin <devin@lucid.com> diff --git a/lisp/descr-text.el b/lisp/descr-text.el index 677db2f68a9..85017de5d5e 100644 --- a/lisp/descr-text.el +++ b/lisp/descr-text.el @@ -1,6 +1,6 @@ ;;; descr-text.el --- describe text mode -*- lexical-binding:t -*- -;; Copyright (C) 1994-1996, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1994-1996, 2001-2021 Free Software Foundation, Inc. ;; Author: Boris Goldowsky <boris@gnu.org> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/desktop.el b/lisp/desktop.el index 4be330375da..fb7c6c79a1a 100644 --- a/lisp/desktop.el +++ b/lisp/desktop.el @@ -1,6 +1,6 @@ ;;; desktop.el --- save partial status of Emacs when killed -*- lexical-binding: t -*- -;; Copyright (C) 1993-1995, 1997, 2000-2020 Free Software Foundation, +;; Copyright (C) 1993-1995, 1997, 2000-2021 Free Software Foundation, ;; Inc. ;; Author: Morten Welinder <terra@diku.dk> diff --git a/lisp/dframe.el b/lisp/dframe.el index 31e571410bc..09d2fe40794 100644 --- a/lisp/dframe.el +++ b/lisp/dframe.el @@ -1,6 +1,6 @@ ;;; dframe --- dedicate frame support modes -*- lexical-binding:t -*- -;; Copyright (C) 1996-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> ;; Keywords: file, tags, tools diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el index 0f68b470733..5a96742fda9 100644 --- a/lisp/dired-aux.el +++ b/lisp/dired-aux.el @@ -1,6 +1,6 @@ ;;; dired-aux.el --- less commonly used parts of dired -*- lexical-binding: t -*- -;; Copyright (C) 1985-1986, 1992, 1994, 1998, 2000-2020 Free Software +;; Copyright (C) 1985-1986, 1992, 1994, 1998, 2000-2021 Free Software ;; Foundation, Inc. ;; Author: Sebastian Kremer <sk@thp.uni-koeln.de>. @@ -145,7 +145,7 @@ substituted, and will be passed through normally to the shell. (defun dired--no-subst-ask (char nb-occur details) (let ((hilit-char (propertize (string char) 'face 'warning)) (choices `(?y ?n ?? ,@(when details '(?^))))) - (read-char-from-minibuffer + (read-char-choice (format-message (ngettext "%d occurrence of `%s' will not be substituted. Proceed? (%s) " @@ -1380,7 +1380,7 @@ return t; if SYM is q or ESC, return nil." (format " [Type yn!q or %s] " (key-description (vector help-char))) " [Type y, n, q or !] "))) - (set sym (setq char (read-char-from-minibuffer prompt char-choices))) + (set sym (setq char (read-char-choice prompt char-choices))) (if (memq char '(?y ?\s ?!)) t))))) diff --git a/lisp/dired-x.el b/lisp/dired-x.el index 75e4f466246..5a52eccbbe3 100644 --- a/lisp/dired-x.el +++ b/lisp/dired-x.el @@ -1,6 +1,6 @@ ;;; dired-x.el --- extra Dired functionality -*- lexical-binding:t -*- -;; Copyright (C) 1993-1994, 1997, 2001-2020 Free Software Foundation, +;; Copyright (C) 1993-1994, 1997, 2001-2021 Free Software Foundation, ;; Inc. ;; Author: Sebastian Kremer <sk@thp.uni-koeln.de> diff --git a/lisp/dired.el b/lisp/dired.el index c68c4a52bd4..3f119363314 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -1,6 +1,6 @@ ;;; dired.el --- directory-browsing commands -*- lexical-binding: t -*- -;; Copyright (C) 1985-1986, 1992-1997, 2000-2020 Free Software +;; Copyright (C) 1985-1986, 1992-1997, 2000-2021 Free Software ;; Foundation, Inc. ;; Author: Sebastian Kremer <sk@thp.uni-koeln.de> diff --git a/lisp/dirtrack.el b/lisp/dirtrack.el index ad0c18d1b38..795f1dd6602 100644 --- a/lisp/dirtrack.el +++ b/lisp/dirtrack.el @@ -1,6 +1,6 @@ ;;; dirtrack.el --- Directory Tracking by watching the prompt -;; Copyright (C) 1996, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996, 2001-2021 Free Software Foundation, Inc. ;; Author: Peter Breton <pbreton@cs.umb.edu> ;; Created: Sun Nov 17 1996 diff --git a/lisp/disp-table.el b/lisp/disp-table.el index 70343a39ad2..6de14b1d297 100644 --- a/lisp/disp-table.el +++ b/lisp/disp-table.el @@ -1,6 +1,6 @@ ;;; disp-table.el --- functions for dealing with char tables -;; Copyright (C) 1987, 1994-1995, 1999, 2001-2020 Free Software +;; Copyright (C) 1987, 1994-1995, 1999, 2001-2021 Free Software ;; Foundation, Inc. ;; Author: Erik Naggum <erik@naggum.no> diff --git a/lisp/display-fill-column-indicator.el b/lisp/display-fill-column-indicator.el index 5fd9f07cd46..50252af4533 100644 --- a/lisp/display-fill-column-indicator.el +++ b/lisp/display-fill-column-indicator.el @@ -1,6 +1,6 @@ ;;; display-fill-column-indicator.el --- interface for display-fill-column-indicator -*- lexical-binding: t -*- -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org ;; Keywords: convenience diff --git a/lisp/display-line-numbers.el b/lisp/display-line-numbers.el index 022ed12046c..a6fa813afe7 100644 --- a/lisp/display-line-numbers.el +++ b/lisp/display-line-numbers.el @@ -1,6 +1,6 @@ ;;; display-line-numbers.el --- interface for display-line-numbers -*- lexical-binding: t -*- -;; Copyright (C) 2017-2020 Free Software Foundation, Inc. +;; Copyright (C) 2017-2021 Free Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org ;; Keywords: convenience diff --git a/lisp/dnd.el b/lisp/dnd.el index 815a4afbecd..7319a27d190 100644 --- a/lisp/dnd.el +++ b/lisp/dnd.el @@ -1,6 +1,6 @@ ;;; dnd.el --- drag and drop support -*- lexical-binding: t; -*- -;; Copyright (C) 2005-2020 Free Software Foundation, Inc. +;; Copyright (C) 2005-2021 Free Software Foundation, Inc. ;; Author: Jan Djärv <jan.h.d@swipnet.se> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/doc-view.el b/lisp/doc-view.el index dbd93563a23..f6fcfae453e 100644 --- a/lisp/doc-view.el +++ b/lisp/doc-view.el @@ -1,6 +1,6 @@ ;;; doc-view.el --- Document viewer for Emacs -*- lexical-binding: t -*- -;; Copyright (C) 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2007-2021 Free Software Foundation, Inc. ;; ;; Author: Tassilo Horn <tsdh@gnu.org> ;; Keywords: files, pdf, ps, dvi diff --git a/lisp/dom.el b/lisp/dom.el index bf4a56ab9f5..71793c0d673 100644 --- a/lisp/dom.el +++ b/lisp/dom.el @@ -1,6 +1,6 @@ ;;; dom.el --- XML/HTML (etc.) DOM manipulation and searching functions -*- lexical-binding: t -*- -;; Copyright (C) 2014-2020 Free Software Foundation, Inc. +;; Copyright (C) 2014-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Keywords: xml, html diff --git a/lisp/dos-fns.el b/lisp/dos-fns.el index d96599d3f76..5d4aa7843f1 100644 --- a/lisp/dos-fns.el +++ b/lisp/dos-fns.el @@ -1,6 +1,6 @@ ;;; dos-fns.el --- MS-Dos specific functions -;; Copyright (C) 1991, 1993, 1995-1996, 2001-2020 Free Software +;; Copyright (C) 1991, 1993, 1995-1996, 2001-2021 Free Software ;; Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/dos-vars.el b/lisp/dos-vars.el index 47d1f83de9e..2f7b3760e3f 100644 --- a/lisp/dos-vars.el +++ b/lisp/dos-vars.el @@ -1,6 +1,6 @@ ;;; dos-vars.el --- MS-Dos specific user options -*- lexical-binding:t -*- -;; Copyright (C) 1998, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998, 2001-2021 Free Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org ;; Keywords: internal diff --git a/lisp/dos-w32.el b/lisp/dos-w32.el index 8c2cad696b1..e902491446c 100644 --- a/lisp/dos-w32.el +++ b/lisp/dos-w32.el @@ -1,6 +1,6 @@ ;; dos-w32.el --- Functions shared among MS-DOS and W32 (NT/95) platforms -;; Copyright (C) 1996, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996, 2001-2021 Free Software Foundation, Inc. ;; Maintainer: Geoff Voelker <voelker@cs.washington.edu> ;; Keywords: internal diff --git a/lisp/double.el b/lisp/double.el index 8e5090034cf..8bbbaa58189 100644 --- a/lisp/double.el +++ b/lisp/double.el @@ -1,6 +1,6 @@ ;;; double.el --- support for keyboard remapping with double clicking -;; Copyright (C) 1994, 1997-1998, 2001-2020 Free Software Foundation, +;; Copyright (C) 1994, 1997-1998, 2001-2021 Free Software Foundation, ;; Inc. ;; Author: Per Abrahamsen <abraham@dina.kvl.dk> diff --git a/lisp/dynamic-setting.el b/lisp/dynamic-setting.el index ce7e9fc7b1d..d6952ed59f3 100644 --- a/lisp/dynamic-setting.el +++ b/lisp/dynamic-setting.el @@ -1,6 +1,6 @@ ;;; dynamic-setting.el --- Support dynamic changes -;; Copyright (C) 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2009-2021 Free Software Foundation, Inc. ;; Author: Jan Djärv <jan.h.d@swipnet.se> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/ebuff-menu.el b/lisp/ebuff-menu.el index cf7b28a1e80..fb73b2d1786 100644 --- a/lisp/ebuff-menu.el +++ b/lisp/ebuff-menu.el @@ -1,6 +1,6 @@ ;;; ebuff-menu.el --- electric-buffer-list mode -;; Copyright (C) 1985-1986, 1994, 2001-2020 Free Software Foundation, +;; Copyright (C) 1985-1986, 1994, 2001-2021 Free Software Foundation, ;; Inc. ;; Author: Richard Mlynarik <mly@ai.mit.edu> diff --git a/lisp/echistory.el b/lisp/echistory.el index e311ee101b4..8f787e7fa1c 100644 --- a/lisp/echistory.el +++ b/lisp/echistory.el @@ -1,6 +1,6 @@ ;;; echistory.el --- Electric Command History Mode -;; Copyright (C) 1985, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1985, 2001-2021 Free Software Foundation, Inc. ;; Author: K. Shane Hartman ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/ecomplete.el b/lisp/ecomplete.el index 831491cba2e..105edc48a07 100644 --- a/lisp/ecomplete.el +++ b/lisp/ecomplete.el @@ -1,6 +1,6 @@ ;;; ecomplete.el --- electric completion of addresses and the like -*- lexical-binding:t -*- -;; Copyright (C) 2006-2020 Free Software Foundation, Inc. +;; Copyright (C) 2006-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Keywords: mail diff --git a/lisp/edmacro.el b/lisp/edmacro.el index 8ff766cee99..3d7db44a86d 100644 --- a/lisp/edmacro.el +++ b/lisp/edmacro.el @@ -1,6 +1,6 @@ ;;; edmacro.el --- keyboard macro editor -;; Copyright (C) 1993-1994, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1993-1994, 2001-2021 Free Software Foundation, Inc. ;; Author: Dave Gillespie <daveg@synaptics.com> ;; Keywords: abbrev diff --git a/lisp/ehelp.el b/lisp/ehelp.el index 7da9aed075b..996b7db48f5 100644 --- a/lisp/ehelp.el +++ b/lisp/ehelp.el @@ -1,6 +1,6 @@ ;;; ehelp.el --- bindings for electric-help mode -*- lexical-binding: t -*- -;; Copyright (C) 1986, 1995, 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 1986, 1995, 2000-2021 Free Software Foundation, Inc. ;; Author: Richard Mlynarik ;; (according to ack.texi and authors.el) diff --git a/lisp/elec-pair.el b/lisp/elec-pair.el index 6c47bea4a7a..d8c377a2ef5 100644 --- a/lisp/elec-pair.el +++ b/lisp/elec-pair.el @@ -1,6 +1,6 @@ ;;; elec-pair.el --- Automatic parenthesis pairing -*- lexical-binding:t -*- -;; Copyright (C) 2013-2020 Free Software Foundation, Inc. +;; Copyright (C) 2013-2021 Free Software Foundation, Inc. ;; Author: João Távora <joaotavora@gmail.com> diff --git a/lisp/electric.el b/lisp/electric.el index 50ddf525ca4..506e9aa0f7c 100644 --- a/lisp/electric.el +++ b/lisp/electric.el @@ -1,6 +1,6 @@ ;;; electric.el --- window maker and Command loop for `electric' modes -;; Copyright (C) 1985-1986, 1995, 2001-2020 Free Software Foundation, +;; Copyright (C) 1985-1986, 1995, 2001-2021 Free Software Foundation, ;; Inc. ;; Author: K. Shane Hartman diff --git a/lisp/elide-head.el b/lisp/elide-head.el index a892754d723..c0857e3938a 100644 --- a/lisp/elide-head.el +++ b/lisp/elide-head.el @@ -1,6 +1,6 @@ ;;; elide-head.el --- hide headers in files -*- lexical-binding: t; -*- -;; Copyright (C) 1999, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2001-2021 Free Software Foundation, Inc. ;; Author: Dave Love <fx@gnu.org> ;; Keywords: outlines tools diff --git a/lisp/emacs-lisp/advice.el b/lisp/emacs-lisp/advice.el index 573212ac00d..dc8636f8f76 100644 --- a/lisp/emacs-lisp/advice.el +++ b/lisp/emacs-lisp/advice.el @@ -1,6 +1,6 @@ ;;; advice.el --- An overloading mechanism for Emacs Lisp functions -*- lexical-binding: t -*- -;; Copyright (C) 1993-1994, 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 1993-1994, 2000-2021 Free Software Foundation, Inc. ;; Author: Hans Chalupsky <hans@cs.buffalo.edu> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el index 2c63b44cd16..75425dc6d0f 100644 --- a/lisp/emacs-lisp/autoload.el +++ b/lisp/emacs-lisp/autoload.el @@ -1,6 +1,6 @@ ;;; autoload.el --- maintain autoloads in loaddefs.el -*- lexical-binding: t -*- -;; Copyright (C) 1991-1997, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1991-1997, 2001-2021 Free Software Foundation, Inc. ;; Author: Roland McGrath <roland@gnu.org> ;; Keywords: maint @@ -370,7 +370,8 @@ FILE's name." (let ((basename (file-name-nondirectory file)) (lp (if (equal type "package") (setq type "autoloads")))) (concat ";;; " basename - " --- automatically extracted " (or type "autoloads") "\n" + " --- automatically extracted " (or type "autoloads") + " -*- lexical-binding: t -*-\n" ";;\n" ";;; Code:\n\n" (if lp diff --git a/lisp/emacs-lisp/avl-tree.el b/lisp/emacs-lisp/avl-tree.el index 3657c4236eb..75c732269e2 100644 --- a/lisp/emacs-lisp/avl-tree.el +++ b/lisp/emacs-lisp/avl-tree.el @@ -1,6 +1,6 @@ ;;; avl-tree.el --- balanced binary trees, AVL-trees -*- lexical-binding:t -*- -;; Copyright (C) 1995, 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 1995, 2007-2021 Free Software Foundation, Inc. ;; Author: Per Cederqvist <ceder@lysator.liu.se> ;; Inge Wallin <inge@lysator.liu.se> diff --git a/lisp/emacs-lisp/backquote.el b/lisp/emacs-lisp/backquote.el index 5413022e341..173c11644d5 100644 --- a/lisp/emacs-lisp/backquote.el +++ b/lisp/emacs-lisp/backquote.el @@ -1,6 +1,6 @@ ;;; backquote.el --- implement the ` Lisp construct -*- lexical-binding: t -*- -;; Copyright (C) 1990, 1992, 1994, 2001-2020 Free Software Foundation, +;; Copyright (C) 1990, 1992, 1994, 2001-2021 Free Software Foundation, ;; Inc. ;; Author: Rick Sladkey <jrs@world.std.com> diff --git a/lisp/emacs-lisp/backtrace.el b/lisp/emacs-lisp/backtrace.el index 5874ba72fcd..3e1c3292650 100644 --- a/lisp/emacs-lisp/backtrace.el +++ b/lisp/emacs-lisp/backtrace.el @@ -1,6 +1,6 @@ ;;; backtrace.el --- generic major mode for Elisp backtraces -*- lexical-binding: t -*- -;; Copyright (C) 2018-2020 Free Software Foundation, Inc. +;; Copyright (C) 2018-2021 Free Software Foundation, Inc. ;; Author: Gemini Lasswell ;; Keywords: lisp, tools, maint diff --git a/lisp/emacs-lisp/benchmark.el b/lisp/emacs-lisp/benchmark.el index 8cf1f54411a..14bc2817390 100644 --- a/lisp/emacs-lisp/benchmark.el +++ b/lisp/emacs-lisp/benchmark.el @@ -1,6 +1,6 @@ ;;; benchmark.el --- support for benchmarking code -*- lexical-binding: t -*- -;; Copyright (C) 2003-2020 Free Software Foundation, Inc. +;; Copyright (C) 2003-2021 Free Software Foundation, Inc. ;; Author: Dave Love <fx@gnu.org> ;; Keywords: lisp, extensions diff --git a/lisp/emacs-lisp/bindat.el b/lisp/emacs-lisp/bindat.el index 0fd273aa3e3..5f432b80bc2 100644 --- a/lisp/emacs-lisp/bindat.el +++ b/lisp/emacs-lisp/bindat.el @@ -1,6 +1,6 @@ ;;; bindat.el --- binary data structure packing and unpacking. -;; Copyright (C) 2002-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002-2021 Free Software Foundation, Inc. ;; Author: Kim F. Storm <storm@cua.dk> ;; Assignment name: struct.el diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el index 0eee6e9d015..cf89456541e 100644 --- a/lisp/emacs-lisp/byte-opt.el +++ b/lisp/emacs-lisp/byte-opt.el @@ -1,6 +1,6 @@ ;;; byte-opt.el --- the optimization passes of the emacs-lisp byte compiler -*- lexical-binding: t -*- -;; Copyright (C) 1991, 1994, 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 1991, 1994, 2000-2021 Free Software Foundation, Inc. ;; Author: Jamie Zawinski <jwz@lucid.com> ;; Hallvard Furuseth <hbf@ulrik.uio.no> diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el index 1bc78391886..5118b8bb35a 100644 --- a/lisp/emacs-lisp/byte-run.el +++ b/lisp/emacs-lisp/byte-run.el @@ -1,6 +1,6 @@ ;;; byte-run.el --- byte-compiler support for inlining -*- lexical-binding: t -*- -;; Copyright (C) 1992, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1992, 2001-2021 Free Software Foundation, Inc. ;; Author: Jamie Zawinski <jwz@lucid.com> ;; Hallvard Furuseth <hbf@ulrik.uio.no> diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index 9f5d121024a..8df008e1cd6 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -1,6 +1,6 @@ ;;; bytecomp.el --- compilation of Lisp code into byte code -*- lexical-binding: t -*- -;; Copyright (C) 1985-1987, 1992, 1994, 1998, 2000-2020 Free Software +;; Copyright (C) 1985-1987, 1992, 1994, 1998, 2000-2021 Free Software ;; Foundation, Inc. ;; Author: Jamie Zawinski <jwz@lucid.com> @@ -299,7 +299,8 @@ The information is logged to `byte-compile-log-buffer'." (defconst byte-compile-warning-types '(redefine callargs free-vars unresolved obsolete noruntime interactive-only - make-local mapcar constants suspicious lexical lexical-dynamic) + make-local mapcar constants suspicious lexical lexical-dynamic + docstrings) "The list of warning types used when `byte-compile-warnings' is t.") (defcustom byte-compile-warnings t "List of warnings that the byte-compiler should issue (t for all). @@ -322,6 +323,8 @@ Elements of the list may be: make-local calls to make-variable-buffer-local that may be incorrect. mapcar mapcar called for effect. constants let-binding of, or assignment to, constants/nonvariables. + docstrings docstrings that are too wide (longer than 80 characters, + or `fill-column', whichever is bigger) suspicious constructs that usually don't do what the coder wanted. If the list begins with `not', then the remaining elements specify warnings to @@ -1612,6 +1615,81 @@ extra args." (if (equal sig1 '(1 . 1)) "argument" "arguments") (byte-compile-arglist-signature-string sig2))))))) +(defvar byte-compile--wide-docstring-substitution-len 3 + "Substitution width used in `byte-compile--wide-docstring-p'. +This is a heuristic for guessing the width of a documentation +string: `byte-compile--wide-docstring-p' assumes that any +`substitute-command-keys' command substitutions are this long.") + +(defun byte-compile--wide-docstring-p (docstring col) + "Return t if string DOCSTRING is wider than COL. +Ignore all `substitute-command-keys' substitutions, except for +the `\\\\=[command]' ones that are assumed to be of length +`byte-compile--wide-docstring-substitution-len'. Also ignore +URLs." + (string-match + (format "^.\\{%s,\\}$" (int-to-string (1+ col))) + (replace-regexp-in-string + (rx (or + ;; Ignore some URLs. + (seq "http" (? "s") "://" (* anychar)) + ;; Ignore these `substitute-command-keys' substitutions. + (seq "\\" (or "=" + (seq "<" (* (not ">")) ">") + (seq "{" (* (not "}")) "}"))))) + "" + ;; Heuristic: assume these substitutions are of some length N. + (replace-regexp-in-string + (rx "\\" (or (seq "[" (* (not "]")) "]"))) + (make-string byte-compile--wide-docstring-substitution-len ?x) + docstring)))) + +(defcustom byte-compile-docstring-max-column 80 + "Recommended maximum width of doc string lines. +The byte-compiler will emit a warning for documentation strings +containing lines wider than this. If `fill-column' has a larger +value, it will override this variable." + :group 'bytecomp + :type 'integer + :safe #'integerp + :version "28.1") + +(defun byte-compile-docstring-length-warn (form) + "Warn if documentation string of FORM is too wide. +It is too wide if it has any lines longer than the largest of +`fill-column' and `byte-compile-docstring-max-column'." + ;; This has some limitations that it would be nice to fix: + ;; 1. We don't try to handle defuns. It is somewhat tricky to get + ;; it right since `defun' is a macro. Also, some macros + ;; themselves produce defuns (e.g. `define-derived-mode'). + ;; 2. We assume that any `subsititute-command-keys' command replacement has a + ;; given length. We can't reliably do these replacements, since the value + ;; of the keymaps in general can't be known at compile time. + (when (byte-compile-warning-enabled-p 'docstrings) + (let ((col (max byte-compile-docstring-max-column fill-column)) + kind name docs) + (pcase (car form) + ((or 'autoload 'custom-declare-variable 'defalias + 'defconst 'define-abbrev-table + 'defvar 'defvaralias) + (setq kind (nth 0 form)) + (setq name (nth 1 form)) + (setq docs (nth 3 form))) + ;; Here is how one could add lambda's here: + ;; ('lambda + ;; (setq kind "") ; can't be "function", unfortunately + ;; (setq docs (and (stringp (nth 2 form)) + ;; (nth 2 form)))) + ) + (when (and (consp name) (eq (car name) 'quote)) + (setq name (cadr name))) + (setq name (if name (format " `%s'" name) "")) + (when (and kind docs (stringp docs) + (byte-compile--wide-docstring-p docs col)) + (byte-compile-warn "%s%s docstring wider than %s characters" + kind name col)))) + form) + (defun byte-compile-print-syms (str1 strn syms) (when syms (byte-compile-set-symbol-position (car syms) t)) @@ -2482,7 +2560,8 @@ list that represents a doc string reference. (delq (assq funsym byte-compile-unresolved-functions) byte-compile-unresolved-functions))))) (if (stringp (nth 3 form)) - form + (prog1 form + (byte-compile-docstring-length-warn form)) ;; No doc string, so we can compile this as a normal form. (byte-compile-keep-pending form 'byte-compile-normal-call))) @@ -2510,6 +2589,7 @@ list that represents a doc string reference. (if (and (null (cddr form)) ;No `value' provided. (eq (car form) 'defvar)) ;Just a declaration. nil + (byte-compile-docstring-length-warn form) (cond ((consp (nth 2 form)) (setq form (copy-sequence form)) (setcar (cdr (cdr form)) @@ -2533,6 +2613,7 @@ list that represents a doc string reference. (if (byte-compile-warning-enabled-p 'suspicious) (byte-compile-warn "Alias for `%S' should be declared before its referent" newname))))) + (byte-compile-docstring-length-warn form) (byte-compile-keep-pending form)) (put 'custom-declare-variable 'byte-hunk-handler @@ -2925,6 +3006,7 @@ for symbols generated by the byte compiler itself." (unless (eq 'lambda (car-safe fun)) (error "Not a lambda list: %S" fun)) (byte-compile-set-symbol-position 'lambda)) + (byte-compile-docstring-length-warn fun) (byte-compile-check-lambda-list (nth 1 fun)) (let* ((arglist (nth 1 fun)) (arglistvars (byte-compile-arglist-vars arglist)) @@ -4712,6 +4794,7 @@ binding slots have been popped." (byte-compile-warning-enabled-p 'lexical (nth 1 form))) (byte-compile-warn "global/dynamic var `%s' lacks a prefix" (nth 1 form))) + (byte-compile-docstring-length-warn form) (let ((fun (nth 0 form)) (var (nth 1 form)) (value (nth 2 form)) @@ -4786,6 +4869,7 @@ binding slots have been popped." ;; - `arg' is the expression to which it is defined. ;; - `rest' is the rest of the arguments. (`(,_ ',name ,arg . ,rest) + (byte-compile-docstring-length-warn form) (pcase-let* ;; `macro' is non-nil if it defines a macro. ;; `fun' is the function part of `arg' (defaults to `arg'). diff --git a/lisp/emacs-lisp/cconv.el b/lisp/emacs-lisp/cconv.el index 351a097ad19..e79583974a8 100644 --- a/lisp/emacs-lisp/cconv.el +++ b/lisp/emacs-lisp/cconv.el @@ -1,6 +1,6 @@ ;;; cconv.el --- Closure conversion for statically scoped Emacs lisp. -*- lexical-binding: t -*- -;; Copyright (C) 2011-2020 Free Software Foundation, Inc. +;; Copyright (C) 2011-2021 Free Software Foundation, Inc. ;; Author: Igor Kuzmin <kzuminig@iro.umontreal.ca> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/emacs-lisp/chart.el b/lisp/emacs-lisp/chart.el index c1c6e3bf0fd..2cd73225ff3 100644 --- a/lisp/emacs-lisp/chart.el +++ b/lisp/emacs-lisp/chart.el @@ -1,6 +1,6 @@ ;;; chart.el --- Draw charts (bar charts, etc) -*- lexical-binding: t -*- -;; Copyright (C) 1996, 1998-1999, 2001, 2004-2005, 2007-2020 Free +;; Copyright (C) 1996, 1998-1999, 2001, 2004-2005, 2007-2021 Free ;; Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> @@ -333,7 +333,8 @@ Automatically compensates for direction." (cl-defmethod chart-axis-draw ((a chart-axis-names) &optional dir margin zone _start _end) "Draw axis information based upon A range to be spread along the edge. Optional argument DIR is the direction of the chart. -Optional arguments MARGIN, ZONE, START and END specify boundaries of the drawing." +Optional arguments MARGIN, ZONE, START and END specify boundaries +of the drawing." (cl-call-next-method) ;; We prefer about 5 spaces between each value (let* ((i 0) diff --git a/lisp/emacs-lisp/check-declare.el b/lisp/emacs-lisp/check-declare.el index 208214f2e6e..7c2b23b4ec4 100644 --- a/lisp/emacs-lisp/check-declare.el +++ b/lisp/emacs-lisp/check-declare.el @@ -1,6 +1,6 @@ ;;; check-declare.el --- Check declare-function statements -*- lexical-binding: t; -*- -;; Copyright (C) 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2007-2021 Free Software Foundation, Inc. ;; Author: Glenn Morris <rgm@gnu.org> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/emacs-lisp/checkdoc.el b/lisp/emacs-lisp/checkdoc.el index 61384c0e6fa..2e204ff7aea 100644 --- a/lisp/emacs-lisp/checkdoc.el +++ b/lisp/emacs-lisp/checkdoc.el @@ -1,6 +1,6 @@ ;;; checkdoc.el --- check documentation strings for style requirements -*- lexical-binding:t -*- -;; Copyright (C) 1997-1998, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997-1998, 2001-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> ;; Old-Version: 0.6.2 diff --git a/lisp/emacs-lisp/cl-extra.el b/lisp/emacs-lisp/cl-extra.el index a55d78de153..28ce6b115a4 100644 --- a/lisp/emacs-lisp/cl-extra.el +++ b/lisp/emacs-lisp/cl-extra.el @@ -1,6 +1,6 @@ ;;; cl-extra.el --- Common Lisp features, part 2 -*- lexical-binding: t -*- -;; Copyright (C) 1993, 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 1993, 2000-2021 Free Software Foundation, Inc. ;; Author: Dave Gillespie <daveg@synaptics.com> ;; Keywords: extensions diff --git a/lisp/emacs-lisp/cl-generic.el b/lisp/emacs-lisp/cl-generic.el index 9ddf9e7333b..19dd54c8645 100644 --- a/lisp/emacs-lisp/cl-generic.el +++ b/lisp/emacs-lisp/cl-generic.el @@ -1,6 +1,6 @@ ;;; cl-generic.el --- CLOS-style generic functions for Elisp -*- lexical-binding: t; -*- -;; Copyright (C) 2015-2020 Free Software Foundation, Inc. +;; Copyright (C) 2015-2021 Free Software Foundation, Inc. ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> ;; Version: 1.0 diff --git a/lisp/emacs-lisp/cl-indent.el b/lisp/emacs-lisp/cl-indent.el index 66502da668a..7d0bfc88b15 100644 --- a/lisp/emacs-lisp/cl-indent.el +++ b/lisp/emacs-lisp/cl-indent.el @@ -1,6 +1,6 @@ ;;; cl-indent.el --- Enhanced lisp-indent mode -*- lexical-binding:t -*- -;; Copyright (C) 1987, 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 1987, 2000-2021 Free Software Foundation, Inc. ;; Author: Richard Mlynarik <mly@eddie.mit.edu> ;; Created: July 1987 diff --git a/lisp/emacs-lisp/cl-lib.el b/lisp/emacs-lisp/cl-lib.el index 86ee94e87e0..3bf3fd21ded 100644 --- a/lisp/emacs-lisp/cl-lib.el +++ b/lisp/emacs-lisp/cl-lib.el @@ -1,6 +1,6 @@ ;;; cl-lib.el --- Common Lisp extensions for Emacs -*- lexical-binding: t -*- -;; Copyright (C) 1993, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1993, 2001-2021 Free Software Foundation, Inc. ;; Author: Dave Gillespie <daveg@synaptics.com> ;; Version: 1.0 diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el index 7dfcc288e67..664d865cffd 100644 --- a/lisp/emacs-lisp/cl-macs.el +++ b/lisp/emacs-lisp/cl-macs.el @@ -1,6 +1,6 @@ ;;; cl-macs.el --- Common Lisp macros -*- lexical-binding: t -*- -;; Copyright (C) 1993, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1993, 2001-2021 Free Software Foundation, Inc. ;; Author: Dave Gillespie <daveg@synaptics.com> ;; Old-Version: 2.02 @@ -900,7 +900,8 @@ This is compatible with Common Lisp, but note that `defun' and "The Common Lisp `loop' macro. Valid clauses include: For clauses: - for VAR from/upfrom/downfrom EXPR1 to/upto/downto/above/below EXPR2 [by EXPR3] + for VAR from/upfrom/downfrom EXPR1 to/upto/downto/above/below EXPR2 + [by EXPR3] for VAR = EXPR1 then EXPR2 for VAR in/on/in-ref LIST [by FUNC] for VAR across/across-ref ARRAY @@ -2728,7 +2729,7 @@ Each SLOT may instead take the form (SNAME SDEFAULT SOPTIONS...), where SDEFAULT is the default value of that slot and SOPTIONS are keyword-value pairs for that slot. Supported keywords for slots are: -- `:read-only': If this has a non-nil value, that slot cannot be set via `setf'. +- `:read-only': If this has a non-nil value, that slot cannot be set via `setf'. - `:documentation': this is a docstring describing the slot. - `:type': the type of the field; currently only used for documentation. diff --git a/lisp/emacs-lisp/cl-preloaded.el b/lisp/emacs-lisp/cl-preloaded.el index eed43c5ed38..7365e23186a 100644 --- a/lisp/emacs-lisp/cl-preloaded.el +++ b/lisp/emacs-lisp/cl-preloaded.el @@ -1,6 +1,6 @@ ;;; cl-preloaded.el --- Preloaded part of the CL library -*- lexical-binding: t; -*- -;; Copyright (C) 2015-2020 Free Software Foundation, Inc +;; Copyright (C) 2015-2021 Free Software Foundation, Inc ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> ;; Package: emacs diff --git a/lisp/emacs-lisp/cl-print.el b/lisp/emacs-lisp/cl-print.el index 0375c57f77d..348da59fd97 100644 --- a/lisp/emacs-lisp/cl-print.el +++ b/lisp/emacs-lisp/cl-print.el @@ -1,6 +1,6 @@ ;;; cl-print.el --- CL-style generic printing -*- lexical-binding: t; -*- -;; Copyright (C) 2017-2020 Free Software Foundation, Inc. +;; Copyright (C) 2017-2021 Free Software Foundation, Inc. ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> ;; Keywords: diff --git a/lisp/emacs-lisp/cl-seq.el b/lisp/emacs-lisp/cl-seq.el index 8cfdd140f8e..329bd7c1b3b 100644 --- a/lisp/emacs-lisp/cl-seq.el +++ b/lisp/emacs-lisp/cl-seq.el @@ -1,6 +1,6 @@ ;;; cl-seq.el --- Common Lisp features, part 3 -*- lexical-binding: t -*- -;; Copyright (C) 1993, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1993, 2001-2021 Free Software Foundation, Inc. ;; Author: Dave Gillespie <daveg@synaptics.com> ;; Old-Version: 2.02 diff --git a/lisp/emacs-lisp/copyright.el b/lisp/emacs-lisp/copyright.el index edeeb03c32a..a9baef39a9a 100644 --- a/lisp/emacs-lisp/copyright.el +++ b/lisp/emacs-lisp/copyright.el @@ -1,6 +1,6 @@ ;;; copyright.el --- update the copyright notice in current buffer -*- lexical-binding: t -*- -;; Copyright (C) 1991-1995, 1998, 2001-2020 Free Software Foundation, +;; Copyright (C) 1991-1995, 1998, 2001-2021 Free Software Foundation, ;; Inc. ;; Author: Daniel Pfeiffer <occitan@esperanto.org> diff --git a/lisp/emacs-lisp/crm.el b/lisp/emacs-lisp/crm.el index 89d106ee489..eb3193c8213 100644 --- a/lisp/emacs-lisp/crm.el +++ b/lisp/emacs-lisp/crm.el @@ -1,6 +1,6 @@ ;;; crm.el --- read multiple strings with completion -;; Copyright (C) 1985-1986, 1993-2020 Free Software Foundation, Inc. +;; Copyright (C) 1985-1986, 1993-2021 Free Software Foundation, Inc. ;; Author: Sen Nagata <sen@eccosys.com> ;; Keywords: completion, minibuffer, multiple elements diff --git a/lisp/emacs-lisp/cursor-sensor.el b/lisp/emacs-lisp/cursor-sensor.el index d50f7ad0be5..ffeddadd574 100644 --- a/lisp/emacs-lisp/cursor-sensor.el +++ b/lisp/emacs-lisp/cursor-sensor.el @@ -1,6 +1,6 @@ ;;; cursor-sensor.el --- React to cursor movement -*- lexical-binding: t; -*- -;; Copyright (C) 2015-2020 Free Software Foundation, Inc. +;; Copyright (C) 2015-2021 Free Software Foundation, Inc. ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> ;; Keywords: diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el index 11ef836563d..d9da0db4551 100644 --- a/lisp/emacs-lisp/debug.el +++ b/lisp/emacs-lisp/debug.el @@ -1,6 +1,6 @@ ;;; debug.el --- debuggers and related commands for Emacs -*- lexical-binding: t -*- -;; Copyright (C) 1985-1986, 1994, 2001-2020 Free Software Foundation, +;; Copyright (C) 1985-1986, 1994, 2001-2021 Free Software Foundation, ;; Inc. ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/emacs-lisp/derived.el b/lisp/emacs-lisp/derived.el index 6a11f1c3949..42528429aaf 100644 --- a/lisp/emacs-lisp/derived.el +++ b/lisp/emacs-lisp/derived.el @@ -1,7 +1,7 @@ ;;; derived.el --- allow inheritance of major modes ;; (formerly mode-clone.el) -;; Copyright (C) 1993-1994, 1999, 2001-2020 Free Software Foundation, +;; Copyright (C) 1993-1994, 1999, 2001-2021 Free Software Foundation, ;; Inc. ;; Author: David Megginson (dmeggins@aix1.uottawa.ca) @@ -306,11 +306,13 @@ No problems result if this variable is not bound. ;; Use a default docstring. (setq docstring (if (null parent) - ;; FIXME filling. - (format "Major-mode.\nUses keymap `%s'%s%s." map - (if abbrev (format "%s abbrev table `%s'" - (if syntax "," " and") abbrev) "") - (if syntax (format " and syntax-table `%s'" syntax) "")) + (concat + "Major-mode.\n" + (internal--format-docstring-line + "Uses keymap `%s'%s%s." map + (if abbrev (format "%s abbrev table `%s'" + (if syntax "," " and") abbrev) "") + (if syntax (format " and syntax-table `%s'" syntax) ""))) (format "Major mode derived from `%s' by `define-derived-mode'. It inherits all of the parent's attributes, but has its own keymap%s: @@ -336,20 +338,22 @@ which more-or-less shadow%s %s's corresponding table%s." (unless (string-match (regexp-quote (symbol-name hook)) docstring) ;; Make sure the docstring mentions the mode's hook. (setq docstring - (concat docstring - (if (null parent) - "\n\nThis mode " - (concat - "\n\nIn addition to any hooks its parent mode " - (if (string-match (format "[`‘]%s['’]" - (regexp-quote - (symbol-name parent))) - docstring) - nil - (format "`%s' " parent)) - "might have run,\nthis mode ")) - (format "runs the hook `%s'" hook) - ", as the final or penultimate step\nduring initialization."))) + (concat docstring "\n\n" + (internal--format-docstring-line + "%s%s%s" + (if (null parent) + "This mode " + (concat + "In addition to any hooks its parent mode " + (if (string-match (format "[`‘]%s['’]" + (regexp-quote + (symbol-name parent))) + docstring) + nil + (format "`%s' " parent)) + "might have run, this mode ")) + (format "runs the hook `%s'" hook) + ", as the final or penultimate step during initialization.")))) (unless (string-match "\\\\[{[]" docstring) ;; And don't forget to put the mode's keymap. diff --git a/lisp/emacs-lisp/disass.el b/lisp/emacs-lisp/disass.el index 7fb370f5df5..6ac76f1c19d 100644 --- a/lisp/emacs-lisp/disass.el +++ b/lisp/emacs-lisp/disass.el @@ -1,6 +1,6 @@ ;;; disass.el --- disassembler for compiled Emacs Lisp code -*- lexical-binding:t -*- -;; Copyright (C) 1986, 1991, 2002-2020 Free Software Foundation, Inc. +;; Copyright (C) 1986, 1991, 2002-2021 Free Software Foundation, Inc. ;; Author: Doug Cutting <doug@csli.stanford.edu> ;; Jamie Zawinski <jwz@lucid.com> diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el index 261f2508af7..f4dbcee4d69 100644 --- a/lisp/emacs-lisp/easy-mmode.el +++ b/lisp/emacs-lisp/easy-mmode.el @@ -1,6 +1,6 @@ ;;; easy-mmode.el --- easy definition for major and minor modes -*- lexical-binding: t; -*- -;; Copyright (C) 1997, 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997, 2000-2021 Free Software Foundation, Inc. ;; Author: Georges Brun-Cottan <Georges.Brun-Cottan@inria.fr> ;; Maintainer: Stefan Monnier <monnier@gnu.org> @@ -278,8 +278,10 @@ For example, you could write ((not globalp) `(progn :autoload-end - (defvar ,mode ,init-value ,(format "Non-nil if %s is enabled. -Use the command `%s' to change this variable." pretty-name mode)) + (defvar ,mode ,init-value + ,(concat (format "Non-nil if %s is enabled.\n" pretty-name) + (internal--format-docstring-line + "Use the command `%s' to change this variable." mode))) (make-variable-buffer-local ',mode))) (t (let ((base-doc-string @@ -455,24 +457,23 @@ on if the hook has explicitly disabled it. (make-variable-buffer-local ',MODE-major-mode)) ;; The actual global minor-mode (define-minor-mode ,global-mode - ;; Very short lines to avoid too long lines in the generated - ;; doc string. - ,(format "Toggle %s in all buffers. -With prefix ARG, enable %s if ARG is positive; -otherwise, disable it. If called from Lisp, enable the mode if -ARG is omitted or nil. - -%s is enabled in all buffers where -`%s' would do it. - -See `%s' for more information on -%s.%s" - pretty-name pretty-global-name - pretty-name turn-on mode pretty-name + ,(concat (format "Toggle %s in all buffers.\n" pretty-name) + (internal--format-docstring-line + "With prefix ARG, enable %s if ARG is positive; otherwise, \ +disable it. If called from Lisp, enable the mode if ARG is omitted or nil.\n\n" + pretty-global-name) + (internal--format-docstring-line + "%s is enabled in all buffers where `%s' would do it.\n\n" + pretty-name turn-on) + (internal--format-docstring-line + "See `%s' for more information on %s." + mode pretty-name) (if predicate - (format "\n\n`%s' is used to control which modes -this minor mode is used in." - MODE-predicate) + (concat + "\n\n" + (internal--format-docstring-line + "`%s' is used to control which modes this minor mode is used in." + MODE-predicate)) "")) :global t ,@group ,@(nreverse extra-keywords) diff --git a/lisp/emacs-lisp/easymenu.el b/lisp/emacs-lisp/easymenu.el index 7a24af7963f..5303da3746c 100644 --- a/lisp/emacs-lisp/easymenu.el +++ b/lisp/emacs-lisp/easymenu.el @@ -1,6 +1,6 @@ ;;; easymenu.el --- support the easymenu interface for defining a menu -*- lexical-binding:t -*- -;; Copyright (C) 1994, 1996, 1998-2020 Free Software Foundation, Inc. +;; Copyright (C) 1994, 1996, 1998-2021 Free Software Foundation, Inc. ;; Keywords: emulations ;; Author: Richard Stallman <rms@gnu.org> diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el index 8e5ece3605d..1ded0e7b097 100644 --- a/lisp/emacs-lisp/edebug.el +++ b/lisp/emacs-lisp/edebug.el @@ -1,6 +1,6 @@ ;;; edebug.el --- a source-level debugger for Emacs Lisp -*- lexical-binding: t -*- -;; Copyright (C) 1988-1995, 1997, 1999-2020 Free Software Foundation, +;; Copyright (C) 1988-1995, 1997, 1999-2021 Free Software Foundation, ;; Inc. ;; Author: Daniel LaLiberte <liberte@holonexus.org> diff --git a/lisp/emacs-lisp/eieio-base.el b/lisp/emacs-lisp/eieio-base.el index a484c2ff382..4ba72aea56d 100644 --- a/lisp/emacs-lisp/eieio-base.el +++ b/lisp/emacs-lisp/eieio-base.el @@ -1,6 +1,6 @@ ;;; eieio-base.el --- Base classes for EIEIO. -*- lexical-binding:t -*- -;;; Copyright (C) 2000-2002, 2004-2005, 2007-2020 Free Software +;;; Copyright (C) 2000-2002, 2004-2005, 2007-2021 Free Software ;;; Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/emacs-lisp/eieio-compat.el b/lisp/emacs-lisp/eieio-compat.el index 2a896f06b6b..db97d4ca4e8 100644 --- a/lisp/emacs-lisp/eieio-compat.el +++ b/lisp/emacs-lisp/eieio-compat.el @@ -1,6 +1,6 @@ ;;; eieio-compat.el --- Compatibility with Older EIEIO versions -*- lexical-binding:t -*- -;; Copyright (C) 1995-1996, 1998-2020 Free Software Foundation, Inc. +;; Copyright (C) 1995-1996, 1998-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> ;; Keywords: OO, lisp diff --git a/lisp/emacs-lisp/eieio-core.el b/lisp/emacs-lisp/eieio-core.el index 3bc65d0d4c5..3e5e9b95235 100644 --- a/lisp/emacs-lisp/eieio-core.el +++ b/lisp/emacs-lisp/eieio-core.el @@ -1,6 +1,6 @@ ;;; eieio-core.el --- Core implementation for eieio -*- lexical-binding:t -*- -;; Copyright (C) 1995-1996, 1998-2020 Free Software Foundation, Inc. +;; Copyright (C) 1995-1996, 1998-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> ;; Version: 1.4 @@ -587,8 +587,8 @@ If SKIPNIL is non-nil, then if default value is nil return t instead." (defun eieio--add-new-slot (newc slot init alloc &optional defaultoverride skipnil) "Add into NEWC attribute SLOT. -If a slot of that name already exists in NEWC, then do nothing. If it doesn't exist, -INIT is the initarg, if any. +If a slot of that name already exists in NEWC, then do nothing. +If it doesn't exist, INIT is the initarg, if any. Argument ALLOC specifies if the slot is allocated per instance, or per class. If optional DEFAULTOVERRIDE is non-nil, then if A exists in NEWC, we must override its value for a default. diff --git a/lisp/emacs-lisp/eieio-custom.el b/lisp/emacs-lisp/eieio-custom.el index c1378cbeb79..184b99fdac6 100644 --- a/lisp/emacs-lisp/eieio-custom.el +++ b/lisp/emacs-lisp/eieio-custom.el @@ -1,6 +1,6 @@ ;;; eieio-custom.el -- eieio object customization -*- lexical-binding:t -*- -;; Copyright (C) 1999-2001, 2005, 2007-2020 Free Software Foundation, +;; Copyright (C) 1999-2001, 2005, 2007-2021 Free Software Foundation, ;; Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/emacs-lisp/eieio-datadebug.el b/lisp/emacs-lisp/eieio-datadebug.el index 94b289be597..9e89ce89179 100644 --- a/lisp/emacs-lisp/eieio-datadebug.el +++ b/lisp/emacs-lisp/eieio-datadebug.el @@ -1,6 +1,6 @@ ;;; eieio-datadebug.el --- EIEIO extensions to the data debugger. -*- lexical-binding:t -*- -;; Copyright (C) 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2007-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> ;; Keywords: OO, lisp diff --git a/lisp/emacs-lisp/eieio-opt.el b/lisp/emacs-lisp/eieio-opt.el index 59af7e12d21..edf4d34b649 100644 --- a/lisp/emacs-lisp/eieio-opt.el +++ b/lisp/emacs-lisp/eieio-opt.el @@ -1,6 +1,6 @@ ;;; eieio-opt.el -- eieio optional functions (debug, printing, speedbar) -;; Copyright (C) 1996, 1998-2003, 2005, 2008-2020 Free Software +;; Copyright (C) 1996, 1998-2003, 2005, 2008-2021 Free Software ;; Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> @@ -136,9 +136,9 @@ are not abstract." (def (symbol-function ctr))) (goto-char (point-min)) (prin1 ctr) - (insert (format " is an %s object constructor function" + (insert (format " is an %sobject constructor function" (if (autoloadp def) - "autoloaded" + "autoloaded " ""))) (when (and (autoloadp def) (null location)) diff --git a/lisp/emacs-lisp/eieio-speedbar.el b/lisp/emacs-lisp/eieio-speedbar.el index 5c6e0e516d1..8bf77e20dfa 100644 --- a/lisp/emacs-lisp/eieio-speedbar.el +++ b/lisp/emacs-lisp/eieio-speedbar.el @@ -1,6 +1,6 @@ ;;; eieio-speedbar.el -- Classes for managing speedbar displays. -*- lexical-binding:t -*- -;; Copyright (C) 1999-2002, 2005, 2007-2020 Free Software Foundation, +;; Copyright (C) 1999-2002, 2005, 2007-2021 Free Software Foundation, ;; Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/emacs-lisp/eieio.el b/lisp/emacs-lisp/eieio.el index 810affa7227..a095ad0f6db 100644 --- a/lisp/emacs-lisp/eieio.el +++ b/lisp/emacs-lisp/eieio.el @@ -1,7 +1,7 @@ ;;; eieio.el --- Enhanced Implementation of Emacs Interpreted Objects -*- lexical-binding:t -*- ;;; or maybe Eric's Implementation of Emacs Interpreted Objects -;; Copyright (C) 1995-1996, 1998-2020 Free Software Foundation, Inc. +;; Copyright (C) 1995-1996, 1998-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> ;; Version: 1.4 diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el index c9d5521e502..90e075b1102 100644 --- a/lisp/emacs-lisp/eldoc.el +++ b/lisp/emacs-lisp/eldoc.el @@ -1,6 +1,6 @@ ;;; eldoc.el --- Show function arglist or variable docstring in echo area -*- lexical-binding:t; -*- -;; Copyright (C) 1996-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996-2021 Free Software Foundation, Inc. ;; Author: Noah Friedman <friedman@splode.com> ;; Keywords: extensions diff --git a/lisp/emacs-lisp/elint.el b/lisp/emacs-lisp/elint.el index d0a0389b3b7..0fba5938f3d 100644 --- a/lisp/emacs-lisp/elint.el +++ b/lisp/emacs-lisp/elint.el @@ -1,6 +1,6 @@ ;;; elint.el --- Lint Emacs Lisp -*- lexical-binding: t -*- -;; Copyright (C) 1997, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997, 2001-2021 Free Software Foundation, Inc. ;; Author: Peter Liljenberg <petli@lysator.liu.se> ;; Created: May 1997 diff --git a/lisp/emacs-lisp/elp.el b/lisp/emacs-lisp/elp.el index a94978ac47b..f551c0c36c3 100644 --- a/lisp/emacs-lisp/elp.el +++ b/lisp/emacs-lisp/elp.el @@ -1,6 +1,6 @@ ;;; elp.el --- Emacs Lisp Profiler -*- lexical-binding: t -*- -;; Copyright (C) 1994-1995, 1997-1998, 2001-2020 Free Software +;; Copyright (C) 1994-1995, 1997-1998, 2001-2021 Free Software ;; Foundation, Inc. ;; Author: Barry A. Warsaw diff --git a/lisp/emacs-lisp/ert-x.el b/lisp/emacs-lisp/ert-x.el index a8da2c413e0..d058d3dda0b 100644 --- a/lisp/emacs-lisp/ert-x.el +++ b/lisp/emacs-lisp/ert-x.el @@ -1,6 +1,6 @@ ;;; ert-x.el --- Staging area for experimental extensions to ERT -*- lexical-binding: t -*- -;; Copyright (C) 2008, 2010-2020 Free Software Foundation, Inc. +;; Copyright (C) 2008, 2010-2021 Free Software Foundation, Inc. ;; Author: Lennart Borgman (lennart O borgman A gmail O com) ;; Christian Ohler <ohler@gnu.org> diff --git a/lisp/emacs-lisp/ert.el b/lisp/emacs-lisp/ert.el index 25237feae2a..58517549454 100644 --- a/lisp/emacs-lisp/ert.el +++ b/lisp/emacs-lisp/ert.el @@ -1,6 +1,6 @@ ;;; ert.el --- Emacs Lisp Regression Testing -*- lexical-binding: t -*- -;; Copyright (C) 2007-2008, 2010-2020 Free Software Foundation, Inc. +;; Copyright (C) 2007-2008, 2010-2021 Free Software Foundation, Inc. ;; Author: Christian Ohler <ohler@gnu.org> ;; Keywords: lisp, tools diff --git a/lisp/emacs-lisp/ewoc.el b/lisp/emacs-lisp/ewoc.el index 5112322cfd6..d3ace97945f 100644 --- a/lisp/emacs-lisp/ewoc.el +++ b/lisp/emacs-lisp/ewoc.el @@ -1,6 +1,6 @@ ;;; ewoc.el --- utility to maintain a view of a list of objects in a buffer -*- lexical-binding: t -*- -;; Copyright (C) 1991-2020 Free Software Foundation, Inc. +;; Copyright (C) 1991-2021 Free Software Foundation, Inc. ;; Author: Per Cederqvist <ceder@lysator.liu.se> ;; Inge Wallin <inge@lysator.liu.se> diff --git a/lisp/emacs-lisp/faceup.el b/lisp/emacs-lisp/faceup.el index 9900136dc1a..6c3931f9829 100644 --- a/lisp/emacs-lisp/faceup.el +++ b/lisp/emacs-lisp/faceup.el @@ -1,6 +1,6 @@ ;;; faceup.el --- Markup language for faces and font-lock regression testing -*- lexical-binding: t -*- -;; Copyright (C) 2013-2020 Free Software Foundation, Inc. +;; Copyright (C) 2013-2021 Free Software Foundation, Inc. ;; Author: Anders Lindgren ;; Version: 0.0.6 diff --git a/lisp/emacs-lisp/find-func.el b/lisp/emacs-lisp/find-func.el index aafefe02603..a0d859b834d 100644 --- a/lisp/emacs-lisp/find-func.el +++ b/lisp/emacs-lisp/find-func.el @@ -1,6 +1,6 @@ ;;; find-func.el --- find the definition of the Emacs Lisp function near point -*- lexical-binding:t -*- -;; Copyright (C) 1997, 1999, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997, 1999, 2001-2021 Free Software Foundation, Inc. ;; Author: Jens Petersen <petersen@kurims.kyoto-u.ac.jp> ;; Keywords: emacs-lisp, functions, variables diff --git a/lisp/emacs-lisp/float-sup.el b/lisp/emacs-lisp/float-sup.el index d92ca5b9337..4256bd59584 100644 --- a/lisp/emacs-lisp/float-sup.el +++ b/lisp/emacs-lisp/float-sup.el @@ -1,6 +1,6 @@ ;;; float-sup.el --- define some constants useful for floating point numbers. -*- lexical-binding:t -*- -;; Copyright (C) 1985-1987, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1985-1987, 2001-2021 Free Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org ;; Keywords: internal diff --git a/lisp/emacs-lisp/generator.el b/lisp/emacs-lisp/generator.el index c95c758a571..9eb6d959645 100644 --- a/lisp/emacs-lisp/generator.el +++ b/lisp/emacs-lisp/generator.el @@ -1,6 +1,6 @@ ;;; generator.el --- generators -*- lexical-binding: t -*- -;;; Copyright (C) 2015-2020 Free Software Foundation, Inc. +;;; Copyright (C) 2015-2021 Free Software Foundation, Inc. ;; Author: Daniel Colascione <dancol@dancol.org> ;; Keywords: extensions, elisp diff --git a/lisp/emacs-lisp/generic.el b/lisp/emacs-lisp/generic.el index 3bc6d021dc8..93f780eac2f 100644 --- a/lisp/emacs-lisp/generic.el +++ b/lisp/emacs-lisp/generic.el @@ -1,6 +1,6 @@ ;;; generic.el --- defining simple major modes with comment and font-lock ;; -;; Copyright (C) 1997, 1999, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997, 1999, 2001-2021 Free Software Foundation, Inc. ;; ;; Author: Peter Breton <pbreton@cs.umb.edu> ;; Created: Fri Sep 27 1996 diff --git a/lisp/emacs-lisp/gv.el b/lisp/emacs-lisp/gv.el index 7ee5c47d116..29f8230e6b8 100644 --- a/lisp/emacs-lisp/gv.el +++ b/lisp/emacs-lisp/gv.el @@ -1,6 +1,6 @@ ;;; gv.el --- generalized variables -*- lexical-binding: t -*- -;; Copyright (C) 2012-2020 Free Software Foundation, Inc. +;; Copyright (C) 2012-2021 Free Software Foundation, Inc. ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> ;; Keywords: extensions diff --git a/lisp/emacs-lisp/helper.el b/lisp/emacs-lisp/helper.el index a2f6fdef6a8..737f3ec2f33 100644 --- a/lisp/emacs-lisp/helper.el +++ b/lisp/emacs-lisp/helper.el @@ -1,6 +1,6 @@ ;;; helper.el --- utility help package supporting help in electric modes -;; Copyright (C) 1985, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1985, 2001-2021 Free Software Foundation, Inc. ;; Author: K. Shane Hartman ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/emacs-lisp/hierarchy.el b/lisp/emacs-lisp/hierarchy.el index 8cef029c4cf..7466fc85df1 100644 --- a/lisp/emacs-lisp/hierarchy.el +++ b/lisp/emacs-lisp/hierarchy.el @@ -1,6 +1,6 @@ ;;; hierarchy.el --- Library to create and display hierarchy structures -*- lexical-binding: t; -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; Author: Damien Cassou <damien@cassou.me> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/emacs-lisp/inline.el b/lisp/emacs-lisp/inline.el index 082587111fd..d6106fe35d0 100644 --- a/lisp/emacs-lisp/inline.el +++ b/lisp/emacs-lisp/inline.el @@ -1,6 +1,6 @@ ;;; inline.el --- Define functions by their inliner -*- lexical-binding:t; -*- -;; Copyright (C) 2014-2020 Free Software Foundation, Inc. +;; Copyright (C) 2014-2021 Free Software Foundation, Inc. ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> diff --git a/lisp/emacs-lisp/let-alist.el b/lisp/emacs-lisp/let-alist.el index 867ff85a1d9..433b37d7923 100644 --- a/lisp/emacs-lisp/let-alist.el +++ b/lisp/emacs-lisp/let-alist.el @@ -1,6 +1,6 @@ ;;; let-alist.el --- Easily let-bind values of an assoc-list by their names -*- lexical-binding: t; -*- -;; Copyright (C) 2014-2020 Free Software Foundation, Inc. +;; Copyright (C) 2014-2021 Free Software Foundation, Inc. ;; Author: Artur Malabarba <emacs@endlessparentheses.com> ;; Package-Requires: ((emacs "24.1")) diff --git a/lisp/emacs-lisp/lisp-mnt.el b/lisp/emacs-lisp/lisp-mnt.el index f1901563429..adb9cb2372c 100644 --- a/lisp/emacs-lisp/lisp-mnt.el +++ b/lisp/emacs-lisp/lisp-mnt.el @@ -1,6 +1,6 @@ ;;; lisp-mnt.el --- utility functions for Emacs Lisp maintainers -*- lexical-binding:t -*- -;; Copyright (C) 1992, 1994, 1997, 2000-2020 Free Software Foundation, +;; Copyright (C) 1992, 1994, 1997, 2000-2021 Free Software Foundation, ;; Inc. ;; Author: Eric S. Raymond <esr@snark.thyrsus.com> diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el index e477ef17000..1ae216c1a27 100644 --- a/lisp/emacs-lisp/lisp-mode.el +++ b/lisp/emacs-lisp/lisp-mode.el @@ -1,6 +1,6 @@ ;;; lisp-mode.el --- Lisp mode, and its idiosyncratic commands -*- lexical-binding:t -*- -;; Copyright (C) 1985-1986, 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1985-1986, 1999-2021 Free Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org ;; Keywords: lisp, languages diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el index 124900168c3..46ca94869c7 100644 --- a/lisp/emacs-lisp/lisp.el +++ b/lisp/emacs-lisp/lisp.el @@ -1,6 +1,6 @@ ;;; lisp.el --- Lisp editing commands for Emacs -*- lexical-binding:t -*- -;; Copyright (C) 1985-1986, 1994, 2000-2020 Free Software Foundation, +;; Copyright (C) 1985-1986, 1994, 2000-2021 Free Software Foundation, ;; Inc. ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/emacs-lisp/macroexp.el b/lisp/emacs-lisp/macroexp.el index 88825fcd58f..82a8cd2d777 100644 --- a/lisp/emacs-lisp/macroexp.el +++ b/lisp/emacs-lisp/macroexp.el @@ -1,6 +1,6 @@ ;;; macroexp.el --- Additional macro-expansion support -*- lexical-binding: t -*- ;; -;; Copyright (C) 2004-2020 Free Software Foundation, Inc. +;; Copyright (C) 2004-2021 Free Software Foundation, Inc. ;; ;; Author: Miles Bader <miles@gnu.org> ;; Keywords: lisp, compiler, macros diff --git a/lisp/emacs-lisp/map-ynp.el b/lisp/emacs-lisp/map-ynp.el index c35db7ae9cb..14112a1c147 100644 --- a/lisp/emacs-lisp/map-ynp.el +++ b/lisp/emacs-lisp/map-ynp.el @@ -1,6 +1,6 @@ ;;; map-ynp.el --- general-purpose boolean question-asker -*- lexical-binding:t -*- -;; Copyright (C) 1991-1995, 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 1991-1995, 2000-2021 Free Software Foundation, Inc. ;; Author: Roland McGrath <roland@gnu.org> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/emacs-lisp/map.el b/lisp/emacs-lisp/map.el index 9c23344baca..46a1bd21a3d 100644 --- a/lisp/emacs-lisp/map.el +++ b/lisp/emacs-lisp/map.el @@ -1,6 +1,6 @@ ;;; map.el --- Map manipulation functions -*- lexical-binding: t; -*- -;; Copyright (C) 2015-2020 Free Software Foundation, Inc. +;; Copyright (C) 2015-2021 Free Software Foundation, Inc. ;; Author: Nicolas Petton <nicolas@petton.fr> ;; Keywords: convenience, map, hash-table, alist, array diff --git a/lisp/emacs-lisp/memory-report.el b/lisp/emacs-lisp/memory-report.el index 332749987c4..3d6ca957e63 100644 --- a/lisp/emacs-lisp/memory-report.el +++ b/lisp/emacs-lisp/memory-report.el @@ -1,6 +1,6 @@ ;;; memory-report.el --- Short function summaries -*- lexical-binding: t -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; Keywords: lisp, help @@ -48,6 +48,7 @@ by counted more than once." (message "Gathering data...") (let ((reports (append (memory-report--garbage-collect) (memory-report--image-cache) + (memory-report--symbol-plist) (memory-report--buffers) (memory-report--largest-variables))) (inhibit-read-only t) @@ -159,6 +160,17 @@ by counted more than once." "\n")) (buffer-string))))) +(defun memory-report--symbol-plist () + (let ((counted (make-hash-table :test #'eq)) + (total 0)) + (mapatoms + (lambda (symbol) + (cl-incf total (memory-report--object-size + counted (symbol-plist symbol)))) + obarray) + (list + (cons "Memory Used By Symbol Plists" total)))) + (defun memory-report--object-size (counted value) (if (gethash value counted) 0 diff --git a/lisp/emacs-lisp/nadvice.el b/lisp/emacs-lisp/nadvice.el index e68c1356081..f9740565389 100644 --- a/lisp/emacs-lisp/nadvice.el +++ b/lisp/emacs-lisp/nadvice.el @@ -1,6 +1,6 @@ ;;; nadvice.el --- Light-weight advice primitives for Elisp functions -*- lexical-binding: t -*- -;; Copyright (C) 2012-2020 Free Software Foundation, Inc. +;; Copyright (C) 2012-2021 Free Software Foundation, Inc. ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> ;; Keywords: extensions, lisp, tools diff --git a/lisp/emacs-lisp/package-x.el b/lisp/emacs-lisp/package-x.el index c01b6efd4ef..8a0853ce445 100644 --- a/lisp/emacs-lisp/package-x.el +++ b/lisp/emacs-lisp/package-x.el @@ -1,6 +1,6 @@ ;;; package-x.el --- Package extras -;; Copyright (C) 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2007-2021 Free Software Foundation, Inc. ;; Author: Tom Tromey <tromey@redhat.com> ;; Created: 10 Mar 2007 diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 656e5ce36bf..5e9c328459c 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -1,6 +1,6 @@ ;;; package.el --- Simple package system for Emacs -*- lexical-binding:t -*- -;; Copyright (C) 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2007-2021 Free Software Foundation, Inc. ;; Author: Tom Tromey <tromey@redhat.com> ;; Daniel Hackney <dan@haxney.org> @@ -203,6 +203,9 @@ If VERSION is nil, the package is not made available (it is \"disabled\")." (defcustom package-archives `(("gnu" . ,(format "http%s://elpa.gnu.org/packages/" + (if (gnutls-available-p) "s" ""))) + ("nongnu" . + ,(format "http%s://elpa.nongnu.org/nongnu/" (if (gnutls-available-p) "s" "")))) "An alist of archives from which to fetch. The default value points to the GNU Emacs package repository. diff --git a/lisp/emacs-lisp/pcase.el b/lisp/emacs-lisp/pcase.el index 206f0dd1a9d..8fb79d220de 100644 --- a/lisp/emacs-lisp/pcase.el +++ b/lisp/emacs-lisp/pcase.el @@ -1,6 +1,6 @@ ;;; pcase.el --- ML-style pattern-matching macro for Elisp -*- lexical-binding: t -*- -;; Copyright (C) 2010-2020 Free Software Foundation, Inc. +;; Copyright (C) 2010-2021 Free Software Foundation, Inc. ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> ;; Keywords: extensions diff --git a/lisp/emacs-lisp/pp.el b/lisp/emacs-lisp/pp.el index de7d2020ea8..ef4c9603284 100644 --- a/lisp/emacs-lisp/pp.el +++ b/lisp/emacs-lisp/pp.el @@ -1,6 +1,6 @@ ;;; pp.el --- pretty printer for Emacs Lisp -*- lexical-binding: t -*- -;; Copyright (C) 1989, 1993, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1989, 1993, 2001-2021 Free Software Foundation, Inc. ;; Author: Randal Schwartz <merlyn@stonehenge.com> ;; Keywords: lisp diff --git a/lisp/emacs-lisp/radix-tree.el b/lisp/emacs-lisp/radix-tree.el index 48aedb2e566..6a483a6d498 100644 --- a/lisp/emacs-lisp/radix-tree.el +++ b/lisp/emacs-lisp/radix-tree.el @@ -1,6 +1,6 @@ ;;; radix-tree.el --- A simple library of radix trees -*- lexical-binding: t; -*- -;; Copyright (C) 2016-2020 Free Software Foundation, Inc. +;; Copyright (C) 2016-2021 Free Software Foundation, Inc. ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> ;; Keywords: diff --git a/lisp/emacs-lisp/re-builder.el b/lisp/emacs-lisp/re-builder.el index ffbf3b4b4dd..23221a2a00d 100644 --- a/lisp/emacs-lisp/re-builder.el +++ b/lisp/emacs-lisp/re-builder.el @@ -1,6 +1,6 @@ ;;; re-builder.el --- building Regexps with visual feedback -*- lexical-binding: t -*- -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: Detlev Zundel <dzu@gnu.org> ;; Keywords: matching, lisp, tools diff --git a/lisp/emacs-lisp/regexp-opt.el b/lisp/emacs-lisp/regexp-opt.el index 35a5fda184f..2a40290249e 100644 --- a/lisp/emacs-lisp/regexp-opt.el +++ b/lisp/emacs-lisp/regexp-opt.el @@ -1,6 +1,6 @@ ;;; regexp-opt.el --- generate efficient regexps to match strings -*- lexical-binding: t -*- -;; Copyright (C) 1994-2020 Free Software Foundation, Inc. +;; Copyright (C) 1994-2021 Free Software Foundation, Inc. ;; Author: Simon Marshall <simon@gnu.org> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/emacs-lisp/regi.el b/lisp/emacs-lisp/regi.el index 2e6e2b75d6a..38b202fa101 100644 --- a/lisp/emacs-lisp/regi.el +++ b/lisp/emacs-lisp/regi.el @@ -1,6 +1,6 @@ ;;; regi.el --- REGular expression Interpreting engine -;; Copyright (C) 1993, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1993, 2001-2021 Free Software Foundation, Inc. ;; Author: 1993 Barry A. Warsaw, Century Computing, Inc. <bwarsaw@cen.com> ;; Created: 24-Feb-1993 diff --git a/lisp/emacs-lisp/ring.el b/lisp/emacs-lisp/ring.el index 624efd6a476..96894655b45 100644 --- a/lisp/emacs-lisp/ring.el +++ b/lisp/emacs-lisp/ring.el @@ -1,6 +1,6 @@ ;;; ring.el --- handle rings of items -*- lexical-binding: t; -*- -;; Copyright (C) 1992, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1992, 2001-2021 Free Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org ;; Keywords: extensions diff --git a/lisp/emacs-lisp/rmc.el b/lisp/emacs-lisp/rmc.el index 9b253b88572..bedf598d442 100644 --- a/lisp/emacs-lisp/rmc.el +++ b/lisp/emacs-lisp/rmc.el @@ -1,6 +1,6 @@ ;;; rmc.el --- read from a multiple choice question -*- lexical-binding: t -*- -;; Copyright (C) 2016-2020 Free Software Foundation, Inc. +;; Copyright (C) 2016-2021 Free Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/emacs-lisp/rx.el b/lisp/emacs-lisp/rx.el index 6d33299e202..b29b870061d 100644 --- a/lisp/emacs-lisp/rx.el +++ b/lisp/emacs-lisp/rx.el @@ -1,6 +1,6 @@ ;;; rx.el --- S-exp notation for regexps --*- lexical-binding: t -*- -;; Copyright (C) 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 2001-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/lisp/emacs-lisp/seq.el b/lisp/emacs-lisp/seq.el index d91a33c1403..31c15fea90d 100644 --- a/lisp/emacs-lisp/seq.el +++ b/lisp/emacs-lisp/seq.el @@ -1,6 +1,6 @@ ;;; seq.el --- Sequence manipulation functions -*- lexical-binding: t -*- -;; Copyright (C) 2014-2020 Free Software Foundation, Inc. +;; Copyright (C) 2014-2021 Free Software Foundation, Inc. ;; Author: Nicolas Petton <nicolas@petton.fr> ;; Keywords: sequences diff --git a/lisp/emacs-lisp/shadow.el b/lisp/emacs-lisp/shadow.el index 68f58f69f7b..168e5e46f37 100644 --- a/lisp/emacs-lisp/shadow.el +++ b/lisp/emacs-lisp/shadow.el @@ -1,6 +1,6 @@ ;;; shadow.el --- locate Emacs Lisp file shadowings -;; Copyright (C) 1995, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1995, 2001-2021 Free Software Foundation, Inc. ;; Author: Terry Jones <terry@santafe.edu> ;; Keywords: lisp diff --git a/lisp/emacs-lisp/shortdoc.el b/lisp/emacs-lisp/shortdoc.el index 7fb1a88b861..698467e939e 100644 --- a/lisp/emacs-lisp/shortdoc.el +++ b/lisp/emacs-lisp/shortdoc.el @@ -1,6 +1,6 @@ ;;; shortdoc.el --- Short function summaries -*- lexical-binding: t -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; Keywords: lisp, help ;; Package: emacs diff --git a/lisp/emacs-lisp/smie.el b/lisp/emacs-lisp/smie.el index 355dd0f49e8..44be9afbfae 100644 --- a/lisp/emacs-lisp/smie.el +++ b/lisp/emacs-lisp/smie.el @@ -1,6 +1,6 @@ ;;; smie.el --- Simple Minded Indentation Engine -*- lexical-binding: t -*- -;; Copyright (C) 2010-2020 Free Software Foundation, Inc. +;; Copyright (C) 2010-2021 Free Software Foundation, Inc. ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> ;; Keywords: languages, lisp, internal, parsing, indentation diff --git a/lisp/emacs-lisp/subr-x.el b/lisp/emacs-lisp/subr-x.el index 9fbb0351af4..b90227da42f 100644 --- a/lisp/emacs-lisp/subr-x.el +++ b/lisp/emacs-lisp/subr-x.el @@ -1,6 +1,6 @@ ;;; subr-x.el --- extra Lisp functions -*- lexical-binding:t -*- -;; Copyright (C) 2013-2020 Free Software Foundation, Inc. +;; Copyright (C) 2013-2021 Free Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org ;; Keywords: convenience diff --git a/lisp/emacs-lisp/syntax.el b/lisp/emacs-lisp/syntax.el index e35f9d89ded..62f213c57f7 100644 --- a/lisp/emacs-lisp/syntax.el +++ b/lisp/emacs-lisp/syntax.el @@ -1,6 +1,6 @@ ;;; syntax.el --- helper functions to find syntactic context -*- lexical-binding: t -*- -;; Copyright (C) 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 2000-2021 Free Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org ;; Keywords: internal diff --git a/lisp/emacs-lisp/tabulated-list.el b/lisp/emacs-lisp/tabulated-list.el index ae3ed055c5d..0c299b48b90 100644 --- a/lisp/emacs-lisp/tabulated-list.el +++ b/lisp/emacs-lisp/tabulated-list.el @@ -1,6 +1,6 @@ ;;; tabulated-list.el --- generic major mode for tabulated lists -*- lexical-binding: t -*- -;; Copyright (C) 2011-2020 Free Software Foundation, Inc. +;; Copyright (C) 2011-2021 Free Software Foundation, Inc. ;; Author: Chong Yidong <cyd@stupidchicken.com> ;; Keywords: extensions, lisp diff --git a/lisp/emacs-lisp/tcover-ses.el b/lisp/emacs-lisp/tcover-ses.el index cfc00f5006f..7de9d547ce4 100644 --- a/lisp/emacs-lisp/tcover-ses.el +++ b/lisp/emacs-lisp/tcover-ses.el @@ -1,6 +1,6 @@ ;;;; testcover-ses.el -- Example use of `testcover' to test "SES" -;; Copyright (C) 2002-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002-2021 Free Software Foundation, Inc. ;; Author: Jonathan Yavner <jyavner@member.fsf.org> ;; Keywords: spreadsheet lisp utility diff --git a/lisp/emacs-lisp/testcover.el b/lisp/emacs-lisp/testcover.el index 79801635f2d..312e38769c5 100644 --- a/lisp/emacs-lisp/testcover.el +++ b/lisp/emacs-lisp/testcover.el @@ -1,6 +1,6 @@ ;;;; testcover.el -- Visual code-coverage tool -*- lexical-binding:t -*- -;; Copyright (C) 2002-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002-2021 Free Software Foundation, Inc. ;; Author: Jonathan Yavner <jyavner@member.fsf.org> ;; Keywords: lisp utility diff --git a/lisp/emacs-lisp/text-property-search.el b/lisp/emacs-lisp/text-property-search.el index d7dc7da7c18..e909e4bf760 100644 --- a/lisp/emacs-lisp/text-property-search.el +++ b/lisp/emacs-lisp/text-property-search.el @@ -1,6 +1,6 @@ ;;; text-property-search.el --- search for text properties -*- lexical-binding:t -*- -;; Copyright (C) 2018-2020 Free Software Foundation, Inc. +;; Copyright (C) 2018-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Keywords: convenience diff --git a/lisp/emacs-lisp/thunk.el b/lisp/emacs-lisp/thunk.el index cd42152527e..83e0fa75aa7 100644 --- a/lisp/emacs-lisp/thunk.el +++ b/lisp/emacs-lisp/thunk.el @@ -1,6 +1,6 @@ ;;; thunk.el --- Lazy form evaluation -*- lexical-binding: t -*- -;; Copyright (C) 2015-2020 Free Software Foundation, Inc. +;; Copyright (C) 2015-2021 Free Software Foundation, Inc. ;; Author: Nicolas Petton <nicolas@petton.fr> ;; Keywords: sequences diff --git a/lisp/emacs-lisp/timer-list.el b/lisp/emacs-lisp/timer-list.el index 024f0030629..d5bbe7d72cd 100644 --- a/lisp/emacs-lisp/timer-list.el +++ b/lisp/emacs-lisp/timer-list.el @@ -1,6 +1,6 @@ ;;; timer-list.el --- list active timers in a buffer -*- lexical-binding:t -*- -;; Copyright (C) 2016-2020 Free Software Foundation, Inc. +;; Copyright (C) 2016-2021 Free Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org ;; Package: emacs diff --git a/lisp/emacs-lisp/timer.el b/lisp/emacs-lisp/timer.el index 61fd05cbb80..36de29a73a8 100644 --- a/lisp/emacs-lisp/timer.el +++ b/lisp/emacs-lisp/timer.el @@ -1,6 +1,6 @@ ;;; timer.el --- run a function with args at some time in future -*- lexical-binding: t -*- -;; Copyright (C) 1996, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996, 2001-2021 Free Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org ;; Package: emacs diff --git a/lisp/emacs-lisp/tq.el b/lisp/emacs-lisp/tq.el index 2780140cee1..e02f4e4f250 100644 --- a/lisp/emacs-lisp/tq.el +++ b/lisp/emacs-lisp/tq.el @@ -1,6 +1,6 @@ ;;; tq.el --- utility to maintain a transaction queue -*- lexical-binding:t -*- -;; Copyright (C) 1985-1987, 1992, 2001-2020 Free Software Foundation, +;; Copyright (C) 1985-1987, 1992, 2001-2021 Free Software Foundation, ;; Inc. ;; Author: Scott Draves <spot@cs.cmu.edu> diff --git a/lisp/emacs-lisp/trace.el b/lisp/emacs-lisp/trace.el index 28e964ec4c2..fa07d622484 100644 --- a/lisp/emacs-lisp/trace.el +++ b/lisp/emacs-lisp/trace.el @@ -1,6 +1,6 @@ ;;; trace.el --- tracing facility for Emacs Lisp functions -*- lexical-binding: t -*- -;; Copyright (C) 1993, 1998, 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 1993, 1998, 2000-2021 Free Software Foundation, Inc. ;; Author: Hans Chalupsky <hans@cs.buffalo.edu> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/emacs-lisp/unsafep.el b/lisp/emacs-lisp/unsafep.el index c4db86a0db3..f46d9c77eae 100644 --- a/lisp/emacs-lisp/unsafep.el +++ b/lisp/emacs-lisp/unsafep.el @@ -1,6 +1,6 @@ ;;;; unsafep.el -- Determine whether a Lisp form is safe to evaluate -;; Copyright (C) 2002-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002-2021 Free Software Foundation, Inc. ;; Author: Jonathan Yavner <jyavner@member.fsf.org> ;; Keywords: safety lisp utility diff --git a/lisp/emacs-lisp/warnings.el b/lisp/emacs-lisp/warnings.el index 28458847cc2..67de690e67d 100644 --- a/lisp/emacs-lisp/warnings.el +++ b/lisp/emacs-lisp/warnings.el @@ -1,6 +1,6 @@ ;;; warnings.el --- log and display warnings -*- lexical-binding:t -*- -;; Copyright (C) 2002-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002-2021 Free Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org ;; Keywords: internal diff --git a/lisp/emacs-lock.el b/lisp/emacs-lock.el index ba75a93035e..5c436f599ef 100644 --- a/lisp/emacs-lock.el +++ b/lisp/emacs-lock.el @@ -1,6 +1,6 @@ ;;; emacs-lock.el --- protect buffers against killing or exiting -*- lexical-binding: t -*- -;; Copyright (C) 2011-2020 Free Software Foundation, Inc. +;; Copyright (C) 2011-2021 Free Software Foundation, Inc. ;; Author: Juanma Barranquero <lekktu@gmail.com> ;; Inspired by emacs-lock.el by Tom Wurgler <twurgler@goodyear.com> diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el index 55578d06229..881eff7f801 100644 --- a/lisp/emulation/cua-base.el +++ b/lisp/emulation/cua-base.el @@ -1,6 +1,6 @@ ;;; cua-base.el --- emulate CUA key bindings -;; Copyright (C) 1997-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997-2021 Free Software Foundation, Inc. ;; Author: Kim F. Storm <storm@cua.dk> ;; Keywords: keyboard emulations convenience cua diff --git a/lisp/emulation/cua-gmrk.el b/lisp/emulation/cua-gmrk.el index cd360721721..195bba1f317 100644 --- a/lisp/emulation/cua-gmrk.el +++ b/lisp/emulation/cua-gmrk.el @@ -1,6 +1,6 @@ ;;; cua-gmrk.el --- CUA unified global mark support -;; Copyright (C) 1997-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997-2021 Free Software Foundation, Inc. ;; Author: Kim F. Storm <storm@cua.dk> ;; Keywords: keyboard emulations convenience cua mark diff --git a/lisp/emulation/cua-rect.el b/lisp/emulation/cua-rect.el index 7ca9dc1af1d..ea5dad2aa0b 100644 --- a/lisp/emulation/cua-rect.el +++ b/lisp/emulation/cua-rect.el @@ -1,6 +1,6 @@ ;;; cua-rect.el --- CUA unified rectangle support -;; Copyright (C) 1997-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997-2021 Free Software Foundation, Inc. ;; Author: Kim F. Storm <storm@cua.dk> ;; Keywords: keyboard emulations convenience CUA diff --git a/lisp/emulation/edt-lk201.el b/lisp/emulation/edt-lk201.el index f7b2c0c93ea..b616fdf4298 100644 --- a/lisp/emulation/edt-lk201.el +++ b/lisp/emulation/edt-lk201.el @@ -1,6 +1,6 @@ ;;; edt-lk201.el --- enhanced EDT keypad mode emulation for LK-201 keyboards -*- lexical-binding: t -*- -;; Copyright (C) 1986, 1992-1993, 1995, 2001-2020 Free Software +;; Copyright (C) 1986, 1992-1993, 1995, 2001-2021 Free Software ;; Foundation, Inc. ;; Author: Kevin Gallagher <kevin.gal@verizon.net> diff --git a/lisp/emulation/edt-mapper.el b/lisp/emulation/edt-mapper.el index 5dd81fab3b6..98085c6214d 100644 --- a/lisp/emulation/edt-mapper.el +++ b/lisp/emulation/edt-mapper.el @@ -1,6 +1,6 @@ ;;; edt-mapper.el --- create an EDT LK-201 map file for X-Windows Emacs -;; Copyright (C) 1994-1995, 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 1994-1995, 2000-2021 Free Software Foundation, Inc. ;; Author: Kevin Gallagher <kevin.gal@verizon.net> ;; Keywords: emulations diff --git a/lisp/emulation/edt-pc.el b/lisp/emulation/edt-pc.el index 53fc9886b77..3131c8f873e 100644 --- a/lisp/emulation/edt-pc.el +++ b/lisp/emulation/edt-pc.el @@ -1,6 +1,6 @@ ;;; edt-pc.el --- enhanced EDT keypad mode emulation for PC 101 keyboards -*- lexical-binding: t -*- -;; Copyright (C) 1986, 1994-1995, 2001-2020 Free Software Foundation, +;; Copyright (C) 1986, 1994-1995, 2001-2021 Free Software Foundation, ;; Inc. ;; Author: Kevin Gallagher <kevin.gal@verizon.net> diff --git a/lisp/emulation/edt-vt100.el b/lisp/emulation/edt-vt100.el index 420d29b6aab..8174d83eaa1 100644 --- a/lisp/emulation/edt-vt100.el +++ b/lisp/emulation/edt-vt100.el @@ -1,6 +1,6 @@ ;;; edt-vt100.el --- enhanced EDT keypad mode emulation for VT series terminals -*- lexical-binding: t -*- -;; Copyright (C) 1986, 1992-1993, 1995, 2002-2020 Free Software +;; Copyright (C) 1986, 1992-1993, 1995, 2002-2021 Free Software ;; Foundation, Inc. ;; Author: Kevin Gallagher <kevin.gal@verizon.net> diff --git a/lisp/emulation/edt.el b/lisp/emulation/edt.el index 7601731a85a..7760a7f2b46 100644 --- a/lisp/emulation/edt.el +++ b/lisp/emulation/edt.el @@ -1,6 +1,6 @@ ;;; edt.el --- enhanced EDT keypad mode emulation for GNU Emacs -;; Copyright (C) 1986, 1992-1995, 2000-2020 Free Software Foundation, +;; Copyright (C) 1986, 1992-1995, 2000-2021 Free Software Foundation, ;; Inc. ;; Author: Kevin Gallagher <kevin.gal@verizon.net> diff --git a/lisp/emulation/keypad.el b/lisp/emulation/keypad.el index f7bebf78e44..e4f3c4d53ec 100644 --- a/lisp/emulation/keypad.el +++ b/lisp/emulation/keypad.el @@ -1,6 +1,6 @@ ;;; keypad.el --- simplified keypad bindings -;; Copyright (C) 2002-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002-2021 Free Software Foundation, Inc. ;; Author: Kim F. Storm <storm@cua.dk> ;; Keywords: keyboard convenience diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el index 938ebb15227..1e235831d6f 100644 --- a/lisp/emulation/viper-cmd.el +++ b/lisp/emulation/viper-cmd.el @@ -1,6 +1,6 @@ ;;; viper-cmd.el --- Vi command support for Viper -*- lexical-binding:t -*- -;; Copyright (C) 1997-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997-2021 Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> ;; Package: viper diff --git a/lisp/emulation/viper-ex.el b/lisp/emulation/viper-ex.el index 929b7a0bed6..238faed069f 100644 --- a/lisp/emulation/viper-ex.el +++ b/lisp/emulation/viper-ex.el @@ -1,6 +1,6 @@ ;;; viper-ex.el --- functions implementing the Ex commands for Viper -;; Copyright (C) 1994-1998, 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 1994-1998, 2000-2021 Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> ;; Package: viper diff --git a/lisp/emulation/viper-init.el b/lisp/emulation/viper-init.el index c2aae9b87fb..cede99bff73 100644 --- a/lisp/emulation/viper-init.el +++ b/lisp/emulation/viper-init.el @@ -1,6 +1,6 @@ ;;; viper-init.el --- some common definitions for Viper -;; Copyright (C) 1997-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997-2021 Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> ;; Package: viper diff --git a/lisp/emulation/viper-keym.el b/lisp/emulation/viper-keym.el index 6a0fc2e9842..7209dc664b5 100644 --- a/lisp/emulation/viper-keym.el +++ b/lisp/emulation/viper-keym.el @@ -1,6 +1,6 @@ ;;; viper-keym.el --- Viper keymaps -*- lexical-binding:t -*- -;; Copyright (C) 1994-1997, 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 1994-1997, 2000-2021 Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> ;; Package: viper diff --git a/lisp/emulation/viper-macs.el b/lisp/emulation/viper-macs.el index ac03cf9bd36..039ddabcdc3 100644 --- a/lisp/emulation/viper-macs.el +++ b/lisp/emulation/viper-macs.el @@ -1,6 +1,6 @@ ;;; viper-macs.el --- functions implementing keyboard macros for Viper -*- lexical-binding:t -*- -;; Copyright (C) 1994-1997, 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 1994-1997, 2000-2021 Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> ;; Package: viper diff --git a/lisp/emulation/viper-mous.el b/lisp/emulation/viper-mous.el index 928a3ef00ee..eec83dd05b5 100644 --- a/lisp/emulation/viper-mous.el +++ b/lisp/emulation/viper-mous.el @@ -1,6 +1,6 @@ ;;; viper-mous.el --- mouse support for Viper -;; Copyright (C) 1994-1997, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1994-1997, 2001-2021 Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> ;; Package: viper diff --git a/lisp/emulation/viper-util.el b/lisp/emulation/viper-util.el index 208a2ee9863..07a234bab9b 100644 --- a/lisp/emulation/viper-util.el +++ b/lisp/emulation/viper-util.el @@ -1,6 +1,6 @@ ;;; viper-util.el --- Utilities used by viper.el -*- lexical-binding:t -*- -;; Copyright (C) 1994-1997, 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1994-1997, 1999-2021 Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> ;; Package: viper diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el index 851092819c8..6c9428060fc 100644 --- a/lisp/emulation/viper.el +++ b/lisp/emulation/viper.el @@ -3,7 +3,7 @@ ;; and a venomous VI PERil. ;; Viper Is also a Package for Emacs Rebels. -;; Copyright (C) 1994-2020 Free Software Foundation, Inc. +;; Copyright (C) 1994-2021 Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> ;; Keywords: emulations diff --git a/lisp/env.el b/lisp/env.el index 6de90385a35..51247f1ff84 100644 --- a/lisp/env.el +++ b/lisp/env.el @@ -1,6 +1,6 @@ ;;; env.el --- functions to manipulate environment variables -*- lexical-binding:t -*- -;; Copyright (C) 1991, 1994, 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 1991, 1994, 2000-2021 Free Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org ;; Keywords: processes, unix diff --git a/lisp/epa-dired.el b/lisp/epa-dired.el index 4ff1ba33941..8a4f8933bf8 100644 --- a/lisp/epa-dired.el +++ b/lisp/epa-dired.el @@ -1,6 +1,6 @@ ;;; epa-dired.el --- the EasyPG Assistant, dired extension -*- lexical-binding: t -*- -;; Copyright (C) 2006-2020 Free Software Foundation, Inc. +;; Copyright (C) 2006-2021 Free Software Foundation, Inc. ;; Author: Daiki Ueno <ueno@unixuser.org> ;; Keywords: PGP, GnuPG diff --git a/lisp/epa-file.el b/lisp/epa-file.el index 21dc1ebaff0..e46e3684c8a 100644 --- a/lisp/epa-file.el +++ b/lisp/epa-file.el @@ -1,6 +1,6 @@ ;;; epa-file.el --- the EasyPG Assistant, transparent file encryption -*- lexical-binding: t -*- -;; Copyright (C) 2006-2020 Free Software Foundation, Inc. +;; Copyright (C) 2006-2021 Free Software Foundation, Inc. ;; Author: Daiki Ueno <ueno@unixuser.org> ;; Keywords: PGP, GnuPG diff --git a/lisp/epa-hook.el b/lisp/epa-hook.el index 6f12f8a6bfa..9ad952c6813 100644 --- a/lisp/epa-hook.el +++ b/lisp/epa-hook.el @@ -1,6 +1,6 @@ ;;; epa-hook.el --- preloaded code to enable epa-file.el -*- lexical-binding: t -*- -;; Copyright (C) 2006-2020 Free Software Foundation, Inc. +;; Copyright (C) 2006-2021 Free Software Foundation, Inc. ;; Author: Daiki Ueno <ueno@unixuser.org> ;; Keywords: PGP, GnuPG diff --git a/lisp/epa-mail.el b/lisp/epa-mail.el index dd171ab6474..7e100569b0f 100644 --- a/lisp/epa-mail.el +++ b/lisp/epa-mail.el @@ -1,6 +1,6 @@ ;;; epa-mail.el --- the EasyPG Assistant, minor-mode for mail composer -*- lexical-binding: t -*- -;; Copyright (C) 2006-2020 Free Software Foundation, Inc. +;; Copyright (C) 2006-2021 Free Software Foundation, Inc. ;; Author: Daiki Ueno <ueno@unixuser.org> ;; Keywords: PGP, GnuPG, mail, message @@ -243,7 +243,7 @@ If no one is selected, symmetric encryption will be performed. " (setq epa-last-coding-system-specified (or coding-system-for-write (select-safe-coding-system (point) (point-max))))) - + ;; Insert contents of requested attachments, if any. (when (and (eq major-mode 'mail-mode) mail-encode-mml) (mml-to-mime) diff --git a/lisp/epa.el b/lisp/epa.el index d6c7946c939..db2b1271473 100644 --- a/lisp/epa.el +++ b/lisp/epa.el @@ -1,6 +1,6 @@ ;;; epa.el --- the EasyPG Assistant -*- lexical-binding: t -*- -;; Copyright (C) 2006-2020 Free Software Foundation, Inc. +;; Copyright (C) 2006-2021 Free Software Foundation, Inc. ;; Author: Daiki Ueno <ueno@unixuser.org> ;; Keywords: PGP, GnuPG diff --git a/lisp/epg-config.el b/lisp/epg-config.el index 9f0c7e4c509..59d097c91f0 100644 --- a/lisp/epg-config.el +++ b/lisp/epg-config.el @@ -1,6 +1,6 @@ ;;; epg-config.el --- configuration of the EasyPG Library -;; Copyright (C) 2006-2020 Free Software Foundation, Inc. +;; Copyright (C) 2006-2021 Free Software Foundation, Inc. ;; Author: Daiki Ueno <ueno@unixuser.org> ;; Keywords: PGP, GnuPG diff --git a/lisp/epg.el b/lisp/epg.el index b27e2c638c2..b1f37cbbdcf 100644 --- a/lisp/epg.el +++ b/lisp/epg.el @@ -1,6 +1,6 @@ ;;; epg.el --- the EasyPG Library -*- lexical-binding: t -*- -;; Copyright (C) 1999-2000, 2002-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2000, 2002-2021 Free Software Foundation, Inc. ;; Author: Daiki Ueno <ueno@unixuser.org> ;; Keywords: PGP, GnuPG diff --git a/lisp/erc/ChangeLog.1 b/lisp/erc/ChangeLog.1 index fdf51954684..26c1bd689ef 100644 --- a/lisp/erc/ChangeLog.1 +++ b/lisp/erc/ChangeLog.1 @@ -11702,7 +11702,7 @@ * erc-speak.el, erc.el: New file. - Copyright (C) 2001-2020 Free Software Foundation, Inc. + Copyright (C) 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lisp/erc/ChangeLog.2 b/lisp/erc/ChangeLog.2 index 5ab459dcd81..b54e3b9af24 100644 --- a/lisp/erc/ChangeLog.2 +++ b/lisp/erc/ChangeLog.2 @@ -757,7 +757,7 @@ See ChangeLog.1 for earlier changes. - Copyright (C) 2009-2020 Free Software Foundation, Inc. + Copyright (C) 2009-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lisp/erc/erc-autoaway.el b/lisp/erc/erc-autoaway.el index 0923ed6e735..a0085662e22 100644 --- a/lisp/erc/erc-autoaway.el +++ b/lisp/erc/erc-autoaway.el @@ -1,6 +1,6 @@ ;;; erc-autoaway.el --- Provides autoaway for ERC -;; Copyright (C) 2002-2004, 2006-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002-2004, 2006-2021 Free Software Foundation, Inc. ;; Author: Jorgen Schaefer <forcer@forcix.cx> ;; Maintainer: Amin Bandali <bandali@gnu.org> diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el index f99088d4c78..487dc7692ef 100644 --- a/lisp/erc/erc-backend.el +++ b/lisp/erc/erc-backend.el @@ -1,6 +1,6 @@ ;;; erc-backend.el --- Backend network communication for ERC -*- lexical-binding:t -*- -;; Copyright (C) 2004-2020 Free Software Foundation, Inc. +;; Copyright (C) 2004-2021 Free Software Foundation, Inc. ;; Filename: erc-backend.el ;; Author: Lawrence Mitchell <wence@gmx.li> diff --git a/lisp/erc/erc-button.el b/lisp/erc/erc-button.el index cd04a3ab2c2..71ff40877a8 100644 --- a/lisp/erc/erc-button.el +++ b/lisp/erc/erc-button.el @@ -1,6 +1,6 @@ ;; erc-button.el --- A way of buttonizing certain things in ERC buffers -*- lexical-binding:t -*- -;; Copyright (C) 1996-2004, 2006-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996-2004, 2006-2021 Free Software Foundation, Inc. ;; Author: Mario Lang <mlang@delysid.org> ;; Maintainer: Amin Bandali <bandali@gnu.org> diff --git a/lisp/erc/erc-capab.el b/lisp/erc/erc-capab.el index 4afe6a7614b..06d4fbd9f6a 100644 --- a/lisp/erc/erc-capab.el +++ b/lisp/erc/erc-capab.el @@ -1,6 +1,6 @@ ;;; erc-capab.el --- support for dancer-ircd and hyperion's CAPAB -;; Copyright (C) 2006-2020 Free Software Foundation, Inc. +;; Copyright (C) 2006-2021 Free Software Foundation, Inc. ;; Maintainer: Amin Bandali <bandali@gnu.org> diff --git a/lisp/erc/erc-dcc.el b/lisp/erc/erc-dcc.el index 04508a44b60..590785e91c2 100644 --- a/lisp/erc/erc-dcc.el +++ b/lisp/erc/erc-dcc.el @@ -1,6 +1,6 @@ ;;; erc-dcc.el --- CTCP DCC module for ERC -;; Copyright (C) 1993-1995, 1998, 2002-2004, 2006-2020 Free Software +;; Copyright (C) 1993-1995, 1998, 2002-2004, 2006-2021 Free Software ;; Foundation, Inc. ;; Author: Ben A. Mesander <ben@gnu.ai.mit.edu> diff --git a/lisp/erc/erc-desktop-notifications.el b/lisp/erc/erc-desktop-notifications.el index 3a9a4a4bac6..056fb23777f 100644 --- a/lisp/erc/erc-desktop-notifications.el +++ b/lisp/erc/erc-desktop-notifications.el @@ -1,6 +1,6 @@ ;; erc-desktop-notifications.el -- Send notification on PRIVMSG or mentions -*- lexical-binding:t -*- -;; Copyright (C) 2012-2020 Free Software Foundation, Inc. +;; Copyright (C) 2012-2021 Free Software Foundation, Inc. ;; Author: Julien Danjou <julien@danjou.info> ;; Maintainer: Amin Bandali <bandali@gnu.org> diff --git a/lisp/erc/erc-ezbounce.el b/lisp/erc/erc-ezbounce.el index 5c2faff96de..62238dd4344 100644 --- a/lisp/erc/erc-ezbounce.el +++ b/lisp/erc/erc-ezbounce.el @@ -1,6 +1,6 @@ ;;; erc-ezbounce.el --- Handle EZBounce bouncer commands -;; Copyright (C) 2002, 2004, 2006-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2004, 2006-2021 Free Software Foundation, Inc. ;; Author: Andreas Fuchs <asf@void.at> ;; Maintainer: Amin Bandali <bandali@gnu.org> diff --git a/lisp/erc/erc-fill.el b/lisp/erc/erc-fill.el index d09caf7aa12..83ef5f93fa7 100644 --- a/lisp/erc/erc-fill.el +++ b/lisp/erc/erc-fill.el @@ -1,6 +1,6 @@ ;;; erc-fill.el --- Filling IRC messages in various ways -;; Copyright (C) 2001-2004, 2006-2020 Free Software Foundation, Inc. +;; Copyright (C) 2001-2004, 2006-2021 Free Software Foundation, Inc. ;; Author: Andreas Fuchs <asf@void.at> ;; Mario Lang <mlang@delysid.org> diff --git a/lisp/erc/erc-goodies.el b/lisp/erc/erc-goodies.el index 350eb89b666..aef68810dfa 100644 --- a/lisp/erc/erc-goodies.el +++ b/lisp/erc/erc-goodies.el @@ -1,6 +1,6 @@ ;; erc-goodies.el --- Collection of ERC modules -;; Copyright (C) 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 2001-2021 Free Software Foundation, Inc. ;; Author: Jorgen Schaefer <forcer@forcix.cx> ;; Maintainer: Amin Bandali <bandali@gnu.org> diff --git a/lisp/erc/erc-ibuffer.el b/lisp/erc/erc-ibuffer.el index 556a25e3e7b..5a002ccae3e 100644 --- a/lisp/erc/erc-ibuffer.el +++ b/lisp/erc/erc-ibuffer.el @@ -1,6 +1,6 @@ ;;; erc-ibuffer.el --- ibuffer integration with ERC -;; Copyright (C) 2002, 2004, 2006-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2004, 2006-2021 Free Software Foundation, Inc. ;; Author: Mario Lang <mlang@delysid.org> ;; Maintainer: Amin Bandali <bandali@gnu.org> diff --git a/lisp/erc/erc-identd.el b/lisp/erc/erc-identd.el index e2115f5f4bb..5f1aab1784b 100644 --- a/lisp/erc/erc-identd.el +++ b/lisp/erc/erc-identd.el @@ -1,6 +1,6 @@ ;;; erc-identd.el --- RFC1413 (identd authentication protocol) server -;; Copyright (C) 2003, 2006-2020 Free Software Foundation, Inc. +;; Copyright (C) 2003, 2006-2021 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> ;; Maintainer: Amin Bandali <bandali@gnu.org> diff --git a/lisp/erc/erc-imenu.el b/lisp/erc/erc-imenu.el index c05633aaea8..1a2d8e2755f 100644 --- a/lisp/erc/erc-imenu.el +++ b/lisp/erc/erc-imenu.el @@ -1,6 +1,6 @@ ;;; erc-imenu.el -- Imenu support for ERC -;; Copyright (C) 2001-2002, 2004, 2006-2020 Free Software Foundation, +;; Copyright (C) 2001-2002, 2004, 2006-2021 Free Software Foundation, ;; Inc. ;; Author: Mario Lang <mlang@delysid.org> diff --git a/lisp/erc/erc-join.el b/lisp/erc/erc-join.el index 79c111082f6..947b2949690 100644 --- a/lisp/erc/erc-join.el +++ b/lisp/erc/erc-join.el @@ -1,6 +1,6 @@ ;;; erc-join.el --- autojoin channels on connect and reconnects -;; Copyright (C) 2002-2004, 2006-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002-2004, 2006-2021 Free Software Foundation, Inc. ;; Author: Alex Schroeder <alex@gnu.org> ;; Maintainer: Amin Bandali <bandali@gnu.org> diff --git a/lisp/erc/erc-lang.el b/lisp/erc/erc-lang.el index 95b94f6a072..b86a8d0be2b 100644 --- a/lisp/erc/erc-lang.el +++ b/lisp/erc/erc-lang.el @@ -1,6 +1,6 @@ ;;; erc-lang.el --- provide the LANG command to ERC -;; Copyright (C) 2002, 2004, 2006-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2004, 2006-2021 Free Software Foundation, Inc. ;; Author: Alex Schroeder <alex@gnu.org> ;; Maintainer: Amin Bandali <bandali@gnu.org> diff --git a/lisp/erc/erc-list.el b/lisp/erc/erc-list.el index ae7c2e5f2fa..cf150e74ab5 100644 --- a/lisp/erc/erc-list.el +++ b/lisp/erc/erc-list.el @@ -1,6 +1,6 @@ ;;; erc-list.el --- /list support for ERC -*- lexical-binding:t -*- -;; Copyright (C) 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2008-2021 Free Software Foundation, Inc. ;; Author: Tom Tromey <tromey@redhat.com> ;; Maintainer: Amin Bandali <bandali@gnu.org> diff --git a/lisp/erc/erc-log.el b/lisp/erc/erc-log.el index 7eddb5f60f1..4540ec6808f 100644 --- a/lisp/erc/erc-log.el +++ b/lisp/erc/erc-log.el @@ -1,6 +1,6 @@ ;;; erc-log.el --- Logging facilities for ERC. -;; Copyright (C) 2003-2020 Free Software Foundation, Inc. +;; Copyright (C) 2003-2021 Free Software Foundation, Inc. ;; Author: Lawrence Mitchell <wence@gmx.li> ;; Maintainer: Amin Bandali <bandali@gnu.org> diff --git a/lisp/erc/erc-match.el b/lisp/erc/erc-match.el index b3145674f29..153742a6706 100644 --- a/lisp/erc/erc-match.el +++ b/lisp/erc/erc-match.el @@ -1,6 +1,6 @@ ;;; erc-match.el --- Highlight messages matching certain regexps -;; Copyright (C) 2002-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002-2021 Free Software Foundation, Inc. ;; Author: Andreas Fuchs <asf@void.at> ;; Maintainer: Amin Bandali <bandali@gnu.org> diff --git a/lisp/erc/erc-menu.el b/lisp/erc/erc-menu.el index b36a1cb8fa9..4c092c834bc 100644 --- a/lisp/erc/erc-menu.el +++ b/lisp/erc/erc-menu.el @@ -1,6 +1,6 @@ ;; erc-menu.el -- Menu-bar definitions for ERC -;; Copyright (C) 2001-2002, 2004-2020 Free Software Foundation, Inc. +;; Copyright (C) 2001-2002, 2004-2021 Free Software Foundation, Inc. ;; Author: Mario Lang <mlang@delysid.org> ;; Maintainer: Amin Bandali <bandali@gnu.org> diff --git a/lisp/erc/erc-netsplit.el b/lisp/erc/erc-netsplit.el index e3dc52bc4ec..9fd3cfe1cc4 100644 --- a/lisp/erc/erc-netsplit.el +++ b/lisp/erc/erc-netsplit.el @@ -1,6 +1,6 @@ ;;; erc-netsplit.el --- Reduce JOIN/QUIT messages on netsplits -;; Copyright (C) 2002-2004, 2006-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002-2004, 2006-2021 Free Software Foundation, Inc. ;; Author: Mario Lang <mlang@delysid.org> ;; Maintainer: Amin Bandali <bandali@gnu.org> diff --git a/lisp/erc/erc-networks.el b/lisp/erc/erc-networks.el index d957fcee056..9c2bb9dfee3 100644 --- a/lisp/erc/erc-networks.el +++ b/lisp/erc/erc-networks.el @@ -1,6 +1,6 @@ ;;; erc-networks.el --- IRC networks -;; Copyright (C) 2002, 2004-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2004-2021 Free Software Foundation, Inc. ;; Author: Mario Lang <mlang@lexx.delysid.org> ;; Maintainer: Amin Bandali <bandali@gnu.org> diff --git a/lisp/erc/erc-notify.el b/lisp/erc/erc-notify.el index 144a981f832..098049edc68 100644 --- a/lisp/erc/erc-notify.el +++ b/lisp/erc/erc-notify.el @@ -1,6 +1,6 @@ ;;; erc-notify.el --- Online status change notification -*- lexical-binding:t -*- -;; Copyright (C) 2002-2004, 2006-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002-2004, 2006-2021 Free Software Foundation, Inc. ;; Author: Mario Lang <mlang@lexx.delysid.org> ;; Maintainer: Amin Bandali <bandali@gnu.org> diff --git a/lisp/erc/erc-page.el b/lisp/erc/erc-page.el index 339beb0e85f..0cb60f5efa0 100644 --- a/lisp/erc/erc-page.el +++ b/lisp/erc/erc-page.el @@ -1,6 +1,6 @@ ;; erc-page.el - CTCP PAGE support for ERC -;; Copyright (C) 2002, 2004, 2006-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2004, 2006-2021 Free Software Foundation, Inc. ;; Maintainer: Amin Bandali <bandali@gnu.org> diff --git a/lisp/erc/erc-pcomplete.el b/lisp/erc/erc-pcomplete.el index c4932f2bde2..ab4c7c580c6 100644 --- a/lisp/erc/erc-pcomplete.el +++ b/lisp/erc/erc-pcomplete.el @@ -1,6 +1,6 @@ ;;; erc-pcomplete.el --- Provides programmable completion for ERC -;; Copyright (C) 2002-2004, 2006-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002-2004, 2006-2021 Free Software Foundation, Inc. ;; Author: Sacha Chua <sacha@free.net.ph> ;; Maintainer: Amin Bandali <bandali@gnu.org> diff --git a/lisp/erc/erc-replace.el b/lisp/erc/erc-replace.el index 8bd97be9494..91fafbb6308 100644 --- a/lisp/erc/erc-replace.el +++ b/lisp/erc/erc-replace.el @@ -1,6 +1,6 @@ ;; erc-replace.el -- wash and massage messages inserted into the buffer -;; Copyright (C) 2001-2002, 2004, 2006-2020 Free Software Foundation, +;; Copyright (C) 2001-2002, 2004, 2006-2021 Free Software Foundation, ;; Inc. ;; Author: Andreas Fuchs <asf@void.at> diff --git a/lisp/erc/erc-ring.el b/lisp/erc/erc-ring.el index bc5f0ed23b3..3813eafe004 100644 --- a/lisp/erc/erc-ring.el +++ b/lisp/erc/erc-ring.el @@ -1,6 +1,6 @@ ;; erc-ring.el -- Command history handling for erc using ring.el -;; Copyright (C) 2001-2004, 2006-2020 Free Software Foundation, Inc. +;; Copyright (C) 2001-2004, 2006-2021 Free Software Foundation, Inc. ;; Author: Alex Schroeder <alex@gnu.org> ;; Maintainer: Amin Bandali <bandali@gnu.org> diff --git a/lisp/erc/erc-services.el b/lisp/erc/erc-services.el index c0011f9808c..4f9b0b199f9 100644 --- a/lisp/erc/erc-services.el +++ b/lisp/erc/erc-services.el @@ -1,6 +1,6 @@ ;;; erc-services.el --- Identify to NickServ -*- lexical-binding:t -*- -;; Copyright (C) 2002-2004, 2006-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002-2004, 2006-2021 Free Software Foundation, Inc. ;; Maintainer: Amin Bandali <bandali@gnu.org> ;; URL: https://www.emacswiki.org/emacs/ErcNickserv diff --git a/lisp/erc/erc-sound.el b/lisp/erc/erc-sound.el index 91ce1c62443..edde9737ff9 100644 --- a/lisp/erc/erc-sound.el +++ b/lisp/erc/erc-sound.el @@ -1,6 +1,6 @@ ;;; erc-sound.el --- CTCP SOUND support for ERC -;; Copyright (C) 2002-2003, 2006-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002-2003, 2006-2021 Free Software Foundation, Inc. ;; Maintainer: Amin Bandali <bandali@gnu.org> ;; URL: https://www.emacswiki.org/emacs/ErcSound diff --git a/lisp/erc/erc-speedbar.el b/lisp/erc/erc-speedbar.el index b64e42b7ee4..c2be23990f1 100644 --- a/lisp/erc/erc-speedbar.el +++ b/lisp/erc/erc-speedbar.el @@ -1,6 +1,6 @@ ;;; erc-speedbar.el --- Speedbar support for ERC -;; Copyright (C) 2001-2004, 2006-2020 Free Software Foundation, Inc. +;; Copyright (C) 2001-2004, 2006-2021 Free Software Foundation, Inc. ;; Author: Mario Lang <mlang@delysid.org> ;; Contributor: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/erc/erc-spelling.el b/lisp/erc/erc-spelling.el index cedffbc56d9..44a3e358812 100644 --- a/lisp/erc/erc-spelling.el +++ b/lisp/erc/erc-spelling.el @@ -1,6 +1,6 @@ ;;; erc-spelling.el --- use flyspell in ERC -;; Copyright (C) 2005-2020 Free Software Foundation, Inc. +;; Copyright (C) 2005-2021 Free Software Foundation, Inc. ;; Author: Jorgen Schaefer <forcer@forcix.cx> ;; Maintainer: Amin Bandali <bandali@gnu.org> diff --git a/lisp/erc/erc-stamp.el b/lisp/erc/erc-stamp.el index 08970f2d70e..c7dfb0807bc 100644 --- a/lisp/erc/erc-stamp.el +++ b/lisp/erc/erc-stamp.el @@ -1,6 +1,6 @@ ;;; erc-stamp.el --- Timestamping for ERC messages -*- lexical-binding:t -*- -;; Copyright (C) 2002-2004, 2006-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002-2004, 2006-2021 Free Software Foundation, Inc. ;; Author: Mario Lang <mlang@delysid.org> ;; Maintainer: Amin Bandali <bandali@gnu.org> diff --git a/lisp/erc/erc-status-sidebar.el b/lisp/erc/erc-status-sidebar.el index 08dc8d6015f..ff51026088a 100644 --- a/lisp/erc/erc-status-sidebar.el +++ b/lisp/erc/erc-status-sidebar.el @@ -1,6 +1,6 @@ ;;; erc-status-sidebar.el --- HexChat-like activity overview for ERC -;; Copyright (C) 2017, 2020 Free Software Foundation, Inc. +;; Copyright (C) 2017, 2020-2021 Free Software Foundation, Inc. ;; Author: Andrew Barbarello ;; Maintainer: Amin Bandali <bandali@gnu.org> diff --git a/lisp/erc/erc-track.el b/lisp/erc/erc-track.el index 60f0cfa942f..d6ad847c5b9 100644 --- a/lisp/erc/erc-track.el +++ b/lisp/erc/erc-track.el @@ -1,6 +1,6 @@ ;;; erc-track.el --- Track modified channel buffers -*- lexical-binding:t -*- -;; Copyright (C) 2002-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002-2021 Free Software Foundation, Inc. ;; Author: Mario Lang <mlang@delysid.org> ;; Maintainer: Amin Bandali <bandali@gnu.org> diff --git a/lisp/erc/erc-truncate.el b/lisp/erc/erc-truncate.el index fff073ad62b..f4514ca1371 100644 --- a/lisp/erc/erc-truncate.el +++ b/lisp/erc/erc-truncate.el @@ -1,6 +1,6 @@ ;;; erc-truncate.el --- Functions for truncating ERC buffers -;; Copyright (C) 2003-2004, 2006-2020 Free Software Foundation, Inc. +;; Copyright (C) 2003-2004, 2006-2021 Free Software Foundation, Inc. ;; Author: Andreas Fuchs <asf@void.at> ;; Maintainer: Amin Bandali <bandali@gnu.org> diff --git a/lisp/erc/erc-xdcc.el b/lisp/erc/erc-xdcc.el index 2a236d26039..6808f24911d 100644 --- a/lisp/erc/erc-xdcc.el +++ b/lisp/erc/erc-xdcc.el @@ -1,6 +1,6 @@ ;;; erc-xdcc.el --- XDCC file-server support for ERC -;; Copyright (C) 2003-2004, 2006-2020 Free Software Foundation, Inc. +;; Copyright (C) 2003-2004, 2006-2021 Free Software Foundation, Inc. ;; Author: Mario Lang <mlang@delysid.org> ;; Maintainer: Amin Bandali <bandali@gnu.org> diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index d0b511dc0a2..1044acff8d5 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -1,6 +1,6 @@ ;; erc.el --- An Emacs Internet Relay Chat client -*- lexical-binding:t -*- -;; Copyright (C) 1997-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997-2021 Free Software Foundation, Inc. ;; Author: Alexander L. Belikoff (alexander@belikoff.net) ;; Contributors: Sergey Berezin (sergey.berezin@cs.cmu.edu), @@ -2861,7 +2861,9 @@ need this when pasting multiple lines of text." (if (string-match "^\\s-*$" line) nil (string-match "^ ?\\(.*\\)" line) - (erc-process-input-line (match-string 1 line) nil t))) + (let ((msg (match-string 1 line))) + (erc-display-msg msg) + (erc-process-input-line msg nil t)))) (put 'erc-cmd-SAY 'do-not-parse-args t) (defun erc-cmd-SET (line) diff --git a/lisp/eshell/em-alias.el b/lisp/eshell/em-alias.el index 67e0c3fc08b..ee7f4633e7b 100644 --- a/lisp/eshell/em-alias.el +++ b/lisp/eshell/em-alias.el @@ -1,6 +1,6 @@ ;;; em-alias.el --- creation and management of command aliases -*- lexical-binding:t -*- -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/em-banner.el b/lisp/eshell/em-banner.el index 53d5fb2f6ea..034fa059b16 100644 --- a/lisp/eshell/em-banner.el +++ b/lisp/eshell/em-banner.el @@ -1,6 +1,6 @@ ;;; em-banner.el --- sample module that displays a login banner -*- lexical-binding:t -*- -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/em-basic.el b/lisp/eshell/em-basic.el index e54eab50fc9..64fc7e7f03b 100644 --- a/lisp/eshell/em-basic.el +++ b/lisp/eshell/em-basic.el @@ -1,6 +1,6 @@ ;;; em-basic.el --- basic shell builtin commands -*- lexical-binding:t -*- -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/em-cmpl.el b/lisp/eshell/em-cmpl.el index d0d7aff7720..0200631da66 100644 --- a/lisp/eshell/em-cmpl.el +++ b/lisp/eshell/em-cmpl.el @@ -1,6 +1,6 @@ ;;; em-cmpl.el --- completion using the TAB key -*- lexical-binding:t -*- -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/em-dirs.el b/lisp/eshell/em-dirs.el index c0c25390256..c702ee192a6 100644 --- a/lisp/eshell/em-dirs.el +++ b/lisp/eshell/em-dirs.el @@ -1,6 +1,6 @@ ;;; em-dirs.el --- directory navigation commands -*- lexical-binding:t -*- -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/em-glob.el b/lisp/eshell/em-glob.el index 9ae2dd94ecf..316094b17e4 100644 --- a/lisp/eshell/em-glob.el +++ b/lisp/eshell/em-glob.el @@ -1,6 +1,6 @@ ;;; em-glob.el --- extended file name globbing -*- lexical-binding:t -*- -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/em-hist.el b/lisp/eshell/em-hist.el index 490b8b679c1..0d09ef4a12e 100644 --- a/lisp/eshell/em-hist.el +++ b/lisp/eshell/em-hist.el @@ -1,6 +1,6 @@ ;;; em-hist.el --- history list management -*- lexical-binding:t -*- -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/em-ls.el b/lisp/eshell/em-ls.el index 44a0df6a3ed..e942ae26928 100644 --- a/lisp/eshell/em-ls.el +++ b/lisp/eshell/em-ls.el @@ -1,6 +1,6 @@ ;;; em-ls.el --- implementation of ls in Lisp -*- lexical-binding:t -*- -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/em-pred.el b/lisp/eshell/em-pred.el index 7b9503917c4..aecc8bb4e0a 100644 --- a/lisp/eshell/em-pred.el +++ b/lisp/eshell/em-pred.el @@ -1,6 +1,6 @@ ;;; em-pred.el --- argument predicates and modifiers (ala zsh) -*- lexical-binding:t -*- -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/em-prompt.el b/lisp/eshell/em-prompt.el index c6afc5a240d..aa96166087a 100644 --- a/lisp/eshell/em-prompt.el +++ b/lisp/eshell/em-prompt.el @@ -1,6 +1,6 @@ ;;; em-prompt.el --- command prompts -*- lexical-binding:t -*- -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/em-rebind.el b/lisp/eshell/em-rebind.el index ab102116877..fa61fffaec8 100644 --- a/lisp/eshell/em-rebind.el +++ b/lisp/eshell/em-rebind.el @@ -1,6 +1,6 @@ ;;; em-rebind.el --- rebind keys when point is at current input -*- lexical-binding:t -*- -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/em-script.el b/lisp/eshell/em-script.el index 857ae6a4755..aecc48610f7 100644 --- a/lisp/eshell/em-script.el +++ b/lisp/eshell/em-script.el @@ -1,6 +1,6 @@ ;;; em-script.el --- Eshell script files -*- lexical-binding:t -*- -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/em-smart.el b/lisp/eshell/em-smart.el index 8bc88f2f4bc..d1c83db188a 100644 --- a/lisp/eshell/em-smart.el +++ b/lisp/eshell/em-smart.el @@ -1,6 +1,6 @@ ;;; em-smart.el --- smart display of output -*- lexical-binding:t -*- -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/em-term.el b/lisp/eshell/em-term.el index be91cf79774..d199a939a31 100644 --- a/lisp/eshell/em-term.el +++ b/lisp/eshell/em-term.el @@ -1,6 +1,6 @@ ;;; em-term.el --- running visual commands -*- lexical-binding:t -*- -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/em-tramp.el b/lisp/eshell/em-tramp.el index c2d3c3edce2..e29e9e3e3af 100644 --- a/lisp/eshell/em-tramp.el +++ b/lisp/eshell/em-tramp.el @@ -1,6 +1,6 @@ ;;; em-tramp.el --- Eshell features that require TRAMP -*- lexical-binding:t -*- -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: Aidan Gauland <aidalgol@no8wireless.co.nz> diff --git a/lisp/eshell/em-unix.el b/lisp/eshell/em-unix.el index 2d6bd32b5a2..7e48a9c7578 100644 --- a/lisp/eshell/em-unix.el +++ b/lisp/eshell/em-unix.el @@ -1,6 +1,6 @@ ;;; em-unix.el --- UNIX command aliases -*- lexical-binding:t -*- -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> @@ -169,7 +169,8 @@ Otherwise, Emacs will attempt to use rsh to invoke du on the remote machine." `info' => goes to top info window `info arg1' => IF arg1 is a file, then visits arg1 `info arg1' => OTHERWISE goes to top info window and then menu item arg1 - `info arg1 arg2' => does action for arg1 (either visit-file or menu-item) and then menu item arg2 + `info arg1 arg2' => does action for arg1 (either visit-file or menu-item) and + then menu item arg2 etc." (eval-and-compile (require 'info)) (let ((file (cond diff --git a/lisp/eshell/em-xtra.el b/lisp/eshell/em-xtra.el index 3c038edfd18..fa3218baf2f 100644 --- a/lisp/eshell/em-xtra.el +++ b/lisp/eshell/em-xtra.el @@ -1,6 +1,6 @@ ;;; em-xtra.el --- extra alias functions -*- lexical-binding:t -*- -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/esh-arg.el b/lisp/eshell/esh-arg.el index cecb6f7918f..3cf80e45187 100644 --- a/lisp/eshell/esh-arg.el +++ b/lisp/eshell/esh-arg.el @@ -1,6 +1,6 @@ ;;; esh-arg.el --- argument processing -*- lexical-binding:t -*- -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/esh-cmd.el b/lisp/eshell/esh-cmd.el index 81124413a42..4d63467899b 100644 --- a/lisp/eshell/esh-cmd.el +++ b/lisp/eshell/esh-cmd.el @@ -1,6 +1,6 @@ ;;; esh-cmd.el --- command invocation -*- lexical-binding:t -*- -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/esh-ext.el b/lisp/eshell/esh-ext.el index c88d3c9f59d..9930e0884cb 100644 --- a/lisp/eshell/esh-ext.el +++ b/lisp/eshell/esh-ext.el @@ -1,6 +1,6 @@ ;;; esh-ext.el --- commands external to Eshell -*- lexical-binding:t -*- -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/esh-io.el b/lisp/eshell/esh-io.el index de41fccc1f5..0e98aa0049e 100644 --- a/lisp/eshell/esh-io.el +++ b/lisp/eshell/esh-io.el @@ -1,6 +1,6 @@ ;;; esh-io.el --- I/O management -*- lexical-binding:t -*- -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/esh-mode.el b/lisp/eshell/esh-mode.el index 81d0ec249c2..d29b010ea09 100644 --- a/lisp/eshell/esh-mode.el +++ b/lisp/eshell/esh-mode.el @@ -1,6 +1,6 @@ ;;; esh-mode.el --- user interface -*- lexical-binding:t -*- -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/esh-module.el b/lisp/eshell/esh-module.el index 10994ba3010..703179504c1 100644 --- a/lisp/eshell/esh-module.el +++ b/lisp/eshell/esh-module.el @@ -1,6 +1,6 @@ ;;; esh-module.el --- Eshell modules -*- lexical-binding:t -*- -;; Copyright (C) 1999-2000, 2002-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2000, 2002-2021 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> ;; Keywords: processes diff --git a/lisp/eshell/esh-opt.el b/lisp/eshell/esh-opt.el index dc8918891bd..c1db484be56 100644 --- a/lisp/eshell/esh-opt.el +++ b/lisp/eshell/esh-opt.el @@ -1,6 +1,6 @@ ;;; esh-opt.el --- command options processing -*- lexical-binding:t -*- -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/esh-proc.el b/lisp/eshell/esh-proc.el index 4a1001bf058..369382906c8 100644 --- a/lisp/eshell/esh-proc.el +++ b/lisp/eshell/esh-proc.el @@ -1,6 +1,6 @@ ;;; esh-proc.el --- process management -*- lexical-binding:t -*- -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/esh-util.el b/lisp/eshell/esh-util.el index 9268921fadc..872e3b52046 100644 --- a/lisp/eshell/esh-util.el +++ b/lisp/eshell/esh-util.el @@ -1,6 +1,6 @@ ;;; esh-util.el --- general utilities -*- lexical-binding:t -*- -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/esh-var.el b/lisp/eshell/esh-var.el index 9aea5430ad7..a09c47ce7c2 100644 --- a/lisp/eshell/esh-var.el +++ b/lisp/eshell/esh-var.el @@ -1,6 +1,6 @@ ;;; esh-var.el --- handling of variables -*- lexical-binding:t -*- -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/eshell.el b/lisp/eshell/eshell.el index 6698ca45de4..3aaf2fb78aa 100644 --- a/lisp/eshell/eshell.el +++ b/lisp/eshell/eshell.el @@ -1,6 +1,6 @@ ;;; eshell.el --- the Emacs command shell -*- lexical-binding:t -*- -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> ;; Version: 2.4.2 diff --git a/lisp/expand.el b/lisp/expand.el index c4e1d227906..5c0b5f42817 100644 --- a/lisp/expand.el +++ b/lisp/expand.el @@ -1,6 +1,6 @@ ;;; expand.el --- make abbreviations more usable -;; Copyright (C) 1995-1996, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1995-1996, 2001-2021 Free Software Foundation, Inc. ;; Author: Frederic Lepied <Frederic.Lepied@sugix.frmug.org> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/ezimage.el b/lisp/ezimage.el index dcedd8a5fb6..9c1d8599101 100644 --- a/lisp/ezimage.el +++ b/lisp/ezimage.el @@ -1,6 +1,6 @@ ;;; ezimage --- Generalized Image management -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> ;; Keywords: file, tags, tools diff --git a/lisp/face-remap.el b/lisp/face-remap.el index e92b89fc4e9..c53b20f3338 100644 --- a/lisp/face-remap.el +++ b/lisp/face-remap.el @@ -1,6 +1,6 @@ ;;; face-remap.el --- Functions for managing `face-remapping-alist' -*- lexical-binding: t -*- ;; -;; Copyright (C) 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2008-2021 Free Software Foundation, Inc. ;; ;; Author: Miles Bader <miles@gnu.org> ;; Keywords: faces, face remapping, display, user commands diff --git a/lisp/facemenu.el b/lisp/facemenu.el index cdff4b8f3e6..d362adcc9b7 100644 --- a/lisp/facemenu.el +++ b/lisp/facemenu.el @@ -1,6 +1,6 @@ ;;; facemenu.el --- create a face menu for interactively adding fonts to text -;; Copyright (C) 1994-1996, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1994-1996, 2001-2021 Free Software Foundation, Inc. ;; Author: Boris Goldowsky <boris@gnu.org> ;; Keywords: faces diff --git a/lisp/faces.el b/lisp/faces.el index d0307fe173d..4e98338432f 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -1,6 +1,6 @@ ;;; faces.el --- Lisp faces -*- lexical-binding: t -*- -;; Copyright (C) 1992-1996, 1998-2020 Free Software Foundation, Inc. +;; Copyright (C) 1992-1996, 1998-2021 Free Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org ;; Keywords: internal diff --git a/lisp/ffap.el b/lisp/ffap.el index d4bddd0574f..1f43bafdb93 100644 --- a/lisp/ffap.el +++ b/lisp/ffap.el @@ -1,6 +1,6 @@ ;;; ffap.el --- find file (or url) at point -*- lexical-binding: t -*- -;; Copyright (C) 1995-1997, 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 1995-1997, 2000-2021 Free Software Foundation, Inc. ;; Author: Michelangelo Grigni <mic@mathcs.emory.edu> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/filecache.el b/lisp/filecache.el index 00c53138032..67d2939dd3c 100644 --- a/lisp/filecache.el +++ b/lisp/filecache.el @@ -1,6 +1,6 @@ ;;; filecache.el --- find files using a pre-loaded cache -*- lexical-binding:t -*- -;; Copyright (C) 1996, 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996, 2000-2021 Free Software Foundation, Inc. ;; Author: Peter Breton <pbreton@cs.umb.edu> ;; Created: Sun Nov 10 1996 diff --git a/lisp/fileloop.el b/lisp/fileloop.el index b778eca8e9b..cb9fe8f7769 100644 --- a/lisp/fileloop.el +++ b/lisp/fileloop.el @@ -1,6 +1,6 @@ ;;; fileloop.el --- Operations on multiple files -*- lexical-binding: t; -*- -;; Copyright (C) 2018-2020 Free Software Foundation, Inc. +;; Copyright (C) 2018-2021 Free Software Foundation, Inc. ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> diff --git a/lisp/filenotify.el b/lisp/filenotify.el index 8aa7f3cd81f..78571776a39 100644 --- a/lisp/filenotify.el +++ b/lisp/filenotify.el @@ -1,6 +1,6 @@ ;;; filenotify.el --- watch files for changes on disk -*- lexical-binding:t -*- -;; Copyright (C) 2013-2020 Free Software Foundation, Inc. +;; Copyright (C) 2013-2021 Free Software Foundation, Inc. ;; Author: Michael Albinus <michael.albinus@gmx.de> diff --git a/lisp/files-x.el b/lisp/files-x.el index 620a2e23f56..628bf180929 100644 --- a/lisp/files-x.el +++ b/lisp/files-x.el @@ -1,6 +1,6 @@ ;;; files-x.el --- extended file handling commands -;; Copyright (C) 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2009-2021 Free Software Foundation, Inc. ;; Author: Juri Linkov <juri@jurta.org> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/files.el b/lisp/files.el index 82a89b030bf..695afae8c56 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -1,6 +1,6 @@ ;;; files.el --- file input and output commands for Emacs -*- lexical-binding:t -*- -;; Copyright (C) 1985-1987, 1992-2020 Free Software Foundation, Inc. +;; Copyright (C) 1985-1987, 1992-2021 Free Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org ;; Package: emacs @@ -2146,7 +2146,7 @@ think it does, because \"free\" is pretty hard to define in practice." ("Yes" . ?y) ("No" . ?n) ("Open literally" . ?l))) - (read-char-from-minibuffer + (read-char-choice (concat prompt " (y)es or (n)o or (l)iterally ") '(?y ?Y ?n ?N ?l ?L))))) (cond ((memq choice '(?y ?Y)) nil) @@ -3543,7 +3543,7 @@ n -- to ignore the local variables list.") ", or C-v/M-v to scroll"))) char) (if offer-save (push ?! exit-chars)) - (setq char (read-char-from-minibuffer prompt exit-chars)) + (setq char (read-char-choice prompt exit-chars)) (when (and offer-save (= char ?!) unsafe-vars) (customize-push-and-save 'safe-local-variable-values unsafe-vars)) (prog1 (memq char '(?! ?\s ?y)) diff --git a/lisp/filesets.el b/lisp/filesets.el index 62dc5a54d53..7c01b15b345 100644 --- a/lisp/filesets.el +++ b/lisp/filesets.el @@ -1,6 +1,6 @@ ;;; filesets.el --- handle group of files -;; Copyright (C) 2002-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002-2021 Free Software Foundation, Inc. ;; Author: Thomas Link <sanobast-emacs@yahoo.de> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/find-cmd.el b/lisp/find-cmd.el index 13b41165d06..5866b308551 100644 --- a/lisp/find-cmd.el +++ b/lisp/find-cmd.el @@ -1,6 +1,6 @@ ;;; find-cmd.el --- Build a valid find(1) command with sexps -;; Copyright (C) 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2008-2021 Free Software Foundation, Inc. ;; Author: Philip Jackson <phil@shellarchive.co.uk> ;; Version: 0.6 diff --git a/lisp/find-dired.el b/lisp/find-dired.el index d2b82bdd51c..adc5672eca9 100644 --- a/lisp/find-dired.el +++ b/lisp/find-dired.el @@ -1,6 +1,6 @@ ;;; find-dired.el --- run a `find' command and dired the output -*- lexical-binding: t -*- -;; Copyright (C) 1992, 1994-1995, 2000-2020 Free Software Foundation, +;; Copyright (C) 1992, 1994-1995, 2000-2021 Free Software Foundation, ;; Inc. ;; Author: Roland McGrath <roland@gnu.org>, diff --git a/lisp/find-file.el b/lisp/find-file.el index 84d02cb4a26..8cc9c972ed4 100644 --- a/lisp/find-file.el +++ b/lisp/find-file.el @@ -4,7 +4,7 @@ ;; Maintainer: emacs-devel@gnu.org ;; Keywords: c, matching, tools -;; Copyright (C) 1994-1995, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1994-1995, 2001-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/lisp/find-lisp.el b/lisp/find-lisp.el index 44a2e6d7371..2f432936033 100644 --- a/lisp/find-lisp.el +++ b/lisp/find-lisp.el @@ -4,7 +4,7 @@ ;; Created: Fri Mar 26 1999 ;; Keywords: unix -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/lisp/finder.el b/lisp/finder.el index 98859f6a395..15c3fcbac79 100644 --- a/lisp/finder.el +++ b/lisp/finder.el @@ -1,6 +1,6 @@ ;;; finder.el --- topic & keyword-based code finder -;; Copyright (C) 1992, 1997-1999, 2001-2020 Free Software Foundation, +;; Copyright (C) 1992, 1997-1999, 2001-2021 Free Software Foundation, ;; Inc. ;; Author: Eric S. Raymond <esr@snark.thyrsus.com> diff --git a/lisp/flow-ctrl.el b/lisp/flow-ctrl.el index b679af80b80..656edf2eb09 100644 --- a/lisp/flow-ctrl.el +++ b/lisp/flow-ctrl.el @@ -1,6 +1,6 @@ ;;; flow-ctrl.el --- help for lusers on cu(1) or ttys with wired-in ^S/^Q flow control -;; Copyright (C) 1990-1991, 1994, 2001-2020 Free Software Foundation, +;; Copyright (C) 1990-1991, 1994, 2001-2021 Free Software Foundation, ;; Inc. ;; Author: Kevin Gallagher diff --git a/lisp/foldout.el b/lisp/foldout.el index 58455c28b16..771b81e5be5 100644 --- a/lisp/foldout.el +++ b/lisp/foldout.el @@ -1,6 +1,6 @@ ;;; foldout.el --- folding extensions for outline-mode and outline-minor-mode -;; Copyright (C) 1994, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1994, 2001-2021 Free Software Foundation, Inc. ;; Author: Kevin Broadey <KevinB@bartley.demon.co.uk> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/follow.el b/lisp/follow.el index f1d823d9f03..292dc4a0225 100644 --- a/lisp/follow.el +++ b/lisp/follow.el @@ -1,6 +1,6 @@ ;;; follow.el --- synchronize windows showing the same buffer -;; Copyright (C) 1995-1997, 1999, 2001-2020 Free Software Foundation, +;; Copyright (C) 1995-1997, 1999, 2001-2021 Free Software Foundation, ;; Inc. ;; Author: Anders Lindgren diff --git a/lisp/font-core.el b/lisp/font-core.el index 1b15d8cd30e..38307bb1576 100644 --- a/lisp/font-core.el +++ b/lisp/font-core.el @@ -1,6 +1,6 @@ ;;; font-core.el --- Core interface to font-lock -;; Copyright (C) 1992-2020 Free Software Foundation, Inc. +;; Copyright (C) 1992-2021 Free Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org ;; Keywords: languages, faces diff --git a/lisp/font-lock.el b/lisp/font-lock.el index a2cf71f9465..a51434c38c9 100644 --- a/lisp/font-lock.el +++ b/lisp/font-lock.el @@ -1,6 +1,6 @@ ;;; font-lock.el --- Electric font lock mode -*- lexical-binding:t -*- -;; Copyright (C) 1992-2020 Free Software Foundation, Inc. +;; Copyright (C) 1992-2021 Free Software Foundation, Inc. ;; Author: Jamie Zawinski ;; Richard Stallman diff --git a/lisp/format-spec.el b/lisp/format-spec.el index 6af79a44167..202d65d8fca 100644 --- a/lisp/format-spec.el +++ b/lisp/format-spec.el @@ -1,6 +1,6 @@ ;;; format-spec.el --- format arbitrary formatting strings -*- lexical-binding: t -*- -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Keywords: tools @@ -25,7 +25,7 @@ ;;; Code: ;;;###autoload -(defun format-spec (format specification &optional ignore-missing) +(defun format-spec (format specification &optional ignore-missing split) "Return a string based on FORMAT and SPECIFICATION. FORMAT is a string containing `format'-like specs like \"su - %u %k\". SPECIFICATION is an alist mapping format specification characters @@ -68,50 +68,65 @@ error; if it is the symbol `ignore', leave those %-specs verbatim in the result, including their text properties, if any; if it is the symbol `delete', remove those %-specs from the result; otherwise do the same as for the symbol `ignore', but also leave -any occurrences of \"%%\" in FORMAT verbatim in the result." +any occurrences of \"%%\" in FORMAT verbatim in the result. + +If SPLIT, instead of returning a single string, a list of strings +is returned, where each format spec is its own element." (with-temp-buffer - (insert format) - (goto-char (point-min)) - (while (search-forward "%" nil t) - (cond - ;; Quoted percent sign. - ((= (following-char) ?%) - (when (memq ignore-missing '(nil ignore delete)) - (delete-char 1))) - ;; Valid format spec. - ((looking-at (rx (? (group (+ (in " 0<>^_-")))) - (? (group (+ digit))) - (? (group ?. (+ digit))) - (group alpha))) - (let* ((beg (point)) - (end (match-end 0)) - (flags (match-string 1)) - (width (match-string 2)) - (trunc (match-string 3)) - (char (string-to-char (match-string 4))) - (text (assq char specification))) - (cond (text - ;; Handle flags. - (setq text (format-spec--do-flags - (format "%s" (cdr text)) - (format-spec--parse-flags flags) - (and width (string-to-number width)) - (and trunc (car (read-from-string trunc 1))))) - ;; Insert first, to preserve text properties. - (insert-and-inherit text) - ;; Delete the specifier body. - (delete-region (point) (+ end (length text))) - ;; Delete the percent sign. - (delete-region (1- beg) beg)) - ((eq ignore-missing 'delete) - ;; Delete the whole format spec. - (delete-region (1- beg) end)) - ((not ignore-missing) - (error "Invalid format character: `%%%c'" char))))) - ;; Signal an error on bogus format strings. - ((not ignore-missing) - (error "Invalid format string")))) - (buffer-string))) + (let ((split-start (point-min)) + (split-result nil)) + (insert format) + (goto-char (point-min)) + (while (search-forward "%" nil t) + (cond + ;; Quoted percent sign. + ((= (following-char) ?%) + (when (memq ignore-missing '(nil ignore delete)) + (delete-char 1))) + ;; Valid format spec. + ((looking-at (rx (? (group (+ (in " 0<>^_-")))) + (? (group (+ digit))) + (? (group ?. (+ digit))) + (group alpha))) + (let* ((beg (point)) + (end (match-end 0)) + (flags (match-string 1)) + (width (match-string 2)) + (trunc (match-string 3)) + (char (string-to-char (match-string 4))) + (text (assq char specification))) + (when (and split + (not (= (1- beg) split-start))) + (push (buffer-substring split-start (1- beg)) split-result)) + (cond (text + ;; Handle flags. + (setq text (format-spec--do-flags + (format "%s" (cdr text)) + (format-spec--parse-flags flags) + (and width (string-to-number width)) + (and trunc (car (read-from-string trunc 1))))) + ;; Insert first, to preserve text properties. + (insert-and-inherit text) + ;; Delete the specifier body. + (delete-region (point) (+ end (length text))) + ;; Delete the percent sign. + (delete-region (1- beg) beg)) + ((eq ignore-missing 'delete) + ;; Delete the whole format spec. + (delete-region (1- beg) end)) + ((not ignore-missing) + (error "Invalid format character: `%%%c'" char))) + (when split + (push (buffer-substring (1- beg) (point)) split-result) + (setq split-start (point))))) + ;; Signal an error on bogus format strings. + ((not ignore-missing) + (error "Invalid format string")))) + (if (not split) + (buffer-string) + (unless (= split-start (point-max)) + (push (buffer-substring split-start (point-max)) split-result)) + (nreverse split-result))))) (defun format-spec--do-flags (str flags width trunc) "Return STR formatted according to FLAGS, WIDTH, and TRUNC. diff --git a/lisp/format.el b/lisp/format.el index 16456eb5877..df3bc462c92 100644 --- a/lisp/format.el +++ b/lisp/format.el @@ -1,6 +1,6 @@ ;;; format.el --- read and save files in multiple formats -;; Copyright (C) 1994-1995, 1997, 1999, 2001-2020 Free Software +;; Copyright (C) 1994-1995, 1997, 1999, 2001-2021 Free Software ;; Foundation, Inc. ;; Author: Boris Goldowsky <boris@gnu.org> diff --git a/lisp/forms.el b/lisp/forms.el index b8638bc6e20..5d7e6dde96c 100644 --- a/lisp/forms.el +++ b/lisp/forms.el @@ -1,6 +1,6 @@ ;;; forms.el --- Forms mode: edit a file as a form to fill in -;; Copyright (C) 1991, 1994-1997, 2001-2020 Free Software Foundation, +;; Copyright (C) 1991, 1994-1997, 2001-2021 Free Software Foundation, ;; Inc. ;; Author: Johan Vromans <jvromans@squirrel.nl> diff --git a/lisp/frame.el b/lisp/frame.el index 772ba3d8c47..c71276287aa 100644 --- a/lisp/frame.el +++ b/lisp/frame.el @@ -1,6 +1,6 @@ ;;; frame.el --- multi-frame management independent of window systems -*- lexical-binding:t -*- -;; Copyright (C) 1993-1994, 1996-1997, 2000-2020 Free Software +;; Copyright (C) 1993-1994, 1996-1997, 2000-2021 Free Software ;; Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/frameset.el b/lisp/frameset.el index 0462d776c0e..e698d5401db 100644 --- a/lisp/frameset.el +++ b/lisp/frameset.el @@ -1,6 +1,6 @@ ;;; frameset.el --- save and restore frame and window setup -*- lexical-binding: t -*- -;; Copyright (C) 2013-2020 Free Software Foundation, Inc. +;; Copyright (C) 2013-2021 Free Software Foundation, Inc. ;; Author: Juanma Barranquero <lekktu@gmail.com> ;; Keywords: convenience diff --git a/lisp/fringe.el b/lisp/fringe.el index 422d014397d..e2d7968adde 100644 --- a/lisp/fringe.el +++ b/lisp/fringe.el @@ -1,6 +1,6 @@ ;;; fringe.el --- fringe setup and control -*- lexical-binding:t -*- -;; Copyright (C) 2002-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002-2021 Free Software Foundation, Inc. ;; Author: Simon Josefsson <simon@josefsson.org> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/generic-x.el b/lisp/generic-x.el index 5875dce5f03..f3ea22a4a30 100644 --- a/lisp/generic-x.el +++ b/lisp/generic-x.el @@ -1,6 +1,6 @@ ;;; generic-x.el --- A collection of generic modes -;; Copyright (C) 1997-1998, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997-1998, 2001-2021 Free Software Foundation, Inc. ;; Author: Peter Breton <pbreton@cs.umb.edu> ;; Created: Tue Oct 08 1996 diff --git a/lisp/gnus/ChangeLog.1 b/lisp/gnus/ChangeLog.1 index e3265303437..6ad87f06f27 100644 --- a/lisp/gnus/ChangeLog.1 +++ b/lisp/gnus/ChangeLog.1 @@ -3702,7 +3702,7 @@ * gnus.el: Quassia Gnus v0.1 is released. - Copyright (C) 1997-2020 Free Software Foundation, Inc. + Copyright (C) 1997-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lisp/gnus/ChangeLog.2 b/lisp/gnus/ChangeLog.2 index 533ceb84bf1..35402dffd07 100644 --- a/lisp/gnus/ChangeLog.2 +++ b/lisp/gnus/ChangeLog.2 @@ -18538,7 +18538,7 @@ See ChangeLog.1 for earlier changes. - Copyright (C) 2000-2002, 2004-2020 Free Software Foundation, Inc. + Copyright (C) 2000-2002, 2004-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lisp/gnus/ChangeLog.3 b/lisp/gnus/ChangeLog.3 index 582c9bd10b7..2aba3a5706f 100644 --- a/lisp/gnus/ChangeLog.3 +++ b/lisp/gnus/ChangeLog.3 @@ -26325,7 +26325,7 @@ See ChangeLog.2 for earlier changes. - Copyright (C) 2004-2020 Free Software Foundation, Inc. + Copyright (C) 2004-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lisp/gnus/canlock.el b/lisp/gnus/canlock.el index ed0a89cf927..6c8c1a5927a 100644 --- a/lisp/gnus/canlock.el +++ b/lisp/gnus/canlock.el @@ -1,6 +1,6 @@ ;;; canlock.el --- functions for Cancel-Lock feature -;; Copyright (C) 1998-1999, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998-1999, 2001-2021 Free Software Foundation, Inc. ;; Author: Katsumi Yamaoka <yamaoka@jpl.org> ;; Keywords: news, cancel-lock, hmac, sha1, rfc2104 diff --git a/lisp/gnus/deuglify.el b/lisp/gnus/deuglify.el index fdc5302a28f..b77dcdd4624 100644 --- a/lisp/gnus/deuglify.el +++ b/lisp/gnus/deuglify.el @@ -1,6 +1,6 @@ ;;; deuglify.el --- deuglify broken Outlook (Express) articles -;; Copyright (C) 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 2001-2021 Free Software Foundation, Inc. ;; Author: Raymond Scholz <rscholz@zonix.de> ;; Thomas Steffen @@ -342,7 +342,7 @@ NODISPLAY is non-nil, don't redisplay the article buffer." (unless nodisplay (gnus-outlook-display-article-buffer))) (defun gnus-outlook-rearrange-article (attr-start) - "Put the text from ATTR-START to the end of buffer at the top of the article buffer." + "Put text from ATTR-START to the end of buffer at the top of the article buffer." ;; FIXME: 1. (*) text/plain ( ) text/html (let ((inhibit-read-only t) (cite-marks gnus-outlook-deuglify-cite-marks)) diff --git a/lisp/gnus/gmm-utils.el b/lisp/gnus/gmm-utils.el index 6d24b409ed0..ab97c593d9c 100644 --- a/lisp/gnus/gmm-utils.el +++ b/lisp/gnus/gmm-utils.el @@ -1,6 +1,6 @@ ;;; gmm-utils.el --- Utility functions for Gnus, Message and MML -;; Copyright (C) 2006-2020 Free Software Foundation, Inc. +;; Copyright (C) 2006-2021 Free Software Foundation, Inc. ;; Author: Reiner Steib <reiner.steib@gmx.de> ;; Keywords: news diff --git a/lisp/gnus/gnus-agent.el b/lisp/gnus/gnus-agent.el index d6802a35d0c..56640ea8302 100644 --- a/lisp/gnus/gnus-agent.el +++ b/lisp/gnus/gnus-agent.el @@ -1,6 +1,6 @@ ;;; gnus-agent.el --- unplugged support for Gnus -;; Copyright (C) 1997-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; This file is part of GNU Emacs. @@ -1901,7 +1901,8 @@ article numbers will be returned." articles)) (defsubst gnus-agent-read-article-number () - "Reads the article number at point. Returns nil when a valid article number can not be read." + "Read the article number at point. +Return nil when a valid article number can not be read." (when (looking-at "[0-9]+\t") (read (current-buffer)))) diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el index 79d4d9087fb..4ade36f4b9c 100644 --- a/lisp/gnus/gnus-art.el +++ b/lisp/gnus/gnus-art.el @@ -1,6 +1,6 @@ ;;; gnus-art.el --- article mode commands for Gnus -;; Copyright (C) 1996-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Keywords: news @@ -1061,7 +1061,7 @@ used." ("view the part" . gnus-mime-view-part) ("pipe to command" . gnus-mime-pipe-part) ("toggle display" . gnus-article-press-button) - ("toggle display" . gnus-article-view-part-as-charset) + ("view as charset" . gnus-mime-view-part-as-charset) ("view as type" . gnus-mime-view-part-as-type) ("view internally" . gnus-mime-view-part-internally) ("view externally" . gnus-mime-view-part-externally)) diff --git a/lisp/gnus/gnus-async.el b/lisp/gnus/gnus-async.el index 9b08e6a0ef8..fefd02c7bfb 100644 --- a/lisp/gnus/gnus-async.el +++ b/lisp/gnus/gnus-async.el @@ -1,6 +1,6 @@ ;;; gnus-async.el --- asynchronous support for Gnus -*- lexical-binding:t -*- -;; Copyright (C) 1996-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Keywords: news diff --git a/lisp/gnus/gnus-bcklg.el b/lisp/gnus/gnus-bcklg.el index d28ae857de0..d6f53e4b380 100644 --- a/lisp/gnus/gnus-bcklg.el +++ b/lisp/gnus/gnus-bcklg.el @@ -1,6 +1,6 @@ ;;; gnus-bcklg.el --- backlog functions for Gnus -;; Copyright (C) 1996-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Keywords: news diff --git a/lisp/gnus/gnus-bookmark.el b/lisp/gnus/gnus-bookmark.el index 4f85349d166..57859d806c9 100644 --- a/lisp/gnus/gnus-bookmark.el +++ b/lisp/gnus/gnus-bookmark.el @@ -1,6 +1,6 @@ ;;; gnus-bookmark.el --- Bookmarks in Gnus -;; Copyright (C) 2006-2020 Free Software Foundation, Inc. +;; Copyright (C) 2006-2021 Free Software Foundation, Inc. ;; Author: Bastien Guerry <bzg AT altern DOT org> ;; Keywords: news diff --git a/lisp/gnus/gnus-cache.el b/lisp/gnus/gnus-cache.el index c31d97d41cd..36657e46219 100644 --- a/lisp/gnus/gnus-cache.el +++ b/lisp/gnus/gnus-cache.el @@ -1,6 +1,6 @@ ;;; gnus-cache.el --- cache interface for Gnus -;; Copyright (C) 1995-2020 Free Software Foundation, Inc. +;; Copyright (C) 1995-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Keywords: news diff --git a/lisp/gnus/gnus-cite.el b/lisp/gnus/gnus-cite.el index 912671a401d..d02e898e230 100644 --- a/lisp/gnus/gnus-cite.el +++ b/lisp/gnus/gnus-cite.el @@ -1,6 +1,6 @@ ;;; gnus-cite.el --- parse citations in articles for Gnus -;; Copyright (C) 1995-2020 Free Software Foundation, Inc. +;; Copyright (C) 1995-2021 Free Software Foundation, Inc. ;; Author: Per Abrahamsen <abraham@dina.kvl.dk> diff --git a/lisp/gnus/gnus-cloud.el b/lisp/gnus/gnus-cloud.el index 3e23e263262..f7c71f43ce8 100644 --- a/lisp/gnus/gnus-cloud.el +++ b/lisp/gnus/gnus-cloud.el @@ -1,6 +1,6 @@ ;;; gnus-cloud.el --- storing and retrieving data via IMAP -;; Copyright (C) 2014-2020 Free Software Foundation, Inc. +;; Copyright (C) 2014-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Keywords: mail diff --git a/lisp/gnus/gnus-cus.el b/lisp/gnus/gnus-cus.el index d832d0ebae1..dc14943a060 100644 --- a/lisp/gnus/gnus-cus.el +++ b/lisp/gnus/gnus-cus.el @@ -1,6 +1,6 @@ ;;; gnus-cus.el --- customization commands for Gnus -;; Copyright (C) 1996, 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996, 1999-2021 Free Software Foundation, Inc. ;; Author: Per Abrahamsen <abraham@dina.kvl.dk> ;; Keywords: news diff --git a/lisp/gnus/gnus-dbus.el b/lisp/gnus/gnus-dbus.el index 8fbeffba437..12bf7bb926a 100644 --- a/lisp/gnus/gnus-dbus.el +++ b/lisp/gnus/gnus-dbus.el @@ -1,6 +1,6 @@ ;;; gnus-dbus.el --- DBUS integration for Gnus -*- lexical-binding: t; -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; Author: Eric Abrahamsen <eric@ericabrahamsen.net> diff --git a/lisp/gnus/gnus-delay.el b/lisp/gnus/gnus-delay.el index 63e938e7453..477ad88a9ca 100644 --- a/lisp/gnus/gnus-delay.el +++ b/lisp/gnus/gnus-delay.el @@ -1,6 +1,6 @@ ;;; gnus-delay.el --- Delayed posting of articles -;; Copyright (C) 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 2001-2021 Free Software Foundation, Inc. ;; Author: Kai Großjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE> ;; Keywords: mail, news, extensions diff --git a/lisp/gnus/gnus-demon.el b/lisp/gnus/gnus-demon.el index 99a736f8f44..219f15e2227 100644 --- a/lisp/gnus/gnus-demon.el +++ b/lisp/gnus/gnus-demon.el @@ -1,6 +1,6 @@ ;;; gnus-demon.el --- daemonic Gnus behavior -;; Copyright (C) 1995-2020 Free Software Foundation, Inc. +;; Copyright (C) 1995-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Keywords: news diff --git a/lisp/gnus/gnus-diary.el b/lisp/gnus/gnus-diary.el index b36faa86a22..78f1e53ff7a 100644 --- a/lisp/gnus/gnus-diary.el +++ b/lisp/gnus/gnus-diary.el @@ -1,6 +1,6 @@ ;;; gnus-diary.el --- Wrapper around the NNDiary Gnus back end -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: Didier Verna <didier@didierverna.net> ;; Created: Tue Jul 20 10:42:55 1999 diff --git a/lisp/gnus/gnus-dired.el b/lisp/gnus/gnus-dired.el index 0063ed25ef6..6f231c4fbb8 100644 --- a/lisp/gnus/gnus-dired.el +++ b/lisp/gnus/gnus-dired.el @@ -1,6 +1,6 @@ ;;; gnus-dired.el --- utility functions where gnus and dired meet -;; Copyright (C) 1996-1999, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996-1999, 2001-2021 Free Software Foundation, Inc. ;; Authors: Benjamin Rutt <brutt@bloomington.in.us>, ;; Shenghuo Zhu <zsh@cs.rochester.edu> diff --git a/lisp/gnus/gnus-draft.el b/lisp/gnus/gnus-draft.el index 3a9bf2a7e8f..5f7ed386297 100644 --- a/lisp/gnus/gnus-draft.el +++ b/lisp/gnus/gnus-draft.el @@ -1,6 +1,6 @@ ;;; gnus-draft.el --- draft message support for Gnus -;; Copyright (C) 1997-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Keywords: news diff --git a/lisp/gnus/gnus-dup.el b/lisp/gnus/gnus-dup.el index 1f247aa4aea..f7d61bb35fc 100644 --- a/lisp/gnus/gnus-dup.el +++ b/lisp/gnus/gnus-dup.el @@ -1,6 +1,6 @@ ;;; gnus-dup.el --- suppression of duplicate articles in Gnus -*- lexical-binding: t -*- -;; Copyright (C) 1996-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Keywords: news diff --git a/lisp/gnus/gnus-eform.el b/lisp/gnus/gnus-eform.el index 1bc1261ee8f..feee7326cd2 100644 --- a/lisp/gnus/gnus-eform.el +++ b/lisp/gnus/gnus-eform.el @@ -1,6 +1,6 @@ ;;; gnus-eform.el --- a mode for editing forms for Gnus -;; Copyright (C) 1996-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Keywords: news diff --git a/lisp/gnus/gnus-fun.el b/lisp/gnus/gnus-fun.el index b6d6aa49298..615f4a55bc5 100644 --- a/lisp/gnus/gnus-fun.el +++ b/lisp/gnus/gnus-fun.el @@ -1,6 +1,6 @@ ;;; gnus-fun.el --- various frivolous extension functions to Gnus -;; Copyright (C) 2002-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Keywords: news diff --git a/lisp/gnus/gnus-gravatar.el b/lisp/gnus/gnus-gravatar.el index 9c24de44cd6..a7ca733e755 100644 --- a/lisp/gnus/gnus-gravatar.el +++ b/lisp/gnus/gnus-gravatar.el @@ -1,6 +1,6 @@ ;;; gnus-gravatar.el --- Gnus Gravatar support -*- lexical-binding: t -*- -;; Copyright (C) 2010-2020 Free Software Foundation, Inc. +;; Copyright (C) 2010-2021 Free Software Foundation, Inc. ;; Author: Julien Danjou <julien@danjou.info> ;; Keywords: multimedia, news diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el index 9bb3ec765ff..ff792c57065 100644 --- a/lisp/gnus/gnus-group.el +++ b/lisp/gnus/gnus-group.el @@ -1,6 +1,6 @@ ;;; gnus-group.el --- group mode commands for Gnus -;; Copyright (C) 1996-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Keywords: news diff --git a/lisp/gnus/gnus-html.el b/lisp/gnus/gnus-html.el index 002a1c1fded..bb1ee5a806a 100644 --- a/lisp/gnus/gnus-html.el +++ b/lisp/gnus/gnus-html.el @@ -1,6 +1,6 @@ ;;; gnus-html.el --- Render HTML in a buffer. -;; Copyright (C) 2010-2020 Free Software Foundation, Inc. +;; Copyright (C) 2010-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Keywords: html, web diff --git a/lisp/gnus/gnus-icalendar.el b/lisp/gnus/gnus-icalendar.el index 389bce85e8b..1e0e2071018 100644 --- a/lisp/gnus/gnus-icalendar.el +++ b/lisp/gnus/gnus-icalendar.el @@ -1,6 +1,6 @@ ;;; gnus-icalendar.el --- reply to iCalendar meeting requests -*- lexical-binding:t -*- -;; Copyright (C) 2013-2020 Free Software Foundation, Inc. +;; Copyright (C) 2013-2021 Free Software Foundation, Inc. ;; Author: Jan Tatarik <Jan.Tatarik@gmail.com> ;; Keywords: mail, icalendar, org diff --git a/lisp/gnus/gnus-int.el b/lisp/gnus/gnus-int.el index b8be766c84f..9c68773e19a 100644 --- a/lisp/gnus/gnus-int.el +++ b/lisp/gnus/gnus-int.el @@ -1,6 +1,6 @@ ;;; gnus-int.el --- backend interface functions for Gnus -;; Copyright (C) 1996-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Keywords: news diff --git a/lisp/gnus/gnus-kill.el b/lisp/gnus/gnus-kill.el index a772281d4c3..7e592026cd0 100644 --- a/lisp/gnus/gnus-kill.el +++ b/lisp/gnus/gnus-kill.el @@ -1,6 +1,6 @@ ;;; gnus-kill.el --- kill commands for Gnus -;; Copyright (C) 1995-2020 Free Software Foundation, Inc. +;; Copyright (C) 1995-2021 Free Software Foundation, Inc. ;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet> ;; Lars Magne Ingebrigtsen <larsi@gnus.org> diff --git a/lisp/gnus/gnus-logic.el b/lisp/gnus/gnus-logic.el index a29772f41e1..105222d6797 100644 --- a/lisp/gnus/gnus-logic.el +++ b/lisp/gnus/gnus-logic.el @@ -1,6 +1,6 @@ ;;; gnus-logic.el --- advanced scoring code for Gnus -;; Copyright (C) 1996-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Keywords: news diff --git a/lisp/gnus/gnus-mh.el b/lisp/gnus/gnus-mh.el index 64333692463..b26b736d055 100644 --- a/lisp/gnus/gnus-mh.el +++ b/lisp/gnus/gnus-mh.el @@ -1,6 +1,6 @@ ;;; gnus-mh.el --- mh-e interface for Gnus -;; Copyright (C) 1994-2020 Free Software Foundation, Inc. +;; Copyright (C) 1994-2021 Free Software Foundation, Inc. ;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet> ;; Lars Magne Ingebrigtsen <larsi@gnus.org> diff --git a/lisp/gnus/gnus-ml.el b/lisp/gnus/gnus-ml.el index acef537197c..a47c15525a3 100644 --- a/lisp/gnus/gnus-ml.el +++ b/lisp/gnus/gnus-ml.el @@ -1,6 +1,6 @@ ;;; gnus-ml.el --- Mailing list minor mode for Gnus -;; Copyright (C) 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 2000-2021 Free Software Foundation, Inc. ;; Author: Julien Gilles <jgilles@free.fr> ;; Keywords: news, mail diff --git a/lisp/gnus/gnus-mlspl.el b/lisp/gnus/gnus-mlspl.el index 8cbe858dc9e..ed8d15a2feb 100644 --- a/lisp/gnus/gnus-mlspl.el +++ b/lisp/gnus/gnus-mlspl.el @@ -1,6 +1,6 @@ ;;; gnus-mlspl.el --- a group params-based mail splitting mechanism -;; Copyright (C) 1998-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998-2021 Free Software Foundation, Inc. ;; Author: Alexandre Oliva <oliva@lsd.ic.unicamp.br> ;; Keywords: news, mail diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el index 3733babfe0f..419b5ead563 100644 --- a/lisp/gnus/gnus-msg.el +++ b/lisp/gnus/gnus-msg.el @@ -1,6 +1,6 @@ ;;; gnus-msg.el --- mail and post interface for Gnus -;; Copyright (C) 1995-2020 Free Software Foundation, Inc. +;; Copyright (C) 1995-2021 Free Software Foundation, Inc. ;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet> ;; Lars Magne Ingebrigtsen <larsi@gnus.org> diff --git a/lisp/gnus/gnus-notifications.el b/lisp/gnus/gnus-notifications.el index 90e4a98b35d..e772dd8e625 100644 --- a/lisp/gnus/gnus-notifications.el +++ b/lisp/gnus/gnus-notifications.el @@ -1,6 +1,6 @@ ;; gnus-notifications.el -- Send notification on new message in Gnus -;; Copyright (C) 2012-2020 Free Software Foundation, Inc. +;; Copyright (C) 2012-2021 Free Software Foundation, Inc. ;; Author: Julien Danjou <julien@danjou.info> ;; Keywords: news diff --git a/lisp/gnus/gnus-picon.el b/lisp/gnus/gnus-picon.el index a4d2d99fb89..92def9a72d0 100644 --- a/lisp/gnus/gnus-picon.el +++ b/lisp/gnus/gnus-picon.el @@ -1,6 +1,6 @@ ;;; gnus-picon.el --- displaying pretty icons in Gnus -;; Copyright (C) 1996-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Keywords: news xpm annotation glyph faces diff --git a/lisp/gnus/gnus-range.el b/lisp/gnus/gnus-range.el index 57a97936b1a..1e5d2a066f6 100644 --- a/lisp/gnus/gnus-range.el +++ b/lisp/gnus/gnus-range.el @@ -1,6 +1,6 @@ ;;; gnus-range.el --- range and sequence functions for Gnus -;; Copyright (C) 1996-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Keywords: news diff --git a/lisp/gnus/gnus-registry.el b/lisp/gnus/gnus-registry.el index 72412595a9a..068066e38c9 100644 --- a/lisp/gnus/gnus-registry.el +++ b/lisp/gnus/gnus-registry.el @@ -1,6 +1,6 @@ ;;; gnus-registry.el --- article registry for Gnus -*- lexical-binding: t; -*- -;; Copyright (C) 2002-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002-2021 Free Software Foundation, Inc. ;; Author: Ted Zlatanov <tzz@lifelogs.com> ;; Keywords: news registry diff --git a/lisp/gnus/gnus-rfc1843.el b/lisp/gnus/gnus-rfc1843.el index 45a6aff1fae..107e96350bb 100644 --- a/lisp/gnus/gnus-rfc1843.el +++ b/lisp/gnus/gnus-rfc1843.el @@ -1,6 +1,6 @@ ;;; gnus-rfc1843.el --- HZ (rfc1843) decoding interface functions for Gnus -;; Copyright (C) 1998-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998-2021 Free Software Foundation, Inc. ;; Author: Shenghuo Zhu <zsh@cs.rochester.edu> ;; Keywords: news HZ HZ+ mail i18n diff --git a/lisp/gnus/gnus-salt.el b/lisp/gnus/gnus-salt.el index f19678a634a..abaa844f58a 100644 --- a/lisp/gnus/gnus-salt.el +++ b/lisp/gnus/gnus-salt.el @@ -1,6 +1,6 @@ ;;; gnus-salt.el --- alternate summary mode interfaces for Gnus -;; Copyright (C) 1996-1999, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996-1999, 2001-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Keywords: news diff --git a/lisp/gnus/gnus-score.el b/lisp/gnus/gnus-score.el index 33c5803f5ab..e74c4980879 100644 --- a/lisp/gnus/gnus-score.el +++ b/lisp/gnus/gnus-score.el @@ -1,6 +1,6 @@ ;;; gnus-score.el --- scoring code for Gnus -;; Copyright (C) 1995-2020 Free Software Foundation, Inc. +;; Copyright (C) 1995-2021 Free Software Foundation, Inc. ;; Author: Per Abrahamsen <amanda@iesd.auc.dk> ;; Lars Magne Ingebrigtsen <larsi@gnus.org> diff --git a/lisp/gnus/gnus-search.el b/lisp/gnus/gnus-search.el index 3a3722c90a3..44f43b073c8 100644 --- a/lisp/gnus/gnus-search.el +++ b/lisp/gnus/gnus-search.el @@ -1,6 +1,6 @@ ;;; gnus-search.el --- Search facilities for Gnus -*- lexical-binding: t; -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; Author: Eric Abrahamsen <eric@ericabrahamsen.net> diff --git a/lisp/gnus/gnus-sieve.el b/lisp/gnus/gnus-sieve.el index 5d8f9b55deb..3b79d578644 100644 --- a/lisp/gnus/gnus-sieve.el +++ b/lisp/gnus/gnus-sieve.el @@ -1,6 +1,6 @@ ;;; gnus-sieve.el --- Utilities to manage sieve scripts for Gnus -;; Copyright (C) 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 2001-2021 Free Software Foundation, Inc. ;; Author: NAGY Andras <nagya@inf.elte.hu>, ;; Simon Josefsson <simon@josefsson.org> diff --git a/lisp/gnus/gnus-spec.el b/lisp/gnus/gnus-spec.el index 6e3e802c830..a5228551396 100644 --- a/lisp/gnus/gnus-spec.el +++ b/lisp/gnus/gnus-spec.el @@ -1,6 +1,6 @@ ;;; gnus-spec.el --- format spec functions for Gnus -;; Copyright (C) 1996-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Keywords: news diff --git a/lisp/gnus/gnus-srvr.el b/lisp/gnus/gnus-srvr.el index ba15f1a04cc..34e5ceb3f67 100644 --- a/lisp/gnus/gnus-srvr.el +++ b/lisp/gnus/gnus-srvr.el @@ -1,6 +1,6 @@ ;;; gnus-srvr.el --- virtual server support for Gnus -;; Copyright (C) 1995-2020 Free Software Foundation, Inc. +;; Copyright (C) 1995-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Keywords: news diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el index d15fc8217ab..fbdbf41dc05 100644 --- a/lisp/gnus/gnus-start.el +++ b/lisp/gnus/gnus-start.el @@ -1,6 +1,6 @@ ;;; gnus-start.el --- startup functions for Gnus -*- lexical-binding:t -*- -;; Copyright (C) 1996-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Keywords: news diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el index 38edc772f8f..b0f9ed4c6f0 100644 --- a/lisp/gnus/gnus-sum.el +++ b/lisp/gnus/gnus-sum.el @@ -1,6 +1,6 @@ ;;; gnus-sum.el --- summary mode commands for Gnus -*- lexical-binding:t -*- -;; Copyright (C) 1996-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Keywords: news diff --git a/lisp/gnus/gnus-topic.el b/lisp/gnus/gnus-topic.el index 75de1e031c3..8a77c532d29 100644 --- a/lisp/gnus/gnus-topic.el +++ b/lisp/gnus/gnus-topic.el @@ -1,6 +1,6 @@ ;;; gnus-topic.el --- a folding minor mode for Gnus group buffers -;; Copyright (C) 1995-2020 Free Software Foundation, Inc. +;; Copyright (C) 1995-2021 Free Software Foundation, Inc. ;; Author: Ilja Weis <kult@uni-paderborn.de> ;; Lars Magne Ingebrigtsen <larsi@gnus.org> diff --git a/lisp/gnus/gnus-undo.el b/lisp/gnus/gnus-undo.el index a852f20109e..b1c1fb832fe 100644 --- a/lisp/gnus/gnus-undo.el +++ b/lisp/gnus/gnus-undo.el @@ -1,6 +1,6 @@ ;;; gnus-undo.el --- minor mode for undoing in Gnus -;; Copyright (C) 1996-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Keywords: news diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el index ef811c65b86..de3c854ca56 100644 --- a/lisp/gnus/gnus-util.el +++ b/lisp/gnus/gnus-util.el @@ -1,6 +1,6 @@ ;;; gnus-util.el --- utility functions for Gnus -;; Copyright (C) 1996-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Keywords: news @@ -785,7 +785,7 @@ If there's no subdirectory, delete DIRECTORY as well." string) (defsubst gnus-put-text-property-excluding-newlines (beg end prop val) - "The same as `put-text-property', but don't put this prop on any newlines in the region." + "Like `put-text-property', but don't put this prop on any newlines in the region." (save-match-data (save-excursion (save-restriction @@ -796,7 +796,7 @@ If there's no subdirectory, delete DIRECTORY as well." (put-text-property beg (point) prop val))))) (defsubst gnus-put-overlay-excluding-newlines (beg end prop val) - "The same as `put-text-property', but don't put this prop on any newlines in the region." + "Like `put-text-property', but don't put this prop on any newlines in the region." (save-match-data (save-excursion (save-restriction diff --git a/lisp/gnus/gnus-uu.el b/lisp/gnus/gnus-uu.el index db01fb13527..db0ffc6d0df 100644 --- a/lisp/gnus/gnus-uu.el +++ b/lisp/gnus/gnus-uu.el @@ -1,6 +1,6 @@ ;;; gnus-uu.el --- extract (uu)encoded files in Gnus -;; Copyright (C) 1985-1987, 1993-1998, 2000-2020 Free Software +;; Copyright (C) 1985-1987, 1993-1998, 2000-2021 Free Software ;; Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> diff --git a/lisp/gnus/gnus-vm.el b/lisp/gnus/gnus-vm.el index 08f6ce6d818..533b1e2a580 100644 --- a/lisp/gnus/gnus-vm.el +++ b/lisp/gnus/gnus-vm.el @@ -1,6 +1,6 @@ ;;; gnus-vm.el --- vm interface for Gnus -;; Copyright (C) 1994-2020 Free Software Foundation, Inc. +;; Copyright (C) 1994-2021 Free Software Foundation, Inc. ;; Author: Per Persson <pp@gnu.ai.mit.edu> ;; Keywords: news, mail diff --git a/lisp/gnus/gnus-win.el b/lisp/gnus/gnus-win.el index e900e294c57..18924a3ad0e 100644 --- a/lisp/gnus/gnus-win.el +++ b/lisp/gnus/gnus-win.el @@ -1,6 +1,6 @@ ;;; gnus-win.el --- window configuration functions for Gnus -;; Copyright (C) 1996-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Keywords: news diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el index ade32da60e6..91ab878b22f 100644 --- a/lisp/gnus/gnus.el +++ b/lisp/gnus/gnus.el @@ -1,6 +1,6 @@ ;;; gnus.el --- a newsreader for GNU Emacs -*- lexical-binding:t -*- -;; Copyright (C) 1987-1990, 1993-1998, 2000-2020 Free Software +;; Copyright (C) 1987-1990, 1993-1998, 2000-2021 Free Software ;; Foundation, Inc. ;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet> diff --git a/lisp/gnus/gssapi.el b/lisp/gnus/gssapi.el index 485d58ad94e..20562fb9ad2 100644 --- a/lisp/gnus/gssapi.el +++ b/lisp/gnus/gssapi.el @@ -1,6 +1,6 @@ ;;; gssapi.el --- GSSAPI/Kerberos 5 interface for Emacs -;; Copyright (C) 2011-2020 Free Software Foundation, Inc. +;; Copyright (C) 2011-2021 Free Software Foundation, Inc. ;; Author: Simon Josefsson <simon@josefsson.org> ;; Lars Magne Ingebrigtsen <larsi@gnus.org> diff --git a/lisp/gnus/legacy-gnus-agent.el b/lisp/gnus/legacy-gnus-agent.el index 44b6c295b3c..b47e69ffa4b 100644 --- a/lisp/gnus/legacy-gnus-agent.el +++ b/lisp/gnus/legacy-gnus-agent.el @@ -1,6 +1,6 @@ ;;; gnus-agent.el --- Legacy unplugged support for Gnus -;; Copyright (C) 2004-2020 Free Software Foundation, Inc. +;; Copyright (C) 2004-2021 Free Software Foundation, Inc. ;; Author: Kevin Greiner <kgreiner@xpediantsolutions.com> ;; Keywords: news diff --git a/lisp/gnus/mail-source.el b/lisp/gnus/mail-source.el index 43180726c45..52470196f62 100644 --- a/lisp/gnus/mail-source.el +++ b/lisp/gnus/mail-source.el @@ -1,6 +1,6 @@ ;;; mail-source.el --- functions for fetching mail -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Keywords: news, mail diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index 86800f28cc4..3ff3d29b45d 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el @@ -1,6 +1,6 @@ ;;; message.el --- composing mail and news messages -*- lexical-binding: t -*- -;; Copyright (C) 1996-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Keywords: mail, news @@ -2669,7 +2669,7 @@ Point is left at the beginning of the narrowed-to region." 10000)))) (defun message-sort-headers () - "Sort the headers of the current message according to `message-header-format-alist'." + "Sort headers of the current message according to `message-header-format-alist'." (interactive) (save-excursion (save-restriction diff --git a/lisp/gnus/mm-archive.el b/lisp/gnus/mm-archive.el index 56253afa193..635e7f4ee84 100644 --- a/lisp/gnus/mm-archive.el +++ b/lisp/gnus/mm-archive.el @@ -1,6 +1,6 @@ ;;; mm-archive.el --- Functions for parsing archive files as MIME -;; Copyright (C) 2012-2020 Free Software Foundation, Inc. +;; Copyright (C) 2012-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; This file is part of GNU Emacs. diff --git a/lisp/gnus/mm-bodies.el b/lisp/gnus/mm-bodies.el index 35332109681..f35ba3a0b91 100644 --- a/lisp/gnus/mm-bodies.el +++ b/lisp/gnus/mm-bodies.el @@ -1,6 +1,6 @@ ;;; mm-bodies.el --- Functions for decoding MIME things -;; Copyright (C) 1998-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; MORIOKA Tomohiko <morioka@jaist.ac.jp> diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el index 1bce6ca020e..61946aa5811 100644 --- a/lisp/gnus/mm-decode.el +++ b/lisp/gnus/mm-decode.el @@ -1,6 +1,6 @@ ;;; mm-decode.el --- Functions for decoding MIME things -*- lexical-binding:t -*- -;; Copyright (C) 1998-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; MORIOKA Tomohiko <morioka@jaist.ac.jp> diff --git a/lisp/gnus/mm-encode.el b/lisp/gnus/mm-encode.el index d66ae607ed9..8bd3e0b3d2d 100644 --- a/lisp/gnus/mm-encode.el +++ b/lisp/gnus/mm-encode.el @@ -1,6 +1,6 @@ ;;; mm-encode.el --- Functions for encoding MIME things -;; Copyright (C) 1998-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; MORIOKA Tomohiko <morioka@jaist.ac.jp> diff --git a/lisp/gnus/mm-extern.el b/lisp/gnus/mm-extern.el index 96f2a78f0d6..4099a10eb35 100644 --- a/lisp/gnus/mm-extern.el +++ b/lisp/gnus/mm-extern.el @@ -1,6 +1,6 @@ ;;; mm-extern.el --- showing message/external-body -*- lexical-binding:t -*- -;; Copyright (C) 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 2000-2021 Free Software Foundation, Inc. ;; Author: Shenghuo Zhu <zsh@cs.rochester.edu> ;; Keywords: message external-body diff --git a/lisp/gnus/mm-partial.el b/lisp/gnus/mm-partial.el index 9bf49681648..165c19139ce 100644 --- a/lisp/gnus/mm-partial.el +++ b/lisp/gnus/mm-partial.el @@ -1,6 +1,6 @@ ;;; mm-partial.el --- showing message/partial -;; Copyright (C) 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 2000-2021 Free Software Foundation, Inc. ;; Author: Shenghuo Zhu <zsh@cs.rochester.edu> ;; Keywords: message partial diff --git a/lisp/gnus/mm-url.el b/lisp/gnus/mm-url.el index 4d56b19c3d7..412a4744125 100644 --- a/lisp/gnus/mm-url.el +++ b/lisp/gnus/mm-url.el @@ -1,6 +1,6 @@ ;;; mm-url.el --- a wrapper of url functions/commands for Gnus -;; Copyright (C) 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 2001-2021 Free Software Foundation, Inc. ;; Author: Shenghuo Zhu <zsh@cs.rochester.edu> diff --git a/lisp/gnus/mm-util.el b/lisp/gnus/mm-util.el index 958e24c39f5..db42bfa4b10 100644 --- a/lisp/gnus/mm-util.el +++ b/lisp/gnus/mm-util.el @@ -1,6 +1,6 @@ ;;; mm-util.el --- Utility functions for Mule and low level things -*- lexical-binding:t -*- -;; Copyright (C) 1998-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; MORIOKA Tomohiko <morioka@jaist.ac.jp> diff --git a/lisp/gnus/mm-uu.el b/lisp/gnus/mm-uu.el index aedd6c948c2..9d4c4bfead7 100644 --- a/lisp/gnus/mm-uu.el +++ b/lisp/gnus/mm-uu.el @@ -1,6 +1,6 @@ ;;; mm-uu.el --- Return uu stuff as mm handles -*- lexical-binding:t -*- -;; Copyright (C) 1998-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998-2021 Free Software Foundation, Inc. ;; Author: Shenghuo Zhu <zsh@cs.rochester.edu> ;; Keywords: postscript uudecode binhex shar forward gnatsweb pgp diff --git a/lisp/gnus/mm-view.el b/lisp/gnus/mm-view.el index 015bc79f455..0683703a4ea 100644 --- a/lisp/gnus/mm-view.el +++ b/lisp/gnus/mm-view.el @@ -1,6 +1,6 @@ ;;; mm-view.el --- functions for viewing MIME objects -;; Copyright (C) 1998-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; This file is part of GNU Emacs. diff --git a/lisp/gnus/mml-sec.el b/lisp/gnus/mml-sec.el index 74af99da7e3..c117a3866ab 100644 --- a/lisp/gnus/mml-sec.el +++ b/lisp/gnus/mml-sec.el @@ -1,6 +1,6 @@ ;;; mml-sec.el --- A package with security functions for MML documents -;; Copyright (C) 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 2000-2021 Free Software Foundation, Inc. ;; Author: Simon Josefsson <simon@josefsson.org> diff --git a/lisp/gnus/mml-smime.el b/lisp/gnus/mml-smime.el index acddb300339..5baeaffa53a 100644 --- a/lisp/gnus/mml-smime.el +++ b/lisp/gnus/mml-smime.el @@ -1,6 +1,6 @@ ;;; mml-smime.el --- S/MIME support for MML -;; Copyright (C) 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 2000-2021 Free Software Foundation, Inc. ;; Author: Simon Josefsson <simon@josefsson.org> ;; Keywords: Gnus, MIME, S/MIME, MML diff --git a/lisp/gnus/mml.el b/lisp/gnus/mml.el index 47dcb54562c..424215de941 100644 --- a/lisp/gnus/mml.el +++ b/lisp/gnus/mml.el @@ -1,6 +1,6 @@ ;;; mml.el --- A package for parsing and validating MML documents -;; Copyright (C) 1998-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; This file is part of GNU Emacs. diff --git a/lisp/gnus/mml1991.el b/lisp/gnus/mml1991.el index 88864ea3579..a87e642c07d 100644 --- a/lisp/gnus/mml1991.el +++ b/lisp/gnus/mml1991.el @@ -1,6 +1,6 @@ ;;; mml1991.el --- Old PGP message format (RFC 1991) support for MML -;; Copyright (C) 1998-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998-2021 Free Software Foundation, Inc. ;; Author: Sascha Lüdecke <sascha@meta-x.de>, ;; Simon Josefsson <simon@josefsson.org> (Mailcrypt interface, Gnus glue) diff --git a/lisp/gnus/mml2015.el b/lisp/gnus/mml2015.el index 0765d7b245d..8eda59372fb 100644 --- a/lisp/gnus/mml2015.el +++ b/lisp/gnus/mml2015.el @@ -1,6 +1,6 @@ ;;; mml2015.el --- MIME Security with Pretty Good Privacy (PGP) -;; Copyright (C) 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 2000-2021 Free Software Foundation, Inc. ;; Author: Shenghuo Zhu <zsh@cs.rochester.edu> ;; Keywords: PGP MIME MML diff --git a/lisp/gnus/nnagent.el b/lisp/gnus/nnagent.el index 1b5b9757dc5..f2acea4fa64 100644 --- a/lisp/gnus/nnagent.el +++ b/lisp/gnus/nnagent.el @@ -1,6 +1,6 @@ ;;; nnagent.el --- offline backend for Gnus -;; Copyright (C) 1997-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Keywords: news, mail diff --git a/lisp/gnus/nnbabyl.el b/lisp/gnus/nnbabyl.el index 480d794b9ac..130f56ad92f 100644 --- a/lisp/gnus/nnbabyl.el +++ b/lisp/gnus/nnbabyl.el @@ -1,6 +1,6 @@ ;;; nnbabyl.el --- rmail mbox access for Gnus -;; Copyright (C) 1995-2020 Free Software Foundation, Inc. +;; Copyright (C) 1995-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Masanobu UMEDA <umerin@flab.flab.fujitsu.junet> diff --git a/lisp/gnus/nndiary.el b/lisp/gnus/nndiary.el index ef520704123..b3e83e494d7 100644 --- a/lisp/gnus/nndiary.el +++ b/lisp/gnus/nndiary.el @@ -1,6 +1,6 @@ ;;; nndiary.el --- A diary back end for Gnus -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: Didier Verna <didier@didierverna.net> ;; Created: Fri Jul 16 18:55:42 1999 diff --git a/lisp/gnus/nndir.el b/lisp/gnus/nndir.el index 32d6c0f856b..46351d0004f 100644 --- a/lisp/gnus/nndir.el +++ b/lisp/gnus/nndir.el @@ -1,6 +1,6 @@ ;;; nndir.el --- single directory newsgroup access for Gnus -;; Copyright (C) 1995-2020 Free Software Foundation, Inc. +;; Copyright (C) 1995-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Keywords: news diff --git a/lisp/gnus/nndoc.el b/lisp/gnus/nndoc.el index 81431270d7c..a3a66454853 100644 --- a/lisp/gnus/nndoc.el +++ b/lisp/gnus/nndoc.el @@ -1,6 +1,6 @@ ;;; nndoc.el --- single file access for Gnus -;; Copyright (C) 1995-2020 Free Software Foundation, Inc. +;; Copyright (C) 1995-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Masanobu UMEDA <umerin@flab.flab.fujitsu.junet> diff --git a/lisp/gnus/nndraft.el b/lisp/gnus/nndraft.el index a3c26ea4ac0..1f87beda5f5 100644 --- a/lisp/gnus/nndraft.el +++ b/lisp/gnus/nndraft.el @@ -1,6 +1,6 @@ ;;; nndraft.el --- draft article access for Gnus -;; Copyright (C) 1995-2020 Free Software Foundation, Inc. +;; Copyright (C) 1995-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Keywords: news diff --git a/lisp/gnus/nneething.el b/lisp/gnus/nneething.el index 9f1fdbae5ae..014ad3adfb1 100644 --- a/lisp/gnus/nneething.el +++ b/lisp/gnus/nneething.el @@ -1,6 +1,6 @@ ;;; nneething.el --- arbitrary file access for Gnus -;; Copyright (C) 1995-2020 Free Software Foundation, Inc. +;; Copyright (C) 1995-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Masanobu UMEDA <umerin@flab.flab.fujitsu.junet> diff --git a/lisp/gnus/nnfolder.el b/lisp/gnus/nnfolder.el index b7bfd9afd05..9a0219c1436 100644 --- a/lisp/gnus/nnfolder.el +++ b/lisp/gnus/nnfolder.el @@ -1,6 +1,6 @@ ;;; nnfolder.el --- mail folder access for Gnus -;; Copyright (C) 1995-2020 Free Software Foundation, Inc. +;; Copyright (C) 1995-2021 Free Software Foundation, Inc. ;; Author: Simon Josefsson <simon@josefsson.org> ;; ShengHuo Zhu <zsh@cs.rochester.edu> (adding NOV) diff --git a/lisp/gnus/nngateway.el b/lisp/gnus/nngateway.el index 13cc65bfb85..15e4876642c 100644 --- a/lisp/gnus/nngateway.el +++ b/lisp/gnus/nngateway.el @@ -1,6 +1,6 @@ ;;; nngateway.el --- posting news via mail gateways -;; Copyright (C) 1996-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Keywords: news, mail diff --git a/lisp/gnus/nnheader.el b/lisp/gnus/nnheader.el index c97622114dc..a381720f24c 100644 --- a/lisp/gnus/nnheader.el +++ b/lisp/gnus/nnheader.el @@ -1,6 +1,6 @@ ;;; nnheader.el --- header access macros for Gnus and its backends -;; Copyright (C) 1987-1990, 1993-1998, 2000-2020 Free Software +;; Copyright (C) 1987-1990, 1993-1998, 2000-2021 Free Software ;; Foundation, Inc. ;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet> diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el index 61693a08b98..121513117b2 100644 --- a/lisp/gnus/nnimap.el +++ b/lisp/gnus/nnimap.el @@ -1,6 +1,6 @@ ;;; nnimap.el --- IMAP interface for Gnus -;; Copyright (C) 2010-2020 Free Software Foundation, Inc. +;; Copyright (C) 2010-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Simon Josefsson <simon@josefsson.org> diff --git a/lisp/gnus/nnmail.el b/lisp/gnus/nnmail.el index 6ee29a25cd8..d043ae1b426 100644 --- a/lisp/gnus/nnmail.el +++ b/lisp/gnus/nnmail.el @@ -1,6 +1,6 @@ ;;; nnmail.el --- mail support functions for the Gnus mail backends -;; Copyright (C) 1995-2020 Free Software Foundation, Inc. +;; Copyright (C) 1995-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Keywords: news, mail diff --git a/lisp/gnus/nnmairix.el b/lisp/gnus/nnmairix.el index e53e000beae..c061031b40a 100644 --- a/lisp/gnus/nnmairix.el +++ b/lisp/gnus/nnmairix.el @@ -1,6 +1,6 @@ ;;; nnmairix.el --- Mairix back end for Gnus, the Emacs newsreader -;; Copyright (C) 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2007-2021 Free Software Foundation, Inc. ;; Author: David Engster <deng@randomsample.de> ;; Keywords: mail searching diff --git a/lisp/gnus/nnmbox.el b/lisp/gnus/nnmbox.el index 8b3d80266e7..a4863c3e1fa 100644 --- a/lisp/gnus/nnmbox.el +++ b/lisp/gnus/nnmbox.el @@ -1,6 +1,6 @@ ;;; nnmbox.el --- mail mbox access for Gnus -;; Copyright (C) 1995-2020 Free Software Foundation, Inc. +;; Copyright (C) 1995-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Masanobu UMEDA <umerin@flab.flab.fujitsu.junet> diff --git a/lisp/gnus/nnmh.el b/lisp/gnus/nnmh.el index 5584dad45f1..82ed091982e 100644 --- a/lisp/gnus/nnmh.el +++ b/lisp/gnus/nnmh.el @@ -1,6 +1,6 @@ ;;; nnmh.el --- mhspool access for Gnus -;; Copyright (C) 1995-2020 Free Software Foundation, Inc. +;; Copyright (C) 1995-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Masanobu UMEDA <umerin@flab.flab.fujitsu.junet> diff --git a/lisp/gnus/nnml.el b/lisp/gnus/nnml.el index c648e3aae7c..ebececa3ce2 100644 --- a/lisp/gnus/nnml.el +++ b/lisp/gnus/nnml.el @@ -1,6 +1,6 @@ ;;; nnml.el --- mail spool access for Gnus -;; Copyright (C) 1995-2020 Free Software Foundation, Inc. +;; Copyright (C) 1995-2021 Free Software Foundation, Inc. ;; Authors: Didier Verna <didier@didierverna.net> (adding compaction) ;; Simon Josefsson <simon@josefsson.org> diff --git a/lisp/gnus/nnoo.el b/lisp/gnus/nnoo.el index ba527a1c4b6..9bb86d65aba 100644 --- a/lisp/gnus/nnoo.el +++ b/lisp/gnus/nnoo.el @@ -1,6 +1,6 @@ ;;; nnoo.el --- OO Gnus Backends -;; Copyright (C) 1996-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Keywords: news diff --git a/lisp/gnus/nnregistry.el b/lisp/gnus/nnregistry.el index 29ca56817ed..e78f93d829a 100644 --- a/lisp/gnus/nnregistry.el +++ b/lisp/gnus/nnregistry.el @@ -1,7 +1,7 @@ ;;; nnregistry.el --- access to articles via Gnus' message-id registry ;;; -*- coding: utf-8 -*- -;; Copyright (C) 2010-2020 Free Software Foundation, Inc. +;; Copyright (C) 2010-2021 Free Software Foundation, Inc. ;; Author: Ludovic Courtès <ludo@gnu.org> ;; Keywords: news, mail diff --git a/lisp/gnus/nnrss.el b/lisp/gnus/nnrss.el index 48c07da1cc8..f9e0a08a06e 100644 --- a/lisp/gnus/nnrss.el +++ b/lisp/gnus/nnrss.el @@ -1,6 +1,6 @@ ;;; nnrss.el --- interfacing with RSS -;; Copyright (C) 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 2001-2021 Free Software Foundation, Inc. ;; Author: Shenghuo Zhu <zsh@cs.rochester.edu> ;; Keywords: RSS diff --git a/lisp/gnus/nnselect.el b/lisp/gnus/nnselect.el index e4753fe95c8..ba0e60a2673 100644 --- a/lisp/gnus/nnselect.el +++ b/lisp/gnus/nnselect.el @@ -1,6 +1,6 @@ ;;; nnselect.el --- a virtual group backend -*- lexical-binding:t -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; Author: Andrew Cohen <cohen@andy.bu.edu> ;; Keywords: news mail diff --git a/lisp/gnus/nnspool.el b/lisp/gnus/nnspool.el index 0b6bba5fea7..9de59d8631d 100644 --- a/lisp/gnus/nnspool.el +++ b/lisp/gnus/nnspool.el @@ -1,6 +1,6 @@ ;;; nnspool.el --- spool access for GNU Emacs -;; Copyright (C) 1988-1990, 1993-1998, 2000-2020 Free Software +;; Copyright (C) 1988-1990, 1993-1998, 2000-2021 Free Software ;; Foundation, Inc. ;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet> diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el index 887dce3472f..7e10e151a4d 100644 --- a/lisp/gnus/nntp.el +++ b/lisp/gnus/nntp.el @@ -1,6 +1,6 @@ ;;; nntp.el --- nntp access for Gnus -*- lexical-binding:t -*- -;; Copyright (C) 1987-1990, 1992-1998, 2000-2020 Free Software +;; Copyright (C) 1987-1990, 1992-1998, 2000-2021 Free Software ;; Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> @@ -600,7 +600,7 @@ retried once before actually displaying the error report." nil))) (defun nntp-with-open-group-function (group server connectionless bodyfun) - "Protect against servers that don't like clients that keep idle connections opens. + "Protect against servers that don't like clients that keep idle connections open. The problem being that these servers may either close a connection or simply ignore any further requests on a connection. Closed connections are not detected until `accept-process-output' has updated @@ -651,7 +651,7 @@ command whose response triggered the error." nntp-with-open-group-internal)) (defmacro nntp-with-open-group (group server &optional connectionless &rest forms) - "Protect against servers that don't like clients that keep idle connections opens. + "Protect against servers that don't like clients that keep idle connections open. The problem being that these servers may either close a connection or simply ignore any further requests on a connection. Closed connections are not detected until `accept-process-output' has updated diff --git a/lisp/gnus/nnvirtual.el b/lisp/gnus/nnvirtual.el index 3e9e608a099..1e2feda6365 100644 --- a/lisp/gnus/nnvirtual.el +++ b/lisp/gnus/nnvirtual.el @@ -1,6 +1,6 @@ ;;; nnvirtual.el --- virtual newsgroups access for Gnus -;; Copyright (C) 1994-2020 Free Software Foundation, Inc. +;; Copyright (C) 1994-2021 Free Software Foundation, Inc. ;; Author: David Moore <dmoore@ucsd.edu> ;; Lars Magne Ingebrigtsen <larsi@gnus.org> @@ -667,7 +667,7 @@ the result." (defun nnvirtual-create-mapping (dont-check) - "Build the tables necessary to map between component (group, article) to virtual article. + "Build tables to map between component (group, article) to virtual article. Generate the set of read messages and marks for the virtual group based on the marks on the component groups." (let ((cnt 0) diff --git a/lisp/gnus/nnweb.el b/lisp/gnus/nnweb.el index 64b6f495197..b8fb4a8373a 100644 --- a/lisp/gnus/nnweb.el +++ b/lisp/gnus/nnweb.el @@ -1,6 +1,6 @@ ;;; nnweb.el --- retrieving articles via web search engines -;; Copyright (C) 1996-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Keywords: news diff --git a/lisp/gnus/score-mode.el b/lisp/gnus/score-mode.el index d8d8af8de1b..b8726c03c3e 100644 --- a/lisp/gnus/score-mode.el +++ b/lisp/gnus/score-mode.el @@ -1,6 +1,6 @@ ;;; score-mode.el --- mode for editing Gnus score files -;; Copyright (C) 1996, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996, 2001-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Keywords: news, mail diff --git a/lisp/gnus/smiley.el b/lisp/gnus/smiley.el index 3edae04fcc0..d9e04f3b40c 100644 --- a/lisp/gnus/smiley.el +++ b/lisp/gnus/smiley.el @@ -1,6 +1,6 @@ ;;; smiley.el --- displaying smiley faces -;; Copyright (C) 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 2000-2021 Free Software Foundation, Inc. ;; Author: Dave Love <fx@gnu.org> ;; Keywords: news mail multimedia diff --git a/lisp/gnus/smime.el b/lisp/gnus/smime.el index 08d45e53155..ae5d171d871 100644 --- a/lisp/gnus/smime.el +++ b/lisp/gnus/smime.el @@ -1,6 +1,6 @@ ;;; smime.el --- S/MIME support library -*- lexical-binding:t -*- -;; Copyright (C) 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 2000-2021 Free Software Foundation, Inc. ;; Author: Simon Josefsson <simon@josefsson.org> ;; Keywords: SMIME X.509 PEM OpenSSL diff --git a/lisp/gnus/spam-report.el b/lisp/gnus/spam-report.el index f414c1ef069..8c148ce9d91 100644 --- a/lisp/gnus/spam-report.el +++ b/lisp/gnus/spam-report.el @@ -1,6 +1,6 @@ ;;; spam-report.el --- Reporting spam -;; Copyright (C) 2002-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002-2021 Free Software Foundation, Inc. ;; Author: Ted Zlatanov <tzz@lifelogs.com> ;; Keywords: network, spam, mail, gmane, report diff --git a/lisp/gnus/spam-stat.el b/lisp/gnus/spam-stat.el index bf593865d72..3662ade2663 100644 --- a/lisp/gnus/spam-stat.el +++ b/lisp/gnus/spam-stat.el @@ -1,6 +1,6 @@ ;;; spam-stat.el --- detecting spam based on statistics -;; Copyright (C) 2002-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002-2021 Free Software Foundation, Inc. ;; Author: Alex Schroeder <alex@gnu.org> ;; Keywords: network diff --git a/lisp/gnus/spam-wash.el b/lisp/gnus/spam-wash.el index 7ce0ce24d17..1d00a39060d 100644 --- a/lisp/gnus/spam-wash.el +++ b/lisp/gnus/spam-wash.el @@ -1,6 +1,6 @@ ;;; spam-wash.el --- wash spam before analysis -;; Copyright (C) 2004, 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2004, 2007-2021 Free Software Foundation, Inc. ;; Author: Andrew Cohen <cohen@andy.bu.edu> ;; Keywords: mail diff --git a/lisp/gnus/spam.el b/lisp/gnus/spam.el index e74aef3efe6..22810332b65 100644 --- a/lisp/gnus/spam.el +++ b/lisp/gnus/spam.el @@ -1,6 +1,6 @@ ;;; spam.el --- Identifying spam -;; Copyright (C) 2002-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Maintainer: Ted Zlatanov <tzz@lifelogs.com> diff --git a/lisp/help-at-pt.el b/lisp/help-at-pt.el index 1d9e051a8cf..e17bd0a081b 100644 --- a/lisp/help-at-pt.el +++ b/lisp/help-at-pt.el @@ -1,6 +1,6 @@ ;;; help-at-pt.el --- local help through the keyboard -;; Copyright (C) 2003-2020 Free Software Foundation, Inc. +;; Copyright (C) 2003-2021 Free Software Foundation, Inc. ;; Author: Luc Teirlinck <teirllm@auburn.edu> ;; Keywords: help diff --git a/lisp/help-fns.el b/lisp/help-fns.el index d4e0a3905ef..b6feeebf038 100644 --- a/lisp/help-fns.el +++ b/lisp/help-fns.el @@ -1,6 +1,6 @@ ;;; help-fns.el --- Complex help functions -*- lexical-binding: t -*- -;; Copyright (C) 1985-1986, 1993-1994, 1998-2020 Free Software +;; Copyright (C) 1985-1986, 1993-1994, 1998-2021 Free Software ;; Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/help-macro.el b/lisp/help-macro.el index 877de781217..791b10a878f 100644 --- a/lisp/help-macro.el +++ b/lisp/help-macro.el @@ -1,6 +1,6 @@ ;;; help-macro.el --- makes command line help such as help-for-help -;; Copyright (C) 1993-1994, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1993-1994, 2001-2021 Free Software Foundation, Inc. ;; Author: Lynn Slater <lrs@indetech.com> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/help-mode.el b/lisp/help-mode.el index 025a67016b6..cd08b2b2ba4 100644 --- a/lisp/help-mode.el +++ b/lisp/help-mode.el @@ -1,6 +1,6 @@ ;;; help-mode.el --- `help-mode' used by *Help* buffers -*- lexical-binding: t; -*- -;; Copyright (C) 1985-1986, 1993-1994, 1998-2020 Free Software +;; Copyright (C) 1985-1986, 1993-1994, 1998-2021 Free Software ;; Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/help.el b/lisp/help.el index 8dac6dcd332..a8af51cd9e7 100644 --- a/lisp/help.el +++ b/lisp/help.el @@ -1,6 +1,6 @@ ;;; help.el --- help commands for Emacs -*- lexical-binding:t -*- -;; Copyright (C) 1985-1986, 1993-1994, 1998-2020 Free Software +;; Copyright (C) 1985-1986, 1993-1994, 1998-2021 Free Software ;; Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/hex-util.el b/lisp/hex-util.el index d3ea705b944..41bdc39875a 100644 --- a/lisp/hex-util.el +++ b/lisp/hex-util.el @@ -1,6 +1,6 @@ ;;; hex-util.el --- Functions to encode/decode hexadecimal string -*- lexical-binding: t -*- -;; Copyright (C) 1999, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2001-2021 Free Software Foundation, Inc. ;; Author: Shuhei KOBAYASHI <shuhei@aqua.ocn.ne.jp> ;; Keywords: data diff --git a/lisp/hexl.el b/lisp/hexl.el index 1fe9aad66de..8d3cfe6de4f 100644 --- a/lisp/hexl.el +++ b/lisp/hexl.el @@ -1,6 +1,6 @@ ;;; hexl.el --- edit a file in a hex dump format using the hexl filter -*- lexical-binding: t -*- -;; Copyright (C) 1989, 1994, 1998, 2001-2020 Free Software Foundation, +;; Copyright (C) 1989, 1994, 1998, 2001-2021 Free Software Foundation, ;; Inc. ;; Author: Keith Gabryelski <ag@wheaties.ai.mit.edu> diff --git a/lisp/hfy-cmap.el b/lisp/hfy-cmap.el index a3398f6e809..b7de65f5b78 100644 --- a/lisp/hfy-cmap.el +++ b/lisp/hfy-cmap.el @@ -1,6 +1,6 @@ ;;; hfy-cmap.el --- Fallback color name -> rgb mapping for `htmlfontify' -*- lexical-binding:t -*- -;; Copyright (C) 2002-2003, 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002-2003, 2009-2021 Free Software Foundation, Inc. ;; Emacs Lisp Archive Entry ;; Package: htmlfontify diff --git a/lisp/hi-lock.el b/lisp/hi-lock.el index 51887b702c1..e214ab640de 100644 --- a/lisp/hi-lock.el +++ b/lisp/hi-lock.el @@ -1,6 +1,6 @@ ;;; hi-lock.el --- minor mode for interactive automatic highlighting -*- lexical-binding: t -*- -;; Copyright (C) 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 2000-2021 Free Software Foundation, Inc. ;; Author: David M. Koppelman <koppel@ece.lsu.edu> ;; Keywords: faces, minor-mode, matching, display diff --git a/lisp/hilit-chg.el b/lisp/hilit-chg.el index ae97bb008af..fb33cd92e35 100644 --- a/lisp/hilit-chg.el +++ b/lisp/hilit-chg.el @@ -1,6 +1,6 @@ ;;; hilit-chg.el --- minor mode displaying buffer changes with special face -;; Copyright (C) 1998, 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998, 2000-2021 Free Software Foundation, Inc. ;; Author: Richard Sharman <rsharman@pobox.com> ;; Keywords: faces diff --git a/lisp/hippie-exp.el b/lisp/hippie-exp.el index b521ddaa552..4d020232939 100644 --- a/lisp/hippie-exp.el +++ b/lisp/hippie-exp.el @@ -1,6 +1,6 @@ ;;; hippie-exp.el --- expand text trying various ways to find its expansion -;; Copyright (C) 1992, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1992, 2001-2021 Free Software Foundation, Inc. ;; Author: Anders Holst <aho@sans.kth.se> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/hl-line.el b/lisp/hl-line.el index fe7e03f6bc2..73870f9579e 100644 --- a/lisp/hl-line.el +++ b/lisp/hl-line.el @@ -1,6 +1,6 @@ ;;; hl-line.el --- highlight the current line -*- lexical-binding:t -*- -;; Copyright (C) 1998, 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998, 2000-2021 Free Software Foundation, Inc. ;; Author: Dave Love <fx@gnu.org> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el index c9ede657f54..bfbe0ee165b 100644 --- a/lisp/htmlfontify.el +++ b/lisp/htmlfontify.el @@ -1,6 +1,6 @@ ;;; htmlfontify.el --- htmlize a buffer/source tree with optional hyperlinks -*- lexical-binding: t -*- -;; Copyright (C) 2002-2003, 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002-2003, 2009-2021 Free Software Foundation, Inc. ;; Emacs Lisp Archive Entry ;; Package: htmlfontify diff --git a/lisp/ibuf-ext.el b/lisp/ibuf-ext.el index 79342976746..7be1b3d16c9 100644 --- a/lisp/ibuf-ext.el +++ b/lisp/ibuf-ext.el @@ -1,6 +1,6 @@ ;;; ibuf-ext.el --- extensions for ibuffer -*- lexical-binding:t -*- -;; Copyright (C) 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 2000-2021 Free Software Foundation, Inc. ;; Author: Colin Walters <walters@verbum.org> ;; Maintainer: John Paul Wallington <jpw@gnu.org> diff --git a/lisp/ibuf-macs.el b/lisp/ibuf-macs.el index 0d5fd9c8629..be09c6582ce 100644 --- a/lisp/ibuf-macs.el +++ b/lisp/ibuf-macs.el @@ -1,6 +1,6 @@ ;;; ibuf-macs.el --- macros for ibuffer -*- lexical-binding:t -*- -;; Copyright (C) 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 2000-2021 Free Software Foundation, Inc. ;; Author: Colin Walters <walters@verbum.org> ;; Maintainer: John Paul Wallington <jpw@gnu.org> diff --git a/lisp/ibuffer.el b/lisp/ibuffer.el index 7269af3fe04..4800e0243d7 100644 --- a/lisp/ibuffer.el +++ b/lisp/ibuffer.el @@ -1,6 +1,6 @@ ;;; ibuffer.el --- operate on buffers like dired -*- lexical-binding:t -*- -;; Copyright (C) 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 2000-2021 Free Software Foundation, Inc. ;; Author: Colin Walters <walters@verbum.org> ;; Maintainer: John Paul Wallington <jpw@gnu.org> diff --git a/lisp/icomplete.el b/lisp/icomplete.el index 6627fd15f65..da589c00649 100644 --- a/lisp/icomplete.el +++ b/lisp/icomplete.el @@ -1,6 +1,6 @@ ;;; icomplete.el --- minibuffer completion incremental feedback -*- lexical-binding: t -*- -;; Copyright (C) 1992-1994, 1997, 1999, 2001-2020 Free Software +;; Copyright (C) 1992-1994, 1997, 1999, 2001-2021 Free Software ;; Foundation, Inc. ;; Author: Ken Manheimer <ken dot manheimer at gmail...> diff --git a/lisp/ido.el b/lisp/ido.el index 277ce15a3a9..89b6a62f5a8 100644 --- a/lisp/ido.el +++ b/lisp/ido.el @@ -1,6 +1,6 @@ ;;; ido.el --- interactively do things with buffers and files -*- lexical-binding: t -*- -;; Copyright (C) 1996-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996-2021 Free Software Foundation, Inc. ;; Author: Kim F. Storm <storm@cua.dk> ;; Based on: iswitchb by Stephen Eglen <stephen@cns.ed.ac.uk> diff --git a/lisp/ielm.el b/lisp/ielm.el index b958389ea57..fd8dac74b74 100644 --- a/lisp/ielm.el +++ b/lisp/ielm.el @@ -1,6 +1,6 @@ ;;; ielm.el --- interaction mode for Emacs Lisp -*- lexical-binding: t -*- -;; Copyright (C) 1994, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1994, 2001-2021 Free Software Foundation, Inc. ;; Author: David Smith <maa036@lancaster.ac.uk> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/iimage.el b/lisp/iimage.el index 07c18863249..cc1461d7b0f 100644 --- a/lisp/iimage.el +++ b/lisp/iimage.el @@ -1,6 +1,6 @@ ;;; iimage.el --- Inline image minor mode. -;; Copyright (C) 2004-2020 Free Software Foundation, Inc. +;; Copyright (C) 2004-2021 Free Software Foundation, Inc. ;; Author: KOSEKI Yoshinori <kose@meadowy.org> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/image-dired.el b/lisp/image-dired.el index a29adde8325..48f9cd0767c 100644 --- a/lisp/image-dired.el +++ b/lisp/image-dired.el @@ -1,6 +1,6 @@ ;;; image-dired.el --- use dired to browse and manipulate your images -*- lexical-binding: t -*- ;; -;; Copyright (C) 2005-2020 Free Software Foundation, Inc. +;; Copyright (C) 2005-2021 Free Software Foundation, Inc. ;; ;; Version: 0.4.11 ;; Keywords: multimedia diff --git a/lisp/image-file.el b/lisp/image-file.el index 3b4f5722518..fbc9eaaf94e 100644 --- a/lisp/image-file.el +++ b/lisp/image-file.el @@ -1,6 +1,6 @@ ;;; image-file.el --- support for visiting image files -*- lexical-binding:t -*- ;; -;; Copyright (C) 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 2000-2021 Free Software Foundation, Inc. ;; ;; Author: Miles Bader <miles@gnu.org> ;; Keywords: multimedia diff --git a/lisp/image-mode.el b/lisp/image-mode.el index 143b68f52e7..9ed295e2aa1 100644 --- a/lisp/image-mode.el +++ b/lisp/image-mode.el @@ -1,6 +1,6 @@ ;;; image-mode.el --- support for visiting image files -*- lexical-binding: t -*- ;; -;; Copyright (C) 2005-2020 Free Software Foundation, Inc. +;; Copyright (C) 2005-2021 Free Software Foundation, Inc. ;; ;; Author: Richard Stallman <rms@gnu.org> ;; Keywords: multimedia diff --git a/lisp/image.el b/lisp/image.el index 023d64fc4ee..814035594b6 100644 --- a/lisp/image.el +++ b/lisp/image.el @@ -1,6 +1,6 @@ ;;; image.el --- image API -*- lexical-binding:t -*- -;; Copyright (C) 1998-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998-2021 Free Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org ;; Keywords: multimedia diff --git a/lisp/image/compface.el b/lisp/image/compface.el index 12473e802b8..6519615f4ec 100644 --- a/lisp/image/compface.el +++ b/lisp/image/compface.el @@ -1,6 +1,6 @@ ;;; compface.el --- functions for converting X-Face headers -*- lexical-binding: t -*- -;; Copyright (C) 2002-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Keywords: multimedia, news diff --git a/lisp/image/exif.el b/lisp/image/exif.el index e328fcce5a8..2dc9419b817 100644 --- a/lisp/image/exif.el +++ b/lisp/image/exif.el @@ -1,6 +1,6 @@ ;;; exif.el --- parsing Exif data in JPEG images -*- lexical-binding: t -*- -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Keywords: images diff --git a/lisp/image/gravatar.el b/lisp/image/gravatar.el index 3543be6de91..4f37834a27f 100644 --- a/lisp/image/gravatar.el +++ b/lisp/image/gravatar.el @@ -1,6 +1,6 @@ ;;; gravatar.el --- Get Gravatars -*- lexical-binding: t -*- -;; Copyright (C) 2010-2020 Free Software Foundation, Inc. +;; Copyright (C) 2010-2021 Free Software Foundation, Inc. ;; Author: Julien Danjou <julien@danjou.info> ;; Keywords: comm, multimedia diff --git a/lisp/image/image-converter.el b/lisp/image/image-converter.el index c31a3b8d3cf..e47f1f76e42 100644 --- a/lisp/image/image-converter.el +++ b/lisp/image/image-converter.el @@ -1,6 +1,6 @@ ;;; image-converter.el --- Converting images from exotic formats -*- lexical-binding: t -*- -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Keywords: images diff --git a/lisp/imenu.el b/lisp/imenu.el index 8fdacb0214d..b5cd18a689d 100644 --- a/lisp/imenu.el +++ b/lisp/imenu.el @@ -1,6 +1,6 @@ ;;; imenu.el --- framework for mode-specific buffer indexes -*- lexical-binding: t -*- -;; Copyright (C) 1994-1998, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1994-1998, 2001-2021 Free Software Foundation, Inc. ;; Author: Ake Stenhoff <etxaksf@aom.ericsson.se> ;; Lars Lindberg <lli@sypro.cap.se> diff --git a/lisp/indent.el b/lisp/indent.el index e67109ab431..5c5270b07c4 100644 --- a/lisp/indent.el +++ b/lisp/indent.el @@ -1,6 +1,6 @@ ;;; indent.el --- indentation commands for Emacs -*- lexical-binding:t -*- -;; Copyright (C) 1985, 1995, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1985, 1995, 2001-2021 Free Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org ;; Package: emacs diff --git a/lisp/info-look.el b/lisp/info-look.el index bcc2930ffc0..fd6f8f15082 100644 --- a/lisp/info-look.el +++ b/lisp/info-look.el @@ -1,7 +1,7 @@ ;;; info-look.el --- major-mode-sensitive Info index lookup facility -*- lexical-binding: t -*- ;; An older version of this was known as libc.el. -;; Copyright (C) 1995-1999, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1995-1999, 2001-2021 Free Software Foundation, Inc. ;; Author: Ralph Schleicher <rs@ralph-schleicher.de> ;; Keywords: help languages diff --git a/lisp/info-xref.el b/lisp/info-xref.el index 6d0ebe0b2a9..be1928d692b 100644 --- a/lisp/info-xref.el +++ b/lisp/info-xref.el @@ -1,6 +1,6 @@ ;;; info-xref.el --- check external references in an Info document -*- lexical-binding: t -*- -;; Copyright (C) 2003-2020 Free Software Foundation, Inc. +;; Copyright (C) 2003-2021 Free Software Foundation, Inc. ;; Author: Kevin Ryde <user42@zip.com.au> ;; Keywords: docs diff --git a/lisp/info.el b/lisp/info.el index efaf440d191..ef94aa945f2 100644 --- a/lisp/info.el +++ b/lisp/info.el @@ -1,6 +1,6 @@ ;; info.el --- Info package for Emacs -*- lexical-binding:t -*- -;; Copyright (C) 1985-1986, 1992-2020 Free Software Foundation, Inc. +;; Copyright (C) 1985-1986, 1992-2021 Free Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org ;; Keywords: help diff --git a/lisp/informat.el b/lisp/informat.el index 7750ab00898..3da23516333 100644 --- a/lisp/informat.el +++ b/lisp/informat.el @@ -1,6 +1,6 @@ ;;; informat.el --- info support functions package for Emacs -;; Copyright (C) 1986, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1986, 2001-2021 Free Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org ;; Keywords: help diff --git a/lisp/international/ccl.el b/lisp/international/ccl.el index 3b3fcf4c041..3c5a461a31e 100644 --- a/lisp/international/ccl.el +++ b/lisp/international/ccl.el @@ -1,6 +1,6 @@ ;;; ccl.el --- CCL (Code Conversion Language) compiler -*- lexical-binding:t -*- -;; Copyright (C) 1997-1998, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997-1998, 2001-2021 Free Software Foundation, Inc. ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) diff --git a/lisp/international/characters.el b/lisp/international/characters.el index 5f610ddf670..64460b411a2 100644 --- a/lisp/international/characters.el +++ b/lisp/international/characters.el @@ -1,6 +1,6 @@ ;;; characters.el --- set syntax and category for multibyte characters -;; Copyright (C) 1997, 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997, 2000-2021 Free Software Foundation, Inc. ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el index a52b6283c3e..4d80e17e3db 100644 --- a/lisp/international/fontset.el +++ b/lisp/international/fontset.el @@ -1,6 +1,6 @@ ;;; fontset.el --- commands for handling fontset -;; Copyright (C) 1997-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997-2021 Free Software Foundation, Inc. ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) diff --git a/lisp/international/isearch-x.el b/lisp/international/isearch-x.el index 1f5f8b7e32a..400421ddb23 100644 --- a/lisp/international/isearch-x.el +++ b/lisp/international/isearch-x.el @@ -1,6 +1,6 @@ ;;; isearch-x.el --- extended isearch handling commands -;; Copyright (C) 1997, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997, 2001-2021 Free Software Foundation, Inc. ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) diff --git a/lisp/international/iso-ascii.el b/lisp/international/iso-ascii.el index 0df07d65148..f8cb61c08f9 100644 --- a/lisp/international/iso-ascii.el +++ b/lisp/international/iso-ascii.el @@ -1,6 +1,6 @@ ;;; iso-ascii.el --- set up char tables for ISO 8859/1 on ASCII terminals -*- lexical-binding: t -*- -;; Copyright (C) 1987, 1995, 1998, 2001-2020 Free Software Foundation, +;; Copyright (C) 1987, 1995, 1998, 2001-2021 Free Software Foundation, ;; Inc. ;; Author: Howard Gayle diff --git a/lisp/international/iso-cvt.el b/lisp/international/iso-cvt.el index e55ae1a5930..3f3843e23dd 100644 --- a/lisp/international/iso-cvt.el +++ b/lisp/international/iso-cvt.el @@ -1,7 +1,7 @@ ;;; iso-cvt.el --- translate ISO 8859-1 from/to various encodings -*- coding: utf-8 -*- ;; This file was formerly called gm-lingo.el. -;; Copyright (C) 1993-1998, 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 1993-1998, 2000-2021 Free Software Foundation, Inc. ;; Author: Michael Gschwind <mike@vlsivie.tuwien.ac.at> ;; Keywords: tex, iso, latin, i18n diff --git a/lisp/international/iso-transl.el b/lisp/international/iso-transl.el index 39fd75ea514..8b5814e577c 100644 --- a/lisp/international/iso-transl.el +++ b/lisp/international/iso-transl.el @@ -1,6 +1,6 @@ ;;; iso-transl.el --- keyboard input for ISO 10646 chars -*- coding: utf-8 -*- -;; Copyright (C) 1987, 1993-1999, 2001-2020 Free Software Foundation, +;; Copyright (C) 1987, 1993-1999, 2001-2021 Free Software Foundation, ;; Inc. ;; Author: Howard Gayle diff --git a/lisp/international/ja-dic-cnv.el b/lisp/international/ja-dic-cnv.el index 5f645b6e8e4..b80590491c1 100644 --- a/lisp/international/ja-dic-cnv.el +++ b/lisp/international/ja-dic-cnv.el @@ -1,6 +1,6 @@ ;;; ja-dic-cnv.el --- convert a Japanese dictionary (SKK-JISYO.L) to Emacs Lisp -;; Copyright (C) 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 2001-2021 Free Software Foundation, Inc. ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 diff --git a/lisp/international/kinsoku.el b/lisp/international/kinsoku.el index 4e9b6b015a5..cd740acc6ac 100644 --- a/lisp/international/kinsoku.el +++ b/lisp/international/kinsoku.el @@ -1,6 +1,6 @@ ;;; kinsoku.el --- `Kinsoku' processing funcs -;; Copyright (C) 1997, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997, 2001-2021 Free Software Foundation, Inc. ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) diff --git a/lisp/international/kkc.el b/lisp/international/kkc.el index 9da9d14b92d..290f4fa0cf1 100644 --- a/lisp/international/kkc.el +++ b/lisp/international/kkc.el @@ -1,6 +1,6 @@ ;;; kkc.el --- Kana Kanji converter -;; Copyright (C) 1997-1998, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997-1998, 2001-2021 Free Software Foundation, Inc. ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) diff --git a/lisp/international/latexenc.el b/lisp/international/latexenc.el index cce5e06002a..e2ee3fb37e3 100644 --- a/lisp/international/latexenc.el +++ b/lisp/international/latexenc.el @@ -1,6 +1,6 @@ ;;; latexenc.el --- guess correct coding system in LaTeX files -*-coding: utf-8 -*- -;; Copyright (C) 2005-2020 Free Software Foundation, Inc. +;; Copyright (C) 2005-2021 Free Software Foundation, Inc. ;; Author: Arne Jørgensen <arne@arnested.dk> ;; Keywords: mule, coding system, latex diff --git a/lisp/international/latin1-disp.el b/lisp/international/latin1-disp.el index f2e35e93672..bda2c51ab9d 100644 --- a/lisp/international/latin1-disp.el +++ b/lisp/international/latin1-disp.el @@ -1,6 +1,6 @@ ;;; latin1-disp.el --- display tables for other ISO 8859 on Latin-1 terminals -*-coding: utf-8;-*- -;; Copyright (C) 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 2000-2021 Free Software Foundation, Inc. ;; Author: Dave Love <fx@gnu.org> ;; Keywords: i18n diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el index e61c66e3328..347e6782590 100644 --- a/lisp/international/mule-cmds.el +++ b/lisp/international/mule-cmds.el @@ -1,6 +1,6 @@ ;;; mule-cmds.el --- commands for multilingual environment -*- lexical-binding:t -*- -;; Copyright (C) 1997-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997-2021 Free Software Foundation, Inc. ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) diff --git a/lisp/international/mule-conf.el b/lisp/international/mule-conf.el index 3b436864f8d..662f211bd28 100644 --- a/lisp/international/mule-conf.el +++ b/lisp/international/mule-conf.el @@ -1,6 +1,6 @@ ;;; mule-conf.el --- configure multilingual environment -;; Copyright (C) 1997-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997-2021 Free Software Foundation, Inc. ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --git a/lisp/international/mule-diag.el b/lisp/international/mule-diag.el index 57e568689e3..d6222685251 100644 --- a/lisp/international/mule-diag.el +++ b/lisp/international/mule-diag.el @@ -1,6 +1,6 @@ ;;; mule-diag.el --- show diagnosis of multilingual environment (Mule) -;; Copyright (C) 1997-1998, 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997-1998, 2000-2021 Free Software Foundation, Inc. ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) diff --git a/lisp/international/mule-util.el b/lisp/international/mule-util.el index 8f316332249..580bd293e73 100644 --- a/lisp/international/mule-util.el +++ b/lisp/international/mule-util.el @@ -1,6 +1,6 @@ ;;; mule-util.el --- utility functions for multilingual environment (mule) -*- lexical-binding:t -*- -;; Copyright (C) 1997-1998, 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997-1998, 2000-2021 Free Software Foundation, Inc. ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) diff --git a/lisp/international/mule.el b/lisp/international/mule.el index ef468927c07..4489abb19de 100644 --- a/lisp/international/mule.el +++ b/lisp/international/mule.el @@ -1,6 +1,6 @@ ;;; mule.el --- basic commands for multilingual environment -;; Copyright (C) 1997-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997-2021 Free Software Foundation, Inc. ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) diff --git a/lisp/international/ogonek.el b/lisp/international/ogonek.el index 37fcda70b37..79e446875da 100644 --- a/lisp/international/ogonek.el +++ b/lisp/international/ogonek.el @@ -1,6 +1,6 @@ ;;; ogonek.el --- change the encoding of Polish diacritics -;; Copyright (C) 1997-1998, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997-1998, 2001-2021 Free Software Foundation, Inc. ;; Author: Włodek Bzyl ;; Ryszard Kubiak diff --git a/lisp/international/quail.el b/lisp/international/quail.el index 39ef6d3bf01..f2ac44a8a60 100644 --- a/lisp/international/quail.el +++ b/lisp/international/quail.el @@ -1,6 +1,6 @@ ;;; quail.el --- provides simple input method for multilingual text -;; Copyright (C) 1997-1998, 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997-1998, 2000-2021 Free Software Foundation, Inc. ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) diff --git a/lisp/international/rfc1843.el b/lisp/international/rfc1843.el index c59538f5469..bd83a7a289b 100644 --- a/lisp/international/rfc1843.el +++ b/lisp/international/rfc1843.el @@ -1,6 +1,6 @@ ;;; rfc1843.el --- HZ (rfc1843) decoding -*- lexical-binding:t -*- -;; Copyright (C) 1998-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998-2021 Free Software Foundation, Inc. ;; Author: Shenghuo Zhu <zsh@cs.rochester.edu> ;; Keywords: news HZ HZ+ mail i18n diff --git a/lisp/international/titdic-cnv.el b/lisp/international/titdic-cnv.el index 2da8635f80b..58c81bfd1f3 100644 --- a/lisp/international/titdic-cnv.el +++ b/lisp/international/titdic-cnv.el @@ -1,6 +1,6 @@ ;;; titdic-cnv.el --- convert cxterm dictionary (TIT format) to Quail package -*- coding:iso-2022-7bit; lexical-binding:t -*- -;; Copyright (C) 1997-1998, 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997-1998, 2000-2021 Free Software Foundation, Inc. ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) diff --git a/lisp/international/ucs-normalize.el b/lisp/international/ucs-normalize.el index 7822450e49b..d1b5c077813 100644 --- a/lisp/international/ucs-normalize.el +++ b/lisp/international/ucs-normalize.el @@ -1,6 +1,6 @@ ;;; ucs-normalize.el --- Unicode normalization NFC/NFD/NFKD/NFKC -;; Copyright (C) 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2009-2021 Free Software Foundation, Inc. ;; Author: Taichi Kawabata <kawabata.taichi@gmail.com> ;; Keywords: unicode, normalization diff --git a/lisp/international/utf-7.el b/lisp/international/utf-7.el index fe676e2635c..e941abb463e 100644 --- a/lisp/international/utf-7.el +++ b/lisp/international/utf-7.el @@ -1,6 +1,6 @@ ;;; utf-7.el --- utf-7 coding system -;; Copyright (C) 2003-2020 Free Software Foundation, Inc. +;; Copyright (C) 2003-2021 Free Software Foundation, Inc. ;; Author: Dave Love <fx@gnu.org> ;; Keywords: i18n, mail diff --git a/lisp/international/utf7.el b/lisp/international/utf7.el index 6df74d0d8da..d78e3975e64 100644 --- a/lisp/international/utf7.el +++ b/lisp/international/utf7.el @@ -1,6 +1,6 @@ ;;; utf7.el --- UTF-7 encoding/decoding for Emacs -*- lexical-binding:t -*- -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: Jon K Hellan <hellan@acm.org> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/isearch.el b/lisp/isearch.el index 13173a28579..fefdd16d25b 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el @@ -1,6 +1,6 @@ ;;; isearch.el --- incremental search minor mode -*- lexical-binding: t -*- -;; Copyright (C) 1992-1997, 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1992-1997, 1999-2021 Free Software Foundation, Inc. ;; Author: Daniel LaLiberte <liberte@cs.uiuc.edu> ;; Maintainer: emacs-devel@gnu.org @@ -519,7 +519,7 @@ This is like `describe-bindings', but displays only Isearch keys." (defvar isearch-menu-bar-yank-map (let ((map (make-sparse-keymap))) (define-key map [isearch-yank-pop] - '(menu-item "Previous kill" isearch-yank-pop + '(menu-item "Previous kill" isearch-yank-pop-only :help "Replace previous yanked kill on search string")) (define-key map [isearch-yank-kill] '(menu-item "Current kill" isearch-yank-kill @@ -734,7 +734,7 @@ This is like `describe-bindings', but displays only Isearch keys." (define-key map "\M-n" 'isearch-ring-advance) (define-key map "\M-p" 'isearch-ring-retreat) - (define-key map "\M-y" 'isearch-yank-pop) + (define-key map "\M-y" 'isearch-yank-pop-only) (define-key map "\M-\t" 'isearch-complete) @@ -1019,7 +1019,7 @@ Type \\[isearch-yank-until-char] to yank from point until the next instance of a Type \\[isearch-yank-line] to yank rest of line onto end of search string\ and search for it. Type \\[isearch-yank-kill] to yank the last string of killed text. -Type \\[isearch-yank-pop] to replace string just yanked into search prompt +Type \\[isearch-yank-pop-only] to replace string just yanked into search prompt with string killed before it. Type \\[isearch-quote-char] to quote control character to search for it. Type \\[isearch-char-by-name] to add a character to search by Unicode name,\ @@ -2491,9 +2491,13 @@ If search string is empty, just beep." (isearch-yank-string (current-kill 0))) (defun isearch-yank-pop () - "Replace just-yanked search string with previously killed string." + "Replace just-yanked search string with previously killed string. +Unlike `isearch-yank-pop-only', when this command is called not immediately +after a `isearch-yank-kill' or a `isearch-yank-pop', it activates the +minibuffer to read a string from the `kill-ring' as `yank-pop' does." (interactive) - (if (not (memq last-command '(isearch-yank-kill isearch-yank-pop))) + (if (not (memq last-command '(isearch-yank-kill + isearch-yank-pop isearch-yank-pop-only))) ;; Yank string from kill-ring-browser. (with-isearch-suspended (let ((string (read-from-kill-ring))) @@ -2509,6 +2513,23 @@ If search string is empty, just beep." (isearch-pop-state) (isearch-yank-string (current-kill 1)))) +(defun isearch-yank-pop-only () + "Replace just-yanked search string with previously killed string. +Unlike `isearch-yank-pop', when this command is called not immediately +after a `isearch-yank-kill' or a `isearch-yank-pop-only', it only pops +the last killed string instead of activating the minibuffer to read +a string from the `kill-ring' as `yank-pop' does." + (interactive) + (if (not (memq last-command '(isearch-yank-kill + isearch-yank-pop isearch-yank-pop-only))) + ;; Fall back on `isearch-yank-kill' for the benefits of people + ;; who are used to the old behavior of `M-y' in isearch mode. + ;; In future, `M-y' could be changed from `isearch-yank-pop-only' + ;; to `isearch-yank-pop' that uses the kill-ring-browser. + (isearch-yank-kill) + (isearch-pop-state) + (isearch-yank-string (current-kill 1)))) + (defun isearch-yank-x-selection () "Pull current X selection into search string." (interactive) diff --git a/lisp/isearchb.el b/lisp/isearchb.el index f75a4b40336..3713879e3b6 100644 --- a/lisp/isearchb.el +++ b/lisp/isearchb.el @@ -1,6 +1,6 @@ ;;; isearchb --- a marriage between iswitchb and isearch -;; Copyright (C) 2004-2020 Free Software Foundation, Inc. +;; Copyright (C) 2004-2021 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/jit-lock.el b/lisp/jit-lock.el index 8b3384ae827..d169e40b817 100644 --- a/lisp/jit-lock.el +++ b/lisp/jit-lock.el @@ -1,6 +1,6 @@ ;;; jit-lock.el --- just-in-time fontification -*- lexical-binding: t -*- -;; Copyright (C) 1998, 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998, 2000-2021 Free Software Foundation, Inc. ;; Author: Gerd Moellmann <gerd@gnu.org> ;; Keywords: faces files diff --git a/lisp/jka-cmpr-hook.el b/lisp/jka-cmpr-hook.el index 79d81a2559b..3c7d2a057d5 100644 --- a/lisp/jka-cmpr-hook.el +++ b/lisp/jka-cmpr-hook.el @@ -1,6 +1,6 @@ ;;; jka-cmpr-hook.el --- preloaded code to enable jka-compr.el -;; Copyright (C) 1993-1995, 1997, 1999-2000, 2002-2020 Free Software +;; Copyright (C) 1993-1995, 1997, 1999-2000, 2002-2021 Free Software ;; Foundation, Inc. ;; Author: Jay K. Adams <jka@ece.cmu.edu> diff --git a/lisp/jka-compr.el b/lisp/jka-compr.el index e1a3058695a..877f2eb825a 100644 --- a/lisp/jka-compr.el +++ b/lisp/jka-compr.el @@ -1,6 +1,6 @@ ;;; jka-compr.el --- reading/writing/loading compressed files -;; Copyright (C) 1993-1995, 1997, 1999-2020 Free Software Foundation, +;; Copyright (C) 1993-1995, 1997, 1999-2021 Free Software Foundation, ;; Inc. ;; Author: Jay K. Adams <jka@ece.cmu.edu> diff --git a/lisp/json.el b/lisp/json.el index 5f512b94cdc..f5659d81efa 100644 --- a/lisp/json.el +++ b/lisp/json.el @@ -1,6 +1,6 @@ ;;; json.el --- JavaScript Object Notation parser / generator -*- lexical-binding: t -*- -;; Copyright (C) 2006-2020 Free Software Foundation, Inc. +;; Copyright (C) 2006-2021 Free Software Foundation, Inc. ;; Author: Theresa O'Connor <ted@oconnor.cx> ;; Version: 1.5 diff --git a/lisp/jsonrpc.el b/lisp/jsonrpc.el index 1aebeae5e16..7f5aa8295fe 100644 --- a/lisp/jsonrpc.el +++ b/lisp/jsonrpc.el @@ -1,6 +1,6 @@ ;;; jsonrpc.el --- JSON-RPC library -*- lexical-binding: t; -*- -;; Copyright (C) 2018-2020 Free Software Foundation, Inc. +;; Copyright (C) 2018-2021 Free Software Foundation, Inc. ;; Author: João Távora <joaotavora@gmail.com> ;; Keywords: processes, languages, extensions diff --git a/lisp/kermit.el b/lisp/kermit.el index f2607bfcf4c..fdab7e5a505 100644 --- a/lisp/kermit.el +++ b/lisp/kermit.el @@ -1,6 +1,6 @@ ;;; kermit.el --- additions to shell mode for use with kermit -*- lexical-binding: t -*- -;; Copyright (C) 1988, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1988, 2001-2021 Free Software Foundation, Inc. ;; Author: Jeff Norden <jeff@colgate.csnet> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/kmacro.el b/lisp/kmacro.el index 17db48c3298..bb8dacf4f48 100644 --- a/lisp/kmacro.el +++ b/lisp/kmacro.el @@ -1,6 +1,6 @@ ;;; kmacro.el --- enhanced keyboard macros -*- lexical-binding: t -*- -;; Copyright (C) 2002-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002-2021 Free Software Foundation, Inc. ;; Author: Kim F. Storm <storm@cua.dk> ;; Keywords: keyboard convenience diff --git a/lisp/language/china-util.el b/lisp/language/china-util.el index 04d40326543..4bc2eaa2cdd 100644 --- a/lisp/language/china-util.el +++ b/lisp/language/china-util.el @@ -1,6 +1,6 @@ ;;; china-util.el --- utilities for Chinese -*- coding: utf-8 -*- -;; Copyright (C) 1995, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1995, 2001-2021 Free Software Foundation, Inc. ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) diff --git a/lisp/language/chinese.el b/lisp/language/chinese.el index 4389db961d8..6b434feb137 100644 --- a/lisp/language/chinese.el +++ b/lisp/language/chinese.el @@ -1,6 +1,6 @@ ;;; chinese.el --- support for Chinese -*- coding: utf-8; -*- -;; Copyright (C) 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 2001-2021 Free Software Foundation, Inc. ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) diff --git a/lisp/language/cyril-util.el b/lisp/language/cyril-util.el index ce60d1a3ad4..72ceffdf0d6 100644 --- a/lisp/language/cyril-util.el +++ b/lisp/language/cyril-util.el @@ -1,6 +1,6 @@ ;;; cyril-util.el --- utilities for Cyrillic scripts -;; Copyright (C) 1997-1998, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997-1998, 2001-2021 Free Software Foundation, Inc. ;; Keywords: mule, multilingual, Cyrillic diff --git a/lisp/language/cyrillic.el b/lisp/language/cyrillic.el index c19637010a2..c491644d57c 100644 --- a/lisp/language/cyrillic.el +++ b/lisp/language/cyrillic.el @@ -1,6 +1,6 @@ ;;; cyrillic.el --- support for Cyrillic -*- coding: utf-8; -*- -;; Copyright (C) 1997-1998, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997-1998, 2001-2021 Free Software Foundation, Inc. ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) diff --git a/lisp/language/czech.el b/lisp/language/czech.el index e6923426b52..e449a7e9279 100644 --- a/lisp/language/czech.el +++ b/lisp/language/czech.el @@ -1,6 +1,6 @@ ;;; czech.el --- support for Czech -*- coding: utf-8; lexical-binding: t -*- -;; Copyright (C) 1998, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998, 2001-2021 Free Software Foundation, Inc. ;; Author: Milan Zamazal <pdm@zamazal.org> ;; Maintainer: Pavel Janík <Pavel@Janik.cz> diff --git a/lisp/language/english.el b/lisp/language/english.el index b7af84c8f75..dfbec85792f 100644 --- a/lisp/language/english.el +++ b/lisp/language/english.el @@ -1,6 +1,6 @@ ;;; english.el --- support for English -;; Copyright (C) 1997, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997, 2001-2021 Free Software Foundation, Inc. ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, ;; 2006, 2007, 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) diff --git a/lisp/language/ethio-util.el b/lisp/language/ethio-util.el index 263ddb235e3..174b9ecfda2 100644 --- a/lisp/language/ethio-util.el +++ b/lisp/language/ethio-util.el @@ -1,6 +1,6 @@ ;;; ethio-util.el --- utilities for Ethiopic -*- coding: utf-8-emacs; -*- -;; Copyright (C) 1997-1998, 2002-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997-1998, 2002-2021 Free Software Foundation, Inc. ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, ;; 2006, 2007, 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) diff --git a/lisp/language/ethiopic.el b/lisp/language/ethiopic.el index 1f8b9b18d65..1e409e3dcf8 100644 --- a/lisp/language/ethiopic.el +++ b/lisp/language/ethiopic.el @@ -1,6 +1,6 @@ ;;; ethiopic.el --- support for Ethiopic -*- coding: utf-8-emacs; -*- -;; Copyright (C) 1997, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997, 2001-2021 Free Software Foundation, Inc. ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) diff --git a/lisp/language/european.el b/lisp/language/european.el index 1f9a15333ba..1f27ff0c73b 100644 --- a/lisp/language/european.el +++ b/lisp/language/european.el @@ -1,6 +1,6 @@ ;;; european.el --- support for European languages -*- coding: utf-8; -*- -;; Copyright (C) 1997-1998, 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997-1998, 2000-2021 Free Software Foundation, Inc. ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) diff --git a/lisp/language/georgian.el b/lisp/language/georgian.el index 53c994bd76f..321ef43f5f2 100644 --- a/lisp/language/georgian.el +++ b/lisp/language/georgian.el @@ -1,6 +1,6 @@ ;;; georgian.el --- language support for Georgian -*- lexical-binding: t -*- -;; Copyright (C) 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 2001-2021 Free Software Foundation, Inc. ;; Author: Dave Love <fx@gnu.org> ;; Keywords: i18n diff --git a/lisp/language/greek.el b/lisp/language/greek.el index 15ae5f42f94..403a87d2535 100644 --- a/lisp/language/greek.el +++ b/lisp/language/greek.el @@ -1,6 +1,6 @@ ;;; greek.el --- support for Greek -*- lexical-binding: t -*- -;; Copyright (C) 2002, 2013-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2013-2021 Free Software Foundation, Inc. ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) diff --git a/lisp/language/hanja-util.el b/lisp/language/hanja-util.el index f38dead5a23..313fc63bebd 100644 --- a/lisp/language/hanja-util.el +++ b/lisp/language/hanja-util.el @@ -1,6 +1,6 @@ ;;; hanja-util.el --- Korean Hanja util module -*- coding: utf-8 -*- -;; Copyright (C) 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2008-2021 Free Software Foundation, Inc. ;; Author: Jihyun Cho <jihyun.jo@gmail.com> ;; Keywords: multilingual, input method, Korean, Hanja diff --git a/lisp/language/hebrew.el b/lisp/language/hebrew.el index 08b70abfc29..9f9a14a0dc0 100644 --- a/lisp/language/hebrew.el +++ b/lisp/language/hebrew.el @@ -1,6 +1,6 @@ ;;; hebrew.el --- support for Hebrew -*- coding: utf-8 -*- -;; Copyright (C) 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 2001-2021 Free Software Foundation, Inc. ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) diff --git a/lisp/language/ind-util.el b/lisp/language/ind-util.el index 62885227f10..4bd1cd76a6d 100644 --- a/lisp/language/ind-util.el +++ b/lisp/language/ind-util.el @@ -1,6 +1,6 @@ ;;; ind-util.el --- Transliteration and Misc. Tools for Indian Languages -*- coding: utf-8-emacs; -*- -;; Copyright (C) 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 2001-2021 Free Software Foundation, Inc. ;; Keywords: multilingual, Indian, Devanagari diff --git a/lisp/language/indian.el b/lisp/language/indian.el index 657ad6915eb..b92fda53648 100644 --- a/lisp/language/indian.el +++ b/lisp/language/indian.el @@ -1,6 +1,6 @@ ;;; indian.el --- Indian languages support -*- coding: utf-8; -*- -;; Copyright (C) 1997, 1999, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997, 1999, 2001-2021 Free Software Foundation, Inc. ;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --git a/lisp/language/japan-util.el b/lisp/language/japan-util.el index 56052b1395c..9dce17c4967 100644 --- a/lisp/language/japan-util.el +++ b/lisp/language/japan-util.el @@ -1,6 +1,6 @@ ;;; japan-util.el --- utilities for Japanese -;; Copyright (C) 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 2001-2021 Free Software Foundation, Inc. ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) diff --git a/lisp/language/japanese.el b/lisp/language/japanese.el index a517b4ea8eb..8c724ee9667 100644 --- a/lisp/language/japanese.el +++ b/lisp/language/japanese.el @@ -1,6 +1,6 @@ ;;; japanese.el --- support for Japanese -;; Copyright (C) 1997, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997, 2001-2021 Free Software Foundation, Inc. ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) diff --git a/lisp/language/korea-util.el b/lisp/language/korea-util.el index 36e1d20a22f..eb7b85bce81 100644 --- a/lisp/language/korea-util.el +++ b/lisp/language/korea-util.el @@ -1,6 +1,6 @@ ;;; korea-util.el --- utilities for Korean -;; Copyright (C) 1997, 1999, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997, 1999, 2001-2021 Free Software Foundation, Inc. ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, ;; 2007, 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) diff --git a/lisp/language/korean.el b/lisp/language/korean.el index 9bd11b9b9ea..997b8ae1319 100644 --- a/lisp/language/korean.el +++ b/lisp/language/korean.el @@ -1,6 +1,6 @@ ;;; korean.el --- support for Korean -*- coding: utf-8 -*- -;; Copyright (C) 1998, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998, 2001-2021 Free Software Foundation, Inc. ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) diff --git a/lisp/language/lao-util.el b/lisp/language/lao-util.el index fa4c2f7f891..59c9850b1a1 100644 --- a/lisp/language/lao-util.el +++ b/lisp/language/lao-util.el @@ -1,6 +1,6 @@ ;;; lao-util.el --- utilities for Lao -*- coding: utf-8; -*- -;; Copyright (C) 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 2001-2021 Free Software Foundation, Inc. ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, ;; 2007, 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) diff --git a/lisp/language/lao.el b/lisp/language/lao.el index ad96fe3c70c..44fe8d230db 100644 --- a/lisp/language/lao.el +++ b/lisp/language/lao.el @@ -1,6 +1,6 @@ ;;; lao.el --- support for Lao -*- coding: utf-8 -*- -;; Copyright (C) 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 2001-2021 Free Software Foundation, Inc. ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, ;; 2007, 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) diff --git a/lisp/language/romanian.el b/lisp/language/romanian.el index 9f1c67765e1..2112df7b150 100644 --- a/lisp/language/romanian.el +++ b/lisp/language/romanian.el @@ -1,6 +1,6 @@ ;;; romanian.el --- support for Romanian -*- coding: utf-8; lexical-binding: t -*- -;; Copyright (C) 1998, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998, 2001-2021 Free Software Foundation, Inc. ;; Author: Dan Nicolaescu <done@ece.arizona.edu> ;; Keywords: multilingual, Romanian, i18n diff --git a/lisp/language/slovak.el b/lisp/language/slovak.el index c42a872574d..2a738467d20 100644 --- a/lisp/language/slovak.el +++ b/lisp/language/slovak.el @@ -1,6 +1,6 @@ ;;; slovak.el --- support for Slovak -*- coding: utf-8; lexical-binding: t -*- -;; Copyright (C) 1998, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998, 2001-2021 Free Software Foundation, Inc. ;; Authors: Tibor Šimko <tibor.simko@fmph.uniba.sk>, ;; Milan Zamazal <pdm@zamazal.org> diff --git a/lisp/language/tai-viet.el b/lisp/language/tai-viet.el index 039e478b162..17abf136f7f 100644 --- a/lisp/language/tai-viet.el +++ b/lisp/language/tai-viet.el @@ -1,6 +1,6 @@ ;;; tai-viet.el --- support for Tai Viet -*- coding: utf-8; lexical-binding: t -*- -;; Copyright (C) 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2007-2021 Free Software Foundation, Inc. ;; Copyright (C) 2007, 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H13PRO009 diff --git a/lisp/language/thai-util.el b/lisp/language/thai-util.el index b856e67df1e..f9c57e8ca83 100644 --- a/lisp/language/thai-util.el +++ b/lisp/language/thai-util.el @@ -1,6 +1,6 @@ ;;; thai-util.el --- utilities for Thai -*- coding: utf-8; -*- -;; Copyright (C) 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 2000-2021 Free Software Foundation, Inc. ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) diff --git a/lisp/language/thai.el b/lisp/language/thai.el index 800657b99af..44a9a319330 100644 --- a/lisp/language/thai.el +++ b/lisp/language/thai.el @@ -1,6 +1,6 @@ ;;; thai.el --- support for Thai -*- coding: utf-8 -*- -;; Copyright (C) 1997-1998, 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997-1998, 2000-2021 Free Software Foundation, Inc. ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) diff --git a/lisp/language/tibet-util.el b/lisp/language/tibet-util.el index 04369f6af87..e741af18740 100644 --- a/lisp/language/tibet-util.el +++ b/lisp/language/tibet-util.el @@ -1,6 +1,6 @@ ;;; tibet-util.el --- utilities for Tibetan -*- coding: utf-8-emacs; -*- -;; Copyright (C) 1997, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997, 2001-2021 Free Software Foundation, Inc. ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) diff --git a/lisp/language/tibetan.el b/lisp/language/tibetan.el index bbd4729f6c5..5b8e29c2c7a 100644 --- a/lisp/language/tibetan.el +++ b/lisp/language/tibetan.el @@ -1,6 +1,6 @@ ;;; tibetan.el --- support for Tibetan language -*- coding: utf-8-emacs; -*- -;; Copyright (C) 1997, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997, 2001-2021 Free Software Foundation, Inc. ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, ;; 2006, 2007, 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) diff --git a/lisp/language/utf-8-lang.el b/lisp/language/utf-8-lang.el index 9e59f61ee10..f23b3889cc4 100644 --- a/lisp/language/utf-8-lang.el +++ b/lisp/language/utf-8-lang.el @@ -1,6 +1,6 @@ ;;; utf-8-lang.el --- generic UTF-8 language environment -*- lexical-binding: t -*- -;; Copyright (C) 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 2001-2021 Free Software Foundation, Inc. ;; Author: Dave Love <fx@gnu.org> ;; Keywords: i18n diff --git a/lisp/language/viet-util.el b/lisp/language/viet-util.el index bd9aa596d2c..177b04bc473 100644 --- a/lisp/language/viet-util.el +++ b/lisp/language/viet-util.el @@ -1,6 +1,6 @@ ;;; viet-util.el --- utilities for Vietnamese -*- coding: utf-8; -*- -;; Copyright (C) 1998, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998, 2001-2021 Free Software Foundation, Inc. ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) diff --git a/lisp/language/vietnamese.el b/lisp/language/vietnamese.el index c1cef962865..7980041e2b3 100644 --- a/lisp/language/vietnamese.el +++ b/lisp/language/vietnamese.el @@ -1,6 +1,6 @@ ;;; vietnamese.el --- support for Vietnamese -*- coding: utf-8; lexical-binding: t -*- -;; Copyright (C) 1998, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998, 2001-2021 Free Software Foundation, Inc. ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el index ed1b2c7714b..c6fa497c213 100644 --- a/lisp/ldefs-boot.el +++ b/lisp/ldefs-boot.el @@ -1,4 +1,4 @@ -;;; loaddefs.el --- automatically extracted autoloads +;;; loaddefs.el --- automatically extracted autoloads -*- lexical-binding: t -*- ;; ;;; Code: @@ -1202,14 +1202,16 @@ The variables are: Variables you assign: array-max-row: The number of rows in the array. array-max-column: The number of columns in the array. - array-columns-per-line: The number of columns in the array per line of buffer. + array-columns-per-line: The number of columns in the array + per line of buffer. array-field-width: The width of each field, in characters. array-rows-numbered: A logical variable describing whether to ignore - row numbers in the buffer. + row numbers in the buffer. Variables which are calculated: array-line-length: The number of characters in a buffer line. - array-lines-per-row: The number of buffer lines used to display each row. + array-lines-per-row: The number of buffer lines used to + display each row. The following commands are available (an asterisk indicates it may take a numeric prefix argument): @@ -1219,17 +1221,17 @@ take a numeric prefix argument): * \\[array-next-row] Move down one row. * \\[array-previous-row] Move up one row. - * \\[array-copy-forward] Copy the current field into the column to the right. - * \\[array-copy-backward] Copy the current field into the column to the left. - * \\[array-copy-down] Copy the current field into the row below. - * \\[array-copy-up] Copy the current field into the row above. + * \\[array-copy-forward] Copy current field into the column to the right. + * \\[array-copy-backward] Copy current field into the column to the left. + * \\[array-copy-down] Copy current field into the row below. + * \\[array-copy-up] Copy current field into the row above. - * \\[array-copy-column-forward] Copy the current column into the column to the right. - * \\[array-copy-column-backward] Copy the current column into the column to the left. + * \\[array-copy-column-forward] Copy current column into the column to the right. + * \\[array-copy-column-backward] Copy current column into the column to the left. * \\[array-copy-row-down] Copy the current row into the row below. * \\[array-copy-row-up] Copy the current row into the row above. - \\[array-fill-rectangle] Copy the field at mark into every cell with row and column + \\[array-fill-rectangle] Copy field at mark into every cell with row and column between that of point and mark. \\[array-what-position] Display the current array row and column. @@ -1240,7 +1242,7 @@ take a numeric prefix argument): \\[array-expand-rows] Expand the array (remove row numbers and newlines inside rows) - \\[array-display-local-variables] Display the current values of local variables. + \\[array-display-local-variables] Display current values of local variables. Entering array mode calls the function `array-mode-hook'. @@ -1510,8 +1512,9 @@ let-binding.") (autoload 'authinfo-mode "auth-source" "\ Mode for editing .authinfo/.netrc files. -This is just like `fundamental-mode', but hides passwords. The -passwords are revealed when point moved into the password. +This is just like `fundamental-mode', but has basic syntax +highlighting and hides passwords. Passwords are revealed when +point is moved into the passwords (see `authinfo-hide-elements'). \\{authinfo-mode-map} @@ -4877,8 +4880,18 @@ DEFAULT-BODY, if present, is used as the body of a default method. (autoload 'cl-defmethod "cl-generic" "\ Define a new method for generic function NAME. -I.e. it defines the implementation of NAME to use for invocations where the -values of the dispatch arguments match the specified TYPEs. +This it defines an implementation of NAME to use for invocations +of specific types of arguments. + +ARGS is a list of dispatch arguments (see `cl-defun'), but where +each variable element is either just a single variable name VAR, +or a list on the form (VAR TYPE). + +For instance: + + (cl-defmethod foo (bar (format-string string) &optional zot) + (format format-string bar)) + The dispatch arguments have to be among the mandatory arguments, and all methods of NAME have to use the same set of arguments for dispatch. Each dispatch argument and TYPE are specified in ARGS where the corresponding @@ -5399,7 +5412,7 @@ You might also use mode hooks to specify it in certain modes, like this: (lambda () (unless (or (file-exists-p \"makefile\") (file-exists-p \"Makefile\")) - (set (make-local-variable \\='compile-command) + (setq-local compile-command (concat \"make -k \" (if buffer-file-name (shell-quote-argument @@ -6643,14 +6656,13 @@ or call the function `global-cwarn-mode'.") (autoload 'global-cwarn-mode "cwarn" "\ Toggle Cwarn mode in all buffers. With prefix ARG, enable Global Cwarn mode if ARG is positive; -otherwise, disable it. If called from Lisp, enable the mode if -ARG is omitted or nil. +otherwise, disable it. If called from Lisp, enable the mode if ARG is +omitted or nil. Cwarn mode is enabled in all buffers where `turn-on-cwarn-mode-if-enabled' would do it. -See `cwarn-mode' for more information on -Cwarn mode. +See `cwarn-mode' for more information on Cwarn mode. \(fn &optional ARG)" t nil) @@ -7538,6 +7550,90 @@ Major mode for editing the diary file. ;;;*** +;;;### (autoloads nil "dictionary" "net/dictionary.el" (0 0 0 0)) +;;; Generated autoloads from net/dictionary.el + +(autoload 'dictionary-mode "dictionary" "\ +Mode for searching a dictionary. +This is a mode for searching a dictionary server implementing the +protocol defined in RFC 2229. + +This is a quick reference to this mode describing the default key bindings: + +* q close the dictionary buffer +* h display this help information +* s ask for a new word to search +* d search the word at point +* n or Tab place point to the next link +* p or S-Tab place point to the prev link + +* m ask for a pattern and list all matching words. +* D select the default dictionary +* M select the default search strategy + +* Return or Button2 visit that link +" nil nil) + +(autoload 'dictionary "dictionary" "\ +Create a new dictonary buffer and install dictionary-mode." t nil) + +(autoload 'dictionary-search "dictionary" "\ +Search the WORD in DICTIONARY if given or in all if nil. +It presents the selection or word at point as default input and +allows editing it. + +\(fn WORD &optional DICTIONARY)" t nil) + +(autoload 'dictionary-lookup-definition "dictionary" "\ +Unconditionally lookup the word at point." t nil) + +(autoload 'dictionary-match-words "dictionary" "\ +Search PATTERN in current default dictionary using default strategy. + +\(fn &optional PATTERN &rest IGNORED)" t nil) + +(autoload 'dictionary-mouse-popup-matching-words "dictionary" "\ +Display entries matching the word at the cursor retrieved using EVENT. + +\(fn EVENT)" t nil) + +(autoload 'dictionary-popup-matching-words "dictionary" "\ +Display entries matching WORD or the current word if not given. + +\(fn &optional WORD)" t nil) + +(autoload 'dictionary-tooltip-mode "dictionary" "\ +Display tooltips for the current word. + +This function can be used to enable or disable the tooltip mode +for the current buffer (based on ARG). If global-tooltip-mode is +active it will overwrite that mode for the current buffer. + +\(fn &optional ARG)" t nil) + +(autoload 'global-dictionary-tooltip-mode "dictionary" "\ +Enable/disable dictionary-tooltip-mode for all buffers. + +Internally it provides a default for the dictionary-tooltip-mode. +It can be overwritten for each buffer using dictionary-tooltip-mode. + +Note: (global-dictionary-tooltip-mode 0) will not disable the mode +any buffer where (dictionary-tooltip-mode 1) has been called. + +\(fn &optional ARG)" t nil) + +(register-definition-prefixes "dictionary" '("dictionary-" "global-dictionary-tooltip-mode")) + +;;;*** + +;;;### (autoloads nil "dictionary-connection" "net/dictionary-connection.el" +;;;;;; (0 0 0 0)) +;;; Generated autoloads from net/dictionary-connection.el + +(register-definition-prefixes "dictionary-connection" '("dictionary-connection-")) + +;;;*** + ;;;### (autoloads nil "diff" "vc/diff.el" (0 0 0 0)) ;;; Generated autoloads from vc/diff.el @@ -8039,9 +8135,9 @@ or call the function `global-display-fill-column-indicator-mode'.") (autoload 'global-display-fill-column-indicator-mode "display-fill-column-indicator" "\ Toggle Display-Fill-Column-Indicator mode in all buffers. -With prefix ARG, enable Global Display-Fill-Column-Indicator mode if ARG is positive; -otherwise, disable it. If called from Lisp, enable the mode if -ARG is omitted or nil. +With prefix ARG, enable Global Display-Fill-Column-Indicator mode if +ARG is positive; otherwise, disable it. If called from Lisp, enable +the mode if ARG is omitted or nil. Display-Fill-Column-Indicator mode is enabled in all buffers where `display-fill-column-indicator--turn-on' would do it. @@ -8049,8 +8145,8 @@ Display-Fill-Column-Indicator mode is enabled in all buffers where See `display-fill-column-indicator-mode' for more information on Display-Fill-Column-Indicator mode. -`global-display-fill-column-indicator-modes' is used to control which modes -this minor mode is used in. +`global-display-fill-column-indicator-modes' is used to control +which modes this minor mode is used in. \(fn &optional ARG)" t nil) @@ -8113,9 +8209,9 @@ or call the function `global-display-line-numbers-mode'.") (autoload 'global-display-line-numbers-mode "display-line-numbers" "\ Toggle Display-Line-Numbers mode in all buffers. -With prefix ARG, enable Global Display-Line-Numbers mode if ARG is positive; -otherwise, disable it. If called from Lisp, enable the mode if -ARG is omitted or nil. +With prefix ARG, enable Global Display-Line-Numbers mode if ARG is +positive; otherwise, disable it. If called from Lisp, enable the mode +if ARG is omitted or nil. Display-Line-Numbers mode is enabled in all buffers where `display-line-numbers--turn-on' would do it. @@ -8319,6 +8415,9 @@ strings when pressed twice. See `double-map' for details. (autoload 'dunnet "dunnet" "\ Switch to *dungeon* buffer and start game." t nil) +(autoload 'dun-batch "dunnet" "\ +Start `dunnet' in batch mode." nil nil) + (register-definition-prefixes "dunnet" '("dun" "obj-special")) ;;;*** @@ -11204,8 +11303,8 @@ Search through all files listed in tags table for match for REGEXP. Stops when a match is found. To continue searching for next match, use command \\[tags-loop-continue]. -If FILES if non-nil should be a list or an iterator returning the files to search. -The search will be restricted to these files. +If FILES if non-nil should be a list or an iterator returning the +files to search. The search will be restricted to these files. Also see the documentation of the `tags-file-name' variable. @@ -11887,13 +11986,13 @@ Set the base remapping of FACE in the current buffer to SPECS. This causes the remappings specified by `face-remap-add-relative' to apply on top of the face specification given by SPECS. -The remaining arguments, SPECS, should form a list of faces. -Each list element should be either a face name or a property list +The remaining arguments, SPECS, specify the base of the remapping. +Each one of SPECS should be either a face name or a property list of face attribute/value pairs, like in a `face' text property. -If SPECS is empty, call `face-remap-reset-base' to use the normal -definition of FACE as the base remapping; note that this is -different from SPECS containing a single value nil, which means +If SPECS is empty or a single face `eq' to FACE, call `face-remap-reset-base' +to use the normal definition of FACE as the base remapping; note that +this is different from SPECS containing a single value nil, which means not to inherit from the global definition of FACE at all. \(fn FACE &rest SPECS)" nil nil) @@ -12101,10 +12200,10 @@ internally by feedmail): after-run (the queue has just been run, possibly sending messages) WHAT-EVENT is used as a key into the table `feedmail-queue-reminder-alist'. If -the associated value is a function, it is called without arguments and is expected -to perform the reminder activity. You can supply your own reminder functions -by redefining `feedmail-queue-reminder-alist'. If you don't want any reminders, -you can set `feedmail-queue-reminder-alist' to nil. +the associated value is a function, it is called without arguments and is +expected to perform the reminder activity. You can supply your own reminder +functions by redefining `feedmail-queue-reminder-alist'. If you don't want any +reminders, you can set `feedmail-queue-reminder-alist' to nil. \(fn &optional WHAT-EVENT)" t nil) @@ -12883,7 +12982,7 @@ diagnostics at BEG. (autoload 'flymake-diag-region "flymake" "\ Compute BUFFER's region (BEG . END) corresponding to LINE and COL. If COL is nil, return a region just for LINE. Return nil if the -region is invalid. +region is invalid. This function saves match data. \(fn BUFFER LINE &optional COL)" nil nil) @@ -13261,7 +13360,10 @@ the symbol `delete', remove those %-specs from the result; otherwise do the same as for the symbol `ignore', but also leave any occurrences of \"%%\" in FORMAT verbatim in the result. -\(fn FORMAT SPECIFICATION &optional IGNORE-MISSING)" nil nil) +If SPLIT, instead of returning a single string, a list of strings +is returned, where each format spec is its own element. + +\(fn FORMAT SPECIFICATION &optional IGNORE-MISSING SPLIT)" nil nil) (register-definition-prefixes "format-spec" '("format-spec-")) @@ -14950,14 +15052,13 @@ or call the function `global-goto-address-mode'.") (autoload 'global-goto-address-mode "goto-addr" "\ Toggle Goto-Address mode in all buffers. With prefix ARG, enable Global Goto-Address mode if ARG is positive; -otherwise, disable it. If called from Lisp, enable the mode if -ARG is omitted or nil. +otherwise, disable it. If called from Lisp, enable the mode if ARG +is omitted or nil. Goto-Address mode is enabled in all buffers where `goto-addr-mode--turn-on' would do it. -See `goto-address-mode' for more information on -Goto-Address mode. +See `goto-address-mode' for more information on Goto-Address mode. \(fn &optional ARG)" t nil) @@ -15041,7 +15142,7 @@ List of hook functions run by `grep-process-setup' (see `run-hooks').") (custom-autoload 'grep-setup-hook "grep" t) -(defconst grep-regexp-alist `((,(concat "^\\(?:" "\\(?1:[^\0\n]+\\)\\(?3:\0\\)\\(?2:[0-9]+\\):" "\\|" "\\(?1:" "\\(?:[a-zA-Z]:\\)?" "[^\n:]+?[^\n/:]\\):[\11 ]*\\(?2:[1-9][0-9]*\\)[\11 ]*:" "\\)") 1 2 (,(lambda nil (when grep-highlight-matches (let* ((beg (match-end 0)) (end (save-excursion (goto-char beg) (line-end-position))) (mbeg (text-property-any beg end 'font-lock-face grep-match-face))) (when mbeg (- mbeg beg))))) \, (lambda nil (when grep-highlight-matches (let* ((beg (match-end 0)) (end (save-excursion (goto-char beg) (line-end-position))) (mbeg (text-property-any beg end 'font-lock-face grep-match-face)) (mend (and mbeg (next-single-property-change mbeg 'font-lock-face nil end)))) (when mend (- mend beg)))))) nil nil (3 '(face nil display ":"))) ("^Binary file \\(.+\\) matches$" 1 nil nil 0 1)) "\ +(defconst grep-regexp-alist `((,(concat "^\\(?:" "\\(?1:[^\0\n]+\\)\\(?3:\0\\)\\(?2:[0-9]+\\):" "\\|" "\\(?1:" "\\(?:[a-zA-Z]:\\)?" "[^\n:]+?[^\n/:]\\):[\11 ]*\\(?2:[1-9][0-9]*\\)[\11 ]*:" "\\)") 1 2 (,(lambda nil (when grep-highlight-matches (let* ((beg (match-end 0)) (end (save-excursion (goto-char beg) (line-end-position))) (mbeg (text-property-any beg end 'font-lock-face grep-match-face))) (when mbeg (- mbeg beg))))) \, (lambda nil (when grep-highlight-matches (let* ((beg (match-end 0)) (end (save-excursion (goto-char beg) (line-end-position))) (mbeg (text-property-any beg end 'font-lock-face grep-match-face)) (mend (and mbeg (next-single-property-change mbeg 'font-lock-face nil end)))) (when mend (- mend beg)))))) nil nil (3 '(face nil display ":"))) ("^Binary file \\(.+\\) matches" 1 nil nil 0 1)) "\ Regexp used to match grep hits. See `compilation-error-regexp-alist' for format details.") @@ -15251,7 +15352,7 @@ and source-file directory for your debugger. \(fn COMMAND-LINE)" t nil) (autoload 'pdb "gud" "\ -Run COMMAND-LINE in the `*gud-FILE*' buffer. +Run COMMAND-LINE in the `*gud-FILE*' buffer to debug Python programs. COMMAND-LINE should include the pdb executable name (`gud-pdb-command-name') and the file to be debugged. @@ -16113,14 +16214,13 @@ or call the function `global-hi-lock-mode'.") (autoload 'global-hi-lock-mode "hi-lock" "\ Toggle Hi-Lock mode in all buffers. With prefix ARG, enable Global Hi-Lock mode if ARG is positive; -otherwise, disable it. If called from Lisp, enable the mode if -ARG is omitted or nil. +otherwise, disable it. If called from Lisp, enable the mode if ARG is +omitted or nil. Hi-Lock mode is enabled in all buffers where `turn-on-hi-lock-if-enabled' would do it. -See `hi-lock-mode' for more information on -Hi-Lock mode. +See `hi-lock-mode' for more information on Hi-Lock mode. \(fn &optional ARG)" t nil) @@ -16498,8 +16598,8 @@ or call the function `global-highlight-changes-mode'.") (autoload 'global-highlight-changes-mode "hilit-chg" "\ Toggle Highlight-Changes mode in all buffers. -With prefix ARG, enable Global Highlight-Changes mode if ARG is positive; -otherwise, disable it. If called from Lisp, enable the mode if +With prefix ARG, enable Global Highlight-Changes mode if ARG is +positive; otherwise, disable it. If called from Lisp, enable the mode if ARG is omitted or nil. Highlight-Changes mode is enabled in all buffers where @@ -17759,11 +17859,13 @@ is supported, and FILE exists, is used to construct the image specification to be returned. Return nil if no specification is satisfied. +If CACHE is non-nil, results are cached and returned on subsequent calls. + The image is looked for in `image-load-path'. Image files should not be larger than specified by `max-image-size'. -\(fn SPECS)" nil nil) +\(fn SPECS &optional CACHE)" nil nil) (autoload 'defimage "image" "\ Define SYMBOL as an image, and return SYMBOL. @@ -17801,7 +17903,7 @@ recognizes these files as having image type `imagemagick'. If Emacs is compiled without ImageMagick support, this does nothing." nil nil) -(register-definition-prefixes "image" '("image" "unknown-image-type")) +(register-definition-prefixes "image" '("find-image--cache" "image" "unknown-image-type")) ;;;*** @@ -18812,16 +18914,6 @@ Add submenus to the File menu, to convert to and from various formats." t nil) ;;;*** -;;;### (autoloads nil "iso-transl" "international/iso-transl.el" -;;;;;; (0 0 0 0)) -;;; Generated autoloads from international/iso-transl.el - (define-key key-translation-map "\C-x8" 'iso-transl-ctl-x-8-map) - (autoload 'iso-transl-ctl-x-8-map "iso-transl" "Keymap for C-x 8 prefix." t 'keymap) - -(register-definition-prefixes "iso-transl" '("iso-transl-")) - -;;;*** - ;;;### (autoloads nil "iso8601" "calendar/iso8601.el" (0 0 0 0)) ;;; Generated autoloads from calendar/iso8601.el @@ -19731,14 +19823,12 @@ or call the function `global-linum-mode'.") (autoload 'global-linum-mode "linum" "\ Toggle Linum mode in all buffers. With prefix ARG, enable Global Linum mode if ARG is positive; -otherwise, disable it. If called from Lisp, enable the mode if -ARG is omitted or nil. +otherwise, disable it. If called from Lisp, enable the mode if ARG is +omitted or nil. -Linum mode is enabled in all buffers where -`linum-on' would do it. +Linum mode is enabled in all buffers where `linum-on' would do it. -See `linum-mode' for more information on -Linum mode. +See `linum-mode' for more information on Linum mode. \(fn &optional ARG)" t nil) @@ -20694,6 +20784,21 @@ recursion depth in the minibuffer prompt. This is only useful if ;;;*** +;;;### (autoloads nil "memory-report" "emacs-lisp/memory-report.el" +;;;;;; (0 0 0 0)) +;;; Generated autoloads from emacs-lisp/memory-report.el + +(autoload 'memory-report "memory-report" "\ +Generate a report of how Emacs is using memory. + +This report is approximate, and will commonly over-count memory +usage by variables, because shared data structures will usually +by counted more than once." t nil) + +(register-definition-prefixes "memory-report" '("memory-report-")) + +;;;*** + ;;;### (autoloads nil "message" "gnus/message.el" (0 0 0 0)) ;;; Generated autoloads from gnus/message.el @@ -22898,7 +23003,6 @@ Many aspects this mode can be customized using ;;;### (autoloads nil "ob-abc" "org/ob-abc.el" (0 0 0 0)) ;;; Generated autoloads from org/ob-abc.el -(push (purecopy '(ob-abc 0 1)) package--builtin-versions) (register-definition-prefixes "ob-abc" '("org-babel-")) @@ -22929,7 +23033,7 @@ Many aspects this mode can be customized using ;;;### (autoloads nil "ob-clojure" "org/ob-clojure.el" (0 0 0 0)) ;;; Generated autoloads from org/ob-clojure.el -(register-definition-prefixes "ob-clojure" '("org-babel-")) +(register-definition-prefixes "ob-clojure" '("ob-clojure-" "org-babel-")) ;;;*** @@ -22970,7 +23074,6 @@ Many aspects this mode can be customized using ;;;### (autoloads nil "ob-ebnf" "org/ob-ebnf.el" (0 0 0 0)) ;;; Generated autoloads from org/ob-ebnf.el -(push (purecopy '(ob-ebnf 1 0)) package--builtin-versions) (register-definition-prefixes "ob-ebnf" '("org-babel-")) @@ -23218,7 +23321,6 @@ Many aspects this mode can be customized using ;;;### (autoloads nil "ob-sed" "org/ob-sed.el" (0 0 0 0)) ;;; Generated autoloads from org/ob-sed.el -(push (purecopy '(ob-sed 0 1 1)) package--builtin-versions) (register-definition-prefixes "ob-sed" '("org-babel-")) @@ -23323,110 +23425,6 @@ startup file, `~/.emacs-octave'. ;;;*** -;;;### (autoloads nil "ol" "org/ol.el" (0 0 0 0)) -;;; Generated autoloads from org/ol.el - -(autoload 'org-next-link "ol" "\ -Move forward to the next link. -If the link is in hidden text, expose it. When SEARCH-BACKWARD -is non-nil, move backward. - -\(fn &optional SEARCH-BACKWARD)" t nil) - -(autoload 'org-previous-link "ol" "\ -Move backward to the previous link. -If the link is in hidden text, expose it." t nil) - -(autoload 'org-toggle-link-display "ol" "\ -Toggle the literal or descriptive display of links." t nil) - -(autoload 'org-store-link "ol" "\ -Store a link to the current location. -\\<org-mode-map> -This link is added to `org-stored-links' and can later be inserted -into an Org buffer with `org-insert-link' (`\\[org-insert-link]'). - -For some link types, a `\\[universal-argument]' prefix ARG is interpreted. A single -`\\[universal-argument]' negates `org-context-in-file-links' for file links or -`org-gnus-prefer-web-links' for links to Usenet articles. - -A `\\[universal-argument] \\[universal-argument]' prefix ARG forces skipping storing functions that are not -part of Org core. - -A `\\[universal-argument] \\[universal-argument] \\[universal-argument]' prefix ARG forces storing a link for each line in the -active region. - -Assume the function is called interactively if INTERACTIVE? is -non-nil. - -\(fn ARG &optional INTERACTIVE\\=\\?)" t nil) - -(autoload 'org-insert-link "ol" "\ -Insert a link. At the prompt, enter the link. - -Completion can be used to insert any of the link protocol prefixes in use. - -The history can be used to select a link previously stored with -`org-store-link'. When the empty string is entered (i.e. if you just -press `RET' at the prompt), the link defaults to the most recently -stored link. As `SPC' triggers completion in the minibuffer, you need to -use `M-SPC' or `C-q SPC' to force the insertion of a space character. - -You will also be prompted for a description, and if one is given, it will -be displayed in the buffer instead of the link. - -If there is already a link at point, this command will allow you to edit -link and description parts. - -With a `\\[universal-argument]' prefix, prompts for a file to link to. The file name can be -selected using completion. The path to the file will be relative to the -current directory if the file is in the current directory or a subdirectory. -Otherwise, the link will be the absolute path as completed in the minibuffer -\(i.e. normally ~/path/to/file). You can configure this behavior using the -option `org-link-file-path-type'. - -With a `\\[universal-argument] \\[universal-argument]' prefix, enforce an absolute path even if the file is in -the current directory or below. - -A `\\[universal-argument] \\[universal-argument] \\[universal-argument]' prefix negates `org-link-keep-stored-after-insertion'. - -If the LINK-LOCATION parameter is non-nil, this value will be used as -the link location instead of reading one interactively. - -If the DESCRIPTION parameter is non-nil, this value will be used as the -default description. Otherwise, if `org-link-make-description-function' -is non-nil, this function will be called with the link target, and the -result will be the default link description. When called non-interactively, -don't allow to edit the default description. - -\(fn &optional COMPLETE-FILE LINK-LOCATION DESCRIPTION)" t nil) - -(autoload 'org-insert-all-links "ol" "\ -Insert all links in `org-stored-links'. -When a universal prefix, do not delete the links from `org-stored-links'. -When `ARG' is a number, insert the last N link(s). -`PRE' and `POST' are optional arguments to define a string to -prepend or to append. - -\(fn ARG &optional PRE POST)" t nil) - -(autoload 'org-insert-last-stored-link "ol" "\ -Insert the last link stored in `org-stored-links'. - -\(fn ARG)" t nil) - -(autoload 'org-insert-link-global "ol" "\ -Insert a link like Org mode does. -This command can be called in any mode to insert a link in Org syntax." t nil) - -(autoload 'org-update-radio-target-regexp "ol" "\ -Find all radio targets in this file and update the regular expression. -Also refresh fontification if needed." t nil) - -(register-definition-prefixes "ol" '("org-")) - -;;;*** - ;;;### (autoloads nil "ol-bibtex" "org/ol-bibtex.el" (0 0 0 0)) ;;; Generated autoloads from org/ol-bibtex.el @@ -23529,7 +23527,7 @@ Coloring: ;;;### (autoloads nil "org" "org/org.el" (0 0 0 0)) ;;; Generated autoloads from org/org.el -(push (purecopy '(org 9 3)) package--builtin-versions) +(push (purecopy '(org 9 4 4)) package--builtin-versions) (autoload 'org-babel-do-load-languages "org" "\ Load the languages defined in `org-babel-load-languages'. @@ -23554,6 +23552,11 @@ FULL is given. \(fn &optional HERE FULL MESSAGE)" t nil) +(autoload 'org-load-modules-maybe "org" "\ +Load all extensions listed in `org-modules'. + +\(fn &optional FORCE)" nil nil) + (autoload 'org-clock-persistence-insinuate "org" "\ Set up hooks for clock persistence." nil nil) @@ -23623,10 +23626,10 @@ When point is not at the beginning of a headline, execute the global binding for `TAB', which is re-indenting the line. See the option `org-cycle-emulate-tab' for details. -As a special case, if point is at the beginning of the buffer and there is -no headline in line 1, this function will act as if called with prefix arg -\(`\\[universal-argument] TAB', same as `S-TAB') also when called without prefix arg, but only -if the variable `org-cycle-global-at-bob' is t. +As a special case, if point is at the very beginning of the buffer, if +there is no headline there, and if the variable `org-cycle-global-at-bob' +is non-nil, this function acts as if called with prefix argument (`\\[universal-argument] TAB', +same as `S-TAB') also when called without prefix argument. \(fn &optional ARG)" t nil) @@ -24052,109 +24055,23 @@ Set `org-capture-templates' to be similar to `org-remember-templates'." t nil) ;;;*** -;;;### (autoloads nil "org-colview" "org/org-colview.el" (0 0 0 0)) -;;; Generated autoloads from org/org-colview.el - -(autoload 'org-columns-remove-overlays "org-colview" "\ -Remove all currently active column overlays." t nil) - -(autoload 'org-columns-get-format-and-top-level "org-colview" nil nil nil) - -(autoload 'org-columns "org-colview" "\ -Turn on column view on an Org mode file. - -Column view applies to the whole buffer if point is before the -first headline. Otherwise, it applies to the first ancestor -setting \"COLUMNS\" property. If there is none, it defaults to -the current headline. With a `\\[universal-argument]' prefix argument, turn on column -view for the whole buffer unconditionally. - -When COLUMNS-FMT-STRING is non-nil, use it as the column format. - -\(fn &optional GLOBAL COLUMNS-FMT-STRING)" t nil) - -(autoload 'org-columns-compute "org-colview" "\ -Summarize the values of PROPERTY hierarchically. -Also update existing values for PROPERTY according to the first -column specification. - -\(fn PROPERTY)" t nil) - -(autoload 'org-dblock-write:columnview "org-colview" "\ -Write the column view table. - -PARAMS is a property list of parameters: - -`:id' (mandatory) - - The ID property of the entry where the columns view should be - built. When the symbol `local', call locally. When `global' - call column view with the cursor at the beginning of the - buffer (usually this means that the whole buffer switches to - column view). When \"file:path/to/file.org\", invoke column - view at the start of that file. Otherwise, the ID is located - using `org-id-find'. - -`:exclude-tags' - - List of tags to exclude from column view table. - -`:format' - - When non-nil, specify the column view format to use. - -`:hlines' - - When non-nil, insert a hline before each item. When - a number, insert a hline before each level inferior or equal - to that number. - -`:indent' - - When non-nil, indent each ITEM field according to its level. - -`:match' - - When set to a string, use this as a tags/property match filter. - -`:maxlevel' - - When set to a number, don't capture headlines below this level. - -`:skip-empty-rows' - - When non-nil, skip rows where all specifiers other than ITEM - are empty. - -`:vlines' - - When non-nil, make each column a column group to enforce - vertical lines. - -\(fn PARAMS)" nil nil) - -(autoload 'org-columns-insert-dblock "org-colview" "\ -Create a dynamic block capturing a column view table." t nil) - -(autoload 'org-agenda-columns "org-colview" "\ -Turn on or update column view in the agenda." t nil) +;;;### (autoloads nil "org-crypt" "org/org-crypt.el" (0 0 0 0)) +;;; Generated autoloads from org/org-crypt.el -(register-definition-prefixes "org-colview" '("org-")) +(autoload 'org-encrypt-entry "org-crypt" "\ +Encrypt the content of the current headline." t nil) -;;;*** - -;;;### (autoloads nil "org-compat" "org/org-compat.el" (0 0 0 0)) -;;; Generated autoloads from org/org-compat.el +(autoload 'org-decrypt-entry "org-crypt" "\ +Decrypt the content of the current headline." t nil) -(autoload 'org-check-version "org-compat" "\ -Try very hard to provide sensible version strings." nil t) +(autoload 'org-encrypt-entries "org-crypt" "\ +Encrypt all top-level entries in the current buffer." t nil) -(register-definition-prefixes "org-compat" '("org-")) +(autoload 'org-decrypt-entries "org-crypt" "\ +Decrypt all entries in the current buffer." t nil) -;;;*** - -;;;### (autoloads nil "org-crypt" "org/org-crypt.el" (0 0 0 0)) -;;; Generated autoloads from org/org-crypt.el +(autoload 'org-crypt-use-before-save-magic "org-crypt" "\ +Add a hook to automatically encrypt entries before a file is saved to disk." nil nil) (register-definition-prefixes "org-crypt" '("org-")) @@ -24167,61 +24084,6 @@ Try very hard to provide sensible version strings." nil t) ;;;*** -;;;### (autoloads nil "org-duration" "org/org-duration.el" (0 0 0 -;;;;;; 0)) -;;; Generated autoloads from org/org-duration.el - -(autoload 'org-duration-set-regexps "org-duration" "\ -Set duration related regexps." t nil) - -(autoload 'org-duration-p "org-duration" "\ -Non-nil when string S is a time duration. - -\(fn S)" nil nil) - -(autoload 'org-duration-to-minutes "org-duration" "\ -Return number of minutes of DURATION string. - -When optional argument CANONICAL is non-nil, ignore -`org-duration-units' and use standard time units value. - -A bare number is translated into minutes. The empty string is -translated into 0.0. - -Return value as a float. Raise an error if duration format is -not recognized. - -\(fn DURATION &optional CANONICAL)" nil nil) - -(autoload 'org-duration-from-minutes "org-duration" "\ -Return duration string for a given number of MINUTES. - -Format duration according to `org-duration-format' or FMT, when -non-nil. - -When optional argument CANONICAL is non-nil, ignore -`org-duration-units' and use standard time units value. - -Raise an error if expected format is unknown. - -\(fn MINUTES &optional FMT CANONICAL)" nil nil) - -(autoload 'org-duration-h:mm-only-p "org-duration" "\ -Non-nil when every duration in TIMES has \"H:MM\" or \"H:MM:SS\" format. - -TIMES is a list of duration strings. - -Return nil if any duration is expressed with units, as defined in -`org-duration-units'. Otherwise, if any duration is expressed -with \"H:MM:SS\" format, return `h:mm:ss'. Otherwise, return -`h:mm'. - -\(fn TIMES)" nil nil) - -(register-definition-prefixes "org-duration" '("org-duration-")) - -;;;*** - ;;;### (autoloads nil "org-entities" "org/org-entities.el" (0 0 0 ;;;;;; 0)) ;;; Generated autoloads from org/org-entities.el @@ -24237,42 +24099,6 @@ with \"H:MM:SS\" format, return `h:mm:ss'. Otherwise, return ;;;*** -;;;### (autoloads nil "org-goto" "org/org-goto.el" (0 0 0 0)) -;;; Generated autoloads from org/org-goto.el - -(autoload 'org-goto-location "org-goto" "\ -Let the user select a location in current buffer. -This function uses a recursive edit. It returns the selected -position or nil. - -\(fn &optional BUF HELP)" nil nil) - -(autoload 'org-goto "org-goto" "\ -Look up a different location in the current file, keeping current visibility. - -When you want look-up or go to a different location in a -document, the fastest way is often to fold the entire buffer and -then dive into the tree. This method has the disadvantage, that -the previous location will be folded, which may not be what you -want. - -This command works around this by showing a copy of the current -buffer in an indirect buffer, in overview mode. You can dive -into the tree in that copy, use org-occur and incremental search -to find a location. When pressing RET or `Q', the command -returns to the original buffer in which the visibility is still -unchanged. After RET it will also jump to the location selected -in the indirect buffer and expose the headline hierarchy above. - -With a prefix argument, use the alternative interface: e.g., if -`org-goto-interface' is `outline' use `outline-path-completion'. - -\(fn &optional ALTERNATIVE-INTERFACE)" t nil) - -(register-definition-prefixes "org-goto" '("org-goto-")) - -;;;*** - ;;;### (autoloads nil "org-habit" "org/org-habit.el" (0 0 0 0)) ;;; Generated autoloads from org/org-habit.el @@ -24288,41 +24114,6 @@ With a prefix argument, use the alternative interface: e.g., if ;;;*** -;;;### (autoloads nil "org-keys" "org/org-keys.el" (0 0 0 0)) -;;; Generated autoloads from org/org-keys.el - -(autoload 'org-babel-describe-bindings "org-keys" "\ -Describe all keybindings behind `org-babel-key-prefix'." t nil) - -(register-definition-prefixes "org-keys" '("org-")) - -;;;*** - -;;;### (autoloads nil "org-lint" "org/org-lint.el" (0 0 0 0)) -;;; Generated autoloads from org/org-lint.el - -(autoload 'org-lint "org-lint" "\ -Check current Org buffer for syntax mistakes. - -By default, run all checkers. With a `\\[universal-argument]' prefix ARG, select one -category of checkers only. With a `\\[universal-argument] \\[universal-argument]' prefix, run one precise -checker by its name. - -ARG can also be a list of checker names, as symbols, to run. - -\(fn &optional ARG)" t nil) - -(register-definition-prefixes "org-lint" '("org-lint-")) - -;;;*** - -;;;### (autoloads nil "org-list" "org/org-list.el" (0 0 0 0)) -;;; Generated autoloads from org/org-list.el - -(register-definition-prefixes "org-list" '("org-")) - -;;;*** - ;;;### (autoloads nil "org-macro" "org/org-macro.el" (0 0 0 0)) ;;; Generated autoloads from org/org-macro.el @@ -24330,18 +24121,6 @@ ARG can also be a list of checker names, as symbols, to run. ;;;*** -;;;### (autoloads nil "org-macs" "org/org-macs.el" (0 0 0 0)) -;;; Generated autoloads from org/org-macs.el - -(autoload 'org-load-noerror-mustsuffix "org-macs" "\ -Load FILE with optional arguments NOERROR and MUSTSUFFIX. - -\(fn FILE)" nil t) - -(register-definition-prefixes "org-macs" '("org-")) - -;;;*** - ;;;### (autoloads nil "org-mouse" "org/org-mouse.el" (0 0 0 0)) ;;; Generated autoloads from org/org-mouse.el @@ -24349,35 +24128,6 @@ Load FILE with optional arguments NOERROR and MUSTSUFFIX. ;;;*** -;;;### (autoloads nil "org-num" "org/org-num.el" (0 0 0 0)) -;;; Generated autoloads from org/org-num.el - -(autoload 'org-num-default-format "org-num" "\ -Default numbering display function. -NUMBERING is a list of numbers. - -\(fn NUMBERING)" nil nil) - -(autoload 'org-num-mode "org-num" "\ -Dynamic numbering of headlines in an Org buffer. - -If called interactively, toggle `Org-Num mode'. If the prefix -argument is positive, enable the mode, and if it is zero or negative, -disable the mode. - -If called from Lisp, toggle the mode if ARG is `toggle'. Enable the -mode if ARG is nil, omitted, or is a positive number. Disable the -mode if ARG is a negative number. - -The mode's hook is called both when the mode is enabled and when it is -disabled. - -\(fn &optional ARG)" t nil) - -(register-definition-prefixes "org-num" '("org-num-")) - -;;;*** - ;;;### (autoloads nil "org-pcomplete" "org/org-pcomplete.el" (0 0 ;;;;;; 0 0)) ;;; Generated autoloads from org/org-pcomplete.el @@ -24474,6 +24224,13 @@ See the command `outline-mode' for more information on this mode. ;;;*** +;;;### (autoloads nil "ox-man" "org/ox-man.el" (0 0 0 0)) +;;; Generated autoloads from org/ox-man.el + +(register-definition-prefixes "ox-man" '("org-man-")) + +;;;*** + ;;;### (autoloads nil "package" "emacs-lisp/package.el" (0 0 0 0)) ;;; Generated autoloads from emacs-lisp/package.el (push (purecopy '(package 1 1 0)) package--builtin-versions) @@ -26094,7 +25851,7 @@ Open profile FILENAME. ;;;### (autoloads nil "project" "progmodes/project.el" (0 0 0 0)) ;;; Generated autoloads from progmodes/project.el -(push (purecopy '(project 0 5 2)) package--builtin-versions) +(push (purecopy '(project 0 5 3)) package--builtin-versions) (autoload 'project-current "project" "\ Return the project instance in DIRECTORY, defaulting to `default-directory'. @@ -26115,7 +25872,7 @@ of the project instance object. \(fn &optional MAYBE-PROMPT DIRECTORY)" nil nil) -(defvar project-prefix-map (let ((map (make-sparse-keymap))) (define-key map "!" 'project-shell-command) (define-key map "&" 'project-async-shell-command) (define-key map "f" 'project-find-file) (define-key map "F" 'project-or-external-find-file) (define-key map "b" 'project-switch-to-buffer) (define-key map "s" 'project-shell) (define-key map "d" 'project-dired) (define-key map "v" 'project-vc-dir) (define-key map "c" 'project-compile) (define-key map "e" 'project-eshell) (define-key map "k" 'project-kill-buffers) (define-key map "p" 'project-switch-project) (define-key map "g" 'project-find-regexp) (define-key map "G" 'project-or-external-find-regexp) (define-key map "r" 'project-query-replace-regexp) map) "\ +(defvar project-prefix-map (let ((map (make-sparse-keymap))) (define-key map "!" 'project-shell-command) (define-key map "&" 'project-async-shell-command) (define-key map "f" 'project-find-file) (define-key map "F" 'project-or-external-find-file) (define-key map "b" 'project-switch-to-buffer) (define-key map "s" 'project-shell) (define-key map "d" 'project-dired) (define-key map "v" 'project-vc-dir) (define-key map "c" 'project-compile) (define-key map "e" 'project-eshell) (define-key map "k" 'project-kill-buffers) (define-key map "p" 'project-switch-project) (define-key map "g" 'project-find-regexp) (define-key map "G" 'project-or-external-find-regexp) (define-key map "r" 'project-query-replace-regexp) (define-key map "x" 'project-execute-extended-command) map) "\ Keymap for project commands.") (define-key ctl-x-map "p" project-prefix-map) @@ -26279,19 +26036,33 @@ Save the result in `project-list-file' if the list of projects has changed. (autoload 'project-known-project-roots "project" "\ Return the list of root directories of all known projects." nil nil) -(defvar project-switch-commands '((102 "Find file" project-find-file) (103 "Find regexp" project-find-regexp) (100 "Dired" project-dired) (118 "VC-Dir" project-vc-dir) (101 "Eshell" project-eshell)) "\ -Alist mapping keys to project switching menu entries. +(autoload 'project-execute-extended-command "project" "\ +Execute an extended command in project root." t nil) + +(function-put 'project-execute-extended-command 'interactive-only 'command-execute) + +(defvar project-switch-commands '((project-find-file "Find file") (project-find-regexp "Find regexp") (project-dired "Dired") (project-vc-dir "VC-Dir") (project-eshell "Eshell")) "\ +Alist mapping commands to descriptions. Used by `project-switch-project' to construct a dispatch menu of commands available upon \"switching\" to another project. -Each element is of the form (KEY LABEL COMMAND), where COMMAND is the -command to run when KEY is pressed. LABEL is used to distinguish -the menu entries in the dispatch menu.") +Each element is of the form (COMMAND LABEL &optional KEY) where +COMMAND is the command to run when KEY is pressed. LABEL is used +to distinguish the menu entries in the dispatch menu. If KEY is +absent, COMMAND must be bound in `project-prefix-map', and the +key is looked up in that map.") + +(custom-autoload 'project-switch-commands "project" t) (autoload 'project-switch-project "project" "\ \"Switch\" to another project by running an Emacs command. The available commands are presented as a dispatch menu -made from `project-switch-commands'." t nil) +made from `project-switch-commands'. + +When called in a program, it will use the project corresponding +to directory DIR. + +\(fn DIR)" t nil) (register-definition-prefixes "project" '("project-")) @@ -26625,7 +26396,7 @@ Optional argument FACE specifies the face to do the highlighting. ;;;### (autoloads nil "python" "progmodes/python.el" (0 0 0 0)) ;;; Generated autoloads from progmodes/python.el -(push (purecopy '(python 0 27)) package--builtin-versions) +(push (purecopy '(python 0 27 1)) package--builtin-versions) (add-to-list 'auto-mode-alist (cons (purecopy "\\.py[iw]?\\'") 'python-mode)) @@ -28013,6 +27784,7 @@ Instead, these commands are available: \\[rmail-undelete-previous-message] Undelete message. Tries current message, then earlier messages till a deleted message is found. \\[rmail-edit-current-message] Edit the current message. \\[rmail-cease-edit] to return to Rmail. +\\[rmail-epa-decrypt] Decrypt the current message. \\[rmail-expunge] Expunge deleted messages. \\[rmail-expunge-and-save] Expunge and save the file. \\[rmail-quit] Quit Rmail: expunge, save, then switch to another buffer. @@ -29574,7 +29346,7 @@ sorted. FUNCTION must be a function of one argument. \(fn FUNCTION PRED SEQUENCE)" nil nil) (autoload 'seq-filter "seq" "\ -Return a list of all the elements for which (PRED element) is non-nil in SEQUENCE. +Return a list of all elements for which (PRED element) is non-nil in SEQUENCE. \(fn PRED SEQUENCE)" nil nil) @@ -29811,8 +29583,8 @@ have <h1>Very Major Headlines</h1> through <h6>Very Minor Headlines</h6> <p>Paragraphs only need an opening tag. Line breaks and multiple spaces are ignored unless the text is <pre>preformatted.</pre> Text can be marked as -<strong>bold</strong>, <em>italic</em> or <u>underlined</u> using the normal M-o or -Edit/Text Properties/Face commands. +<strong>bold</strong>, <em>italic</em> or <u>underlined</u> using the normal M-o +or Edit/Text Properties/Face commands. Pages can have <a name=\"SOMENAME\">named points</a> and can link other points to them with <a href=\"#SOMENAME\">see also somename</a>. In the same way <a @@ -31818,14 +31590,13 @@ or call the function `global-subword-mode'.") (autoload 'global-subword-mode "subword" "\ Toggle Subword mode in all buffers. With prefix ARG, enable Global Subword mode if ARG is positive; -otherwise, disable it. If called from Lisp, enable the mode if -ARG is omitted or nil. +otherwise, disable it. If called from Lisp, enable the mode if ARG is +omitted or nil. -Subword mode is enabled in all buffers where -`(lambda nil (subword-mode 1))' would do it. +Subword mode is enabled in all buffers where `(lambda nil +\(subword-mode 1))' would do it. -See `subword-mode' for more information on -Subword mode. +See `subword-mode' for more information on Subword mode. \(fn &optional ARG)" t nil) @@ -31867,14 +31638,13 @@ or call the function `global-superword-mode'.") (autoload 'global-superword-mode "subword" "\ Toggle Superword mode in all buffers. With prefix ARG, enable Global Superword mode if ARG is positive; -otherwise, disable it. If called from Lisp, enable the mode if -ARG is omitted or nil. +otherwise, disable it. If called from Lisp, enable the mode if ARG is +omitted or nil. -Superword mode is enabled in all buffers where -`(lambda nil (superword-mode 1))' would do it. +Superword mode is enabled in all buffers where `(lambda nil +\(superword-mode 1))' would do it. -See `superword-mode' for more information on -Superword mode. +See `superword-mode' for more information on Superword mode. \(fn &optional ARG)" t nil) @@ -32001,14 +31771,13 @@ or call the function `global-tab-line-mode'.") (autoload 'global-tab-line-mode "tab-line" "\ Toggle Tab-Line mode in all buffers. With prefix ARG, enable Global Tab-Line mode if ARG is positive; -otherwise, disable it. If called from Lisp, enable the mode if -ARG is omitted or nil. +otherwise, disable it. If called from Lisp, enable the mode if ARG is +omitted or nil. Tab-Line mode is enabled in all buffers where `tab-line-mode--turn-on' would do it. -See `tab-line-mode' for more information on -Tab-Line mode. +See `tab-line-mode' for more information on Tab-Line mode. \(fn &optional ARG)" t nil) @@ -32337,7 +32106,8 @@ Creates a cell above and a cell below the current point location." t nil) (autoload 'table-split-cell-horizontally "table" "\ Split current cell horizontally. -Creates a cell on the left and a cell on the right of the current point location." t nil) +Creates a cell on the left and a cell on the right of the current +point location." t nil) (autoload 'table-split-cell "table" "\ Split current cell in ORIENTATION. @@ -32805,7 +32575,7 @@ use in that buffer. \(fn PORT SPEED &optional LINE-MODE)" t nil) -(register-definition-prefixes "term" '("ansi-term-color-vector" "explicit-shell-file-name" "serial-" "term-")) +(register-definition-prefixes "term" '("ansi-term-color-vector" "serial-" "term-")) ;;;*** @@ -32828,7 +32598,6 @@ Start coverage on function under point." t nil) ;;;### (autoloads nil "tetris" "play/tetris.el" (0 0 0 0)) ;;; Generated autoloads from play/tetris.el -(push (purecopy '(tetris 2 1)) package--builtin-versions) (autoload 'tetris "tetris" "\ Play the Tetris game. @@ -32837,17 +32606,15 @@ rotate the shape to fit in with those at the bottom of the screen so as to form complete rows. tetris-mode keybindings: - \\<tetris-mode-map> -\\[tetris-start-game] Starts a new game of Tetris -\\[tetris-end-game] Terminates the current game -\\[tetris-pause-game] Pauses (or resumes) the current game -\\[tetris-move-left] Moves the shape one square to the left -\\[tetris-move-right] Moves the shape one square to the right -\\[tetris-rotate-prev] Rotates the shape clockwise -\\[tetris-rotate-next] Rotates the shape anticlockwise -\\[tetris-move-bottom] Drops the shape to the bottom of the playing area - -" t nil) +\\<tetris-mode-map> +\\[tetris-start-game] Start a new game of Tetris +\\[tetris-end-game] Terminate the current game +\\[tetris-pause-game] Pause (or resume) the current game +\\[tetris-move-left] Move the shape one square to the left +\\[tetris-move-right] Move the shape one square to the right +\\[tetris-rotate-prev] Rotate the shape clockwise +\\[tetris-rotate-next] Rotate the shape anticlockwise +\\[tetris-move-bottom] Drop the shape to the bottom of the playing area" t nil) (register-definition-prefixes "tetris" '("tetris-")) @@ -34234,7 +34001,6 @@ the output buffer or changing the window configuration. ;;;### (autoloads nil "tramp" "net/tramp.el" (0 0 0 0)) ;;; Generated autoloads from net/tramp.el -(push (purecopy '(tramp 2 5 0 -1)) package--builtin-versions) (defvar tramp-mode t "\ Whether Tramp is enabled. @@ -34408,6 +34174,7 @@ Add archive file name handler to `file-name-handler-alist'." (when tramp-archive ;;;### (autoloads nil "trampver" "net/trampver.el" (0 0 0 0)) ;;; Generated autoloads from net/trampver.el +(push (purecopy '(tramp 2 5 0)) package--builtin-versions) (register-definition-prefixes "trampver" '("tramp-")) @@ -38445,7 +38212,7 @@ If LIMIT is non-nil, then do not consider characters beyond LIMIT. ;;;### (autoloads nil "xref" "progmodes/xref.el" (0 0 0 0)) ;;; Generated autoloads from progmodes/xref.el -(push (purecopy '(xref 1 0 3)) package--builtin-versions) +(push (purecopy '(xref 1 0 4)) package--builtin-versions) (autoload 'xref-find-backend "xref" nil nil nil) @@ -38699,39 +38466,39 @@ Zone out, completely." t nil) ;;;;;; "font-lock.el" "format.el" "frame.el" "help.el" "hfy-cmap.el" ;;;;;; "ibuf-ext.el" "indent.el" "international/characters.el" "international/charprop.el" ;;;;;; "international/charscript.el" "international/cp51932.el" -;;;;;; "international/eucjp-ms.el" "international/mule-cmds.el" -;;;;;; "international/mule-conf.el" "international/mule.el" "international/uni-bidi.el" -;;;;;; "international/uni-brackets.el" "international/uni-category.el" -;;;;;; "international/uni-combining.el" "international/uni-comment.el" -;;;;;; "international/uni-decimal.el" "international/uni-decomposition.el" -;;;;;; "international/uni-digit.el" "international/uni-lowercase.el" -;;;;;; "international/uni-mirrored.el" "international/uni-name.el" -;;;;;; "international/uni-numeric.el" "international/uni-old-name.el" -;;;;;; "international/uni-special-lowercase.el" "international/uni-special-titlecase.el" -;;;;;; "international/uni-special-uppercase.el" "international/uni-titlecase.el" -;;;;;; "international/uni-uppercase.el" "isearch.el" "jit-lock.el" -;;;;;; "jka-cmpr-hook.el" "language/burmese.el" "language/cham.el" -;;;;;; "language/chinese.el" "language/cyrillic.el" "language/czech.el" -;;;;;; "language/english.el" "language/ethiopic.el" "language/european.el" -;;;;;; "language/georgian.el" "language/greek.el" "language/hebrew.el" -;;;;;; "language/indian.el" "language/japanese.el" "language/khmer.el" -;;;;;; "language/korean.el" "language/lao.el" "language/misc-lang.el" -;;;;;; "language/romanian.el" "language/sinhala.el" "language/slovak.el" -;;;;;; "language/tai-viet.el" "language/thai.el" "language/tibetan.el" -;;;;;; "language/utf-8-lang.el" "language/vietnamese.el" "ldefs-boot.el" -;;;;;; "leim/ja-dic/ja-dic.el" "leim/leim-list.el" "leim/quail/4Corner.el" -;;;;;; "leim/quail/ARRAY30.el" "leim/quail/CCDOSPY.el" "leim/quail/CTLau-b5.el" -;;;;;; "leim/quail/CTLau.el" "leim/quail/ECDICT.el" "leim/quail/ETZY.el" -;;;;;; "leim/quail/PY-b5.el" "leim/quail/PY.el" "leim/quail/Punct-b5.el" -;;;;;; "leim/quail/Punct.el" "leim/quail/QJ-b5.el" "leim/quail/QJ.el" -;;;;;; "leim/quail/SW.el" "leim/quail/TONEPY.el" "leim/quail/ZIRANMA.el" -;;;;;; "leim/quail/ZOZY.el" "leim/quail/arabic.el" "leim/quail/compose.el" -;;;;;; "leim/quail/croatian.el" "leim/quail/cyril-jis.el" "leim/quail/cyrillic.el" -;;;;;; "leim/quail/czech.el" "leim/quail/georgian.el" "leim/quail/greek.el" -;;;;;; "leim/quail/hanja-jis.el" "leim/quail/hanja.el" "leim/quail/hanja3.el" -;;;;;; "leim/quail/hebrew.el" "leim/quail/ipa-praat.el" "leim/quail/latin-alt.el" -;;;;;; "leim/quail/latin-ltx.el" "leim/quail/latin-post.el" "leim/quail/latin-pre.el" -;;;;;; "leim/quail/persian.el" "leim/quail/programmer-dvorak.el" +;;;;;; "international/eucjp-ms.el" "international/iso-transl.el" +;;;;;; "international/mule-cmds.el" "international/mule-conf.el" +;;;;;; "international/mule.el" "international/uni-bidi.el" "international/uni-brackets.el" +;;;;;; "international/uni-category.el" "international/uni-combining.el" +;;;;;; "international/uni-comment.el" "international/uni-decimal.el" +;;;;;; "international/uni-decomposition.el" "international/uni-digit.el" +;;;;;; "international/uni-lowercase.el" "international/uni-mirrored.el" +;;;;;; "international/uni-name.el" "international/uni-numeric.el" +;;;;;; "international/uni-old-name.el" "international/uni-special-lowercase.el" +;;;;;; "international/uni-special-titlecase.el" "international/uni-special-uppercase.el" +;;;;;; "international/uni-titlecase.el" "international/uni-uppercase.el" +;;;;;; "isearch.el" "jit-lock.el" "jka-cmpr-hook.el" "language/burmese.el" +;;;;;; "language/cham.el" "language/chinese.el" "language/cyrillic.el" +;;;;;; "language/czech.el" "language/english.el" "language/ethiopic.el" +;;;;;; "language/european.el" "language/georgian.el" "language/greek.el" +;;;;;; "language/hebrew.el" "language/indian.el" "language/japanese.el" +;;;;;; "language/khmer.el" "language/korean.el" "language/lao.el" +;;;;;; "language/misc-lang.el" "language/romanian.el" "language/sinhala.el" +;;;;;; "language/slovak.el" "language/tai-viet.el" "language/thai.el" +;;;;;; "language/tibetan.el" "language/utf-8-lang.el" "language/vietnamese.el" +;;;;;; "ldefs-boot.el" "leim/ja-dic/ja-dic.el" "leim/leim-list.el" +;;;;;; "leim/quail/4Corner.el" "leim/quail/ARRAY30.el" "leim/quail/CCDOSPY.el" +;;;;;; "leim/quail/CTLau-b5.el" "leim/quail/CTLau.el" "leim/quail/ECDICT.el" +;;;;;; "leim/quail/ETZY.el" "leim/quail/PY-b5.el" "leim/quail/PY.el" +;;;;;; "leim/quail/Punct-b5.el" "leim/quail/Punct.el" "leim/quail/QJ-b5.el" +;;;;;; "leim/quail/QJ.el" "leim/quail/SW.el" "leim/quail/TONEPY.el" +;;;;;; "leim/quail/ZIRANMA.el" "leim/quail/ZOZY.el" "leim/quail/arabic.el" +;;;;;; "leim/quail/compose.el" "leim/quail/croatian.el" "leim/quail/cyril-jis.el" +;;;;;; "leim/quail/cyrillic.el" "leim/quail/czech.el" "leim/quail/georgian.el" +;;;;;; "leim/quail/greek.el" "leim/quail/hanja-jis.el" "leim/quail/hanja.el" +;;;;;; "leim/quail/hanja3.el" "leim/quail/hebrew.el" "leim/quail/ipa-praat.el" +;;;;;; "leim/quail/latin-alt.el" "leim/quail/latin-ltx.el" "leim/quail/latin-post.el" +;;;;;; "leim/quail/latin-pre.el" "leim/quail/persian.el" "leim/quail/programmer-dvorak.el" ;;;;;; "leim/quail/py-punct.el" "leim/quail/pypunct-b5.el" "leim/quail/quick-b5.el" ;;;;;; "leim/quail/quick-cns.el" "leim/quail/rfc1345.el" "leim/quail/sami.el" ;;;;;; "leim/quail/sgml-input.el" "leim/quail/slovak.el" "leim/quail/symbol-ksc.el" @@ -38743,14 +38510,17 @@ Zone out, completely." t nil) ;;;;;; "mh-e/mh-loaddefs.el" "minibuffer.el" "mouse.el" "net/tramp-loaddefs.el" ;;;;;; "newcomment.el" "obarray.el" "org/ob-core.el" "org/ob-lob.el" ;;;;;; "org/ob-matlab.el" "org/ob-tangle.el" "org/ob.el" "org/ol-bbdb.el" -;;;;;; "org/ol-irc.el" "org/org-archive.el" "org/org-attach.el" -;;;;;; "org/org-clock.el" "org/org-datetree.el" "org/org-element.el" -;;;;;; "org/org-feed.el" "org/org-footnote.el" "org/org-id.el" "org/org-indent.el" -;;;;;; "org/org-install.el" "org/org-mobile.el" "org/org-plot.el" +;;;;;; "org/ol-irc.el" "org/ol.el" "org/org-archive.el" "org/org-attach.el" +;;;;;; "org/org-clock.el" "org/org-colview.el" "org/org-compat.el" +;;;;;; "org/org-datetree.el" "org/org-duration.el" "org/org-element.el" +;;;;;; "org/org-feed.el" "org/org-footnote.el" "org/org-goto.el" +;;;;;; "org/org-id.el" "org/org-indent.el" "org/org-install.el" +;;;;;; "org/org-keys.el" "org/org-lint.el" "org/org-list.el" "org/org-macs.el" +;;;;;; "org/org-mobile.el" "org/org-num.el" "org/org-plot.el" "org/org-refile.el" ;;;;;; "org/org-table.el" "org/org-timer.el" "org/ox-ascii.el" "org/ox-beamer.el" ;;;;;; "org/ox-html.el" "org/ox-icalendar.el" "org/ox-latex.el" -;;;;;; "org/ox-man.el" "org/ox-md.el" "org/ox-odt.el" "org/ox-org.el" -;;;;;; "org/ox-publish.el" "org/ox-texinfo.el" "org/ox.el" "progmodes/elisp-mode.el" +;;;;;; "org/ox-md.el" "org/ox-odt.el" "org/ox-org.el" "org/ox-publish.el" +;;;;;; "org/ox-texinfo.el" "org/ox.el" "progmodes/elisp-mode.el" ;;;;;; "progmodes/prog-mode.el" "ps-mule.el" "register.el" "replace.el" ;;;;;; "rfn-eshadow.el" "select.el" "simple.el" "startup.el" "subdirs.el" ;;;;;; "subr.el" "tab-bar.el" "textmodes/fill.el" "textmodes/page.el" diff --git a/lisp/leim/quail/arabic.el b/lisp/leim/quail/arabic.el index dd840c344cc..e5bd62b9096 100644 --- a/lisp/leim/quail/arabic.el +++ b/lisp/leim/quail/arabic.el @@ -1,6 +1,6 @@ ;;; arabic.el --- Quail package for inputting Arabic -*- coding: utf-8; lexical-binding:t -*- -;; Copyright (C) 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2007-2021 Free Software Foundation, Inc. ;; Author: James Cloos <cloos@jhcloos.com> ;; Keywords: mule, input method, Arabic diff --git a/lisp/leim/quail/compose.el b/lisp/leim/quail/compose.el index de251a364e6..f7ac83aec5b 100644 --- a/lisp/leim/quail/compose.el +++ b/lisp/leim/quail/compose.el @@ -1,6 +1,6 @@ ;;; compose.el --- Quail package for Multi_key character composition -*-coding: utf-8;-*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; Author: Juri Linkov <juri@linkov.net> ;; Keywords: multilingual, input method, i18n diff --git a/lisp/leim/quail/croatian.el b/lisp/leim/quail/croatian.el index 2efd7ce6bbd..08f1e47b6f3 100644 --- a/lisp/leim/quail/croatian.el +++ b/lisp/leim/quail/croatian.el @@ -1,6 +1,6 @@ ;;; croatian.el -- Quail package for inputting Croatian -*-coding: utf-8; lexical-binding:t -*- -;; Copyright (C) 2003-2020 Free Software Foundation, Inc. +;; Copyright (C) 2003-2021 Free Software Foundation, Inc. ;; Author: Hrvoje Nikšić <hrvoje.niksic@avl.com> ;; Keywords: i18n diff --git a/lisp/leim/quail/cyril-jis.el b/lisp/leim/quail/cyril-jis.el index 730042b4bc0..689f738f5ee 100644 --- a/lisp/leim/quail/cyril-jis.el +++ b/lisp/leim/quail/cyril-jis.el @@ -1,6 +1,6 @@ ;;; cyril-jis.el --- Quail package for inputting JISX0208 Cyrillic letters -*- lexical-binding: t -*- -;; Copyright (C) 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 2001-2021 Free Software Foundation, Inc. ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, ;; 2006, 2007, 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) diff --git a/lisp/leim/quail/cyrillic.el b/lisp/leim/quail/cyrillic.el index fa209f0bce2..3654aca192c 100644 --- a/lisp/leim/quail/cyrillic.el +++ b/lisp/leim/quail/cyrillic.el @@ -1,6 +1,6 @@ ;;; cyrillic.el --- Quail package for inputting Cyrillic characters -*- lexical-binding: t -*- -;; Copyright (C) 1997-1998, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997-1998, 2001-2021 Free Software Foundation, Inc. ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, ;; 2006, 2007, 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) diff --git a/lisp/leim/quail/czech.el b/lisp/leim/quail/czech.el index 34416c2b91e..78b50117225 100644 --- a/lisp/leim/quail/czech.el +++ b/lisp/leim/quail/czech.el @@ -1,6 +1,6 @@ ;;; czech.el --- Quail package for inputting Czech -*-coding: utf-8; lexical-binding:t -*- -;; Copyright (C) 1998, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998, 2001-2021 Free Software Foundation, Inc. ;; Author: Milan Zamazal <pdm@zamazal.org> ;; Maintainer: Pavel Janík <Pavel@Janik.cz> diff --git a/lisp/leim/quail/georgian.el b/lisp/leim/quail/georgian.el index e66477a66aa..2389d8138ae 100644 --- a/lisp/leim/quail/georgian.el +++ b/lisp/leim/quail/georgian.el @@ -1,6 +1,6 @@ ;;; georgian.el --- Quail package for inputting Georgian characters -*- coding: utf-8; lexical-binding:t -*- -;; Copyright (C) 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 2001-2021 Free Software Foundation, Inc. ;; Author: Dave Love <fx@gnu.org> ;; Keywords: i18n diff --git a/lisp/leim/quail/greek.el b/lisp/leim/quail/greek.el index eedfb9d0f60..89ebd447471 100644 --- a/lisp/leim/quail/greek.el +++ b/lisp/leim/quail/greek.el @@ -1,6 +1,6 @@ ;;; greek.el --- Quail package for inputting Greek -*- coding: utf-8; lexical-binding:t -*- -;; Copyright (C) 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 2001-2021 Free Software Foundation, Inc. ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, ;; 2006, 2007, 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) diff --git a/lisp/leim/quail/hangul.el b/lisp/leim/quail/hangul.el index 16f8de9cfbe..20762d36f07 100644 --- a/lisp/leim/quail/hangul.el +++ b/lisp/leim/quail/hangul.el @@ -1,6 +1,6 @@ ;;; hangul.el --- Korean Hangul input method -;; Copyright (C) 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2008-2021 Free Software Foundation, Inc. ;; Author: Jihyun Cho <jihyun.jo@gmail.com> ;; Keywords: multilingual, input method, Korean, Hangul diff --git a/lisp/leim/quail/hanja.el b/lisp/leim/quail/hanja.el index 3ca17c67bd3..7095bcf38ae 100644 --- a/lisp/leim/quail/hanja.el +++ b/lisp/leim/quail/hanja.el @@ -1,6 +1,6 @@ ;;; hanja.el --- Quail-package for Korean Hanja (KSC5601) -*-coding: utf-8; lexical-binding: t -*- -;; Copyright (C) 1997, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997, 2001-2021 Free Software Foundation, Inc. ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, ;; 2006, 2007, 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) diff --git a/lisp/leim/quail/hanja3.el b/lisp/leim/quail/hanja3.el index b380d40853d..080ba0e0fde 100644 --- a/lisp/leim/quail/hanja3.el +++ b/lisp/leim/quail/hanja3.el @@ -1,6 +1,6 @@ ;;; hanja3.el --- Quail-package for Korean Hanja (KSC5601) -*-coding: utf-8; lexical-binding: t -*- -;; Copyright (C) 1997, 1999, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997, 1999, 2001-2021 Free Software Foundation, Inc. ;; Author: Koaunghi Un <koaunghi.un@zdv.uni-tuebingen.de> ;; Keywords: mule, quail, multilingual, input method, Korean, Hanja diff --git a/lisp/leim/quail/indian.el b/lisp/leim/quail/indian.el index 100ae63f6ac..6f5054e3f62 100644 --- a/lisp/leim/quail/indian.el +++ b/lisp/leim/quail/indian.el @@ -1,6 +1,6 @@ ;;; indian.el --- Quail packages for inputting Indian -;; Copyright (C) 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 2000-2021 Free Software Foundation, Inc. ;; Author: KAWABATA, Taichi <kawabata@m17n.org> diff --git a/lisp/leim/quail/ipa-praat.el b/lisp/leim/quail/ipa-praat.el index cc577c6aff2..0920bc79009 100644 --- a/lisp/leim/quail/ipa-praat.el +++ b/lisp/leim/quail/ipa-praat.el @@ -1,6 +1,6 @@ ;;; ipa-praat.el --- Inputting IPA characters with the conventions of Praat -*- lexical-binding: t -*- -;; Copyright (C) 2011-2020 Free Software Foundation, Inc. +;; Copyright (C) 2011-2021 Free Software Foundation, Inc. ;; Author: Oliver Scholz <epameinondas@gmx.de> ;; Keywords: multilingual, input method, IPA diff --git a/lisp/leim/quail/ipa.el b/lisp/leim/quail/ipa.el index cbc555d1faa..d9f58885f20 100644 --- a/lisp/leim/quail/ipa.el +++ b/lisp/leim/quail/ipa.el @@ -1,6 +1,6 @@ ;;; ipa.el --- Quail package for inputting IPA characters -*-coding: utf-8;-*- -;; Copyright (C) 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2009-2021 Free Software Foundation, Inc. ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, ;; 2006, 2007, 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) diff --git a/lisp/leim/quail/japanese.el b/lisp/leim/quail/japanese.el index 37479974265..d7249d286fb 100644 --- a/lisp/leim/quail/japanese.el +++ b/lisp/leim/quail/japanese.el @@ -1,6 +1,6 @@ ;;; japanese.el --- Quail package for inputting Japanese -;; Copyright (C) 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 2001-2021 Free Software Foundation, Inc. ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, ;; 2006, 2007, 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) diff --git a/lisp/leim/quail/latin-alt.el b/lisp/leim/quail/latin-alt.el index 4661ba8cc84..0db952b67c4 100644 --- a/lisp/leim/quail/latin-alt.el +++ b/lisp/leim/quail/latin-alt.el @@ -1,6 +1,6 @@ ;;; latin-alt.el --- Quail package for inputting various European characters -*-coding: utf-8; lexical-binding: t -*- -;; Copyright (C) 1997-1998, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997-1998, 2001-2021 Free Software Foundation, Inc. ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, ;; 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) diff --git a/lisp/leim/quail/latin-ltx.el b/lisp/leim/quail/latin-ltx.el index f1a24bbd5fe..fd78253c4fb 100644 --- a/lisp/leim/quail/latin-ltx.el +++ b/lisp/leim/quail/latin-ltx.el @@ -1,6 +1,6 @@ ;;; latin-ltx.el --- Quail package for TeX-style input -*-coding: utf-8;-*- -;; Copyright (C) 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 2001-2021 Free Software Foundation, Inc. ;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, ;; 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) diff --git a/lisp/leim/quail/latin-post.el b/lisp/leim/quail/latin-post.el index 293c0c0b6ed..8e21ed80130 100644 --- a/lisp/leim/quail/latin-post.el +++ b/lisp/leim/quail/latin-post.el @@ -1,6 +1,6 @@ ;;; latin-post.el --- Quail packages for inputting various European characters -*-coding: utf-8; lexical-binding: t -*- -;; Copyright (C) 1997-1998, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997-1998, 2001-2021 Free Software Foundation, Inc. ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, ;; 2006, 2007, 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) diff --git a/lisp/leim/quail/latin-pre.el b/lisp/leim/quail/latin-pre.el index 802b70ec7cd..22006547c45 100644 --- a/lisp/leim/quail/latin-pre.el +++ b/lisp/leim/quail/latin-pre.el @@ -1,6 +1,6 @@ ;;; latin-pre.el --- Quail packages for inputting various European characters -*-coding: utf-8; lexical-binding: t -*- -;; Copyright (C) 1997-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997-2021 Free Software Foundation, Inc. ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, ;; 2006, 2007, 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) diff --git a/lisp/leim/quail/lrt.el b/lisp/leim/quail/lrt.el index 5b0988693f4..e05bc1e6cb7 100644 --- a/lisp/leim/quail/lrt.el +++ b/lisp/leim/quail/lrt.el @@ -1,6 +1,6 @@ ;;; lrt.el --- Quail package for inputting Lao characters by LRT method -*-coding: utf-8;-*- -;; Copyright (C) 1998, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998, 2001-2021 Free Software Foundation, Inc. ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, ;; 2006, 2007, 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) diff --git a/lisp/leim/quail/persian.el b/lisp/leim/quail/persian.el index fcbf727e93a..4157f886704 100644 --- a/lisp/leim/quail/persian.el +++ b/lisp/leim/quail/persian.el @@ -1,6 +1,6 @@ ;;; persian.el --- Quail package for inputting Persian/Farsi keyboard -*- coding: utf-8; lexical-binding: t -*- -;; Copyright (C) 2011-2020 Free Software Foundation, Inc. +;; Copyright (C) 2011-2021 Free Software Foundation, Inc. ;; Author: Mohsen BANAN <libre@mohsen.1.banan.byname.net> ;; X-URL: http://mohsen.1.banan.byname.net/contact diff --git a/lisp/leim/quail/programmer-dvorak.el b/lisp/leim/quail/programmer-dvorak.el index c544c62d07b..49f9d82bc0d 100644 --- a/lisp/leim/quail/programmer-dvorak.el +++ b/lisp/leim/quail/programmer-dvorak.el @@ -1,6 +1,6 @@ ;;; programmer-dvorak.el --- Quail package for the programmer Dvorak layout -*- lexical-binding: t -*- -;; Copyright (C) 2015-2020 Free Software Foundation, Inc. +;; Copyright (C) 2015-2021 Free Software Foundation, Inc. ;; Author: Joakim Jalap <joakim.jalap@fastmail.com> diff --git a/lisp/leim/quail/py-punct.el b/lisp/leim/quail/py-punct.el index 76bf6125ef8..2a61795a135 100644 --- a/lisp/leim/quail/py-punct.el +++ b/lisp/leim/quail/py-punct.el @@ -1,6 +1,6 @@ ;;; py-punct.el --- Quail packages for Chinese (pinyin + extra symbols) -*- lexical-binding: t -*- -;; Copyright (C) 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 2001-2021 Free Software Foundation, Inc. ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, ;; 2006, 2007, 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) diff --git a/lisp/leim/quail/rfc1345.el b/lisp/leim/quail/rfc1345.el index 7f98021dfe8..a07208294f7 100644 --- a/lisp/leim/quail/rfc1345.el +++ b/lisp/leim/quail/rfc1345.el @@ -1,6 +1,6 @@ ;;; rfc1345.el --- Quail method for RFC 1345 mnemonics -*- coding: utf-8; lexical-binding: t -*- -;; Copyright (C) 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 2001-2021 Free Software Foundation, Inc. ;; Author: Dave Love <fx@gnu.org> ;; Keywords: i18n diff --git a/lisp/leim/quail/sami.el b/lisp/leim/quail/sami.el index 33fe2878dff..6c9b2d99cc0 100644 --- a/lisp/leim/quail/sami.el +++ b/lisp/leim/quail/sami.el @@ -1,6 +1,6 @@ ;;; sami.el --- Quail package for inputting Sámi -*-coding: utf-8; lexical-binding: t -*- -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; Author: Wojciech S. Gac <wojciech.s.gac@gmail.com> ;; Keywords: i18n, multilingual, input method, Sámi diff --git a/lisp/leim/quail/sgml-input.el b/lisp/leim/quail/sgml-input.el index df7ac984ce1..68add78e29d 100644 --- a/lisp/leim/quail/sgml-input.el +++ b/lisp/leim/quail/sgml-input.el @@ -1,6 +1,6 @@ ;;; sgml-input.el --- Quail method for Unicode entered as SGML entities -*- coding: utf-8; lexical-binding: t -*- -;; Copyright (C) 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 2001-2021 Free Software Foundation, Inc. ;; Author: Dave Love <fx@gnu.org> ;; Keywords: i18n diff --git a/lisp/leim/quail/sisheng.el b/lisp/leim/quail/sisheng.el index 7e25fbe12e3..8e7a500276a 100644 --- a/lisp/leim/quail/sisheng.el +++ b/lisp/leim/quail/sisheng.el @@ -1,6 +1,6 @@ ;;; sisheng.el --- sisheng input method for Chinese pinyin transliteration -;; Copyright (C) 2004-2020 Free Software Foundation, Inc. +;; Copyright (C) 2004-2021 Free Software Foundation, Inc. ;; Author: Werner LEMBERG <wl@gnu.org> diff --git a/lisp/leim/quail/slovak.el b/lisp/leim/quail/slovak.el index c306be1e558..53780cfd4a5 100644 --- a/lisp/leim/quail/slovak.el +++ b/lisp/leim/quail/slovak.el @@ -1,6 +1,6 @@ ;;; slovak.el --- Quail package for inputting Slovak -*-coding: utf-8; lexical-binding: t -*- -;; Copyright (C) 1998, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998, 2001-2021 Free Software Foundation, Inc. ;; Authors: Tibor Šimko <tibor.simko@fmph.uniba.sk> ;; Milan Zamazal <pdm@zamazal.org> diff --git a/lisp/leim/quail/symbol-ksc.el b/lisp/leim/quail/symbol-ksc.el index e346f7c7bd9..0583d64c2b6 100644 --- a/lisp/leim/quail/symbol-ksc.el +++ b/lisp/leim/quail/symbol-ksc.el @@ -1,6 +1,6 @@ ;;; symbol-ksc.el --- Quail-package for Korean Symbol (KSC5601) -*-coding: utf-8; lexical-binding: t -*- -;; Copyright (C) 1997, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997, 2001-2021 Free Software Foundation, Inc. ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, ;; 2006, 2007, 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) diff --git a/lisp/leim/quail/tamil-dvorak.el b/lisp/leim/quail/tamil-dvorak.el index 0a70c3bfe11..b2d48afa0a7 100644 --- a/lisp/leim/quail/tamil-dvorak.el +++ b/lisp/leim/quail/tamil-dvorak.el @@ -1,6 +1,6 @@ ;;; tamil-dvorak.el --- Quail package for Tamil input with Dvorak keyboard -*- lexical-binding: t -*- -;; Copyright (C) 2015-2020 Free Software Foundation, Inc. +;; Copyright (C) 2015-2021 Free Software Foundation, Inc. ;; Author: Shakthi Kannan <author@shakthimaan.com> diff --git a/lisp/leim/quail/tibetan.el b/lisp/leim/quail/tibetan.el index dad4950f6e3..a54763d56f6 100644 --- a/lisp/leim/quail/tibetan.el +++ b/lisp/leim/quail/tibetan.el @@ -1,6 +1,6 @@ ;;; tibetan.el --- Quail package for inputting Tibetan characters -*-coding: utf-8-emacs;-*- -;; Copyright (C) 1997, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997, 2001-2021 Free Software Foundation, Inc. ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, ;; 2006, 2007, 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) diff --git a/lisp/leim/quail/uni-input.el b/lisp/leim/quail/uni-input.el index bee73d8e743..c7cf6abe2aa 100644 --- a/lisp/leim/quail/uni-input.el +++ b/lisp/leim/quail/uni-input.el @@ -1,6 +1,6 @@ ;;; uni-input.el --- Hex Unicode input method -;; Copyright (C) 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 2001-2021 Free Software Foundation, Inc. ;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --git a/lisp/leim/quail/vntelex.el b/lisp/leim/quail/vntelex.el index 8d53ab0be04..22d23d47474 100644 --- a/lisp/leim/quail/vntelex.el +++ b/lisp/leim/quail/vntelex.el @@ -1,6 +1,6 @@ ;;; vntelex.el --- Quail package for Vietnamese by Telex method -*- lexical-binding: t -*- -;; Copyright (C) 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 2001-2021 Free Software Foundation, Inc. ;; Author: Werner Lemberg <wl@gnu.org> ;; Keywords: multilingual, input method, Vietnamese diff --git a/lisp/leim/quail/vnvni.el b/lisp/leim/quail/vnvni.el index e7973044b0a..faccc0afc53 100644 --- a/lisp/leim/quail/vnvni.el +++ b/lisp/leim/quail/vnvni.el @@ -1,6 +1,6 @@ ;;; vnvni.el --- Quail package for Vietnamese by VNI method -*- lexical-binding: t -*- -;; Copyright (C) 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 2001-2021 Free Software Foundation, Inc. ;; Author: Werner Lemberg <wl@gnu.org> ;; Nguyen Thai Ngoc Duy <pclouds@gmail.com> diff --git a/lisp/leim/quail/welsh.el b/lisp/leim/quail/welsh.el index a62d2f50955..f521d1464e9 100644 --- a/lisp/leim/quail/welsh.el +++ b/lisp/leim/quail/welsh.el @@ -1,6 +1,6 @@ ;;; welsh.el --- Quail package for inputting Welsh characters -*- coding: utf-8; lexical-binding: t -*- -;; Copyright (C) 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 2001-2021 Free Software Foundation, Inc. ;; Author: Dave Love <fx@gnu.org> ;; Keywords: i18n diff --git a/lisp/linum.el b/lisp/linum.el index e8c364245ae..824f016271d 100644 --- a/lisp/linum.el +++ b/lisp/linum.el @@ -1,6 +1,6 @@ ;;; linum.el --- display line numbers in the left margin -*- lexical-binding: t -*- -;; Copyright (C) 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2008-2021 Free Software Foundation, Inc. ;; Author: Markus Triska <markus.triska@gmx.at> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/loadhist.el b/lisp/loadhist.el index 8ac575e8e39..a60d6b29095 100644 --- a/lisp/loadhist.el +++ b/lisp/loadhist.el @@ -1,6 +1,6 @@ ;;; loadhist.el --- lisp functions for working with feature groups -;; Copyright (C) 1995, 1998, 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 1995, 1998, 2000-2021 Free Software Foundation, Inc. ;; Author: Eric S. Raymond <esr@snark.thyrsus.com> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/loadup.el b/lisp/loadup.el index e0174fcdb19..aefe91405cf 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -1,6 +1,6 @@ ;;; loadup.el --- load up standardly loaded Lisp files for Emacs -;; Copyright (C) 1985-1986, 1992, 1994, 2001-2020 Free Software +;; Copyright (C) 1985-1986, 1992, 1994, 2001-2021 Free Software ;; Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/locate.el b/lisp/locate.el index 14fd2608034..c4dbe2af02b 100644 --- a/lisp/locate.el +++ b/lisp/locate.el @@ -1,6 +1,6 @@ ;;; locate.el --- interface to the locate command -*- lexical-binding:t -*- -;; Copyright (C) 1996, 1998, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996, 1998, 2001-2021 Free Software Foundation, Inc. ;; Author: Peter Breton <pbreton@cs.umb.edu> ;; Keywords: unix files diff --git a/lisp/lpr.el b/lisp/lpr.el index b45e9c733ec..012d2518929 100644 --- a/lisp/lpr.el +++ b/lisp/lpr.el @@ -1,6 +1,6 @@ ;;; lpr.el --- print Emacs buffer on line printer -;; Copyright (C) 1985, 1988, 1992, 1994, 2001-2020 Free Software +;; Copyright (C) 1985, 1988, 1992, 1994, 2001-2021 Free Software ;; Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/ls-lisp.el b/lisp/ls-lisp.el index e2646209313..3721e86475c 100644 --- a/lisp/ls-lisp.el +++ b/lisp/ls-lisp.el @@ -1,6 +1,6 @@ ;;; ls-lisp.el --- emulate insert-directory completely in Emacs Lisp -*- lexical-binding: t -*- -;; Copyright (C) 1992, 1994, 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 1992, 1994, 2000-2021 Free Software Foundation, Inc. ;; Author: Sebastian Kremer <sk@thp.uni-koeln.de> ;; Modified by: Francis J. Wright <F.J.Wright@maths.qmw.ac.uk> diff --git a/lisp/macros.el b/lisp/macros.el index f90ad429b29..faa1f0bd35d 100644 --- a/lisp/macros.el +++ b/lisp/macros.el @@ -1,6 +1,6 @@ ;;; macros.el --- non-primitive commands for keyboard macros -*- lexical-binding:t -*- -;; Copyright (C) 1985-1987, 1992, 1994-1995, 2001-2020 Free Software +;; Copyright (C) 1985-1987, 1992, 1994-1995, 2001-2021 Free Software ;; Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/mail/binhex.el b/lisp/mail/binhex.el index 035bb32fa12..edb52b65789 100644 --- a/lisp/mail/binhex.el +++ b/lisp/mail/binhex.el @@ -1,6 +1,6 @@ ;;; binhex.el --- decode BinHex-encoded text -*- lexical-binding:t -*- -;; Copyright (C) 1998-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998-2021 Free Software Foundation, Inc. ;; Author: Shenghuo Zhu <zsh@cs.rochester.edu> ;; Keywords: binhex news diff --git a/lisp/mail/blessmail.el b/lisp/mail/blessmail.el index 242714db968..505ce5d4767 100644 --- a/lisp/mail/blessmail.el +++ b/lisp/mail/blessmail.el @@ -1,6 +1,6 @@ ;;; blessmail.el --- decide whether movemail needs special privileges -*- no-byte-compile: t -*- -;; Copyright (C) 1994, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1994, 2001-2021 Free Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org ;; Keywords: internal diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el index 7348324dcf1..fa9e89e6fe0 100644 --- a/lisp/mail/emacsbug.el +++ b/lisp/mail/emacsbug.el @@ -1,6 +1,6 @@ ;;; emacsbug.el --- command to report Emacs bugs to appropriate mailing list -;; Copyright (C) 1985, 1994, 1997-1998, 2000-2020 Free Software +;; Copyright (C) 1985, 1994, 1997-1998, 2000-2021 Free Software ;; Foundation, Inc. ;; Author: K. Shane Hartman diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el index 2907093ea71..2bcbdf4a223 100644 --- a/lisp/mail/feedmail.el +++ b/lisp/mail/feedmail.el @@ -628,16 +628,19 @@ address via a command line option, \"-f\". Unfortunately, it also has a widely disliked default behavior of selling you out if you do that by inserting an unattractive warning in the headers. It looks something like this: - X-Authentication-Warning: u1.example.com: niceguy set sender to niceguy@example.com using -f - -It is possible to configure sendmail to not do this, but such a reconfiguration -is not an option for many users. As this is the default behavior of most -sendmail installations, one can mostly only wish it were otherwise. If feedmail -believes the sendmail program will sell you out this way, it won't use the \"-f\" -option when calling sendmail. If it doesn't think sendmail will sell you out, -it will use the \"-f\" \(since it is a handy feature). You control what -feedmail thinks with this variable. The default is nil, meaning that feedmail -will believe that sendmail will sell you out." + X-Authentication-Warning: u1.example.com: niceguy set + sender to niceguy@example.com using -f + +It is possible to configure sendmail to not do this, but such a +reconfiguration is not an option for many users. As this is the +default behavior of most sendmail installations, one can mostly +only wish it were otherwise. If feedmail believes the sendmail +program will sell you out this way, it won't use the \"-f\" +option when calling sendmail. If it doesn't think sendmail will +sell you out, it will use the \"-f\" \(since it is a handy +feature). You control what feedmail thinks with this variable. +The default is nil, meaning that feedmail will believe that +sendmail will sell you out." :version "24.1" :group 'feedmail-headers :type 'boolean @@ -1338,19 +1341,22 @@ variable, but may depend on its value as described here.") (defun feedmail-mail-send-hook-splitter () "Facilitate dividing `mail-send-hook' things into queued and immediate cases. -If you have `mail-send-hook' functions that should only be called for sending/ -queueing messages or only be called for the sending of queued messages, this is -for you. Add this function to `mail-send-hook' with something like this: +If you have `mail-send-hook' functions that should only be called +for sending/ queueing messages or only be called for the sending +of queued messages, this is for you. Add this function to +`mail-send-hook' with something like this: (add-hook \\='mail-send-hook \\='feedmail-mail-send-hook-splitter) -Then add the functions you want called to either `feedmail-mail-send-hook-queued' -or `feedmail-mail-send-hook', as appropriate. The distinction is that -`feedmail-mail-send-hook' will be called when you send mail from a composition -buffer (typically by typing C-c C-c), whether the message is sent immediately -or placed in the queue or drafts directory. `feedmail-mail-send-hook-queued' is -called when messages are being sent from the queue directory, typically via a -call to `feedmail-run-the-queue'." +Then add the functions you want called to either +`feedmail-mail-send-hook-queued' or `feedmail-mail-send-hook', as +appropriate. The distinction is that `feedmail-mail-send-hook' +will be called when you send mail from a composition +buffer (typically by typing C-c C-c), whether the message is sent +immediately or placed in the queue or drafts directory. +`feedmail-mail-send-hook-queued' is called when messages are +being sent from the queue directory, typically via a call to +`feedmail-run-the-queue'." (feedmail-say-debug ">in-> feedmail-mail-send-hook-splitter %s" feedmail-queue-runner-is-active) (if feedmail-queue-runner-is-active (run-hooks 'feedmail-mail-send-hook-queued) @@ -2069,10 +2075,10 @@ internally by feedmail): after-run (the queue has just been run, possibly sending messages) WHAT-EVENT is used as a key into the table `feedmail-queue-reminder-alist'. If -the associated value is a function, it is called without arguments and is expected -to perform the reminder activity. You can supply your own reminder functions -by redefining `feedmail-queue-reminder-alist'. If you don't want any reminders, -you can set `feedmail-queue-reminder-alist' to nil." +the associated value is a function, it is called without arguments and is +expected to perform the reminder activity. You can supply your own reminder +functions by redefining `feedmail-queue-reminder-alist'. If you don't want any +reminders, you can set `feedmail-queue-reminder-alist' to nil." (interactive "p") (feedmail-say-debug ">in-> feedmail-queue-reminder %s" what-event) (let ((key (if (and what-event (symbolp what-event)) what-event 'on-demand)) entry reminder) @@ -2967,7 +2973,8 @@ probably not appropriate for you." (defun feedmail-fiddle-list-of-fiddle-plexes (list-of-fiddle-plexes) - "Fiddling based on a list of fiddle-plexes. Values t, nil, and string are pointless." + "Fiddling based on a list of fiddle-plexes. +Values t, nil, and string are pointless." (feedmail-say-debug ">in-> feedmail-fiddle-list-of-fiddle-plexes") ;; default is to fall off the end of the list and do nothing (let ((lofp list-of-fiddle-plexes) fp) diff --git a/lisp/mail/flow-fill.el b/lisp/mail/flow-fill.el index b357b3e2563..e93ba547a89 100644 --- a/lisp/mail/flow-fill.el +++ b/lisp/mail/flow-fill.el @@ -1,6 +1,6 @@ ;;; flow-fill.el --- interpret RFC2646 "flowed" text -*- lexical-binding:t -*- -;; Copyright (C) 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 2000-2021 Free Software Foundation, Inc. ;; Author: Simon Josefsson <jas@pdc.kth.se> ;; Keywords: mail diff --git a/lisp/mail/footnote.el b/lisp/mail/footnote.el index 67bfbf703bb..ea109eec12a 100644 --- a/lisp/mail/footnote.el +++ b/lisp/mail/footnote.el @@ -1,6 +1,6 @@ ;;; footnote.el --- footnote support for message mode -*- lexical-binding:t -*- -;; Copyright (C) 1997, 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997, 2000-2021 Free Software Foundation, Inc. ;; Author: Steven L Baur <steve@xemacs.org> (1997-2011) ;; Boruch Baum <boruch_baum@gmx.com> (2017-) diff --git a/lisp/mail/hashcash.el b/lisp/mail/hashcash.el index a2705d659a4..b4889eec46f 100644 --- a/lisp/mail/hashcash.el +++ b/lisp/mail/hashcash.el @@ -1,6 +1,6 @@ ;;; hashcash.el --- Add hashcash payments to email -*- lexical-binding:t -*- -;; Copyright (C) 2003-2005, 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2003-2005, 2007-2021 Free Software Foundation, Inc. ;; Written by: Paul Foley <mycroft@actrix.gen.nz> (1997-2002) ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/mail/ietf-drums.el b/lisp/mail/ietf-drums.el index a136ccf14e7..795e37dced6 100644 --- a/lisp/mail/ietf-drums.el +++ b/lisp/mail/ietf-drums.el @@ -1,6 +1,6 @@ ;;; ietf-drums.el --- Functions for parsing RFC 2822 headers -*- lexical-binding:t -*- -;; Copyright (C) 1998-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; This file is part of GNU Emacs. diff --git a/lisp/mail/mail-extr.el b/lisp/mail/mail-extr.el index 49dfd2ee874..4e3bf78c807 100644 --- a/lisp/mail/mail-extr.el +++ b/lisp/mail/mail-extr.el @@ -1,6 +1,6 @@ ;;; mail-extr.el --- extract full name and address from email header -;; Copyright (C) 1991-1994, 1997, 2001-2020 Free Software Foundation, +;; Copyright (C) 1991-1994, 1997, 2001-2021 Free Software Foundation, ;; Inc. ;; Author: Joe Wells <jbw@cs.bu.edu> diff --git a/lisp/mail/mail-hist.el b/lisp/mail/mail-hist.el index 34bef2cfb8a..37c8ad68860 100644 --- a/lisp/mail/mail-hist.el +++ b/lisp/mail/mail-hist.el @@ -1,6 +1,6 @@ ;;; mail-hist.el --- headers and message body history for outgoing mail -;; Copyright (C) 1994, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1994, 2001-2021 Free Software Foundation, Inc. ;; Author: Karl Fogel <kfogel@red-bean.com> ;; Created: March, 1994 diff --git a/lisp/mail/mail-parse.el b/lisp/mail/mail-parse.el index e0274c8a11b..e72ed828494 100644 --- a/lisp/mail/mail-parse.el +++ b/lisp/mail/mail-parse.el @@ -1,6 +1,6 @@ ;;; mail-parse.el --- Interface functions for parsing mail -*- lexical-binding: t -*- -;; Copyright (C) 1998-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; This file is part of GNU Emacs. diff --git a/lisp/mail/mail-prsvr.el b/lisp/mail/mail-prsvr.el index 7c67c49b0b4..a9b5a4422d4 100644 --- a/lisp/mail/mail-prsvr.el +++ b/lisp/mail/mail-prsvr.el @@ -1,6 +1,6 @@ ;;; mail-prsvr.el --- Interface variables for parsing mail -*- lexical-binding: t -*- -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; This file is part of GNU Emacs. diff --git a/lisp/mail/mail-utils.el b/lisp/mail/mail-utils.el index 68b6fea0ede..ad2dee59c7c 100644 --- a/lisp/mail/mail-utils.el +++ b/lisp/mail/mail-utils.el @@ -1,6 +1,6 @@ ;;; mail-utils.el --- utility functions used both by rmail and rnews -;; Copyright (C) 1985, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1985, 2001-2021 Free Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org ;; Keywords: mail, news diff --git a/lisp/mail/mailabbrev.el b/lisp/mail/mailabbrev.el index de4fe257f02..2147049ab19 100644 --- a/lisp/mail/mailabbrev.el +++ b/lisp/mail/mailabbrev.el @@ -1,6 +1,6 @@ ;;; mailabbrev.el --- abbrev-expansion of mail aliases -;; Copyright (C) 1985-1987, 1992-1993, 1996-1997, 2000-2020 Free +;; Copyright (C) 1985-1987, 1992-1993, 1996-1997, 2000-2021 Free ;; Software Foundation, Inc. ;; Author: Jamie Zawinski <jwz@lucid.com; now jwz@jwz.org> diff --git a/lisp/mail/mailalias.el b/lisp/mail/mailalias.el index 2b76539e152..5a5488b2ec1 100644 --- a/lisp/mail/mailalias.el +++ b/lisp/mail/mailalias.el @@ -1,6 +1,6 @@ ;;; mailalias.el --- expand and complete mailing address aliases -*- lexical-binding: t -*- -;; Copyright (C) 1985, 1987, 1995-1997, 2001-2020 Free Software +;; Copyright (C) 1985, 1987, 1995-1997, 2001-2021 Free Software ;; Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/mail/mailclient.el b/lisp/mail/mailclient.el index 405ae17a12c..3cba6a60e8f 100644 --- a/lisp/mail/mailclient.el +++ b/lisp/mail/mailclient.el @@ -1,6 +1,6 @@ ;;; mailclient.el --- mail sending via system's mail client. -;; Copyright (C) 2005-2020 Free Software Foundation, Inc. +;; Copyright (C) 2005-2021 Free Software Foundation, Inc. ;; Author: David Reitter <david.reitter@gmail.com> ;; Keywords: mail diff --git a/lisp/mail/mailheader.el b/lisp/mail/mailheader.el index 801df100135..cbc01e4a442 100644 --- a/lisp/mail/mailheader.el +++ b/lisp/mail/mailheader.el @@ -1,6 +1,6 @@ ;;; mailheader.el --- mail header parsing, merging, formatting -;; Copyright (C) 1996, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996, 2001-2021 Free Software Foundation, Inc. ;; Author: Erik Naggum <erik@naggum.no> ;; Keywords: tools, mail, news diff --git a/lisp/mail/mspools.el b/lisp/mail/mspools.el index ab2649feb4b..970f52c3374 100644 --- a/lisp/mail/mspools.el +++ b/lisp/mail/mspools.el @@ -1,6 +1,6 @@ ;;; mspools.el --- show mail spools waiting to be read -*- lexical-binding: t; -*- -;; Copyright (C) 1997, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997, 2001-2021 Free Software Foundation, Inc. ;; Author: Stephen Eglen <stephen@gnu.org> ;; Created: 22 Jan 1997 diff --git a/lisp/mail/qp.el b/lisp/mail/qp.el index 10ac696fecf..02a371a8448 100644 --- a/lisp/mail/qp.el +++ b/lisp/mail/qp.el @@ -1,6 +1,6 @@ ;;; qp.el --- Quoted-Printable functions -*- lexical-binding:t -*- -;; Copyright (C) 1998-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Keywords: mail, extensions diff --git a/lisp/mail/reporter.el b/lisp/mail/reporter.el index 805dd12d3bd..f4de299f537 100644 --- a/lisp/mail/reporter.el +++ b/lisp/mail/reporter.el @@ -1,6 +1,6 @@ ;;; reporter.el --- customizable bug reporting of lisp programs -;; Copyright (C) 1993-1998, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1993-1998, 2001-2021 Free Software Foundation, Inc. ;; Author: 1993-1998 Barry A. Warsaw ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/mail/rfc2045.el b/lisp/mail/rfc2045.el index dba9c04cc83..c0672f18a98 100644 --- a/lisp/mail/rfc2045.el +++ b/lisp/mail/rfc2045.el @@ -1,6 +1,6 @@ ;;; rfc2045.el --- Functions for decoding rfc2045 headers -*- lexical-binding:t -*- -;; Copyright (C) 1998-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; This file is part of GNU Emacs. diff --git a/lisp/mail/rfc2047.el b/lisp/mail/rfc2047.el index 4aa0c2809b2..5b08713949f 100644 --- a/lisp/mail/rfc2047.el +++ b/lisp/mail/rfc2047.el @@ -1,6 +1,6 @@ ;;; rfc2047.el --- functions for encoding and decoding rfc2047 messages -*- lexical-binding:t -*- -;; Copyright (C) 1998-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; MORIOKA Tomohiko <morioka@jaist.ac.jp> diff --git a/lisp/mail/rfc2231.el b/lisp/mail/rfc2231.el index 17da60e0bee..6fb4502b23b 100644 --- a/lisp/mail/rfc2231.el +++ b/lisp/mail/rfc2231.el @@ -1,6 +1,6 @@ ;;; rfc2231.el --- Functions for decoding rfc2231 headers -*- lexical-binding:t -*- -;; Copyright (C) 1998-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; This file is part of GNU Emacs. diff --git a/lisp/mail/rfc2368.el b/lisp/mail/rfc2368.el index afa30590059..553f3cc3a54 100644 --- a/lisp/mail/rfc2368.el +++ b/lisp/mail/rfc2368.el @@ -1,6 +1,6 @@ ;;; rfc2368.el --- support for rfc2368 -*- lexical-binding:t -*- -;; Copyright (C) 1998, 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998, 2000-2021 Free Software Foundation, Inc. ;; Author: Sen Nagata <sen@eccosys.com> ;; Keywords: mail diff --git a/lisp/mail/rfc822.el b/lisp/mail/rfc822.el index 70480d4ede6..f07fcdfc9f1 100644 --- a/lisp/mail/rfc822.el +++ b/lisp/mail/rfc822.el @@ -1,6 +1,6 @@ ;;; rfc822.el --- hairy RFC 822 (or later) parser for mail, news, etc. -;; Copyright (C) 1986-1987, 1990, 2001-2020 Free Software Foundation, +;; Copyright (C) 1986-1987, 1990, 2001-2021 Free Software Foundation, ;; Inc. ;; Author: Richard Mlynarik <mly@eddie.mit.edu> diff --git a/lisp/mail/rmail-spam-filter.el b/lisp/mail/rmail-spam-filter.el index 4d8c9267f31..dda472eb30e 100644 --- a/lisp/mail/rmail-spam-filter.el +++ b/lisp/mail/rmail-spam-filter.el @@ -1,6 +1,6 @@ ;;; rmail-spam-filter.el --- spam filter for Rmail, the Emacs mail reader -;; Copyright (C) 2002-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002-2021 Free Software Foundation, Inc. ;; Keywords: email, spam, filter, rmail ;; Author: Eli Tziperman <eli AT deas.harvard.edu> ;; Package: rmail diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index 3c74edd1054..69797837cd2 100644 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el @@ -1,6 +1,6 @@ ;;; rmail.el --- main code of "RMAIL" mail reader for Emacs -*- lexical-binding:t -*- -;; Copyright (C) 1985-1988, 1993-1998, 2000-2020 Free Software +;; Copyright (C) 1985-1988, 1993-1998, 2000-2021 Free Software ;; Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/mail/rmailedit.el b/lisp/mail/rmailedit.el index 72a5603ddc2..2680ed7f3a3 100644 --- a/lisp/mail/rmailedit.el +++ b/lisp/mail/rmailedit.el @@ -1,6 +1,6 @@ ;;; rmailedit.el --- "RMAIL edit mode" Edit the current message -;; Copyright (C) 1985, 1994, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1985, 1994, 2001-2021 Free Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org ;; Keywords: mail diff --git a/lisp/mail/rmailkwd.el b/lisp/mail/rmailkwd.el index f5115ad06c2..657b3629bd1 100644 --- a/lisp/mail/rmailkwd.el +++ b/lisp/mail/rmailkwd.el @@ -1,6 +1,6 @@ ;;; rmailkwd.el --- part of the "RMAIL" mail reader for Emacs -;; Copyright (C) 1985, 1988, 1994, 2001-2020 Free Software Foundation, +;; Copyright (C) 1985, 1988, 1994, 2001-2021 Free Software Foundation, ;; Inc. ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/mail/rmailmm.el b/lisp/mail/rmailmm.el index 29c6dcf40e8..ab5b49aab92 100644 --- a/lisp/mail/rmailmm.el +++ b/lisp/mail/rmailmm.el @@ -1,6 +1,6 @@ ;;; rmailmm.el --- MIME decoding and display stuff for RMAIL -;; Copyright (C) 2006-2020 Free Software Foundation, Inc. +;; Copyright (C) 2006-2021 Free Software Foundation, Inc. ;; Author: Alexander Pohoyda ;; Alex Schroeder diff --git a/lisp/mail/rmailmsc.el b/lisp/mail/rmailmsc.el index 204f33db542..ef5f3c31bbc 100644 --- a/lisp/mail/rmailmsc.el +++ b/lisp/mail/rmailmsc.el @@ -1,6 +1,6 @@ ;;; rmailmsc.el --- miscellaneous support functions for the RMAIL mail reader -;; Copyright (C) 1985, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1985, 2001-2021 Free Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org ;; Keywords: mail diff --git a/lisp/mail/rmailout.el b/lisp/mail/rmailout.el index cfde335b54f..9305a48b8d8 100644 --- a/lisp/mail/rmailout.el +++ b/lisp/mail/rmailout.el @@ -1,6 +1,6 @@ ;;; rmailout.el --- "RMAIL" mail reader for Emacs: output message to a file -;; Copyright (C) 1985, 1987, 1993-1994, 2001-2020 Free Software +;; Copyright (C) 1985, 1987, 1993-1994, 2001-2021 Free Software ;; Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/mail/rmailsort.el b/lisp/mail/rmailsort.el index c2749be9d07..2c42e6c8598 100644 --- a/lisp/mail/rmailsort.el +++ b/lisp/mail/rmailsort.el @@ -1,6 +1,6 @@ ;;; rmailsort.el --- Rmail: sort messages -;; Copyright (C) 1990, 1993-1994, 2001-2020 Free Software Foundation, +;; Copyright (C) 1990, 1993-1994, 2001-2021 Free Software Foundation, ;; Inc. ;; Author: Masanobu UMEDA <umerin@mse.kyutech.ac.jp> diff --git a/lisp/mail/rmailsum.el b/lisp/mail/rmailsum.el index 9ccc0cfee97..60b67edf85a 100644 --- a/lisp/mail/rmailsum.el +++ b/lisp/mail/rmailsum.el @@ -1,6 +1,6 @@ ;;; rmailsum.el --- make summary buffers for the mail reader -*- lexical-binding:t -*- -;; Copyright (C) 1985, 1993-1996, 2000-2020 Free Software Foundation, +;; Copyright (C) 1985, 1993-1996, 2000-2021 Free Software Foundation, ;; Inc. ;; Maintainer: emacs-devel@gnu.org @@ -786,6 +786,11 @@ the message being processed." ;; To: =?UTF-8?Q?=C5=A0t=C4=9Bp=C3=A1n_?= =?UTF-8?Q?N=C4=9Bmec?= ;; <stepnem@gmail.com> (setq from (rfc2047-decode-string from)) + ;; We cannot tolerate any leftover newlines in From, + ;; as that disrupts the rmail-summary display. + ;; Newlines can be left in From if it was malformed, + ;; e.g. had unbalanced quotes. + (setq from (replace-regexp-in-string "\n+" " " from)) (setq len (length from)) (setq mch (string-match "[@%]" from)) (format "%25s" diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el index 02a852f19bd..9f6fd6de224 100644 --- a/lisp/mail/sendmail.el +++ b/lisp/mail/sendmail.el @@ -1,6 +1,6 @@ ;;; sendmail.el --- mail sending commands for Emacs -*- lexical-binding:t -*- -;; Copyright (C) 1985-1986, 1992-1996, 1998, 2000-2020 Free Software +;; Copyright (C) 1985-1986, 1992-1996, 1998, 2000-2021 Free Software ;; Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el index 63c8f14085a..5526f2fbe64 100644 --- a/lisp/mail/smtpmail.el +++ b/lisp/mail/smtpmail.el @@ -1,6 +1,6 @@ ;;; smtpmail.el --- simple SMTP protocol (RFC 821) for sending mail -*- lexical-binding:t -*- -;; Copyright (C) 1995-1996, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1995-1996, 2001-2021 Free Software Foundation, Inc. ;; Author: Tomoji Kagatani <kagatani@rbc.ncl.omron.co.jp> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/mail/supercite.el b/lisp/mail/supercite.el index 9b7af0111e2..5766c791878 100644 --- a/lisp/mail/supercite.el +++ b/lisp/mail/supercite.el @@ -1,6 +1,6 @@ ;;; supercite.el --- minor mode for citing mail and news replies -;; Copyright (C) 1993, 1997, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1993, 1997, 2001-2021 Free Software Foundation, Inc. ;; Author: 1993 Barry A. Warsaw <bwarsaw@python.org> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/mail/uce.el b/lisp/mail/uce.el index 2a1e4f35538..a573c8a2673 100644 --- a/lisp/mail/uce.el +++ b/lisp/mail/uce.el @@ -1,6 +1,6 @@ ;;; uce.el --- facilitate reply to unsolicited commercial email -;; Copyright (C) 1996, 1998, 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996, 1998, 2000-2021 Free Software Foundation, Inc. ;; Author: stanislav shalunov <shalunov@mccme.ru> ;; Created: 10 Dec 1996 diff --git a/lisp/mail/undigest.el b/lisp/mail/undigest.el index 9ac5f35988b..bf57ed6fa6f 100644 --- a/lisp/mail/undigest.el +++ b/lisp/mail/undigest.el @@ -1,6 +1,6 @@ ;;; undigest.el --- digest-cracking support for the RMAIL mail reader -*- lexical-binding:t -*- -;; Copyright (C) 1985-1986, 1994, 1996, 2001-2020 Free Software +;; Copyright (C) 1985-1986, 1994, 1996, 2001-2021 Free Software ;; Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/mail/unrmail.el b/lisp/mail/unrmail.el index e1f137819dc..34de416c959 100644 --- a/lisp/mail/unrmail.el +++ b/lisp/mail/unrmail.el @@ -1,6 +1,6 @@ ;;; unrmail.el --- convert Rmail Babyl files to mbox files -;; Copyright (C) 1992, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1992, 2001-2021 Free Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org ;; Keywords: mail diff --git a/lisp/mail/uudecode.el b/lisp/mail/uudecode.el index 0dce9b7b726..fdd402e0fa0 100644 --- a/lisp/mail/uudecode.el +++ b/lisp/mail/uudecode.el @@ -1,6 +1,6 @@ ;;; uudecode.el -- elisp native uudecode -*- lexical-binding:t -*- -;; Copyright (C) 1998-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998-2021 Free Software Foundation, Inc. ;; Author: Shenghuo Zhu <zsh@cs.rochester.edu> ;; Keywords: uudecode news diff --git a/lisp/mail/yenc.el b/lisp/mail/yenc.el index 58e2965940b..0ab6d85da8e 100644 --- a/lisp/mail/yenc.el +++ b/lisp/mail/yenc.el @@ -1,6 +1,6 @@ ;;; yenc.el --- elisp native yenc decoder -*- lexical-binding:t -*- -;; Copyright (C) 2002-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002-2021 Free Software Foundation, Inc. ;; Author: Jesper Harder <harder@ifa.au.dk> ;; Keywords: yenc news diff --git a/lisp/makesum.el b/lisp/makesum.el index 673cb15d11e..a7e88dbaa2a 100644 --- a/lisp/makesum.el +++ b/lisp/makesum.el @@ -1,6 +1,6 @@ ;;; makesum.el --- generate key binding summary for Emacs -*- lexical-binding:t -*- -;; Copyright (C) 1985, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1985, 2001-2021 Free Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org ;; Keywords: help diff --git a/lisp/man.el b/lisp/man.el index 8430201c562..ca50b3a2fa3 100644 --- a/lisp/man.el +++ b/lisp/man.el @@ -1,6 +1,6 @@ ;;; man.el --- browse UNIX manual pages -*- lexical-binding: t -*- -;; Copyright (C) 1993-1994, 1996-1997, 2001-2020 Free Software +;; Copyright (C) 1993-1994, 1996-1997, 2001-2021 Free Software ;; Foundation, Inc. ;; Author: Barry A. Warsaw <bwarsaw@cen.com> diff --git a/lisp/master.el b/lisp/master.el index 88baa1f8218..796f2189d66 100644 --- a/lisp/master.el +++ b/lisp/master.el @@ -1,6 +1,6 @@ ;;; master.el --- make a buffer the master over another buffer -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: Alex Schroeder <alex@gnu.org> ;; Old-Version: 1.0.2 diff --git a/lisp/mb-depth.el b/lisp/mb-depth.el index 7ee7525d9f3..06da0739d6b 100644 --- a/lisp/mb-depth.el +++ b/lisp/mb-depth.el @@ -1,6 +1,6 @@ ;;; mb-depth.el --- Indicate minibuffer-depth in prompt -*- lexical-binding: t -*- ;; -;; Copyright (C) 2006-2020 Free Software Foundation, Inc. +;; Copyright (C) 2006-2021 Free Software Foundation, Inc. ;; ;; Author: Miles Bader <miles@gnu.org> ;; Keywords: convenience diff --git a/lisp/md4.el b/lisp/md4.el index 11c91307afc..771d9f9f0d4 100644 --- a/lisp/md4.el +++ b/lisp/md4.el @@ -1,6 +1,6 @@ ;;; md4.el --- MD4 Message Digest Algorithm. -*- lexical-binding: t -*- -;; Copyright (C) 2001, 2004, 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2001, 2004, 2007-2021 Free Software Foundation, Inc. ;; Author: Taro Kawagishi <tarok@transpulse.org> ;; Keywords: MD4 diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el index c6ced689a67..c4eae686bd7 100644 --- a/lisp/menu-bar.el +++ b/lisp/menu-bar.el @@ -1,6 +1,6 @@ ;;; menu-bar.el --- define a default menu bar -;; Copyright (C) 1993-1995, 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 1993-1995, 2000-2021 Free Software Foundation, Inc. ;; Author: Richard M. Stallman ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/mh-e/ChangeLog.1 b/lisp/mh-e/ChangeLog.1 index d30441f91a8..f1aeca65479 100644 --- a/lisp/mh-e/ChangeLog.1 +++ b/lisp/mh-e/ChangeLog.1 @@ -11419,7 +11419,7 @@ (dist): Leave release in current directory. - Copyright (C) 2003-2020 Free Software Foundation, Inc. + Copyright (C) 2003-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lisp/mh-e/ChangeLog.2 b/lisp/mh-e/ChangeLog.2 index 02a0c07a570..b6b16f7d79c 100644 --- a/lisp/mh-e/ChangeLog.2 +++ b/lisp/mh-e/ChangeLog.2 @@ -3673,7 +3673,7 @@ See ChangeLog.1 for earlier changes. - Copyright (C) 2005-2020 Free Software Foundation, Inc. + Copyright (C) 2005-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lisp/mh-e/mh-acros.el b/lisp/mh-e/mh-acros.el index 8e610ec2740..af6f2f1ab02 100644 --- a/lisp/mh-e/mh-acros.el +++ b/lisp/mh-e/mh-acros.el @@ -1,6 +1,6 @@ ;;; mh-acros.el --- macros used in MH-E -;; Copyright (C) 2004, 2006-2020 Free Software Foundation, Inc. +;; Copyright (C) 2004, 2006-2021 Free Software Foundation, Inc. ;; Author: Satyaki Das <satyaki@theforce.stanford.edu> ;; Maintainer: Bill Wohler <wohler@newt.com> diff --git a/lisp/mh-e/mh-alias.el b/lisp/mh-e/mh-alias.el index d037bdce887..012725cab60 100644 --- a/lisp/mh-e/mh-alias.el +++ b/lisp/mh-e/mh-alias.el @@ -1,6 +1,6 @@ ;;; mh-alias.el --- MH-E mail alias completion and expansion -;; Copyright (C) 1994-1997, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1994-1997, 2001-2021 Free Software Foundation, Inc. ;; Author: Peter S. Galbraith <psg@debian.org> ;; Maintainer: Bill Wohler <wohler@newt.com> diff --git a/lisp/mh-e/mh-buffers.el b/lisp/mh-e/mh-buffers.el index f1334b820fa..55f74b6585d 100644 --- a/lisp/mh-e/mh-buffers.el +++ b/lisp/mh-e/mh-buffers.el @@ -1,6 +1,6 @@ ;;; mh-buffers.el --- MH-E buffer constants and utilities -;; Copyright (C) 1993, 1995, 1997, 2000-2020 Free Software Foundation, +;; Copyright (C) 1993, 1995, 1997, 2000-2021 Free Software Foundation, ;; Inc. ;; Author: Bill Wohler <wohler@newt.com> diff --git a/lisp/mh-e/mh-comp.el b/lisp/mh-e/mh-comp.el index e766bca89d8..0dedb7e0ad0 100644 --- a/lisp/mh-e/mh-comp.el +++ b/lisp/mh-e/mh-comp.el @@ -1,6 +1,6 @@ ;;; mh-comp.el --- MH-E functions for composing and sending messages -;; Copyright (C) 1993, 1995, 1997, 2000-2020 Free Software Foundation, +;; Copyright (C) 1993, 1995, 1997, 2000-2021 Free Software Foundation, ;; Inc. ;; Author: Bill Wohler <wohler@newt.com> diff --git a/lisp/mh-e/mh-compat.el b/lisp/mh-e/mh-compat.el index c02b095b2ea..07bf03b30ee 100644 --- a/lisp/mh-e/mh-compat.el +++ b/lisp/mh-e/mh-compat.el @@ -1,6 +1,6 @@ ;;; mh-compat.el --- make MH-E compatible with various versions of Emacs -;; Copyright (C) 2006-2020 Free Software Foundation, Inc. +;; Copyright (C) 2006-2021 Free Software Foundation, Inc. ;; Author: Bill Wohler <wohler@newt.com> ;; Keywords: mail diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el index e5f69a5ae8d..9185c2a0645 100644 --- a/lisp/mh-e/mh-e.el +++ b/lisp/mh-e/mh-e.el @@ -1,6 +1,6 @@ ;;; mh-e.el --- GNU Emacs interface to the MH mail system -;; Copyright (C) 1985-1988, 1990, 1992-1995, 1997, 1999-2020 Free +;; Copyright (C) 1985-1988, 1990, 1992-1995, 1997, 1999-2021 Free ;; Software Foundation, Inc. ;; Author: Bill Wohler <wohler@newt.com> diff --git a/lisp/mh-e/mh-folder.el b/lisp/mh-e/mh-folder.el index 0fb5ebf1f78..555d13d7235 100644 --- a/lisp/mh-e/mh-folder.el +++ b/lisp/mh-e/mh-folder.el @@ -1,6 +1,6 @@ ;;; mh-folder.el --- MH-Folder mode -;; Copyright (C) 2002-2003, 2005-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002-2003, 2005-2021 Free Software Foundation, Inc. ;; Author: Bill Wohler <wohler@newt.com> ;; Keywords: mail diff --git a/lisp/mh-e/mh-funcs.el b/lisp/mh-e/mh-funcs.el index 66cea013595..309bcb4b49f 100644 --- a/lisp/mh-e/mh-funcs.el +++ b/lisp/mh-e/mh-funcs.el @@ -1,6 +1,6 @@ ;;; mh-funcs.el --- MH-E functions not everyone will use right away -;; Copyright (C) 1993, 1995, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1993, 1995, 2001-2021 Free Software Foundation, Inc. ;; Author: Bill Wohler <wohler@newt.com> ;; Keywords: mail diff --git a/lisp/mh-e/mh-gnus.el b/lisp/mh-e/mh-gnus.el index 12a0f624dda..6a9851662ab 100644 --- a/lisp/mh-e/mh-gnus.el +++ b/lisp/mh-e/mh-gnus.el @@ -1,6 +1,6 @@ ;;; mh-gnus.el --- make MH-E compatible with various versions of Gnus -;; Copyright (C) 2003-2004, 2006-2020 Free Software Foundation, Inc. +;; Copyright (C) 2003-2004, 2006-2021 Free Software Foundation, Inc. ;; Author: Satyaki Das <satyaki@theforce.stanford.edu> ;; Maintainer: Bill Wohler <wohler@newt.com> diff --git a/lisp/mh-e/mh-identity.el b/lisp/mh-e/mh-identity.el index 23fa87de825..18443992177 100644 --- a/lisp/mh-e/mh-identity.el +++ b/lisp/mh-e/mh-identity.el @@ -1,6 +1,6 @@ ;;; mh-identity.el --- multiple identify support for MH-E -;; Copyright (C) 2002-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002-2021 Free Software Foundation, Inc. ;; Author: Peter S. Galbraith <psg@debian.org> ;; Maintainer: Bill Wohler <wohler@newt.com> diff --git a/lisp/mh-e/mh-inc.el b/lisp/mh-e/mh-inc.el index bff99b76979..32f731799b9 100644 --- a/lisp/mh-e/mh-inc.el +++ b/lisp/mh-e/mh-inc.el @@ -1,6 +1,6 @@ ;;; mh-inc.el --- MH-E "inc" and separate mail spool handling -;; Copyright (C) 2003-2004, 2006-2020 Free Software Foundation, Inc. +;; Copyright (C) 2003-2004, 2006-2021 Free Software Foundation, Inc. ;; Author: Peter S. Galbraith <psg@debian.org> ;; Maintainer: Bill Wohler <wohler@newt.com> diff --git a/lisp/mh-e/mh-junk.el b/lisp/mh-e/mh-junk.el index ebc5038a194..b49c6322492 100644 --- a/lisp/mh-e/mh-junk.el +++ b/lisp/mh-e/mh-junk.el @@ -1,6 +1,6 @@ ;;; mh-junk.el --- MH-E interface to anti-spam measures -;; Copyright (C) 2003-2020 Free Software Foundation, Inc. +;; Copyright (C) 2003-2021 Free Software Foundation, Inc. ;; Author: Satyaki Das <satyaki@theforce.stanford.edu>, ;; Bill Wohler <wohler@newt.com> diff --git a/lisp/mh-e/mh-letter.el b/lisp/mh-e/mh-letter.el index b8aca77ddc8..f5ad73d800d 100644 --- a/lisp/mh-e/mh-letter.el +++ b/lisp/mh-e/mh-letter.el @@ -1,6 +1,6 @@ ;;; mh-letter.el --- MH-Letter mode -;; Copyright (C) 1993, 1995, 1997, 2000-2020 Free Software Foundation, +;; Copyright (C) 1993, 1995, 1997, 2000-2021 Free Software Foundation, ;; Inc. ;; Author: Bill Wohler <wohler@newt.com> diff --git a/lisp/mh-e/mh-limit.el b/lisp/mh-e/mh-limit.el index d4577807c92..036522f3ddd 100644 --- a/lisp/mh-e/mh-limit.el +++ b/lisp/mh-e/mh-limit.el @@ -1,6 +1,6 @@ ;;; mh-limit.el --- MH-E display limits -;; Copyright (C) 2001-2003, 2006-2020 Free Software Foundation, Inc. +;; Copyright (C) 2001-2003, 2006-2021 Free Software Foundation, Inc. ;; Author: Peter S. Galbraith <psg@debian.org> ;; Keywords: mail diff --git a/lisp/mh-e/mh-mime.el b/lisp/mh-e/mh-mime.el index dc9d17aebad..7bdf743fc42 100644 --- a/lisp/mh-e/mh-mime.el +++ b/lisp/mh-e/mh-mime.el @@ -1,6 +1,6 @@ ;;; mh-mime.el --- MH-E MIME support -;; Copyright (C) 1993, 1995, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1993, 1995, 2001-2021 Free Software Foundation, Inc. ;; Author: Bill Wohler <wohler@newt.com> ;; Keywords: mail diff --git a/lisp/mh-e/mh-print.el b/lisp/mh-e/mh-print.el index 7779ec0d90d..513a1bc953d 100644 --- a/lisp/mh-e/mh-print.el +++ b/lisp/mh-e/mh-print.el @@ -1,6 +1,6 @@ ;;; mh-print.el --- MH-E printing support -;; Copyright (C) 2003-2020 Free Software Foundation, Inc. +;; Copyright (C) 2003-2021 Free Software Foundation, Inc. ;; Author: Jeffrey C Honig <jch@honig.net> ;; Maintainer: Bill Wohler <wohler@newt.com> diff --git a/lisp/mh-e/mh-scan.el b/lisp/mh-e/mh-scan.el index a0addcb77d5..cec331389b0 100644 --- a/lisp/mh-e/mh-scan.el +++ b/lisp/mh-e/mh-scan.el @@ -1,6 +1,6 @@ ;;; mh-scan.el --- MH-E scan line constants and utilities -;; Copyright (C) 1993, 1995, 1997, 2000-2020 Free Software Foundation, +;; Copyright (C) 1993, 1995, 1997, 2000-2021 Free Software Foundation, ;; Inc. ;; Author: Bill Wohler <wohler@newt.com> diff --git a/lisp/mh-e/mh-search.el b/lisp/mh-e/mh-search.el index 5cfe67865ee..05ba12d7617 100644 --- a/lisp/mh-e/mh-search.el +++ b/lisp/mh-e/mh-search.el @@ -1,6 +1,6 @@ ;;; mh-search --- MH-Search mode -;; Copyright (C) 1993, 1995, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1993, 1995, 2001-2021 Free Software Foundation, Inc. ;; Author: Indexed search by Satyaki Das <satyaki@theforce.stanford.edu> ;; Maintainer: Bill Wohler <wohler@newt.com> diff --git a/lisp/mh-e/mh-seq.el b/lisp/mh-e/mh-seq.el index a8fb46d8d98..e8a03f6704b 100644 --- a/lisp/mh-e/mh-seq.el +++ b/lisp/mh-e/mh-seq.el @@ -1,6 +1,6 @@ ;;; mh-seq.el --- MH-E sequences support -;; Copyright (C) 1993, 1995, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1993, 1995, 2001-2021 Free Software Foundation, Inc. ;; Author: Bill Wohler <wohler@newt.com> ;; Keywords: mail diff --git a/lisp/mh-e/mh-show.el b/lisp/mh-e/mh-show.el index 48ff74131d7..9ad843c3259 100644 --- a/lisp/mh-e/mh-show.el +++ b/lisp/mh-e/mh-show.el @@ -1,6 +1,6 @@ ;;; mh-show.el --- MH-Show mode -;; Copyright (C) 1993, 1995, 1997, 2000-2020 Free Software Foundation, +;; Copyright (C) 1993, 1995, 1997, 2000-2021 Free Software Foundation, ;; Inc. ;; Author: Bill Wohler <wohler@newt.com> diff --git a/lisp/mh-e/mh-speed.el b/lisp/mh-e/mh-speed.el index 0732a16dc7d..35d5884b16c 100644 --- a/lisp/mh-e/mh-speed.el +++ b/lisp/mh-e/mh-speed.el @@ -1,6 +1,6 @@ ;;; mh-speed.el --- MH-E speedbar support -;; Copyright (C) 2002-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002-2021 Free Software Foundation, Inc. ;; Author: Satyaki Das <satyaki@theforce.stanford.edu> ;; Maintainer: Bill Wohler <wohler@newt.com> diff --git a/lisp/mh-e/mh-thread.el b/lisp/mh-e/mh-thread.el index e6ee87b8411..365746259af 100644 --- a/lisp/mh-e/mh-thread.el +++ b/lisp/mh-e/mh-thread.el @@ -1,6 +1,6 @@ ;;; mh-thread.el --- MH-E threading support -;; Copyright (C) 2002-2004, 2006-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002-2004, 2006-2021 Free Software Foundation, Inc. ;; Author: Satyaki Das <satyaki@theforce.stanford.edu> ;; Maintainer: Bill Wohler <wohler@newt.com> diff --git a/lisp/mh-e/mh-tool-bar.el b/lisp/mh-e/mh-tool-bar.el index b1e417741b2..7dbddbc891b 100644 --- a/lisp/mh-e/mh-tool-bar.el +++ b/lisp/mh-e/mh-tool-bar.el @@ -1,6 +1,6 @@ ;;; mh-tool-bar.el --- MH-E tool bar support -;; Copyright (C) 2002-2003, 2005-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002-2003, 2005-2021 Free Software Foundation, Inc. ;; Author: Satyaki Das <satyaki@theforce.stanford.edu> ;; Maintainer: Bill Wohler <wohler@newt.com> diff --git a/lisp/mh-e/mh-utils.el b/lisp/mh-e/mh-utils.el index 28d3c7614ce..d7c607df5c3 100644 --- a/lisp/mh-e/mh-utils.el +++ b/lisp/mh-e/mh-utils.el @@ -1,6 +1,6 @@ ;;; mh-utils.el --- MH-E general utilities -;; Copyright (C) 1993, 1995, 1997, 2000-2020 Free Software Foundation, +;; Copyright (C) 1993, 1995, 1997, 2000-2021 Free Software Foundation, ;; Inc. ;; Author: Bill Wohler <wohler@newt.com> diff --git a/lisp/mh-e/mh-xface.el b/lisp/mh-e/mh-xface.el index 65039310e7b..036575a8e64 100644 --- a/lisp/mh-e/mh-xface.el +++ b/lisp/mh-e/mh-xface.el @@ -1,6 +1,6 @@ ;;; mh-xface.el --- MH-E X-Face and Face header field display -;; Copyright (C) 2002-2003, 2005-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002-2003, 2005-2021 Free Software Foundation, Inc. ;; Author: Bill Wohler <wohler@newt.com> ;; Keywords: mail diff --git a/lisp/midnight.el b/lisp/midnight.el index 69e6f0ce42b..8b798926c1c 100644 --- a/lisp/midnight.el +++ b/lisp/midnight.el @@ -1,6 +1,6 @@ ;;; midnight.el --- run something every midnight, e.g., kill old buffers -*- lexical-binding:t -*- -;; Copyright (C) 1998, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998, 2001-2021 Free Software Foundation, Inc. ;; Author: Sam Steingold <sds@gnu.org> ;; Created: 1998-05-18 diff --git a/lisp/minibuf-eldef.el b/lisp/minibuf-eldef.el index 363899d2656..30273fab1b8 100644 --- a/lisp/minibuf-eldef.el +++ b/lisp/minibuf-eldef.el @@ -1,6 +1,6 @@ ;;; minibuf-eldef.el --- Only show defaults in prompts when applicable -*- lexical-binding: t -*- ;; -;; Copyright (C) 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 2000-2021 Free Software Foundation, Inc. ;; ;; Author: Miles Bader <miles@gnu.org> ;; Keywords: convenience diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el index 7d05f7704e9..556f5d3a564 100644 --- a/lisp/minibuffer.el +++ b/lisp/minibuffer.el @@ -1,6 +1,6 @@ ;;; minibuffer.el --- Minibuffer completion functions -*- lexical-binding: t -*- -;; Copyright (C) 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2008-2021 Free Software Foundation, Inc. ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> ;; Package: emacs @@ -956,6 +956,7 @@ styles for specific categories, such as files, buffers, etc." ;; A new style that combines substring and pcm might be better, ;; e.g. one that does not anchor to bos. (project-file (styles . (substring))) + (xref-location (styles . (substring))) (info-menu (styles . (basic substring)))) "Default settings for specific completion categories. Each entry has the shape (CATEGORY . ALIST) where ALIST is @@ -3159,7 +3160,8 @@ or a symbol, see `completion-pcm--merge-completions'." (let ((n '())) (while p (pcase p - (`(,(or 'any 'any-delim) point . ,rest) (setq p `(point . ,rest))) + (`(,(or 'any 'any-delim) ,(or 'any 'point) . ,rest) + (setq p (cdr p))) ;; This is not just a performance improvement: it turns a ;; terminating `point' into an implicit `any', which affects ;; the final position of point (because `point' gets turned @@ -3244,6 +3246,13 @@ than the latter (which has two \"holes\" and three one-letter-long matches).") (defun completion-pcm--hilit-commonality (pattern completions) + "Show where and how well PATTERN matches COMPLETIONS. +PATTERN, a list of symbols and strings as seen +`completion-pcm--merge-completions', is assumed to match every +string in COMPLETIONS. Return a deep copy of COMPLETIONS where +each string is propertized with `completion-score', a number +between 0 and 1, and with faces `completions-common-part', +`completions-first-difference' in the relevant segments." (when completions (let* ((re (completion-pcm--pattern->regex pattern 'group)) (point-idx (completion-pcm--pattern-point-idx pattern)) @@ -3255,12 +3264,12 @@ one-letter-long matches).") (unless (string-match re str) (error "Internal error: %s does not match %s" re str)) (let* ((pos (if point-idx (match-beginning point-idx) (match-end 0))) - (md (match-data)) - (start (pop md)) - (end (pop md)) - (len (length str)) - ;; To understand how this works, consider these bad - ;; ascii(tm) diagrams showing how the pattern "foo" + (match-end (match-end 0)) + (md (cddr (match-data))) + (from 0) + (end (length str)) + ;; To understand how this works, consider these simple + ;; ascii diagrams showing how the pattern "foo" ;; flex-matches "fabrobazo", "fbarbazoo" and ;; "barfoobaz": @@ -3296,9 +3305,12 @@ one-letter-long matches).") (score-numerator 0) (score-denominator 0) (last-b 0) - (update-score + (update-score-and-face (lambda (a b) - "Update score variables given match range (A B)." + "Update score and face given match range (A B)." + (add-face-text-property a b + 'completions-common-part + nil str) (setq score-numerator (+ score-numerator (- b a))) (unless (or (= a last-b) @@ -3312,19 +3324,15 @@ one-letter-long matches).") flex-score-match-tightness))))) (setq last-b b)))) - (funcall update-score start start) (while md - (funcall update-score start (car md)) - (add-face-text-property - start (pop md) - 'completions-common-part - nil str) - (setq start (pop md))) - (funcall update-score len len) - (add-face-text-property - start end - 'completions-common-part - nil str) + (funcall update-score-and-face from (pop md)) + (setq from (pop md))) + ;; If `pattern' doesn't have an explicit trailing any, the + ;; regex `re' won't produce match data representing the + ;; region after the match. We need to account to account + ;; for that extra bit of match (bug#42149). + (unless (= from match-end) + (funcall update-score-and-face from match-end)) (if (> (length str) pos) (add-face-text-property pos (1+ pos) @@ -3333,7 +3341,7 @@ one-letter-long matches).") (unless (zerop (length str)) (put-text-property 0 1 'completion-score - (/ score-numerator (* len (1+ score-denominator)) 1.0) str))) + (/ score-numerator (* end (1+ score-denominator)) 1.0) str))) str) completions)))) diff --git a/lisp/misc.el b/lisp/misc.el index 03395781a51..09f6011f98d 100644 --- a/lisp/misc.el +++ b/lisp/misc.el @@ -1,6 +1,6 @@ ;;; misc.el --- some nonstandard editing and utility commands for Emacs -*- lexical-binding:t -*- -;; Copyright (C) 1989, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1989, 2001-2021 Free Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org ;; Keywords: convenience diff --git a/lisp/misearch.el b/lisp/misearch.el index 6ec10fe2c2e..668c711922a 100644 --- a/lisp/misearch.el +++ b/lisp/misearch.el @@ -1,6 +1,6 @@ ;;; misearch.el --- isearch extensions for multi-buffer search -;; Copyright (C) 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2007-2021 Free Software Foundation, Inc. ;; Author: Juri Linkov <juri@jurta.org> ;; Keywords: matching diff --git a/lisp/mouse-copy.el b/lisp/mouse-copy.el index a650bd6a499..e48722ef944 100644 --- a/lisp/mouse-copy.el +++ b/lisp/mouse-copy.el @@ -1,6 +1,6 @@ ;;; mouse-copy.el --- one-click text copy and move -;; Copyright (C) 1996, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996, 2001-2021 Free Software Foundation, Inc. ;; Author: John Heidemann <johnh@ISI.EDU> ;; Keywords: mouse diff --git a/lisp/mouse-drag.el b/lisp/mouse-drag.el index e80ebba28d5..f6612600bdd 100644 --- a/lisp/mouse-drag.el +++ b/lisp/mouse-drag.el @@ -1,6 +1,6 @@ ;;; mouse-drag.el --- use mouse-2 to do a new style of scrolling -;; Copyright (C) 1996-1997, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996-1997, 2001-2021 Free Software Foundation, Inc. ;; Author: John Heidemann <johnh@ISI.EDU> ;; Keywords: mouse diff --git a/lisp/mouse.el b/lisp/mouse.el index 9d4492f1bde..0da82882fc1 100644 --- a/lisp/mouse.el +++ b/lisp/mouse.el @@ -1,6 +1,6 @@ ;;; mouse.el --- window system-independent mouse support -*- lexical-binding: t -*- -;; Copyright (C) 1993-1995, 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1993-1995, 1999-2021 Free Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org ;; Keywords: hardware, mouse diff --git a/lisp/mpc.el b/lisp/mpc.el index fade23e3cc2..827f8aacdd6 100644 --- a/lisp/mpc.el +++ b/lisp/mpc.el @@ -1,6 +1,6 @@ ;;; mpc.el --- A client for the Music Player Daemon -*- lexical-binding: t -*- -;; Copyright (C) 2006-2020 Free Software Foundation, Inc. +;; Copyright (C) 2006-2021 Free Software Foundation, Inc. ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> ;; Keywords: multimedia diff --git a/lisp/msb.el b/lisp/msb.el index 15aeaa2e73f..14209d9956d 100644 --- a/lisp/msb.el +++ b/lisp/msb.el @@ -1,6 +1,6 @@ ;;; msb.el --- customizable buffer-selection with multiple menus -;; Copyright (C) 1993-1995, 1997-2020 Free Software Foundation, Inc. +;; Copyright (C) 1993-1995, 1997-2021 Free Software Foundation, Inc. ;; Author: Lars Lindberg <lars.lindberg@home.se> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/mwheel.el b/lisp/mwheel.el index 9fd050fea58..adfeaccb29b 100644 --- a/lisp/mwheel.el +++ b/lisp/mwheel.el @@ -1,6 +1,6 @@ ;;; mwheel.el --- Mouse wheel support -*- lexical-binding:t -*- -;; Copyright (C) 1998, 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998, 2000-2021 Free Software Foundation, Inc. ;; Keywords: mouse ;; Package: emacs diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el index 1922adb5480..9559b125135 100644 --- a/lisp/net/ange-ftp.el +++ b/lisp/net/ange-ftp.el @@ -1,6 +1,6 @@ ;;; ange-ftp.el --- transparent FTP support for GNU Emacs -*- lexical-binding:t -*- -;; Copyright (C) 1989-1996, 1998, 2000-2020 Free Software Foundation, +;; Copyright (C) 1989-1996, 1998, 2000-2021 Free Software Foundation, ;; Inc. ;; Author: Andy Norman (ange@hplb.hpl.hp.com) diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el index 8b245b01066..7b72a713623 100644 --- a/lisp/net/browse-url.el +++ b/lisp/net/browse-url.el @@ -1,6 +1,6 @@ ;;; browse-url.el --- pass a URL to a WWW browser -*- lexical-binding: t; -*- -;; Copyright (C) 1995-2020 Free Software Foundation, Inc. +;; Copyright (C) 1995-2021 Free Software Foundation, Inc. ;; Author: Denis Howe <dbh@doc.ic.ac.uk> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el index 8b40808005b..7a7bbef5364 100644 --- a/lisp/net/dbus.el +++ b/lisp/net/dbus.el @@ -1,6 +1,6 @@ ;;; dbus.el --- Elisp bindings for D-Bus. -*- lexical-binding: t -*- -;; Copyright (C) 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2007-2021 Free Software Foundation, Inc. ;; Author: Michael Albinus <michael.albinus@gmx.de> ;; Keywords: comm, hardware diff --git a/lisp/net/dictionary.el b/lisp/net/dictionary.el index 0df9d8b1423..07f44ba035b 100644 --- a/lisp/net/dictionary.el +++ b/lisp/net/dictionary.el @@ -1029,7 +1029,7 @@ If PATTERN is omitted, it defaults to \"[ \\f\\t\\n\\r\\v]+\"." 'dictionary-display-match-result))) (defun dictionary-do-matching (word dictionary strategy function) - "Find matches for WORD with STRATEGY in DICTIONARY and displays them with FUNCTION." + "Find matches for WORD with STRATEGY in DICTIONARY and display them with FUNCTION." (message "Lookup matching words for %s in %s using %s" word dictionary strategy) diff --git a/lisp/net/dig.el b/lisp/net/dig.el index da4ea4050d8..92dcf73250b 100644 --- a/lisp/net/dig.el +++ b/lisp/net/dig.el @@ -1,6 +1,6 @@ ;;; dig.el --- Domain Name System dig interface -*- lexical-binding:t -*- -;; Copyright (C) 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 2000-2021 Free Software Foundation, Inc. ;; Author: Simon Josefsson <simon@josefsson.org> ;; Keywords: DNS BIND dig comm diff --git a/lisp/net/dns.el b/lisp/net/dns.el index c368cd773c2..2045d4dfca1 100644 --- a/lisp/net/dns.el +++ b/lisp/net/dns.el @@ -1,6 +1,6 @@ ;;; dns.el --- Domain Name Service lookups -*- lexical-binding:t -*- -;; Copyright (C) 2002-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Keywords: network comm diff --git a/lisp/net/eudc-bob.el b/lisp/net/eudc-bob.el index b2069ed6ef8..456d70ee0fe 100644 --- a/lisp/net/eudc-bob.el +++ b/lisp/net/eudc-bob.el @@ -1,6 +1,6 @@ ;;; eudc-bob.el --- Binary Objects Support for EUDC -*- lexical-binding: t; -*- -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: Oscar Figueiredo <oscar@cpe.fr> ;; Pavel Janík <Pavel@Janik.cz> diff --git a/lisp/net/eudc-export.el b/lisp/net/eudc-export.el index 5c966281499..bac75e6555d 100644 --- a/lisp/net/eudc-export.el +++ b/lisp/net/eudc-export.el @@ -1,6 +1,6 @@ ;;; eudc-export.el --- functions to export EUDC query results -;; Copyright (C) 1998-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998-2021 Free Software Foundation, Inc. ;; Author: Oscar Figueiredo <oscar@cpe.fr> ;; Pavel Janík <Pavel@Janik.cz> diff --git a/lisp/net/eudc-hotlist.el b/lisp/net/eudc-hotlist.el index f87f8f0fb03..e4b7e8ae71b 100644 --- a/lisp/net/eudc-hotlist.el +++ b/lisp/net/eudc-hotlist.el @@ -1,6 +1,6 @@ ;;; eudc-hotlist.el --- hotlist management for EUDC -;; Copyright (C) 1998-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998-2021 Free Software Foundation, Inc. ;; Author: Oscar Figueiredo <oscar@cpe.fr> ;; Pavel Janík <Pavel@Janik.cz> diff --git a/lisp/net/eudc-vars.el b/lisp/net/eudc-vars.el index 2306d7b99a4..b80801717f1 100644 --- a/lisp/net/eudc-vars.el +++ b/lisp/net/eudc-vars.el @@ -1,6 +1,6 @@ ;;; eudc-vars.el --- Emacs Unified Directory Client -*- lexical-binding: t -*- -;; Copyright (C) 1998-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998-2021 Free Software Foundation, Inc. ;; Author: Oscar Figueiredo <oscar@cpe.fr> ;; Pavel Janík <Pavel@Janik.cz> diff --git a/lisp/net/eudc.el b/lisp/net/eudc.el index f4e4c17d69e..f61929c9ef8 100644 --- a/lisp/net/eudc.el +++ b/lisp/net/eudc.el @@ -1,6 +1,6 @@ ;;; eudc.el --- Emacs Unified Directory Client -*- lexical-binding:t -*- -;; Copyright (C) 1998-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998-2021 Free Software Foundation, Inc. ;; Author: Oscar Figueiredo <oscar@cpe.fr> ;; Pavel Janík <Pavel@Janik.cz> diff --git a/lisp/net/eudcb-bbdb.el b/lisp/net/eudcb-bbdb.el index 5d6b52a19d2..e11458b29cb 100644 --- a/lisp/net/eudcb-bbdb.el +++ b/lisp/net/eudcb-bbdb.el @@ -1,6 +1,6 @@ ;;; eudcb-bbdb.el --- Emacs Unified Directory Client - BBDB Backend -;; Copyright (C) 1998-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998-2021 Free Software Foundation, Inc. ;; Author: Oscar Figueiredo <oscar@cpe.fr> ;; Pavel Janík <Pavel@Janik.cz> diff --git a/lisp/net/eudcb-ldap.el b/lisp/net/eudcb-ldap.el index 14cc7db2fa8..4623079ea9f 100644 --- a/lisp/net/eudcb-ldap.el +++ b/lisp/net/eudcb-ldap.el @@ -1,6 +1,6 @@ ;;; eudcb-ldap.el --- Emacs Unified Directory Client - LDAP Backend -;; Copyright (C) 1998-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998-2021 Free Software Foundation, Inc. ;; Author: Oscar Figueiredo <oscar@cpe.fr> ;; Pavel Janík <Pavel@Janik.cz> diff --git a/lisp/net/eudcb-mab.el b/lisp/net/eudcb-mab.el index 5953c86b951..eb7032ac4c8 100644 --- a/lisp/net/eudcb-mab.el +++ b/lisp/net/eudcb-mab.el @@ -1,6 +1,6 @@ ;;; eudcb-mab.el --- Emacs Unified Directory Client - AddressBook backend -;; Copyright (C) 2003-2020 Free Software Foundation, Inc. +;; Copyright (C) 2003-2021 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@newartisans.com> ;; Maintainer: Thomas Fitzsimmons <fitzsim@fitzsim.org> diff --git a/lisp/net/eudcb-macos-contacts.el b/lisp/net/eudcb-macos-contacts.el index 3c0d88fc23f..66a684dfc59 100644 --- a/lisp/net/eudcb-macos-contacts.el +++ b/lisp/net/eudcb-macos-contacts.el @@ -1,6 +1,6 @@ ;;; eudcb-macos-contacts.el --- EUDC - macOS Contacts backend -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; Author: Alexander Adolf diff --git a/lisp/net/eww.el b/lisp/net/eww.el index ce49e32601b..d131b2bf8c9 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -1,6 +1,6 @@ ;;; eww.el --- Emacs Web Wowser -*- lexical-binding:t -*- -;; Copyright (C) 2013-2020 Free Software Foundation, Inc. +;; Copyright (C) 2013-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Keywords: html diff --git a/lisp/net/gnutls.el b/lisp/net/gnutls.el index 8ad721964dd..ff58cbb035e 100644 --- a/lisp/net/gnutls.el +++ b/lisp/net/gnutls.el @@ -1,6 +1,6 @@ ;;; gnutls.el --- Support SSL/TLS connections through GnuTLS -;; Copyright (C) 2010-2020 Free Software Foundation, Inc. +;; Copyright (C) 2010-2021 Free Software Foundation, Inc. ;; Author: Ted Zlatanov <tzz@lifelogs.com> ;; Keywords: comm, tls, ssl, encryption diff --git a/lisp/net/goto-addr.el b/lisp/net/goto-addr.el index 43bea76a6bc..d1926302470 100644 --- a/lisp/net/goto-addr.el +++ b/lisp/net/goto-addr.el @@ -1,6 +1,6 @@ ;;; goto-addr.el --- click to browse URL or to send to e-mail address -;; Copyright (C) 1995, 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 1995, 2000-2021 Free Software Foundation, Inc. ;; Author: Eric Ding <ericding@alum.mit.edu> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/net/hmac-def.el b/lisp/net/hmac-def.el index 944cc6cef6c..5ea8839699d 100644 --- a/lisp/net/hmac-def.el +++ b/lisp/net/hmac-def.el @@ -1,6 +1,6 @@ ;;; hmac-def.el --- A macro for defining HMAC functions. -*- lexical-binding: t -*- -;; Copyright (C) 1999, 2001, 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2001, 2007-2021 Free Software Foundation, Inc. ;; Author: Shuhei KOBAYASHI <shuhei@aqua.ocn.ne.jp> ;; Keywords: HMAC, RFC2104 diff --git a/lisp/net/hmac-md5.el b/lisp/net/hmac-md5.el index 974ee0d3691..85a8c51de23 100644 --- a/lisp/net/hmac-md5.el +++ b/lisp/net/hmac-md5.el @@ -1,6 +1,6 @@ ;;; hmac-md5.el --- Compute HMAC-MD5. -*- lexical-binding:t -*- -;; Copyright (C) 1999, 2001, 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2001, 2007-2021 Free Software Foundation, Inc. ;; Author: Shuhei KOBAYASHI <shuhei@aqua.ocn.ne.jp> ;; Keywords: HMAC, RFC2104, HMAC-MD5, MD5, KEYED-MD5, CRAM-MD5 diff --git a/lisp/net/imap.el b/lisp/net/imap.el index fe895d7e23d..052ef292957 100644 --- a/lisp/net/imap.el +++ b/lisp/net/imap.el @@ -1,6 +1,6 @@ ;;; imap.el --- imap library -*- lexical-binding:t -*- -;; Copyright (C) 1998-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998-2021 Free Software Foundation, Inc. ;; Author: Simon Josefsson <simon@josefsson.org> ;; Keywords: mail diff --git a/lisp/net/ldap.el b/lisp/net/ldap.el index 0016af292ef..0476835ebd9 100644 --- a/lisp/net/ldap.el +++ b/lisp/net/ldap.el @@ -1,6 +1,6 @@ ;;; ldap.el --- client interface to LDAP for Emacs -;; Copyright (C) 1998-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998-2021 Free Software Foundation, Inc. ;; Author: Oscar Figueiredo <oscar@cpe.fr> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/net/mailcap.el b/lisp/net/mailcap.el index bc99f02fe33..455673b5e9f 100644 --- a/lisp/net/mailcap.el +++ b/lisp/net/mailcap.el @@ -1,6 +1,6 @@ ;;; mailcap.el --- MIME media types configuration -*- lexical-binding: t -*- -;; Copyright (C) 1998-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998-2021 Free Software Foundation, Inc. ;; Author: William M. Perry <wmperry@aventail.com> ;; Lars Magne Ingebrigtsen <larsi@gnus.org> diff --git a/lisp/net/mairix.el b/lisp/net/mairix.el index 5571b2ab81c..08edb44275c 100644 --- a/lisp/net/mairix.el +++ b/lisp/net/mairix.el @@ -1,6 +1,6 @@ ;;; mairix.el --- Mairix interface for Emacs -;; Copyright (C) 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2008-2021 Free Software Foundation, Inc. ;; Author: David Engster <dengste@eml.cc> ;; Keywords: mail searching diff --git a/lisp/net/net-utils.el b/lisp/net/net-utils.el index 994a0bf9ab7..d5aad3a3f77 100644 --- a/lisp/net/net-utils.el +++ b/lisp/net/net-utils.el @@ -1,6 +1,6 @@ ;;; net-utils.el --- network functions -;; Copyright (C) 1998-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998-2021 Free Software Foundation, Inc. ;; Author: Peter Breton <pbreton@cs.umb.edu> ;; Created: Sun Mar 16 1997 diff --git a/lisp/net/netrc.el b/lisp/net/netrc.el index 01db97c29d4..9473c821a1a 100644 --- a/lisp/net/netrc.el +++ b/lisp/net/netrc.el @@ -1,6 +1,6 @@ ;;; netrc.el --- .netrc parsing functionality -*- lexical-binding: t -*- -;; Copyright (C) 1996-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Keywords: news diff --git a/lisp/net/network-stream.el b/lisp/net/network-stream.el index e86426d4664..b45cefcb442 100644 --- a/lisp/net/network-stream.el +++ b/lisp/net/network-stream.el @@ -1,6 +1,6 @@ ;;; network-stream.el --- open network processes, possibly with encryption -*- lexical-binding: t -*- -;; Copyright (C) 2010-2020 Free Software Foundation, Inc. +;; Copyright (C) 2010-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Keywords: network diff --git a/lisp/net/newst-backend.el b/lisp/net/newst-backend.el index f45abf780f7..3b120be61f5 100644 --- a/lisp/net/newst-backend.el +++ b/lisp/net/newst-backend.el @@ -1,6 +1,6 @@ ;;; newst-backend.el --- Retrieval backend for newsticker -*- lexical-binding:t -*- -;; Copyright (C) 2003-2020 Free Software Foundation, Inc. +;; Copyright (C) 2003-2021 Free Software Foundation, Inc. ;; Author: Ulf Jasper <ulf.jasper@web.de> ;; Filename: newst-backend.el diff --git a/lisp/net/newst-plainview.el b/lisp/net/newst-plainview.el index 98f55a7f528..44d2fd666ad 100644 --- a/lisp/net/newst-plainview.el +++ b/lisp/net/newst-plainview.el @@ -1,6 +1,6 @@ ;;; newst-plainview.el --- Single buffer frontend for newsticker. -;; Copyright (C) 2003-2020 Free Software Foundation, Inc. +;; Copyright (C) 2003-2021 Free Software Foundation, Inc. ;; Author: Ulf Jasper <ulf.jasper@web.de> ;; Filename: newst-plainview.el diff --git a/lisp/net/newst-reader.el b/lisp/net/newst-reader.el index 7c3a919535d..b188bd4589e 100644 --- a/lisp/net/newst-reader.el +++ b/lisp/net/newst-reader.el @@ -1,6 +1,6 @@ ;;; newst-reader.el --- Generic RSS reader functions. -;; Copyright (C) 2003-2020 Free Software Foundation, Inc. +;; Copyright (C) 2003-2021 Free Software Foundation, Inc. ;; Author: Ulf Jasper <ulf.jasper@web.de> ;; Filename: newst-reader.el diff --git a/lisp/net/newst-ticker.el b/lisp/net/newst-ticker.el index 8e60c1e7828..275c91a36ea 100644 --- a/lisp/net/newst-ticker.el +++ b/lisp/net/newst-ticker.el @@ -1,6 +1,6 @@ ;; newst-ticker.el --- mode line ticker for newsticker. -;; Copyright (C) 2003-2020 Free Software Foundation, Inc. +;; Copyright (C) 2003-2021 Free Software Foundation, Inc. ;; Author: Ulf Jasper <ulf.jasper@web.de> ;; Filename: newst-ticker.el diff --git a/lisp/net/newst-treeview.el b/lisp/net/newst-treeview.el index 30db1a3d9f9..cf55f66e780 100644 --- a/lisp/net/newst-treeview.el +++ b/lisp/net/newst-treeview.el @@ -1,6 +1,6 @@ ;;; newst-treeview.el --- Treeview frontend for newsticker. -*- lexical-binding:t -*- -;; Copyright (C) 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2008-2021 Free Software Foundation, Inc. ;; Author: Ulf Jasper <ulf.jasper@web.de> ;; Filename: newst-treeview.el diff --git a/lisp/net/newsticker.el b/lisp/net/newsticker.el index c949915845b..34e94acd12c 100644 --- a/lisp/net/newsticker.el +++ b/lisp/net/newsticker.el @@ -1,6 +1,6 @@ ;;; newsticker.el --- A Newsticker for Emacs. -*- lexical-binding: t -*- -;; Copyright (C) 2003-2020 Free Software Foundation, Inc. +;; Copyright (C) 2003-2021 Free Software Foundation, Inc. ;; Author: Ulf Jasper <ulf.jasper@web.de> ;; Filename: newsticker.el diff --git a/lisp/net/nsm.el b/lisp/net/nsm.el index 2b300401650..3f3e7133713 100644 --- a/lisp/net/nsm.el +++ b/lisp/net/nsm.el @@ -1,6 +1,6 @@ ;;; nsm.el --- Network Security Manager -*- lexical-binding:t -*- -;; Copyright (C) 2014-2020 Free Software Foundation, Inc. +;; Copyright (C) 2014-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Keywords: encryption, security, network diff --git a/lisp/net/ntlm.el b/lisp/net/ntlm.el index 6d1cf2da71f..0450c80c2ec 100644 --- a/lisp/net/ntlm.el +++ b/lisp/net/ntlm.el @@ -1,6 +1,6 @@ ;;; ntlm.el --- NTLM (NT LanManager) authentication support -*- lexical-binding:t -*- -;; Copyright (C) 2001, 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2001, 2007-2021 Free Software Foundation, Inc. ;; Author: Taro Kawagishi <tarok@transpulse.org> ;; Maintainer: Thomas Fitzsimmons <fitzsim@fitzsim.org> diff --git a/lisp/net/pop3.el b/lisp/net/pop3.el index 6f5898437ca..aa34fe7f1a3 100644 --- a/lisp/net/pop3.el +++ b/lisp/net/pop3.el @@ -1,6 +1,6 @@ ;;; pop3.el --- Post Office Protocol (RFC 1460) interface -*- lexical-binding:t -*- -;; Copyright (C) 1996-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996-2021 Free Software Foundation, Inc. ;; Author: Richard L. Pieri <ratinox@peorth.gweep.net> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/net/puny.el b/lisp/net/puny.el index 5c58fe02cbf..6b3663a5fb2 100644 --- a/lisp/net/puny.el +++ b/lisp/net/puny.el @@ -1,6 +1,6 @@ ;;; puny.el --- translate non-ASCII domain names to ASCII -*- lexical-binding:t -*- -;; Copyright (C) 2015-2020 Free Software Foundation, Inc. +;; Copyright (C) 2015-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Keywords: mail, net diff --git a/lisp/net/quickurl.el b/lisp/net/quickurl.el index 8609ea82945..ab1f43f552b 100644 --- a/lisp/net/quickurl.el +++ b/lisp/net/quickurl.el @@ -1,6 +1,6 @@ ;;; quickurl.el --- insert a URL based on text at point in buffer -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: Dave Pearson <davep@davep.org> ;; Created: 1999-05-28 diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el index 6a32fa9255b..22348a1725c 100644 --- a/lisp/net/rcirc.el +++ b/lisp/net/rcirc.el @@ -1,6 +1,6 @@ ;;; rcirc.el --- default, simple IRC client -*- lexical-binding: t; -*- -;; Copyright (C) 2005-2020 Free Software Foundation, Inc. +;; Copyright (C) 2005-2021 Free Software Foundation, Inc. ;; Author: Ryan Yeske <rcyeske@gmail.com> ;; Maintainers: Ryan Yeske <rcyeske@gmail.com>, diff --git a/lisp/net/rfc2104.el b/lisp/net/rfc2104.el index b008c9ac927..c03ac5a87bc 100644 --- a/lisp/net/rfc2104.el +++ b/lisp/net/rfc2104.el @@ -1,6 +1,6 @@ ;;; rfc2104.el --- RFC2104 Hashed Message Authentication Codes -*- lexical-binding:t -*- -;; Copyright (C) 1998-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998-2021 Free Software Foundation, Inc. ;; Author: Simon Josefsson <jas@pdc.kth.se> ;; Keywords: mail diff --git a/lisp/net/rlogin.el b/lisp/net/rlogin.el index 6c960a1f1a9..3136e53b80b 100644 --- a/lisp/net/rlogin.el +++ b/lisp/net/rlogin.el @@ -1,6 +1,6 @@ ;;; rlogin.el --- remote login interface -*- lexical-binding:t -*- -;; Copyright (C) 1992-1995, 1997-1998, 2001-2020 Free Software +;; Copyright (C) 1992-1995, 1997-1998, 2001-2021 Free Software ;; Foundation, Inc. ;; Author: Noah Friedman <friedman@splode.com> diff --git a/lisp/net/sasl-cram.el b/lisp/net/sasl-cram.el index 3810572a942..bc2612d9452 100644 --- a/lisp/net/sasl-cram.el +++ b/lisp/net/sasl-cram.el @@ -1,6 +1,6 @@ ;;; sasl-cram.el --- CRAM-MD5 module for the SASL client framework -;; Copyright (C) 2000, 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2000, 2007-2021 Free Software Foundation, Inc. ;; Author: Daiki Ueno <ueno@gnu.org> ;; Kenichi OKADA <okada@opaopa.org> diff --git a/lisp/net/sasl-digest.el b/lisp/net/sasl-digest.el index ea0b82c7f21..efc8f82890c 100644 --- a/lisp/net/sasl-digest.el +++ b/lisp/net/sasl-digest.el @@ -1,6 +1,6 @@ ;;; sasl-digest.el --- DIGEST-MD5 module for the SASL client framework -;; Copyright (C) 2000, 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2000, 2007-2021 Free Software Foundation, Inc. ;; Author: Daiki Ueno <ueno@unixuser.org> ;; Kenichi OKADA <okada@opaopa.org> diff --git a/lisp/net/sasl-ntlm.el b/lisp/net/sasl-ntlm.el index 6882c23d789..66582265615 100644 --- a/lisp/net/sasl-ntlm.el +++ b/lisp/net/sasl-ntlm.el @@ -1,6 +1,6 @@ ;;; sasl-ntlm.el --- NTLM (NT Lan Manager) module for the SASL client framework -;; Copyright (C) 2000, 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2000, 2007-2021 Free Software Foundation, Inc. ;; Author: Taro Kawagishi <tarok@transpulse.org> ;; Keywords: SASL, NTLM diff --git a/lisp/net/sasl-scram-rfc.el b/lisp/net/sasl-scram-rfc.el index 8de52de2c4d..91d76663ef2 100644 --- a/lisp/net/sasl-scram-rfc.el +++ b/lisp/net/sasl-scram-rfc.el @@ -1,6 +1,6 @@ ;;; sasl-scram-rfc.el --- SCRAM-SHA-1 module for the SASL client framework -*- lexical-binding: t; -*- -;; Copyright (C) 2014-2020 Free Software Foundation, Inc. +;; Copyright (C) 2014-2021 Free Software Foundation, Inc. ;; Author: Magnus Henoch <magnus.henoch@gmail.com> ;; Package: sasl diff --git a/lisp/net/sasl-scram-sha256.el b/lisp/net/sasl-scram-sha256.el index e50a032c233..c1df988a369 100644 --- a/lisp/net/sasl-scram-sha256.el +++ b/lisp/net/sasl-scram-sha256.el @@ -1,6 +1,6 @@ ;;; sasl-scram-sha256.el --- SCRAM-SHA-256 module for the SASL client framework -*- lexical-binding: t; -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; Author: Simon Josefsson <simon@josefsson.org> ;; Package: sasl diff --git a/lisp/net/sasl.el b/lisp/net/sasl.el index ab118e1f982..7f0431afb60 100644 --- a/lisp/net/sasl.el +++ b/lisp/net/sasl.el @@ -1,6 +1,6 @@ ;;; sasl.el --- SASL client framework -;; Copyright (C) 2000, 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2000, 2007-2021 Free Software Foundation, Inc. ;; Author: Daiki Ueno <ueno@gnu.org> ;; Keywords: SASL diff --git a/lisp/net/secrets.el b/lisp/net/secrets.el index e8ef1858176..ad271679618 100644 --- a/lisp/net/secrets.el +++ b/lisp/net/secrets.el @@ -1,6 +1,6 @@ ;;; secrets.el --- Client interface to gnome-keyring and kwallet. -*- lexical-binding: t -*- -;; Copyright (C) 2010-2020 Free Software Foundation, Inc. +;; Copyright (C) 2010-2021 Free Software Foundation, Inc. ;; Author: Michael Albinus <michael.albinus@gmx.de> ;; Keywords: comm password passphrase diff --git a/lisp/net/shr-color.el b/lisp/net/shr-color.el index ce55ca68411..ac1f701fd37 100644 --- a/lisp/net/shr-color.el +++ b/lisp/net/shr-color.el @@ -1,6 +1,6 @@ ;;; shr-color.el --- Simple HTML Renderer color management -*- lexical-binding:t -*- -;; Copyright (C) 2010-2020 Free Software Foundation, Inc. +;; Copyright (C) 2010-2021 Free Software Foundation, Inc. ;; Author: Julien Danjou <julien@danjou.info> ;; Keywords: html diff --git a/lisp/net/shr.el b/lisp/net/shr.el index 1648e56cfb4..9c3740fccc9 100644 --- a/lisp/net/shr.el +++ b/lisp/net/shr.el @@ -1,6 +1,6 @@ ;;; shr.el --- Simple HTML Renderer -*- lexical-binding: t -*- -;; Copyright (C) 2010-2020 Free Software Foundation, Inc. +;; Copyright (C) 2010-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Keywords: html diff --git a/lisp/net/sieve-manage.el b/lisp/net/sieve-manage.el index f9224b2f096..c4d6ec4b6cc 100644 --- a/lisp/net/sieve-manage.el +++ b/lisp/net/sieve-manage.el @@ -1,6 +1,6 @@ ;;; sieve-manage.el --- Implementation of the managesieve protocol in elisp -*- lexical-binding:t -*- -;; Copyright (C) 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 2001-2021 Free Software Foundation, Inc. ;; Author: Simon Josefsson <simon@josefsson.org> ;; Albert Krewinkel <tarleb@moltkeplatz.de> diff --git a/lisp/net/sieve-mode.el b/lisp/net/sieve-mode.el index b3d511c2868..fbc4e75fae5 100644 --- a/lisp/net/sieve-mode.el +++ b/lisp/net/sieve-mode.el @@ -1,6 +1,6 @@ ;;; sieve-mode.el --- Sieve code editing commands for Emacs -*- lexical-binding: t -*- -;; Copyright (C) 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 2001-2021 Free Software Foundation, Inc. ;; Author: Simon Josefsson <simon@josefsson.org> diff --git a/lisp/net/sieve.el b/lisp/net/sieve.el index ae96134a18f..e46f4daae20 100644 --- a/lisp/net/sieve.el +++ b/lisp/net/sieve.el @@ -1,6 +1,6 @@ ;;; sieve.el --- Utilities to manage sieve scripts -;; Copyright (C) 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 2001-2021 Free Software Foundation, Inc. ;; Author: Simon Josefsson <simon@josefsson.org> diff --git a/lisp/net/snmp-mode.el b/lisp/net/snmp-mode.el index df0fd1d80fc..983e6d92ee0 100644 --- a/lisp/net/snmp-mode.el +++ b/lisp/net/snmp-mode.el @@ -1,6 +1,6 @@ ;;; snmp-mode.el --- SNMP & SNMPv2 MIB major mode -;; Copyright (C) 1995, 1998, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1995, 1998, 2001-2021 Free Software Foundation, Inc. ;; Author: Paul D. Smith <psmith@BayNetworks.com> ;; Keywords: data diff --git a/lisp/net/soap-client.el b/lisp/net/soap-client.el index 241ce9efcb3..3cc5569b55c 100644 --- a/lisp/net/soap-client.el +++ b/lisp/net/soap-client.el @@ -1,6 +1,6 @@ ;;; soap-client.el --- Access SOAP web services -*- lexical-binding: t -*- -;; Copyright (C) 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2009-2021 Free Software Foundation, Inc. ;; Author: Alexandru Harsanyi <AlexHarsanyi@gmail.com> ;; Author: Thomas Fitzsimmons <fitzsim@fitzsim.org> diff --git a/lisp/net/soap-inspect.el b/lisp/net/soap-inspect.el index 54d196bf525..604e35c07cf 100644 --- a/lisp/net/soap-inspect.el +++ b/lisp/net/soap-inspect.el @@ -1,6 +1,6 @@ ;;; soap-inspect.el --- Interactive WSDL inspector -*- lexical-binding: t -*- -;; Copyright (C) 2010-2020 Free Software Foundation, Inc. +;; Copyright (C) 2010-2021 Free Software Foundation, Inc. ;; Author: Alexandru Harsanyi <AlexHarsanyi@gmail.com> ;; Created: October 2010 diff --git a/lisp/net/socks.el b/lisp/net/socks.el index cb50a0adbea..0d48fd7e05a 100644 --- a/lisp/net/socks.el +++ b/lisp/net/socks.el @@ -1,6 +1,6 @@ ;;; socks.el --- A Socks v5 Client for Emacs -*- lexical-binding:t -*- -;; Copyright (C) 1996-2000, 2002, 2007-2020 Free Software Foundation, +;; Copyright (C) 1996-2000, 2002, 2007-2021 Free Software Foundation, ;; Inc. ;; Author: William M. Perry <wmperry@gnu.org> diff --git a/lisp/net/telnet.el b/lisp/net/telnet.el index 872c9f634e6..67f844428a7 100644 --- a/lisp/net/telnet.el +++ b/lisp/net/telnet.el @@ -1,6 +1,6 @@ ;;; telnet.el --- run a telnet session from within an Emacs buffer -;; Copyright (C) 1985, 1988, 1992, 1994, 2001-2020 Free Software +;; Copyright (C) 1985, 1988, 1992, 1994, 2001-2021 Free Software ;; Foundation, Inc. ;; Author: William F. Schelter diff --git a/lisp/net/tramp-adb.el b/lisp/net/tramp-adb.el index 9ea72668e7b..c0c215de877 100644 --- a/lisp/net/tramp-adb.el +++ b/lisp/net/tramp-adb.el @@ -1,6 +1,6 @@ ;;; tramp-adb.el --- Functions for calling Android Debug Bridge from Tramp -*- lexical-binding:t -*- -;; Copyright (C) 2011-2020 Free Software Foundation, Inc. +;; Copyright (C) 2011-2021 Free Software Foundation, Inc. ;; Author: Jürgen Hötzel <juergen@archlinux.org> ;; Keywords: comm, processes @@ -1131,6 +1131,13 @@ This happens for Android >= 4.0." (if (string-match-p "[[:multibyte:]]" command) ;; Multibyte codepoints with four bytes are not supported at ;; least by toybox. + + ;; <https://android.stackexchange.com/questions/226638/how-to-use-multibyte-file-names-in-adb-shell/232379#232379> + ;; mksh uses UTF-8 internally, but is currently limited to the + ;; BMP (basic multilingua plane), which means U+0000 to + ;; U+FFFD. If you want to use SMP codepoints (U-00010000 to + ;; U-0010FFFD) on the input line, you currently have to disable + ;; the UTF-8 mode (sorry). (tramp-adb-execute-adb-command vec "shell" command) (unless neveropen (tramp-adb-maybe-open-connection vec)) diff --git a/lisp/net/tramp-archive.el b/lisp/net/tramp-archive.el index 931a9717310..0bbd9271b18 100644 --- a/lisp/net/tramp-archive.el +++ b/lisp/net/tramp-archive.el @@ -1,6 +1,6 @@ ;;; tramp-archive.el --- Tramp archive manager -*- lexical-binding:t -*- -;; Copyright (C) 2017-2020 Free Software Foundation, Inc. +;; Copyright (C) 2017-2021 Free Software Foundation, Inc. ;; Author: Michael Albinus <michael.albinus@gmx.de> ;; Keywords: comm, processes diff --git a/lisp/net/tramp-cache.el b/lisp/net/tramp-cache.el index 970e2eea0ac..2b0a4d9cd05 100644 --- a/lisp/net/tramp-cache.el +++ b/lisp/net/tramp-cache.el @@ -1,6 +1,6 @@ ;;; tramp-cache.el --- file information caching for Tramp -*- lexical-binding:t -*- -;; Copyright (C) 2000, 2005-2020 Free Software Foundation, Inc. +;; Copyright (C) 2000, 2005-2021 Free Software Foundation, Inc. ;; Author: Daniel Pittman <daniel@inanna.danann.net> ;; Michael Albinus <michael.albinus@gmx.de> diff --git a/lisp/net/tramp-cmds.el b/lisp/net/tramp-cmds.el index 9b6250430a8..097f25ea85e 100644 --- a/lisp/net/tramp-cmds.el +++ b/lisp/net/tramp-cmds.el @@ -1,6 +1,6 @@ ;;; tramp-cmds.el --- Interactive commands for Tramp -*- lexical-binding:t -*- -;; Copyright (C) 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2007-2021 Free Software Foundation, Inc. ;; Author: Michael Albinus <michael.albinus@gmx.de> ;; Keywords: comm, processes diff --git a/lisp/net/tramp-compat.el b/lisp/net/tramp-compat.el index b44eabcfa8b..87e5378e807 100644 --- a/lisp/net/tramp-compat.el +++ b/lisp/net/tramp-compat.el @@ -1,6 +1,6 @@ ;;; tramp-compat.el --- Tramp compatibility functions -*- lexical-binding:t -*- -;; Copyright (C) 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2007-2021 Free Software Foundation, Inc. ;; Author: Michael Albinus <michael.albinus@gmx.de> ;; Keywords: comm, processes diff --git a/lisp/net/tramp-crypt.el b/lisp/net/tramp-crypt.el index 4d34bbbeea6..dfe54623dbc 100644 --- a/lisp/net/tramp-crypt.el +++ b/lisp/net/tramp-crypt.el @@ -1,6 +1,6 @@ ;;; tramp-crypt.el --- Tramp crypt utilities -*- lexical-binding:t -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; Author: Michael Albinus <michael.albinus@gmx.de> ;; Keywords: comm, processes diff --git a/lisp/net/tramp-ftp.el b/lisp/net/tramp-ftp.el index 329a490c7ae..fa2df89e495 100644 --- a/lisp/net/tramp-ftp.el +++ b/lisp/net/tramp-ftp.el @@ -1,6 +1,6 @@ ;;; tramp-ftp.el --- Tramp convenience functions for Ange-FTP -*- lexical-binding:t -*- -;; Copyright (C) 2002-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002-2021 Free Software Foundation, Inc. ;; Author: Michael Albinus <michael.albinus@gmx.de> ;; Keywords: comm, processes diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el index fa1a90bc844..f882636a8fc 100644 --- a/lisp/net/tramp-gvfs.el +++ b/lisp/net/tramp-gvfs.el @@ -1,6 +1,6 @@ ;;; tramp-gvfs.el --- Tramp access functions for GVFS daemon -*- lexical-binding:t -*- -;; Copyright (C) 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2009-2021 Free Software Foundation, Inc. ;; Author: Michael Albinus <michael.albinus@gmx.de> ;; Keywords: comm, processes diff --git a/lisp/net/tramp-integration.el b/lisp/net/tramp-integration.el index 566c673af16..64b5b48e7d4 100644 --- a/lisp/net/tramp-integration.el +++ b/lisp/net/tramp-integration.el @@ -1,6 +1,6 @@ ;;; tramp-integration.el --- Tramp integration into other packages -*- lexical-binding:t -*- -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; Author: Michael Albinus <michael.albinus@gmx.de> ;; Keywords: comm, processes diff --git a/lisp/net/tramp-rclone.el b/lisp/net/tramp-rclone.el index 4790bb453d3..8638bb477f8 100644 --- a/lisp/net/tramp-rclone.el +++ b/lisp/net/tramp-rclone.el @@ -1,6 +1,6 @@ ;;; tramp-rclone.el --- Tramp access functions to cloud storages -*- lexical-binding:t -*- -;; Copyright (C) 2018-2020 Free Software Foundation, Inc. +;; Copyright (C) 2018-2021 Free Software Foundation, Inc. ;; Author: Michael Albinus <michael.albinus@gmx.de> ;; Keywords: comm, processes diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 0dbcb835363..865ea4e92a4 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -1,6 +1,6 @@ ;;; tramp-sh.el --- Tramp access functions for (s)sh-like connections -*- lexical-binding:t -*- -;; Copyright (C) 1998-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998-2021 Free Software Foundation, Inc. ;; (copyright statements below in code to be updated with the above notice) @@ -781,7 +781,7 @@ characters need to be doubled.") (defconst tramp-perl-encode "%p -e ' # This script contributed by Juanma Barranquero <lektu@terra.es>. -# Copyright (C) 2002-2020 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 Free Software Foundation, Inc. use strict; my %%trans = do { @@ -820,7 +820,7 @@ characters need to be doubled.") (defconst tramp-perl-decode "%p -e ' # This script contributed by Juanma Barranquero <lektu@terra.es>. -# Copyright (C) 2002-2020 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 Free Software Foundation, Inc. use strict; my %%trans = do { diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el index 83c1b58a30d..1604e8962c0 100644 --- a/lisp/net/tramp-smb.el +++ b/lisp/net/tramp-smb.el @@ -1,6 +1,6 @@ ;;; tramp-smb.el --- Tramp access functions for SMB servers -*- lexical-binding:t -*- -;; Copyright (C) 2002-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002-2021 Free Software Foundation, Inc. ;; Author: Michael Albinus <michael.albinus@gmx.de> ;; Keywords: comm, processes diff --git a/lisp/net/tramp-sudoedit.el b/lisp/net/tramp-sudoedit.el index 558a57b2ead..5bb1546d08b 100644 --- a/lisp/net/tramp-sudoedit.el +++ b/lisp/net/tramp-sudoedit.el @@ -1,6 +1,6 @@ ;;; tramp-sudoedit.el --- Functions for accessing under root permissions -*- lexical-binding:t -*- -;; Copyright (C) 2018-2020 Free Software Foundation, Inc. +;; Copyright (C) 2018-2021 Free Software Foundation, Inc. ;; Author: Michael Albinus <michael.albinus@gmx.de> ;; Keywords: comm, processes diff --git a/lisp/net/tramp-uu.el b/lisp/net/tramp-uu.el index f368f72a8dc..5171b9d1819 100644 --- a/lisp/net/tramp-uu.el +++ b/lisp/net/tramp-uu.el @@ -1,6 +1,6 @@ ;;; tramp-uu.el --- uuencode in Lisp -*- lexical-binding:t -*- -;; Copyright (C) 2002-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002-2021 Free Software Foundation, Inc. ;; Author: Kai Großjohann <kai.grossjohann@gmx.net> ;; Maintainer: Michael Albinus <michael.albinus@gmx.de> diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 0260569aa95..cc8dda809e2 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -1,6 +1,6 @@ ;;; tramp.el --- Transparent Remote Access, Multiple Protocol -*- lexical-binding:t -*- -;; Copyright (C) 1998-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998-2021 Free Software Foundation, Inc. ;; Author: Kai Großjohann <kai.grossjohann@gmx.net> ;; Michael Albinus <michael.albinus@gmx.de> diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el index 30e5ba8151b..714b3f9bb01 100644 --- a/lisp/net/trampver.el +++ b/lisp/net/trampver.el @@ -1,13 +1,13 @@ ;;; trampver.el --- Transparent Remote Access, Multiple Protocol -*- lexical-binding:t -*- ;;; lisp/trampver.el. Generated from trampver.el.in by configure. -;; Copyright (C) 2003-2020 Free Software Foundation, Inc. +;; Copyright (C) 2003-2021 Free Software Foundation, Inc. ;; Author: Kai Großjohann <kai.grossjohann@gmx.net> ;; Maintainer: Michael Albinus <michael.albinus@gmx.de> ;; Keywords: comm, processes ;; Package: tramp -;; Version: 2.5.0-pre +;; Version: 2.5.0 ;; Package-Requires: ((emacs "25.1")) ;; Package-Type: multi ;; URL: https://www.gnu.org/software/tramp/ @@ -40,7 +40,7 @@ ;; ./configure" to change them. ;;;###tramp-autoload -(defconst tramp-version "2.5.0-pre" +(defconst tramp-version "2.5.0" "This version of Tramp.") ;;;###tramp-autoload @@ -76,7 +76,7 @@ ;; Check for Emacs version. (let ((x (if (not (string-lessp emacs-version "25.1")) "ok" - (format "Tramp 2.5.0-pre is not fit for %s" + (format "Tramp 2.5.0 is not fit for %s" (replace-regexp-in-string "\n" "" (emacs-version)))))) (unless (string-equal "ok" x) (error "%s" x))) diff --git a/lisp/net/webjump.el b/lisp/net/webjump.el index 9fbc434760c..9bcf1d37345 100644 --- a/lisp/net/webjump.el +++ b/lisp/net/webjump.el @@ -1,6 +1,6 @@ ;;; webjump.el --- programmable Web hotlist -*- lexical-binding: t; -*- -;; Copyright (C) 1996-1997, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996-1997, 2001-2021 Free Software Foundation, Inc. ;; Author: Neil W. Van Dyke <nwv@acm.org> ;; Created: 09-Aug-1996 diff --git a/lisp/net/zeroconf.el b/lisp/net/zeroconf.el index cb3c0f2a7ee..d5da73bd857 100644 --- a/lisp/net/zeroconf.el +++ b/lisp/net/zeroconf.el @@ -1,6 +1,6 @@ ;;; zeroconf.el --- Service browser using Avahi. -*- lexical-binding:t -*- -;; Copyright (C) 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2008-2021 Free Software Foundation, Inc. ;; Author: Michael Albinus <michael.albinus@gmx.de> ;; Keywords: comm, hardware diff --git a/lisp/newcomment.el b/lisp/newcomment.el index 5d318bbd2e1..5d0d1053f4b 100644 --- a/lisp/newcomment.el +++ b/lisp/newcomment.el @@ -1,6 +1,6 @@ ;;; newcomment.el --- (un)comment regions of buffers -*- lexical-binding: t -*- -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: code extracted from Emacs-20's simple.el ;; Maintainer: Stefan Monnier <monnier@gnu.org> diff --git a/lisp/notifications.el b/lisp/notifications.el index f83898622ec..2241afa9050 100644 --- a/lisp/notifications.el +++ b/lisp/notifications.el @@ -1,6 +1,6 @@ ;;; notifications.el --- Client interface to desktop notifications. -;; Copyright (C) 2010-2020 Free Software Foundation, Inc. +;; Copyright (C) 2010-2021 Free Software Foundation, Inc. ;; Author: Julien Danjou <julien@danjou.info> ;; Keywords: comm desktop notifications diff --git a/lisp/novice.el b/lisp/novice.el index 4771d8dbaed..22eca21784c 100644 --- a/lisp/novice.el +++ b/lisp/novice.el @@ -1,6 +1,6 @@ ;;; novice.el --- handling of disabled commands ("novice mode") for Emacs -;; Copyright (C) 1985-1987, 1994, 2001-2020 Free Software Foundation, +;; Copyright (C) 1985-1987, 1994, 2001-2021 Free Software Foundation, ;; Inc. ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/nxml/nxml-enc.el b/lisp/nxml/nxml-enc.el index 3221d80ca44..abdc2e4ab25 100644 --- a/lisp/nxml/nxml-enc.el +++ b/lisp/nxml/nxml-enc.el @@ -1,6 +1,6 @@ ;;; nxml-enc.el --- XML encoding auto-detection -*- lexical-binding:t -*- -;; Copyright (C) 2003, 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2003, 2007-2021 Free Software Foundation, Inc. ;; Author: James Clark ;; Keywords: wp, hypermedia, languages, XML diff --git a/lisp/nxml/nxml-maint.el b/lisp/nxml/nxml-maint.el index a838eb60ba2..24a3c5c6dbc 100644 --- a/lisp/nxml/nxml-maint.el +++ b/lisp/nxml/nxml-maint.el @@ -1,6 +1,6 @@ ;;; nxml-maint.el --- commands for maintainers of nxml-*.el -*- lexical-binding:t -*- -;; Copyright (C) 2003, 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2003, 2007-2021 Free Software Foundation, Inc. ;; Author: James Clark ;; Keywords: wp, hypermedia, languages, XML diff --git a/lisp/nxml/nxml-mode.el b/lisp/nxml/nxml-mode.el index 080b8c0c6e8..5bc3049d90f 100644 --- a/lisp/nxml/nxml-mode.el +++ b/lisp/nxml/nxml-mode.el @@ -1,6 +1,6 @@ ;;; nxml-mode.el --- a new XML mode -*- lexical-binding:t -*- -;; Copyright (C) 2003-2004, 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2003-2004, 2007-2021 Free Software Foundation, Inc. ;; Author: James Clark ;; Keywords: wp, hypermedia, languages, XML diff --git a/lisp/nxml/nxml-ns.el b/lisp/nxml/nxml-ns.el index 9f6598ecc28..e33140c0a48 100644 --- a/lisp/nxml/nxml-ns.el +++ b/lisp/nxml/nxml-ns.el @@ -1,6 +1,6 @@ ;;; nxml-ns.el --- XML namespace processing -*- lexical-binding:t -*- -;; Copyright (C) 2003, 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2003, 2007-2021 Free Software Foundation, Inc. ;; Author: James Clark ;; Keywords: wp, hypermedia, languages, XML diff --git a/lisp/nxml/nxml-outln.el b/lisp/nxml/nxml-outln.el index 8fab612c7ff..6dca34a80f2 100644 --- a/lisp/nxml/nxml-outln.el +++ b/lisp/nxml/nxml-outln.el @@ -1,6 +1,6 @@ ;;; nxml-outln.el --- outline support for nXML mode -*- lexical-binding:t -*- -;; Copyright (C) 2004, 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2004, 2007-2021 Free Software Foundation, Inc. ;; Author: James Clark ;; Keywords: wp, hypermedia, languages, XML diff --git a/lisp/nxml/nxml-parse.el b/lisp/nxml/nxml-parse.el index e5c785e42ef..d2eb4f1feb9 100644 --- a/lisp/nxml/nxml-parse.el +++ b/lisp/nxml/nxml-parse.el @@ -1,6 +1,6 @@ ;;; nxml-parse.el --- XML parser, sharing infrastructure with nxml-mode -*- lexical-binding:t -*- -;; Copyright (C) 2003, 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2003, 2007-2021 Free Software Foundation, Inc. ;; Author: James Clark ;; Keywords: wp, hypermedia, languages, XML diff --git a/lisp/nxml/nxml-rap.el b/lisp/nxml/nxml-rap.el index 0d7d95acff1..6f742746e9e 100644 --- a/lisp/nxml/nxml-rap.el +++ b/lisp/nxml/nxml-rap.el @@ -1,6 +1,6 @@ ;;; nxml-rap.el --- low-level support for random access parsing for nXML mode -*- lexical-binding:t -*- -;; Copyright (C) 2003-2004, 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2003-2004, 2007-2021 Free Software Foundation, Inc. ;; Author: James Clark ;; Keywords: wp, hypermedia, languages, XML diff --git a/lisp/nxml/nxml-util.el b/lisp/nxml/nxml-util.el index 33c2e67c4dc..022d6c5f29d 100644 --- a/lisp/nxml/nxml-util.el +++ b/lisp/nxml/nxml-util.el @@ -1,6 +1,6 @@ ;;; nxml-util.el --- utility functions for nxml-*.el -*- lexical-binding:t -*- -;; Copyright (C) 2003, 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2003, 2007-2021 Free Software Foundation, Inc. ;; Author: James Clark ;; Keywords: wp, hypermedia, languages, XML diff --git a/lisp/nxml/rng-cmpct.el b/lisp/nxml/rng-cmpct.el index 296cc260663..dcbd7ed1dd7 100644 --- a/lisp/nxml/rng-cmpct.el +++ b/lisp/nxml/rng-cmpct.el @@ -1,6 +1,6 @@ ;;; rng-cmpct.el --- parsing of RELAX NG Compact Syntax schemas -*- lexical-binding:t -*- -;; Copyright (C) 2003, 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2003, 2007-2021 Free Software Foundation, Inc. ;; Author: James Clark ;; Keywords: wp, hypermedia, languages, XML, RelaxNG diff --git a/lisp/nxml/rng-dt.el b/lisp/nxml/rng-dt.el index 4aba09a68c5..25d838ce445 100644 --- a/lisp/nxml/rng-dt.el +++ b/lisp/nxml/rng-dt.el @@ -1,6 +1,6 @@ ;;; rng-dt.el --- datatype library interface for RELAX NG -*- lexical-binding:t -*- -;; Copyright (C) 2003, 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2003, 2007-2021 Free Software Foundation, Inc. ;; Author: James Clark ;; Keywords: wp, hypermedia, languages, XML, RelaxNG diff --git a/lisp/nxml/rng-loc.el b/lisp/nxml/rng-loc.el index 00b2aa7c267..d5a608d6ff2 100644 --- a/lisp/nxml/rng-loc.el +++ b/lisp/nxml/rng-loc.el @@ -1,6 +1,6 @@ ;;; rng-loc.el --- Locate the schema to use for validation -*- lexical-binding:t -*- -;; Copyright (C) 2003, 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2003, 2007-2021 Free Software Foundation, Inc. ;; Author: James Clark ;; Keywords: wp, hypermedia, languages, XML, RelaxNG diff --git a/lisp/nxml/rng-maint.el b/lisp/nxml/rng-maint.el index 67c7c59117d..82d716d95c1 100644 --- a/lisp/nxml/rng-maint.el +++ b/lisp/nxml/rng-maint.el @@ -1,6 +1,6 @@ ;;; rng-maint.el --- commands for RELAX NG maintainers -*- lexical-binding:t -*- -;; Copyright (C) 2003, 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2003, 2007-2021 Free Software Foundation, Inc. ;; Author: James Clark ;; Keywords: wp, hypermedia, languages, XML, RelaxNG diff --git a/lisp/nxml/rng-match.el b/lisp/nxml/rng-match.el index 928808c849b..4fc6727d0e6 100644 --- a/lisp/nxml/rng-match.el +++ b/lisp/nxml/rng-match.el @@ -1,6 +1,6 @@ ;;; rng-match.el --- matching of RELAX NG patterns against XML events -*- lexical-binding:t -*- -;; Copyright (C) 2003, 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2003, 2007-2021 Free Software Foundation, Inc. ;; Author: James Clark ;; Keywords: wp, hypermedia, languages, XML, RelaxNG diff --git a/lisp/nxml/rng-nxml.el b/lisp/nxml/rng-nxml.el index d0ebdf15589..7d74fd3c8a7 100644 --- a/lisp/nxml/rng-nxml.el +++ b/lisp/nxml/rng-nxml.el @@ -1,6 +1,6 @@ ;;; rng-nxml.el --- make nxml-mode take advantage of rng-validate-mode -*- lexical-binding:t -*- -;; Copyright (C) 2003, 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2003, 2007-2021 Free Software Foundation, Inc. ;; Author: James Clark ;; Keywords: wp, hypermedia, languages, XML, RelaxNG diff --git a/lisp/nxml/rng-parse.el b/lisp/nxml/rng-parse.el index 8d21aa39e79..f72f33282ee 100644 --- a/lisp/nxml/rng-parse.el +++ b/lisp/nxml/rng-parse.el @@ -1,6 +1,6 @@ ;;; rng-parse.el --- parse an XML file and validate it against a schema -*- lexical-binding:t -*- -;; Copyright (C) 2003, 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2003, 2007-2021 Free Software Foundation, Inc. ;; Author: James Clark ;; Keywords: wp, hypermedia, languages, XML, RelaxNG diff --git a/lisp/nxml/rng-pttrn.el b/lisp/nxml/rng-pttrn.el index faaee349418..12ffa578200 100644 --- a/lisp/nxml/rng-pttrn.el +++ b/lisp/nxml/rng-pttrn.el @@ -1,6 +1,6 @@ ;;; rng-pttrn.el --- RELAX NG patterns -*- lexical-binding:t -*- -;; Copyright (C) 2003, 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2003, 2007-2021 Free Software Foundation, Inc. ;; Author: James Clark ;; Keywords: wp, hypermedia, languages, XML, RelaxNG diff --git a/lisp/nxml/rng-uri.el b/lisp/nxml/rng-uri.el index a44a5dd7e63..fda481fa281 100644 --- a/lisp/nxml/rng-uri.el +++ b/lisp/nxml/rng-uri.el @@ -1,6 +1,6 @@ ;;; rng-uri.el --- URI parsing and manipulation -*- lexical-binding:t -*- -;; Copyright (C) 2003, 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2003, 2007-2021 Free Software Foundation, Inc. ;; Author: James Clark ;; Keywords: wp, hypermedia, languages, XML diff --git a/lisp/nxml/rng-util.el b/lisp/nxml/rng-util.el index 2b820fdc0c6..59465c371eb 100644 --- a/lisp/nxml/rng-util.el +++ b/lisp/nxml/rng-util.el @@ -1,6 +1,6 @@ ;;; rng-util.el --- utility functions for RELAX NG library -;; Copyright (C) 2003, 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2003, 2007-2021 Free Software Foundation, Inc. ;; Author: James Clark ;; Keywords: wp, hypermedia, languages, XML, RelaxNG diff --git a/lisp/nxml/rng-valid.el b/lisp/nxml/rng-valid.el index 803e68b3de0..6ea893404cb 100644 --- a/lisp/nxml/rng-valid.el +++ b/lisp/nxml/rng-valid.el @@ -1,6 +1,6 @@ ;;; rng-valid.el --- real-time validation of XML using RELAX NG -*- lexical-binding:t -*- -;; Copyright (C) 2003, 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2003, 2007-2021 Free Software Foundation, Inc. ;; Author: James Clark ;; Keywords: wp, hypermedia, languages, XML, RelaxNG diff --git a/lisp/nxml/rng-xsd.el b/lisp/nxml/rng-xsd.el index 02b0cecdca4..81314b85ca9 100644 --- a/lisp/nxml/rng-xsd.el +++ b/lisp/nxml/rng-xsd.el @@ -1,6 +1,6 @@ ;;; rng-xsd.el --- W3C XML Schema datatypes library for RELAX NG -*- lexical-binding:t -*- -;; Copyright (C) 2003, 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2003, 2007-2021 Free Software Foundation, Inc. ;; Author: James Clark ;; Keywords: wp, hypermedia, languages, XML, RelaxNG diff --git a/lisp/nxml/xmltok.el b/lisp/nxml/xmltok.el index 9815f4c9ce0..8f89598a5ad 100644 --- a/lisp/nxml/xmltok.el +++ b/lisp/nxml/xmltok.el @@ -1,6 +1,6 @@ ;;; xmltok.el --- XML tokenization -*- lexical-binding:t -*- -;; Copyright (C) 2003, 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2003, 2007-2021 Free Software Foundation, Inc. ;; Author: James Clark ;; Keywords: wp, hypermedia, languages, XML diff --git a/lisp/nxml/xsd-regexp.el b/lisp/nxml/xsd-regexp.el index 3ce59b75560..f07ca6657ed 100644 --- a/lisp/nxml/xsd-regexp.el +++ b/lisp/nxml/xsd-regexp.el @@ -1,6 +1,6 @@ ;;; xsd-regexp.el --- translate W3C XML Schema regexps to Emacs regexps -*- lexical-binding:t -*- -;; Copyright (C) 2003, 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2003, 2007-2021 Free Software Foundation, Inc. ;; Author: James Clark ;; Keywords: wp, hypermedia, languages, XML, regexp diff --git a/lisp/obarray.el b/lisp/obarray.el index dcd4ca5e837..ef2ddb3989e 100644 --- a/lisp/obarray.el +++ b/lisp/obarray.el @@ -1,6 +1,6 @@ ;;; obarray.el --- obarray functions -*- lexical-binding: t -*- -;; Copyright (C) 2015-2020 Free Software Foundation, Inc. +;; Copyright (C) 2015-2021 Free Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org ;; Keywords: obarray functions diff --git a/lisp/obsolete/abbrevlist.el b/lisp/obsolete/abbrevlist.el index bfe0f277d49..1d517dbd116 100644 --- a/lisp/obsolete/abbrevlist.el +++ b/lisp/obsolete/abbrevlist.el @@ -1,6 +1,6 @@ ;;; abbrevlist.el --- list one abbrev table alphabetically ordered -;; Copyright (C) 1986, 1992, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1986, 1992, 2001-2021 Free Software Foundation, Inc. ;; Suggested by a previous version by Gildea. ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/obsolete/assoc.el b/lisp/obsolete/assoc.el index 58b1a9534a2..cb5809b7174 100644 --- a/lisp/obsolete/assoc.el +++ b/lisp/obsolete/assoc.el @@ -1,6 +1,6 @@ ;;; assoc.el --- insert/delete functions on association lists -*- lexical-binding: t -*- -;; Copyright (C) 1996, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996, 2001-2021 Free Software Foundation, Inc. ;; Author: Barry A. Warsaw <bwarsaw@cen.com> ;; Keywords: extensions diff --git a/lisp/obsolete/bruce.el b/lisp/obsolete/bruce.el index 475eb980f7c..398f315c5d4 100644 --- a/lisp/obsolete/bruce.el +++ b/lisp/obsolete/bruce.el @@ -1,7 +1,7 @@ ;;; bruce.el --- bruce phrase utility for overloading the Communications ;;; Decency Act snoops, if any. -;; Copyright (C) 1988, 1993, 1997, 2001-2020 Free Software Foundation, +;; Copyright (C) 1988, 1993, 1997, 2001-2021 Free Software Foundation, ;; Inc. ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/obsolete/cc-compat.el b/lisp/obsolete/cc-compat.el index ae6447a97d9..96b036e892c 100644 --- a/lisp/obsolete/cc-compat.el +++ b/lisp/obsolete/cc-compat.el @@ -1,6 +1,6 @@ ;;; cc-compat.el --- cc-mode compatibility with c-mode.el confusion -;; Copyright (C) 1985, 1987, 1992-2020 Free Software Foundation, Inc. +;; Copyright (C) 1985, 1987, 1992-2021 Free Software Foundation, Inc. ;; Authors: 1998- Martin Stjernholm ;; 1994-1999 Barry A. Warsaw diff --git a/lisp/obsolete/cl-compat.el b/lisp/obsolete/cl-compat.el index c37fc8eb5bb..4abedf3e627 100644 --- a/lisp/obsolete/cl-compat.el +++ b/lisp/obsolete/cl-compat.el @@ -1,6 +1,6 @@ ;;; cl-compat.el --- Common Lisp extensions for GNU Emacs Lisp (compatibility) -;; Copyright (C) 1993, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1993, 2001-2021 Free Software Foundation, Inc. ;; Author: Dave Gillespie <daveg@synaptics.com> ;; Version: 2.02 diff --git a/lisp/obsolete/cl.el b/lisp/obsolete/cl.el index 6a628f305cf..95af29bb87f 100644 --- a/lisp/obsolete/cl.el +++ b/lisp/obsolete/cl.el @@ -1,6 +1,6 @@ ;;; cl.el --- Compatibility aliases for the old CL library. -*- lexical-binding: t -*- -;; Copyright (C) 2012-2020 Free Software Foundation, Inc. +;; Copyright (C) 2012-2021 Free Software Foundation, Inc. ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> ;; Deprecated-since: 27.1 diff --git a/lisp/obsolete/complete.el b/lisp/obsolete/complete.el index b1448e72e86..735e1e0b6a6 100644 --- a/lisp/obsolete/complete.el +++ b/lisp/obsolete/complete.el @@ -1,6 +1,6 @@ ;;; complete.el --- partial completion mechanism plus other goodies -;; Copyright (C) 1990-1993, 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1990-1993, 1999-2021 Free Software Foundation, Inc. ;; Author: Dave Gillespie <daveg@synaptics.com> ;; Keywords: abbrev convenience diff --git a/lisp/obsolete/crisp.el b/lisp/obsolete/crisp.el index 18eb0f34e63..91ff899c84d 100644 --- a/lisp/obsolete/crisp.el +++ b/lisp/obsolete/crisp.el @@ -1,6 +1,6 @@ ;;; crisp.el --- CRiSP/Brief Emacs emulator -;; Copyright (C) 1997-1999, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997-1999, 2001-2021 Free Software Foundation, Inc. ;; Author: Gary D. Foster <Gary.Foster@Corp.Sun.COM> ;; Keywords: emulations brief crisp diff --git a/lisp/obsolete/cust-print.el b/lisp/obsolete/cust-print.el index 40532ea5b9d..c7342b61ae7 100644 --- a/lisp/obsolete/cust-print.el +++ b/lisp/obsolete/cust-print.el @@ -1,6 +1,6 @@ ;;; cust-print.el --- handles print-level and print-circle -;; Copyright (C) 1992, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1992, 2001-2021 Free Software Foundation, Inc. ;; Author: Daniel LaLiberte <liberte@holonexus.org> ;; Adapted-By: ESR diff --git a/lisp/obsolete/erc-compat.el b/lisp/obsolete/erc-compat.el index 7ef30d822ff..203ef079c14 100644 --- a/lisp/obsolete/erc-compat.el +++ b/lisp/obsolete/erc-compat.el @@ -1,6 +1,6 @@ ;;; erc-compat.el --- ERC compatibility code for XEmacs -;; Copyright (C) 2002-2003, 2005-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002-2003, 2005-2021 Free Software Foundation, Inc. ;; Author: Alex Schroeder <alex@gnu.org> ;; Maintainer: Amin Bandali <bandali@gnu.org> diff --git a/lisp/obsolete/erc-hecomplete.el b/lisp/obsolete/erc-hecomplete.el index cd26edeaa24..fce79f7f34f 100644 --- a/lisp/obsolete/erc-hecomplete.el +++ b/lisp/obsolete/erc-hecomplete.el @@ -1,6 +1,6 @@ ;;; erc-hecomplete.el --- Provides Nick name completion for ERC -;; Copyright (C) 2001-2002, 2004, 2006-2020 Free Software Foundation, +;; Copyright (C) 2001-2002, 2004, 2006-2021 Free Software Foundation, ;; Inc. ;; Author: Alex Schroeder <alex@gnu.org> diff --git a/lisp/obsolete/eudcb-ph.el b/lisp/obsolete/eudcb-ph.el index 9f7518b1f37..c7212e3fdb7 100644 --- a/lisp/obsolete/eudcb-ph.el +++ b/lisp/obsolete/eudcb-ph.el @@ -1,6 +1,6 @@ ;;; eudcb-ph.el --- Emacs Unified Directory Client - CCSO PH/QI Backend -;; Copyright (C) 1998-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998-2021 Free Software Foundation, Inc. ;; Author: Oscar Figueiredo <oscar@cpe.fr> ;; Pavel Janík <Pavel@Janik.cz> diff --git a/lisp/obsolete/fast-lock.el b/lisp/obsolete/fast-lock.el index 9e0198dd596..8848c89c62f 100644 --- a/lisp/obsolete/fast-lock.el +++ b/lisp/obsolete/fast-lock.el @@ -1,6 +1,6 @@ ;;; fast-lock.el --- automagic text properties caching for fast Font Lock mode -;; Copyright (C) 1994-1998, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1994-1998, 2001-2021 Free Software Foundation, Inc. ;; Author: Simon Marshall <simon@gnu.org> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/obsolete/gs.el b/lisp/obsolete/gs.el index 4658f2eba7e..6ab3fc59380 100644 --- a/lisp/obsolete/gs.el +++ b/lisp/obsolete/gs.el @@ -1,6 +1,6 @@ ;;; gs.el --- interface to Ghostscript -;; Copyright (C) 1998, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998, 2001-2021 Free Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org ;; Keywords: internal diff --git a/lisp/obsolete/gulp.el b/lisp/obsolete/gulp.el index 08ab3884d41..0fbaa1cc4f8 100644 --- a/lisp/obsolete/gulp.el +++ b/lisp/obsolete/gulp.el @@ -1,6 +1,6 @@ ;;; gulp.el --- ask for updates for Lisp packages -;; Copyright (C) 1996, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996, 2001-2021 Free Software Foundation, Inc. ;; Author: Sam Shteingold <shteingd@math.ucla.edu> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/obsolete/html2text.el b/lisp/obsolete/html2text.el index bc2c8d18f81..f01561bd12c 100644 --- a/lisp/obsolete/html2text.el +++ b/lisp/obsolete/html2text.el @@ -1,6 +1,6 @@ ;;; html2text.el --- a simple html to plain text converter -*- coding: utf-8 -*- -;; Copyright (C) 2002-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002-2021 Free Software Foundation, Inc. ;; Author: Joakim Hove <hove@phys.ntnu.no> ;; Obsolete-since: 26.1 diff --git a/lisp/obsolete/info-edit.el b/lisp/obsolete/info-edit.el index ee8f7c17dd0..c8a187c08ee 100644 --- a/lisp/obsolete/info-edit.el +++ b/lisp/obsolete/info-edit.el @@ -1,6 +1,6 @@ ;; info-edit.el --- Editing info files -*- lexical-binding:t -*- -;; Copyright (C) 1985-1986, 1992-2020 Free Software Foundation, Inc. +;; Copyright (C) 1985-1986, 1992-2021 Free Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org ;; Keywords: help diff --git a/lisp/obsolete/iswitchb.el b/lisp/obsolete/iswitchb.el index 96b063be701..58cada13747 100644 --- a/lisp/obsolete/iswitchb.el +++ b/lisp/obsolete/iswitchb.el @@ -1,6 +1,6 @@ ;;; iswitchb.el --- switch between buffers using substrings -;; Copyright (C) 1996-1997, 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996-1997, 2000-2021 Free Software Foundation, Inc. ;; Author: Stephen Eglen <stephen@gnu.org> ;; Keywords: completion convenience diff --git a/lisp/obsolete/landmark.el b/lisp/obsolete/landmark.el index 39e0f50e731..ae15109beaa 100644 --- a/lisp/obsolete/landmark.el +++ b/lisp/obsolete/landmark.el @@ -1,6 +1,6 @@ ;;; landmark.el --- Neural-network robot that learns landmarks -*- lexical-binding:t -*- -;; Copyright (C) 1996-1997, 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996-1997, 2000-2021 Free Software Foundation, Inc. ;; Author: Terrence Brannon <metaperl@gmail.com> ;; Created: December 16, 1996 - first release to usenet diff --git a/lisp/obsolete/lazy-lock.el b/lisp/obsolete/lazy-lock.el index 694188ff234..e1a01913bea 100644 --- a/lisp/obsolete/lazy-lock.el +++ b/lisp/obsolete/lazy-lock.el @@ -1,6 +1,6 @@ ;;; lazy-lock.el --- lazy demand-driven fontification for fast Font Lock mode -;; Copyright (C) 1994-1998, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1994-1998, 2001-2021 Free Software Foundation, Inc. ;; Author: Simon Marshall <simon@gnu.org> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/obsolete/longlines.el b/lisp/obsolete/longlines.el index cbe453aa6bf..f274dfb926d 100644 --- a/lisp/obsolete/longlines.el +++ b/lisp/obsolete/longlines.el @@ -1,6 +1,6 @@ ;;; longlines.el --- automatically wrap long lines -*- coding:utf-8 -*- -;; Copyright (C) 2000-2001, 2004-2020 Free Software Foundation, Inc. +;; Copyright (C) 2000-2001, 2004-2021 Free Software Foundation, Inc. ;; Authors: Kai Grossjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE> ;; Alex Schroeder <alex@gnu.org> @@ -407,7 +407,8 @@ Hard newlines are left intact." (defun longlines-auto-wrap (&optional arg) "Toggle automatic line wrapping. -With optional argument ARG, turn on line wrapping if and only if ARG is positive. +With optional argument ARG, turn on line wrapping if and only if +ARG is positive. If automatic line wrapping is turned on, wrap the entire buffer." (interactive "P") (setq arg (if arg diff --git a/lisp/obsolete/mantemp.el b/lisp/obsolete/mantemp.el index 9c0e553feca..287a5a732ca 100644 --- a/lisp/obsolete/mantemp.el +++ b/lisp/obsolete/mantemp.el @@ -1,6 +1,6 @@ ;;; mantemp.el --- create manual template instantiations from g++ 2.7.2 output -;; Copyright (C) 1996, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996, 2001-2021 Free Software Foundation, Inc. ;; Author: Tom Houlder <thoulder@icor.fr> ;; Created: 10 Dec 1996 diff --git a/lisp/obsolete/messcompat.el b/lisp/obsolete/messcompat.el index 71ae9e4595d..fa73dc7a0fd 100644 --- a/lisp/obsolete/messcompat.el +++ b/lisp/obsolete/messcompat.el @@ -1,6 +1,6 @@ ;;; messcompat.el --- making message mode compatible with mail mode -;; Copyright (C) 1996-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Keywords: mail, news diff --git a/lisp/obsolete/metamail.el b/lisp/obsolete/metamail.el index d6ab4a3d0cf..ef97e8aa55c 100644 --- a/lisp/obsolete/metamail.el +++ b/lisp/obsolete/metamail.el @@ -1,6 +1,6 @@ ;;; metamail.el --- Metamail interface for GNU Emacs -;; Copyright (C) 1993, 1996, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1993, 1996, 2001-2021 Free Software Foundation, Inc. ;; Author: Masanobu UMEDA <umerin@mse.kyutech.ac.jp> ;; Keywords: mail, news, mime, multimedia diff --git a/lisp/obsolete/mouse-sel.el b/lisp/obsolete/mouse-sel.el index aabbfcfa3ea..608596e882b 100644 --- a/lisp/obsolete/mouse-sel.el +++ b/lisp/obsolete/mouse-sel.el @@ -1,6 +1,6 @@ ;;; mouse-sel.el --- multi-click selection support -;; Copyright (C) 1993-1995, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1993-1995, 2001-2021 Free Software Foundation, Inc. ;; Author: Mike Williams <mdub@bigfoot.com> ;; Keywords: mouse diff --git a/lisp/obsolete/nnir.el b/lisp/obsolete/nnir.el index 6f17854754d..147efed0057 100644 --- a/lisp/obsolete/nnir.el +++ b/lisp/obsolete/nnir.el @@ -1,6 +1,6 @@ ;;; nnir.el --- Search mail with various search engines -*- lexical-binding:t -*- -;; Copyright (C) 1998-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998-2021 Free Software Foundation, Inc. ;; Author: Kai Großjohann <grossjohann@ls6.cs.uni-dortmund.de> ;; Swish-e and Swish++ backends by: diff --git a/lisp/obsolete/old-emacs-lock.el b/lisp/obsolete/old-emacs-lock.el index 0e178231833..07bccd90711 100644 --- a/lisp/obsolete/old-emacs-lock.el +++ b/lisp/obsolete/old-emacs-lock.el @@ -1,6 +1,6 @@ ;;; emacs-lock.el --- prevents you from exiting Emacs if a buffer is locked -;; Copyright (C) 1994, 1997, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1994, 1997, 2001-2021 Free Software Foundation, Inc. ;; Author: Tom Wurgler <twurgler@goodyear.com> ;; Created: 12/8/94 diff --git a/lisp/obsolete/otodo-mode.el b/lisp/obsolete/otodo-mode.el index 6aada0755ef..58c385adad4 100644 --- a/lisp/obsolete/otodo-mode.el +++ b/lisp/obsolete/otodo-mode.el @@ -1,6 +1,6 @@ ;;; todo-mode.el --- major mode for editing TODO list files -;; Copyright (C) 1997, 1999, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997, 1999, 2001-2021 Free Software Foundation, Inc. ;; Author: Oliver Seidel <privat@os10000.net> ;; Maintainer: Stephen Berman <stephen.berman@gmx.net> diff --git a/lisp/obsolete/pc-mode.el b/lisp/obsolete/pc-mode.el index 0c69f898a07..d4c90c2b298 100644 --- a/lisp/obsolete/pc-mode.el +++ b/lisp/obsolete/pc-mode.el @@ -1,6 +1,6 @@ ;;; pc-mode.el --- emulate certain key bindings used on PCs -;; Copyright (C) 1995, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1995, 2001-2021 Free Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org ;; Keywords: emulations diff --git a/lisp/obsolete/pc-select.el b/lisp/obsolete/pc-select.el index 73ded272c5d..3f184881096 100644 --- a/lisp/obsolete/pc-select.el +++ b/lisp/obsolete/pc-select.el @@ -2,7 +2,7 @@ ;;; (or MAC GUI or MS-windoze (bah)) look-and-feel ;;; including key bindings. -;; Copyright (C) 1995-1997, 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 1995-1997, 2000-2021 Free Software Foundation, Inc. ;; Author: Michael Staats <michael@thp.Uni-Duisburg.DE> ;; Keywords: convenience emulations diff --git a/lisp/obsolete/pgg-def.el b/lisp/obsolete/pgg-def.el index a3575feb1a9..425093832f8 100644 --- a/lisp/obsolete/pgg-def.el +++ b/lisp/obsolete/pgg-def.el @@ -1,6 +1,6 @@ ;;; pgg-def.el --- functions/macros for defining PGG functions -;; Copyright (C) 1999, 2002-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2002-2021 Free Software Foundation, Inc. ;; Author: Daiki Ueno <ueno@unixuser.org> ;; Created: 1999/11/02 diff --git a/lisp/obsolete/pgg-gpg.el b/lisp/obsolete/pgg-gpg.el index 6e4cec97a67..90255fe2f7d 100644 --- a/lisp/obsolete/pgg-gpg.el +++ b/lisp/obsolete/pgg-gpg.el @@ -1,6 +1,6 @@ ;;; pgg-gpg.el --- GnuPG support for PGG. -;; Copyright (C) 1999-2000, 2002-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2000, 2002-2021 Free Software Foundation, Inc. ;; Author: Daiki Ueno <ueno@unixuser.org> ;; Symmetric encryption and gpg-agent support added by: diff --git a/lisp/obsolete/pgg-parse.el b/lisp/obsolete/pgg-parse.el index 79d5cbb3f3b..edb5d4f6775 100644 --- a/lisp/obsolete/pgg-parse.el +++ b/lisp/obsolete/pgg-parse.el @@ -1,6 +1,6 @@ ;;; pgg-parse.el --- OpenPGP packet parsing -;; Copyright (C) 1999, 2002-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2002-2021 Free Software Foundation, Inc. ;; Author: Daiki Ueno <ueno@unixuser.org> ;; Created: 1999/10/28 diff --git a/lisp/obsolete/pgg-pgp.el b/lisp/obsolete/pgg-pgp.el index cbcb1b33e72..e02032a6a57 100644 --- a/lisp/obsolete/pgg-pgp.el +++ b/lisp/obsolete/pgg-pgp.el @@ -1,6 +1,6 @@ ;;; pgg-pgp.el --- PGP 2.* and 6.* support for PGG. -;; Copyright (C) 1999-2000, 2002-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2000, 2002-2021 Free Software Foundation, Inc. ;; Author: Daiki Ueno <ueno@unixuser.org> ;; Created: 1999/11/02 diff --git a/lisp/obsolete/pgg-pgp5.el b/lisp/obsolete/pgg-pgp5.el index 892874e3af8..42ff1ca2bd6 100644 --- a/lisp/obsolete/pgg-pgp5.el +++ b/lisp/obsolete/pgg-pgp5.el @@ -1,6 +1,6 @@ ;;; pgg-pgp5.el --- PGP 5.* support for PGG. -;; Copyright (C) 1999-2000, 2002-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2000, 2002-2021 Free Software Foundation, Inc. ;; Author: Daiki Ueno <ueno@unixuser.org> ;; Created: 1999/11/02 diff --git a/lisp/obsolete/pgg.el b/lisp/obsolete/pgg.el index f0f7081665a..ec93eeb93f8 100644 --- a/lisp/obsolete/pgg.el +++ b/lisp/obsolete/pgg.el @@ -1,6 +1,6 @@ ;;; pgg.el --- glue for the various PGP implementations. -;; Copyright (C) 1999-2000, 2002-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2000, 2002-2021 Free Software Foundation, Inc. ;; Author: Daiki Ueno <ueno@unixuser.org> ;; Symmetric encryption added by: Sascha Wilde <wilde@sha-bang.de> diff --git a/lisp/obsolete/rcompile.el b/lisp/obsolete/rcompile.el index 6d95b7136b1..29931d9bda4 100644 --- a/lisp/obsolete/rcompile.el +++ b/lisp/obsolete/rcompile.el @@ -1,6 +1,6 @@ ;;; rcompile.el --- run a compilation on a remote machine -;; Copyright (C) 1993-1994, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1993-1994, 2001-2021 Free Software Foundation, Inc. ;; Author: Alon Albert <alon@milcse.rtsg.mot.com> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/obsolete/s-region.el b/lisp/obsolete/s-region.el index 2b55f91a7d5..bcb5279d115 100644 --- a/lisp/obsolete/s-region.el +++ b/lisp/obsolete/s-region.el @@ -1,6 +1,6 @@ ;;; s-region.el --- set region using shift key -;; Copyright (C) 1994-1995, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1994-1995, 2001-2021 Free Software Foundation, Inc. ;; Author: Morten Welinder <terra@diku.dk> ;; Keywords: terminals diff --git a/lisp/obsolete/sb-image.el b/lisp/obsolete/sb-image.el index fd8884738d4..53ecfb7f268 100644 --- a/lisp/obsolete/sb-image.el +++ b/lisp/obsolete/sb-image.el @@ -1,6 +1,7 @@ ;;; sb-image --- Image management for speedbar -;; Copyright (C) 1999-2003, 2005-2019 Free Software Foundation, Inc. +;; Copyright (C) 1999-2003, 2005-2019, 2021 Free Software Foundation, +;; Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> ;; Keywords: file, tags, tools diff --git a/lisp/obsolete/sregex.el b/lisp/obsolete/sregex.el index ad3671cef84..ac5f62dd67e 100644 --- a/lisp/obsolete/sregex.el +++ b/lisp/obsolete/sregex.el @@ -1,6 +1,6 @@ ;;; sregex.el --- symbolic regular expressions -;; Copyright (C) 1997-1998, 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997-1998, 2000-2021 Free Software Foundation, Inc. ;; Author: Bob Glickstein <bobg+sregex@zanshin.com> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/obsolete/starttls.el b/lisp/obsolete/starttls.el index df1a251dbe4..451c7eb2ffc 100644 --- a/lisp/obsolete/starttls.el +++ b/lisp/obsolete/starttls.el @@ -1,6 +1,6 @@ ;;; starttls.el --- STARTTLS functions -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: Daiki Ueno <ueno@unixuser.org> ;; Author: Simon Josefsson <simon@josefsson.org> diff --git a/lisp/obsolete/sup-mouse.el b/lisp/obsolete/sup-mouse.el index 1852e20c199..f3db27f567e 100644 --- a/lisp/obsolete/sup-mouse.el +++ b/lisp/obsolete/sup-mouse.el @@ -1,6 +1,6 @@ ;;; sup-mouse.el --- supdup mouse support for lisp machines -;; Copyright (C) 1985-1986, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1985-1986, 2001-2021 Free Software Foundation, Inc. ;; Author: Wolfgang Rupprecht ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/obsolete/terminal.el b/lisp/obsolete/terminal.el index 3d73c030c36..bde656dfa6a 100644 --- a/lisp/obsolete/terminal.el +++ b/lisp/obsolete/terminal.el @@ -1,6 +1,6 @@ ;;; terminal.el --- terminal emulator for GNU Emacs -;; Copyright (C) 1986-1989, 1993-1994, 2001-2020 Free Software +;; Copyright (C) 1986-1989, 1993-1994, 2001-2021 Free Software ;; Foundation, Inc. ;; Author: Richard Mlynarik <mly@eddie.mit.edu> diff --git a/lisp/obsolete/tls.el b/lisp/obsolete/tls.el index a9d7b843736..67a497f9412 100644 --- a/lisp/obsolete/tls.el +++ b/lisp/obsolete/tls.el @@ -1,6 +1,6 @@ ;;; tls.el --- TLS/SSL support via wrapper around GnuTLS -;; Copyright (C) 1996-1999, 2002-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996-1999, 2002-2021 Free Software Foundation, Inc. ;; Author: Simon Josefsson <simon@josefsson.org> ;; Keywords: comm, tls, gnutls, ssl diff --git a/lisp/obsolete/tpu-edt.el b/lisp/obsolete/tpu-edt.el index 0de7aa096d6..78d88cf3774 100644 --- a/lisp/obsolete/tpu-edt.el +++ b/lisp/obsolete/tpu-edt.el @@ -1,6 +1,6 @@ ;;; tpu-edt.el --- Emacs emulating TPU emulating EDT -;; Copyright (C) 1993-1995, 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 1993-1995, 2000-2021 Free Software Foundation, Inc. ;; Author: Rob Riepel <riepel@networking.stanford.edu> ;; Version: 4.5 diff --git a/lisp/obsolete/tpu-extras.el b/lisp/obsolete/tpu-extras.el index f3b59ddd3c1..10b9c893721 100644 --- a/lisp/obsolete/tpu-extras.el +++ b/lisp/obsolete/tpu-extras.el @@ -1,6 +1,6 @@ ;;; tpu-extras.el --- scroll margins and free cursor mode for TPU-edt -;; Copyright (C) 1993-1995, 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 1993-1995, 2000-2021 Free Software Foundation, Inc. ;; Author: Rob Riepel <riepel@networking.stanford.edu> ;; Keywords: emulations diff --git a/lisp/obsolete/tpu-mapper.el b/lisp/obsolete/tpu-mapper.el index f1c0bb8a848..2735820ae49 100644 --- a/lisp/obsolete/tpu-mapper.el +++ b/lisp/obsolete/tpu-mapper.el @@ -1,6 +1,6 @@ ;;; tpu-mapper.el --- create a TPU-edt X-windows keymap file -;; Copyright (C) 1993-1995, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1993-1995, 2001-2021 Free Software Foundation, Inc. ;; Author: Rob Riepel <riepel@networking.stanford.edu> ;; Keywords: emulations diff --git a/lisp/obsolete/url-ns.el b/lisp/obsolete/url-ns.el index 848710571b4..fff3be95453 100644 --- a/lisp/obsolete/url-ns.el +++ b/lisp/obsolete/url-ns.el @@ -1,6 +1,6 @@ ;;; url-ns.el --- Various netscape-ish functions for proxy definitions -;; Copyright (C) 1997-1999, 2004-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997-1999, 2004-2021 Free Software Foundation, Inc. ;; Keywords: comm, data, processes, hypermedia ;; Obsolete-since: 27.1 diff --git a/lisp/obsolete/vc-arch.el b/lisp/obsolete/vc-arch.el index 93bd991eb3a..80a2094d804 100644 --- a/lisp/obsolete/vc-arch.el +++ b/lisp/obsolete/vc-arch.el @@ -1,6 +1,6 @@ ;;; vc-arch.el --- VC backend for the Arch version-control system -*- lexical-binding: t -*- -;; Copyright (C) 2004-2020 Free Software Foundation, Inc. +;; Copyright (C) 2004-2021 Free Software Foundation, Inc. ;; Author: FSF (see vc.el for full credits) ;; Maintainer: Stefan Monnier <monnier@gnu.org> diff --git a/lisp/obsolete/vip.el b/lisp/obsolete/vip.el index 37defd1c5a4..08085e51d74 100644 --- a/lisp/obsolete/vip.el +++ b/lisp/obsolete/vip.el @@ -1,6 +1,6 @@ ;;; vip.el --- a VI Package for GNU Emacs -;; Copyright (C) 1986-1988, 1992-1993, 1998, 2001-2020 Free Software +;; Copyright (C) 1986-1988, 1992-1993, 1998, 2001-2021 Free Software ;; Foundation, Inc. ;; Author: Masahiko Sato <ms@sail.stanford.edu> diff --git a/lisp/obsolete/ws-mode.el b/lisp/obsolete/ws-mode.el index 086983202b8..d1ced86c468 100644 --- a/lisp/obsolete/ws-mode.el +++ b/lisp/obsolete/ws-mode.el @@ -1,6 +1,6 @@ ;;; ws-mode.el --- WordStar emulation mode for GNU Emacs -*- lexical-binding: t -*- -;; Copyright (C) 1991, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1991, 2001-2021 Free Software Foundation, Inc. ;; Author: Juergen Nickelsen <nickel@cs.tu-berlin.de> ;; Version: 0.7 diff --git a/lisp/obsolete/yow.el b/lisp/obsolete/yow.el index 5efd63c90e7..76485f989c1 100644 --- a/lisp/obsolete/yow.el +++ b/lisp/obsolete/yow.el @@ -1,6 +1,6 @@ ;;; yow.el --- quote random zippyisms -;; Copyright (C) 1993-1995, 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 1993-1995, 2000-2021 Free Software Foundation, Inc. ;; Author: Richard Mlynarik ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/org/ChangeLog.1 b/lisp/org/ChangeLog.1 index ef62ae7356c..d350a3117b0 100644 --- a/lisp/org/ChangeLog.1 +++ b/lisp/org/ChangeLog.1 @@ -32833,7 +32833,7 @@ ;; add-log-time-zone-rule: t ;; End: - Copyright (C) 2008-2020 Free Software Foundation, Inc. + Copyright (C) 2008-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lisp/org/ob-C.el b/lisp/org/ob-C.el index c5155fbfcc8..6e339017931 100644 --- a/lisp/org/ob-C.el +++ b/lisp/org/ob-C.el @@ -1,6 +1,6 @@ ;;; ob-C.el --- Babel Functions for C and Similar Languages -*- lexical-binding: t; -*- -;; Copyright (C) 2010-2020 Free Software Foundation, Inc. +;; Copyright (C) 2010-2021 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Thierry Banel diff --git a/lisp/org/ob-J.el b/lisp/org/ob-J.el index e66227b8df6..0c5591d5b71 100644 --- a/lisp/org/ob-J.el +++ b/lisp/org/ob-J.el @@ -1,6 +1,6 @@ ;;; ob-J.el --- Babel Functions for J -*- lexical-binding: t; -*- -;; Copyright (C) 2011-2020 Free Software Foundation, Inc. +;; Copyright (C) 2011-2021 Free Software Foundation, Inc. ;; Author: Oleh Krehel ;; Maintainer: Joseph Novakovich <josephnovakovich@gmail.com> diff --git a/lisp/org/ob-R.el b/lisp/org/ob-R.el index b4cf360730d..309a0acf7e7 100644 --- a/lisp/org/ob-R.el +++ b/lisp/org/ob-R.el @@ -1,6 +1,6 @@ ;;; ob-R.el --- Babel Functions for R -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2009-2021 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Dan Davison diff --git a/lisp/org/ob-abc.el b/lisp/org/ob-abc.el index 4c9e83525d9..404e39fc27c 100644 --- a/lisp/org/ob-abc.el +++ b/lisp/org/ob-abc.el @@ -1,6 +1,6 @@ ;;; ob-abc.el --- Org Babel Functions for ABC -*- lexical-binding: t; -*- -;; Copyright (C) 2013-2020 Free Software Foundation, Inc. +;; Copyright (C) 2013-2021 Free Software Foundation, Inc. ;; Author: William Waites ;; Keywords: literate programming, music diff --git a/lisp/org/ob-asymptote.el b/lisp/org/ob-asymptote.el index da7f870d494..bfb5b79145e 100644 --- a/lisp/org/ob-asymptote.el +++ b/lisp/org/ob-asymptote.el @@ -1,6 +1,6 @@ ;;; ob-asymptote.el --- Babel Functions for Asymptote -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2009-2021 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/lisp/org/ob-awk.el b/lisp/org/ob-awk.el index 577878349c5..b41d70f12ca 100644 --- a/lisp/org/ob-awk.el +++ b/lisp/org/ob-awk.el @@ -1,6 +1,6 @@ ;;; ob-awk.el --- Babel Functions for Awk -*- lexical-binding: t; -*- -;; Copyright (C) 2011-2020 Free Software Foundation, Inc. +;; Copyright (C) 2011-2021 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/lisp/org/ob-calc.el b/lisp/org/ob-calc.el index c2937f6952b..39ebce10020 100644 --- a/lisp/org/ob-calc.el +++ b/lisp/org/ob-calc.el @@ -1,6 +1,6 @@ ;;; ob-calc.el --- Babel Functions for Calc -*- lexical-binding: t; -*- -;; Copyright (C) 2010-2020 Free Software Foundation, Inc. +;; Copyright (C) 2010-2021 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/lisp/org/ob-clojure.el b/lisp/org/ob-clojure.el index 299a326e429..df2d691f68b 100644 --- a/lisp/org/ob-clojure.el +++ b/lisp/org/ob-clojure.el @@ -1,6 +1,6 @@ ;;; ob-clojure.el --- Babel Functions for Clojure -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2009-2021 Free Software Foundation, Inc. ;; Author: Joel Boehland, Eric Schulte, Oleh Krehel, Frederick Giasson ;; diff --git a/lisp/org/ob-comint.el b/lisp/org/ob-comint.el index d3484bb7c60..18d4f3c9388 100644 --- a/lisp/org/ob-comint.el +++ b/lisp/org/ob-comint.el @@ -1,6 +1,6 @@ ;;; ob-comint.el --- Babel Functions for Interaction with Comint Buffers -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2009-2021 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research, comint diff --git a/lisp/org/ob-coq.el b/lisp/org/ob-coq.el index e473eac3301..c77e8c9af69 100644 --- a/lisp/org/ob-coq.el +++ b/lisp/org/ob-coq.el @@ -1,6 +1,6 @@ ;;; ob-coq.el --- Babel Functions for Coq -*- lexical-binding: t; -*- -;; Copyright (C) 2010-2020 Free Software Foundation, Inc. +;; Copyright (C) 2010-2021 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/lisp/org/ob-core.el b/lisp/org/ob-core.el index ede35e154a3..1343410792a 100644 --- a/lisp/org/ob-core.el +++ b/lisp/org/ob-core.el @@ -1,6 +1,6 @@ ;;; ob-core.el --- Working with Code Blocks -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2009-2021 Free Software Foundation, Inc. ;; Authors: Eric Schulte ;; Dan Davison diff --git a/lisp/org/ob-css.el b/lisp/org/ob-css.el index 190f69cbff4..8ad70d44d06 100644 --- a/lisp/org/ob-css.el +++ b/lisp/org/ob-css.el @@ -1,6 +1,6 @@ ;;; ob-css.el --- Babel Functions for CSS -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2009-2021 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/lisp/org/ob-ditaa.el b/lisp/org/ob-ditaa.el index 59129503e9f..249c8c899eb 100644 --- a/lisp/org/ob-ditaa.el +++ b/lisp/org/ob-ditaa.el @@ -1,6 +1,6 @@ ;;; ob-ditaa.el --- Babel Functions for ditaa -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2009-2021 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/lisp/org/ob-dot.el b/lisp/org/ob-dot.el index 669d3cdbff1..d13261b340e 100644 --- a/lisp/org/ob-dot.el +++ b/lisp/org/ob-dot.el @@ -1,6 +1,6 @@ ;;; ob-dot.el --- Babel Functions for dot -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2009-2021 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/lisp/org/ob-ebnf.el b/lisp/org/ob-ebnf.el index 773edded452..58666a4ded0 100644 --- a/lisp/org/ob-ebnf.el +++ b/lisp/org/ob-ebnf.el @@ -1,6 +1,6 @@ ;;; ob-ebnf.el --- Babel Functions for EBNF -*- lexical-binding: t; -*- -;; Copyright (C) 2013-2020 Free Software Foundation, Inc. +;; Copyright (C) 2013-2021 Free Software Foundation, Inc. ;; Author: Michael Gauland ;; Keywords: literate programming, reproducible research diff --git a/lisp/org/ob-emacs-lisp.el b/lisp/org/ob-emacs-lisp.el index a18038112b4..d03151f13ea 100644 --- a/lisp/org/ob-emacs-lisp.el +++ b/lisp/org/ob-emacs-lisp.el @@ -1,6 +1,6 @@ ;;; ob-emacs-lisp.el --- Babel Functions for Emacs-lisp Code -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2009-2021 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/lisp/org/ob-eshell.el b/lisp/org/ob-eshell.el index 4edd3cf641e..6ae0fc613dd 100644 --- a/lisp/org/ob-eshell.el +++ b/lisp/org/ob-eshell.el @@ -1,6 +1,6 @@ ;;; ob-eshell.el --- Babel Functions for Eshell -*- lexical-binding: t; -*- -;; Copyright (C) 2018-2020 Free Software Foundation, Inc. +;; Copyright (C) 2018-2021 Free Software Foundation, Inc. ;; Author: stardiviner <numbchild@gmail.com> ;; Keywords: literate programming, reproducible research diff --git a/lisp/org/ob-eval.el b/lisp/org/ob-eval.el index c11ebf19e93..b0fca7bd95b 100644 --- a/lisp/org/ob-eval.el +++ b/lisp/org/ob-eval.el @@ -1,6 +1,6 @@ ;;; ob-eval.el --- Babel Functions for External Code Evaluation -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2009-2021 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research, comint diff --git a/lisp/org/ob-exp.el b/lisp/org/ob-exp.el index 46506fcfddc..e851ff624a7 100644 --- a/lisp/org/ob-exp.el +++ b/lisp/org/ob-exp.el @@ -1,6 +1,6 @@ ;;; ob-exp.el --- Exportation of Babel Source Blocks -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2009-2021 Free Software Foundation, Inc. ;; Authors: Eric Schulte ;; Dan Davison diff --git a/lisp/org/ob-forth.el b/lisp/org/ob-forth.el index b6191c30719..3b521bc4d95 100644 --- a/lisp/org/ob-forth.el +++ b/lisp/org/ob-forth.el @@ -1,6 +1,6 @@ ;;; ob-forth.el --- Babel Functions for Forth -*- lexical-binding: t; -*- -;; Copyright (C) 2014-2020 Free Software Foundation, Inc. +;; Copyright (C) 2014-2021 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research, forth diff --git a/lisp/org/ob-fortran.el b/lisp/org/ob-fortran.el index 279ca6ceba1..99afa0d963d 100644 --- a/lisp/org/ob-fortran.el +++ b/lisp/org/ob-fortran.el @@ -1,6 +1,6 @@ ;;; ob-fortran.el --- Babel Functions for Fortran -*- lexical-binding: t; -*- -;; Copyright (C) 2011-2020 Free Software Foundation, Inc. +;; Copyright (C) 2011-2021 Free Software Foundation, Inc. ;; Authors: Sergey Litvinov ;; Eric Schulte diff --git a/lisp/org/ob-gnuplot.el b/lisp/org/ob-gnuplot.el index 62ab04d94a7..6489c23f570 100644 --- a/lisp/org/ob-gnuplot.el +++ b/lisp/org/ob-gnuplot.el @@ -1,6 +1,6 @@ ;;; ob-gnuplot.el --- Babel Functions for Gnuplot -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2009-2021 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/lisp/org/ob-groovy.el b/lisp/org/ob-groovy.el index caf35350c5c..fa847dd0a2b 100644 --- a/lisp/org/ob-groovy.el +++ b/lisp/org/ob-groovy.el @@ -1,6 +1,6 @@ ;;; ob-groovy.el --- Babel Functions for Groovy -*- lexical-binding: t; -*- -;; Copyright (C) 2013-2020 Free Software Foundation, Inc. +;; Copyright (C) 2013-2021 Free Software Foundation, Inc. ;; Author: Miro Bezjak ;; Keywords: literate programming, reproducible research diff --git a/lisp/org/ob-haskell.el b/lisp/org/ob-haskell.el index 84e2d6c42bc..d7ac1b04b36 100644 --- a/lisp/org/ob-haskell.el +++ b/lisp/org/ob-haskell.el @@ -1,6 +1,6 @@ ;;; ob-haskell.el --- Babel Functions for Haskell -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2009-2021 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/lisp/org/ob-hledger.el b/lisp/org/ob-hledger.el index ff451befa26..3d2f46cdce2 100644 --- a/lisp/org/ob-hledger.el +++ b/lisp/org/ob-hledger.el @@ -1,6 +1,6 @@ ;; ob-hledger.el --- Babel Functions for hledger -*- lexical-binding: t; -*- -;; Copyright (C) 2010-2020 Free Software Foundation, Inc. +;; Copyright (C) 2010-2021 Free Software Foundation, Inc. ;; Author: Simon Michael ;; Keywords: literate programming, reproducible research, plain text accounting diff --git a/lisp/org/ob-io.el b/lisp/org/ob-io.el index 46e721b7ae7..63d2b6cf35e 100644 --- a/lisp/org/ob-io.el +++ b/lisp/org/ob-io.el @@ -1,6 +1,6 @@ ;;; ob-io.el --- Babel Functions for Io -*- lexical-binding: t; -*- -;; Copyright (C) 2012-2020 Free Software Foundation, Inc. +;; Copyright (C) 2012-2021 Free Software Foundation, Inc. ;; Author: Andrzej Lichnerowicz ;; Keywords: literate programming, reproducible research diff --git a/lisp/org/ob-java.el b/lisp/org/ob-java.el index f5edc6d53b5..b1d517e94aa 100644 --- a/lisp/org/ob-java.el +++ b/lisp/org/ob-java.el @@ -1,6 +1,6 @@ ;;; ob-java.el --- Babel Functions for Java -*- lexical-binding: t; -*- -;; Copyright (C) 2011-2020 Free Software Foundation, Inc. +;; Copyright (C) 2011-2021 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/lisp/org/ob-js.el b/lisp/org/ob-js.el index 0879e689255..b2a971e2a59 100644 --- a/lisp/org/ob-js.el +++ b/lisp/org/ob-js.el @@ -1,6 +1,6 @@ ;;; ob-js.el --- Babel Functions for Javascript -*- lexical-binding: t; -*- -;; Copyright (C) 2010-2020 Free Software Foundation, Inc. +;; Copyright (C) 2010-2021 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research, js diff --git a/lisp/org/ob-latex.el b/lisp/org/ob-latex.el index 4b343dd14d6..138f4749525 100644 --- a/lisp/org/ob-latex.el +++ b/lisp/org/ob-latex.el @@ -1,6 +1,6 @@ ;;; ob-latex.el --- Babel Functions for LaTeX -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2009-2021 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/lisp/org/ob-ledger.el b/lisp/org/ob-ledger.el index 2be1a39ac7c..a117f854e48 100644 --- a/lisp/org/ob-ledger.el +++ b/lisp/org/ob-ledger.el @@ -1,6 +1,6 @@ ;;; ob-ledger.el --- Babel Functions for Ledger -*- lexical-binding: t; -*- -;; Copyright (C) 2010-2020 Free Software Foundation, Inc. +;; Copyright (C) 2010-2021 Free Software Foundation, Inc. ;; Author: Eric S Fraga ;; Keywords: literate programming, reproducible research, accounting diff --git a/lisp/org/ob-lilypond.el b/lisp/org/ob-lilypond.el index af66cc8a011..fbdd905a5fe 100644 --- a/lisp/org/ob-lilypond.el +++ b/lisp/org/ob-lilypond.el @@ -1,6 +1,6 @@ ;;; ob-lilypond.el --- Babel Functions for Lilypond -*- lexical-binding: t; -*- -;; Copyright (C) 2010-2020 Free Software Foundation, Inc. +;; Copyright (C) 2010-2021 Free Software Foundation, Inc. ;; Author: Martyn Jago ;; Keywords: babel language, literate programming diff --git a/lisp/org/ob-lisp.el b/lisp/org/ob-lisp.el index 8b126b26f20..87b9241e758 100644 --- a/lisp/org/ob-lisp.el +++ b/lisp/org/ob-lisp.el @@ -1,6 +1,6 @@ ;;; ob-lisp.el --- Babel Functions for Common Lisp -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2009-2021 Free Software Foundation, Inc. ;; Authors: Joel Boehland ;; Eric Schulte diff --git a/lisp/org/ob-lob.el b/lisp/org/ob-lob.el index 8c341e6756d..903dabfbd59 100644 --- a/lisp/org/ob-lob.el +++ b/lisp/org/ob-lob.el @@ -1,6 +1,6 @@ ;;; ob-lob.el --- Functions Supporting the Library of Babel -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2009-2021 Free Software Foundation, Inc. ;; Authors: Eric Schulte ;; Dan Davison diff --git a/lisp/org/ob-lua.el b/lisp/org/ob-lua.el index 5e7b5145fa2..11503e47470 100644 --- a/lisp/org/ob-lua.el +++ b/lisp/org/ob-lua.el @@ -1,6 +1,6 @@ ;;; ob-lua.el --- Org Babel functions for Lua evaluation -*- lexical-binding: t; -*- -;; Copyright (C) 2014, 2016-2020 Free Software Foundation, Inc. +;; Copyright (C) 2014, 2016-2021 Free Software Foundation, Inc. ;; Authors: Dieter Schoen ;; Keywords: literate programming, reproducible research diff --git a/lisp/org/ob-makefile.el b/lisp/org/ob-makefile.el index d1f2fba9894..69ab6fe9eaa 100644 --- a/lisp/org/ob-makefile.el +++ b/lisp/org/ob-makefile.el @@ -1,6 +1,6 @@ ;;; ob-makefile.el --- Babel Functions for Makefile -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2009-2021 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Thomas S. Dye diff --git a/lisp/org/ob-matlab.el b/lisp/org/ob-matlab.el index 0d238a44f75..45ec5c5437b 100644 --- a/lisp/org/ob-matlab.el +++ b/lisp/org/ob-matlab.el @@ -1,6 +1,6 @@ ;;; ob-matlab.el --- Babel support for Matlab -*- lexical-binding: t; -*- -;; Copyright (C) 2010-2020 Free Software Foundation, Inc. +;; Copyright (C) 2010-2021 Free Software Foundation, Inc. ;; Author: Dan Davison ;; Keywords: literate programming, reproducible research diff --git a/lisp/org/ob-maxima.el b/lisp/org/ob-maxima.el index c30b702a1ed..7b49bb07a0e 100644 --- a/lisp/org/ob-maxima.el +++ b/lisp/org/ob-maxima.el @@ -1,6 +1,6 @@ ;;; ob-maxima.el --- Babel Functions for Maxima -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2009-2021 Free Software Foundation, Inc. ;; Author: Eric S Fraga ;; Eric Schulte diff --git a/lisp/org/ob-mscgen.el b/lisp/org/ob-mscgen.el index 2bd9144f4fe..999d4f4140b 100644 --- a/lisp/org/ob-mscgen.el +++ b/lisp/org/ob-mscgen.el @@ -1,6 +1,6 @@ ;;; ob-msc.el --- Babel Functions for Mscgen -*- lexical-binding: t; -*- -;; Copyright (C) 2010-2020 Free Software Foundation, Inc. +;; Copyright (C) 2010-2021 Free Software Foundation, Inc. ;; Author: Juan Pechiar ;; Keywords: literate programming, reproducible research diff --git a/lisp/org/ob-ocaml.el b/lisp/org/ob-ocaml.el index 2389f192c5b..0aa91afdb24 100644 --- a/lisp/org/ob-ocaml.el +++ b/lisp/org/ob-ocaml.el @@ -1,6 +1,6 @@ ;;; ob-ocaml.el --- Babel Functions for Ocaml -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2009-2021 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/lisp/org/ob-octave.el b/lisp/org/ob-octave.el index 5cb47e956ff..166cd596a53 100644 --- a/lisp/org/ob-octave.el +++ b/lisp/org/ob-octave.el @@ -1,6 +1,6 @@ ;;; ob-octave.el --- Babel Functions for Octave and Matlab -*- lexical-binding: t; -*- -;; Copyright (C) 2010-2020 Free Software Foundation, Inc. +;; Copyright (C) 2010-2021 Free Software Foundation, Inc. ;; Author: Dan Davison ;; Keywords: literate programming, reproducible research diff --git a/lisp/org/ob-org.el b/lisp/org/ob-org.el index 858c78346f8..e29cbb5b76f 100644 --- a/lisp/org/ob-org.el +++ b/lisp/org/ob-org.el @@ -1,6 +1,6 @@ ;;; ob-org.el --- Babel Functions for Org Code Blocks -*- lexical-binding: t; -*- -;; Copyright (C) 2010-2020 Free Software Foundation, Inc. +;; Copyright (C) 2010-2021 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/lisp/org/ob-perl.el b/lisp/org/ob-perl.el index 3e784e2a0e6..0cfac850078 100644 --- a/lisp/org/ob-perl.el +++ b/lisp/org/ob-perl.el @@ -1,6 +1,6 @@ ;;; ob-perl.el --- Babel Functions for Perl -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2009-2021 Free Software Foundation, Inc. ;; Authors: Dan Davison ;; Eric Schulte diff --git a/lisp/org/ob-picolisp.el b/lisp/org/ob-picolisp.el index 96fee36fcb8..b1587f2b86d 100644 --- a/lisp/org/ob-picolisp.el +++ b/lisp/org/ob-picolisp.el @@ -1,6 +1,6 @@ ;;; ob-picolisp.el --- Babel Functions for Picolisp -*- lexical-binding: t; -*- -;; Copyright (C) 2010-2020 Free Software Foundation, Inc. +;; Copyright (C) 2010-2021 Free Software Foundation, Inc. ;; Authors: Thorsten Jolitz ;; Eric Schulte diff --git a/lisp/org/ob-plantuml.el b/lisp/org/ob-plantuml.el index e692bf7cdbe..93c653870c2 100644 --- a/lisp/org/ob-plantuml.el +++ b/lisp/org/ob-plantuml.el @@ -1,6 +1,6 @@ ;;; ob-plantuml.el --- Babel Functions for Plantuml -*- lexical-binding: t; -*- -;; Copyright (C) 2010-2020 Free Software Foundation, Inc. +;; Copyright (C) 2010-2021 Free Software Foundation, Inc. ;; Author: Zhang Weize ;; Keywords: literate programming, reproducible research diff --git a/lisp/org/ob-processing.el b/lisp/org/ob-processing.el index fc1beadfc62..9e6572a5fdd 100644 --- a/lisp/org/ob-processing.el +++ b/lisp/org/ob-processing.el @@ -1,6 +1,6 @@ ;;; ob-processing.el --- Babel functions for processing -*- lexical-binding: t; -*- -;; Copyright (C) 2015-2020 Free Software Foundation, Inc. +;; Copyright (C) 2015-2021 Free Software Foundation, Inc. ;; Author: Jarmo Hurri (adapted from ob-asymptote.el written by Eric Schulte) ;; Keywords: literate programming, reproducible research diff --git a/lisp/org/ob-python.el b/lisp/org/ob-python.el index ffb8ee855ef..7911205d08d 100644 --- a/lisp/org/ob-python.el +++ b/lisp/org/ob-python.el @@ -1,6 +1,6 @@ ;;; ob-python.el --- Babel Functions for Python -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2009-2021 Free Software Foundation, Inc. ;; Authors: Eric Schulte ;; Dan Davison diff --git a/lisp/org/ob-ref.el b/lisp/org/ob-ref.el index 394c4ffb59d..a7ab299b274 100644 --- a/lisp/org/ob-ref.el +++ b/lisp/org/ob-ref.el @@ -1,6 +1,6 @@ ;;; ob-ref.el --- Babel Functions for Referencing External Data -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2009-2021 Free Software Foundation, Inc. ;; Authors: Eric Schulte ;; Dan Davison diff --git a/lisp/org/ob-ruby.el b/lisp/org/ob-ruby.el index 2e33bfa29af..ccc746e8df2 100644 --- a/lisp/org/ob-ruby.el +++ b/lisp/org/ob-ruby.el @@ -1,6 +1,6 @@ ;;; ob-ruby.el --- Babel Functions for Ruby -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2009-2021 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/lisp/org/ob-sass.el b/lisp/org/ob-sass.el index 33d8ef7e471..76cdfd8063a 100644 --- a/lisp/org/ob-sass.el +++ b/lisp/org/ob-sass.el @@ -1,6 +1,6 @@ ;;; ob-sass.el --- Babel Functions for the Sass CSS generation language -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2009-2021 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/lisp/org/ob-scheme.el b/lisp/org/ob-scheme.el index 3eee8213dfd..a18bfb51817 100644 --- a/lisp/org/ob-scheme.el +++ b/lisp/org/ob-scheme.el @@ -1,6 +1,6 @@ ;;; ob-scheme.el --- Babel Functions for Scheme -*- lexical-binding: t; -*- -;; Copyright (C) 2010-2020 Free Software Foundation, Inc. +;; Copyright (C) 2010-2021 Free Software Foundation, Inc. ;; Authors: Eric Schulte ;; Michael Gauland diff --git a/lisp/org/ob-screen.el b/lisp/org/ob-screen.el index 4d729856316..c3388c3d3de 100644 --- a/lisp/org/ob-screen.el +++ b/lisp/org/ob-screen.el @@ -1,6 +1,6 @@ ;;; ob-screen.el --- Babel Support for Interactive Terminal -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2009-2021 Free Software Foundation, Inc. ;; Author: Benjamin Andresen ;; Keywords: literate programming, interactive shell diff --git a/lisp/org/ob-sed.el b/lisp/org/ob-sed.el index 6914cd3bfee..b95f411858d 100644 --- a/lisp/org/ob-sed.el +++ b/lisp/org/ob-sed.el @@ -1,6 +1,6 @@ ;;; ob-sed.el --- Babel Functions for Sed Scripts -*- lexical-binding: t; -*- -;; Copyright (C) 2015-2020 Free Software Foundation, Inc. +;; Copyright (C) 2015-2021 Free Software Foundation, Inc. ;; Author: Bjarte Johansen ;; Keywords: literate programming, reproducible research diff --git a/lisp/org/ob-shell.el b/lisp/org/ob-shell.el index c08ba50fe7e..3eed0c1640a 100644 --- a/lisp/org/ob-shell.el +++ b/lisp/org/ob-shell.el @@ -1,6 +1,6 @@ ;;; ob-shell.el --- Babel Functions for Shell Evaluation -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2009-2021 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/lisp/org/ob-shen.el b/lisp/org/ob-shen.el index 0e012ac82b0..6803b0bf68b 100644 --- a/lisp/org/ob-shen.el +++ b/lisp/org/ob-shen.el @@ -1,6 +1,6 @@ ;;; ob-shen.el --- Babel Functions for Shen -*- lexical-binding: t; -*- -;; Copyright (C) 2010-2020 Free Software Foundation, Inc. +;; Copyright (C) 2010-2021 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research, shen diff --git a/lisp/org/ob-sql.el b/lisp/org/ob-sql.el index 7c359b988d3..947acef1b27 100644 --- a/lisp/org/ob-sql.el +++ b/lisp/org/ob-sql.el @@ -1,6 +1,6 @@ ;;; ob-sql.el --- Babel Functions for SQL -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2009-2021 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research @@ -164,7 +164,8 @@ SQL Server on Windows and Linux platform." " ")) (defun org-babel-sql-dbstring-vertica (host port user password database) - "Make Vertica command line args for database connection. Pass nil to omit that arg." + "Make Vertica command line args for database connection. +Pass nil to omit that arg." (mapconcat #'identity (delq nil (list (when host (format "-h %s" host)) diff --git a/lisp/org/ob-sqlite.el b/lisp/org/ob-sqlite.el index 22d018bcf5a..6e21fa9fd9a 100644 --- a/lisp/org/ob-sqlite.el +++ b/lisp/org/ob-sqlite.el @@ -1,6 +1,6 @@ ;;; ob-sqlite.el --- Babel Functions for SQLite Databases -*- lexical-binding: t; -*- -;; Copyright (C) 2010-2020 Free Software Foundation, Inc. +;; Copyright (C) 2010-2021 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/lisp/org/ob-stan.el b/lisp/org/ob-stan.el index 00aa8fb28c8..1f2afdeeda7 100644 --- a/lisp/org/ob-stan.el +++ b/lisp/org/ob-stan.el @@ -1,6 +1,6 @@ ;;; ob-stan.el --- Babel Functions for Stan -*- lexical-binding: t; -*- -;; Copyright (C) 2015-2020 Free Software Foundation, Inc. +;; Copyright (C) 2015-2021 Free Software Foundation, Inc. ;; Author: Kyle Meyer ;; Keywords: literate programming, reproducible research diff --git a/lisp/org/ob-table.el b/lisp/org/ob-table.el index 77daf7be4ef..39a14a25d6c 100644 --- a/lisp/org/ob-table.el +++ b/lisp/org/ob-table.el @@ -1,6 +1,6 @@ ;;; ob-table.el --- Support for Calling Babel Functions from Tables -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2009-2021 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/lisp/org/ob-tangle.el b/lisp/org/ob-tangle.el index b74b3fa0c49..3c3943c8fa9 100644 --- a/lisp/org/ob-tangle.el +++ b/lisp/org/ob-tangle.el @@ -1,6 +1,6 @@ ;;; ob-tangle.el --- Extract Source Code From Org Files -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2009-2021 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/lisp/org/ob-vala.el b/lisp/org/ob-vala.el index b1c22756226..6c3068a8b47 100644 --- a/lisp/org/ob-vala.el +++ b/lisp/org/ob-vala.el @@ -1,6 +1,6 @@ ;;; ob-vala.el --- Babel functions for Vala evaluation -*- lexical-binding: t; -*- -;; Copyright (C) 2017-2020 Free Software Foundation, Inc. +;; Copyright (C) 2017-2021 Free Software Foundation, Inc. ;; Author: Christian Garbs <mitch@cgarbs.de> ;; Keywords: literate programming, reproducible research diff --git a/lisp/org/ob.el b/lisp/org/ob.el index 7347baba11b..1e89b02aed1 100644 --- a/lisp/org/ob.el +++ b/lisp/org/ob.el @@ -1,6 +1,6 @@ ;;; ob.el --- Working with Code Blocks in Org -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2009-2021 Free Software Foundation, Inc. ;; Authors: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/lisp/org/ol-bbdb.el b/lisp/org/ol-bbdb.el index 73627b901fa..01a1fe93255 100644 --- a/lisp/org/ol-bbdb.el +++ b/lisp/org/ol-bbdb.el @@ -1,6 +1,6 @@ ;;; ol-bbdb.el --- Links to BBDB entries -*- lexical-binding: t; -*- -;; Copyright (C) 2004-2020 Free Software Foundation, Inc. +;; Copyright (C) 2004-2021 Free Software Foundation, Inc. ;; Authors: Carsten Dominik <carsten at orgmode dot org> ;; Thomas Baumann <thomas dot baumann at ch dot tum dot de> @@ -431,7 +431,7 @@ variable to be globally bound." ;;; to override the 7-day default. (defun org-bbdb-date-list (d n) - "Return a list of dates in (m d y) format from the given date D to n-1 days hence." + "Return list of dates in (m d y) format from the given date D to n-1 days hence." (let ((abs (calendar-absolute-from-gregorian d))) (mapcar (lambda (i) (calendar-gregorian-from-absolute (+ abs i))) (number-sequence 0 (1- n))))) diff --git a/lisp/org/ol-bibtex.el b/lisp/org/ol-bibtex.el index bf25d22057b..6b591218c82 100644 --- a/lisp/org/ol-bibtex.el +++ b/lisp/org/ol-bibtex.el @@ -1,6 +1,6 @@ ;;; ol-bibtex.el --- Links to BibTeX entries -*- lexical-binding: t; -*- ;; -;; Copyright (C) 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2007-2021 Free Software Foundation, Inc. ;; ;; Authors: Bastien Guerry <bzg@gnu.org> ;; Carsten Dominik <carsten dot dominik at gmail dot com> diff --git a/lisp/org/ol-docview.el b/lisp/org/ol-docview.el index 0c6419fbab9..7ab67de8091 100644 --- a/lisp/org/ol-docview.el +++ b/lisp/org/ol-docview.el @@ -1,6 +1,6 @@ ;;; ol-docview.el --- Links to Docview mode buffers -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2009-2021 Free Software Foundation, Inc. ;; Author: Jan Böcker <jan.boecker at jboecker dot de> ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/lisp/org/ol-eshell.el b/lisp/org/ol-eshell.el index 2bc1a2938ff..769e7ee5225 100644 --- a/lisp/org/ol-eshell.el +++ b/lisp/org/ol-eshell.el @@ -1,6 +1,6 @@ ;;; ol-eshell.el - Links to Working Directories in Eshell -*- lexical-binding: t; -*- -;; Copyright (C) 2011-2020 Free Software Foundation, Inc. +;; Copyright (C) 2011-2021 Free Software Foundation, Inc. ;; Author: Konrad Hinsen <konrad.hinsen AT fastmail.net> diff --git a/lisp/org/ol-eww.el b/lisp/org/ol-eww.el index 27e32bc3a3b..e9ffee6e560 100644 --- a/lisp/org/ol-eww.el +++ b/lisp/org/ol-eww.el @@ -1,6 +1,6 @@ ;;; ol-eww.el --- Store URL and kill from Eww mode -*- lexical-binding: t -*- -;; Copyright (C) 2014-2020 Free Software Foundation, Inc. +;; Copyright (C) 2014-2021 Free Software Foundation, Inc. ;; Author: Marco Wahl <marcowahlsoft>a<gmailcom> ;; Keywords: link, eww diff --git a/lisp/org/ol-gnus.el b/lisp/org/ol-gnus.el index af88c1a1532..71051bc6830 100644 --- a/lisp/org/ol-gnus.el +++ b/lisp/org/ol-gnus.el @@ -1,6 +1,6 @@ ;;; ol-gnus.el --- Links to Gnus Groups and Messages -*- lexical-binding: t; -*- -;; Copyright (C) 2004-2020 Free Software Foundation, Inc. +;; Copyright (C) 2004-2021 Free Software Foundation, Inc. ;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Tassilo Horn <tassilo at member dot fsf dot org> diff --git a/lisp/org/ol-info.el b/lisp/org/ol-info.el index 864fbc47de3..8b1e5da5168 100644 --- a/lisp/org/ol-info.el +++ b/lisp/org/ol-info.el @@ -1,6 +1,6 @@ ;;; ol-info.el --- Links to Info Nodes -*- lexical-binding: t; -*- -;; Copyright (C) 2004-2020 Free Software Foundation, Inc. +;; Copyright (C) 2004-2021 Free Software Foundation, Inc. ;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/lisp/org/ol-irc.el b/lisp/org/ol-irc.el index a2f8086b313..e3d7651c1a1 100644 --- a/lisp/org/ol-irc.el +++ b/lisp/org/ol-irc.el @@ -1,6 +1,6 @@ ;;; ol-irc.el --- Links to IRC Sessions -*- lexical-binding: t; -*- ;; -;; Copyright (C) 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2008-2021 Free Software Foundation, Inc. ;; ;; Author: Philip Jackson <emacs@shellarchive.co.uk> ;; Keywords: erc, irc, link, org diff --git a/lisp/org/ol-mhe.el b/lisp/org/ol-mhe.el index 50002b0e872..37147a33aca 100644 --- a/lisp/org/ol-mhe.el +++ b/lisp/org/ol-mhe.el @@ -1,6 +1,6 @@ ;;; ol-mhe.el --- Links to MH-E Messages -*- lexical-binding: t; -*- -;; Copyright (C) 2004-2020 Free Software Foundation, Inc. +;; Copyright (C) 2004-2021 Free Software Foundation, Inc. ;; Author: Thomas Baumann <thomas dot baumann at ch dot tum dot de> ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/lisp/org/ol-rmail.el b/lisp/org/ol-rmail.el index e43fc932ee2..a73060b50fa 100644 --- a/lisp/org/ol-rmail.el +++ b/lisp/org/ol-rmail.el @@ -1,6 +1,6 @@ ;;; ol-rmail.el --- Links to Rmail Messages -*- lexical-binding: t; -*- -;; Copyright (C) 2004-2020 Free Software Foundation, Inc. +;; Copyright (C) 2004-2021 Free Software Foundation, Inc. ;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/lisp/org/ol-w3m.el b/lisp/org/ol-w3m.el index 5b03b8d3cae..f1f3afd764d 100644 --- a/lisp/org/ol-w3m.el +++ b/lisp/org/ol-w3m.el @@ -1,6 +1,6 @@ ;;; ol-w3m.el --- Copy and Paste From W3M -*- lexical-binding: t; -*- -;; Copyright (C) 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2008-2021 Free Software Foundation, Inc. ;; Author: Andy Stewart <lazycat dot manatee at gmail dot com> ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/lisp/org/ol.el b/lisp/org/ol.el index 5bb01e3f5fd..d1db1683bbe 100644 --- a/lisp/org/ol.el +++ b/lisp/org/ol.el @@ -1,6 +1,6 @@ ;;; ol.el --- Org links library -*- lexical-binding: t; -*- -;; Copyright (C) 2018-2020 Free Software Foundation, Inc. +;; Copyright (C) 2018-2021 Free Software Foundation, Inc. ;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el index 1c65ca1a0cf..99e5464c2b9 100644 --- a/lisp/org/org-agenda.el +++ b/lisp/org/org-agenda.el @@ -1,6 +1,6 @@ ;;; org-agenda.el --- Dynamic task and appointment lists for Org -;; Copyright (C) 2004-2020 Free Software Foundation, Inc. +;; Copyright (C) 2004-2021 Free Software Foundation, Inc. ;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/lisp/org/org-archive.el b/lisp/org/org-archive.el index 4a0de3cb5a6..73cd83ebf33 100644 --- a/lisp/org/org-archive.el +++ b/lisp/org/org-archive.el @@ -1,6 +1,6 @@ ;;; org-archive.el --- Archiving for Org -*- lexical-binding: t; -*- -;; Copyright (C) 2004-2020 Free Software Foundation, Inc. +;; Copyright (C) 2004-2021 Free Software Foundation, Inc. ;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/lisp/org/org-attach-git.el b/lisp/org/org-attach-git.el index 31945ff205e..2091cbc610c 100644 --- a/lisp/org/org-attach-git.el +++ b/lisp/org/org-attach-git.el @@ -1,6 +1,6 @@ ;;; org-attach-git.el --- Automatic git commit extension to org-attach -*- lexical-binding: t; -*- -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; Original Author: John Wiegley <johnw@newartisans.com> ;; Restructurer: Gustav Wikström <gustav@whil.se> diff --git a/lisp/org/org-attach.el b/lisp/org/org-attach.el index 9360562b095..46decacca03 100644 --- a/lisp/org/org-attach.el +++ b/lisp/org/org-attach.el @@ -1,6 +1,6 @@ ;;; org-attach.el --- Manage file attachments to Org outlines -*- lexical-binding: t; -*- -;; Copyright (C) 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2008-2021 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@newartisans.com> ;; Keywords: org data attachment diff --git a/lisp/org/org-capture.el b/lisp/org/org-capture.el index d3dc0ab3e75..f40f2b335ef 100644 --- a/lisp/org/org-capture.el +++ b/lisp/org/org-capture.el @@ -1,6 +1,6 @@ ;;; org-capture.el --- Fast note taking in Org -*- lexical-binding: t; -*- -;; Copyright (C) 2010-2020 Free Software Foundation, Inc. +;; Copyright (C) 2010-2021 Free Software Foundation, Inc. ;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/lisp/org/org-clock.el b/lisp/org/org-clock.el index 9efd99be826..2073b33380b 100644 --- a/lisp/org/org-clock.el +++ b/lisp/org/org-clock.el @@ -1,6 +1,6 @@ ;;; org-clock.el --- The time clocking code for Org mode -*- lexical-binding: t; -*- -;; Copyright (C) 2004-2020 Free Software Foundation, Inc. +;; Copyright (C) 2004-2021 Free Software Foundation, Inc. ;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/lisp/org/org-colview.el b/lisp/org/org-colview.el index 565bdb2ddee..75056d45a7e 100644 --- a/lisp/org/org-colview.el +++ b/lisp/org/org-colview.el @@ -1,6 +1,6 @@ ;;; org-colview.el --- Column View in Org -*- lexical-binding: t; -*- -;; Copyright (C) 2004-2020 Free Software Foundation, Inc. +;; Copyright (C) 2004-2021 Free Software Foundation, Inc. ;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/lisp/org/org-compat.el b/lisp/org/org-compat.el index 6e9e248d23a..1f4e2e8308f 100644 --- a/lisp/org/org-compat.el +++ b/lisp/org/org-compat.el @@ -1,6 +1,6 @@ ;;; org-compat.el --- Compatibility Code for Older Emacsen -*- lexical-binding: t; -*- -;; Copyright (C) 2004-2020 Free Software Foundation, Inc. +;; Copyright (C) 2004-2021 Free Software Foundation, Inc. ;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/lisp/org/org-crypt.el b/lisp/org/org-crypt.el index 187560c5538..caf9de91b98 100644 --- a/lisp/org/org-crypt.el +++ b/lisp/org/org-crypt.el @@ -1,6 +1,6 @@ ;;; org-crypt.el --- Public Key Encryption for Org Entries -*- lexical-binding: t; -*- ;; -;; Copyright (C) 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2007-2021 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/org/org-ctags.el b/lisp/org/org-ctags.el index bb1f2b83647..1fca873c159 100644 --- a/lisp/org/org-ctags.el +++ b/lisp/org/org-ctags.el @@ -1,6 +1,6 @@ ;;; org-ctags.el - Integrate Emacs "tags" Facility with Org -*- lexical-binding: t; -*- ;; -;; Copyright (C) 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2007-2021 Free Software Foundation, Inc. ;; Author: Paul Sexton <eeeickythump@gmail.com> diff --git a/lisp/org/org-datetree.el b/lisp/org/org-datetree.el index d4ccc84bb4b..62bd46e2e97 100644 --- a/lisp/org/org-datetree.el +++ b/lisp/org/org-datetree.el @@ -1,6 +1,6 @@ ;;; org-datetree.el --- Create date entries in a tree -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2009-2021 Free Software Foundation, Inc. ;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/lisp/org/org-duration.el b/lisp/org/org-duration.el index 81d5a66d9c8..29fae2dbf03 100644 --- a/lisp/org/org-duration.el +++ b/lisp/org/org-duration.el @@ -1,6 +1,6 @@ ;;; org-duration.el --- Library handling durations -*- lexical-binding: t; -*- -;; Copyright (C) 2017-2020 Free Software Foundation, Inc. +;; Copyright (C) 2017-2021 Free Software Foundation, Inc. ;; Author: Nicolas Goaziou <mail@nicolasgoaziou.fr> ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/lisp/org/org-element.el b/lisp/org/org-element.el index 2ad557d2179..b7319d638ed 100644 --- a/lisp/org/org-element.el +++ b/lisp/org/org-element.el @@ -1,6 +1,6 @@ ;;; org-element.el --- Parser for Org Syntax -*- lexical-binding: t; -*- -;; Copyright (C) 2012-2020 Free Software Foundation, Inc. +;; Copyright (C) 2012-2021 Free Software Foundation, Inc. ;; Author: Nicolas Goaziou <n.goaziou at gmail dot com> ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/lisp/org/org-entities.el b/lisp/org/org-entities.el index b2878609d87..eb098993b77 100644 --- a/lisp/org/org-entities.el +++ b/lisp/org/org-entities.el @@ -1,6 +1,6 @@ ;;; org-entities.el --- Support for Special Entities -*- lexical-binding: t; -*- -;; Copyright (C) 2010-2020 Free Software Foundation, Inc. +;; Copyright (C) 2010-2021 Free Software Foundation, Inc. ;; Author: Carsten Dominik <carsten at orgmode dot org>, ;; Ulf Stegemann <ulf at zeitform dot de> diff --git a/lisp/org/org-faces.el b/lisp/org/org-faces.el index c0556b8bbcd..c56873b54c5 100644 --- a/lisp/org/org-faces.el +++ b/lisp/org/org-faces.el @@ -1,6 +1,6 @@ ;;; org-faces.el --- Face definitions -*- lexical-binding: t; -*- -;; Copyright (C) 2004-2020 Free Software Foundation, Inc. +;; Copyright (C) 2004-2021 Free Software Foundation, Inc. ;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/lisp/org/org-feed.el b/lisp/org/org-feed.el index 58bbba7c71f..5dbd887ef50 100644 --- a/lisp/org/org-feed.el +++ b/lisp/org/org-feed.el @@ -1,6 +1,6 @@ ;;; org-feed.el --- Add RSS feed items to Org files -*- lexical-binding: t; -*- ;; -;; Copyright (C) 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2009-2021 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/lisp/org/org-footnote.el b/lisp/org/org-footnote.el index 14b0a2a0002..3d42421e0db 100644 --- a/lisp/org/org-footnote.el +++ b/lisp/org/org-footnote.el @@ -1,6 +1,6 @@ ;;; org-footnote.el --- Footnote support in Org -*- lexical-binding: t; -*- ;; -;; Copyright (C) 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2009-2021 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/lisp/org/org-goto.el b/lisp/org/org-goto.el index 93e6f940c75..163aa580ef6 100644 --- a/lisp/org/org-goto.el +++ b/lisp/org/org-goto.el @@ -1,6 +1,6 @@ ;;; org-goto.el --- Fast navigation in an Org buffer -*- lexical-binding: t; -*- -;; Copyright (C) 2012-2020 Free Software Foundation, Inc. +;; Copyright (C) 2012-2021 Free Software Foundation, Inc. ;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/lisp/org/org-habit.el b/lisp/org/org-habit.el index f76f0f2131a..231c08be0ac 100644 --- a/lisp/org/org-habit.el +++ b/lisp/org/org-habit.el @@ -1,6 +1,6 @@ ;;; org-habit.el --- The habit tracking code for Org -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2009-2021 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw at gnu dot org> ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/lisp/org/org-id.el b/lisp/org/org-id.el index f8af52964e4..b3b98c614ab 100644 --- a/lisp/org/org-id.el +++ b/lisp/org/org-id.el @@ -1,6 +1,6 @@ ;;; org-id.el --- Global identifiers for Org entries -*- lexical-binding: t; -*- ;; -;; Copyright (C) 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2008-2021 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/lisp/org/org-indent.el b/lisp/org/org-indent.el index 708b5c305ef..c6bf416564e 100644 --- a/lisp/org/org-indent.el +++ b/lisp/org/org-indent.el @@ -1,6 +1,6 @@ ;;; org-indent.el --- Dynamic indentation for Org -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2009-2021 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/lisp/org/org-inlinetask.el b/lisp/org/org-inlinetask.el index 60e3e0cc595..48402b092b2 100644 --- a/lisp/org/org-inlinetask.el +++ b/lisp/org/org-inlinetask.el @@ -1,6 +1,6 @@ ;;; org-inlinetask.el --- Tasks Independent of Outline Hierarchy -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2009-2021 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/lisp/org/org-keys.el b/lisp/org/org-keys.el index 37df2998323..f0fdb79ea49 100644 --- a/lisp/org/org-keys.el +++ b/lisp/org/org-keys.el @@ -1,6 +1,6 @@ ;;; org-keys.el --- Key bindings for Org mode -*- lexical-binding: t; -*- -;; Copyright (C) 2018-2020 Free Software Foundation, Inc. +;; Copyright (C) 2018-2021 Free Software Foundation, Inc. ;; Author: Nicolas Goaziou <mail@nicolasgoaziou.fr> diff --git a/lisp/org/org-lint.el b/lisp/org/org-lint.el index e4e0ef75166..2e080cc138f 100644 --- a/lisp/org/org-lint.el +++ b/lisp/org/org-lint.el @@ -1,6 +1,6 @@ ;;; org-lint.el --- Linting for Org documents -*- lexical-binding: t; -*- -;; Copyright (C) 2015-2020 Free Software Foundation, Inc. +;; Copyright (C) 2015-2021 Free Software Foundation, Inc. ;; Author: Nicolas Goaziou <mail@nicolasgoaziou.fr> ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/lisp/org/org-list.el b/lisp/org/org-list.el index dc7dc2a2c26..39122e7ce41 100644 --- a/lisp/org/org-list.el +++ b/lisp/org/org-list.el @@ -1,6 +1,6 @@ ;;; org-list.el --- Plain lists for Org -*- lexical-binding: t; -*- ;; -;; Copyright (C) 2004-2020 Free Software Foundation, Inc. +;; Copyright (C) 2004-2021 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Bastien Guerry <bzg@gnu.org> diff --git a/lisp/org/org-macro.el b/lisp/org/org-macro.el index 5ddfae4e1f6..f914a33d61b 100644 --- a/lisp/org/org-macro.el +++ b/lisp/org/org-macro.el @@ -1,6 +1,6 @@ ;;; org-macro.el --- Macro Replacement Code for Org -*- lexical-binding: t; -*- -;; Copyright (C) 2013-2020 Free Software Foundation, Inc. +;; Copyright (C) 2013-2021 Free Software Foundation, Inc. ;; Author: Nicolas Goaziou <n.goaziou@gmail.com> ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/lisp/org/org-macs.el b/lisp/org/org-macs.el index d397e3ed05b..56afdf6ef19 100644 --- a/lisp/org/org-macs.el +++ b/lisp/org/org-macs.el @@ -1,6 +1,6 @@ ;;; org-macs.el --- Top-level Definitions for Org -*- lexical-binding: t; -*- -;; Copyright (C) 2004-2020 Free Software Foundation, Inc. +;; Copyright (C) 2004-2021 Free Software Foundation, Inc. ;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/lisp/org/org-mobile.el b/lisp/org/org-mobile.el index 6df567d6377..a64e0a274a2 100644 --- a/lisp/org/org-mobile.el +++ b/lisp/org/org-mobile.el @@ -1,5 +1,5 @@ ;;; org-mobile.el --- Code for Asymmetric Sync With a Mobile Device -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2009-2021 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/lisp/org/org-mouse.el b/lisp/org/org-mouse.el index d8877630241..5c222ea70d5 100644 --- a/lisp/org/org-mouse.el +++ b/lisp/org/org-mouse.el @@ -1,6 +1,6 @@ ;;; org-mouse.el --- Better mouse support for Org -*- lexical-binding: t; -*- -;; Copyright (C) 2006-2020 Free Software Foundation, Inc. +;; Copyright (C) 2006-2021 Free Software Foundation, Inc. ;; Author: Piotr Zielinski <piotr dot zielinski at gmail dot com> ;; Maintainer: Carsten Dominik <carsten at orgmode dot org> diff --git a/lisp/org/org-num.el b/lisp/org/org-num.el index 167db18ed2d..ebddaa32b4e 100644 --- a/lisp/org/org-num.el +++ b/lisp/org/org-num.el @@ -1,6 +1,6 @@ ;;; org-num.el --- Dynamic Headlines Numbering -*- lexical-binding: t; -*- -;; Copyright (C) 2018-2020 Free Software Foundation, Inc. +;; Copyright (C) 2018-2021 Free Software Foundation, Inc. ;; Author: Nicolas Goaziou <mail@nicolasgoaziou.fr> ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/lisp/org/org-pcomplete.el b/lisp/org/org-pcomplete.el index 4b2da9d6948..29d9d58482a 100644 --- a/lisp/org/org-pcomplete.el +++ b/lisp/org/org-pcomplete.el @@ -1,6 +1,6 @@ ;;; org-pcomplete.el --- In-buffer Completion Code -*- lexical-binding: t; -*- -;; Copyright (C) 2004-2020 Free Software Foundation, Inc. +;; Copyright (C) 2004-2021 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik <carsten at orgmode dot org> ;; John Wiegley <johnw at gnu dot org> diff --git a/lisp/org/org-plot.el b/lisp/org/org-plot.el index 57b280fe383..4ac15b379d3 100644 --- a/lisp/org/org-plot.el +++ b/lisp/org/org-plot.el @@ -1,6 +1,6 @@ ;;; org-plot.el --- Support for Plotting from Org -*- lexical-binding: t; -*- -;; Copyright (C) 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2008-2021 Free Software Foundation, Inc. ;; ;; Author: Eric Schulte <schulte dot eric at gmail dot com> ;; Maintainer: TEC <tecosaur@gmail.com> diff --git a/lisp/org/org-protocol.el b/lisp/org/org-protocol.el index 92ec24415b7..74043f8340b 100644 --- a/lisp/org/org-protocol.el +++ b/lisp/org/org-protocol.el @@ -1,6 +1,6 @@ ;;; org-protocol.el --- Intercept Calls from Emacsclient to Trigger Custom Actions -*- lexical-binding: t; -*- ;; -;; Copyright (C) 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2008-2021 Free Software Foundation, Inc. ;; ;; Authors: Bastien Guerry <bzg@gnu.org> ;; Daniel M German <dmg AT uvic DOT org> diff --git a/lisp/org/org-refile.el b/lisp/org/org-refile.el index 9eab7e1edeb..1e0c339f7b2 100644 --- a/lisp/org/org-refile.el +++ b/lisp/org/org-refile.el @@ -1,6 +1,6 @@ ;;; org-refile.el --- Refile Org Subtrees -*- lexical-binding: t; -*- -;; Copyright (C) 2010-2020 Free Software Foundation, Inc. +;; Copyright (C) 2010-2021 Free Software Foundation, Inc. ;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/lisp/org/org-src.el b/lisp/org/org-src.el index b4e54083d24..20acee4e662 100644 --- a/lisp/org/org-src.el +++ b/lisp/org/org-src.el @@ -1,6 +1,6 @@ ;;; org-src.el --- Source code examples in Org -*- lexical-binding: t; -*- ;; -;; Copyright (C) 2004-2020 Free Software Foundation, Inc. +;; Copyright (C) 2004-2021 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Bastien Guerry <bzg@gnu.org> diff --git a/lisp/org/org-table.el b/lisp/org/org-table.el index 546326d0d58..ef4672e1b96 100644 --- a/lisp/org/org-table.el +++ b/lisp/org/org-table.el @@ -1,6 +1,6 @@ ;;; org-table.el --- The Table Editor for Org -*- lexical-binding: t; -*- -;; Copyright (C) 2004-2020 Free Software Foundation, Inc. +;; Copyright (C) 2004-2021 Free Software Foundation, Inc. ;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/lisp/org/org-tempo.el b/lisp/org/org-tempo.el index eac6b35fd50..36b8614fe1c 100644 --- a/lisp/org/org-tempo.el +++ b/lisp/org/org-tempo.el @@ -1,6 +1,6 @@ ;;; org-tempo.el --- Template expansion for Org structures -*- lexical-binding: t; -*- -;; Copyright (C) 2017-2020 Free Software Foundation, Inc. +;; Copyright (C) 2017-2021 Free Software Foundation, Inc. ;; ;; Author: Rasmus Pank Roulund <emacs at pank dot eu> ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/lisp/org/org-timer.el b/lisp/org/org-timer.el index 251e3c86b68..b6802fe8b04 100644 --- a/lisp/org/org-timer.el +++ b/lisp/org/org-timer.el @@ -1,6 +1,6 @@ ;;; org-timer.el --- Timer code for Org mode -*- lexical-binding: t; -*- -;; Copyright (C) 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2008-2021 Free Software Foundation, Inc. ;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/lisp/org/org.el b/lisp/org/org.el index 0473caef9bc..43aa0a178a9 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el @@ -1,7 +1,7 @@ ;;; org.el --- Outline-based notes management and organizer -*- lexical-binding: t; -*- ;; Carstens outline-mode for keeping track of everything. -;; Copyright (C) 2004-2020 Free Software Foundation, Inc. +;; Copyright (C) 2004-2021 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Maintainer: Bastien Guerry <bzg@gnu.org> diff --git a/lisp/org/ox-ascii.el b/lisp/org/ox-ascii.el index e5240f5c895..70bd1c4df2f 100644 --- a/lisp/org/ox-ascii.el +++ b/lisp/org/ox-ascii.el @@ -1,6 +1,6 @@ ;;; ox-ascii.el --- ASCII Back-End for Org Export Engine -*- lexical-binding: t; -*- -;; Copyright (C) 2012-2020 Free Software Foundation, Inc. +;; Copyright (C) 2012-2021 Free Software Foundation, Inc. ;; Author: Nicolas Goaziou <n.goaziou at gmail dot com> ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/lisp/org/ox-beamer.el b/lisp/org/ox-beamer.el index 66589fac5d9..1a1732b6836 100644 --- a/lisp/org/ox-beamer.el +++ b/lisp/org/ox-beamer.el @@ -1,6 +1,6 @@ ;;; ox-beamer.el --- Beamer Back-End for Org Export Engine -*- lexical-binding: t; -*- -;; Copyright (C) 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2007-2021 Free Software Foundation, Inc. ;; Author: Carsten Dominik <carsten.dominik AT gmail DOT com> ;; Nicolas Goaziou <n.goaziou AT gmail DOT com> diff --git a/lisp/org/ox-html.el b/lisp/org/ox-html.el index 1a466fb162b..03145e35c53 100644 --- a/lisp/org/ox-html.el +++ b/lisp/org/ox-html.el @@ -1,6 +1,6 @@ ;;; ox-html.el --- HTML Back-End for Org Export Engine -*- lexical-binding: t; -*- -;; Copyright (C) 2011-2020 Free Software Foundation, Inc. +;; Copyright (C) 2011-2021 Free Software Foundation, Inc. ;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Jambunathan K <kjambunathan at gmail dot com> diff --git a/lisp/org/ox-icalendar.el b/lisp/org/ox-icalendar.el index 0f890534a8a..b8834c4ce10 100644 --- a/lisp/org/ox-icalendar.el +++ b/lisp/org/ox-icalendar.el @@ -1,6 +1,6 @@ ;;; ox-icalendar.el --- iCalendar Back-End for Org Export Engine -*- lexical-binding: t; -*- -;; Copyright (C) 2004-2020 Free Software Foundation, Inc. +;; Copyright (C) 2004-2021 Free Software Foundation, Inc. ;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Nicolas Goaziou <n dot goaziou at gmail dot com> diff --git a/lisp/org/ox-latex.el b/lisp/org/ox-latex.el index 32d1d43a5f3..149492fa849 100644 --- a/lisp/org/ox-latex.el +++ b/lisp/org/ox-latex.el @@ -1,6 +1,6 @@ ;;; ox-latex.el --- LaTeX Back-End for Org Export Engine -*- lexical-binding: t; -*- -;; Copyright (C) 2011-2020 Free Software Foundation, Inc. +;; Copyright (C) 2011-2021 Free Software Foundation, Inc. ;; Author: Nicolas Goaziou <n.goaziou at gmail dot com> ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/lisp/org/ox-man.el b/lisp/org/ox-man.el index 0e487d8966c..6cace7e6989 100644 --- a/lisp/org/ox-man.el +++ b/lisp/org/ox-man.el @@ -1,6 +1,6 @@ ;; ox-man.el --- Man Back-End for Org Export Engine -*- lexical-binding: t; -*- -;; Copyright (C) 2011-2020 Free Software Foundation, Inc. +;; Copyright (C) 2011-2021 Free Software Foundation, Inc. ;; Author: Nicolas Goaziou <n.goaziou at gmail dot com> ;; Luis R Anaya <papoanaya aroba hot mail punto com> diff --git a/lisp/org/ox-md.el b/lisp/org/ox-md.el index 1d20c04f44d..f4afe6b30ea 100644 --- a/lisp/org/ox-md.el +++ b/lisp/org/ox-md.el @@ -1,6 +1,6 @@ ;;; ox-md.el --- Markdown Back-End for Org Export Engine -*- lexical-binding: t; -*- -;; Copyright (C) 2012-2020 Free Software Foundation, Inc. +;; Copyright (C) 2012-2021 Free Software Foundation, Inc. ;; Author: Nicolas Goaziou <n.goaziou@gmail.com> ;; Keywords: org, wp, markdown diff --git a/lisp/org/ox-odt.el b/lisp/org/ox-odt.el index 3b90d03b1d7..2d550d92774 100644 --- a/lisp/org/ox-odt.el +++ b/lisp/org/ox-odt.el @@ -1,6 +1,6 @@ ;;; ox-odt.el --- OpenDocument Text Exporter for Org Mode -*- lexical-binding: t; -*- -;; Copyright (C) 2010-2020 Free Software Foundation, Inc. +;; Copyright (C) 2010-2021 Free Software Foundation, Inc. ;; Author: Jambunathan K <kjambunathan at gmail dot com> ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/lisp/org/ox-org.el b/lisp/org/ox-org.el index 740419e0e38..26259d8752c 100644 --- a/lisp/org/ox-org.el +++ b/lisp/org/ox-org.el @@ -1,6 +1,6 @@ ;;; ox-org.el --- Org Back-End for Org Export Engine -*- lexical-binding: t; -*- -;; Copyright (C) 2013-2020 Free Software Foundation, Inc. +;; Copyright (C) 2013-2021 Free Software Foundation, Inc. ;; Author: Nicolas Goaziou <n.goaziou@gmail.com> ;; Keywords: org, wp diff --git a/lisp/org/ox-publish.el b/lisp/org/ox-publish.el index 7bb2fed6e18..6f82b485724 100644 --- a/lisp/org/ox-publish.el +++ b/lisp/org/ox-publish.el @@ -1,5 +1,5 @@ ;;; ox-publish.el --- Publish Related Org Mode Files as a Website -*- lexical-binding: t; -*- -;; Copyright (C) 2006-2020 Free Software Foundation, Inc. +;; Copyright (C) 2006-2021 Free Software Foundation, Inc. ;; Author: David O'Toole <dto@gnu.org> ;; Maintainer: Carsten Dominik <carsten at orgmode dot org> diff --git a/lisp/org/ox-texinfo.el b/lisp/org/ox-texinfo.el index ff4aa704b42..cf080549a6a 100644 --- a/lisp/org/ox-texinfo.el +++ b/lisp/org/ox-texinfo.el @@ -1,6 +1,6 @@ ;;; ox-texinfo.el --- Texinfo Back-End for Org Export Engine -*- lexical-binding: t; -*- -;; Copyright (C) 2012-2020 Free Software Foundation, Inc. +;; Copyright (C) 2012-2021 Free Software Foundation, Inc. ;; Author: Jonathan Leech-Pepin <jonathan.leechpepin at gmail dot com> ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/lisp/org/ox.el b/lisp/org/ox.el index 6dd2cd4a089..050a8094d07 100644 --- a/lisp/org/ox.el +++ b/lisp/org/ox.el @@ -1,6 +1,6 @@ ;;; ox.el --- Export Framework for Org Mode -*- lexical-binding: t; -*- -;; Copyright (C) 2012-2020 Free Software Foundation, Inc. +;; Copyright (C) 2012-2021 Free Software Foundation, Inc. ;; Author: Nicolas Goaziou <n.goaziou at gmail dot com> ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/lisp/outline.el b/lisp/outline.el index 85f9de4e1b4..57909b307b8 100644 --- a/lisp/outline.el +++ b/lisp/outline.el @@ -1,6 +1,6 @@ ;;; outline.el --- outline mode commands for Emacs -*- lexical-binding: t; -*- -;; Copyright (C) 1986, 1993-1995, 1997, 2000-2020 Free Software +;; Copyright (C) 1986, 1993-1995, 1997, 2000-2021 Free Software ;; Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/paren.el b/lisp/paren.el index b56a78781c3..a45a08abd36 100644 --- a/lisp/paren.el +++ b/lisp/paren.el @@ -1,6 +1,6 @@ ;;; paren.el --- highlight matching paren -*- lexical-binding:t -*- -;; Copyright (C) 1993, 1996, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1993, 1996, 2001-2021 Free Software Foundation, Inc. ;; Author: rms@gnu.org ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/password-cache.el b/lisp/password-cache.el index 375d06c74fd..83a25725199 100644 --- a/lisp/password-cache.el +++ b/lisp/password-cache.el @@ -1,6 +1,6 @@ ;;; password-cache.el --- Read passwords, possibly using a password cache. -*- lexical-binding: t -*- -;; Copyright (C) 1999-2000, 2003-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2000, 2003-2021 Free Software Foundation, Inc. ;; Author: Simon Josefsson <simon@josefsson.org> ;; Created: 2003-12-21 diff --git a/lisp/pcmpl-cvs.el b/lisp/pcmpl-cvs.el index 13f3093c218..588a5e725a8 100644 --- a/lisp/pcmpl-cvs.el +++ b/lisp/pcmpl-cvs.el @@ -1,6 +1,6 @@ ;;; pcmpl-cvs.el --- functions for dealing with cvs completions -*- lexical-binding: t -*- -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> ;; Package: pcomplete diff --git a/lisp/pcmpl-gnu.el b/lisp/pcmpl-gnu.el index c6050094498..dd964e36384 100644 --- a/lisp/pcmpl-gnu.el +++ b/lisp/pcmpl-gnu.el @@ -1,6 +1,6 @@ ;;; pcmpl-gnu.el --- completions for GNU project tools -*- lexical-binding: t -*- -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Package: pcomplete diff --git a/lisp/pcmpl-linux.el b/lisp/pcmpl-linux.el index df9d24507a0..2f42dbd4fa1 100644 --- a/lisp/pcmpl-linux.el +++ b/lisp/pcmpl-linux.el @@ -1,6 +1,6 @@ ;;; pcmpl-linux.el --- functions for dealing with GNU/Linux completions -*- lexical-binding: t -*- -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Package: pcomplete diff --git a/lisp/pcmpl-rpm.el b/lisp/pcmpl-rpm.el index efd255908cd..39f700cb362 100644 --- a/lisp/pcmpl-rpm.el +++ b/lisp/pcmpl-rpm.el @@ -1,6 +1,6 @@ ;;; pcmpl-rpm.el --- functions for dealing with rpm completions -*- lexical-binding: t -*- -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Package: pcomplete diff --git a/lisp/pcmpl-unix.el b/lisp/pcmpl-unix.el index 13de4b65e5b..70273b94a1b 100644 --- a/lisp/pcmpl-unix.el +++ b/lisp/pcmpl-unix.el @@ -1,6 +1,6 @@ ;;; pcmpl-unix.el --- standard UNIX completions -*- lexical-binding:t -*- -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Package: pcomplete diff --git a/lisp/pcmpl-x.el b/lisp/pcmpl-x.el index 0fd426e3d1f..61d88666798 100644 --- a/lisp/pcmpl-x.el +++ b/lisp/pcmpl-x.el @@ -1,6 +1,6 @@ ;;; pcmpl-x.el --- completion for miscellaneous tools -*- lexical-binding: t; -*- -;; Copyright (C) 2013-2020 Free Software Foundation, Inc. +;; Copyright (C) 2013-2021 Free Software Foundation, Inc. ;; Author: Leo Liu <sdl.web@gmail.com> ;; Keywords: processes, tools, convenience diff --git a/lisp/pcomplete.el b/lisp/pcomplete.el index 1f3327435e2..0dd99cec66d 100644 --- a/lisp/pcomplete.el +++ b/lisp/pcomplete.el @@ -1,6 +1,6 @@ ;;; pcomplete.el --- programmable completion -*- lexical-binding: t -*- -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> ;; Keywords: processes abbrev diff --git a/lisp/pixel-scroll.el b/lisp/pixel-scroll.el index 9e86e4695bd..cc0e159faef 100644 --- a/lisp/pixel-scroll.el +++ b/lisp/pixel-scroll.el @@ -1,6 +1,6 @@ ;;; pixel-scroll.el --- Scroll a line smoothly -;; Copyright (C) 2017-2020 Free Software Foundation, Inc. +;; Copyright (C) 2017-2021 Free Software Foundation, Inc. ;; Author: Tak Kunihiro <tkk@misasa.okayama-u.ac.jp> ;; Keywords: mouse ;; Package: emacs diff --git a/lisp/play/5x5.el b/lisp/play/5x5.el index 8538dd5d3e4..07ef30c07d1 100644 --- a/lisp/play/5x5.el +++ b/lisp/play/5x5.el @@ -1,6 +1,6 @@ ;;; 5x5.el --- simple little puzzle game -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: Dave Pearson <davep@davep.org> ;; Created: 1998-10-03 diff --git a/lisp/play/animate.el b/lisp/play/animate.el index 8dec55178b1..7eb1b277179 100644 --- a/lisp/play/animate.el +++ b/lisp/play/animate.el @@ -1,6 +1,6 @@ ;;; animate.el --- make text dance -*- lexical-binding:t -*- -;; Copyright (C) 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 2001-2021 Free Software Foundation, Inc. ;; Maintainer: Richard Stallman <rms@gnu.org> ;; Keywords: games diff --git a/lisp/play/blackbox.el b/lisp/play/blackbox.el index 2b4a10c9288..e3854b55a14 100644 --- a/lisp/play/blackbox.el +++ b/lisp/play/blackbox.el @@ -1,6 +1,6 @@ ;;; blackbox.el --- blackbox game in Emacs Lisp -;; Copyright (C) 1985-1987, 1992, 2001-2020 Free Software Foundation, +;; Copyright (C) 1985-1987, 1992, 2001-2021 Free Software Foundation, ;; Inc. ;; Author: F. Thomas May <uw-nsr!uw-warp!tom@beaver.cs.washington.edu> diff --git a/lisp/play/bubbles.el b/lisp/play/bubbles.el index ca23a78202e..f317ad51cfc 100644 --- a/lisp/play/bubbles.el +++ b/lisp/play/bubbles.el @@ -1,6 +1,6 @@ ;;; bubbles.el --- Puzzle game for Emacs -*- lexical-binding:t -*- -;; Copyright (C) 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2007-2021 Free Software Foundation, Inc. ;; Author: Ulf Jasper <ulf.jasper@web.de> ;; URL: http://ulf.epplejasper.de/ diff --git a/lisp/play/cookie1.el b/lisp/play/cookie1.el index 44a82c4dac4..9cecb706f98 100644 --- a/lisp/play/cookie1.el +++ b/lisp/play/cookie1.el @@ -1,6 +1,6 @@ ;;; cookie1.el --- retrieve random phrases from fortune cookie files -;; Copyright (C) 1993, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1993, 2001-2021 Free Software Foundation, Inc. ;; Author: Eric S. Raymond <esr@snark.thyrsus.com> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/play/decipher.el b/lisp/play/decipher.el index 674ddce6c9d..a7a4b89c372 100644 --- a/lisp/play/decipher.el +++ b/lisp/play/decipher.el @@ -1,6 +1,6 @@ ;;; decipher.el --- cryptanalyze monoalphabetic substitution ciphers ;; -;; Copyright (C) 1995-1996, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1995-1996, 2001-2021 Free Software Foundation, Inc. ;; ;; Author: Christopher J. Madsen <chris_madsen@geocities.com> ;; Keywords: games diff --git a/lisp/play/dissociate.el b/lisp/play/dissociate.el index 9a6300c0fd2..a1cc4727b54 100644 --- a/lisp/play/dissociate.el +++ b/lisp/play/dissociate.el @@ -1,6 +1,6 @@ ;;; dissociate.el --- scramble text amusingly for Emacs -*- lexical-binding:t -*- -;; Copyright (C) 1985, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1985, 2001-2021 Free Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org ;; Keywords: games diff --git a/lisp/play/doctor.el b/lisp/play/doctor.el index 8fc207da351..028f04c325b 100644 --- a/lisp/play/doctor.el +++ b/lisp/play/doctor.el @@ -1,6 +1,6 @@ ;;; doctor.el --- psychological help for frustrated users -;; Copyright (C) 1985, 1987, 1994, 1996, 2000-2020 Free Software +;; Copyright (C) 1985, 1987, 1994, 1996, 2000-2021 Free Software ;; Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/play/dunnet.el b/lisp/play/dunnet.el index 45afb51041f..e328b6eab52 100644 --- a/lisp/play/dunnet.el +++ b/lisp/play/dunnet.el @@ -1,6 +1,6 @@ ;;; dunnet.el --- text adventure for Emacs -*- lexical-binding: t -*- -;; Copyright (C) 1992-1993, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1992-1993, 2001-2021 Free Software Foundation, Inc. ;; Author: Ron Schnell <ronnie@driver-aces.com> ;; Created: 25 Jul 1992 diff --git a/lisp/play/fortune.el b/lisp/play/fortune.el index ce40aba8e2e..fb02edffe73 100644 --- a/lisp/play/fortune.el +++ b/lisp/play/fortune.el @@ -1,6 +1,6 @@ ;;; fortune.el --- use fortune to create signatures -*- lexical-binding: t -*- -;; Copyright (C) 1999, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2001-2021 Free Software Foundation, Inc. ;; Author: Holger Schauer <Holger.Schauer@gmx.de> ;; Keywords: games utils mail diff --git a/lisp/play/gamegrid.el b/lisp/play/gamegrid.el index bb8ae5693f6..e540ca723d0 100644 --- a/lisp/play/gamegrid.el +++ b/lisp/play/gamegrid.el @@ -1,6 +1,6 @@ ;;; gamegrid.el --- library for implementing grid-based games on Emacs -*- lexical-binding:t -*- -;; Copyright (C) 1997-1998, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997-1998, 2001-2021 Free Software Foundation, Inc. ;; Author: Glynn Clements <glynn@sensei.co.uk> ;; Old-Version: 1.02 diff --git a/lisp/play/gametree.el b/lisp/play/gametree.el index a9417e9e0ac..1a1d2d76520 100644 --- a/lisp/play/gametree.el +++ b/lisp/play/gametree.el @@ -1,6 +1,6 @@ ;;; gametree.el --- manage game analysis trees in Emacs -;; Copyright (C) 1997, 1999, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997, 1999, 2001-2021 Free Software Foundation, Inc. ;; Author: Ian T Zimmerman <itz@rahul.net> ;; Created: Wed Dec 10 07:41:46 PST 1997 diff --git a/lisp/play/gomoku.el b/lisp/play/gomoku.el index 8ede82a6b9c..1856db8b8bf 100644 --- a/lisp/play/gomoku.el +++ b/lisp/play/gomoku.el @@ -1,6 +1,6 @@ ;;; gomoku.el --- Gomoku game between you and Emacs -*- lexical-binding:t -*- -;; Copyright (C) 1988, 1994, 1996, 2001-2020 Free Software Foundation, +;; Copyright (C) 1988, 1994, 1996, 2001-2021 Free Software Foundation, ;; Inc. ;; Author: Philippe Schnoebelen <phs@lsv.ens-cachan.fr> diff --git a/lisp/play/handwrite.el b/lisp/play/handwrite.el index 06ea54cb473..7ad3de6fb64 100644 --- a/lisp/play/handwrite.el +++ b/lisp/play/handwrite.el @@ -1,6 +1,6 @@ ;;; handwrite.el --- turns your emacs buffer into a handwritten document -;; Copyright (C) 1996, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996, 2001-2021 Free Software Foundation, Inc. ;; Author: Danny Roozendaal (was: <danny@tvs.kun.nl>) ;; Created: October 21 1996 diff --git a/lisp/play/life.el b/lisp/play/life.el index 56ecc5273da..2abf8ccb74b 100644 --- a/lisp/play/life.el +++ b/lisp/play/life.el @@ -1,6 +1,6 @@ ;;; life.el --- John Horton Conway's Game of Life -*- lexical-binding:t -*- -;; Copyright (C) 1988, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1988, 2001-2021 Free Software Foundation, Inc. ;; Author: Kyle Jones <kyleuunet.uu.net> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/play/morse.el b/lisp/play/morse.el index da26835c8e7..8e09c225059 100644 --- a/lisp/play/morse.el +++ b/lisp/play/morse.el @@ -1,6 +1,6 @@ ;;; morse.el --- convert text to morse code and back -*- lexical-binding: t -*- -;; Copyright (C) 1995, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1995, 2001-2021 Free Software Foundation, Inc. ;; Author: Rick Farnbach <rick_farnbach@MENTORG.COM> ;; Keywords: games diff --git a/lisp/play/mpuz.el b/lisp/play/mpuz.el index 24134670500..7fff604aead 100644 --- a/lisp/play/mpuz.el +++ b/lisp/play/mpuz.el @@ -1,6 +1,6 @@ ;;; mpuz.el --- multiplication puzzle for GNU Emacs -;; Copyright (C) 1990, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1990, 2001-2021 Free Software Foundation, Inc. ;; Author: Philippe Schnoebelen <phs@lsv.ens-cachan.fr> ;; Overhauled: Daniel Pfeiffer <occitan@esperanto.org> diff --git a/lisp/play/pong.el b/lisp/play/pong.el index 4e6d73b6e94..b73dbc1010e 100644 --- a/lisp/play/pong.el +++ b/lisp/play/pong.el @@ -1,6 +1,6 @@ ;;; pong.el --- classical implementation of pong -*- lexical-binding:t -*- -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: Benjamin Drieu <bdrieu@april.org> ;; Keywords: games diff --git a/lisp/play/snake.el b/lisp/play/snake.el index 8ea214d8025..5584bf88103 100644 --- a/lisp/play/snake.el +++ b/lisp/play/snake.el @@ -1,6 +1,6 @@ ;;; snake.el --- implementation of Snake for Emacs -*- lexical-binding:t -*- -;; Copyright (C) 1997, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997, 2001-2021 Free Software Foundation, Inc. ;; Author: Glynn Clements <glynn@sensei.co.uk> ;; Created: 1997-09-10 diff --git a/lisp/play/solitaire.el b/lisp/play/solitaire.el index 1383efe37cd..e74ba98ca1b 100644 --- a/lisp/play/solitaire.el +++ b/lisp/play/solitaire.el @@ -1,6 +1,6 @@ ;;; solitaire.el --- game of solitaire in Emacs Lisp -*- lexical-binding: t -*- -;; Copyright (C) 1994, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1994, 2001-2021 Free Software Foundation, Inc. ;; Author: Jan Schormann <Jan.Schormann@rechen-gilde.de> ;; Created: Fri afternoon, Jun 3, 1994 diff --git a/lisp/play/spook.el b/lisp/play/spook.el index ed91dadcbca..d0669eb1f46 100644 --- a/lisp/play/spook.el +++ b/lisp/play/spook.el @@ -1,6 +1,6 @@ ;;; spook.el --- spook phrase utility for overloading the NSA line eater -*- lexical-binding:t -*- -;; Copyright (C) 1988, 1993, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1988, 1993, 2001-2021 Free Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org ;; Keywords: games diff --git a/lisp/play/tetris.el b/lisp/play/tetris.el index e25cacbb722..8205d3f79c5 100644 --- a/lisp/play/tetris.el +++ b/lisp/play/tetris.el @@ -1,9 +1,9 @@ ;;; tetris.el --- implementation of Tetris for Emacs -*- lexical-binding:t -*- -;; Copyright (C) 1997, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997, 2001-2021 Free Software Foundation, Inc. ;; Author: Glynn Clements <glynn@sensei.co.uk> -;; Version: 2.01 +;; Old-Version: 2.01 ;; Created: 1997-08-13 ;; Keywords: games @@ -39,22 +39,18 @@ (defcustom tetris-use-glyphs t "Non-nil means use glyphs when available." - :group 'tetris :type 'boolean) (defcustom tetris-use-color t "Non-nil means use color when available." - :group 'tetris :type 'boolean) (defcustom tetris-draw-border-with-glyphs t "Non-nil means draw a border even when using glyphs." - :group 'tetris :type 'boolean) (defcustom tetris-default-tick-period 0.3 "The default time taken for a shape to drop one row." - :group 'tetris :type 'number) (defcustom tetris-update-speed-function @@ -65,18 +61,15 @@ SHAPES is the number of shapes which have been dropped. ROWS is the number of rows which have been completed. If the return value is a number, it is used as the timer period." - :group 'tetris :type 'function) (defcustom tetris-mode-hook nil "Hook run upon starting Tetris." - :group 'tetris :type 'hook) (defcustom tetris-tty-colors ["blue" "white" "yellow" "magenta" "cyan" "green" "red"] "Vector of colors of the various shapes in text mode." - :group 'tetris :type '(vector (color :tag "Shape 1") (color :tag "Shape 2") (color :tag "Shape 3") @@ -88,7 +81,6 @@ If the return value is a number, it is used as the timer period." (defcustom tetris-x-colors [[0 0 1] [0.7 0 1] [1 1 0] [1 0 1] [0 1 1] [0 1 0] [1 0 0]] "Vector of RGB colors of the various shapes." - :group 'tetris :type '(vector (vector :tag "Shape 1" number number number) (vector :tag "Shape 2" number number number) (vector :tag "Shape 3" number number number) @@ -99,37 +91,30 @@ If the return value is a number, it is used as the timer period." (defcustom tetris-buffer-name "*Tetris*" "Name used for Tetris buffer." - :group 'tetris :type 'string) (defcustom tetris-buffer-width 30 "Width of used portion of buffer." - :group 'tetris :type 'number) (defcustom tetris-buffer-height 22 "Height of used portion of buffer." - :group 'tetris :type 'number) (defcustom tetris-width 10 "Width of playing area." - :group 'tetris :type 'number) (defcustom tetris-height 20 "Height of playing area." - :group 'tetris :type 'number) (defcustom tetris-top-left-x 3 "X position of top left of playing area." - :group 'tetris :type 'number) (defcustom tetris-top-left-y 1 "Y position of top left of playing area." - :group 'tetris :type 'number) (defvar tetris-next-x (+ (* 2 tetris-top-left-x) tetris-width) @@ -335,11 +320,10 @@ each one of its four blocks.") options)) (defun tetris-get-tick-period () - (if (boundp 'tetris-update-speed-function) - (let ((period (apply tetris-update-speed-function - tetris-n-shapes - tetris-n-rows nil))) - (and (numberp period) period)))) + (let ((period (apply tetris-update-speed-function + tetris-n-shapes + tetris-n-rows nil))) + (and (numberp period) period))) (defun tetris-get-shape-cell (block) (aref (aref (aref tetris-shapes @@ -646,17 +630,15 @@ rotate the shape to fit in with those at the bottom of the screen so as to form complete rows. tetris-mode keybindings: - \\<tetris-mode-map> -\\[tetris-start-game] Starts a new game of Tetris -\\[tetris-end-game] Terminates the current game -\\[tetris-pause-game] Pauses (or resumes) the current game -\\[tetris-move-left] Moves the shape one square to the left -\\[tetris-move-right] Moves the shape one square to the right -\\[tetris-rotate-prev] Rotates the shape clockwise -\\[tetris-rotate-next] Rotates the shape anticlockwise -\\[tetris-move-bottom] Drops the shape to the bottom of the playing area - -" +\\<tetris-mode-map> +\\[tetris-start-game] Start a new game of Tetris +\\[tetris-end-game] Terminate the current game +\\[tetris-pause-game] Pause (or resume) the current game +\\[tetris-move-left] Move the shape one square to the left +\\[tetris-move-right] Move the shape one square to the right +\\[tetris-rotate-prev] Rotate the shape clockwise +\\[tetris-rotate-next] Rotate the shape anticlockwise +\\[tetris-move-bottom] Drop the shape to the bottom of the playing area" (interactive) (select-window (or (get-buffer-window tetris-buffer-name) diff --git a/lisp/play/zone.el b/lisp/play/zone.el index 6e341e737ae..70b6a01a017 100644 --- a/lisp/play/zone.el +++ b/lisp/play/zone.el @@ -1,6 +1,6 @@ ;;; zone.el --- idle display hacks -;; Copyright (C) 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 2000-2021 Free Software Foundation, Inc. ;; Author: Victor Zandy <zandy@cs.wisc.edu> ;; Maintainer: Thien-Thi Nguyen <ttn@gnu.org> diff --git a/lisp/plstore.el b/lisp/plstore.el index c08e0792b4c..46533664d52 100644 --- a/lisp/plstore.el +++ b/lisp/plstore.el @@ -1,5 +1,5 @@ ;;; plstore.el --- secure plist store -*- lexical-binding: t -*- -;; Copyright (C) 2011-2020 Free Software Foundation, Inc. +;; Copyright (C) 2011-2021 Free Software Foundation, Inc. ;; Author: Daiki Ueno <ueno@gnu.org> ;; Keywords: PGP, GnuPG diff --git a/lisp/printing.el b/lisp/printing.el index 90ef02fe7b1..2f234b7b052 100644 --- a/lisp/printing.el +++ b/lisp/printing.el @@ -1,6 +1,6 @@ ;;; printing.el --- printing utilities -*- lexical-binding:t -*- -;; Copyright (C) 2000-2001, 2003-2020 Free Software Foundation, Inc. +;; Copyright (C) 2000-2001, 2003-2021 Free Software Foundation, Inc. ;; Author: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com> ;; Keywords: wp, print, PostScript diff --git a/lisp/proced.el b/lisp/proced.el index 5d4318d81f6..d1a243df8e0 100644 --- a/lisp/proced.el +++ b/lisp/proced.el @@ -1,6 +1,6 @@ ;;; proced.el --- operate on system processes like dired -*- lexical-binding:t -*- -;; Copyright (C) 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2008-2021 Free Software Foundation, Inc. ;; Author: Roland Winkler <winkler@gnu.org> ;; Keywords: Processes, Unix diff --git a/lisp/profiler.el b/lisp/profiler.el index 1c843727cc8..64d71f4aab2 100644 --- a/lisp/profiler.el +++ b/lisp/profiler.el @@ -1,6 +1,6 @@ ;;; profiler.el --- UI and helper functions for Emacs's native profiler -*- lexical-binding: t -*- -;; Copyright (C) 2012-2020 Free Software Foundation, Inc. +;; Copyright (C) 2012-2021 Free Software Foundation, Inc. ;; Author: Tomohiro Matsuyama <tomo@cx4a.org> ;; Keywords: lisp @@ -500,10 +500,10 @@ RET: expand or collapse")) (defun profiler-report-header-line-format (fmt &rest args) (let* ((header (apply #'profiler-format fmt args)) (escaped (replace-regexp-in-string "%" "%%" header))) - (concat - (propertize " " + (concat + (propertize " " 'display '(space :align-to 0) - 'face 'fixed-pitch) + 'face 'fixed-pitch) escaped))) (defun profiler-report-line-format (tree) diff --git a/lisp/progmodes/antlr-mode.el b/lisp/progmodes/antlr-mode.el index 2d86f8843e7..527cb03cfbe 100644 --- a/lisp/progmodes/antlr-mode.el +++ b/lisp/progmodes/antlr-mode.el @@ -1,6 +1,6 @@ ;;; antlr-mode.el --- major mode for ANTLR grammar files -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: Christoph Wedler <Christoph.Wedler@sap.com> ;; Keywords: languages, ANTLR, code generator diff --git a/lisp/progmodes/asm-mode.el b/lisp/progmodes/asm-mode.el index 3fde01d0ba6..62ff783fbac 100644 --- a/lisp/progmodes/asm-mode.el +++ b/lisp/progmodes/asm-mode.el @@ -1,6 +1,6 @@ ;;; asm-mode.el --- mode for editing assembler code -*- lexical-binding: t; -*- -;; Copyright (C) 1991, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1991, 2001-2021 Free Software Foundation, Inc. ;; Author: Eric S. Raymond <esr@snark.thyrsus.com> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/progmodes/autoconf.el b/lisp/progmodes/autoconf.el index d12bed7e27d..73cf290f43c 100644 --- a/lisp/progmodes/autoconf.el +++ b/lisp/progmodes/autoconf.el @@ -1,6 +1,6 @@ ;;; autoconf.el --- mode for editing Autoconf configure.ac files -*- lexical-binding: t; -*- -;; Copyright (C) 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 2000-2021 Free Software Foundation, Inc. ;; Author: Dave Love <fx@gnu.org> ;; Keywords: languages diff --git a/lisp/progmodes/bat-mode.el b/lisp/progmodes/bat-mode.el index 98e58be2303..44295c3f679 100644 --- a/lisp/progmodes/bat-mode.el +++ b/lisp/progmodes/bat-mode.el @@ -1,6 +1,6 @@ ;;; bat-mode.el --- Major mode for editing DOS/Windows scripts -;; Copyright (C) 2003, 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2003, 2008-2021 Free Software Foundation, Inc. ;; Author: Arni Magnusson <arnima@hafro.is> ;; Keywords: languages diff --git a/lisp/progmodes/bug-reference.el b/lisp/progmodes/bug-reference.el index c52331f84fa..a759394abeb 100644 --- a/lisp/progmodes/bug-reference.el +++ b/lisp/progmodes/bug-reference.el @@ -1,6 +1,6 @@ ;; bug-reference.el --- buttonize bug references -*- lexical-binding: t; -*- -;; Copyright (C) 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2008-2021 Free Software Foundation, Inc. ;; Author: Tom Tromey <tromey@redhat.com> ;; Created: 21 Mar 2007 diff --git a/lisp/progmodes/cc-align.el b/lisp/progmodes/cc-align.el index 7884d4bd2ec..d14ef1744af 100644 --- a/lisp/progmodes/cc-align.el +++ b/lisp/progmodes/cc-align.el @@ -1,6 +1,6 @@ ;;; cc-align.el --- custom indentation functions for CC Mode -;; Copyright (C) 1985, 1987, 1992-2020 Free Software Foundation, Inc. +;; Copyright (C) 1985, 1987, 1992-2021 Free Software Foundation, Inc. ;; Authors: 2004- Alan Mackenzie ;; 1998- Martin Stjernholm diff --git a/lisp/progmodes/cc-awk.el b/lisp/progmodes/cc-awk.el index 52e6da6f4ac..32289443725 100644 --- a/lisp/progmodes/cc-awk.el +++ b/lisp/progmodes/cc-awk.el @@ -1,6 +1,6 @@ ;;; cc-awk.el --- AWK specific code within cc-mode. -;; Copyright (C) 1988, 1994, 1996, 2000-2020 Free Software Foundation, +;; Copyright (C) 1988, 1994, 1996, 2000-2021 Free Software Foundation, ;; Inc. ;; Author: Alan Mackenzie <acm@muc.de> (originally based on awk-mode.el) @@ -49,9 +49,11 @@ (load "cc-bytecomp" nil t))) (cc-require 'cc-defs) +(cc-require-when-compile 'cc-langs) +(cc-require-when-compile 'cc-fonts) +(cc-require 'cc-engine) ;; Silence the byte compiler. -(cc-bytecomp-defvar font-lock-mode) ; Checked with boundp before use. (cc-bytecomp-defvar c-new-BEG) (cc-bytecomp-defvar c-new-END) @@ -649,6 +651,46 @@ ;; several lines back. The elisp "advice" feature is used on these functions ;; to allow this. +(defun c-awk-font-lock-invalid-namespace-separators (limit) + ;; This function will be called from font-lock for a region bounded by POINT + ;; and LIMIT, as though it were to identify a keyword for + ;; font-lock-keyword-face. It always returns NIL to inhibit this and + ;; prevent a repeat invocation. See elisp/lispref page "Search-based + ;; Fontification". + ;; + ;; This function gives invalid GAWK namepace separators (::) + ;; font-lock-warning-face. "Invalid" here means there are spaces, etc., + ;; around a separator, or there are more than one of them in an identifier. + ;; Invalid separators inside function declaration parentheses are handled + ;; elsewhere. + (while (and + (< (point) limit) + (c-syntactic-re-search-forward + (eval-when-compile + (concat "\\([^" (c-lang-const c-symbol-chars awk) "]::\\)" + "\\|" + ;; "\\(::[^" (c-lang-const c-symbol-start awk) "]\\)" + "\\(::[^" c-alpha "_" "]\\)" + "\\|" + "\\(::[" (c-lang-const c-symbol-chars awk) "]*::\\)")) + limit 'bound)) + (cond + ((match-beginning 1) ; " ::" + (c-put-font-lock-face (1+ (match-beginning 1)) (match-end 1) + 'font-lock-warning-face) + (goto-char (- (match-end 1) 2))) + ((match-beginning 2) ; ":: " + (c-put-font-lock-face (match-beginning 2) (1- (match-end 2)) + 'font-lock-warning-face) + (goto-char (1- (match-end 2)))) + (t ; "::foo::" + (c-put-font-lock-face (match-beginning 3) (+ 2 (match-beginning 3)) + 'font-lock-warning-face) + (c-put-font-lock-face (- (match-end 3) 2) (match-end 3) + 'font-lock-warning-face) + (goto-char (- (match-end 3) 2))))) + nil) + (defun c-awk-beginning-of-logical-line (&optional pos) ;; Go back to the start of the (apparent) current line (or the start of the ;; line containing POS), returning the buffer position of that point. I.e., @@ -900,6 +942,13 @@ (goto-char c-new-BEG) (c-awk-set-syntax-table-properties c-new-END))) +(defun c-awk-context-expand-fl-region (beg end) + ;; Return a cons (NEW-BEG . NEW-END), where NEW-BEG is the beginning of the + ;; logical line BEG is on, and NEW-END is the beginning of the line after + ;; the end of the logical line that END is on. + (cons (save-excursion (c-awk-beginning-of-logical-line beg)) + (c-awk-beyond-logical-line end))) + ;; Awk regexps written with help from Peter Galbraith ;; <galbraith@mixing.qc.dfo.ca>. ;; Take GNU Emacs's 'words out of the following regexp-opts. They don't work @@ -907,18 +956,34 @@ (defconst awk-font-lock-keywords (eval-when-compile (list - ;; Function names. - '("^\\s *\\(func\\(tion\\)?\\)\\>\\s *\\(\\sw+\\)?" - (1 font-lock-keyword-face) (3 font-lock-function-name-face nil t)) - ;; + ;; Function declarations. + `(,(c-make-font-lock-search-function + "^\\s *\\(func\\(tion\\)?\\)\\s +\\(\\(\\sw+\\(::\\sw+\\)?\\)\\s *\\)?\\(([^()]*)\\)?" + '(1 font-lock-keyword-face t) + ;; We can't use LAXMATCH in `c-make-font-lock-search-function', so.... + '((when (match-beginning 4) + (c-put-font-lock-face + (match-beginning 4) (match-end 4) font-lock-function-name-face) + nil)) + ;; Put warning face on any use of :: inside the parens. + '((when (match-beginning 6) + (goto-char (1+ (match-beginning 6))) + (let ((end (1- (match-end 6)))) + (while (and (< (point) end) + (c-syntactic-re-search-forward "::" end t)) + (c-put-font-lock-face (- (point) 2) (point) + 'font-lock-warning-face))) + nil)))) + ;; Variable names. (cons (concat "\\<" (regexp-opt '("ARGC" "ARGIND" "ARGV" "BINMODE" "CONVFMT" "ENVIRON" - "ERRNO" "FIELDWIDTHS" "FILENAME" "FNR" "FS" "IGNORECASE" - "LINT" "NF" "NR" "OFMT" "OFS" "ORS" "PROCINFO" "RLENGTH" - "RS" "RSTART" "RT" "SUBSEP" "TEXTDOMAIN") t) "\\>") + "ERRNO" "FIELDWIDTHS" "FILENAME" "FNR" "FPAT" "FS" "FUNCTAB" + "IGNORECASE" "LINT" "NF" "NR" "OFMT" "OFS" "ORS" "PREC" + "PROCINFO" "RLENGTH" "ROUNDMODE" "RS" "RSTART" "RT" "SUBSEP" + "SYNTAB" "TEXTDOMAIN") t) "\\>") 'font-lock-variable-name-face) ;; Special file names. (acm, 2002/7/22) @@ -949,7 +1014,8 @@ std\\(err\\|in\\|out\\)\\|user\\)\\)\\>\ ;; Keywords. (concat "\\<" (regexp-opt - '("BEGIN" "END" "break" "case" "continue" "default" "delete" + '("BEGIN" "BEGINFILE" "END" "ENDFILE" + "break" "case" "continue" "default" "delete" "do" "else" "exit" "for" "getline" "if" "in" "next" "nextfile" "return" "switch" "while") t) "\\>") @@ -959,16 +1025,20 @@ std\\(err\\|in\\|out\\)\\|user\\)\\)\\>\ ,(concat "\\<" (regexp-opt - '("adump" "and" "asort" "atan2" "bindtextdomain" "close" - "compl" "cos" "dcgettext" "exp" "extension" "fflush" - "gensub" "gsub" "index" "int" "length" "log" "lshift" - "match" "mktime" "or" "print" "printf" "rand" "rshift" + '("adump" "and" "asort" "asorti" "atan2" "bindtextdomain" "close" + "compl" "cos" "dcgettext" "dcngettext" "exp" "extension" "fflush" + "gensub" "gsub" "index" "int" "isarray" "length" "log" "lshift" + "match" "mktime" "or" "patsplit" "print" "printf" "rand" "rshift" "sin" "split" "sprintf" "sqrt" "srand" "stopme" "strftime" "strtonum" "sub" "substr" "system" - "systime" "tolower" "toupper" "xor") t) + "systime" "tolower" "toupper" "typeof" "xor") + t) "\\>") 0 c-preprocessor-face-name)) + ;; Directives + `(eval . '("@\\(include\\|load\\|namespace\\)\\>" 0 ,c-preprocessor-face-name)) + ;; gawk debugging keywords. (acm, 2002/7/21) ;; (Removed, 2003/6/6. These functions are now fontified as built-ins) ;; (list (concat "\\<" (regexp-opt '("adump" "stopme") t) "\\>") @@ -980,6 +1050,9 @@ std\\(err\\|in\\|out\\)\\|user\\)\\)\\>\ c-awk-escaped-nls*-with-space* "(") (0 'font-lock-warning-face)) + ;; Double :: tokens, or the same with space(s) around them. + #'c-awk-font-lock-invalid-namespace-separators + ;; Space after \ in what looks like an escaped newline. 2002/5/31 '("\\\\\\s +$" 0 font-lock-warning-face t) diff --git a/lisp/progmodes/cc-bytecomp.el b/lisp/progmodes/cc-bytecomp.el index 7798b49f398..89ea1dca3b0 100644 --- a/lisp/progmodes/cc-bytecomp.el +++ b/lisp/progmodes/cc-bytecomp.el @@ -1,6 +1,6 @@ ;;; cc-bytecomp.el --- compile time setup for proper compilation -;; Copyright (C) 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 2000-2021 Free Software Foundation, Inc. ;; Author: Martin Stjernholm ;; Maintainer: bug-cc-mode@gnu.org diff --git a/lisp/progmodes/cc-cmds.el b/lisp/progmodes/cc-cmds.el index 0ce3b3f6edd..33a03602070 100644 --- a/lisp/progmodes/cc-cmds.el +++ b/lisp/progmodes/cc-cmds.el @@ -1,6 +1,6 @@ ;;; cc-cmds.el --- user level commands for CC Mode -;; Copyright (C) 1985, 1987, 1992-2020 Free Software Foundation, Inc. +;; Copyright (C) 1985, 1987, 1992-2021 Free Software Foundation, Inc. ;; Authors: 2003- Alan Mackenzie ;; 1998- Martin Stjernholm @@ -2357,7 +2357,7 @@ With a prefix arg, push the name onto the kill ring too." (put 'c-display-defun-name 'isearch-scroll t) (defun c-mark-function () - "Put mark at end of the current top-level declaration or macro, point at beginning. + "Put mark at end of current top-level declaration or macro, point at beginning. If point is not inside any then the closest following one is chosen. Each successive call of this command extends the marked region by one function. diff --git a/lisp/progmodes/cc-defs.el b/lisp/progmodes/cc-defs.el index c82b3a34e33..38fe23b0eaf 100644 --- a/lisp/progmodes/cc-defs.el +++ b/lisp/progmodes/cc-defs.el @@ -1,6 +1,6 @@ ;;; cc-defs.el --- compile time definitions for CC Mode -;; Copyright (C) 1985, 1987, 1992-2020 Free Software Foundation, Inc. +;; Copyright (C) 1985, 1987, 1992-2021 Free Software Foundation, Inc. ;; Authors: 2003- Alan Mackenzie ;; 1998- Martin Stjernholm @@ -87,7 +87,7 @@ ;;; Variables also used at compile time. -(defconst c-version "5.34.2" +(defconst c-version "5.35.1" "CC Mode version number.") (defconst c-version-sym (intern c-version)) diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index 51f620ea1f0..3fce7dbafae 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el @@ -1,6 +1,6 @@ ;;; cc-engine.el --- core syntax guessing engine for CC mode -*- coding: utf-8 -*- -;; Copyright (C) 1985, 1987, 1992-2020 Free Software Foundation, Inc. +;; Copyright (C) 1985, 1987, 1992-2021 Free Software Foundation, Inc. ;; Authors: 2001- Alan Mackenzie ;; 1998- Martin Stjernholm @@ -10893,7 +10893,7 @@ comment at the start of cc-engine.el for more info." (pp-count-out 20) ; Max number of paren/brace constructs before ; we give up ids ; List of identifiers in the parenthesized list. - id-start after-prec-token decl-or-cast decl-res + id-start after-prec-token decl-or-cast c-last-identifier-range semi-position+1) (narrow-to-region low-lim (or macro-end (point-max))) @@ -11735,7 +11735,7 @@ comment at the start of cc-engine.el for more info." (new-elt (list lim start end result)) big-ptr (cur-ptr c-laomib-cache) - togo togo-ptr (size 0) cur-size + togo (size 0) cur-size ) (if old-elt (setq c-laomib-cache (delq old-elt c-laomib-cache))) @@ -11776,27 +11776,26 @@ comment at the start of cc-engine.el for more info." ((<= lwm (nth 2 elt)) nil) (t - (let (cur-brace) - ;; Search for the last brace in `paren-state' before (car `lim'). This - ;; brace will become our new 2nd element of `elt'. - (while - ;; Search one brace level per iteration. - (and paren-state - (progn - ;; (setq cur-brace (c-laomib-next-BRACE paren-state)) - (while - ;; Go past non-brace levels, one per iteration. - (and paren-state - (not (eq (char-after - (c-state-cache-top-lparen paren-state)) - ?{))) - (setq paren-state (cdr paren-state))) - (cadr paren-state)) - (> (c-state-cache-top-lparen (cdr paren-state)) (car elt))) - (setq paren-state (cdr paren-state))) - (when (cadr paren-state) - (setcar (cdr elt) (c-state-cache-top-lparen paren-state)) - elt))))) + ;; Search for the last brace in `paren-state' before (car `lim'). This + ;; brace will become our new 2nd element of `elt'. + (while + ;; Search one brace level per iteration. + (and paren-state + (progn + ;; (setq cur-brace (c-laomib-next-BRACE paren-state)) + (while + ;; Go past non-brace levels, one per iteration. + (and paren-state + (not (eq (char-after + (c-state-cache-top-lparen paren-state)) + ?{))) + (setq paren-state (cdr paren-state))) + (cadr paren-state)) + (> (c-state-cache-top-lparen (cdr paren-state)) (car elt))) + (setq paren-state (cdr paren-state))) + (when (cadr paren-state) + (setcar (cdr elt) (c-state-cache-top-lparen paren-state)) + elt)))) (defun c-laomib-invalidate-cache (beg _end) ;; Called from late in c-before-change. Amend `c-laomib-cache' to remove diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el index e403c49e398..4e283764ceb 100644 --- a/lisp/progmodes/cc-fonts.el +++ b/lisp/progmodes/cc-fonts.el @@ -1,6 +1,6 @@ ;;; cc-fonts.el --- font lock support for CC Mode -;; Copyright (C) 2002-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002-2021 Free Software Foundation, Inc. ;; Authors: 2003- Alan Mackenzie ;; 2002- Martin Stjernholm @@ -76,9 +76,6 @@ (cc-require-when-compile 'cc-langs) (cc-require 'cc-vars) (cc-require 'cc-engine) -(cc-require-when-compile 'cc-awk) ; Change from cc-require, 2003/6/18 to -;; prevent cc-awk being loaded when it's not needed. There is now a (require -;; 'cc-awk) in (defun awk-mode ..). ;; Avoid repeated loading through the eval-after-load directive in ;; cc-mode.el. diff --git a/lisp/progmodes/cc-guess.el b/lisp/progmodes/cc-guess.el index 8c4b3814e1a..1b852ec4910 100644 --- a/lisp/progmodes/cc-guess.el +++ b/lisp/progmodes/cc-guess.el @@ -1,6 +1,6 @@ ;;; cc-guess.el --- guess indentation values by scanning existing code -;; Copyright (C) 1985, 1987, 1992-2006, 2011-2020 Free Software +;; Copyright (C) 1985, 1987, 1992-2006, 2011-2021 Free Software ;; Foundation, Inc. ;; Author: 1994-1995 Barry A. Warsaw diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el index faf31ff21cf..a5a6780a460 100644 --- a/lisp/progmodes/cc-langs.el +++ b/lisp/progmodes/cc-langs.el @@ -1,6 +1,6 @@ ;;; cc-langs.el --- language specific settings for CC Mode -*- coding: utf-8 -*- -;; Copyright (C) 1985, 1987, 1992-2020 Free Software Foundation, Inc. +;; Copyright (C) 1985, 1987, 1992-2021 Free Software Foundation, Inc. ;; Authors: 2002- Alan Mackenzie ;; 1998- Martin Stjernholm @@ -458,13 +458,11 @@ so that all identifiers are recognized as words.") c-before-change-check-raw-strings c-before-change-check-<>-operators c-depropertize-CPP - c-invalidate-macro-cache c-truncate-bs-cache c-before-change-check-unbalanced-strings c-parse-quotes-before-change) (c objc) '(c-extend-region-for-CPP c-depropertize-CPP - c-invalidate-macro-cache c-truncate-bs-cache c-before-change-check-unbalanced-strings c-parse-quotes-before-change) @@ -550,7 +548,7 @@ parameters (point-min), (point-max) and <buffer size>.") (c-lang-defconst c-before-context-fontification-functions t 'c-context-expand-fl-region - awk nil) + awk 'c-awk-context-expand-fl-region) ;; For documentation see the following c-lang-defvar of the same name. ;; The value here may be a list of functions or a single function. (c-lang-defvar c-before-context-fontification-functions @@ -582,12 +580,14 @@ don't have EOL terminated statements. " (c-lang-defvar c-at-vsemi-p-fn (c-lang-const c-at-vsemi-p-fn)) (c-lang-defconst c-vsemi-status-unknown-p-fn - "Contains a function \"are we unsure whether there is a virtual semicolon on this line?\". -The (admittedly kludgy) purpose of such a function is to prevent an infinite -recursion in c-beginning-of-statement-1 when point starts at a `while' token. -The function MUST NOT UNDER ANY CIRCUMSTANCES call c-beginning-of-statement-1, -even indirectly. This variable contains nil for languages which don't have -EOL terminated statements." + "Contains a predicate regarding the presence of virtual semicolons. +More precisely, the function answers the question, \"are we unsure whether a +virtual semicolon exists on this line?\". The (admittedly kludgy) purpose of +such a function is to prevent an infinite recursion in +`c-beginning-of-statement-1' when point starts at a `while' token. The function +MUST NOT UNDER ANY CIRCUMSTANCES call `c-beginning-of-statement-1', even +indirectly. This variable contains nil for languages which don't have EOL +terminated statements." t nil (c c++ objc) 'c-macro-vsemi-status-unknown-p awk 'c-awk-vsemi-status-unknown-p) diff --git a/lisp/progmodes/cc-menus.el b/lisp/progmodes/cc-menus.el index 97037dea6e8..0ff6efb7d37 100644 --- a/lisp/progmodes/cc-menus.el +++ b/lisp/progmodes/cc-menus.el @@ -1,6 +1,6 @@ ;;; cc-menus.el --- imenu support for CC Mode -;; Copyright (C) 1985, 1987, 1992-2020 Free Software Foundation, Inc. +;; Copyright (C) 1985, 1987, 1992-2021 Free Software Foundation, Inc. ;; Authors: 1998- Martin Stjernholm ;; 1992-1999 Barry A. Warsaw diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el index f6d36f5670c..cfb23d0d45e 100644 --- a/lisp/progmodes/cc-mode.el +++ b/lisp/progmodes/cc-mode.el @@ -1,6 +1,6 @@ ;;; cc-mode.el --- major mode for editing C and similar languages -;; Copyright (C) 1985, 1987, 1992-2020 Free Software Foundation, Inc. +;; Copyright (C) 1985, 1987, 1992-2021 Free Software Foundation, Inc. ;; Authors: 2003- Alan Mackenzie ;; 1998- Martin Stjernholm @@ -113,6 +113,7 @@ ;; Silence the compiler. (cc-bytecomp-defvar adaptive-fill-first-line-regexp) ; Emacs (cc-bytecomp-defun run-mode-hooks) ; Emacs 21.1 +(cc-bytecomp-defvar awk-mode-syntax-table) ;; We set this variable during mode init, yet we don't require ;; font-lock. @@ -730,8 +731,8 @@ that requires a literal mode spec at compile time." ;; ;; Put submode indicators onto minor-mode-alist, but only once. ;; (or (assq 'c-submode-indicators minor-mode-alist) ;; (setq minor-mode-alist -;; (cons '(c-submode-indicators c-submode-indicators) -;; minor-mode-alist))) +;; (cons '(c-submode-indicators c-submode-indicators) +;; minor-mode-alist))) (c-update-modeline) ;; Install the functions that ensure that various internal caches @@ -1257,7 +1258,7 @@ Note that the style variables are always made local to the buffer." ;; Set both the syntax-table and the c-fl-syn-tab text properties at POS to ;; VALUE (which should not be nil). ;; `(let ((-pos- ,pos) - ;; (-value- ,value)) + ;; (-value- ,value)) (c-put-char-property pos 'syntax-table value) (c-put-char-property pos 'c-fl-syn-tab value) (cond @@ -1487,7 +1488,7 @@ Note that the style variables are always made local to the buffer." ((and (c-is-escaped end) (or (eq beg end) ; .... by inserting stuff between \ and \n? - (c-will-be-unescaped beg))) ; ... by removing an odd number of \s? + (c-will-be-unescaped beg))) ; ... by removing an odd number of \s? (goto-char (1+ end))) ; To after the NL which is being unescaped. (t (goto-char end))) @@ -2064,7 +2065,11 @@ Note that this is a strict tail, so won't match, e.g. \"0x....\".") ;; The following must be done here rather than in `c-after-change' ;; because newly inserted parens would foul up the invalidation ;; algorithm. - (c-invalidate-state-cache beg))) + (c-invalidate-state-cache beg) + ;; The following must happen after the previous, which likely alters + ;; the macro cache. + (when c-opt-cpp-symbol + (c-invalidate-macro-cache beg end)))) (defvar c-in-after-change-fontification nil) (make-variable-buffer-local 'c-in-after-change-fontification) diff --git a/lisp/progmodes/cc-styles.el b/lisp/progmodes/cc-styles.el index 855e467571d..aec259f1b38 100644 --- a/lisp/progmodes/cc-styles.el +++ b/lisp/progmodes/cc-styles.el @@ -1,6 +1,6 @@ ;;; cc-styles.el --- support for styles in CC Mode -;; Copyright (C) 1985, 1987, 1992-2020 Free Software Foundation, Inc. +;; Copyright (C) 1985, 1987, 1992-2021 Free Software Foundation, Inc. ;; Authors: 2004- Alan Mackenzie ;; 1998- Martin Stjernholm diff --git a/lisp/progmodes/cc-vars.el b/lisp/progmodes/cc-vars.el index 8772ed06324..88ee092da79 100644 --- a/lisp/progmodes/cc-vars.el +++ b/lisp/progmodes/cc-vars.el @@ -1,6 +1,6 @@ ;;; cc-vars.el --- user customization variables for CC Mode -;; Copyright (C) 1985, 1987, 1992-2020 Free Software Foundation, Inc. +;; Copyright (C) 1985, 1987, 1992-2021 Free Software Foundation, Inc. ;; Authors: 2002- Alan Mackenzie ;; 1998- Martin Stjernholm diff --git a/lisp/progmodes/cfengine.el b/lisp/progmodes/cfengine.el index 6e915440f95..f516664f7f4 100644 --- a/lisp/progmodes/cfengine.el +++ b/lisp/progmodes/cfengine.el @@ -1,6 +1,6 @@ ;;; cfengine.el --- mode for editing Cfengine files -;; Copyright (C) 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 2001-2021 Free Software Foundation, Inc. ;; Author: Dave Love <fx@gnu.org> ;; Maintainer: Ted Zlatanov <tzz@lifelogs.com> diff --git a/lisp/progmodes/cl-font-lock.el b/lisp/progmodes/cl-font-lock.el index cb6bd6c34bb..178fe944f30 100644 --- a/lisp/progmodes/cl-font-lock.el +++ b/lisp/progmodes/cl-font-lock.el @@ -1,5 +1,5 @@ ;;; cl-font-lock.el --- Pretty Common Lisp font locking -*- lexical-binding: t; -*- -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; Author: Yue Daian <sheepduke@gmail.com> ;; Maintainer: Spenser Truex <web@spensertruex.com> diff --git a/lisp/progmodes/cmacexp.el b/lisp/progmodes/cmacexp.el index 78e0a5bba08..d3a33bdf870 100644 --- a/lisp/progmodes/cmacexp.el +++ b/lisp/progmodes/cmacexp.el @@ -1,6 +1,6 @@ ;;; cmacexp.el --- expand C macros in a region -;; Copyright (C) 1992, 1994, 1996, 2000-2020 Free Software Foundation, +;; Copyright (C) 1992, 1994, 1996, 2000-2021 Free Software Foundation, ;; Inc. ;; Author: Francesco Potortì <pot@gnu.org> diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index d2293151c7d..94e4f3c6fa7 100644 --- a/lisp/progmodes/compile.el +++ b/lisp/progmodes/compile.el @@ -1,6 +1,6 @@ ;;; compile.el --- run compiler as inferior of Emacs, parse error messages -*- lexical-binding:t -*- -;; Copyright (C) 1985-1987, 1993-1999, 2001-2020 Free Software +;; Copyright (C) 1985-1987, 1993-1999, 2001-2021 Free Software ;; Foundation, Inc. ;; Authors: Roland McGrath <roland@gnu.org>, @@ -1577,10 +1577,10 @@ to `compilation-error-regexp-alist' if RULES is nil." (put-text-property (match-beginning mn) (match-end mn) 'font-lock-face face)) - ((and (listp face) - (eq (car face) 'face) - (or (symbolp (cadr face)) - (stringp (cadr face)))) + ((and (listp face) + (eq (car face) 'face) + (or (symbolp (cadr face)) + (stringp (cadr face)))) (compilation--put-prop mn 'font-lock-face (cadr face)) (add-text-properties (match-beginning mn) (match-end mn) diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el index 2fc2d14ee6a..d401513646f 100644 --- a/lisp/progmodes/cperl-mode.el +++ b/lisp/progmodes/cperl-mode.el @@ -1,6 +1,6 @@ ;;; cperl-mode.el --- Perl code editing commands for Emacs -*- lexical-binding:t -*- -;; Copyright (C) 1985-1987, 1991-2020 Free Software Foundation, Inc. +;; Copyright (C) 1985-1987, 1991-2021 Free Software Foundation, Inc. ;; Author: Ilya Zakharevich ;; Bob Olson @@ -6533,7 +6533,7 @@ Does not move point." (defun cperl-add-tags-recurse-noxs () "Add to TAGS data for \"pure\" Perl files in the current directory and kids. Use as - emacs -batch -q -no-site-file -l emacs/cperl-mode.el \ + emacs -batch -q -no-site-file -l emacs/cperl-mode.el \\ -f cperl-add-tags-recurse-noxs " (cperl-write-tags nil nil t t nil t)) @@ -6542,7 +6542,7 @@ Use as "Add to TAGS data for \"pure\" Perl in the current directory and kids. Writes down fullpath, so TAGS is relocatable (but if the build directory is relocated, the file TAGS inside it breaks). Use as - emacs -batch -q -no-site-file -l emacs/cperl-mode.el \ + emacs -batch -q -no-site-file -l emacs/cperl-mode.el \\ -f cperl-add-tags-recurse-noxs-fullpath " (cperl-write-tags nil nil t t nil t "")) @@ -6550,7 +6550,7 @@ is relocated, the file TAGS inside it breaks). Use as (defun cperl-add-tags-recurse () "Add to TAGS file data for Perl files in the current directory and kids. Use as - emacs -batch -q -no-site-file -l emacs/cperl-mode.el \ + emacs -batch -q -no-site-file -l emacs/cperl-mode.el \\ -f cperl-add-tags-recurse " (cperl-write-tags nil nil t t)) diff --git a/lisp/progmodes/cpp.el b/lisp/progmodes/cpp.el index 65ef83f7698..4ea1674db02 100644 --- a/lisp/progmodes/cpp.el +++ b/lisp/progmodes/cpp.el @@ -1,6 +1,6 @@ ;;; cpp.el --- highlight or hide text according to cpp conditionals -*- lexical-binding: t -*- -;; Copyright (C) 1994-1995, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1994-1995, 2001-2021 Free Software Foundation, Inc. ;; Author: Per Abrahamsen <abraham@dina.kvl.dk> ;; Keywords: c, faces, tools diff --git a/lisp/progmodes/cwarn.el b/lisp/progmodes/cwarn.el index b09a2ed7865..042030da396 100644 --- a/lisp/progmodes/cwarn.el +++ b/lisp/progmodes/cwarn.el @@ -1,6 +1,6 @@ ;;; cwarn.el --- highlight suspicious C and C++ constructions -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: Anders Lindgren ;; Keywords: c, languages, faces diff --git a/lisp/progmodes/dcl-mode.el b/lisp/progmodes/dcl-mode.el index 9bafd7aa42c..3815b176503 100644 --- a/lisp/progmodes/dcl-mode.el +++ b/lisp/progmodes/dcl-mode.el @@ -1,6 +1,6 @@ ;;; dcl-mode.el --- major mode for editing DCL command files -;; Copyright (C) 1997, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997, 2001-2021 Free Software Foundation, Inc. ;; Author: Odd Gripenstam <gripenstamol@decus.se> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/progmodes/ebnf-abn.el b/lisp/progmodes/ebnf-abn.el index be82c72910b..9e570b6c03f 100644 --- a/lisp/progmodes/ebnf-abn.el +++ b/lisp/progmodes/ebnf-abn.el @@ -1,6 +1,6 @@ ;;; ebnf-abn.el --- parser for ABNF (Augmented BNF) -;; Copyright (C) 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 2001-2021 Free Software Foundation, Inc. ;; Author: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com> ;; Keywords: wp, ebnf, PostScript diff --git a/lisp/progmodes/ebnf-bnf.el b/lisp/progmodes/ebnf-bnf.el index 4e11862c1dc..93ebfe8654d 100644 --- a/lisp/progmodes/ebnf-bnf.el +++ b/lisp/progmodes/ebnf-bnf.el @@ -1,6 +1,6 @@ ;;; ebnf-bnf.el --- parser for EBNF -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com> ;; Keywords: wp, ebnf, PostScript diff --git a/lisp/progmodes/ebnf-dtd.el b/lisp/progmodes/ebnf-dtd.el index ddddb27a11c..66e5dd095ea 100644 --- a/lisp/progmodes/ebnf-dtd.el +++ b/lisp/progmodes/ebnf-dtd.el @@ -1,6 +1,6 @@ ;;; ebnf-dtd.el --- parser for DTD (Data Type Description for XML) -;; Copyright (C) 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 2001-2021 Free Software Foundation, Inc. ;; Author: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com> ;; Keywords: wp, ebnf, PostScript diff --git a/lisp/progmodes/ebnf-ebx.el b/lisp/progmodes/ebnf-ebx.el index 546f1f8a87f..389049e39a9 100644 --- a/lisp/progmodes/ebnf-ebx.el +++ b/lisp/progmodes/ebnf-ebx.el @@ -1,6 +1,6 @@ ;;; ebnf-ebx.el --- parser for EBNF used to specify XML (EBNFX) -;; Copyright (C) 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 2001-2021 Free Software Foundation, Inc. ;; Author: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com> ;; Keywords: wp, ebnf, PostScript diff --git a/lisp/progmodes/ebnf-iso.el b/lisp/progmodes/ebnf-iso.el index 466e7785053..d25ff3ecb4b 100644 --- a/lisp/progmodes/ebnf-iso.el +++ b/lisp/progmodes/ebnf-iso.el @@ -1,6 +1,6 @@ ;;; ebnf-iso.el --- parser for ISO EBNF -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com> ;; Keywords: wp, ebnf, PostScript diff --git a/lisp/progmodes/ebnf-otz.el b/lisp/progmodes/ebnf-otz.el index a5105746284..b724d75a7e5 100644 --- a/lisp/progmodes/ebnf-otz.el +++ b/lisp/progmodes/ebnf-otz.el @@ -1,6 +1,6 @@ ;;; ebnf-otz.el --- syntactic chart OpTimiZer -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com> ;; Keywords: wp, ebnf, PostScript diff --git a/lisp/progmodes/ebnf-yac.el b/lisp/progmodes/ebnf-yac.el index a657c637f82..2765d03acba 100644 --- a/lisp/progmodes/ebnf-yac.el +++ b/lisp/progmodes/ebnf-yac.el @@ -1,6 +1,6 @@ ;;; ebnf-yac.el --- parser for Yacc/Bison -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com> ;; Keywords: wp, ebnf, PostScript diff --git a/lisp/progmodes/ebnf2ps.el b/lisp/progmodes/ebnf2ps.el index 991cd6fc519..6f9509d152b 100644 --- a/lisp/progmodes/ebnf2ps.el +++ b/lisp/progmodes/ebnf2ps.el @@ -1,6 +1,6 @@ ;;; ebnf2ps.el --- translate an EBNF to a syntactic chart on PostScript -*- lexical-binding:t -*- -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com> ;; Keywords: wp, ebnf, PostScript diff --git a/lisp/progmodes/ebrowse.el b/lisp/progmodes/ebrowse.el index ffd7d03d7a9..a174d4851e5 100644 --- a/lisp/progmodes/ebrowse.el +++ b/lisp/progmodes/ebrowse.el @@ -1,6 +1,6 @@ ;;; ebrowse.el --- Emacs C++ class browser & tags facility -*- lexical-binding:t -*- -;; Copyright (C) 1992-2020 Free Software Foundation, Inc. +;; Copyright (C) 1992-2021 Free Software Foundation, Inc. ;; Author: Gerd Moellmann <gerd@gnu.org> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el index 6e67ce5035b..017e8c5b415 100644 --- a/lisp/progmodes/elisp-mode.el +++ b/lisp/progmodes/elisp-mode.el @@ -1,6 +1,6 @@ ;;; elisp-mode.el --- Emacs Lisp mode -*- lexical-binding:t -*- -;; Copyright (C) 1985-1986, 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1985-1986, 1999-2021 Free Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org ;; Keywords: lisp, languages @@ -1736,7 +1736,8 @@ Calls REPORT-FN directly." collect (flymake-make-diagnostic (current-buffer) - start end :note text))) + (or start 1) (or end (1+ (or start 1))) + :note text))) collected)) (defun elisp-flymake--byte-compile-done (report-fn diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el index aadfb8150cf..869529ab2db 100644 --- a/lisp/progmodes/etags.el +++ b/lisp/progmodes/etags.el @@ -1,6 +1,6 @@ ;;; etags.el --- etags facility for Emacs -*- lexical-binding: t -*- -;; Copyright (C) 1985-1986, 1988-1989, 1992-1996, 1998, 2000-2020 Free +;; Copyright (C) 1985-1986, 1988-1989, 1992-1996, 1998, 2000-2021 Free ;; Software Foundation, Inc. ;; Author: Roland McGrath <roland@gnu.org> @@ -1814,8 +1814,8 @@ argument is passed to `next-file', which see)." Stops when a match is found. To continue searching for next match, use command \\[tags-loop-continue]. -If FILES if non-nil should be a list or an iterator returning the files to search. -The search will be restricted to these files. +If FILES if non-nil should be a list or an iterator returning the +files to search. The search will be restricted to these files. Also see the documentation of the `tags-file-name' variable." (interactive "sTags search (regexp): ") diff --git a/lisp/progmodes/executable.el b/lisp/progmodes/executable.el index cc7280921ad..fa5724a3800 100644 --- a/lisp/progmodes/executable.el +++ b/lisp/progmodes/executable.el @@ -1,6 +1,6 @@ ;;; executable.el --- base functionality for executable interpreter scripts -;; Copyright (C) 1994-1996, 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 1994-1996, 2000-2021 Free Software Foundation, Inc. ;; Author: Daniel Pfeiffer <occitan@esperanto.org> ;; Keywords: languages, unix diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el index 3c5c29bd8d9..2641387986d 100644 --- a/lisp/progmodes/f90.el +++ b/lisp/progmodes/f90.el @@ -1,6 +1,6 @@ ;;; f90.el --- Fortran-90 mode (free format) -*- lexical-binding: t -*- -;; Copyright (C) 1995-1997, 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 1995-1997, 2000-2021 Free Software Foundation, Inc. ;; Author: Torbjörn Einarsson <Torbjorn.Einarsson@era.ericsson.se> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/progmodes/flymake-cc.el b/lisp/progmodes/flymake-cc.el index 19cef855c54..bd403faf7c4 100644 --- a/lisp/progmodes/flymake-cc.el +++ b/lisp/progmodes/flymake-cc.el @@ -1,6 +1,6 @@ ;;; flymake-cc.el --- Flymake support for GNU tools for C/C++ -*- lexical-binding: t; -*- -;; Copyright (C) 2018-2020 Free Software Foundation, Inc. +;; Copyright (C) 2018-2021 Free Software Foundation, Inc. ;; Author: João Távora <joaotavora@gmail.com> ;; Keywords: languages, c diff --git a/lisp/progmodes/flymake-proc.el b/lisp/progmodes/flymake-proc.el index 4975d4f35dd..9cbad121d1f 100644 --- a/lisp/progmodes/flymake-proc.el +++ b/lisp/progmodes/flymake-proc.el @@ -1,6 +1,6 @@ ;;; flymake-proc.el --- Flymake backend for external tools -*- lexical-binding: t; -*- -;; Copyright (C) 2003-2020 Free Software Foundation, Inc. +;; Copyright (C) 2003-2021 Free Software Foundation, Inc. ;; Author: Pavel Kobyakov <pk_at_work@yahoo.com> ;; Maintainer: João Távora <joaotavora@gmail.com> diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el index 40bb90d0f15..5ba9460eee9 100644 --- a/lisp/progmodes/flymake.el +++ b/lisp/progmodes/flymake.el @@ -1,6 +1,6 @@ ;;; flymake.el --- A universal on-the-fly syntax checker -*- lexical-binding: t; -*- -;; Copyright (C) 2003-2020 Free Software Foundation, Inc. +;; Copyright (C) 2003-2021 Free Software Foundation, Inc. ;; Author: Pavel Kobyakov <pk_at_work@yahoo.com> ;; Maintainer: João Távora <joaotavora@gmail.com> @@ -997,7 +997,7 @@ suitable for the current buffer. The commands `flymake-running-backends', `flymake-disabled-backends' and `flymake-reporting-backends' summarize the situation, as does the special *Flymake log* buffer." :group 'flymake :lighter - flymake--mode-line-format :keymap flymake-mode-map + flymake-mode-line-format :keymap flymake-mode-map (cond ;; Turning the mode ON. (flymake-mode @@ -1186,123 +1186,141 @@ default) no filter is applied." [ "Go to log buffer" flymake-switch-to-log-buffer t ] [ "Turn off Flymake" flymake-mode t ])) -(defvar flymake--mode-line-format '(:eval (flymake--mode-line-format))) - -(put 'flymake--mode-line-format 'risky-local-variable t) - - -(defun flymake--mode-line-format () - "Produce a pretty minor mode indicator." - (let* ((known (hash-table-keys flymake--backend-state)) - (running (flymake-running-backends)) - (disabled (flymake-disabled-backends)) - (reported (flymake-reporting-backends)) - (diags-by-type (make-hash-table)) - (all-disabled (and disabled (null running))) - (some-waiting (cl-set-difference running reported))) - (maphash (lambda (_b state) - (mapc (lambda (diag) - (push diag - (gethash (flymake--diag-type diag) - diags-by-type))) - (flymake--backend-state-diags state))) - flymake--backend-state) - `((:propertize " Flymake" - mouse-face mode-line-highlight - help-echo - ,(concat (format "%s known backends\n" (length known)) - (format "%s running\n" (length running)) - (format "%s disabled\n" (length disabled)) - "mouse-1: Display minor mode menu\n" - "mouse-2: Show help for minor mode") - keymap - ,(let ((map (make-sparse-keymap))) - (define-key map [mode-line down-mouse-1] - flymake-menu) - (define-key map [mode-line mouse-2] - (lambda () - (interactive) - (describe-function 'flymake-mode))) - map)) - ,@(pcase-let ((`(,ind ,face ,explain) - (cond ((null known) - '("?" nil "No known backends")) - (some-waiting - `("Wait" compilation-mode-line-run - ,(format "Waiting for %s running backend(s)" - (length some-waiting)))) - (all-disabled - '("!" compilation-mode-line-run - "All backends disabled")) - (t - '(nil nil nil))))) - (when ind - `((":" - (:propertize ,ind - face ,face - help-echo ,explain - keymap - ,(let ((map (make-sparse-keymap))) +(defcustom flymake-mode-line-format + '(" " flymake-mode-line-title flymake-mode-line-exception + flymake-mode-line-counters) + "Mode line construct for customizing Flymake information." + :group 'flymake + :type '(repeat (choice string symbol))) + +(defcustom flymake-mode-line-counter-format + '("[" + flymake-mode-line-error-counter + flymake-mode-line-warning-counter + flymake-mode-line-note-counter "]") + "Mode-line construct for formatting Flymake diagnostic counters. +This is a suitable place for placing the `flymake-error-counter', +`flymake-warning-counter' and `flymake-note-counter' constructs. +Separating each of these with space is not necessary." + :group 'flymake + :type '(repeat (choice string symbol))) + +(defvar flymake-mode-line-title '(:eval (flymake--mode-line-title)) + "Mode-line construct to show Flymake's mode name and menu.") + +(defvar flymake-mode-line-exception '(:eval (flymake--mode-line-exception)) + "Mode-line construct to report on exceptional Flymake status.") + +(defvar flymake-mode-line-counters '(:eval (flymake--mode-line-counters)) + "Mode-line construct for counting Flymake diagnostics. +The counters are only placed if some Flymake backend initialized +correctly.") + +(defvar flymake-mode-line-error-counter + `(:eval (flymake--mode-line-counter :error t))) +(defvar flymake-mode-line-warning-counter + `(:eval (flymake--mode-line-counter :warning))) +(defvar flymake-mode-line-note-counter + `(:eval (flymake--mode-line-counter :note))) + +(put 'flymake-mode-line-format 'risky-local-variable t) +(put 'flymake-mode-line-title 'risky-local-variable t) +(put 'flymake-mode-line-exception 'risky-local-variable t) +(put 'flymake-mode-line-counters 'risky-local-variable t) +(put 'flymake-mode-line-error-counter 'risky-local-variable t) +(put 'flymake-mode-line-warning-counter 'risky-local-variable t) +(put 'flymake-mode-line-note-counter 'risky-local-variable t) + +(defun flymake--mode-line-title () + `(:propertize + "Flymake" + mouse-face mode-line-highlight + help-echo + (lambda (&rest whatever) + (concat + (format "%s known backends\n" (hash-table-count flymake--backend-state)) + (format "%s running\n" (length (flymake-running-backends))) + (format "%s disabled\n" (length (flymake-disabled-backends))) + "mouse-1: Display minor mode menu\n" + "mouse-2: Show help for minor mode")) + keymap + ,(let ((map (make-sparse-keymap))) + (define-key map [mode-line down-mouse-1] + flymake-menu) + (define-key map [mode-line mouse-2] + (lambda () + (interactive) + (describe-function 'flymake-mode))) + map))) + +(defun flymake--mode-line-exception () + "Helper for `flymake-mode-line-exception'." + (pcase-let* ((running) (reported) + (`(,ind ,face ,explain) + (cond ((zerop (hash-table-count flymake--backend-state)) + '("?" nil "No known backends")) + ((cl-set-difference + (setq running (flymake-running-backends)) + (setq reported (flymake-reporting-backends))) + `("Wait" compilation-mode-line-run + ,(format "Waiting for %s running backend(s)" + (length (cl-set-difference running reported))))) + ((and (flymake-disabled-backends) (null running)) + '("!" compilation-mode-line-run + "All backends disabled")) + (t + '(nil nil nil))))) + (when ind + `(":" + (:propertize ,ind face ,face + help-echo ,explain + keymap ,(let ((map (make-sparse-keymap))) (define-key map [mode-line mouse-1] 'flymake-switch-to-log-buffer) map)))))) - ,@(unless (or all-disabled - (null known)) - (cl-loop - with types = (hash-table-keys diags-by-type) - with _augmented = (cl-loop for extra in '(:error :warning) - do (cl-pushnew extra types - :key #'flymake--severity)) - for type in (cl-sort types #'> :key #'flymake--severity) - for diags = (gethash type diags-by-type) - for face = (flymake--lookup-type-property type - 'mode-line-face - 'compilation-error) - when (or diags - (cond ((eq flymake-suppress-zero-counters t) - nil) - (flymake-suppress-zero-counters - (>= (flymake--severity type) - (warning-numeric-level - flymake-suppress-zero-counters))) - (t t))) - collect `(:propertize - ,(format "%d" (length diags)) - face ,face - mouse-face mode-line-highlight - keymap - ,(let ((map (make-sparse-keymap)) - (type type)) - (define-key map (vector 'mode-line - mouse-wheel-down-event) - (lambda (event) - (interactive "e") - (with-selected-window (posn-window (event-start event)) - (flymake-goto-prev-error 1 (list type) t)))) - (define-key map (vector 'mode-line - mouse-wheel-up-event) - (lambda (event) - (interactive "e") - (with-selected-window (posn-window (event-start event)) - (flymake-goto-next-error 1 (list type) t)))) - map) - help-echo - ,(concat (format "%s diagnostics of type %s\n" - (propertize (format "%d" - (length diags)) - 'face face) - (propertize (format "%s" type) - 'face face)) - (format "%s/%s: previous/next of this type" - mouse-wheel-down-event - mouse-wheel-up-event))) - into forms - finally return - `((:propertize "[") - ,@(cl-loop for (a . rest) on forms by #'cdr - collect a when rest collect - '(:propertize " ")) - (:propertize "]"))))))) + +(defun flymake--mode-line-counters () + (when (flymake-running-backends) flymake-mode-line-counter-format)) + +(defun flymake--mode-line-counter (type &optional no-space) + (let ((count 0) + (face (flymake--lookup-type-property type + 'mode-line-face + 'compilation-error))) + (maphash (lambda + (_b state) + (dolist (d (flymake--backend-state-diags state)) + (when (eq type (flymake--diag-type d)) + (cl-incf count)))) + flymake--backend-state) + (when (or (cl-plusp count) + (cond ((eq flymake-suppress-zero-counters t) + nil) + (flymake-suppress-zero-counters + (>= (flymake--severity type) + (warning-numeric-level + flymake-suppress-zero-counters))) + (t t))) + `(,(if no-space "" '(:propertize " ")) + (:propertize + ,(format "%d" count) + face ,face + mouse-face mode-line-highlight + keymap + ,(let ((map (make-sparse-keymap))) + (define-key map (vector 'mode-line + mouse-wheel-down-event) + (lambda (event) + (interactive "e") + (with-selected-window (posn-window (event-start event)) + (flymake-goto-prev-error 1 (list type) t)))) + (define-key map (vector 'mode-line + mouse-wheel-up-event) + (lambda (event) + (interactive "e") + (with-selected-window (posn-window (event-start event)) + (flymake-goto-next-error 1 (list type) t)))) + map)))))) ;;; Diagnostics buffer diff --git a/lisp/progmodes/fortran.el b/lisp/progmodes/fortran.el index 1142c323dc3..3bef3986a10 100644 --- a/lisp/progmodes/fortran.el +++ b/lisp/progmodes/fortran.el @@ -1,6 +1,6 @@ ;;; fortran.el --- Fortran mode for GNU Emacs -*- lexical-binding: t -*- -;; Copyright (C) 1986, 1993-1995, 1997-2020 Free Software Foundation, +;; Copyright (C) 1986, 1993-1995, 1997-2021 Free Software Foundation, ;; Inc. ;; Author: Michael D. Prange <prange@erl.mit.edu> diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el index 99ca0a639a8..1a96755bcf0 100644 --- a/lisp/progmodes/gdb-mi.el +++ b/lisp/progmodes/gdb-mi.el @@ -1,6 +1,6 @@ ;;; gdb-mi.el --- User Interface for running GDB -*- lexical-binding: t -*- -;; Copyright (C) 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2007-2021 Free Software Foundation, Inc. ;; Author: Nick Roberts <nickrob@gnu.org> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/progmodes/glasses.el b/lisp/progmodes/glasses.el index ab65a1590c0..a0f5d36bb65 100644 --- a/lisp/progmodes/glasses.el +++ b/lisp/progmodes/glasses.el @@ -1,6 +1,6 @@ ;;; glasses.el --- make cantReadThis readable -*- lexical-binding: t; -*- -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: Milan Zamazal <pdm@zamazal.org> ;; Keywords: tools diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el index 5dc99cc7e93..1a8435fde33 100644 --- a/lisp/progmodes/grep.el +++ b/lisp/progmodes/grep.el @@ -1,6 +1,6 @@ ;;; grep.el --- run `grep' and display the results -*- lexical-binding:t -*- -;; Copyright (C) 1985-1987, 1993-1999, 2001-2020 Free Software +;; Copyright (C) 1985-1987, 1993-1999, 2001-2021 Free Software ;; Foundation, Inc. ;; Author: Roland McGrath <roland@gnu.org> @@ -79,7 +79,7 @@ This option sets the environment variable GREP_COLORS to specify markers for highlighting and adds the --color option in front of any explicit grep options before starting the grep. -When this option is `auto', grep uses `--color' to highlight +When this option is `auto', grep uses `--color=auto' to highlight matches only when it outputs to a terminal (when `grep' is the last command in the pipe), thus avoiding the use of any potentially-harmful escape sequences when standard output goes to a file or pipe. @@ -95,7 +95,7 @@ To change the default value, use \\[customize] or call the function :type '(choice (const :tag "Do not highlight matches with grep markers" nil) (const :tag "Highlight matches with grep markers" t) (const :tag "Use --color=always" always) - (const :tag "Use --color" auto) + (const :tag "Use --color=auto" auto) (other :tag "Not Set" auto-detect)) :set #'grep-apply-setting :version "22.1") @@ -743,7 +743,7 @@ The value depends on `grep-command', `grep-template', `(nil nil nil "--color" "x" ,(null-device)) nil 1) (if (eq grep-highlight-matches 'always) - "--color=always" "--color")) + "--color=always" "--color=auto")) "") grep-options))) (unless grep-template @@ -1000,7 +1000,7 @@ these include `opts', `dir', `files', `null-device', `excl' and ((eq grep-highlight-matches 'always) (push "--color=always" opts)) ((eq grep-highlight-matches 'auto) - (push "--color" opts))) + (push "--color=auto" opts))) opts)) (excl . ,excl) (dir . ,dir) diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el index 134c2fc5c97..259da2fd019 100644 --- a/lisp/progmodes/gud.el +++ b/lisp/progmodes/gud.el @@ -1,6 +1,6 @@ ;;; gud.el --- Grand Unified Debugger mode for running GDB and other debuggers -*- lexical-binding:t -*- -;; Copyright (C) 1992-1996, 1998, 2000-2020 Free Software Foundation, +;; Copyright (C) 1992-1996, 1998, 2000-2021 Free Software Foundation, ;; Inc. ;; Author: Eric S. Raymond <esr@snark.thyrsus.com> diff --git a/lisp/progmodes/hideif.el b/lisp/progmodes/hideif.el index fb487f7e1f2..923f85fd4dd 100644 --- a/lisp/progmodes/hideif.el +++ b/lisp/progmodes/hideif.el @@ -1,6 +1,6 @@ ;;; hideif.el --- hides selected code within ifdef -*- lexical-binding:t -*- -;; Copyright (C) 1988, 1994, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1988, 1994, 2001-2021 Free Software Foundation, Inc. ;; Author: Brian Marick ;; Daniel LaLiberte <liberte@holonexus.org> diff --git a/lisp/progmodes/hideshow.el b/lisp/progmodes/hideshow.el index c882b7bc52c..73d09e00591 100644 --- a/lisp/progmodes/hideshow.el +++ b/lisp/progmodes/hideshow.el @@ -1,6 +1,6 @@ ;;; hideshow.el --- minor mode cmds to selectively display code/comment blocks -*- lexical-binding:t -*- -;; Copyright (C) 1994-2020 Free Software Foundation, Inc. +;; Copyright (C) 1994-2021 Free Software Foundation, Inc. ;; Author: Thien-Thi Nguyen <ttn@gnu.org> ;; Dan Nicolaescu <dann@ics.uci.edu> diff --git a/lisp/progmodes/icon.el b/lisp/progmodes/icon.el index dd0ee952a26..933cb333dfb 100644 --- a/lisp/progmodes/icon.el +++ b/lisp/progmodes/icon.el @@ -1,6 +1,6 @@ ;;; icon.el --- mode for editing Icon code -;; Copyright (C) 1989, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1989, 2001-2021 Free Software Foundation, Inc. ;; Author: Chris Smith <csmith@convex.com> ;; Created: 15 Feb 89 diff --git a/lisp/progmodes/idlw-complete-structtag.el b/lisp/progmodes/idlw-complete-structtag.el index 4cb82786aef..25bc5ad881b 100644 --- a/lisp/progmodes/idlw-complete-structtag.el +++ b/lisp/progmodes/idlw-complete-structtag.el @@ -1,6 +1,6 @@ ;;; idlw-complete-structtag.el --- Completion of structure tags. -;; Copyright (C) 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 2001-2021 Free Software Foundation, Inc. ;; Author: Carsten Dominik <dominik@astro.uva.nl> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/progmodes/idlw-help.el b/lisp/progmodes/idlw-help.el index af1a1b154b7..2e7b0aa7ef1 100644 --- a/lisp/progmodes/idlw-help.el +++ b/lisp/progmodes/idlw-help.el @@ -1,6 +1,6 @@ ;;; idlw-help.el --- HTML Help code for IDLWAVE -;; Copyright (C) 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 2000-2021 Free Software Foundation, Inc. ;; ;; Authors: JD Smith <jd.smith@utoledo.edu> ;; Carsten Dominik <dominik@science.uva.nl> diff --git a/lisp/progmodes/idlw-shell.el b/lisp/progmodes/idlw-shell.el index 31f18457e77..4bc52247d86 100644 --- a/lisp/progmodes/idlw-shell.el +++ b/lisp/progmodes/idlw-shell.el @@ -1,6 +1,6 @@ ;; idlw-shell.el --- run IDL as an inferior process of Emacs. -*- lexical-binding:t -*- -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Authors: JD Smith <jd.smith@utoledo.edu> ;; Carsten Dominik <dominik@astro.uva.nl> diff --git a/lisp/progmodes/idlw-toolbar.el b/lisp/progmodes/idlw-toolbar.el index 1866e50d680..4bd0afb2ba1 100644 --- a/lisp/progmodes/idlw-toolbar.el +++ b/lisp/progmodes/idlw-toolbar.el @@ -1,6 +1,6 @@ ;;; idlw-toolbar.el --- a debugging toolbar for IDLWAVE -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: Carsten Dominik <dominik@astro.uva.nl> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/progmodes/idlwave.el b/lisp/progmodes/idlwave.el index 9107086b72e..c11892492de 100644 --- a/lisp/progmodes/idlwave.el +++ b/lisp/progmodes/idlwave.el @@ -1,6 +1,6 @@ ;; idlwave.el --- IDL editing mode for GNU Emacs -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Authors: JD Smith <jd.smith@utoledo.edu> ;; Carsten Dominik <dominik@science.uva.nl> diff --git a/lisp/progmodes/inf-lisp.el b/lisp/progmodes/inf-lisp.el index 93d5d0fbcc2..ac230596240 100644 --- a/lisp/progmodes/inf-lisp.el +++ b/lisp/progmodes/inf-lisp.el @@ -1,6 +1,6 @@ ;;; inf-lisp.el --- an inferior-lisp mode -;; Copyright (C) 1988, 1993-1994, 2001-2020 Free Software Foundation, +;; Copyright (C) 1988, 1993-1994, 2001-2021 Free Software Foundation, ;; Inc. ;; Author: Olin Shivers <shivers@cs.cmu.edu> diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el index f3cfbbb948f..33bea59e3ba 100644 --- a/lisp/progmodes/js.el +++ b/lisp/progmodes/js.el @@ -1,6 +1,6 @@ ;;; js.el --- Major mode for editing JavaScript -*- lexical-binding: t -*- -;; Copyright (C) 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2008-2021 Free Software Foundation, Inc. ;; Author: Karl Landstrom <karl.landstrom@brgeight.se> ;; Daniel Colascione <dancol@dancol.org> diff --git a/lisp/progmodes/ld-script.el b/lisp/progmodes/ld-script.el index 656af69d42b..c4ea8e158d8 100644 --- a/lisp/progmodes/ld-script.el +++ b/lisp/progmodes/ld-script.el @@ -1,6 +1,6 @@ ;;; ld-script.el --- GNU linker script editing mode for Emacs -*- lexical-binding:t -*- -;; Copyright (C) 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 2001-2021 Free Software Foundation, Inc. ;; Author: Masatake YAMATO <yamato@redhat.com> ;; Keywords: languages, faces diff --git a/lisp/progmodes/m4-mode.el b/lisp/progmodes/m4-mode.el index ec0f425de92..99f4be38721 100644 --- a/lisp/progmodes/m4-mode.el +++ b/lisp/progmodes/m4-mode.el @@ -1,6 +1,6 @@ ;;; m4-mode.el --- m4 code editing commands for Emacs -*- lexical-binding:t -*- -;; Copyright (C) 1996-1997, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996-1997, 2001-2021 Free Software Foundation, Inc. ;; Author: Andrew Csillag <drew@thecsillags.com> ;; Keywords: languages, faces diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el index 8b6a7fc1b48..a0e09f51ce3 100644 --- a/lisp/progmodes/make-mode.el +++ b/lisp/progmodes/make-mode.el @@ -1,6 +1,6 @@ ;;; make-mode.el --- makefile editing commands for Emacs -*- lexical-binding:t -*- -;; Copyright (C) 1992, 1994, 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1992, 1994, 1999-2021 Free Software Foundation, Inc. ;; Author: Thomas Neumann <tom@smart.bo.open.de> ;; Eric S. Raymond <esr@snark.thyrsus.com> diff --git a/lisp/progmodes/meta-mode.el b/lisp/progmodes/meta-mode.el index e15ec721814..9da968c8314 100644 --- a/lisp/progmodes/meta-mode.el +++ b/lisp/progmodes/meta-mode.el @@ -1,6 +1,6 @@ ;;; meta-mode.el --- major mode for editing Metafont or MetaPost sources -*- lexical-binding:t -*- -;; Copyright (C) 1997, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997, 2001-2021 Free Software Foundation, Inc. ;; Author: Ulrik Vieth <vieth@thphy.uni-duesseldorf.de> ;; Version: 1.0 diff --git a/lisp/progmodes/mixal-mode.el b/lisp/progmodes/mixal-mode.el index 1f88e87c651..59e87b87411 100644 --- a/lisp/progmodes/mixal-mode.el +++ b/lisp/progmodes/mixal-mode.el @@ -1,6 +1,6 @@ ;;; mixal-mode.el --- Major mode for the mix asm language. -*- lexical-binding:t -*- -;; Copyright (C) 2003-2020 Free Software Foundation, Inc. +;; Copyright (C) 2003-2021 Free Software Foundation, Inc. ;; Author: Pieter E.J. Pareit <pieter.pareit@gmail.com> ;; Maintainer: Jose A Ortega Ruiz <jao@gnu.org> diff --git a/lisp/progmodes/octave.el b/lisp/progmodes/octave.el index bda4e60c55c..a14a8d75a78 100644 --- a/lisp/progmodes/octave.el +++ b/lisp/progmodes/octave.el @@ -1,6 +1,6 @@ ;;; octave.el --- editing octave source files under emacs -*- lexical-binding: t; -*- -;; Copyright (C) 1997, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997, 2001-2021 Free Software Foundation, Inc. ;; Author: Kurt Hornik <Kurt.Hornik@wu-wien.ac.at> ;; John Eaton <jwe@octave.org> @@ -1512,28 +1512,12 @@ current buffer file unless called with a prefix arg \\[universal-argument]." (interactive "r") (inferior-octave t) (let ((proc inferior-octave-process) - (string (buffer-substring-no-properties beg end)) - line) + (string (buffer-substring-no-properties beg end))) (with-current-buffer inferior-octave-buffer ;; https://lists.gnu.org/r/emacs-devel/2013-10/msg00095.html (compilation-forget-errors) - (setq inferior-octave-output-list nil) - (while (not (string-equal string "")) - (if (string-match "\n" string) - (setq line (substring string 0 (match-beginning 0)) - string (substring string (match-end 0))) - (setq line string string "")) - (setq inferior-octave-receive-in-progress t) - (inferior-octave-send-list-and-digest (list (concat line "\n"))) - (while inferior-octave-receive-in-progress - (accept-process-output proc)) - (insert-before-markers - (mapconcat 'identity - (append - (if octave-send-echo-input (list line) (list "")) - inferior-octave-output-list - (list inferior-octave-output-string)) - "\n"))))) + (insert-before-markers string "\n") + (comint-send-string proc (concat string "\n")))) (if octave-send-show-buffer (display-buffer inferior-octave-buffer))) diff --git a/lisp/progmodes/opascal.el b/lisp/progmodes/opascal.el index 8c060991f42..662d2b4b74f 100644 --- a/lisp/progmodes/opascal.el +++ b/lisp/progmodes/opascal.el @@ -1,6 +1,6 @@ ;;; opascal.el --- major mode for editing Object Pascal source in Emacs -*- lexical-binding: t -*- -;; Copyright (C) 1998-1999, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998-1999, 2001-2021 Free Software Foundation, Inc. ;; Authors: Ray Blaak <blaak@infomatch.com>, ;; Simon South <ssouth@member.fsf.org> diff --git a/lisp/progmodes/pascal.el b/lisp/progmodes/pascal.el index fce059bafc7..59f90d7293b 100644 --- a/lisp/progmodes/pascal.el +++ b/lisp/progmodes/pascal.el @@ -1,6 +1,6 @@ ;;; pascal.el --- major mode for editing pascal source in Emacs -*- lexical-binding: t -*- -;; Copyright (C) 1993-2020 Free Software Foundation, Inc. +;; Copyright (C) 1993-2021 Free Software Foundation, Inc. ;; Author: Espen Skoglund <esk@gnu.org> ;; Keywords: languages diff --git a/lisp/progmodes/perl-mode.el b/lisp/progmodes/perl-mode.el index fd8a51b5a54..ec20b01a0f0 100644 --- a/lisp/progmodes/perl-mode.el +++ b/lisp/progmodes/perl-mode.el @@ -1,6 +1,6 @@ ;;; perl-mode.el --- Perl code editing commands for GNU Emacs -*- lexical-binding:t -*- -;; Copyright (C) 1990, 1994, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1990, 1994, 2001-2021 Free Software Foundation, Inc. ;; Author: William F. Mann ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/progmodes/prog-mode.el b/lisp/progmodes/prog-mode.el index d3d3deae4b1..d88d3505586 100644 --- a/lisp/progmodes/prog-mode.el +++ b/lisp/progmodes/prog-mode.el @@ -1,6 +1,6 @@ ;;; prog-mode.el --- Generic major mode for programming -*- lexical-binding: t -*- -;; Copyright (C) 2013-2020 Free Software Foundation, Inc. +;; Copyright (C) 2013-2021 Free Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org ;; Keywords: internal diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el index 5b58090de02..d417382c0df 100644 --- a/lisp/progmodes/project.el +++ b/lisp/progmodes/project.el @@ -1,6 +1,6 @@ ;;; project.el --- Operations on the current project -*- lexical-binding: t; -*- -;; Copyright (C) 2015-2020 Free Software Foundation, Inc. +;; Copyright (C) 2015-2021 Free Software Foundation, Inc. ;; Version: 0.5.3 ;; Package-Requires: ((emacs "26.3") (xref "1.0.2")) diff --git a/lisp/progmodes/prolog.el b/lisp/progmodes/prolog.el index a4e677ba41d..c8f6c12a3f0 100644 --- a/lisp/progmodes/prolog.el +++ b/lisp/progmodes/prolog.el @@ -1,6 +1,6 @@ ;;; prolog.el --- major mode for Prolog (and Mercury) -*- lexical-binding:t -*- -;; Copyright (C) 1986-1987, 1997-1999, 2002-2003, 2011-2020 Free +;; Copyright (C) 1986-1987, 1997-1999, 2002-2003, 2011-2021 Free ;; Software Foundation, Inc. ;; Authors: Emil Åström <emil_astrom(at)hotmail(dot)com> diff --git a/lisp/progmodes/ps-mode.el b/lisp/progmodes/ps-mode.el index bcf7bfdefc8..15fd2e84393 100644 --- a/lisp/progmodes/ps-mode.el +++ b/lisp/progmodes/ps-mode.el @@ -1,6 +1,6 @@ ;;; ps-mode.el --- PostScript mode for GNU Emacs -;; Copyright (C) 1999, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2001-2021 Free Software Foundation, Inc. ;; Author: Peter Kleiweg <p.c.j.kleiweg@rug.nl> ;; Created: 20 Aug 1997 diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 50bb841111f..0965fecfb74 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -1,6 +1,6 @@ ;;; python.el --- Python's flying circus support for Emacs -*- lexical-binding: t -*- -;; Copyright (C) 2003-2020 Free Software Foundation, Inc. +;; Copyright (C) 2003-2021 Free Software Foundation, Inc. ;; Author: Fabián E. Gallina <fgallina@gnu.org> ;; URL: https://github.com/fgallina/python.el diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el index 45b0f84e332..3effb6ed662 100644 --- a/lisp/progmodes/ruby-mode.el +++ b/lisp/progmodes/ruby-mode.el @@ -1,6 +1,6 @@ ;;; ruby-mode.el --- Major mode for editing Ruby files -*- lexical-binding: t -*- -;; Copyright (C) 1994-2020 Free Software Foundation, Inc. +;; Copyright (C) 1994-2021 Free Software Foundation, Inc. ;; Authors: Yukihiro Matsumoto ;; Nobuyoshi Nakada @@ -32,7 +32,7 @@ ;;; Code: -(eval-when-compile (require 'cl-lib)) +(require 'cl-lib) (defgroup ruby nil "Major mode for editing Ruby code." @@ -101,7 +101,7 @@ "Regexp to match the beginning of a heredoc.") (defconst ruby-expression-expansion-re - "\\(?:[^\\]\\|\\=\\)\\(\\\\\\\\\\)*\\(#\\({[^}\n\\]*\\(\\\\.[^}\n\\]*\\)*}\\|\\(\\$\\|@\\|@@\\)\\(\\w\\|_\\)+\\|\\$[^a-zA-Z \n]\\)\\)")) + "#\\({[^}\n\\]*\\(\\\\.[^}\n\\]*\\)*}\\|\\(?:\\$\\|@\\|@@\\)\\(\\w\\|_\\)+\\|\\$[^a-zA-Z \n]\\)")) (defun ruby-here-doc-end-match () "Return a regexp to find the end of a heredoc. @@ -401,7 +401,10 @@ It is used when `ruby-encoding-magic-comment-style' is set to `custom'." (or (and (bolp) ;; Newline is escaped. (not (eq (char-before (1- (point))) ?\\))) - (memq (char-before) '(?\; ?=))))) + (eq (char-before) ?\;) + (and (eq (char-before) ?=) + (equal (syntax-after (1- (point))) + (string-to-syntax ".")))))) (defun ruby-smie--implicit-semi-p () (save-excursion @@ -595,7 +598,7 @@ It is used when `ruby-encoding-magic-comment-style' is set to `custom'." (`(:before . ,(or "(" "[" "{")) (cond ((and (equal token "{") - (not (smie-rule-prev-p "(" "{" "[" "," "=>" "=" "return" ";")) + (not (smie-rule-prev-p "(" "{" "[" "," "=>" "=" "return" ";" "do")) (save-excursion (forward-comment -1) (not (eq (preceding-char) ?:)))) @@ -1861,10 +1864,18 @@ It will be properly highlighted even when the call omits parens.") 'syntax-table (string-to-syntax "_")) (string-to-syntax "'")))) ;; Symbols with special characters. - ("\\(^\\|[^:]\\)\\(:\\([-+~]@?\\|[/%&|^`]\\|\\*\\*?\\|<\\(<\\|=>?\\)?\\|>[>=]?\\|===?\\|=~\\|![~=]?\\|\\[\\]=?\\)\\)" - (3 (unless (nth 8 (syntax-ppss (match-beginning 3))) + (":\\([-+~]@?\\|[/%&|^`]\\|\\*\\*?\\|<\\(<\\|=>?\\)?\\|>[>=]?\\|===?\\|=~\\|![~=]?\\|\\[\\]=?\\)" + (1 (unless (or + (eq (char-before (match-beginning 0)) ?:) + (nth 8 (syntax-ppss (match-beginning 1)))) (goto-char (match-end 0)) (string-to-syntax "_")))) + ;; Symbols ending with '=' (bug#42846). + (":[[:alpha:]][[:alnum:]_]*\\(=\\)" + (1 (unless (or (nth 8 (syntax-ppss)) + (eq (char-before (match-beginning 0)) ?:) + (eq (char-after (match-end 3)) ?>)) + (string-to-syntax "_")))) ;; Part of method name when at the end of it. ("[!?]" (0 (unless (save-excursion @@ -1879,9 +1890,14 @@ It will be properly highlighted even when the call omits parens.") ;; (semi-important for indentation). ("\\(:\\)\\(?:[({]\\|\\[[^]]\\)" (1 (string-to-syntax "."))) - ;; Regular expressions. Start with matching unescaped slash. - ("\\(?:\\=\\|[^\\]\\)\\(?:\\\\\\\\\\)*\\(/\\)" - (1 (let ((state (save-excursion (syntax-ppss (match-beginning 1))))) + ;; Regular expressions. + ("\\(/\\)" + (1 + ;; No unescaped slashes in front. + (when (save-excursion + (forward-char -1) + (cl-evenp (skip-chars-backward "\\\\"))) + (let ((state (save-excursion (syntax-ppss (match-beginning 1))))) (when (or ;; Beginning of a regexp. (and (null (nth 8 state)) @@ -1894,11 +1910,17 @@ It will be properly highlighted even when the call omits parens.") ;; string interpolation inside, or span ;; several lines. (eq ?/ (nth 3 state))) - (string-to-syntax "\"/"))))) + (string-to-syntax "\"/")))))) ;; Expression expansions in strings. We're handling them ;; here, so that the regexp rule never matches inside them. (ruby-expression-expansion-re - (0 (ignore (ruby-syntax-propertize-expansion)))) + (0 (ignore + (if (save-excursion + (goto-char (match-beginning 0)) + ;; The hash character is not escaped. + (cl-evenp (skip-chars-backward "\\\\"))) + (ruby-syntax-propertize-expansion) + (goto-char (match-beginning 1)))))) ("^=en\\(d\\)\\_>" (1 "!")) ("^\\(=\\)begin\\_>" (1 "!")) ;; Handle here documents. @@ -1988,8 +2010,8 @@ It will be properly highlighted even when the call omits parens.") (defun ruby-syntax-propertize-expansion () ;; Save the match data to a text property, for font-locking later. ;; Set the syntax of all double quotes and backticks to punctuation. - (let* ((beg (match-beginning 2)) - (end (match-end 2)) + (let* ((beg (match-beginning 0)) + (end (match-end 0)) (state (and beg (save-excursion (syntax-ppss beg))))) (when (ruby-syntax-expansion-allowed-p state) (put-text-property beg (1+ beg) 'ruby-expansion-match-data @@ -2181,12 +2203,7 @@ It will be properly highlighted even when the call omits parens.") (0 font-lock-builtin-face)) ;; Symbols. ("\\(^\\|[^:]\\)\\(:@\\{0,2\\}\\(?:\\sw\\|\\s_\\)+\\)" - (2 font-lock-constant-face) - (3 (unless (and (eq (char-before (match-end 3)) ?=) - (eq (char-after (match-end 3)) ?>)) - ;; bug#18644 - font-lock-constant-face) - nil t)) + (2 font-lock-constant-face)) ;; Special globals. (,(concat "\\$\\(?:[:\"!@;,/._><\\$?~=*&`'+0-9]\\|-[0adFiIlpvw]\\|" (regexp-opt '("LOAD_PATH" "LOADED_FEATURES" "PROGRAM_NAME" @@ -2221,7 +2238,7 @@ It will be properly highlighted even when the call omits parens.") (1 font-lock-builtin-face)) ;; Expression expansion. (ruby-match-expression-expansion - 2 font-lock-variable-name-face t) + 0 font-lock-variable-name-face t) ;; Negation char. ("\\(?:^\\|[^[:alnum:]_]\\)\\(!+\\)[^=~]" 1 font-lock-negation-char-face) diff --git a/lisp/progmodes/scheme.el b/lisp/progmodes/scheme.el index 33ba0d11d80..f610efbfca5 100644 --- a/lisp/progmodes/scheme.el +++ b/lisp/progmodes/scheme.el @@ -1,6 +1,6 @@ ;;; scheme.el --- Scheme (and DSSSL) editing mode -*- lexical-binding: t; -*- -;; Copyright (C) 1986-1988, 1997-1998, 2001-2020 Free Software +;; Copyright (C) 1986-1988, 1997-1998, 2001-2021 Free Software ;; Foundation, Inc. ;; Author: Bill Rozas <jinx@martigny.ai.mit.edu> diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el index b7327e75583..a417de32640 100644 --- a/lisp/progmodes/sh-script.el +++ b/lisp/progmodes/sh-script.el @@ -1,6 +1,6 @@ ;;; sh-script.el --- shell-script editing commands for Emacs -*- lexical-binding:t -*- -;; Copyright (C) 1993-1997, 1999, 2001-2020 Free Software Foundation, +;; Copyright (C) 1993-1997, 1999, 2001-2021 Free Software Foundation, ;; Inc. ;; Author: Daniel Pfeiffer <occitan@esperanto.org> diff --git a/lisp/progmodes/simula.el b/lisp/progmodes/simula.el index 44d4a9ca449..7806a6b46c8 100644 --- a/lisp/progmodes/simula.el +++ b/lisp/progmodes/simula.el @@ -1,6 +1,6 @@ ;;; simula.el --- SIMULA 87 code editing commands for Emacs -;; Copyright (C) 1992, 1994, 1996, 2001-2020 Free Software Foundation, +;; Copyright (C) 1992, 1994, 1996, 2001-2021 Free Software Foundation, ;; Inc. ;; Author: Hans Henrik Eriksen <hhe@ifi.uio.no> diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el index 78f8577ef99..4d027f3df53 100644 --- a/lisp/progmodes/sql.el +++ b/lisp/progmodes/sql.el @@ -1,6 +1,6 @@ ;;; sql.el --- specialized comint.el for SQL interpreters -*- lexical-binding: t -*- -;; Copyright (C) 1998-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998-2021 Free Software Foundation, Inc. ;; Author: Alex Schroeder <alex@gnu.org> ;; Maintainer: Michael Mauger <michael@mauger.com> diff --git a/lisp/progmodes/subword.el b/lisp/progmodes/subword.el index b0df90995bf..33b70d83bed 100644 --- a/lisp/progmodes/subword.el +++ b/lisp/progmodes/subword.el @@ -1,6 +1,6 @@ ;;; subword.el --- Handling capitalized subwords in a nomenclature -*- lexical-binding: t -*- -;; Copyright (C) 2004-2020 Free Software Foundation, Inc. +;; Copyright (C) 2004-2021 Free Software Foundation, Inc. ;; Author: Masatake YAMATO diff --git a/lisp/progmodes/tcl.el b/lisp/progmodes/tcl.el index dbf6684b0e9..0a0118a5eba 100644 --- a/lisp/progmodes/tcl.el +++ b/lisp/progmodes/tcl.el @@ -1,6 +1,6 @@ ;;; tcl.el --- Tcl code editing commands for Emacs -*- lexical-binding: t; -*- -;; Copyright (C) 1994, 1998-2020 Free Software Foundation, Inc. +;; Copyright (C) 1994, 1998-2021 Free Software Foundation, Inc. ;; Author: Tom Tromey <tromey@redhat.com> ;; Chris Lindblad <cjl@lcs.mit.edu> diff --git a/lisp/progmodes/vera-mode.el b/lisp/progmodes/vera-mode.el index 8bde89e774e..c2e1719d54a 100644 --- a/lisp/progmodes/vera-mode.el +++ b/lisp/progmodes/vera-mode.el @@ -1,6 +1,6 @@ ;;; vera-mode.el --- major mode for editing Vera files -*- lexical-binding: t; -*- -;; Copyright (C) 1997-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997-2021 Free Software Foundation, Inc. ;; Author: Reto Zimmermann <reto@gnu.org> ;; Version: 2.28 diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el index f6e95b9cb6a..8dddcf0eef0 100644 --- a/lisp/progmodes/verilog-mode.el +++ b/lisp/progmodes/verilog-mode.el @@ -1,6 +1,6 @@ ;;; verilog-mode.el --- major mode for editing verilog source in Emacs -;; Copyright (C) 1996-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996-2021 Free Software Foundation, Inc. ;; Author: Michael McNamara <mac@verilog.com> ;; Wilson Snyder <wsnyder@wsnyder.org> @@ -5193,7 +5193,7 @@ Useful for creating tri's and other expanded fields." (verilog-expand-vector-internal "[" "]")) (defun verilog-expand-vector-internal (bra ket) - "Given BRA, the start brace and KET, the end brace, expand one line into many lines." + "Given start brace BRA, and end brace KET, expand one line into many lines." (save-excursion (forward-line 0) (let ((signal-string (buffer-substring (point) @@ -10450,7 +10450,7 @@ if non-nil." ;; (defun verilog-auto-re-search-do (search-for func) - "Search for the given auto text regexp SEARCH-FOR, and perform FUNC where it occurs." + "Search for given auto text regexp SEARCH-FOR, and perform FUNC where it occurs." (goto-char (point-min)) (while (verilog-re-search-forward-quick search-for nil t) (funcall func))) @@ -10862,7 +10862,8 @@ removed." (defun verilog-delete-auto-buffer () "Perform `verilog-delete-auto' on the current buffer. -Intended for internal use inside a `verilog-save-font-no-change-functions' block." +Intended for internal use inside a +`verilog-save-font-no-change-functions' block." ;; Allow user to customize (verilog-run-hooks 'verilog-before-delete-auto-hook) diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el index 489092f58e6..c4de800e332 100644 --- a/lisp/progmodes/vhdl-mode.el +++ b/lisp/progmodes/vhdl-mode.el @@ -1,6 +1,6 @@ ;;; vhdl-mode.el --- major mode for editing VHDL code -;; Copyright (C) 1992-2020 Free Software Foundation, Inc. +;; Copyright (C) 1992-2021 Free Software Foundation, Inc. ;; Authors: Reto Zimmermann <reto@gnu.org> ;; Rodney J. Whitby <software.vhdl-mode@rwhitby.net> @@ -2286,7 +2286,7 @@ Ignore byte-compiler warnings you might see." (setq contents (nconc (if (and (car dirs) (not full)) - (mapcar (function (lambda (name) (concat (car dirs) name))) + (mapcar (lambda (name) (concat (car dirs) name)) this-dir-contents) this-dir-contents) contents)))) @@ -2563,7 +2563,7 @@ conversion." (defun vhdl-sort-alist (alist) "Sort ALIST." - (sort alist (function (lambda (a b) (string< (car a) (car b)))))) + (sort alist (lambda (a b) (string< (car a) (car b))))) (defun vhdl-get-subdirs (directory) "Recursively get subdirectories of DIRECTORY." @@ -2941,10 +2941,9 @@ STRING are replaced by `-' and substrings are converted to lower case." ;; set up electric character functions to work with ;; `delete-selection-mode' (Emacs) and `pending-delete-mode' (XEmacs) (mapc - (function - (lambda (sym) - (put sym 'delete-selection t) ; for `delete-selection-mode' (Emacs) - (put sym 'pending-delete t))) ; for `pending-delete-mode' (XEmacs) + (lambda (sym) + (put sym 'delete-selection t) ; for `delete-selection-mode' (Emacs) + (put sym 'pending-delete t)) ; for `pending-delete-mode' (XEmacs) '(vhdl-electric-space vhdl-electric-tab vhdl-electric-return @@ -3317,7 +3316,7 @@ STRING are replaced by `-' and substrings are converted to lower case." (setq menu-list (if vhdl-project-sort (sort menu-list - (function (lambda (a b) (string< (elt a 0) (elt b 0))))) + (lambda (a b) (string< (elt a 0) (elt b 0)))) (nreverse menu-list))) (vhdl-menu-split menu-list "Project")) '("--" "--" @@ -5566,9 +5565,8 @@ offset for that syntactic element. Optional ADD-P says to add SYMBOL to (if current-prefix-arg " or add" "") ": ") (mapcar - (function - (lambda (langelem) - (cons (format "%s" (car langelem)) nil))) + (lambda (langelem) + (cons (format "%s" (car langelem)) nil)) vhdl-offsets-alist) nil (not current-prefix-arg) ;; initial contents tries to be the last element @@ -5615,26 +5613,24 @@ argument. The styles are chosen from the `vhdl-style-alist' variable." (error "ERROR: Invalid VHDL indentation style `%s'" style)) ;; set all the variables (mapc - (function - (lambda (varentry) - (let ((var (car varentry)) - (val (cdr varentry))) - ;; special case for vhdl-offsets-alist - (if (not (eq var 'vhdl-offsets-alist)) - (set (if local (make-local-variable var) var) val) - ;; reset vhdl-offsets-alist to the default value first - (set (if local (make-local-variable var) var) - (copy-alist vhdl-offsets-alist-default)) - ;; now set the langelems that are different - (mapcar - (function - (lambda (langentry) - (let ((langelem (car langentry)) - (offset (cdr langentry))) - (vhdl-set-offset langelem offset) - ))) - val)) - ))) + (lambda (varentry) + (let ((var (car varentry)) + (val (cdr varentry))) + ;; special case for vhdl-offsets-alist + (if (not (eq var 'vhdl-offsets-alist)) + (set (if local (make-local-variable var) var) val) + ;; reset vhdl-offsets-alist to the default value first + (set (if local (make-local-variable var) var) + (copy-alist vhdl-offsets-alist-default)) + ;; now set the langelems that are different + (mapcar + (lambda (langentry) + (let ((langelem (car langentry)) + (offset (cdr langentry))) + (vhdl-set-offset langelem offset) + )) + val)) + )) vars)) (vhdl-keep-region-active)) @@ -7578,12 +7574,11 @@ ENDPOS is encountered." (expurgated)) ;; remove the library unit symbols (mapc - (function - (lambda (elt) - (if (memq (car elt) '(entity configuration context package - package-body architecture)) - nil - (setq expurgated (append expurgated (list elt)))))) + (lambda (elt) + (if (memq (car elt) '(entity configuration context package + package-body architecture)) + nil + (setq expurgated (append expurgated (list elt))))) actual) (if (and (not arg) expected (listp expected)) (if (not (equal expected expurgated)) @@ -7950,7 +7945,7 @@ the token in MATCH." (push (cons start length) comment-list)) (beginning-of-line 2)) (setq comment-list - (sort comment-list (function (lambda (a b) (> (car a) (car b)))))) + (sort comment-list (lambda (a b) (> (car a) (car b))))) ;; reduce start positions (setq start-list (list (caar comment-list))) (setq comment-list (cdr comment-list)) @@ -15886,8 +15881,7 @@ NO-POSITION non-nil means do not re-position cursor." (setq path-list-1 (append (mapcar - (function - (lambda (var) (concat path-beg var path-end))) + (lambda (var) (concat path-beg var path-end)) (let ((all-list (vhdl-directory-files (match-string 2 dir) t (concat "\\<" (wildcard-to-regexp @@ -17440,8 +17434,8 @@ specified by a target." (setq tmp-list (cdr tmp-list))) (setq rule-alist ; sort by first rule target (sort rule-alist - (function (lambda (a b) - (string< (car (cadr a)) (car (cadr b))))))) + (lambda (a b) + (string< (car (cadr a)) (car (cadr b)))))) ;; open and clear Makefile (set-buffer (find-file-noselect makefile-path-name t t)) (erase-buffer) @@ -17752,16 +17746,15 @@ specified by a target." 'vhdl-word-completion-in-minibuffer 'vhdl-underscore-is-part-of-word 'vhdl-mode-hook) - (function - (lambda () - (insert - (if vhdl-special-indent-hook - (concat "\n@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n" - "vhdl-special-indent-hook is set to '" - (format "%s" vhdl-special-indent-hook) - ".\nPerhaps this is your problem?\n" - "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n\n") - "\n")))) + (lambda () + (insert + (if vhdl-special-indent-hook + (concat "\n@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n" + "vhdl-special-indent-hook is set to '" + (format "%s" vhdl-special-indent-hook) + ".\nPerhaps this is your problem?\n" + "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n\n") + "\n"))) nil "Hi Reto,")))) diff --git a/lisp/progmodes/which-func.el b/lisp/progmodes/which-func.el index 562a357a8cb..3303257c98c 100644 --- a/lisp/progmodes/which-func.el +++ b/lisp/progmodes/which-func.el @@ -1,6 +1,6 @@ ;;; which-func.el --- print current function in mode line -*- lexical-binding:t -*- -;; Copyright (C) 1994, 1997-1998, 2001-2020 Free Software Foundation, +;; Copyright (C) 1994, 1997-1998, 2001-2021 Free Software Foundation, ;; Inc. ;; Author: Alex Rezinsky <alexr@msil.sps.mot.com> diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el index 181f94b0bc6..29e7b6849fd 100644 --- a/lisp/progmodes/xref.el +++ b/lisp/progmodes/xref.el @@ -1,6 +1,6 @@ ;;; xref.el --- Cross-referencing commands -*-lexical-binding:t-*- -;; Copyright (C) 2014-2020 Free Software Foundation, Inc. +;; Copyright (C) 2014-2021 Free Software Foundation, Inc. ;; Version: 1.0.4 ;; Package-Requires: ((emacs "26.3")) @@ -109,12 +109,20 @@ This is typically the filename.") (defcustom xref-file-name-display 'abs "Style of file name display in *xref* buffers. + If the value is the symbol `abs', the default, show the file names in their full absolute form. + If `nondirectory', show only the nondirectory (a.k.a. \"base name\") -part of the file name." +part of the file name. + +If `project-relative', show only the file name relative to the +current project root. If there is no current project, or if the +file resides outside of its root, show that particular file name +in its full absolute form." :type '(choice (const :tag "absolute file name" abs) - (const :tag "nondirectory file name" nondirectory)) + (const :tag "nondirectory file name" nondirectory) + (const :tag "relative to project root" project-relative)) :version "27.1") ;; FIXME: might be useful to have an optional "hint" i.e. a string to @@ -149,10 +157,31 @@ Line numbers start from 1 and columns from 0.") (forward-char column)) (point-marker)))))) +(defvar xref--project-root-memo nil + "Cons mapping `default-directory' value to the search root.") + (cl-defmethod xref-location-group ((l xref-file-location)) (cl-ecase xref-file-name-display - (abs (oref l file)) - (nondirectory (file-name-nondirectory (oref l file))))) + (abs + (oref l file)) + (nondirectory + (file-name-nondirectory (oref l file))) + (project-relative + (unless (and xref--project-root-memo + (equal (car xref--project-root-memo) + default-directory)) + (setq xref--project-root-memo + (cons default-directory + (let ((root + (let ((pr (project-current))) + (and pr (xref--project-root pr))))) + (and root (expand-file-name root)))))) + (let ((file (oref l file)) + (search-root (cdr xref--project-root-memo))) + (if (and search-root + (string-prefix-p search-root file)) + (substring file (length search-root)) + file))))) (defclass xref-buffer-location (xref-location) ((buffer :type buffer :initarg :buffer) @@ -273,10 +302,7 @@ current project's main and external roots." (xref-references-in-directory identifier dir)) (let ((pr (project-current t))) (cons - (if (fboundp 'project-root) - (project-root pr) - (with-no-warnings - (project-roots pr))) + (xref--project-root pr) (project-external-roots pr))))) (cl-defgeneric xref-backend-apropos (backend pattern) @@ -913,6 +939,12 @@ Return an alist of the form ((FILENAME . (XREF ...)) ...)." (pop-to-buffer (current-buffer)) (current-buffer)))) +(defun xref--project-root (project) + (if (fboundp 'project-root) + (project-root project) + (with-no-warnings + (car (project-roots project))))) + (defun xref--show-common-initialize (xref-alist fetcher alist) (setq buffer-undo-list nil) (let ((inhibit-read-only t) @@ -941,7 +973,10 @@ Return an alist of the form ((FILENAME . (XREF ...)) ...)." 'face 'error)))) (goto-char (point-min))))) -(defun xref--show-defs-buffer (fetcher alist) +(defun xref-show-definitions-buffer (fetcher alist) + "Show the definitions list in a regular window. + +When only one definition found, jump to it right away instead." (let ((xrefs (funcall fetcher))) (cond ((not (cdr xrefs)) @@ -952,8 +987,12 @@ Return an alist of the form ((FILENAME . (XREF ...)) ...)." (cons (cons 'fetched-xrefs xrefs) alist)))))) -(defun xref--show-defs-buffer-at-bottom (fetcher alist) - "Show definitions list in a window at the bottom. +(define-obsolete-function-alias + 'xref--show-defs-buffer #'xref-show-definitions-buffer "28.1") + +(defun xref-show-definitions-buffer-at-bottom (fetcher alist) + "Show the definitions list in a window at the bottom. + When there is more than one definition, split the selected window and show the list in a small window at the bottom. And use a local keymap that binds `RET' to `xref-quit-and-goto-xref'." @@ -970,7 +1009,14 @@ local keymap that binds `RET' to `xref-quit-and-goto-xref'." '(display-buffer-in-direction . ((direction . below)))) (current-buffer)))))) -(defun xref--show-defs-minibuffer (fetcher alist) +(define-obsolete-function-alias + 'xref--show-defs-buffer-at-bottom #'xref-show-definitions-buffer-at-bottom) + +(defun xref-show-definitions-completing-read (fetcher alist) + "Let the user choose the target definition with completion. + +When there is more than one definition, let the user choose +between them by typing in the minibuffer with completion." (let* ((xrefs (funcall fetcher)) (xref-alist (xref--analyze xrefs)) xref-alist-with-line-info @@ -1004,12 +1050,27 @@ local keymap that binds `RET' to `xref-quit-and-goto-xref'." (setq xref (if (not (cdr xrefs)) (car xrefs) - (cdr (assoc (completing-read "Jump to definition: " - (reverse xref-alist-with-line-info)) - xref-alist-with-line-info)))) + (let* ((collection (reverse xref-alist-with-line-info)) + (ctable + (lambda (string pred action) + (cond + ((eq action 'metadata) + '(metadata . ((category . xref-location)))) + (t + (complete-with-action action collection string pred))))) + (def (caar collection))) + (cdr (assoc (completing-read "Choose definition: " + ctable nil t + nil nil + def) + collection))))) (xref-pop-to-location xref (assoc-default 'display-action alist)))) +;; TODO: Can delete this alias before Emacs 28's release. +(define-obsolete-function-alias + 'xref--show-defs-minibuffer #'xref-show-definitions-completing-read "28.1") + (defcustom xref-show-xrefs-function 'xref--show-xref-buffer "Function to display a list of search results. @@ -1030,11 +1091,22 @@ displayed. The possible values are nil, `window' meaning the other window, or `frame' meaning the other frame." :type 'function) -(defcustom xref-show-definitions-function 'xref--show-defs-buffer - "Function to display a list of definitions. - -Accepts the same arguments as `xref-show-xrefs-function'." - :type 'function) +(defcustom xref-show-definitions-function 'xref-show-definitions-buffer + "Function to handle the definition search results. + +Accepts the same arguments as `xref-show-xrefs-function'. + +Generally, it is expected to jump to the definition if there's +only one, and otherwise provide some way to choose among the +definitions." + :type '(choice + (const :tag "Show a regular list of locations" + xref-show-definitions-buffer) + (const :tag "Show a \"transient\" list at the bottom of the window" + xref-show-definitions-buffer-at-bottom) + (const :tag "Choose the definition with completion" + xref-show-definitions-completing-read) + (function :tag "Custom function"))) (defvar xref--read-identifier-history nil) diff --git a/lisp/progmodes/xscheme.el b/lisp/progmodes/xscheme.el index cdbafbaf897..e85e3cfdbbd 100644 --- a/lisp/progmodes/xscheme.el +++ b/lisp/progmodes/xscheme.el @@ -1,6 +1,6 @@ ;;; xscheme.el --- run MIT Scheme under Emacs -*- lexical-binding: t; -*- -;; Copyright (C) 1986-1987, 1989-1990, 2001-2020 Free Software +;; Copyright (C) 1986-1987, 1989-1990, 2001-2021 Free Software ;; Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/ps-bdf.el b/lisp/ps-bdf.el index 9216cfd91e9..7bf2f71822a 100644 --- a/lisp/ps-bdf.el +++ b/lisp/ps-bdf.el @@ -1,6 +1,6 @@ ;;; ps-bdf.el --- BDF font file handler for ps-print -;; Copyright (C) 1998-1999, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998-1999, 2001-2021 Free Software Foundation, Inc. ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, ;; 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) diff --git a/lisp/ps-def.el b/lisp/ps-def.el index 571e1a68c5e..b9c3ab57a26 100644 --- a/lisp/ps-def.el +++ b/lisp/ps-def.el @@ -1,6 +1,6 @@ ;;; ps-def.el --- Emacs definitions for ps-print -*- lexical-binding: t -*- -;; Copyright (C) 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2007-2021 Free Software Foundation, Inc. ;; Author: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com> ;; Kenichi Handa <handa@gnu.org> (multi-byte characters) diff --git a/lisp/ps-mule.el b/lisp/ps-mule.el index cba08737938..db86f9400e7 100644 --- a/lisp/ps-mule.el +++ b/lisp/ps-mule.el @@ -1,6 +1,6 @@ ;;; ps-mule.el --- provide multi-byte character facility to ps-print -;; Copyright (C) 1998-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998-2021 Free Software Foundation, Inc. ;; Author: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com> ;; Kenichi Handa <handa@gnu.org> (multi-byte characters) diff --git a/lisp/ps-print.el b/lisp/ps-print.el index 351c489f487..fcc6e1fd834 100644 --- a/lisp/ps-print.el +++ b/lisp/ps-print.el @@ -1,6 +1,6 @@ ;;; ps-print.el --- print text from the buffer as PostScript -*- lexical-binding: t -*- -;; Copyright (C) 1993-2020 Free Software Foundation, Inc. +;; Copyright (C) 1993-2021 Free Software Foundation, Inc. ;; Author: Jim Thompson (was <thompson@wg2.waii.com>) ;; Jacques Duthen (was <duthen@cegelec-red.fr>) @@ -4114,7 +4114,6 @@ If EXTENSION is any other symbol, it is ignored." (defun ps-message-log-max () (and (not (string= (buffer-name) "*Messages*")) - (boundp 'message-log-max) message-log-max)) diff --git a/lisp/ps-samp.el b/lisp/ps-samp.el index c5dcf494c0b..fdff0f182db 100644 --- a/lisp/ps-samp.el +++ b/lisp/ps-samp.el @@ -1,6 +1,6 @@ ;;; ps-samp.el --- ps-print sample setup code -;; Copyright (C) 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2007-2021 Free Software Foundation, Inc. ;; Author: Jim Thompson (was <thompson@wg2.waii.com>) ;; Jacques Duthen (was <duthen@cegelec-red.fr>) diff --git a/lisp/recentf.el b/lisp/recentf.el index 746363728b0..a28a3977a76 100644 --- a/lisp/recentf.el +++ b/lisp/recentf.el @@ -1,6 +1,6 @@ ;;; recentf.el --- setup a menu of recently opened files -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: David Ponce <david@dponce.com> ;; Created: July 19 1999 diff --git a/lisp/rect.el b/lisp/rect.el index ebf309a88fe..cb941b46009 100644 --- a/lisp/rect.el +++ b/lisp/rect.el @@ -1,6 +1,6 @@ ;;; rect.el --- rectangle functions for GNU Emacs -*- lexical-binding:t -*- -;; Copyright (C) 1985, 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1985, 1999-2021 Free Software Foundation, Inc. ;; Maintainer: Didier Verna <didier@didierverna.net> ;; Keywords: internal diff --git a/lisp/register.el b/lisp/register.el index 2e8989f316f..11d98482cb4 100644 --- a/lisp/register.el +++ b/lisp/register.el @@ -1,6 +1,6 @@ ;;; register.el --- register commands for Emacs -*- lexical-binding: t; -*- -;; Copyright (C) 1985, 1993-1994, 2001-2020 Free Software Foundation, +;; Copyright (C) 1985, 1993-1994, 2001-2021 Free Software Foundation, ;; Inc. ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/registry.el b/lisp/registry.el index ef47f07aec5..a5c30f20efc 100644 --- a/lisp/registry.el +++ b/lisp/registry.el @@ -1,6 +1,6 @@ ;;; registry.el --- Track and remember data items by various fields -;; Copyright (C) 2011-2020 Free Software Foundation, Inc. +;; Copyright (C) 2011-2021 Free Software Foundation, Inc. ;; Author: Teodor Zlatanov <tzz@lifelogs.com> ;; Keywords: data diff --git a/lisp/repeat.el b/lisp/repeat.el index 1dabd76e071..d4888893484 100644 --- a/lisp/repeat.el +++ b/lisp/repeat.el @@ -1,6 +1,6 @@ ;;; repeat.el --- convenient way to repeat the previous command -*- lexical-binding: t -*- -;; Copyright (C) 1998, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998, 2001-2021 Free Software Foundation, Inc. ;; Author: Will Mengarini <seldon@eskimo.com> ;; Created: Mo 02 Mar 98 diff --git a/lisp/replace.el b/lisp/replace.el index 5ebc5493012..d41dc98a0d9 100644 --- a/lisp/replace.el +++ b/lisp/replace.el @@ -1,6 +1,6 @@ ;;; replace.el --- replace commands for Emacs -*- lexical-binding: t -*- -;; Copyright (C) 1985-1987, 1992, 1994, 1996-1997, 2000-2020 Free +;; Copyright (C) 1985-1987, 1992, 1994, 1996-1997, 2000-2021 Free ;; Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/reposition.el b/lisp/reposition.el index 7561cc4c5f3..008fa009fdc 100644 --- a/lisp/reposition.el +++ b/lisp/reposition.el @@ -1,6 +1,6 @@ ;;; reposition.el --- center a Lisp function or comment on the screen -*- lexical-binding: t -*- -;; Copyright (C) 1991, 1994, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1991, 1994, 2001-2021 Free Software Foundation, Inc. ;; Author: Michael D. Ernst <mernst@theory.lcs.mit.edu> ;; Created: Jan 1991 diff --git a/lisp/reveal.el b/lisp/reveal.el index b4558e1bebb..c01afd9739a 100644 --- a/lisp/reveal.el +++ b/lisp/reveal.el @@ -1,6 +1,6 @@ ;;; reveal.el --- Automatically reveal hidden text at point -*- lexical-binding: t -*- -;; Copyright (C) 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 2000-2021 Free Software Foundation, Inc. ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> ;; Keywords: outlines diff --git a/lisp/rfn-eshadow.el b/lisp/rfn-eshadow.el index 0ed1c370983..f9842b52b13 100644 --- a/lisp/rfn-eshadow.el +++ b/lisp/rfn-eshadow.el @@ -1,6 +1,6 @@ ;;; rfn-eshadow.el --- Highlight `shadowed' part of read-file-name input text ;; -;; Copyright (C) 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 2000-2021 Free Software Foundation, Inc. ;; ;; Author: Miles Bader <miles@gnu.org> ;; Keywords: convenience minibuffer diff --git a/lisp/rot13.el b/lisp/rot13.el index 7a1f6077126..dfcf4adc179 100644 --- a/lisp/rot13.el +++ b/lisp/rot13.el @@ -1,6 +1,6 @@ ;;; rot13.el --- display a buffer in ROT13 -*- lexical-binding: t -*- -;; Copyright (C) 1988, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1988, 2001-2021 Free Software Foundation, Inc. ;; Author: Howard Gayle ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/rtree.el b/lisp/rtree.el index b790d050c28..166c7808184 100644 --- a/lisp/rtree.el +++ b/lisp/rtree.el @@ -1,6 +1,6 @@ ;;; rtree.el --- functions for manipulating range trees -*- lexical-binding:t -*- -;; Copyright (C) 2010-2020 Free Software Foundation, Inc. +;; Copyright (C) 2010-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> diff --git a/lisp/ruler-mode.el b/lisp/ruler-mode.el index d97abca9ee7..7cda6c96aff 100644 --- a/lisp/ruler-mode.el +++ b/lisp/ruler-mode.el @@ -1,6 +1,6 @@ ;;; ruler-mode.el --- display a ruler in the header line -;; Copyright (C) 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 2001-2021 Free Software Foundation, Inc. ;; Author: David Ponce <david@dponce.com> ;; Created: 24 Mar 2001 diff --git a/lisp/savehist.el b/lisp/savehist.el index 8931e83243d..b8e9d6b427f 100644 --- a/lisp/savehist.el +++ b/lisp/savehist.el @@ -1,6 +1,6 @@ ;;; savehist.el --- Save minibuffer history -*- lexical-binding:t -*- -;; Copyright (C) 1997, 2005-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997, 2005-2021 Free Software Foundation, Inc. ;; Author: Hrvoje Nikšić <hrvoje.niksic@avl.com> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/saveplace.el b/lisp/saveplace.el index d420bfb4e9f..f654702def4 100644 --- a/lisp/saveplace.el +++ b/lisp/saveplace.el @@ -1,6 +1,6 @@ ;;; saveplace.el --- automatically save place in files -*- lexical-binding:t -*- -;; Copyright (C) 1993-1994, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1993-1994, 2001-2021 Free Software Foundation, Inc. ;; Author: Karl Fogel <kfogel@red-bean.com> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/scroll-all.el b/lisp/scroll-all.el index d6e18aee642..25b245e4b63 100644 --- a/lisp/scroll-all.el +++ b/lisp/scroll-all.el @@ -1,6 +1,6 @@ ;;; scroll-all.el --- scroll all buffers together minor mode -;; Copyright (C) 1997, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997, 2001-2021 Free Software Foundation, Inc. ;; Author: Gary D. Foster <Gary.Foster@corp.sun.com> ;; Keywords: convenience scroll lock diff --git a/lisp/scroll-bar.el b/lisp/scroll-bar.el index 5b829345795..802cb3072fa 100644 --- a/lisp/scroll-bar.el +++ b/lisp/scroll-bar.el @@ -1,6 +1,6 @@ ;;; scroll-bar.el --- window system-independent scroll bar support -;; Copyright (C) 1993-1995, 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1993-1995, 1999-2021 Free Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org ;; Keywords: hardware diff --git a/lisp/scroll-lock.el b/lisp/scroll-lock.el index 31808be4372..e8f69b29565 100644 --- a/lisp/scroll-lock.el +++ b/lisp/scroll-lock.el @@ -1,6 +1,6 @@ ;;; scroll-lock.el --- Scroll lock scrolling. -*- lexical-binding:t -*- -;; Copyright (C) 2005-2020 Free Software Foundation, Inc. +;; Copyright (C) 2005-2021 Free Software Foundation, Inc. ;; Author: Ralf Angeli <angeli@iwi.uni-sb.de> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/select.el b/lisp/select.el index 596335b0ecc..c39bc93deab 100644 --- a/lisp/select.el +++ b/lisp/select.el @@ -1,6 +1,6 @@ ;;; select.el --- lisp portion of standard selection support -*- lexical-binding:t -*- -;; Copyright (C) 1993-1994, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1993-1994, 2001-2021 Free Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org ;; Keywords: internal diff --git a/lisp/server.el b/lisp/server.el index d1183b95d36..b82e301d0aa 100644 --- a/lisp/server.el +++ b/lisp/server.el @@ -1,6 +1,6 @@ ;;; server.el --- Lisp code for GNU Emacs running as server process -*- lexical-binding: t -*- -;; Copyright (C) 1986-1987, 1992, 1994-2020 Free Software Foundation, +;; Copyright (C) 1986-1987, 1992, 1994-2021 Free Software Foundation, ;; Inc. ;; Author: William Sommerfeld <wesommer@athena.mit.edu> diff --git a/lisp/ses.el b/lisp/ses.el index 2a28ad3add7..d6090f3e8d7 100644 --- a/lisp/ses.el +++ b/lisp/ses.el @@ -1,6 +1,6 @@ ;;; ses.el -- Simple Emacs Spreadsheet -*- lexical-binding:t -*- -;; Copyright (C) 2002-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002-2021 Free Software Foundation, Inc. ;; Author: Jonathan Yavner <jyavner@member.fsf.org> ;; Maintainer: Vincent Belaïche <vincentb1@users.sourceforge.net> diff --git a/lisp/shadowfile.el b/lisp/shadowfile.el index a7343a9f943..a4f0eba4449 100644 --- a/lisp/shadowfile.el +++ b/lisp/shadowfile.el @@ -1,6 +1,6 @@ ;;; shadowfile.el --- automatic file copying -;; Copyright (C) 1993-1994, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1993-1994, 2001-2021 Free Software Foundation, Inc. ;; Author: Boris Goldowsky <boris@gnu.org> ;; Keywords: comm files diff --git a/lisp/shell.el b/lisp/shell.el index 5cc9a189c72..c179dd24d3f 100644 --- a/lisp/shell.el +++ b/lisp/shell.el @@ -1,6 +1,6 @@ ;;; shell.el --- specialized comint.el for running the shell -*- lexical-binding: t -*- -;; Copyright (C) 1988, 1993-1997, 2000-2020 Free Software Foundation, +;; Copyright (C) 1988, 1993-1997, 2000-2021 Free Software Foundation, ;; Inc. ;; Author: Olin Shivers <shivers@cs.cmu.edu> diff --git a/lisp/simple.el b/lisp/simple.el index 2b13a0d4867..54c35c04bea 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -1,6 +1,6 @@ ;;; simple.el --- basic editing commands for Emacs -*- lexical-binding: t -*- -;; Copyright (C) 1985-1987, 1993-2020 Free Software Foundation, Inc. +;; Copyright (C) 1985-1987, 1993-2021 Free Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org ;; Keywords: internal diff --git a/lisp/skeleton.el b/lisp/skeleton.el index 5578a937d76..48491e43cae 100644 --- a/lisp/skeleton.el +++ b/lisp/skeleton.el @@ -1,6 +1,6 @@ ;;; skeleton.el --- Lisp language extension for writing statement skeletons -*- lexical-binding: t; -*- -;; Copyright (C) 1993-1996, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1993-1996, 2001-2021 Free Software Foundation, Inc. ;; Author: Daniel Pfeiffer <occitan@esperanto.org> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/so-long.el b/lisp/so-long.el index 417409bc327..f44d41dc5eb 100644 --- a/lisp/so-long.el +++ b/lisp/so-long.el @@ -1,6 +1,6 @@ ;;; so-long.el --- Say farewell to performance problems with minified code. -*- lexical-binding:t -*- ;; -;; Copyright (C) 2015-2016, 2018-2020 Free Software Foundation, Inc. +;; Copyright (C) 2015-2016, 2018-2021 Free Software Foundation, Inc. ;; Author: Phil Sainty <psainty@orcon.net.nz> ;; Maintainer: Phil Sainty <psainty@orcon.net.nz> diff --git a/lisp/sort.el b/lisp/sort.el index b9a27a84e44..0d2fd416649 100644 --- a/lisp/sort.el +++ b/lisp/sort.el @@ -1,6 +1,6 @@ ;;; sort.el --- commands to sort text in an Emacs buffer -*- lexical-binding: t -*- -;; Copyright (C) 1986-1987, 1994-1995, 2001-2020 Free Software +;; Copyright (C) 1986-1987, 1994-1995, 2001-2021 Free Software ;; Foundation, Inc. ;; Author: Howie Kaye diff --git a/lisp/soundex.el b/lisp/soundex.el index fac63b160eb..ed98c65e809 100644 --- a/lisp/soundex.el +++ b/lisp/soundex.el @@ -1,6 +1,6 @@ ;;; soundex.el --- implement Soundex algorithm -*- lexical-binding: t -*- -;; Copyright (C) 1993, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1993, 2001-2021 Free Software Foundation, Inc. ;; Author: Christian Plaunt <chris@bliss.berkeley.edu> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/speedbar.el b/lisp/speedbar.el index e2cfe9861a5..7f751ec3476 100644 --- a/lisp/speedbar.el +++ b/lisp/speedbar.el @@ -1,6 +1,6 @@ ;;; speedbar --- quick access to files and tags in a frame -;; Copyright (C) 1996-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> ;; Keywords: file, tags, tools diff --git a/lisp/startup.el b/lisp/startup.el index 5fe1e30166d..c6dafe60b89 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -1,6 +1,6 @@ ;;; startup.el --- process Emacs shell arguments -*- lexical-binding: t -*- -;; Copyright (C) 1985-1986, 1992, 1994-2020 Free Software Foundation, +;; Copyright (C) 1985-1986, 1992, 1994-2021 Free Software Foundation, ;; Inc. ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/strokes.el b/lisp/strokes.el index 044872068f4..b0ab4f990f6 100644 --- a/lisp/strokes.el +++ b/lisp/strokes.el @@ -1,6 +1,6 @@ ;;; strokes.el --- control Emacs through mouse strokes -;; Copyright (C) 1997, 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997, 2000-2021 Free Software Foundation, Inc. ;; Author: David Bakhash <cadet@alum.mit.edu> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/subr.el b/lisp/subr.el index eaebdf663d8..9ed77c7317b 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -1,6 +1,6 @@ ;;; subr.el --- basic lisp subroutines for Emacs -*- lexical-binding:t -*- -;; Copyright (C) 1985-1986, 1992, 1994-1995, 1999-2020 Free Software +;; Copyright (C) 1985-1986, 1992, 1994-1995, 1999-2021 Free Software ;; Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org @@ -1980,9 +1980,8 @@ can do the job." "Add ELEMENT to the value of LIST-VAR if it isn't there yet. The test for presence of ELEMENT is done with `eq'. -The resulting list is reordered so that the elements are in the -order given by each element's numeric list order. Elements -without a numeric list order are placed at the end of the list. +The value of LIST-VAR is kept ordered based on the ORDER +parameter. If the third optional argument ORDER is a number (integer or float), set the element's list order to the given value. If @@ -2631,6 +2630,10 @@ This function is used by the `interactive' code letter `n'." t))) n)) +(defvar read-char-choice-use-read-key nil + "Prefer `read-key' when reading a character by `read-char-choice'. +Otherwise, use the minibuffer.") + (defun read-char-choice (prompt chars &optional inhibit-keyboard-quit) "Read and return one of CHARS, prompting for PROMPT. Any input that is not one of CHARS is ignored. @@ -2641,44 +2644,46 @@ keyboard-quit events while waiting for a valid input. If you bind the variable `help-form' to a non-nil value while calling this function, then pressing `help-char' causes it to evaluate `help-form' and display the result." - (unless (consp chars) - (error "Called `read-char-choice' without valid char choices")) - (let (char done show-help (helpbuf " *Char Help*")) - (let ((cursor-in-echo-area t) - (executing-kbd-macro executing-kbd-macro) - (esc-flag nil)) - (save-window-excursion ; in case we call help-form-show - (while (not done) - (unless (get-text-property 0 'face prompt) - (setq prompt (propertize prompt 'face 'minibuffer-prompt))) - (setq char (let ((inhibit-quit inhibit-keyboard-quit)) - (read-key prompt))) - (and show-help (buffer-live-p (get-buffer helpbuf)) - (kill-buffer helpbuf)) - (cond - ((not (numberp char))) - ;; If caller has set help-form, that's enough. - ;; They don't explicitly have to add help-char to chars. - ((and help-form - (eq char help-char) - (setq show-help t) - (help-form-show))) - ((memq char chars) - (setq done t)) - ((and executing-kbd-macro (= char -1)) - ;; read-event returns -1 if we are in a kbd macro and - ;; there are no more events in the macro. Attempt to - ;; get an event interactively. - (setq executing-kbd-macro nil)) - ((not inhibit-keyboard-quit) - (cond - ((and (null esc-flag) (eq char ?\e)) - (setq esc-flag t)) - ((memq char '(?\C-g ?\e)) - (keyboard-quit)))))))) - ;; Display the question with the answer. But without cursor-in-echo-area. - (message "%s%s" prompt (char-to-string char)) - char)) + (if (not read-char-choice-use-read-key) + (read-char-from-minibuffer prompt chars) + (unless (consp chars) + (error "Called `read-char-choice' without valid char choices")) + (let (char done show-help (helpbuf " *Char Help*")) + (let ((cursor-in-echo-area t) + (executing-kbd-macro executing-kbd-macro) + (esc-flag nil)) + (save-window-excursion ; in case we call help-form-show + (while (not done) + (unless (get-text-property 0 'face prompt) + (setq prompt (propertize prompt 'face 'minibuffer-prompt))) + (setq char (let ((inhibit-quit inhibit-keyboard-quit)) + (read-key prompt))) + (and show-help (buffer-live-p (get-buffer helpbuf)) + (kill-buffer helpbuf)) + (cond + ((not (numberp char))) + ;; If caller has set help-form, that's enough. + ;; They don't explicitly have to add help-char to chars. + ((and help-form + (eq char help-char) + (setq show-help t) + (help-form-show))) + ((memq char chars) + (setq done t)) + ((and executing-kbd-macro (= char -1)) + ;; read-event returns -1 if we are in a kbd macro and + ;; there are no more events in the macro. Attempt to + ;; get an event interactively. + (setq executing-kbd-macro nil)) + ((not inhibit-keyboard-quit) + (cond + ((and (null esc-flag) (eq char ?\e)) + (setq esc-flag t)) + ((memq char '(?\C-g ?\e)) + (keyboard-quit)))))))) + ;; Display the question with the answer. But without cursor-in-echo-area. + (message "%s%s" prompt (char-to-string char)) + char))) (defun sit-for (seconds &optional nodisp obsolete) "Redisplay, then wait for SECONDS seconds. Stop when input is available. @@ -2925,6 +2930,10 @@ Also discard all previous input in the minibuffer." (minibuffer-message "Please answer y or n") (sit-for 2))) +(defvar y-or-n-p-use-read-key nil + "Prefer `read-key' when answering a \"y or n\" question by `y-or-n-p'. +Otherwise, use the minibuffer.") + (defvar empty-history) (defun y-or-n-p (prompt) @@ -2985,6 +2994,41 @@ is nil and `use-dialog-box' is non-nil." use-dialog-box) (setq prompt (funcall padded prompt t) answer (x-popup-dialog t `(,prompt ("Yes" . act) ("No" . skip))))) + (y-or-n-p-use-read-key + ;; ¡Beware! when I tried to edebug this code, Emacs got into a weird state + ;; where all the keys were unbound (i.e. it somehow got triggered + ;; within read-key, apparently). I had to kill it. + (setq prompt (funcall padded prompt)) + (while + (let* ((scroll-actions '(recenter scroll-up scroll-down + scroll-other-window scroll-other-window-down)) + (key + (let ((cursor-in-echo-area t)) + (when minibuffer-auto-raise + (raise-frame (window-frame (minibuffer-window)))) + (read-key (propertize (if (memq answer scroll-actions) + prompt + (concat "Please answer y or n. " + prompt)) + 'face 'minibuffer-prompt))))) + (setq answer (lookup-key query-replace-map (vector key) t)) + (cond + ((memq answer '(skip act)) nil) + ((eq answer 'recenter) + (recenter) t) + ((eq answer 'scroll-up) + (ignore-errors (scroll-up-command)) t) + ((eq answer 'scroll-down) + (ignore-errors (scroll-down-command)) t) + ((eq answer 'scroll-other-window) + (ignore-errors (scroll-other-window)) t) + ((eq answer 'scroll-other-window-down) + (ignore-errors (scroll-other-window-down)) t) + ((or (memq answer '(exit-prefix quit)) (eq key ?\e)) + (signal 'quit nil) t) + (t t))) + (ding) + (discard-input))) (t (setq prompt (funcall padded prompt)) (let* ((empty-history '()) @@ -5978,4 +6022,22 @@ seconds." ;; Continue running. nil))) +(defun internal--fill-string-single-line (str) + "Fill string STR to `fill-column'. +This is intended for very simple filling while bootstrapping +Emacs itself, and does not support all the customization options +of fill.el (for example `fill-region')." + (if (< (string-width str) fill-column) + str + (let ((fst (substring str 0 fill-column)) + (lst (substring str fill-column))) + (if (string-match ".*\\( \\(.+\\)\\)$" fst) + (setq fst (replace-match "\n\\2" nil nil fst 1))) + (concat fst (internal--fill-string-single-line lst))))) + +(defun internal--format-docstring-line (string &rest objects) + "Format a documentation string out of STRING and OBJECTS. +This is intended for internal use only." + (internal--fill-string-single-line (apply #'format string objects))) + ;;; subr.el ends here diff --git a/lisp/svg.el b/lisp/svg.el index 1ca59658aa7..717c84788f0 100644 --- a/lisp/svg.el +++ b/lisp/svg.el @@ -1,6 +1,6 @@ ;;; svg.el --- SVG image creation functions -*- lexical-binding: t -*- -;; Copyright (C) 2014-2020 Free Software Foundation, Inc. +;; Copyright (C) 2014-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Felix E. Klee <felix.klee@inka.de> diff --git a/lisp/t-mouse.el b/lisp/t-mouse.el index 4feab71401e..ec36f543789 100644 --- a/lisp/t-mouse.el +++ b/lisp/t-mouse.el @@ -4,7 +4,7 @@ ;; Maintainer: emacs-devel@gnu.org ;; Keywords: mouse gpm linux -;; Copyright (C) 1994-1995, 1998, 2006-2020 Free Software Foundation, +;; Copyright (C) 1994-1995, 1998, 2006-2021 Free Software Foundation, ;; Inc. ;; This file is part of GNU Emacs. diff --git a/lisp/tab-bar.el b/lisp/tab-bar.el index 8c649bd507a..935c97e2a41 100644 --- a/lisp/tab-bar.el +++ b/lisp/tab-bar.el @@ -1,6 +1,6 @@ ;;; tab-bar.el --- frame-local tabs with named persistent window configurations -*- lexical-binding: t; -*- -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; Author: Juri Linkov <juri@linkov.net> ;; Keywords: frames tabs diff --git a/lisp/tab-line.el b/lisp/tab-line.el index c9444718536..2726947a4c2 100644 --- a/lisp/tab-line.el +++ b/lisp/tab-line.el @@ -1,6 +1,6 @@ ;;; tab-line.el --- window-local tabs with window buffers -*- lexical-binding: t; -*- -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; Author: Juri Linkov <juri@linkov.net> ;; Keywords: windows tabs diff --git a/lisp/tabify.el b/lisp/tabify.el index 7408fe1e233..f7360313fc6 100644 --- a/lisp/tabify.el +++ b/lisp/tabify.el @@ -1,6 +1,6 @@ ;;; tabify.el --- tab conversion commands for Emacs -*- lexical-binding: t -*- -;; Copyright (C) 1985, 1994, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1985, 1994, 2001-2021 Free Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org ;; Package: emacs diff --git a/lisp/talk.el b/lisp/talk.el index a18cf263435..473f8ac9218 100644 --- a/lisp/talk.el +++ b/lisp/talk.el @@ -1,6 +1,6 @@ ;;; talk.el --- allow several users to talk to each other through Emacs -;; Copyright (C) 1995, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1995, 2001-2021 Free Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org ;; Keywords: comm, frames diff --git a/lisp/tar-mode.el b/lisp/tar-mode.el index 608d997863b..cd53d7b6ff4 100644 --- a/lisp/tar-mode.el +++ b/lisp/tar-mode.el @@ -1,6 +1,6 @@ ;;; tar-mode.el --- simple editing of tar files from GNU Emacs -*- lexical-binding:t -*- -;; Copyright (C) 1990-1991, 1993-2020 Free Software Foundation, Inc. +;; Copyright (C) 1990-1991, 1993-2021 Free Software Foundation, Inc. ;; Author: Jamie Zawinski <jwz@lucid.com> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/tempo.el b/lisp/tempo.el index 9ee0eefc4ae..87e274a527c 100644 --- a/lisp/tempo.el +++ b/lisp/tempo.el @@ -1,6 +1,6 @@ ;;; tempo.el --- Flexible template insertion -*- lexical-binding: t; -*- -;; Copyright (C) 1994-1995, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1994-1995, 2001-2021 Free Software Foundation, Inc. ;; Author: David Kågedal <davidk@lysator.liu.se> ;; Created: 16 Feb 1994 diff --git a/lisp/term.el b/lisp/term.el index d73a9b0d01c..8a560e85d58 100644 --- a/lisp/term.el +++ b/lisp/term.el @@ -1,6 +1,6 @@ ;;; term.el --- general command interpreter in a window stuff -*- lexical-binding: t -*- -;; Copyright (C) 1988, 1990, 1992, 1994-1995, 2001-2020 Free Software +;; Copyright (C) 1988, 1990, 1992, 1994-1995, 2001-2021 Free Software ;; Foundation, Inc. ;; Author: Per Bothner <per@bothner.com> diff --git a/lisp/term/AT386.el b/lisp/term/AT386.el index 8ce7fbbcafd..3bedde503f6 100644 --- a/lisp/term/AT386.el +++ b/lisp/term/AT386.el @@ -1,6 +1,6 @@ ;;; AT386.el --- terminal support package for IBM AT keyboards -*- lexical-binding: t -*- -;; Copyright (C) 1992, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1992, 2001-2021 Free Software Foundation, Inc. ;; Author: Eric S. Raymond <esr@snark.thyrsus.com> ;; Keywords: terminals diff --git a/lisp/term/README b/lisp/term/README index 6276adc6809..9e986bd8bcb 100644 --- a/lisp/term/README +++ b/lisp/term/README @@ -1,4 +1,4 @@ -Copyright (C) 1993, 2001-2020 Free Software Foundation, Inc. +Copyright (C) 1993, 2001-2021 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/lisp/term/common-win.el b/lisp/term/common-win.el index 92f3f42f05c..8d5cb191dd8 100644 --- a/lisp/term/common-win.el +++ b/lisp/term/common-win.el @@ -1,6 +1,6 @@ ;;; common-win.el --- common part of handling window systems -;; Copyright (C) 1993-1994, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1993-1994, 2001-2021 Free Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org ;; Keywords: terminals diff --git a/lisp/term/internal.el b/lisp/term/internal.el index 9a6f4fac1ee..fd75ded081f 100644 --- a/lisp/term/internal.el +++ b/lisp/term/internal.el @@ -1,6 +1,6 @@ ;;; internal.el --- support for PC internal terminal -*- lexical-binding: t -*- -;; Copyright (C) 1993-1994, 1998-1999, 2001-2020 Free Software +;; Copyright (C) 1993-1994, 1998-1999, 2001-2021 Free Software ;; Foundation, Inc. ;; Author: Morten Welinder <terra@diku.dk> diff --git a/lisp/term/iris-ansi.el b/lisp/term/iris-ansi.el index 7a92aa7adaa..e5b94eab76b 100644 --- a/lisp/term/iris-ansi.el +++ b/lisp/term/iris-ansi.el @@ -1,6 +1,6 @@ ;;; iris-ansi.el --- configure Emacs for SGI xwsh and winterm apps -*- lexical-binding: t -*- -;; Copyright (C) 1997, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997, 2001-2021 Free Software Foundation, Inc. ;; Author: Dan Nicolaescu <dann@ics.uci.edu> diff --git a/lisp/term/konsole.el b/lisp/term/konsole.el index 4af818b4a63..e38a5d34e75 100644 --- a/lisp/term/konsole.el +++ b/lisp/term/konsole.el @@ -1,5 +1,5 @@ ;;; konsole.el --- terminal initialization for konsole -*- lexical-binding:t -*- -;; Copyright (C) 2017-2020 Free Software Foundation, Inc. +;; Copyright (C) 2017-2021 Free Software Foundation, Inc. (require 'term/xterm) diff --git a/lisp/term/news.el b/lisp/term/news.el index 33c7aa6ccaa..40aa58ef1c8 100644 --- a/lisp/term/news.el +++ b/lisp/term/news.el @@ -1,6 +1,6 @@ ;;; news.el --- keypad and function key bindings for the Sony NEWS keyboard -*- lexical-binding: t -*- -;; Copyright (C) 1989, 1993, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1989, 1993, 2001-2021 Free Software Foundation, Inc. ;; Author: FSF ;; Keywords: terminals diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el index 99cead99237..5f4dd9ef587 100644 --- a/lisp/term/ns-win.el +++ b/lisp/term/ns-win.el @@ -1,6 +1,6 @@ ;;; ns-win.el --- lisp side of interface with NeXT/Open/GNUstep/macOS window system -*- lexical-binding: t -*- -;; Copyright (C) 1993-1994, 2005-2020 Free Software Foundation, Inc. +;; Copyright (C) 1993-1994, 2005-2021 Free Software Foundation, Inc. ;; Authors: Carl Edman ;; Christian Limpach diff --git a/lisp/term/pc-win.el b/lisp/term/pc-win.el index 76a48a86c73..8cff2ceaeec 100644 --- a/lisp/term/pc-win.el +++ b/lisp/term/pc-win.el @@ -1,6 +1,6 @@ ;;; pc-win.el --- setup support for `PC windows' (whatever that is) -*- lexical-binding:t -*- -;; Copyright (C) 1994, 1996-1997, 1999, 2001-2020 Free Software +;; Copyright (C) 1994, 1996-1997, 1999, 2001-2021 Free Software ;; Foundation, Inc. ;; Author: Morten Welinder <terra@diku.dk> diff --git a/lisp/term/rxvt.el b/lisp/term/rxvt.el index 71ee9086937..9671e95aeb4 100644 --- a/lisp/term/rxvt.el +++ b/lisp/term/rxvt.el @@ -1,6 +1,6 @@ ;;; rxvt.el --- define function key sequences and standard colors for rxvt -*- lexical-binding: t -*- -;; Copyright (C) 2002-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002-2021 Free Software Foundation, Inc. ;; Author: Eli Zaretskii ;; Keywords: terminals diff --git a/lisp/term/screen.el b/lisp/term/screen.el index 0623aa7b54b..04481e8358b 100644 --- a/lisp/term/screen.el +++ b/lisp/term/screen.el @@ -1,5 +1,5 @@ ;;; screen.el --- terminal initialization for screen and tmux -*- lexical-binding: t -*- -;; Copyright (C) 1995, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1995, 2001-2021 Free Software Foundation, Inc. (require 'term/xterm) diff --git a/lisp/term/st.el b/lisp/term/st.el index 617664bb263..08432c414af 100644 --- a/lisp/term/st.el +++ b/lisp/term/st.el @@ -1,6 +1,6 @@ ;;; st.el --- terminal initialization for st -*- lexical-binding:t -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;;; Commentary: diff --git a/lisp/term/sun.el b/lisp/term/sun.el index 7d1cd9f2cfe..3dfd4c697a2 100644 --- a/lisp/term/sun.el +++ b/lisp/term/sun.el @@ -1,6 +1,6 @@ ;;; sun.el --- keybinding for standard default sunterm keys -*- lexical-binding: t -*- -;; Copyright (C) 1987, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1987, 2001-2021 Free Software Foundation, Inc. ;; Author: Jeff Peck <peck@sun.com> ;; Keywords: terminals diff --git a/lisp/term/tmux.el b/lisp/term/tmux.el index b67f9357e02..aa0c98364f3 100644 --- a/lisp/term/tmux.el +++ b/lisp/term/tmux.el @@ -1,5 +1,5 @@ ;;; tmux.el --- terminal initialization for tmux -*- lexical-binding: t -*- -;; Copyright (C) 2017-2020 Free Software Foundation, Inc. +;; Copyright (C) 2017-2021 Free Software Foundation, Inc. (require 'term/xterm) diff --git a/lisp/term/tty-colors.el b/lisp/term/tty-colors.el index dda7fcc3691..1aeaffbbc01 100644 --- a/lisp/term/tty-colors.el +++ b/lisp/term/tty-colors.el @@ -1,6 +1,6 @@ ;;; tty-colors.el --- color support for character terminals -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: Eli Zaretskii ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/term/tvi970.el b/lisp/term/tvi970.el index fc8ad80ae5c..4447657d44f 100644 --- a/lisp/term/tvi970.el +++ b/lisp/term/tvi970.el @@ -1,6 +1,6 @@ ;;; tvi970.el --- terminal support for the Televideo 970 -*- lexical-binding: t -*- -;; Copyright (C) 1992, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1992, 2001-2021 Free Software Foundation, Inc. ;; Author: Jim Blandy <jimb@occs.cs.oberlin.edu> ;; Keywords: terminals diff --git a/lisp/term/vt100.el b/lisp/term/vt100.el index 2df14145231..5e32e297921 100644 --- a/lisp/term/vt100.el +++ b/lisp/term/vt100.el @@ -1,6 +1,6 @@ ;;; vt100.el --- define VT100 function key sequences in function-key-map -*- lexical-binding:t -*- -;; Copyright (C) 1989, 1993, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1989, 1993, 2001-2021 Free Software Foundation, Inc. ;; Author: FSF ;; Keywords: terminals diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el index 1fcfca5dfdd..23f6ed89c6f 100644 --- a/lisp/term/w32-win.el +++ b/lisp/term/w32-win.el @@ -1,6 +1,6 @@ ;;; w32-win.el --- parse switches controlling interface with W32 window system -*- lexical-binding: t -*- -;; Copyright (C) 1993-1994, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1993-1994, 2001-2021 Free Software Foundation, Inc. ;; Author: Kevin Gallo ;; Keywords: terminals diff --git a/lisp/term/w32console.el b/lisp/term/w32console.el index 36e9d896c77..8859f13bd20 100644 --- a/lisp/term/w32console.el +++ b/lisp/term/w32console.el @@ -1,6 +1,6 @@ ;;; w32console.el -- Setup w32 console keys and colors. -;; Copyright (C) 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2007-2021 Free Software Foundation, Inc. ;; Author: FSF ;; Keywords: terminals diff --git a/lisp/term/wyse50.el b/lisp/term/wyse50.el index f06563ebebf..d3b0fdad24b 100644 --- a/lisp/term/wyse50.el +++ b/lisp/term/wyse50.el @@ -1,6 +1,6 @@ ;;; wyse50.el --- terminal support code for Wyse 50 -*- lexical-binding: t -*- -;; Copyright (C) 1989, 1993-1994, 2001-2020 Free Software Foundation, +;; Copyright (C) 1989, 1993-1994, 2001-2021 Free Software Foundation, ;; Inc. ;; Author: Daniel Pfeiffer <occitan@esperanto.org>, diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el index 6069272604c..e4521ff1876 100644 --- a/lisp/term/x-win.el +++ b/lisp/term/x-win.el @@ -1,6 +1,6 @@ ;;; x-win.el --- parse relevant switches and set up for X -*- lexical-binding:t -*- -;; Copyright (C) 1993-1994, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1993-1994, 2001-2021 Free Software Foundation, Inc. ;; Author: FSF ;; Keywords: terminals, i18n diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el index 709410064b1..eeaf805930b 100644 --- a/lisp/term/xterm.el +++ b/lisp/term/xterm.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-2021 Free Software Foundation, Inc. ;; Author: FSF ;; Keywords: terminals @@ -710,15 +710,18 @@ Return the pasted text as a string." (while (and (setq chr (xterm--read-event-for-query)) (not (equal chr ?c))) (setq str (concat str (string chr)))) ;; Since xterm-280, the terminal type (NUMBER1) is now 41 instead of 0. - (when (string-match "\\([0-9]+\\);\\([0-9]+\\);0" str) + (when (string-match "\\([0-9]+\\);\\([0-9]+\\);[01]" str) (let ((version (string-to-number (match-string 2 str)))) - (when (and (> version 2000) (equal (match-string 1 str) "1")) + (when (and (> version 2000) + (or (equal (match-string 1 str) "1") + (equal (match-string 1 str) "65"))) ;; Hack attack! bug#16988: gnome-terminal reports "1;NNNN;0" ;; with a large NNNN but is based on a rather old xterm code. ;; Gnome terminal 2.32.1 reports 1;2802;0 ;; Gnome terminal 3.6.1 reports 1;3406;0 ;; Gnome terminal 3.22.2 reports 1;4601;0 and *does* support ;; background color querying (Bug#29716). + ;; Gnome terminal 3.38.0 reports 65;6200;1. (when (> version 4000) (xterm--query "\e]11;?\e\\" '(("\e]11;" . xterm--report-background-handler)))) diff --git a/lisp/textmodes/artist.el b/lisp/textmodes/artist.el index cc2eaf1e4e9..ce620821d65 100644 --- a/lisp/textmodes/artist.el +++ b/lisp/textmodes/artist.el @@ -1,6 +1,6 @@ ;;; artist.el --- draw ascii graphics with your mouse -*- lexical-binding: t -*- -;; Copyright (C) 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 2000-2021 Free Software Foundation, Inc. ;; Author: Tomas Abrahamsson <tab@lysator.liu.se> ;; Keywords: mouse diff --git a/lisp/textmodes/bib-mode.el b/lisp/textmodes/bib-mode.el index 5b4fa34a1ac..1e22287d32e 100644 --- a/lisp/textmodes/bib-mode.el +++ b/lisp/textmodes/bib-mode.el @@ -1,6 +1,6 @@ ;;; bib-mode.el --- major mode for editing bib files -;; Copyright (C) 1989, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1989, 2001-2021 Free Software Foundation, Inc. ;; Author: Henry Kautz ;; (according to authors.el) diff --git a/lisp/textmodes/bibtex-style.el b/lisp/textmodes/bibtex-style.el index 41650eb4371..66d245f9083 100644 --- a/lisp/textmodes/bibtex-style.el +++ b/lisp/textmodes/bibtex-style.el @@ -1,6 +1,6 @@ ;;; bibtex-style.el --- Major mode for BibTeX Style files -*- lexical-binding: t -*- -;; Copyright (C) 2005, 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2005, 2007-2021 Free Software Foundation, Inc. ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> ;; Keywords: tex diff --git a/lisp/textmodes/bibtex.el b/lisp/textmodes/bibtex.el index cf193ca9b10..d238b6037e7 100644 --- a/lisp/textmodes/bibtex.el +++ b/lisp/textmodes/bibtex.el @@ -1,6 +1,6 @@ ;;; bibtex.el --- BibTeX mode for GNU Emacs -*- lexical-binding: t -*- -;; Copyright (C) 1992, 1994-1999, 2001-2020 Free Software Foundation, +;; Copyright (C) 1992, 1994-1999, 2001-2021 Free Software Foundation, ;; Inc. ;; Author: Stefan Schoef <schoef@offis.uni-oldenburg.de> @@ -477,280 +477,376 @@ COMMENT is the comment string that appears in the echo area. If COMMENT is nil use `bibtex-BibTeX-field-alist' if possible. INIT is either the initial content of the field or a function, which is called to determine the initial content of the field. -ALTERNATIVE if non-nil is an integer that numbers sets of -alternatives, starting from zero." +ALTERNATIVE if non-nil is an integer N that numbers sets of +alternatives. A negative integer -N indicates an alias for the +field +N. Such aliases are ignored by `bibtex-entry' in the template +for a new entry." :group 'bibtex - :version "26.1" ; add Conference + :version "28.1" ; extend alternatives :type 'bibtex-entry-alist :risky t) (defcustom bibtex-biblatex-entry-alist ;; Compare in biblatex documentation: ;; Sec. 2.1.1 Regular types (required and optional fields) + ;; Sec. 2.2.5 Field Aliases ;; Appendix A Default Crossref setup '(("Article" "Article in Journal" - (("author") ("title") ("journaltitle") - ("year" nil nil 0) ("date" nil nil 0)) + (("author") ("title") + ("journaltitle" nil nil 3) ("journal" nil nil -3) + ("date" nil nil 1) ("year" nil nil -1)) nil (("translator") ("annotator") ("commentator") ("subtitle") ("titleaddon") ("editor") ("editora") ("editorb") ("editorc") ("journalsubtitle") ("journaltitleaddon") ("issuetitle") ("issuesubtitle") ("issuetitleaddon") ("language") ("origlanguage") ("series") ("volume") ("number") ("eid") ("issue") ("month") ("pages") ("version") ("note") ("issn") - ("addendum") ("pubstate") ("doi") ("eprint") ("eprintclass") - ("eprinttype") ("url") ("urldate"))) + ("addendum") ("pubstate") ("doi") + ("eprint") ("eprintclass" nil nil 4) ("primaryclass" nil nil -4) + ("eprinttype" nil nil 5) ("archiveprefix" nil nil -5) + ("url") ("urldate"))) ("Book" "Single-Volume Book" - (("author") ("title") ("year" nil nil 0) ("date" nil nil 0)) + (("author") ("title") + ("date" nil nil 1) ("year" nil nil -1)) nil (("editor") ("editora") ("editorb") ("editorc") ("translator") ("annotator") ("commentator") ("introduction") ("foreword") ("afterword") ("subtitle") ("titleaddon") ("maintitle") ("mainsubtitle") ("maintitleaddon") ("language") ("origlanguage") ("volume") ("part") ("edition") ("volumes") - ("series") ("number") ("note") ("publisher") ("location") ("isbn") ("eid") + ("series") ("number") ("note") ("publisher") + ("location" nil nil 2) ("address" nil nil -2) ("isbn") ("eid") ("chapter") ("pages") ("pagetotal") ("addendum") ("pubstate") ("doi") - ("eprint") ("eprintclass") ("eprinttype") ("url") ("urldate"))) + ("eprint") ("eprintclass" nil nil 4) ("primaryclass" nil nil -4) + ("eprinttype" nil nil 5) ("archiveprefix" nil nil -5) + ("url") ("urldate"))) ("MVBook" "Multi-Volume Book" - (("author") ("title") ("year" nil nil 0) ("date" nil nil 0)) + (("author") ("title") + ("date" nil nil 1) ("year" nil nil -1)) nil (("editor") ("editora") ("editorb") ("editorc") ("translator") ("annotator") ("commentator") ("introduction") ("foreword") ("afterword") ("subtitle") ("titleaddon") ("language") ("origlanguage") ("edition") ("volumes") ("series") ("number") ("note") ("publisher") - ("location") ("isbn") ("pagetotal") ("addendum") ("pubstate") ("doi") - ("eprint") ("eprintclass") ("eprinttype") ("url") ("urldate"))) + ("location" nil nil 2) ("address" nil nil -2) + ("isbn") ("pagetotal") ("addendum") ("pubstate") ("doi") + ("eprint") ("eprintclass" nil nil 4) ("primaryclass" nil nil -4) + ("eprinttype" nil nil 5) ("archiveprefix" nil nil -5) + ("url") ("urldate"))) ("InBook" "Chapter or Pages in a Book" - (("title") ("year" nil nil 0) ("date" nil nil 0)) + (("title") ("date" nil nil 1) ("year" nil nil -1)) (("author") ("booktitle")) (("bookauthor") ("editor") ("editora") ("editorb") ("editorc") ("translator") ("annotator") ("commentator") ("introduction") ("foreword") ("afterword") ("subtitle") ("titleaddon") ("maintitle") ("mainsubtitle") ("maintitleaddon") ("booksubtitle") ("booktitleaddon") ("language") ("origlanguage") ("volume") ("part") ("edition") ("volumes") - ("series") ("number") ("note") ("publisher") ("location") ("isbn") ("eid") - ("chapter") ("pages") ("addendum") ("pubstate") - ("doi") ("eprint") ("eprintclass") ("eprinttype") ("url") ("urldate"))) + ("series") ("number") ("note") ("publisher") + ("location" nil nil 2) ("address" nil nil -2) ("isbn") ("eid") + ("chapter") ("pages") ("addendum") ("pubstate") ("doi") + ("eprint") ("eprintclass" nil nil 4) ("primaryclass" nil nil -4) + ("eprinttype" nil nil 5) ("archiveprefix" nil nil -5) + ("url") ("urldate"))) ("BookInBook" "Book in Collection" ; same as @inbook - (("title") ("year" nil nil 0) ("date" nil nil 0)) + (("title") ("date" nil nil 1) ("year" nil nil -1)) (("author") ("booktitle")) (("bookauthor") ("editor") ("editora") ("editorb") ("editorc") ("translator") ("annotator") ("commentator") ("introduction") ("foreword") ("afterword") ("subtitle") ("titleaddon") ("maintitle") ("mainsubtitle") ("maintitleaddon") ("booksubtitle") ("booktitleaddon") ("language") ("origlanguage") ("volume") ("part") ("edition") ("volumes") - ("series") ("number") ("note") ("publisher") ("location") ("isbn") ("eid") - ("chapter") ("pages") ("addendum") ("pubstate") - ("doi") ("eprint") ("eprintclass") ("eprinttype") ("url") ("urldate"))) + ("series") ("number") ("note") ("publisher") + ("location" nil nil 2) ("address" nil nil -2) ("isbn") ("eid") + ("chapter") ("pages") ("addendum") ("pubstate") ("doi") + ("eprint") ("eprintclass" nil nil 4) ("primaryclass" nil nil -4) + ("eprinttype" nil nil 5) ("archiveprefix" nil nil -5) + ("url") ("urldate"))) ("SuppBook" "Supplemental Material in a Book" ; same as @inbook - (("title") ("year" nil nil 0) ("date" nil nil 0)) + (("title") ("date" nil nil 1) ("year" nil nil -1)) (("author") ("booktitle")) (("bookauthor") ("editor") ("editora") ("editorb") ("editorc") ("translator") ("annotator") ("commentator") ("introduction") ("foreword") ("afterword") ("subtitle") ("titleaddon") ("maintitle") ("mainsubtitle") ("maintitleaddon") ("booksubtitle") ("booktitleaddon") ("language") ("origlanguage") ("volume") ("part") ("edition") ("volumes") - ("series") ("number") ("note") ("publisher") ("location") ("isbn") ("eid") - ("chapter") ("pages") ("addendum") ("pubstate") - ("doi") ("eprint") ("eprintclass") ("eprinttype") ("url") ("urldate"))) + ("series") ("number") ("note") ("publisher") + ("location" nil nil 2) ("address" nil nil -2) ("isbn") ("eid") + ("chapter") ("pages") ("addendum") ("pubstate") ("doi") + ("eprint")("eprintclass" nil nil 4) ("primaryclass" nil nil -4) + ("eprinttype" nil nil 5) ("archiveprefix" nil nil -5) + ("url") ("urldate"))) ("Booklet" "Booklet (Bound, but no Publisher)" (("author" nil nil 0) ("editor" nil nil 0) ("title") - ("year" nil nil 1) ("date" nil nil 1)) + ("date" nil nil 1) ("year" nil nil -1)) nil (("subtitle") ("titleaddon") ("language") ("howpublished") ("type") - ("note") ("location") ("eid") ("chapter") ("pages") ("pagetotal") - ("addendum") ("pubstate") ("doi") ("eprint") ("eprintclass") - ("eprinttype") ("url") ("urldate"))) + ("note") ("location" nil nil 2) ("address" nil nil -2) + ("eid") ("chapter") ("pages") ("pagetotal") + ("addendum") ("pubstate") ("doi") + ("eprint") ("eprintclass" nil nil 4) ("primaryclass" nil nil -4) + ("eprinttype" nil nil 5) ("archiveprefix" nil nil -5) + ("url") ("urldate"))) ("Collection" "Single-Volume Collection" - (("editor") ("title") ("year" nil nil 0) ("date" nil nil 0)) + (("editor") ("title") + ("date" nil nil 1) ("year" nil nil -1)) nil (("editora") ("editorb") ("editorc") ("translator") ("annotator") ("commentator") ("introduction") ("foreword") ("afterword") ("subtitle") ("titleaddon") ("maintitle") ("mainsubtitle") ("maintitleaddon") ("language") ("origlanguage") ("volume") ("part") ("edition") ("volumes") ("series") ("number") ("note") - ("publisher") ("location") ("isbn") ("eid") ("chapter") ("pages") - ("pagetotal") ("addendum") ("pubstate") ("doi") ("eprint") ("eprintclass") - ("eprinttype") ("url") ("urldate"))) + ("publisher") ("location" nil nil 2) ("address" nil nil -2) + ("isbn") ("eid") ("chapter") ("pages") + ("pagetotal") ("addendum") ("pubstate") ("doi") + ("eprint") ("eprintclass" nil nil 4) ("primaryclass" nil nil -4) + ("eprinttype" nil nil 5) ("archiveprefix" nil nil -5) + ("url") ("urldate"))) ("MVCollection" "Multi-Volume Collection" - (("editor") ("title") ("year" nil nil 0) ("date" nil nil 0)) + (("editor") ("title") + ("date" nil nil 1) ("year" nil nil -1)) nil (("editora") ("editorb") ("editorc") ("translator") ("annotator") ("commentator") ("introduction") ("foreword") ("afterword") ("subtitle") ("titleaddon") ("language") ("origlanguage") ("edition") ("volumes") ("series") ("number") ("note") ("publisher") - ("location") ("isbn") ("pagetotal") ("addendum") ("pubstate") ("doi") - ("eprint") ("eprintclass") ("eprinttype") ("url") ("urldate"))) + ("location" nil nil 2) ("address" nil nil -2) + ("isbn") ("pagetotal") ("addendum") ("pubstate") ("doi") + ("eprint") ("eprintclass" nil nil 4) ("primaryclass" nil nil -4) + ("eprinttype" nil nil 5) ("archiveprefix" nil nil -5) + ("url") ("urldate"))) ("InCollection" "Article in a Collection" - (("author") ("title") ("year" nil nil 0) ("date" nil nil 0)) + (("author") ("title") + ("date" nil nil 1) ("year" nil nil -1)) (("booktitle")) (("editor") ("editora") ("editorb") ("editorc") ("translator") ("annotator") ("commentator") ("introduction") ("foreword") ("afterword") ("subtitle") ("titleaddon") ("maintitle") ("mainsubtitle") ("maintitleaddon") ("booksubtitle") ("booktitleaddon") ("language") ("origlanguage") ("volume") ("part") ("edition") - ("volumes") ("series") ("number") ("note") ("publisher") ("location") + ("volumes") ("series") ("number") ("note") ("publisher") + ("location" nil nil 2) ("address" nil nil -2) ("isbn") ("eid") ("chapter") ("pages") ("addendum") ("pubstate") ("doi") - ("eprint") ("eprintclass") ("eprinttype") ("url") ("urldate"))) + ("eprint") ("eprintclass" nil nil 4) ("primaryclass" nil nil -4) + ("eprinttype" nil nil 5) ("archiveprefix" nil nil -5) + ("url") ("urldate"))) ("SuppCollection" "Supplemental Material in a Collection" ; same as @incollection - (("author") ("title") ("year" nil nil 0) ("date" nil nil 0)) + (("author") ("title") + ("date" nil nil 1) ("year" nil nil -1)) (("booktitle")) (("editor") ("editora") ("editorb") ("editorc") ("translator") ("annotator") ("commentator") ("introduction") ("foreword") ("afterword") ("subtitle") ("titleaddon") ("maintitle") ("mainsubtitle") ("maintitleaddon") ("booksubtitle") ("booktitleaddon") ("language") ("origlanguage") ("volume") ("part") ("edition") - ("volumes") ("series") ("number") ("note") ("publisher") ("location") + ("volumes") ("series") ("number") ("note") ("publisher") + ("location" nil nil 2) ("address" nil nil -2) ("isbn") ("eid") ("chapter") ("pages") ("addendum") ("pubstate") ("doi") - ("eprint") ("eprintclass") ("eprinttype") ("url") ("urldate"))) + ("eprint") ("eprintclass" nil nil 4) ("primaryclass" nil nil -4) + ("eprinttype" nil nil 5) ("archiveprefix" nil nil -5) + ("url") ("urldate"))) ("Dataset" "Data Set" (("author" nil nil 0) ("editor" nil nil 0) ("title") - ("year" nil nil 1) ("date" nil nil 1)) + ("date" nil nil 1) ("year" nil nil -1)) nil (("subtitle") ("titleaddon") ("language") ("edition") ("type") ("series") ("number") ("version") ("note") ("organization") ("publisher") - ("location") ("addendum") ("pubstate") ("doi") ("eprint") ("eprintclass") - ("eprinttype") ("url") ("urldate"))) + ("location" nil nil 2) ("address" nil nil -2) + ("addendum") ("pubstate") ("doi") + ("eprint") ("eprintclass" nil nil 4) ("primaryclass" nil nil -4) + ("eprinttype" nil nil 5) ("archiveprefix" nil nil -5) + ("url") ("urldate"))) ("Manual" "Technical Manual" (("author" nil nil 0) ("editor" nil nil 0) ("title") - ("year" nil nil 1) ("date" nil nil 1)) + ("date" nil nil 1) ("year" nil nil -1)) nil (("subtitle") ("titleaddon") ("language") ("edition") ("type") ("series") ("number") ("version") ("note") - ("organization") ("publisher") ("location") ("isbn") ("eid") ("chapter") - ("pages") ("pagetotal") ("addendum") ("pubstate") - ("doi") ("eprint") ("eprintclass") ("eprinttype") ("url") ("urldate"))) + ("organization") ("publisher") + ("location" nil nil 2) ("address" nil nil -2) + ("isbn") ("eid") ("chapter") + ("pages") ("pagetotal") ("addendum") ("pubstate") ("doi") + ("eprint") ("eprintclass" nil nil 4) ("primaryclass" nil nil -4) + ("eprinttype" nil nil 5) ("archiveprefix" nil nil -5) + ("url") ("urldate"))) ("Misc" "Miscellaneous" (("author" nil nil 0) ("editor" nil nil 0) ("title") - ("year" nil nil 1) ("date" nil nil 1)) + ("date" nil nil 1) ("year" nil nil -1)) nil (("subtitle") ("titleaddon") ("language") ("howpublished") ("type") - ("version") ("note") ("organization") ("location") - ("month") ("addendum") ("pubstate") - ("doi") ("eprint") ("eprintclass") ("eprinttype") ("url") ("urldate"))) + ("version") ("note") ("organization") + ("location" nil nil 2) ("address" nil nil -2) + ("month") ("addendum") ("pubstate") ("doi") + ("eprint") ("eprintclass" nil nil 4) ("primaryclass" nil nil -4) + ("eprinttype" nil nil 5) ("archiveprefix" nil nil -5) + ("url") ("urldate"))) ("Online" "Online Resource" (("author" nil nil 0) ("editor" nil nil 0) ("title") - ("year" nil nil 1) ("date" nil nil 1) + ("date" nil nil 1) ("year" nil nil -1) ("doi" nil nil 2) ("eprint" nil nil 2) ("url" nil nil 2)) nil (("subtitle") ("titleaddon") ("language") ("version") ("note") ("organization") ("month") ("addendum") - ("pubstate") ("eprintclass") ("eprinttype") ("urldate"))) + ("pubstate") ("eprintclass" nil nil 4) ("primaryclass" nil nil -4) + ("eprinttype" nil nil 5) ("archiveprefix" nil nil -5) ("urldate"))) ("Patent" "Patent" - (("author") ("title") ("number") ("year" nil nil 0) ("date" nil nil 0)) + (("author") ("title") ("number") + ("date" nil nil 1) ("year" nil nil -1)) nil - (("holder") ("subtitle") ("titleaddon") ("type") ("version") ("location") - ("note") ("month") ("addendum") ("pubstate") - ("doi") ("eprint") ("eprintclass") ("eprinttype") ("url") ("urldate"))) + (("holder") ("subtitle") ("titleaddon") ("type") ("version") + ("location" nil nil 2) ("address" nil nil -2) + ("note") ("month") ("addendum") ("pubstate") ("doi") + ("eprint") ("eprintclass" nil nil 4) ("primaryclass" nil nil -4) + ("eprinttype" nil nil 5) ("archiveprefix" nil nil -5) + ("url") ("urldate"))) ("Periodical" "Complete Issue of a Periodical" - (("editor") ("title") ("year" nil nil 0) ("date" nil nil 0)) + (("editor") ("title") + ("date" nil nil 1) ("year" nil nil -1)) nil (("editora") ("editorb") ("editorc") ("subtitle") ("titleaddon") ("issuetitle") ("issuesubtitle") ("issuetitleaddon") ("language") ("series") ("volume") ("number") ("issue") - ("month") ("note") ("issn") ("addendum") ("pubstate") - ("doi") ("eprint") ("eprintclass") ("eprinttype") ("url") ("urldate"))) + ("month") ("note") ("issn") ("addendum") ("pubstate") ("doi") + ("eprint") ("eprintclass" nil nil 4) ("primaryclass" nil nil -4) + ("eprinttype" nil nil 5) ("archiveprefix" nil nil -5) + ("url") ("urldate"))) ("SuppPeriodical" "Supplemental Material in a Periodical" ; same as @article - (("author") ("title") ("journaltitle") - ("year" nil nil 0) ("date" nil nil 0)) + (("author") ("title") + ("journaltitle" nil nil 3) ("journal" nil nil -3) + ("date" nil nil 1) ("year" nil nil -1)) nil (("translator") ("annotator") ("commentator") ("subtitle") ("titleaddon") ("editor") ("editora") ("editorb") ("editorc") ("journalsubtitle") ("journaltitleaddon") ("issuetitle") ("issuesubtitle") ("issuetitleaddon") ("language") ("origlanguage") ("series") ("volume") ("number") ("eid") ("issue") ("month") ("pages") ("version") ("note") ("issn") - ("addendum") ("pubstate") ("doi") ("eprint") ("eprintclass") - ("eprinttype") ("url") ("urldate"))) + ("addendum") ("pubstate") ("doi") + ("eprint") ("eprintclass" nil nil 4) ("primaryclass" nil nil -4) + ("eprinttype" nil nil 5) ("archiveprefix" nil nil -5) + ("url") ("urldate"))) ("Proceedings" "Single-Volume Conference Proceedings" - (("title") ("year" nil nil 0) ("date" nil nil 0)) + (("title") ("date" nil nil 1) ("year" nil nil -1)) nil (("editor") ("subtitle") ("titleaddon") ("maintitle") ("mainsubtitle") ("maintitleaddon") ("eventtitle") ("eventtitleaddon") ("eventdate") ("venue") ("language") ("volume") ("part") ("volumes") ("series") - ("number") ("note") ("organization") ("publisher") ("location") ("month") + ("number") ("note") ("organization") ("publisher") + ("location" nil nil 2) ("address" nil nil -2) ("month") ("isbn") ("eid") ("chapter") ("pages") ("pagetotal") ("addendum") - ("pubstate") ("doi") ("eprint") ("eprintclass") ("eprinttype") ("url") - ("urldate"))) + ("pubstate") ("doi") + ("eprint") ("eprintclass" nil nil 4) ("primaryclass" nil nil -4) + ("eprinttype" nil nil 5) ("archiveprefix" nil nil -5) + ("url") ("urldate"))) ("MVProceedings" "Multi-Volume Conference Proceedings" - (("title") ("year" nil nil 0) ("date" nil nil 0)) + (("title") ("date" nil nil 1) ("year" nil nil -1)) nil (("editor") ("subtitle") ("titleaddon") ("eventtitle") ("eventtitleaddon") ("eventdate") ("venue") ("language") ("volumes") ("series") ("number") - ("note") ("organization") ("publisher") ("location") ("month") - ("isbn") ("pagetotal") ("addendum") ("pubstate") - ("doi") ("eprint") ("eprintclass") ("eprinttype") ("url") ("urldate"))) + ("note") ("organization") ("publisher") + ("location" nil nil 2) ("address" nil nil -2) ("month") + ("isbn") ("pagetotal") ("addendum") ("pubstate") ("doi") + ("eprint") ("eprintclass" nil nil 4) ("primaryclass" nil nil -4) + ("eprinttype" nil nil 5) ("archiveprefix" nil nil -5) + ("url") ("urldate"))) ("InProceedings" "Article in Conference Proceedings" - (("author") ("title") ("year" nil nil 0) ("date" nil nil 0)) + (("author") ("title") + ("date" nil nil 1) ("year" nil nil -1)) (("booktitle")) (("editor") ("subtitle") ("titleaddon") ("maintitle") ("mainsubtitle") ("maintitleaddon") ("booksubtitle") ("booktitleaddon") ("eventtitle") ("eventtitleaddon") ("eventdate") ("venue") ("language") ("volume") ("part") ("volumes") ("series") ("number") ("note") - ("organization") ("publisher") ("location") ("month") ("isbn") ("eid") - ("chapter") ("pages") ("addendum") ("pubstate") - ("doi") ("eprint") ("eprintclass") ("eprinttype") ("url") ("urldate"))) + ("organization") ("publisher") + ("location" nil nil 2) ("address" nil nil -2) ("month") ("isbn") ("eid") + ("chapter") ("pages") ("addendum") ("pubstate") ("doi") + ("eprint") ("eprintclass" nil nil 4) ("primaryclass" nil nil -4) + ("eprinttype" nil nil 5) ("archiveprefix" nil nil -5) + ("url") ("urldate"))) ("Reference" "Single-Volume Work of Reference" ; same as @collection - (("editor") ("title") ("year" nil nil 0) ("date" nil nil 0)) + (("editor") ("title") ("date" nil nil 1) ("year" nil nil -1)) nil (("editora") ("editorb") ("editorc") ("translator") ("annotator") ("commentator") ("introduction") ("foreword") ("afterword") ("subtitle") ("titleaddon") ("maintitle") ("mainsubtitle") ("maintitleaddon") ("language") ("origlanguage") ("volume") ("part") ("edition") ("volumes") ("series") ("number") ("note") - ("publisher") ("location") ("isbn") ("eid") ("chapter") ("pages") - ("pagetotal") ("addendum") ("pubstate") ("doi") ("eprint") ("eprintclass") - ("eprinttype") ("url") ("urldate"))) + ("publisher") ("location" nil nil 2) ("address" nil nil -2) + ("isbn") ("eid") ("chapter") ("pages") + ("pagetotal") ("addendum") ("pubstate") ("doi") + ("eprint") ("eprintclass" nil nil 4) ("primaryclass" nil nil -4) + ("eprinttype" nil nil 5) ("archiveprefix" nil nil -5) + ("url") ("urldate"))) ("MVReference" "Multi-Volume Work of Reference" ; same as @mvcollection - (("editor") ("title") ("year" nil nil 0) ("date" nil nil 0)) + (("editor") ("title") ("date" nil nil 1) ("year" nil nil -1)) nil (("editora") ("editorb") ("editorc") ("translator") ("annotator") ("commentator") ("introduction") ("foreword") ("afterword") ("subtitle") ("titleaddon") ("language") ("origlanguage") ("edition") ("volumes") ("series") ("number") ("note") ("publisher") - ("location") ("isbn") ("pagetotal") ("addendum") ("pubstate") ("doi") - ("eprint") ("eprintclass") ("eprinttype") ("url") ("urldate"))) + ("location" nil nil 2) ("address" nil nil -2) + ("isbn") ("pagetotal") ("addendum") ("pubstate") ("doi") + ("eprint") ("eprintclass" nil nil 4) ("primaryclass" nil nil -4) + ("eprinttype" nil nil 5) ("archiveprefix" nil nil -5) + ("url") ("urldate"))) ("InReference" "Article in a Work of Reference" ; same as @incollection - (("author") ("title") ("year" nil nil 0) ("date" nil nil 0)) + (("author") ("title") ("date" nil nil 1) ("year" nil nil -1)) (("booktitle")) (("editor") ("editora") ("editorb") ("editorc") ("translator") ("annotator") ("commentator") ("introduction") ("foreword") ("afterword") ("subtitle") ("titleaddon") ("maintitle") ("mainsubtitle") ("maintitleaddon") ("booksubtitle") ("booktitleaddon") ("language") ("origlanguage") ("volume") ("part") ("edition") - ("volumes") ("series") ("number") ("note") ("publisher") ("location") + ("volumes") ("series") ("number") ("note") ("publisher") + ("location" nil nil 2) ("address" nil nil -2) ("isbn") ("eid") ("chapter") ("pages") ("addendum") ("pubstate") ("doi") - ("eprint") ("eprintclass") ("eprinttype") ("url") ("urldate"))) + ("eprint") ("eprintclass" nil nil 4) ("primaryclass" nil nil -4) + ("eprinttype" nil nil 5) ("archiveprefix" nil nil -5) + ("url") ("urldate"))) ("Report" "Technical or Research Report" - (("author") ("title") ("type") ("institution") - ("year" nil nil 0) ("date" nil nil 0)) + (("author") ("title") ("type") + ("institution" nil nil 6) ("school" nil nil -6) + ("date" nil nil 1) ("year" nil nil -1)) nil (("subtitle") ("titleaddon") ("language") ("number") ("version") ("note") - ("location") ("month") ("isrn") ("eid") ("chapter") ("pages") - ("pagetotal") ("addendum") ("pubstate") - ("doi") ("eprint") ("eprintclass") ("eprinttype") ("url") ("urldate"))) + ("location" nil nil 2) ("address" nil nil -2) + ("month") ("isrn") ("eid") ("chapter") ("pages") + ("pagetotal") ("addendum") ("pubstate") ("doi") + ("eprint") ("eprintclass" nil nil 4) ("primaryclass" nil nil -4) + ("eprinttype" nil nil 5) ("archiveprefix" nil nil -5) + ("url") ("urldate"))) ("Software" "Computer Software" ; Same as @misc. (("author" nil nil 0) ("editor" nil nil 0) ("title") - ("year" nil nil 1) ("date" nil nil 1)) + ("date" nil nil 1) ("year" nil nil -1)) nil (("subtitle") ("titleaddon") ("language") ("howpublished") ("type") - ("version") ("note") ("organization") ("location") - ("month") ("addendum") ("pubstate") - ("doi") ("eprint") ("eprintclass") ("eprinttype") ("url") ("urldate"))) + ("version") ("note") ("organization") + ("location" nil nil 2) ("address" nil nil -2) + ("month") ("addendum") ("pubstate") ("doi") + ("eprint") ("eprintclass" nil nil 4) ("primaryclass" nil nil -4) + ("eprinttype" nil nil 5) ("archiveprefix" nil nil -5) + ("url") ("urldate"))) ("Thesis" "PhD or Master's Thesis" - (("author") ("title") ("type") ("institution") - ("year" nil nil 0) ("date" nil nil 0)) + (("author") ("title") ("type") + ("institution" nil nil 6) ("school" nil nil -6) + ("date" nil nil 1) ("year" nil nil -1)) nil - (("subtitle") ("titleaddon") ("language") ("note") ("location") + (("subtitle") ("titleaddon") ("language") ("note") + ("location" nil nil 2) ("address" nil nil -2) ("month") ("isbn") ("eid") ("chapter") ("pages") ("pagetotal") - ("addendum") ("pubstate") - ("doi") ("eprint") ("eprintclass") ("eprinttype") ("url") ("urldate"))) + ("addendum") ("pubstate") ("doi") + ("eprint") ("eprintclass" nil nil 4) ("primaryclass" nil nil -4) + ("eprinttype" nil nil 5) ("archiveprefix" nil nil -5) + ("url") ("urldate"))) ("Unpublished" "Unpublished" - (("author") ("title") ("year" nil nil 0) ("date" nil nil 0)) + (("author") ("title") ("date" nil nil 1) ("year" nil nil -1)) nil (("subtitle") ("titleaddon") ("type") ("eventtitle") ("eventtitleaddon") ("eventdate") ("venue") ("language") ("howpublished") ("note") - ("location") ("isbn") ("month") ("addendum") ("pubstate") ("doi") - ("eprint") ("eprintclass") ("eprinttype") ("url") ("urldate")))) + ("location" nil nil 2) ("address" nil nil -2) + ("isbn") ("month") ("addendum") ("pubstate") ("doi") + ("eprint") ("eprintclass" nil nil 4) ("primaryclass" nil nil -4) + ("eprinttype" nil nil 5) ("archiveprefix" nil nil -5) + ("url") ("urldate")))) "Alist of biblatex entry types and their associated fields. It has the same format as `bibtex-BibTeX-entry-alist'." :group 'bibtex @@ -2328,10 +2424,6 @@ Optional arg COMMA is as in `bibtex-enclosing-field'." "Add NEWELT to the list stored in VEC at index IDX." (aset vec idx (cons newelt (aref vec idx)))) -(defsubst bibtex-vec-incr (vec idx) - "Increment by 1 the counter which is stored in VEC at index IDX." - (aset vec idx (1+ (aref vec idx)))) - (defun bibtex-format-entry () "Helper function for `bibtex-clean-entry'. Formats current entry according to variable `bibtex-entry-format'." @@ -2352,7 +2444,8 @@ Formats current entry according to variable `bibtex-entry-format'." strings sort-fields) bibtex-entry-format)) (left-delim-re (regexp-quote (bibtex-field-left-delimiter))) - bounds crossref-key req-field-list default-field-list field-list + bounds crossref-key req-field-list opt-field-list + default-field-list field-list num-alt alt-fields idx error-field-name) (unwind-protect ;; formatting (undone if error occurs) @@ -2399,16 +2492,22 @@ Formats current entry according to variable `bibtex-entry-format'." ;; list of required fields appropriate for an entry with ;; or without crossref key. - (setq req-field-list (if crossref-key (nth 2 entry-list) - (append (nth 2 entry-list) (nth 3 entry-list))) + (setq req-field-list (append (nth 2 entry-list) + (unless crossref-key + (nth 3 entry-list))) + opt-field-list (append (if crossref-key + (nth 3 entry-list)) + (nth 4 entry-list) + bibtex-user-optional-fields) ;; default list of fields that may appear in this entry - default-field-list (append (nth 2 entry-list) (nth 3 entry-list) - (nth 4 entry-list) - bibtex-user-optional-fields) - ;; number of ALT fields we expect to find - num-alt (length (delq nil (delete-dups - (mapcar (lambda (x) (nth 3 x)) - req-field-list)))) + default-field-list (append req-field-list opt-field-list) + ;; number of ALT fields we may find + num-alt (let ((n 0)) + (mapc (lambda (x) + (if (nth 3 x) + (setq n (max n (abs (nth 3 x)))))) + default-field-list) + (1+ n)) ;; ALT fields of respective groups alt-fields (make-vector num-alt nil)) @@ -2447,8 +2546,9 @@ Formats current entry according to variable `bibtex-entry-format'." (if opt-alt (setq field-name (substring field-name 3))) ;; keep track of alternatives - (if (setq idx (nth 3 (assoc-string field-name req-field-list t))) - (bibtex-vec-push alt-fields idx field-name)) + (if (and (not empty-field) + (setq idx (nth 3 (assoc-string field-name default-field-list t)))) + (bibtex-vec-push alt-fields (abs idx) field-name)) (if (memq 'opts-or-alts format) ;; delete empty optional and alternative fields @@ -2597,34 +2697,34 @@ Formats current entry according to variable `bibtex-entry-format'." ;; check whether all required fields are present (when (memq 'required-fields format) - (let ((alt-expect (make-vector num-alt nil)) - (alt-found (make-vector num-alt 0))) + (let ((alt-expect (make-vector num-alt nil))) (dolist (fname req-field-list) - (cond ((setq idx (nth 3 fname)) - ;; t if field has alternative flag - (bibtex-vec-push alt-expect idx (car fname)) - (if (member-ignore-case (car fname) field-list) - (bibtex-vec-incr alt-found idx))) + (cond ((nth 3 fname) + ;; t if required field has alternative flag + (setq idx (abs (nth 3 fname))) + (bibtex-vec-push alt-expect idx (car fname))) ((not (member-ignore-case (car fname) field-list)) - ;; If we use the crossref field, a required field - ;; can have the OPT prefix. So if it was empty, - ;; we have deleted by now. Nonetheless we can - ;; move point on this empty field. - (setq error-field-name (car fname)) + (setq error-field-name (car fname)) (user-error "Mandatory field `%s' is missing" (car fname))))) (dotimes (idx num-alt) - (cond ((= 0 (aref alt-found idx)) + (cond ((and (aref alt-expect idx) + (not (aref alt-fields idx))) (setq error-field-name (car (last (aref alt-fields idx)))) - (user-error "Alternative mandatory field `%s' is missing" - (aref alt-expect idx))) - ((< 1 (aref alt-found idx)) + (user-error "Alternative mandatory fields `%s' are missing" + (mapconcat 'identity + (reverse + (aref alt-expect idx)) + ", "))) + ((nth 1 (aref alt-fields idx)) (setq error-field-name (car (last (aref alt-fields idx)))) - (user-error "Alternative fields `%s' are defined %s times" - (aref alt-expect idx) - (length (aref alt-fields idx)))))))) + (user-error "Fields `%s' are alternatives" + (mapconcat 'identity + (reverse + (aref alt-fields idx)) + ", "))))))) ;; update comma after last field (if (memq 'last-comma format) @@ -3653,8 +3753,7 @@ and `bibtex-user-optional-fields'." (setq required (append (nth 2 e-list) (nth 3 e-list)) optional (nth 4 e-list))) (if bibtex-include-OPTkey - (push (list "key" - "Crossref key" + (push (list "key" "Used as label with certain BibTeX styles" (if (or (stringp bibtex-include-OPTkey) (functionp bibtex-include-OPTkey)) bibtex-include-OPTkey)) @@ -3663,7 +3762,41 @@ and `bibtex-user-optional-fields'." (push '("crossref" "Reference key of the cross-referenced entry") optional)) (setq optional (append optional bibtex-user-optional-fields)) - (cons required optional))) + (cons (bibtex--skip-field-aliases required) + (bibtex--skip-field-aliases optional)))) + +(defun bibtex--skip-field-aliases (list) + "Skip fields in LIST that are aliases, return the shortened list. +Aliases are fields for which the element ALTERNATIVE is a negative number, +see `bibtex-BibTeX-entry-alist'. The shortened field list is used +for the templates of `bibtex-entry', whereas entry validation performed by +`bibtex-format-entry' uses the full list of fields for an entry." + ;; FIXME: `bibtex-entry' and `bibtex-format-entry' handle aliases + ;; under the hood in a manner that is largely invisible to users. + ;; If instead one wanted to display the aliases as alternatives + ;; in the usual way, field names may get both the ALT and the OPT prefix. + ;; That gets rather clumsy. Also, the code currently assumes that + ;; field names have either the ALT or the OPT prefix, but not both. + ;; Are there scenarios when it would be useful to display both? + (let (alt-list new-list) + (dolist (elt list) ; identify alternatives + (if (and (nth 3 elt) + (<= 0 (nth 3 elt))) + (push (nth 3 elt) alt-list))) + (setq alt-list (sort alt-list '<)) + ;; Skip aliases. If ELT is marked as "proper alternative", but all + ;; alternatives for field ELT are aliases, we do not label ELT + ;; as an alternative either. + (dolist (elt list) + (let ((alt (nth 3 elt))) + (if alt + (if (<= 0 alt) + (push (if (eq alt (cadr (memq alt alt-list))) + elt ; ELT has proper alternatives + (butlast elt)) ; alternatives of ELT are alias + new-list)) + (push elt new-list)))) + (reverse new-list))) (defun bibtex-entry (entry-type) "Insert a template for a BibTeX entry of type ENTRY-TYPE. @@ -4399,12 +4532,19 @@ Return t if test was successful, nil otherwise." (entry-list (assoc-string (bibtex-type-in-head) bibtex-entry-alist t)) (crossref (bibtex-search-forward-field "crossref" end)) - (req (if crossref (copy-sequence (nth 2 entry-list)) - (append (nth 2 entry-list) + (req (append (nth 2 entry-list) + (unless crossref (copy-sequence (nth 3 entry-list))))) - (num-alt (length (delq nil (delete-dups - (mapcar (lambda (x) (nth 3 x)) - req))))) + (opt (append (if crossref (nth 3 entry-list)) + (nth 4 entry-list) + bibtex-user-optional-fields)) + (default (append req opt)) + (num-alt (let ((n 0)) + (mapc (lambda (x) + (if (nth 3 x) + (setq n (max n (abs (nth 3 x)))))) + default) + (1+ n))) (alt-fields (make-vector num-alt nil)) bounds field idx) (while (setq bounds (bibtex-parse-field)) @@ -4419,7 +4559,7 @@ Return t if test was successful, nil otherwise." (push (cons (bibtex-current-line) "Questionable month field") error-list)) - (setq field (assoc-string field-name req t) + (setq field (assoc-string field-name default t) req (delete field req)) (if (setq idx (nth 3 field)) (if (aref alt-fields idx) @@ -4438,12 +4578,13 @@ Return t if test was successful, nil otherwise." (car field))) error-list))) (dotimes (idx num-alt) - (unless (aref alt-fields idx) - (push (cons beg-line - (format-message - "Alternative fields `%s' missing" - (aref alt-expect idx))) - error-list)))))))) + (if (and (aref alt-expect idx) + (not (aref alt-fields idx))) + (push (cons beg-line + (format-message + "Alternative fields `%s' missing" + (aref alt-expect idx))) + error-list)))))))) (bibtex-progress-message 'done))))) (if error-list diff --git a/lisp/textmodes/conf-mode.el b/lisp/textmodes/conf-mode.el index 722fc0a3137..d88964aa4f0 100644 --- a/lisp/textmodes/conf-mode.el +++ b/lisp/textmodes/conf-mode.el @@ -1,6 +1,6 @@ ;;; conf-mode.el --- Simple major mode for editing conf/ini/properties files -*- lexical-binding: t; -*- -;; Copyright (C) 2004-2020 Free Software Foundation, Inc. +;; Copyright (C) 2004-2021 Free Software Foundation, Inc. ;; Author: Daniel Pfeiffer <occitan@esperanto.org> ;; Keywords: conf ini windows java diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el index 747657b1ed5..9186e520086 100644 --- a/lisp/textmodes/css-mode.el +++ b/lisp/textmodes/css-mode.el @@ -1,6 +1,6 @@ ;;; css-mode.el --- Major mode to edit CSS files -*- lexical-binding: t -*- -;; Copyright (C) 2006-2020 Free Software Foundation, Inc. +;; Copyright (C) 2006-2021 Free Software Foundation, Inc. ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> ;; Maintainer: Simen Heggestøyl <simenheg@gmail.com> diff --git a/lisp/textmodes/dns-mode.el b/lisp/textmodes/dns-mode.el index dd28cb8f9a4..23a622992ad 100644 --- a/lisp/textmodes/dns-mode.el +++ b/lisp/textmodes/dns-mode.el @@ -1,6 +1,6 @@ ;;; dns-mode.el --- a mode for viewing/editing Domain Name System master files -;; Copyright (C) 2000-2001, 2004-2020 Free Software Foundation, Inc. +;; Copyright (C) 2000-2001, 2004-2021 Free Software Foundation, Inc. ;; Author: Simon Josefsson <simon@josefsson.org> ;; Keywords: DNS master zone file SOA comm diff --git a/lisp/textmodes/enriched.el b/lisp/textmodes/enriched.el index 919e09076d2..1aac96413e4 100644 --- a/lisp/textmodes/enriched.el +++ b/lisp/textmodes/enriched.el @@ -1,6 +1,6 @@ ;;; enriched.el --- read and save files in text/enriched format -;; Copyright (C) 1994-1996, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1994-1996, 2001-2021 Free Software Foundation, Inc. ;; Author: Boris Goldowsky <boris@gnu.org> ;; Keywords: wp, faces diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el index 15b13af5681..e9bef6ec801 100644 --- a/lisp/textmodes/fill.el +++ b/lisp/textmodes/fill.el @@ -1,6 +1,6 @@ ;;; fill.el --- fill commands for Emacs -;; Copyright (C) 1985-1986, 1992, 1994-1997, 1999, 2001-2020 Free +;; Copyright (C) 1985-1986, 1992, 1994-1997, 1999, 2001-2021 Free ;; Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el index 2757074f9f8..d8503168846 100644 --- a/lisp/textmodes/flyspell.el +++ b/lisp/textmodes/flyspell.el @@ -1,6 +1,6 @@ ;;; flyspell.el --- On-the-fly spell checker -*- lexical-binding:t -*- -;; Copyright (C) 1998, 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998, 2000-2021 Free Software Foundation, Inc. ;; Author: Manuel Serrano <Manuel.Serrano@sophia.inria.fr> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el index ba7f36da76c..8d49a7c54c8 100644 --- a/lisp/textmodes/ispell.el +++ b/lisp/textmodes/ispell.el @@ -1,6 +1,6 @@ ;;; ispell.el --- interface to spell checkers -*- lexical-binding:t -*- -;; Copyright (C) 1994-1995, 1997-2020 Free Software Foundation, Inc. +;; Copyright (C) 1994-1995, 1997-2021 Free Software Foundation, Inc. ;; Author: Ken Stevens <k.stevens@ieee.org> diff --git a/lisp/textmodes/less-css-mode.el b/lisp/textmodes/less-css-mode.el index 30974b99881..9cacc175ba9 100644 --- a/lisp/textmodes/less-css-mode.el +++ b/lisp/textmodes/less-css-mode.el @@ -1,6 +1,6 @@ ;;; less-css-mode.el --- Major mode for editing Less CSS files -*- lexical-binding: t; -*- -;; Copyright (C) 2011-2020 Free Software Foundation, Inc. +;; Copyright (C) 2011-2021 Free Software Foundation, Inc. ;; Author: Steve Purcell <steve@sanityinc.com> ;; Maintainer: Simen Heggestøyl <simenheg@gmail.com> diff --git a/lisp/textmodes/makeinfo.el b/lisp/textmodes/makeinfo.el index f41ed876e5f..e48649bae37 100644 --- a/lisp/textmodes/makeinfo.el +++ b/lisp/textmodes/makeinfo.el @@ -1,6 +1,6 @@ ;;; makeinfo.el --- run makeinfo conveniently -;; Copyright (C) 1991, 1993, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1991, 1993, 2001-2021 Free Software Foundation, Inc. ;; Author: Robert J. Chassell ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/textmodes/mhtml-mode.el b/lisp/textmodes/mhtml-mode.el index 329f3e7241d..32542d0400f 100644 --- a/lisp/textmodes/mhtml-mode.el +++ b/lisp/textmodes/mhtml-mode.el @@ -1,6 +1,6 @@ ;;; mhtml-mode.el --- HTML editing mode that handles CSS and JS -*- lexical-binding:t -*- -;; Copyright (C) 2017-2020 Free Software Foundation, Inc. +;; Copyright (C) 2017-2021 Free Software Foundation, Inc. ;; Keywords: wp, hypermedia, comm, languages diff --git a/lisp/textmodes/nroff-mode.el b/lisp/textmodes/nroff-mode.el index 2d7ab13f480..896578513cf 100644 --- a/lisp/textmodes/nroff-mode.el +++ b/lisp/textmodes/nroff-mode.el @@ -1,6 +1,6 @@ ;;; nroff-mode.el --- GNU Emacs major mode for editing nroff source -;; Copyright (C) 1985-1986, 1994-1995, 1997, 2001-2020 Free Software +;; Copyright (C) 1985-1986, 1994-1995, 1997, 2001-2021 Free Software ;; Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/textmodes/page-ext.el b/lisp/textmodes/page-ext.el index b357bbbbe97..c3e1fb14bc3 100644 --- a/lisp/textmodes/page-ext.el +++ b/lisp/textmodes/page-ext.el @@ -1,6 +1,6 @@ ;;; page-ext.el --- extended page handling commands -*- lexical-binding:t -*- -;; Copyright (C) 1990-1991, 1993-1994, 2001-2020 Free Software +;; Copyright (C) 1990-1991, 1993-1994, 2001-2021 Free Software ;; Foundation, Inc. ;; Author: Robert J. Chassell <bob@gnu.org> diff --git a/lisp/textmodes/page.el b/lisp/textmodes/page.el index 029ba966912..e1d7fb7431c 100644 --- a/lisp/textmodes/page.el +++ b/lisp/textmodes/page.el @@ -1,6 +1,6 @@ ;;; page.el --- page motion commands for Emacs -*- lexical-binding: t; -*- -;; Copyright (C) 1985, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1985, 2001-2021 Free Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org ;; Keywords: wp convenience diff --git a/lisp/textmodes/paragraphs.el b/lisp/textmodes/paragraphs.el index b0975291428..217ae10fe4d 100644 --- a/lisp/textmodes/paragraphs.el +++ b/lisp/textmodes/paragraphs.el @@ -1,6 +1,6 @@ ;;; paragraphs.el --- paragraph and sentence parsing -*- lexical-binding: t -*- -;; Copyright (C) 1985-1987, 1991, 1994-1997, 1999-2020 Free Software +;; Copyright (C) 1985-1987, 1991, 1994-1997, 1999-2021 Free Software ;; Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/textmodes/picture.el b/lisp/textmodes/picture.el index 9cf61c6c5ee..3cb1043545a 100644 --- a/lisp/textmodes/picture.el +++ b/lisp/textmodes/picture.el @@ -1,6 +1,6 @@ ;;; picture.el --- "Picture mode" -- editing using quarter-plane screen model -*- lexical-binding: t -*- -;; Copyright (C) 1985, 1994, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1985, 1994, 2001-2021 Free Software Foundation, Inc. ;; Author: K. Shane Hartman ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/textmodes/po.el b/lisp/textmodes/po.el index 29c6d3f4608..1066e93af10 100644 --- a/lisp/textmodes/po.el +++ b/lisp/textmodes/po.el @@ -1,6 +1,6 @@ ;;; po.el --- basic support of PO translation files -*- lexical-binding:t -*- -;; Copyright (C) 1995-1998, 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 1995-1998, 2000-2021 Free Software Foundation, Inc. ;; Authors: François Pinard <pinard@iro.umontreal.ca>, ;; Greg McGary <gkm@magilla.cichlid.com>, diff --git a/lisp/textmodes/refbib.el b/lisp/textmodes/refbib.el index a1df483801e..bff57128c51 100644 --- a/lisp/textmodes/refbib.el +++ b/lisp/textmodes/refbib.el @@ -1,6 +1,6 @@ ;;; refbib.el --- convert refer-style references to ones usable by Latex bib -;; Copyright (C) 1989, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1989, 2001-2021 Free Software Foundation, Inc. ;; Author: Henry Kautz <kautz@research.att.com> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/textmodes/refer.el b/lisp/textmodes/refer.el index 888c310b4a1..ae1f7781686 100644 --- a/lisp/textmodes/refer.el +++ b/lisp/textmodes/refer.el @@ -1,6 +1,6 @@ ;;; refer.el --- look up references in bibliography files -;; Copyright (C) 1992, 1996, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1992, 1996, 2001-2021 Free Software Foundation, Inc. ;; Author: Ashwin Ram <ashwin@cc.gatech.edu> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/textmodes/refill.el b/lisp/textmodes/refill.el index 139221fae37..6edd9aeb7ef 100644 --- a/lisp/textmodes/refill.el +++ b/lisp/textmodes/refill.el @@ -1,6 +1,6 @@ ;;; refill.el --- `auto-fill' by refilling paragraphs on changes -;; Copyright (C) 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 2000-2021 Free Software Foundation, Inc. ;; Author: Dave Love <fx@gnu.org> ;; Maintainer: Miles Bader <miles@gnu.org> diff --git a/lisp/textmodes/reftex-auc.el b/lisp/textmodes/reftex-auc.el index de6d5338004..ae3faec4fdc 100644 --- a/lisp/textmodes/reftex-auc.el +++ b/lisp/textmodes/reftex-auc.el @@ -1,6 +1,6 @@ ;;; reftex-auc.el --- RefTeX's interface to AUCTeX -;; Copyright (C) 1997-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997-2021 Free Software Foundation, Inc. ;; Author: Carsten Dominik <dominik@science.uva.nl> ;; Maintainer: auctex-devel@gnu.org diff --git a/lisp/textmodes/reftex-cite.el b/lisp/textmodes/reftex-cite.el index 49e5b28f6a4..5579e401790 100644 --- a/lisp/textmodes/reftex-cite.el +++ b/lisp/textmodes/reftex-cite.el @@ -1,6 +1,6 @@ ;;; reftex-cite.el --- creating citations with RefTeX -;; Copyright (C) 1997-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997-2021 Free Software Foundation, Inc. ;; Author: Carsten Dominik <dominik@science.uva.nl> ;; Maintainer: auctex-devel@gnu.org diff --git a/lisp/textmodes/reftex-dcr.el b/lisp/textmodes/reftex-dcr.el index 8b2569a352d..e517cea2669 100644 --- a/lisp/textmodes/reftex-dcr.el +++ b/lisp/textmodes/reftex-dcr.el @@ -1,6 +1,6 @@ ;;; reftex-dcr.el --- viewing cross references and citations with RefTeX -;; Copyright (C) 1997-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997-2021 Free Software Foundation, Inc. ;; Author: Carsten Dominik <dominik@science.uva.nl> ;; Maintainer: auctex-devel@gnu.org diff --git a/lisp/textmodes/reftex-global.el b/lisp/textmodes/reftex-global.el index a4e8c9ffd33..4d021609019 100644 --- a/lisp/textmodes/reftex-global.el +++ b/lisp/textmodes/reftex-global.el @@ -1,6 +1,6 @@ ;;; reftex-global.el --- operations on entire documents with RefTeX -;; Copyright (C) 1997-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997-2021 Free Software Foundation, Inc. ;; Author: Carsten Dominik <dominik@science.uva.nl> ;; Maintainer: auctex-devel@gnu.org diff --git a/lisp/textmodes/reftex-index.el b/lisp/textmodes/reftex-index.el index bebda483679..5049ffb64b1 100644 --- a/lisp/textmodes/reftex-index.el +++ b/lisp/textmodes/reftex-index.el @@ -1,6 +1,6 @@ ;;; reftex-index.el --- index support with RefTeX -;; Copyright (C) 1997-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997-2021 Free Software Foundation, Inc. ;; Author: Carsten Dominik <dominik@science.uva.nl> ;; Maintainer: auctex-devel@gnu.org diff --git a/lisp/textmodes/reftex-parse.el b/lisp/textmodes/reftex-parse.el index 4f4afe9d2c6..98c61f56b48 100644 --- a/lisp/textmodes/reftex-parse.el +++ b/lisp/textmodes/reftex-parse.el @@ -1,6 +1,6 @@ ;;; reftex-parse.el --- parser functions for RefTeX -;; Copyright (C) 1997-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997-2021 Free Software Foundation, Inc. ;; Author: Carsten Dominik <dominik@science.uva.nl> ;; Maintainer: auctex-devel@gnu.org @@ -1046,7 +1046,7 @@ When point is just after a { or [, limit string to matching parenthesis." ;;;###autoload (defun reftex-init-section-numbers (&optional toc-entry appendix) - "Initialize the section numbers with zeros or with what is found in the TOC-ENTRY." + "Initialize section numbers with zeros or with what is found in the TOC-ENTRY." (let* ((level (or (nth 5 toc-entry) -1)) (numbers (nreverse (split-string (or (nth 6 toc-entry) "") "\\."))) (depth (1- (length reftex-section-numbers))) diff --git a/lisp/textmodes/reftex-ref.el b/lisp/textmodes/reftex-ref.el index 4c780d8d8c3..439c02f8089 100644 --- a/lisp/textmodes/reftex-ref.el +++ b/lisp/textmodes/reftex-ref.el @@ -1,6 +1,6 @@ ;;; reftex-ref.el --- code to create labels and references with RefTeX -;; Copyright (C) 1997-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997-2021 Free Software Foundation, Inc. ;; Author: Carsten Dominik <dominik@science.uva.nl> ;; Maintainer: auctex-devel@gnu.org diff --git a/lisp/textmodes/reftex-sel.el b/lisp/textmodes/reftex-sel.el index 137a912cb60..d2e9974499b 100644 --- a/lisp/textmodes/reftex-sel.el +++ b/lisp/textmodes/reftex-sel.el @@ -1,6 +1,6 @@ ;;; reftex-sel.el --- the selection modes for RefTeX -;; Copyright (C) 1997-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997-2021 Free Software Foundation, Inc. ;; Author: Carsten Dominik <dominik@science.uva.nl> ;; Maintainer: auctex-devel@gnu.org diff --git a/lisp/textmodes/reftex-toc.el b/lisp/textmodes/reftex-toc.el index eb6ed2ff441..3b9f970a3d2 100644 --- a/lisp/textmodes/reftex-toc.el +++ b/lisp/textmodes/reftex-toc.el @@ -1,6 +1,6 @@ ;;; reftex-toc.el --- RefTeX's table of contents mode -;; Copyright (C) 1997-2000, 2003-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997-2000, 2003-2021 Free Software Foundation, Inc. ;; Author: Carsten Dominik <dominik@science.uva.nl> ;; Maintainer: auctex-devel@gnu.org @@ -851,7 +851,8 @@ if these sets are sorted blocks in the alist." "Make sure all files of the document are being visited by buffers, and that the scanning info is absolutely up to date. We do this by rescanning with `reftex-keep-temporary-buffers' bound to t. -The variable `reftex--pro-or-de' is assumed to be dynamically scoped into this function. +The variable `reftex--pro-or-de' is assumed to be dynamically +scoped into this function. When finished, we exit with an error message." (let ((reftex-keep-temporary-buffers t)) (reftex-toc-Rescan) diff --git a/lisp/textmodes/reftex-vars.el b/lisp/textmodes/reftex-vars.el index f73b849b6dd..073059d52e8 100644 --- a/lisp/textmodes/reftex-vars.el +++ b/lisp/textmodes/reftex-vars.el @@ -1,6 +1,6 @@ ;;; reftex-vars.el --- configuration variables for RefTeX -;; Copyright (C) 1997-1999, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997-1999, 2001-2021 Free Software Foundation, Inc. ;; Author: Carsten Dominik <dominik@science.uva.nl> ;; Maintainer: auctex-devel@gnu.org diff --git a/lisp/textmodes/reftex.el b/lisp/textmodes/reftex.el index b1fa79ae2ac..be9b23677cb 100644 --- a/lisp/textmodes/reftex.el +++ b/lisp/textmodes/reftex.el @@ -1,5 +1,5 @@ ;;; reftex.el --- minor mode for doing \label, \ref, \cite, \index in LaTeX -;; Copyright (C) 1997-2000, 2003-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997-2000, 2003-2021 Free Software Foundation, Inc. ;; Author: Carsten Dominik <dominik@science.uva.nl> ;; Maintainer: auctex-devel@gnu.org diff --git a/lisp/textmodes/remember.el b/lisp/textmodes/remember.el index 7bc7dc1762e..98d3a3856ea 100644 --- a/lisp/textmodes/remember.el +++ b/lisp/textmodes/remember.el @@ -1,6 +1,6 @@ ;;; remember --- a mode for quickly jotting down things to remember -;; Copyright (C) 1999-2001, 2003-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2001, 2003-2021 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> ;; Maintainer: emacs-devel@gnu.org @@ -638,9 +638,14 @@ to turn the *scratch* buffer into your notes buffer." (interactive "p") (let ((buf (or (find-buffer-visiting remember-data-file) (with-current-buffer (find-file-noselect remember-data-file) - (and remember-notes-buffer-name - (not (get-buffer remember-notes-buffer-name)) - (rename-buffer remember-notes-buffer-name)) + (when remember-notes-buffer-name + (when (and (get-buffer remember-notes-buffer-name) + (equal remember-notes-buffer-name "*scratch*")) + (kill-buffer remember-notes-buffer-name)) + ;; Rename the buffer to the requested name (if + ;; it's not already in use). + (unless (get-buffer remember-notes-buffer-name) + (rename-buffer remember-notes-buffer-name))) (funcall (or remember-notes-initial-major-mode initial-major-mode)) (remember-notes-mode 1) diff --git a/lisp/textmodes/rst.el b/lisp/textmodes/rst.el index 435de2683ef..18341716e3a 100644 --- a/lisp/textmodes/rst.el +++ b/lisp/textmodes/rst.el @@ -1,6 +1,6 @@ ;;; rst.el --- Mode for viewing and editing reStructuredText-documents -*- lexical-binding: t -*- -;; Copyright (C) 2003-2020 Free Software Foundation, Inc. +;; Copyright (C) 2003-2021 Free Software Foundation, Inc. ;; Maintainer: Stefan Merten <stefan at merten-home dot de> ;; Author: Stefan Merten <stefan at merten-home dot de>, @@ -568,9 +568,7 @@ After interpretation of ARGS the results are concatenated as for (regexp-quote (char-to-string re))) ((listp re) (let ((nested - (mapcar (lambda (elt) - (rst-re elt)) - (cdr re)))) + (mapcar #'rst-re (cdr re)))) (cond ((eq (car re) :seq) (mapconcat #'identity nested "")) @@ -1398,7 +1396,8 @@ highlighting. t nil nil nil (font-lock-multiline . t) (font-lock-mark-block-function . mark-paragraph))) - (add-hook 'font-lock-extend-region-functions #'rst-font-lock-extend-region t) + (add-hook 'font-lock-extend-region-functions + #'rst-font-lock-extend-region nil t) ;; Text after a changed line may need new fontification. (setq-local jit-lock-contextually t) diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el index f3d8695e248..8465e82b02a 100644 --- a/lisp/textmodes/sgml-mode.el +++ b/lisp/textmodes/sgml-mode.el @@ -1,6 +1,6 @@ ;;; sgml-mode.el --- SGML- and HTML-editing modes -*- lexical-binding:t -*- -;; Copyright (C) 1992, 1995-1996, 1998, 2001-2020 Free Software +;; Copyright (C) 1992, 1995-1996, 1998, 2001-2021 Free Software ;; Foundation, Inc. ;; Author: James Clark <jjc@jclark.com> @@ -2364,8 +2364,8 @@ have <h1>Very Major Headlines</h1> through <h6>Very Minor Headlines</h6> <p>Paragraphs only need an opening tag. Line breaks and multiple spaces are ignored unless the text is <pre>preformatted.</pre> Text can be marked as -<strong>bold</strong>, <em>italic</em> or <u>underlined</u> using the normal M-o or -Edit/Text Properties/Face commands. +<strong>bold</strong>, <em>italic</em> or <u>underlined</u> using the normal M-o +or Edit/Text Properties/Face commands. Pages can have <a name=\"SOMENAME\">named points</a> and can link other points to them with <a href=\"#SOMENAME\">see also somename</a>. In the same way <a diff --git a/lisp/textmodes/table.el b/lisp/textmodes/table.el index 59d60272aa8..071684d3c4d 100644 --- a/lisp/textmodes/table.el +++ b/lisp/textmodes/table.el @@ -1,6 +1,6 @@ ;;; table.el --- create and edit WYSIWYG text based embedded tables -*- lexical-binding: t -*- -;; Copyright (C) 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 2000-2021 Free Software Foundation, Inc. ;; Keywords: wp, convenience ;; Author: Takaaki Ota <Takaaki.Ota@am.sony.com> @@ -2651,7 +2651,8 @@ Creates a cell above and a cell below the current point location." ;;;###autoload (defun table-split-cell-horizontally () "Split current cell horizontally. -Creates a cell on the left and a cell on the right of the current point location." +Creates a cell on the left and a cell on the right of the current +point location." (interactive "*") (table-recognize-cell 'force) (let* ((o-coordinate (table--get-coordinate)) @@ -4197,21 +4198,21 @@ cache buffer into the designated cell in the table buffer." (1- (cdr (table--get-coordinate (car (table--vertical-cell-list t t)))))))) (defun table-goto-top-right-corner () - "Move point to top right corner of the current table and return the char position." + "Move point to top right corner of the current table and return char position." (table--goto-coordinate (cons (car (table--get-coordinate (cdr (table--horizontal-cell-list nil t)))) (1- (cdr (table--get-coordinate (car (table--vertical-cell-list t t)))))))) (defun table-goto-bottom-left-corner () - "Move point to bottom left corner of the current table and return the char position." + "Move point to bottom left corner of the current table and return char position." (table--goto-coordinate (cons (1- (car (table--get-coordinate (car (table--horizontal-cell-list t t))))) (1+ (cdr (table--get-coordinate (cdr (table--vertical-cell-list nil t)))))))) (defun table-goto-bottom-right-corner () - "Move point to bottom right corner of the current table and return the char position." + "Move point to bottom right corner of the current table and return char position." (table--goto-coordinate (cons (car (table--get-coordinate (cdr (table--horizontal-cell-list nil t)))) @@ -4925,7 +4926,7 @@ When optional LOCATION is provided the test is performed at that location." t)) (defun table--region-in-cell-p (beg end) - "Return t when location BEG and END are in a valid table cell in the current buffer." + "Return t when location BEG and END are in a valid table cell in current buffer." (and (table--at-cell-p (min beg end)) (save-excursion (let ((cell-beg (progn (goto-char beg) (table--probe-cell)))) @@ -5245,7 +5246,7 @@ works better than the previous versions however not fully compatible. str)) (defun table--remove-eol-spaces (beg end &optional bol force) - "Remove spaces at the end of each line in the BEG END region of the current buffer. + "Remove spaces at the end of each line in the BEG END region of current buffer. When optional BOL is non-nil spaces at the beginning of line are removed. When optional FORCE is non-nil removal operation is enforced even when point is within the removal area." @@ -5386,7 +5387,8 @@ point" (defun table--transcoord-table-to-cache (&optional coordinate) "Transpose COORDINATE from table coordinate system to cache coordinate system. -When COORDINATE is omitted or nil the point in current buffer is assumed in place." +When COORDINATE is omitted or nil the point in current buffer is +assumed in place." (table--offset-coordinate (or coordinate (table--get-coordinate)) table-cell-info-lu-coordinate @@ -5394,7 +5396,8 @@ When COORDINATE is omitted or nil the point in current buffer is assumed in plac (defun table--transcoord-cache-to-table (&optional coordinate) "Transpose COORDINATE from cache coordinate system to table coordinate system. -When COORDINATE is omitted or nil the point in current buffer is assumed in place." +When COORDINATE is omitted or nil the point in current buffer is +assumed in place." (table--offset-coordinate (or coordinate (table--get-coordinate)) table-cell-info-lu-coordinate)) diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el index 59238452a4d..c4e4864da17 100644 --- a/lisp/textmodes/tex-mode.el +++ b/lisp/textmodes/tex-mode.el @@ -1,6 +1,6 @@ ;;; tex-mode.el --- TeX, LaTeX, and SliTeX mode commands -*- lexical-binding:t -*- -;; Copyright (C) 1985-1986, 1989, 1992, 1994-1999, 2001-2020 Free +;; Copyright (C) 1985-1986, 1989, 1992, 1994-1999, 2001-2021 Free ;; Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/textmodes/texinfmt.el b/lisp/textmodes/texinfmt.el index c38787d081b..ed0a367d01d 100644 --- a/lisp/textmodes/texinfmt.el +++ b/lisp/textmodes/texinfmt.el @@ -1,6 +1,6 @@ ;;; texinfmt.el --- format Texinfo files into Info files -;; Copyright (C) 1985-1986, 1988, 1990-1998, 2000-2020 Free Software +;; Copyright (C) 1985-1986, 1988, 1990-1998, 2000-2021 Free Software ;; Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/textmodes/texinfo.el b/lisp/textmodes/texinfo.el index b3bc634de9b..7799cdb5529 100644 --- a/lisp/textmodes/texinfo.el +++ b/lisp/textmodes/texinfo.el @@ -1,6 +1,6 @@ ;;; texinfo.el --- major mode for editing Texinfo files -;; Copyright (C) 1985, 1988-1993, 1996-1997, 2000-2020 Free Software +;; Copyright (C) 1985, 1988-1993, 1996-1997, 2000-2021 Free Software ;; Foundation, Inc. ;; Author: Robert J. Chassell diff --git a/lisp/textmodes/texnfo-upd.el b/lisp/textmodes/texnfo-upd.el index 78f8b2783bb..ea35641a6c6 100644 --- a/lisp/textmodes/texnfo-upd.el +++ b/lisp/textmodes/texnfo-upd.el @@ -1,6 +1,6 @@ ;;; texnfo-upd.el --- utilities for updating nodes and menus in Texinfo files -;; Copyright (C) 1989-1992, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1989-1992, 2001-2021 Free Software Foundation, Inc. ;; Author: Robert J. Chassell ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/textmodes/text-mode.el b/lisp/textmodes/text-mode.el index c0b3c35d6f3..1432ab6a300 100644 --- a/lisp/textmodes/text-mode.el +++ b/lisp/textmodes/text-mode.el @@ -1,6 +1,6 @@ ;;; text-mode.el --- text mode, and its idiosyncratic commands -*- lexical-binding: t -*- -;; Copyright (C) 1985, 1992, 1994, 2001-2020 Free Software Foundation, +;; Copyright (C) 1985, 1992, 1994, 2001-2021 Free Software Foundation, ;; Inc. ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/textmodes/tildify.el b/lisp/textmodes/tildify.el index 398f7fdc232..33a976aa7b0 100644 --- a/lisp/textmodes/tildify.el +++ b/lisp/textmodes/tildify.el @@ -1,6 +1,6 @@ ;;; tildify.el --- adding hard spaces into texts -*- lexical-binding: t -*- -;; Copyright (C) 1997-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997-2021 Free Software Foundation, Inc. ;; Author: Milan Zamazal <pdm@zamazal.org> ;; Michal Nazarewicz <mina86@mina86.com> diff --git a/lisp/textmodes/two-column.el b/lisp/textmodes/two-column.el index 227e2dffd8b..36aad84c0e6 100644 --- a/lisp/textmodes/two-column.el +++ b/lisp/textmodes/two-column.el @@ -1,6 +1,6 @@ ;;; two-column.el --- minor mode for editing of two-column text -;; Copyright (C) 1992-1995, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1992-1995, 2001-2021 Free Software Foundation, Inc. ;; Author: Daniel Pfeiffer <occitan@esperanto.org> ;; Adapted-By: ESR, Daniel Pfeiffer diff --git a/lisp/textmodes/underline.el b/lisp/textmodes/underline.el index cfd515055a8..3f4e63a349b 100644 --- a/lisp/textmodes/underline.el +++ b/lisp/textmodes/underline.el @@ -1,6 +1,6 @@ ;;; underline.el --- insert/remove underlining (done by overstriking) in Emacs -*- lexical-binding: t -*- -;; Copyright (C) 1985, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1985, 2001-2021 Free Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org ;; Keywords: wp diff --git a/lisp/thingatpt.el b/lisp/thingatpt.el index 558a3fd7368..d3ba941fcc2 100644 --- a/lisp/thingatpt.el +++ b/lisp/thingatpt.el @@ -1,6 +1,6 @@ ;;; thingatpt.el --- get the `thing' at point -*- lexical-binding:t -*- -;; Copyright (C) 1991-1998, 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 1991-1998, 2000-2021 Free Software Foundation, Inc. ;; Author: Mike Williams <mikew@gopher.dosli.govt.nz> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/thread.el b/lisp/thread.el index 00a0084f81f..efb058c4361 100644 --- a/lisp/thread.el +++ b/lisp/thread.el @@ -1,6 +1,6 @@ ;;; thread.el --- Thread support in Emacs Lisp -*- lexical-binding: t -*- -;; Copyright (C) 2018-2020 Free Software Foundation, Inc. +;; Copyright (C) 2018-2021 Free Software Foundation, Inc. ;; Author: Gemini Lasswell <gazally@runbox.com> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/thumbs.el b/lisp/thumbs.el index 93b7c08d62f..7d6558d8f78 100644 --- a/lisp/thumbs.el +++ b/lisp/thumbs.el @@ -1,6 +1,6 @@ ;;; thumbs.el --- Thumbnails previewer for images files -;; Copyright (C) 2004-2020 Free Software Foundation, Inc. +;; Copyright (C) 2004-2021 Free Software Foundation, Inc. ;; Author: Jean-Philippe Theberge <jphiltheberge@videotron.ca> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/time-stamp.el b/lisp/time-stamp.el index c50d68b60af..b9eab95b232 100644 --- a/lisp/time-stamp.el +++ b/lisp/time-stamp.el @@ -1,6 +1,6 @@ ;;; time-stamp.el --- Maintain last change time stamps in files edited by Emacs -*- lexical-binding: t -*- -;; Copyright (C) 1989, 1993-1995, 1997, 2000-2020 Free Software +;; Copyright (C) 1989, 1993-1995, 1997, 2000-2021 Free Software ;; Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/lisp/time.el b/lisp/time.el index eca9a0752e4..1403c4ac00a 100644 --- a/lisp/time.el +++ b/lisp/time.el @@ -1,6 +1,6 @@ ;;; time.el --- display time, load and mail indicator in mode line of Emacs -*- lexical-binding: t -*- -;; Copyright (C) 1985-1987, 1993-1994, 1996, 2000-2020 Free Software +;; Copyright (C) 1985-1987, 1993-1994, 1996, 2000-2021 Free Software ;; Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/timezone.el b/lisp/timezone.el index 1b5e4226e2e..2c96343a74b 100644 --- a/lisp/timezone.el +++ b/lisp/timezone.el @@ -1,6 +1,6 @@ ;;; timezone.el --- time zone package for GNU Emacs -*- lexical-binding: t -*- -;; Copyright (C) 1990-1993, 1996, 1999, 2001-2020 Free Software +;; Copyright (C) 1990-1993, 1996, 1999, 2001-2021 Free Software ;; Foundation, Inc. ;; Author: Masanobu Umeda <umerin@mse.kyutech.ac.jp> diff --git a/lisp/tmm.el b/lisp/tmm.el index 4c2855751c2..e49246a5c4f 100644 --- a/lisp/tmm.el +++ b/lisp/tmm.el @@ -1,6 +1,6 @@ ;;; tmm.el --- text mode access to menu-bar -*- lexical-binding: t -*- -;; Copyright (C) 1994-1996, 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 1994-1996, 2000-2021 Free Software Foundation, Inc. ;; Author: Ilya Zakharevich <ilya@math.mps.ohio-state.edu> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/tool-bar.el b/lisp/tool-bar.el index 37f42be3f4d..6da401187b1 100644 --- a/lisp/tool-bar.el +++ b/lisp/tool-bar.el @@ -1,6 +1,6 @@ ;;; tool-bar.el --- setting up the tool bar -*- lexical-binding: t -*- -;; Copyright (C) 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 2000-2021 Free Software Foundation, Inc. ;; Author: Dave Love <fx@gnu.org> ;; Keywords: mouse frames diff --git a/lisp/tooltip.el b/lisp/tooltip.el index ffc3d499e30..8e00aa5c2a9 100644 --- a/lisp/tooltip.el +++ b/lisp/tooltip.el @@ -1,6 +1,6 @@ ;;; tooltip.el --- show tooltip windows -*- lexical-binding:t -*- -;; Copyright (C) 1997, 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997, 1999-2021 Free Software Foundation, Inc. ;; Author: Gerd Moellmann <gerd@acm.org> ;; Keywords: help c mouse tools diff --git a/lisp/tree-widget.el b/lisp/tree-widget.el index e8a71a38df6..44b29bffe87 100644 --- a/lisp/tree-widget.el +++ b/lisp/tree-widget.el @@ -1,6 +1,6 @@ ;;; tree-widget.el --- Tree widget -*- lexical-binding:t -*- -;; Copyright (C) 2004-2020 Free Software Foundation, Inc. +;; Copyright (C) 2004-2021 Free Software Foundation, Inc. ;; Author: David Ponce <david@dponce.com> ;; Created: 16 Feb 2001 diff --git a/lisp/tutorial.el b/lisp/tutorial.el index ca84f86f289..6bda1ab0d50 100644 --- a/lisp/tutorial.el +++ b/lisp/tutorial.el @@ -1,6 +1,6 @@ ;;; tutorial.el --- tutorial for Emacs -;; Copyright (C) 2006-2020 Free Software Foundation, Inc. +;; Copyright (C) 2006-2021 Free Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org ;; Keywords: help, internal diff --git a/lisp/type-break.el b/lisp/type-break.el index a9ec19b2565..84c240c9f8c 100644 --- a/lisp/type-break.el +++ b/lisp/type-break.el @@ -1,6 +1,6 @@ ;;; type-break.el --- encourage rests from typing at appropriate intervals -*- lexical-binding: t -*- -;; Copyright (C) 1994-1995, 1997, 2000-2020 Free Software Foundation, +;; Copyright (C) 1994-1995, 1997, 2000-2021 Free Software Foundation, ;; Inc. ;; Author: Noah Friedman <friedman@splode.com> diff --git a/lisp/uniquify.el b/lisp/uniquify.el index e6a1b35bc06..c1ec90e2908 100644 --- a/lisp/uniquify.el +++ b/lisp/uniquify.el @@ -1,6 +1,6 @@ ;;; uniquify.el --- unique buffer names dependent on file name -*- lexical-binding: t -*- -;; Copyright (C) 1989, 1995-1997, 2001-2020 Free Software Foundation, +;; Copyright (C) 1989, 1995-1997, 2001-2021 Free Software Foundation, ;; Inc. ;; Author: Dick King <king@reasoning.com> diff --git a/lisp/url/ChangeLog.1 b/lisp/url/ChangeLog.1 index 0309440defa..5a3bf3afd1a 100644 --- a/lisp/url/ChangeLog.1 +++ b/lisp/url/ChangeLog.1 @@ -3068,7 +3068,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 1999, 2001-2002, 2004-2020 Free Software Foundation, + Copyright (C) 1999, 2001-2002, 2004-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lisp/url/url-about.el b/lisp/url/url-about.el index 5fe817cc0e8..bff5570f6df 100644 --- a/lisp/url/url-about.el +++ b/lisp/url/url-about.el @@ -1,6 +1,6 @@ ;;; url-about.el --- Show internal URLs -;; Copyright (C) 2001, 2004-2020 Free Software Foundation, Inc. +;; Copyright (C) 2001, 2004-2021 Free Software Foundation, Inc. ;; Keywords: comm, data, processes, hypermedia diff --git a/lisp/url/url-auth.el b/lisp/url/url-auth.el index bcb48aa455d..f291414e81b 100644 --- a/lisp/url/url-auth.el +++ b/lisp/url/url-auth.el @@ -1,6 +1,6 @@ ;;; url-auth.el --- Uniform Resource Locator authorization modules -*- lexical-binding: t -*- -;; Copyright (C) 1996-1999, 2004-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996-1999, 2004-2021 Free Software Foundation, Inc. ;; Keywords: comm, data, processes, hypermedia diff --git a/lisp/url/url-cache.el b/lisp/url/url-cache.el index ea14e60ecc8..acf88eb0212 100644 --- a/lisp/url/url-cache.el +++ b/lisp/url/url-cache.el @@ -1,6 +1,6 @@ ;;; url-cache.el --- Uniform Resource Locator retrieval tool -;; Copyright (C) 1996-1999, 2004-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996-1999, 2004-2021 Free Software Foundation, Inc. ;; Keywords: comm, data, processes, hypermedia diff --git a/lisp/url/url-cid.el b/lisp/url/url-cid.el index ace971462a1..d465cabc90c 100644 --- a/lisp/url/url-cid.el +++ b/lisp/url/url-cid.el @@ -1,6 +1,6 @@ ;;; url-cid.el --- Content-ID URL loader -;; Copyright (C) 1998-1999, 2004-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998-1999, 2004-2021 Free Software Foundation, Inc. ;; Keywords: comm, data, processes diff --git a/lisp/url/url-cookie.el b/lisp/url/url-cookie.el index e185a7914f3..085159cb500 100644 --- a/lisp/url/url-cookie.el +++ b/lisp/url/url-cookie.el @@ -1,6 +1,6 @@ ;;; url-cookie.el --- URL cookie support -*- lexical-binding:t -*- -;; Copyright (C) 1996-1999, 2004-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996-1999, 2004-2021 Free Software Foundation, Inc. ;; Keywords: comm, data, processes, hypermedia diff --git a/lisp/url/url-dav.el b/lisp/url/url-dav.el index 3cd34b5a6fb..12d5a683e97 100644 --- a/lisp/url/url-dav.el +++ b/lisp/url/url-dav.el @@ -1,6 +1,6 @@ ;;; url-dav.el --- WebDAV support -;; Copyright (C) 2001, 2004-2020 Free Software Foundation, Inc. +;; Copyright (C) 2001, 2004-2021 Free Software Foundation, Inc. ;; Author: Bill Perry <wmperry@gnu.org> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/url/url-dired.el b/lisp/url/url-dired.el index fa75a0a6bb9..398113db139 100644 --- a/lisp/url/url-dired.el +++ b/lisp/url/url-dired.el @@ -1,6 +1,6 @@ ;;; url-dired.el --- URL Dired minor mode -*- lexical-binding: t -*- -;; Copyright (C) 1996-1999, 2004-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996-1999, 2004-2021 Free Software Foundation, Inc. ;; Keywords: comm, files diff --git a/lisp/url/url-domsuf.el b/lisp/url/url-domsuf.el index c1cdf901d6c..59d70cbd0ee 100644 --- a/lisp/url/url-domsuf.el +++ b/lisp/url/url-domsuf.el @@ -1,6 +1,6 @@ ;;; url-domsuf.el --- Say what domain names can have cookies set. -*- lexical-binding:t -*- -;; Copyright (C) 2012-2020 Free Software Foundation, Inc. +;; Copyright (C) 2012-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> diff --git a/lisp/url/url-expand.el b/lisp/url/url-expand.el index 9f52f2586f4..a42b4c7ad23 100644 --- a/lisp/url/url-expand.el +++ b/lisp/url/url-expand.el @@ -1,6 +1,6 @@ ;;; url-expand.el --- expand-file-name for URLs -*- lexical-binding: t -*- -;; Copyright (C) 1999, 2004-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2004-2021 Free Software Foundation, Inc. ;; Keywords: comm, data, processes diff --git a/lisp/url/url-file.el b/lisp/url/url-file.el index eec7cdfbe8a..52a9588030e 100644 --- a/lisp/url/url-file.el +++ b/lisp/url/url-file.el @@ -1,6 +1,6 @@ ;;; url-file.el --- File retrieval code -*- lexical-binding:t -*- -;; Copyright (C) 1996-1999, 2004-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996-1999, 2004-2021 Free Software Foundation, Inc. ;; Keywords: comm, data, processes diff --git a/lisp/url/url-ftp.el b/lisp/url/url-ftp.el index 50b21bd8d44..3cda29a086d 100644 --- a/lisp/url/url-ftp.el +++ b/lisp/url/url-ftp.el @@ -1,6 +1,6 @@ ;;; url-ftp.el --- FTP wrapper -*- lexical-binding: t -*- -;; Copyright (C) 1996-1999, 2004-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996-1999, 2004-2021 Free Software Foundation, Inc. ;; Keywords: comm, data, processes diff --git a/lisp/url/url-future.el b/lisp/url/url-future.el index e48ad3c7c8f..c5733175283 100644 --- a/lisp/url/url-future.el +++ b/lisp/url/url-future.el @@ -1,6 +1,6 @@ ;;; url-future.el --- general futures facility for url.el -*- lexical-binding: t -*- -;; Copyright (C) 2011-2020 Free Software Foundation, Inc. +;; Copyright (C) 2011-2021 Free Software Foundation, Inc. ;; Author: Teodor Zlatanov <tzz@lifelogs.com> ;; Keywords: data diff --git a/lisp/url/url-gw.el b/lisp/url/url-gw.el index f16fc234025..68df67f6486 100644 --- a/lisp/url/url-gw.el +++ b/lisp/url/url-gw.el @@ -1,6 +1,6 @@ ;;; url-gw.el --- Gateway munging for URL loading -;; Copyright (C) 1997-1998, 2004-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997-1998, 2004-2021 Free Software Foundation, Inc. ;; Author: Bill Perry <wmperry@gnu.org> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/url/url-handlers.el b/lisp/url/url-handlers.el index 1c3607bb661..68556d6aa9c 100644 --- a/lisp/url/url-handlers.el +++ b/lisp/url/url-handlers.el @@ -1,6 +1,6 @@ ;;; url-handlers.el --- file-name-handler stuff for URL loading -*- lexical-binding:t -*- -;; Copyright (C) 1996-1999, 2004-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996-1999, 2004-2021 Free Software Foundation, Inc. ;; Keywords: comm, data, processes, hypermedia @@ -299,8 +299,8 @@ BUFFER should be a complete URL buffer as returned by `url-retrieve'. If the headers specify a coding-system (and current buffer is multibyte), it is applied to the body before it is inserted. Returns a list of the form (SIZE CHARSET), where SIZE is the size in bytes -of the inserted text and CHARSET is the charset that was specified in the header, -or nil if none was found. +of the inserted text and CHARSET is the charset that was specified in the +header, or nil if none was found. BEG and END can be used to only insert a subpart of the body. They count bytes from the beginning of the body." (let* ((handle (with-current-buffer buffer (mm-dissect-buffer t))) diff --git a/lisp/url/url-history.el b/lisp/url/url-history.el index 9942e6c88b9..10238a46607 100644 --- a/lisp/url/url-history.el +++ b/lisp/url/url-history.el @@ -1,6 +1,6 @@ ;;; url-history.el --- Global history tracking for URL package -*- lexical-binding:t -*- -;; Copyright (C) 1996-1999, 2004-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996-1999, 2004-2021 Free Software Foundation, Inc. ;; Keywords: comm, data, processes, hypermedia diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el index 1271b9b96f5..324cf99554d 100644 --- a/lisp/url/url-http.el +++ b/lisp/url/url-http.el @@ -1,6 +1,6 @@ ;;; url-http.el --- HTTP retrieval routines -*- lexical-binding:t -*- -;; Copyright (C) 1999, 2001, 2004-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2001, 2004-2021 Free Software Foundation, Inc. ;; Author: Bill Perry <wmperry@gnu.org> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/url/url-imap.el b/lisp/url/url-imap.el index 4ac22f5fa8e..05c3e73fb0e 100644 --- a/lisp/url/url-imap.el +++ b/lisp/url/url-imap.el @@ -1,6 +1,6 @@ ;;; url-imap.el --- IMAP retrieval routines -;; Copyright (C) 1999, 2004-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2004-2021 Free Software Foundation, Inc. ;; Author: Simon Josefsson <jas@pdc.kth.se> ;; Keywords: comm, data, processes diff --git a/lisp/url/url-irc.el b/lisp/url/url-irc.el index 3ff6e647478..c895144ae2a 100644 --- a/lisp/url/url-irc.el +++ b/lisp/url/url-irc.el @@ -1,6 +1,6 @@ ;;; url-irc.el --- IRC URL interface -*- lexical-binding: t -*- -;; Copyright (C) 1996-1999, 2004-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996-1999, 2004-2021 Free Software Foundation, Inc. ;; Keywords: comm, data, processes diff --git a/lisp/url/url-ldap.el b/lisp/url/url-ldap.el index a64515f0ac8..0fa9970fa47 100644 --- a/lisp/url/url-ldap.el +++ b/lisp/url/url-ldap.el @@ -1,6 +1,6 @@ ;;; url-ldap.el --- LDAP Uniform Resource Locator retrieval code -;; Copyright (C) 1998-1999, 2004-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998-1999, 2004-2021 Free Software Foundation, Inc. ;; Keywords: comm, data, processes diff --git a/lisp/url/url-mailto.el b/lisp/url/url-mailto.el index 67707e9c092..688f102cabd 100644 --- a/lisp/url/url-mailto.el +++ b/lisp/url/url-mailto.el @@ -1,6 +1,6 @@ ;;; url-mail.el --- Mail Uniform Resource Locator retrieval code -;; Copyright (C) 1996-1999, 2004-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996-1999, 2004-2021 Free Software Foundation, Inc. ;; Keywords: comm, data, processes diff --git a/lisp/url/url-methods.el b/lisp/url/url-methods.el index bcea0508795..7aad741210d 100644 --- a/lisp/url/url-methods.el +++ b/lisp/url/url-methods.el @@ -1,6 +1,6 @@ ;;; url-methods.el --- Load URL schemes as needed -;; Copyright (C) 1996-1999, 2004-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996-1999, 2004-2021 Free Software Foundation, Inc. ;; Keywords: comm, data, processes, hypermedia diff --git a/lisp/url/url-misc.el b/lisp/url/url-misc.el index 587bde5216d..d3db31d612a 100644 --- a/lisp/url/url-misc.el +++ b/lisp/url/url-misc.el @@ -1,6 +1,6 @@ ;;; url-misc.el --- Misc Uniform Resource Locator retrieval code -;; Copyright (C) 1996-1999, 2002, 2004-2020 Free Software Foundation, +;; Copyright (C) 1996-1999, 2002, 2004-2021 Free Software Foundation, ;; Inc. ;; Keywords: comm, data, processes diff --git a/lisp/url/url-news.el b/lisp/url/url-news.el index 78a6aa94839..d5f8483ab7a 100644 --- a/lisp/url/url-news.el +++ b/lisp/url/url-news.el @@ -1,6 +1,6 @@ ;;; url-news.el --- News Uniform Resource Locator retrieval code -;; Copyright (C) 1996-1999, 2004-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996-1999, 2004-2021 Free Software Foundation, Inc. ;; Keywords: comm, data, processes diff --git a/lisp/url/url-nfs.el b/lisp/url/url-nfs.el index f8efd12aeb7..3c80c8059b5 100644 --- a/lisp/url/url-nfs.el +++ b/lisp/url/url-nfs.el @@ -1,6 +1,6 @@ ;;; url-nfs.el --- NFS URL interface -;; Copyright (C) 1996-1999, 2004-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996-1999, 2004-2021 Free Software Foundation, Inc. ;; Keywords: comm, data, processes diff --git a/lisp/url/url-parse.el b/lisp/url/url-parse.el index b1588def8a0..cd332f5ff74 100644 --- a/lisp/url/url-parse.el +++ b/lisp/url/url-parse.el @@ -1,6 +1,6 @@ ;;; url-parse.el --- Uniform Resource Locator parser -*- lexical-binding: t -*- -;; Copyright (C) 1996-1999, 2004-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996-1999, 2004-2021 Free Software Foundation, Inc. ;; Keywords: comm, data, processes diff --git a/lisp/url/url-privacy.el b/lisp/url/url-privacy.el index 716e3107424..e3ca0f66d98 100644 --- a/lisp/url/url-privacy.el +++ b/lisp/url/url-privacy.el @@ -1,6 +1,6 @@ ;;; url-privacy.el --- Global history tracking for URL package -;; Copyright (C) 1996-1999, 2004-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996-1999, 2004-2021 Free Software Foundation, Inc. ;; Keywords: comm, data, processes, hypermedia diff --git a/lisp/url/url-proxy.el b/lisp/url/url-proxy.el index ad04a2d94a3..6bf65845098 100644 --- a/lisp/url/url-proxy.el +++ b/lisp/url/url-proxy.el @@ -1,6 +1,6 @@ ;;; url-proxy.el --- Proxy server support -;; Copyright (C) 1999, 2004-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2004-2021 Free Software Foundation, Inc. ;; Keywords: comm, data, processes, hypermedia diff --git a/lisp/url/url-queue.el b/lisp/url/url-queue.el index 46cdff0f724..0923731ad8e 100644 --- a/lisp/url/url-queue.el +++ b/lisp/url/url-queue.el @@ -1,6 +1,6 @@ ;;; url-queue.el --- Fetching web pages in parallel -*- lexical-binding: t -*- -;; Copyright (C) 2011-2020 Free Software Foundation, Inc. +;; Copyright (C) 2011-2021 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Keywords: comm diff --git a/lisp/url/url-tramp.el b/lisp/url/url-tramp.el index 3757a681aea..325d25cb8e2 100644 --- a/lisp/url/url-tramp.el +++ b/lisp/url/url-tramp.el @@ -1,6 +1,6 @@ ;;; url-tramp.el --- file-name-handler magic invoking Tramp for some protocols -;; Copyright (C) 2014-2020 Free Software Foundation, Inc. +;; Copyright (C) 2014-2021 Free Software Foundation, Inc. ;; Author: Michael Albinus <michael.albinus@gmx.de> ;; Keywords: comm, data, processes, hypermedia diff --git a/lisp/url/url-util.el b/lisp/url/url-util.el index bd9543bbe75..7c913bcb1a9 100644 --- a/lisp/url/url-util.el +++ b/lisp/url/url-util.el @@ -1,6 +1,6 @@ ;;; url-util.el --- Miscellaneous helper routines for URL library -*- lexical-binding: t -*- -;; Copyright (C) 1996-1999, 2001, 2004-2020 Free Software Foundation, +;; Copyright (C) 1996-1999, 2001, 2004-2021 Free Software Foundation, ;; Inc. ;; Author: Bill Perry <wmperry@gnu.org> diff --git a/lisp/url/url-vars.el b/lisp/url/url-vars.el index f9dce2418f6..6493abfa056 100644 --- a/lisp/url/url-vars.el +++ b/lisp/url/url-vars.el @@ -1,6 +1,6 @@ ;;; url-vars.el --- Variables for Uniform Resource Locator tool -*- lexical-binding:t -*- -;; Copyright (C) 1996-1999, 2001, 2004-2020 Free Software Foundation, +;; Copyright (C) 1996-1999, 2001, 2004-2021 Free Software Foundation, ;; Inc. ;; Keywords: comm, data, processes, hypermedia diff --git a/lisp/url/url.el b/lisp/url/url.el index 5188007a58b..172a3af2b3b 100644 --- a/lisp/url/url.el +++ b/lisp/url/url.el @@ -1,6 +1,6 @@ ;;; url.el --- Uniform Resource Locator retrieval tool -*- lexical-binding: t -*- -;; Copyright (C) 1996-1999, 2001, 2004-2020 Free Software Foundation, +;; Copyright (C) 1996-1999, 2001, 2004-2021 Free Software Foundation, ;; Inc. ;; Author: Bill Perry <wmperry@gnu.org> diff --git a/lisp/userlock.el b/lisp/userlock.el index ec763223379..a340ff85b2d 100644 --- a/lisp/userlock.el +++ b/lisp/userlock.el @@ -1,6 +1,6 @@ ;;; userlock.el --- handle file access contention between multiple users -;; Copyright (C) 1985-1986, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1985-1986, 2001-2021 Free Software Foundation, Inc. ;; Author: Richard King ;; (according to authors.el) @@ -159,7 +159,7 @@ really edit the buffer? (y, n, r or C-h) " (message "%s" prompt) (error "Cannot resolve conflict in batch mode")) (while (null answer) - (setq answer (read-char-from-minibuffer prompt choices)) + (setq answer (read-char-choice prompt choices)) (cond ((memq answer '(?? ?\C-h)) (ask-user-about-supersession-help) (setq answer nil)) diff --git a/lisp/vc/add-log.el b/lisp/vc/add-log.el index e177a5a57d9..19765e0da34 100644 --- a/lisp/vc/add-log.el +++ b/lisp/vc/add-log.el @@ -1,6 +1,6 @@ ;;; add-log.el --- change log maintenance commands for Emacs -;; Copyright (C) 1985-1986, 1988, 1993-1994, 1997-1998, 2000-2020 Free +;; Copyright (C) 1985-1986, 1988, 1993-1994, 1997-1998, 2000-2021 Free ;; Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/vc/compare-w.el b/lisp/vc/compare-w.el index c7da8940f9c..932dcd78920 100644 --- a/lisp/vc/compare-w.el +++ b/lisp/vc/compare-w.el @@ -1,6 +1,6 @@ ;;; compare-w.el --- compare text between windows for Emacs -;; Copyright (C) 1986, 1989, 1993, 1997, 2001-2020 Free Software +;; Copyright (C) 1986, 1989, 1993, 1997, 2001-2021 Free Software ;; Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/vc/cvs-status.el b/lisp/vc/cvs-status.el index 093c17b8cc3..ff3a2944a17 100644 --- a/lisp/vc/cvs-status.el +++ b/lisp/vc/cvs-status.el @@ -1,6 +1,6 @@ ;;; cvs-status.el --- major mode for browsing `cvs status' output -*- lexical-binding: t -*- -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> ;; Keywords: pcl-cvs cvs status tree vc tools diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el index bf836010831..7a474201811 100644 --- a/lisp/vc/diff-mode.el +++ b/lisp/vc/diff-mode.el @@ -1,6 +1,6 @@ ;;; diff-mode.el --- a mode for viewing/editing context diffs -*- lexical-binding: t -*- -;; Copyright (C) 1998-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998-2021 Free Software Foundation, Inc. ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> ;; Keywords: convenience patch diff vc diff --git a/lisp/vc/diff.el b/lisp/vc/diff.el index e43801a1a02..7c4931b4b89 100644 --- a/lisp/vc/diff.el +++ b/lisp/vc/diff.el @@ -1,6 +1,6 @@ ;;; diff.el --- run `diff' -*- lexical-binding: t -*- -;; Copyright (C) 1992, 1994, 1996, 2001-2020 Free Software Foundation, +;; Copyright (C) 1992, 1994, 1996, 2001-2021 Free Software Foundation, ;; Inc. ;; Author: Frank Bresz diff --git a/lisp/vc/ediff-diff.el b/lisp/vc/ediff-diff.el index adb6ce80537..e90eaa11565 100644 --- a/lisp/vc/ediff-diff.el +++ b/lisp/vc/ediff-diff.el @@ -1,6 +1,6 @@ ;;; ediff-diff.el --- diff-related utilities -*- lexical-binding:t -*- -;; Copyright (C) 1994-2020 Free Software Foundation, Inc. +;; Copyright (C) 1994-2021 Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> ;; Package: ediff diff --git a/lisp/vc/ediff-help.el b/lisp/vc/ediff-help.el index 57cb0017ef5..84bf063aedf 100644 --- a/lisp/vc/ediff-help.el +++ b/lisp/vc/ediff-help.el @@ -1,6 +1,6 @@ ;;; ediff-help.el --- Code related to the contents of Ediff help buffers -*- lexical-binding:t -*- -;; Copyright (C) 1996-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996-2021 Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> ;; Package: ediff diff --git a/lisp/vc/ediff-hook.el b/lisp/vc/ediff-hook.el index ed29da13878..ff48bb3845c 100644 --- a/lisp/vc/ediff-hook.el +++ b/lisp/vc/ediff-hook.el @@ -1,6 +1,6 @@ ;;; ediff-hook.el --- setup for Ediff's menus and autoloads -*- lexical-binding:t -*- -;; Copyright (C) 1995-2020 Free Software Foundation, Inc. +;; Copyright (C) 1995-2021 Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> ;; Package: ediff diff --git a/lisp/vc/ediff-init.el b/lisp/vc/ediff-init.el index 3d16f316a63..0865ac5ce41 100644 --- a/lisp/vc/ediff-init.el +++ b/lisp/vc/ediff-init.el @@ -1,6 +1,6 @@ ;;; ediff-init.el --- Macros, variables, and defsubsts used by Ediff -*- lexical-binding:t -*- -;; Copyright (C) 1994-2020 Free Software Foundation, Inc. +;; Copyright (C) 1994-2021 Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> ;; Package: ediff diff --git a/lisp/vc/ediff-merg.el b/lisp/vc/ediff-merg.el index 1c1d5219c7b..826cad9cc1b 100644 --- a/lisp/vc/ediff-merg.el +++ b/lisp/vc/ediff-merg.el @@ -1,6 +1,6 @@ ;;; ediff-merg.el --- merging utilities -*- lexical-binding:t -*- -;; Copyright (C) 1994-2020 Free Software Foundation, Inc. +;; Copyright (C) 1994-2021 Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> ;; Package: ediff diff --git a/lisp/vc/ediff-mult.el b/lisp/vc/ediff-mult.el index 3d79630f3bb..d32c18be8fd 100644 --- a/lisp/vc/ediff-mult.el +++ b/lisp/vc/ediff-mult.el @@ -1,6 +1,6 @@ ;;; ediff-mult.el --- support for multi-file/multi-buffer processing in Ediff -*- lexical-binding:t -*- -;; Copyright (C) 1995-2020 Free Software Foundation, Inc. +;; Copyright (C) 1995-2021 Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> ;; Package: ediff diff --git a/lisp/vc/ediff-ptch.el b/lisp/vc/ediff-ptch.el index 580d48880bd..d52910efceb 100644 --- a/lisp/vc/ediff-ptch.el +++ b/lisp/vc/ediff-ptch.el @@ -1,6 +1,6 @@ ;;; ediff-ptch.el --- Ediff's patch support -*- lexical-binding:t -*- -;; Copyright (C) 1996-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996-2021 Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> ;; Package: ediff diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el index 73c39b65197..f955ba8283a 100644 --- a/lisp/vc/ediff-util.el +++ b/lisp/vc/ediff-util.el @@ -1,6 +1,6 @@ ;;; ediff-util.el --- the core commands and utilities of ediff -*- lexical-binding:t -*- -;; Copyright (C) 1994-2020 Free Software Foundation, Inc. +;; Copyright (C) 1994-2021 Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> ;; Package: ediff @@ -3443,8 +3443,8 @@ Without an argument, it saves customized diff argument, if available (defun ediff-inferior-compare-regions () "Compare regions in an active Ediff session. -Like `ediff-regions-linewise' but is called from under an active Ediff session on -the files that belong to that session. +Like `ediff-regions-linewise' but is called from under an active Ediff session +on the files that belong to that session. After quitting the session invoked via this function, type C-l to the parent Ediff Control Panel to restore highlighting." diff --git a/lisp/vc/ediff-vers.el b/lisp/vc/ediff-vers.el index 4ee7ee5c1f5..13a653b270b 100644 --- a/lisp/vc/ediff-vers.el +++ b/lisp/vc/ediff-vers.el @@ -1,6 +1,6 @@ ;;; ediff-vers.el --- version control interface to Ediff -*- lexical-binding:t -*- -;; Copyright (C) 1995-1997, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1995-1997, 2001-2021 Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> ;; Package: ediff diff --git a/lisp/vc/ediff-wind.el b/lisp/vc/ediff-wind.el index 3d90ccb1cbb..72b345874f9 100644 --- a/lisp/vc/ediff-wind.el +++ b/lisp/vc/ediff-wind.el @@ -1,6 +1,6 @@ ;;; ediff-wind.el --- window manipulation utilities -*- lexical-binding:t -*- -;; Copyright (C) 1994-1997, 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 1994-1997, 2000-2021 Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> ;; Package: ediff diff --git a/lisp/vc/ediff.el b/lisp/vc/ediff.el index ae2f8ad6c1c..e3612dd8e34 100644 --- a/lisp/vc/ediff.el +++ b/lisp/vc/ediff.el @@ -1,6 +1,6 @@ ;;; ediff.el --- a comprehensive visual interface to diff & patch -*- lexical-binding:t -*- -;; Copyright (C) 1994-2020 Free Software Foundation, Inc. +;; Copyright (C) 1994-2021 Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> ;; Created: February 2, 1994 diff --git a/lisp/vc/log-edit.el b/lisp/vc/log-edit.el index 5f978daec02..56b31662210 100644 --- a/lisp/vc/log-edit.el +++ b/lisp/vc/log-edit.el @@ -1,6 +1,6 @@ ;;; log-edit.el --- Major mode for editing CVS commit messages -*- lexical-binding: t -*- -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> ;; Keywords: pcl-cvs cvs commit log vc diff --git a/lisp/vc/log-view.el b/lisp/vc/log-view.el index 87e662ce1cc..e8930979b5d 100644 --- a/lisp/vc/log-view.el +++ b/lisp/vc/log-view.el @@ -1,6 +1,6 @@ ;;; log-view.el --- Major mode for browsing revision log histories -*- lexical-binding: t -*- -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> ;; Keywords: tools, vc diff --git a/lisp/vc/pcvs-defs.el b/lisp/vc/pcvs-defs.el index e558292f33b..2ee3da70274 100644 --- a/lisp/vc/pcvs-defs.el +++ b/lisp/vc/pcvs-defs.el @@ -1,6 +1,6 @@ ;;; pcvs-defs.el --- variable definitions for PCL-CVS -;; Copyright (C) 1991-2020 Free Software Foundation, Inc. +;; Copyright (C) 1991-2021 Free Software Foundation, Inc. ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> ;; Keywords: pcl-cvs diff --git a/lisp/vc/pcvs-info.el b/lisp/vc/pcvs-info.el index 9f8a168a0a8..e1197176af2 100644 --- a/lisp/vc/pcvs-info.el +++ b/lisp/vc/pcvs-info.el @@ -1,6 +1,6 @@ ;;; pcvs-info.el --- internal representation of a fileinfo entry -;; Copyright (C) 1991-2020 Free Software Foundation, Inc. +;; Copyright (C) 1991-2021 Free Software Foundation, Inc. ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> ;; Keywords: pcl-cvs diff --git a/lisp/vc/pcvs-parse.el b/lisp/vc/pcvs-parse.el index dd56aec94a0..43816501bda 100644 --- a/lisp/vc/pcvs-parse.el +++ b/lisp/vc/pcvs-parse.el @@ -1,6 +1,6 @@ ;;; pcvs-parse.el --- the CVS output parser -;; Copyright (C) 1991-2020 Free Software Foundation, Inc. +;; Copyright (C) 1991-2021 Free Software Foundation, Inc. ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> ;; Keywords: pcl-cvs diff --git a/lisp/vc/pcvs-util.el b/lisp/vc/pcvs-util.el index 45703983b24..57da7bf730e 100644 --- a/lisp/vc/pcvs-util.el +++ b/lisp/vc/pcvs-util.el @@ -1,6 +1,6 @@ ;;; pcvs-util.el --- utility functions for PCL-CVS -;; Copyright (C) 1991-2020 Free Software Foundation, Inc. +;; Copyright (C) 1991-2021 Free Software Foundation, Inc. ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> ;; Keywords: pcl-cvs diff --git a/lisp/vc/pcvs.el b/lisp/vc/pcvs.el index 0fd5ceed562..1a42c67cb1c 100644 --- a/lisp/vc/pcvs.el +++ b/lisp/vc/pcvs.el @@ -1,6 +1,6 @@ ;;; pcvs.el --- a front-end to CVS -*- lexical-binding:t -*- -;; Copyright (C) 1991-2020 Free Software Foundation, Inc. +;; Copyright (C) 1991-2021 Free Software Foundation, Inc. ;; Author: The PCL-CVS Trust <pcl-cvs@cyclic.com> ;; Per Cederqvist <ceder@lysator.liu.se> diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el index 5c41761a04b..3b09dfe5d2e 100644 --- a/lisp/vc/smerge-mode.el +++ b/lisp/vc/smerge-mode.el @@ -1,6 +1,6 @@ ;;; smerge-mode.el --- Minor mode to resolve diff3 conflicts -*- lexical-binding: t -*- -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> ;; Keywords: vc, tools, revision control, merge, diff3, cvs, conflict diff --git a/lisp/vc/vc-annotate.el b/lisp/vc/vc-annotate.el index 43d43e9c642..b0435ab53ee 100644 --- a/lisp/vc/vc-annotate.el +++ b/lisp/vc/vc-annotate.el @@ -1,6 +1,6 @@ ;;; vc-annotate.el --- VC Annotate Support -*- lexical-binding: t -*- -;; Copyright (C) 1997-1998, 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997-1998, 2000-2021 Free Software Foundation, Inc. ;; Author: Martin Lorentzson <emwson@emw.ericsson.se> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el index 5eee7f63277..e4eff486f5e 100644 --- a/lisp/vc/vc-bzr.el +++ b/lisp/vc/vc-bzr.el @@ -1,6 +1,6 @@ ;;; vc-bzr.el --- VC backend for the bzr revision control system -*- lexical-binding: t -*- -;; Copyright (C) 2006-2020 Free Software Foundation, Inc. +;; Copyright (C) 2006-2021 Free Software Foundation, Inc. ;; Author: Dave Love <fx@gnu.org> ;; Riccardo Murri <riccardo.murri@gmail.com> diff --git a/lisp/vc/vc-cvs.el b/lisp/vc/vc-cvs.el index fdbf44e0f13..a595cc9778b 100644 --- a/lisp/vc/vc-cvs.el +++ b/lisp/vc/vc-cvs.el @@ -1,6 +1,6 @@ ;;; vc-cvs.el --- non-resident support for CVS version-control -*- lexical-binding: t -*- -;; Copyright (C) 1995, 1998-2020 Free Software Foundation, Inc. +;; Copyright (C) 1995, 1998-2021 Free Software Foundation, Inc. ;; Author: FSF (see vc.el for full credits) ;; Package: vc diff --git a/lisp/vc/vc-dav.el b/lisp/vc/vc-dav.el index d453cb41cea..88f46eff059 100644 --- a/lisp/vc/vc-dav.el +++ b/lisp/vc/vc-dav.el @@ -1,6 +1,6 @@ ;;; vc-dav.el --- vc.el support for WebDAV -;; Copyright (C) 2001, 2004-2020 Free Software Foundation, Inc. +;; Copyright (C) 2001, 2004-2021 Free Software Foundation, Inc. ;; Author: Bill Perry <wmperry@gnu.org> ;; Keywords: url, vc diff --git a/lisp/vc/vc-dir.el b/lisp/vc/vc-dir.el index f576fcfb9fc..bbb73240be2 100644 --- a/lisp/vc/vc-dir.el +++ b/lisp/vc/vc-dir.el @@ -1,6 +1,6 @@ ;;; vc-dir.el --- Directory status display under VC -*- lexical-binding: t -*- -;; Copyright (C) 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2007-2021 Free Software Foundation, Inc. ;; Author: Dan Nicolaescu <dann@ics.uci.edu> ;; Keywords: vc tools diff --git a/lisp/vc/vc-dispatcher.el b/lisp/vc/vc-dispatcher.el index 4cc6fddd7b5..6b17f2afe74 100644 --- a/lisp/vc/vc-dispatcher.el +++ b/lisp/vc/vc-dispatcher.el @@ -1,6 +1,6 @@ ;;; vc-dispatcher.el -- generic command-dispatcher facility. -*- lexical-binding: t -*- -;; Copyright (C) 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2008-2021 Free Software Foundation, Inc. ;; Author: FSF (see below for full credits) ;; Keywords: vc tools diff --git a/lisp/vc/vc-filewise.el b/lisp/vc/vc-filewise.el index 67c696ced29..ee73aa6f938 100644 --- a/lisp/vc/vc-filewise.el +++ b/lisp/vc/vc-filewise.el @@ -1,6 +1,6 @@ ;;; vc-filewise.el --- common functions for file-oriented back ends. -;; Copyright (C) 1992-1996, 1998-2020 Free Software Foundation, Inc. +;; Copyright (C) 1992-1996, 1998-2021 Free Software Foundation, Inc. ;; Author: FSF (see vc.el for full credits) ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index 84c964e7f52..a9ee28e3aad 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -1,6 +1,6 @@ ;;; vc-git.el --- VC backend for the git version control system -*- lexical-binding: t -*- -;; Copyright (C) 2006-2020 Free Software Foundation, Inc. +;; Copyright (C) 2006-2021 Free Software Foundation, Inc. ;; Author: Alexandre Julliard <julliard@winehq.org> ;; Keywords: vc tools diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el index c8a80d75ec1..c4b82ab11eb 100644 --- a/lisp/vc/vc-hg.el +++ b/lisp/vc/vc-hg.el @@ -1,6 +1,6 @@ ;;; vc-hg.el --- VC backend for the mercurial version control system -*- lexical-binding: t -*- -;; Copyright (C) 2006-2020 Free Software Foundation, Inc. +;; Copyright (C) 2006-2021 Free Software Foundation, Inc. ;; Author: Ivan Kanis ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el index 07bec8e0877..f910f9d5496 100644 --- a/lisp/vc/vc-hooks.el +++ b/lisp/vc/vc-hooks.el @@ -1,6 +1,6 @@ ;;; vc-hooks.el --- resident support for version-control -*- lexical-binding:t -*- -;; Copyright (C) 1992-1996, 1998-2020 Free Software Foundation, Inc. +;; Copyright (C) 1992-1996, 1998-2021 Free Software Foundation, Inc. ;; Author: FSF (see vc.el for full credits) ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/vc/vc-mtn.el b/lisp/vc/vc-mtn.el index 7797d194326..3b610a1e4fe 100644 --- a/lisp/vc/vc-mtn.el +++ b/lisp/vc/vc-mtn.el @@ -1,6 +1,6 @@ ;;; vc-mtn.el --- VC backend for Monotone -*- lexical-binding: t -*- -;; Copyright (C) 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2007-2021 Free Software Foundation, Inc. ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> ;; Keywords: vc diff --git a/lisp/vc/vc-rcs.el b/lisp/vc/vc-rcs.el index 23f088b0cff..8d64ee5cc57 100644 --- a/lisp/vc/vc-rcs.el +++ b/lisp/vc/vc-rcs.el @@ -1,6 +1,6 @@ ;;; vc-rcs.el --- support for RCS version-control -*- lexical-binding:t -*- -;; Copyright (C) 1992-2020 Free Software Foundation, Inc. +;; Copyright (C) 1992-2021 Free Software Foundation, Inc. ;; Author: FSF (see vc.el for full credits) ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/vc/vc-sccs.el b/lisp/vc/vc-sccs.el index ba50c36832d..3d3f4048052 100644 --- a/lisp/vc/vc-sccs.el +++ b/lisp/vc/vc-sccs.el @@ -1,6 +1,6 @@ ;;; vc-sccs.el --- support for SCCS version-control -*- lexical-binding:t -*- -;; Copyright (C) 1992-2020 Free Software Foundation, Inc. +;; Copyright (C) 1992-2021 Free Software Foundation, Inc. ;; Author: FSF (see vc.el for full credits) ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/vc/vc-src.el b/lisp/vc/vc-src.el index 4eb638978a9..201d69d79a1 100644 --- a/lisp/vc/vc-src.el +++ b/lisp/vc/vc-src.el @@ -1,6 +1,6 @@ ;;; vc-src.el --- support for SRC version-control -*- lexical-binding:t -*- -;; Copyright (C) 1992-2020 Free Software Foundation, Inc. +;; Copyright (C) 1992-2021 Free Software Foundation, Inc. ;; Author: FSF (see vc.el for full credits) ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el index 5ea2a41fe11..da5471107d2 100644 --- a/lisp/vc/vc-svn.el +++ b/lisp/vc/vc-svn.el @@ -1,6 +1,6 @@ ;;; vc-svn.el --- non-resident support for Subversion version-control -*- lexical-binding:t -*- -;; Copyright (C) 2003-2020 Free Software Foundation, Inc. +;; Copyright (C) 2003-2021 Free Software Foundation, Inc. ;; Author: FSF (see vc.el for full credits) ;; Maintainer: Stefan Monnier <monnier@gnu.org> diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index 160016c3e5e..6c96d8ca7c4 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -1,6 +1,6 @@ ;;; vc.el --- drive a version-control system from within Emacs -*- lexical-binding:t -*- -;; Copyright (C) 1992-1998, 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 1992-1998, 2000-2021 Free Software Foundation, Inc. ;; Author: FSF (see below for full credits) ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/vcursor.el b/lisp/vcursor.el index e5e9f062a92..e699df4842d 100644 --- a/lisp/vcursor.el +++ b/lisp/vcursor.el @@ -1,6 +1,6 @@ ;;; vcursor.el --- manipulate an alternative ("virtual") cursor -;; Copyright (C) 1994, 1996, 1998, 2001-2020 Free Software Foundation, +;; Copyright (C) 1994, 1996, 1998, 2001-2021 Free Software Foundation, ;; Inc. ;; Author: Peter Stephenson <pws@ibmth.df.unipi.it> diff --git a/lisp/version.el b/lisp/version.el index b247232dcfd..fcfc2f8b806 100644 --- a/lisp/version.el +++ b/lisp/version.el @@ -1,6 +1,6 @@ ;;; version.el --- record version number of Emacs -*- lexical-binding:t -*- -;; Copyright (C) 1985, 1992, 1994-1995, 1999-2020 Free Software +;; Copyright (C) 1985, 1992, 1994-1995, 1999-2021 Free Software ;; Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/view.el b/lisp/view.el index c1b788a7393..5a2f2fadfc3 100644 --- a/lisp/view.el +++ b/lisp/view.el @@ -1,6 +1,6 @@ ;;; view.el --- peruse file or buffer without editing -;; Copyright (C) 1985, 1989, 1994-1995, 1997, 2000-2020 Free Software +;; Copyright (C) 1985, 1989, 1994-1995, 1997, 2000-2021 Free Software ;; Foundation, Inc. ;; Author: K. Shane Hartman diff --git a/lisp/vt-control.el b/lisp/vt-control.el index d4c14197bdc..0bd5132f7c3 100644 --- a/lisp/vt-control.el +++ b/lisp/vt-control.el @@ -1,6 +1,6 @@ ;;; vt-control.el --- Common VTxxx control functions -*- lexical-binding:t -*- -;; Copyright (C) 1993-1994, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1993-1994, 2001-2021 Free Software Foundation, Inc. ;; Author: Rob Riepel <riepel@networking.stanford.edu> ;; Keywords: terminals diff --git a/lisp/vt100-led.el b/lisp/vt100-led.el index 1e81dd241f1..117bef70653 100644 --- a/lisp/vt100-led.el +++ b/lisp/vt100-led.el @@ -1,6 +1,6 @@ ;;; vt100-led.el --- functions for LED control on VT-100 terminals & clones -*- lexical-binding:t -*- -;; Copyright (C) 1988, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1988, 2001-2021 Free Software Foundation, Inc. ;; Author: Howard Gayle ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el index f1dcc54043d..3da24c85c85 100644 --- a/lisp/w32-fns.el +++ b/lisp/w32-fns.el @@ -1,6 +1,6 @@ ;;; w32-fns.el --- Lisp routines for 32-bit Windows -;; Copyright (C) 1994, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1994, 2001-2021 Free Software Foundation, Inc. ;; Author: Geoff Voelker <voelker@cs.washington.edu> ;; Keywords: internal diff --git a/lisp/w32-vars.el b/lisp/w32-vars.el index 642a48446ef..f00e474e1e4 100644 --- a/lisp/w32-vars.el +++ b/lisp/w32-vars.el @@ -1,6 +1,6 @@ ;;; w32-vars.el --- MS-Windows specific user options -*- lexical-binding:t -*- -;; Copyright (C) 2002-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002-2021 Free Software Foundation, Inc. ;; Author: Jason Rumney <jasonr@gnu.org> ;; Keywords: internal diff --git a/lisp/wdired.el b/lisp/wdired.el index c2e1d0cafce..f4a0b6d9a93 100644 --- a/lisp/wdired.el +++ b/lisp/wdired.el @@ -1,6 +1,6 @@ ;;; wdired.el --- Rename files editing their names in dired buffers -*- coding: utf-8; -*- -;; Copyright (C) 2004-2020 Free Software Foundation, Inc. +;; Copyright (C) 2004-2021 Free Software Foundation, Inc. ;; Filename: wdired.el ;; Author: Juan León Lahoz García <juanleon1@gmail.com> diff --git a/lisp/whitespace.el b/lisp/whitespace.el index 814f3e5a5f6..7b8e5b7cc11 100644 --- a/lisp/whitespace.el +++ b/lisp/whitespace.el @@ -1,6 +1,6 @@ ;;; whitespace.el --- minor mode to visualize TAB, (HARD) SPACE, NEWLINE -*- lexical-binding: t -*- -;; Copyright (C) 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 2000-2021 Free Software Foundation, Inc. ;; Author: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com> ;; Keywords: data, wp diff --git a/lisp/wid-browse.el b/lisp/wid-browse.el index bc2e3c4c12b..0864e1b313e 100644 --- a/lisp/wid-browse.el +++ b/lisp/wid-browse.el @@ -1,6 +1,6 @@ ;;; wid-browse.el --- functions for browsing widgets ;; -;; Copyright (C) 1997, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997, 2001-2021 Free Software Foundation, Inc. ;; ;; Author: Per Abrahamsen <abraham@dina.kvl.dk> ;; Keywords: extensions diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el index 8250316bcc7..f920130226e 100644 --- a/lisp/wid-edit.el +++ b/lisp/wid-edit.el @@ -1,6 +1,6 @@ ;;; wid-edit.el --- Functions for creating and using widgets -*- lexical-binding:t -*- ;; -;; Copyright (C) 1996-1997, 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996-1997, 1999-2021 Free Software Foundation, Inc. ;; ;; Author: Per Abrahamsen <abraham@dina.kvl.dk> ;; Maintainer: emacs-devel@gnu.org @@ -338,7 +338,7 @@ in the key vector, as in the argument of `define-key'." '(display-buffer-in-direction (direction . bottom) (window-height . fit-window-to-buffer))) - (setq value (read-char-from-minibuffer + (setq value (read-char-choice (format "%s: " title) (mapcar #'car alist))))) (cdr (assoc value alist)))))) diff --git a/lisp/widget.el b/lisp/widget.el index 8f1e0901610..de690ad225d 100644 --- a/lisp/widget.el +++ b/lisp/widget.el @@ -1,6 +1,6 @@ ;;; widget.el --- a library of user interface components ;; -;; Copyright (C) 1996-1997, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1996-1997, 2001-2021 Free Software Foundation, Inc. ;; ;; Author: Per Abrahamsen <abraham@dina.kvl.dk> ;; Keywords: help, extensions, faces, hypermedia diff --git a/lisp/windmove.el b/lisp/windmove.el index 5db13cf6b30..e4ea8e0f693 100644 --- a/lisp/windmove.el +++ b/lisp/windmove.el @@ -1,6 +1,6 @@ ;;; windmove.el --- directional window-selection routines -*- lexical-binding:t -*- ;; -;; Copyright (C) 1998-2020 Free Software Foundation, Inc. +;; Copyright (C) 1998-2021 Free Software Foundation, Inc. ;; ;; Author: Hovav Shacham (hovav@cs.stanford.edu) ;; Created: 17 October 1998 diff --git a/lisp/window.el b/lisp/window.el index 67c3992c3f9..cd13e6603a5 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -1,6 +1,6 @@ ;;; window.el --- GNU Emacs window commands aside from those written in C -*- lexical-binding:t -*- -;; Copyright (C) 1985, 1989, 1992-1994, 2000-2020 Free Software +;; Copyright (C) 1985, 1989, 1992-1994, 2000-2021 Free Software ;; Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/winner.el b/lisp/winner.el index 4313e767196..9506ac53bb2 100644 --- a/lisp/winner.el +++ b/lisp/winner.el @@ -1,6 +1,6 @@ ;;; winner.el --- Restore old window configurations -;; Copyright (C) 1997-1998, 2001-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997-1998, 2001-2021 Free Software Foundation, Inc. ;; Author: Ivar Rummelhoff <ivarru@math.uio.no> ;; Created: 27 Feb 1997 diff --git a/lisp/woman.el b/lisp/woman.el index 33a6a0dfbdb..0e4c1c10fca 100644 --- a/lisp/woman.el +++ b/lisp/woman.el @@ -1,6 +1,6 @@ ;;; woman.el --- browse UN*X manual pages `wo (without) man' -;; Copyright (C) 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 2000-2021 Free Software Foundation, Inc. ;; Author: Francis J. Wright <F.J.Wright@qmul.ac.uk> ;; Maintainer: emacs-devel@gnu.org diff --git a/lisp/x-dnd.el b/lisp/x-dnd.el index 1d49f462531..23e8001c013 100644 --- a/lisp/x-dnd.el +++ b/lisp/x-dnd.el @@ -1,6 +1,6 @@ ;;; x-dnd.el --- drag and drop support for X -*- lexical-binding: t; -*- -;; Copyright (C) 2004-2020 Free Software Foundation, Inc. +;; Copyright (C) 2004-2021 Free Software Foundation, Inc. ;; Author: Jan Djärv <jan.h.d@swipnet.se> ;; Maintainer: emacs-devel@gnu.org @@ -411,8 +411,10 @@ Coordinates are required to be absolute. FRAME is the frame and W is the window where the drop happened. If W is a window, return its absolute coordinates, otherwise return the frame coordinates." - (let* ((frame-left (frame-parameter frame 'left)) - (frame-top (frame-parameter frame 'top))) + (let* ((frame-left (or (car-safe (cdr-safe (frame-parameter frame 'left))) + (frame-parameter frame 'left))) + (frame-top (or (car-safe (cdr-safe (frame-parameter frame 'top))) + (frame-parameter frame 'top)))) (if (windowp w) (let ((edges (window-inside-pixel-edges w))) (cons diff --git a/lisp/xdg.el b/lisp/xdg.el index ae4a3f05684..0f0df53d27e 100644 --- a/lisp/xdg.el +++ b/lisp/xdg.el @@ -1,6 +1,6 @@ ;;; xdg.el --- XDG specification and standard support -*- lexical-binding: t -*- -;; Copyright (C) 2017-2020 Free Software Foundation, Inc. +;; Copyright (C) 2017-2021 Free Software Foundation, Inc. ;; Author: Mark Oteiza <mvoteiza@udel.edu> ;; Created: 27 January 2017 diff --git a/lisp/xml.el b/lisp/xml.el index c96ff80446a..4e2dd13ecbd 100644 --- a/lisp/xml.el +++ b/lisp/xml.el @@ -1,6 +1,6 @@ ;;; xml.el --- XML parser -*- lexical-binding: t -*- -;; Copyright (C) 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 2000-2021 Free Software Foundation, Inc. ;; Author: Emmanuel Briot <briot@gnat.com> ;; Maintainer: Mark A. Hershberger <mah@everybody.org> diff --git a/lisp/xt-mouse.el b/lisp/xt-mouse.el index 9301476e815..72faff81015 100644 --- a/lisp/xt-mouse.el +++ b/lisp/xt-mouse.el @@ -1,6 +1,6 @@ ;;; xt-mouse.el --- support the mouse when emacs run in an xterm -*- lexical-binding: t -*- -;; Copyright (C) 1994, 2000-2020 Free Software Foundation, Inc. +;; Copyright (C) 1994, 2000-2021 Free Software Foundation, Inc. ;; Author: Per Abrahamsen <abraham@dina.kvl.dk> ;; Keywords: mouse, terminals diff --git a/lisp/xwidget.el b/lisp/xwidget.el index 9d502d772bd..b8df55090a2 100644 --- a/lisp/xwidget.el +++ b/lisp/xwidget.el @@ -1,6 +1,6 @@ ;;; xwidget.el --- api functions for xwidgets -*- lexical-binding: t -*- ;; -;; Copyright (C) 2011-2020 Free Software Foundation, Inc. +;; Copyright (C) 2011-2021 Free Software Foundation, Inc. ;; ;; Author: Joakim Verona (joakim@verona.se) ;; diff --git a/lwlib/ChangeLog.1 b/lwlib/ChangeLog.1 index 52ec945a06f..bf839cf7091 100644 --- a/lwlib/ChangeLog.1 +++ b/lwlib/ChangeLog.1 @@ -1964,7 +1964,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 1995-1999, 2001-2020 Free Software Foundation, Inc. + Copyright (C) 1995-1999, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lwlib/Makefile.in b/lwlib/Makefile.in index 1077324b513..28c16acbabc 100644 --- a/lwlib/Makefile.in +++ b/lwlib/Makefile.in @@ -1,7 +1,7 @@ ### @configure_input@ # Copyright (C) 1992, 1993 Lucid, Inc. -# Copyright (C) 1994, 2001-2020 Free Software Foundation, Inc. +# Copyright (C) 1994, 2001-2021 Free Software Foundation, Inc. # # This file is part of the Lucid Widget Library. # diff --git a/lwlib/deps.mk b/lwlib/deps.mk index 105ea1b170d..66c464f8f92 100644 --- a/lwlib/deps.mk +++ b/lwlib/deps.mk @@ -1,7 +1,7 @@ ### deps.mk --- lwlib/Makefile fragment for GNU Emacs # Copyright (C) 1992, 1993 Lucid, Inc. -# Copyright (C) 1994, 2001-2020 Free Software Foundation, Inc. +# Copyright (C) 1994, 2001-2021 Free Software Foundation, Inc. # # This file is part of the Lucid Widget Library. # diff --git a/lwlib/lwlib-Xaw.c b/lwlib/lwlib-Xaw.c index 71ac98aabd7..8806d3f700a 100644 --- a/lwlib/lwlib-Xaw.c +++ b/lwlib/lwlib-Xaw.c @@ -1,7 +1,7 @@ /* The lwlib interface to Athena widgets. Copyright (C) 1993 Chuck Thompson <cthomp@cs.uiuc.edu> -Copyright (C) 1994, 2001-2020 Free Software Foundation, Inc. +Copyright (C) 1994, 2001-2021 Free Software Foundation, Inc. This file is part of the Lucid Widget Library. diff --git a/lwlib/lwlib-Xlw.c b/lwlib/lwlib-Xlw.c index 862bc8f5d9d..54dc06f52ac 100644 --- a/lwlib/lwlib-Xlw.c +++ b/lwlib/lwlib-Xlw.c @@ -1,7 +1,7 @@ /* The lwlib interface to "xlwmenu" menus. Copyright (C) 1992 Lucid, Inc. -Copyright (C) 1994, 2000-2020 Free Software Foundation, Inc. +Copyright (C) 1994, 2000-2021 Free Software Foundation, Inc. This file is part of the Lucid Widget Library. diff --git a/lwlib/lwlib-Xm.c b/lwlib/lwlib-Xm.c index c4ba4113fd1..525465fa998 100644 --- a/lwlib/lwlib-Xm.c +++ b/lwlib/lwlib-Xm.c @@ -1,6 +1,6 @@ /* The lwlib interface to Motif widgets. -Copyright (C) 1994-1997, 1999-2020 Free Software Foundation, Inc. +Copyright (C) 1994-1997, 1999-2021 Free Software Foundation, Inc. Copyright (C) 1992 Lucid, Inc. This file is part of the Lucid Widget Library. diff --git a/lwlib/lwlib-int.h b/lwlib/lwlib-int.h index 885d951919c..ef76d67bfc5 100644 --- a/lwlib/lwlib-int.h +++ b/lwlib/lwlib-int.h @@ -1,6 +1,6 @@ /* Copyright (C) 1992 Lucid, Inc. -Copyright (C) 2000-2020 Free Software Foundation, Inc. +Copyright (C) 2000-2021 Free Software Foundation, Inc. This file is part of the Lucid Widget Library. diff --git a/lwlib/lwlib-utils.c b/lwlib/lwlib-utils.c index 2b3aa55c3e6..3c700e0c5fc 100644 --- a/lwlib/lwlib-utils.c +++ b/lwlib/lwlib-utils.c @@ -1,7 +1,7 @@ /* Defines some widget utility functions. Copyright (C) 1992 Lucid, Inc. -Copyright (C) 1994, 2001-2020 Free Software Foundation, Inc. +Copyright (C) 1994, 2001-2021 Free Software Foundation, Inc. This file is part of the Lucid Widget Library. diff --git a/lwlib/lwlib-widget.h b/lwlib/lwlib-widget.h index f1323378d04..2fd84c043f2 100644 --- a/lwlib/lwlib-widget.h +++ b/lwlib/lwlib-widget.h @@ -1,6 +1,6 @@ /* Copyright (C) 1992, 1993 Lucid, Inc. -Copyright (C) 1994, 1999-2020 Free Software Foundation, Inc. +Copyright (C) 1994, 1999-2021 Free Software Foundation, Inc. This file is part of the Lucid Widget Library. diff --git a/lwlib/lwlib.c b/lwlib/lwlib.c index 33c6ab1a60d..820538f738b 100644 --- a/lwlib/lwlib.c +++ b/lwlib/lwlib.c @@ -1,7 +1,7 @@ /* A general interface to the widgets of different toolkits. Copyright (C) 1992, 1993 Lucid, Inc. -Copyright (C) 1994-1996, 1999-2020 Free Software Foundation, Inc. +Copyright (C) 1994-1996, 1999-2021 Free Software Foundation, Inc. This file is part of the Lucid Widget Library. diff --git a/lwlib/lwlib.h b/lwlib/lwlib.h index cd269749411..ab48d85890a 100644 --- a/lwlib/lwlib.h +++ b/lwlib/lwlib.h @@ -1,6 +1,6 @@ /* Copyright (C) 1992, 1993 Lucid, Inc. -Copyright (C) 1994, 1999-2020 Free Software Foundation, Inc. +Copyright (C) 1994, 1999-2021 Free Software Foundation, Inc. This file is part of the Lucid Widget Library. diff --git a/lwlib/xlwmenu.c b/lwlib/xlwmenu.c index dcef17218fb..cc73d9aa498 100644 --- a/lwlib/xlwmenu.c +++ b/lwlib/xlwmenu.c @@ -1,7 +1,7 @@ /* Implements a lightweight menubar widget. Copyright (C) 1992 Lucid, Inc. -Copyright (C) 1994-1995, 1997, 1999-2020 Free Software Foundation, Inc. +Copyright (C) 1994-1995, 1997, 1999-2021 Free Software Foundation, Inc. This file is part of the Lucid Widget Library. diff --git a/lwlib/xlwmenu.h b/lwlib/xlwmenu.h index 5215127edb3..9143edba9a2 100644 --- a/lwlib/xlwmenu.h +++ b/lwlib/xlwmenu.h @@ -1,6 +1,6 @@ /* Interface of a lightweight menubar widget. -Copyright (C) 2002-2020 Free Software Foundation, Inc. +Copyright (C) 2002-2021 Free Software Foundation, Inc. Copyright (C) 1992 Lucid, Inc. This file is part of the Lucid Widget Library. diff --git a/lwlib/xlwmenuP.h b/lwlib/xlwmenuP.h index 614a4db534a..fc77ec4bfd1 100644 --- a/lwlib/xlwmenuP.h +++ b/lwlib/xlwmenuP.h @@ -1,6 +1,6 @@ /* Internals of a lightweight menubar widget. -Copyright (C) 2002-2020 Free Software Foundation, Inc. +Copyright (C) 2002-2021 Free Software Foundation, Inc. Copyright (C) 1992 Lucid, Inc. This file is part of the Lucid Widget Library. diff --git a/m4/00gnulib.m4 b/m4/00gnulib.m4 index 14628c363b7..9ba1743e652 100644 --- a/m4/00gnulib.m4 +++ b/m4/00gnulib.m4 @@ -1,5 +1,5 @@ # 00gnulib.m4 serial 8 -dnl Copyright (C) 2009-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/__inline.m4 b/m4/__inline.m4 index 520c8c4b208..b28cc6abc51 100644 --- a/m4/__inline.m4 +++ b/m4/__inline.m4 @@ -1,5 +1,5 @@ # Test for __inline keyword -dnl Copyright 2017-2020 Free Software Foundation, Inc. +dnl Copyright 2017-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/absolute-header.m4 b/m4/absolute-header.m4 index c043233de36..52d80d0428e 100644 --- a/m4/absolute-header.m4 +++ b/m4/absolute-header.m4 @@ -1,5 +1,5 @@ # absolute-header.m4 serial 17 -dnl Copyright (C) 2006-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/acl.m4 b/m4/acl.m4 index a3dcf9357b9..aaf231aee9a 100644 --- a/m4/acl.m4 +++ b/m4/acl.m4 @@ -1,7 +1,7 @@ # acl.m4 - check for access control list (ACL) primitives # serial 24 -# Copyright (C) 2002, 2004-2020 Free Software Foundation, Inc. +# Copyright (C) 2002, 2004-2021 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/alloca.m4 b/m4/alloca.m4 index e3c377c9e2c..ba2f679d8e0 100644 --- a/m4/alloca.m4 +++ b/m4/alloca.m4 @@ -1,5 +1,5 @@ # alloca.m4 serial 20 -dnl Copyright (C) 2002-2004, 2006-2007, 2009-2020 Free Software Foundation, +dnl Copyright (C) 2002-2004, 2006-2007, 2009-2021 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/builtin-expect.m4 b/m4/builtin-expect.m4 index a6e889503dc..c58411643ca 100644 --- a/m4/builtin-expect.m4 +++ b/m4/builtin-expect.m4 @@ -1,6 +1,6 @@ dnl Check for __builtin_expect. -dnl Copyright 2016-2020 Free Software Foundation, Inc. +dnl Copyright 2016-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/byteswap.m4 b/m4/byteswap.m4 index 0f43994eb7d..1083b4c9e24 100644 --- a/m4/byteswap.m4 +++ b/m4/byteswap.m4 @@ -1,5 +1,5 @@ # byteswap.m4 serial 4 -dnl Copyright (C) 2005, 2007, 2009-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2005, 2007, 2009-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/canonicalize.m4 b/m4/canonicalize.m4 index c8da4dfcb6b..475fa15d6bd 100644 --- a/m4/canonicalize.m4 +++ b/m4/canonicalize.m4 @@ -1,6 +1,6 @@ -# canonicalize.m4 serial 34 +# canonicalize.m4 serial 35 -dnl Copyright (C) 2003-2007, 2009-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2003-2007, 2009-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -11,7 +11,6 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_CANONICALIZE_FILENAME_MODE], [ AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) - AC_REQUIRE([gl_FUNC_FACCESSAT_EOVERFLOW]) AC_REQUIRE([gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK]) AC_CHECK_FUNCS_ONCE([canonicalize_file_name faccessat]) AC_REQUIRE([gl_DOUBLE_SLASH_ROOT]) @@ -58,7 +57,6 @@ AC_DEFUN([gl_CANONICALIZE_LGPL], AC_DEFUN([gl_CANONICALIZE_LGPL_SEPARATE], [ AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) - AC_REQUIRE([gl_FUNC_FACCESSAT_EOVERFLOW]) AC_REQUIRE([gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK]) AC_CHECK_FUNCS_ONCE([canonicalize_file_name faccessat]) diff --git a/m4/clock_time.m4 b/m4/clock_time.m4 index f4f51fa0eac..c3b9e7ea408 100644 --- a/m4/clock_time.m4 +++ b/m4/clock_time.m4 @@ -1,5 +1,5 @@ # clock_time.m4 serial 10 -dnl Copyright (C) 2002-2006, 2009-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2009-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/close-stream.m4 b/m4/close-stream.m4 index f3cc7aa9466..feeb4eae5d3 100644 --- a/m4/close-stream.m4 +++ b/m4/close-stream.m4 @@ -1,5 +1,5 @@ #serial 4 -dnl Copyright (C) 2006-2007, 2009-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2007, 2009-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/copy-file-range.m4 b/m4/copy-file-range.m4 index 5c5a274d9cc..82904e9fce4 100644 --- a/m4/copy-file-range.m4 +++ b/m4/copy-file-range.m4 @@ -1,5 +1,5 @@ # copy-file-range.m4 -dnl Copyright 2019-2020 Free Software Foundation, Inc. +dnl Copyright 2019-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/d-type.m4 b/m4/d-type.m4 index d40220a1b59..534a59e3e5b 100644 --- a/m4/d-type.m4 +++ b/m4/d-type.m4 @@ -5,7 +5,7 @@ dnl dnl Check whether struct dirent has a member named d_type. dnl -# Copyright (C) 1997, 1999-2004, 2006, 2009-2020 Free Software Foundation, Inc. +# Copyright (C) 1997, 1999-2004, 2006, 2009-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/dirent_h.m4 b/m4/dirent_h.m4 index 8bef6a0ce61..6d861425855 100644 --- a/m4/dirent_h.m4 +++ b/m4/dirent_h.m4 @@ -1,5 +1,5 @@ # dirent_h.m4 serial 16 -dnl Copyright (C) 2008-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/dirfd.m4 b/m4/dirfd.m4 index d92445e6d80..3c9ce5dc65f 100644 --- a/m4/dirfd.m4 +++ b/m4/dirfd.m4 @@ -2,7 +2,7 @@ dnl Find out how to get the file descriptor associated with an open DIR*. -# Copyright (C) 2001-2006, 2008-2020 Free Software Foundation, Inc. +# Copyright (C) 2001-2006, 2008-2021 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/double-slash-root.m4 b/m4/double-slash-root.m4 index c463ac41aca..c9bbcef6781 100644 --- a/m4/double-slash-root.m4 +++ b/m4/double-slash-root.m4 @@ -1,5 +1,5 @@ # double-slash-root.m4 serial 4 -*- Autoconf -*- -dnl Copyright (C) 2006, 2008-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 2008-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/dup2.m4 b/m4/dup2.m4 index a82798d6bba..0753a32491e 100644 --- a/m4/dup2.m4 +++ b/m4/dup2.m4 @@ -1,5 +1,5 @@ #serial 27 -dnl Copyright (C) 2002, 2005, 2007, 2009-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2005, 2007, 2009-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/eealloc.m4 b/m4/eealloc.m4 index 236f373c564..002f0c86713 100644 --- a/m4/eealloc.m4 +++ b/m4/eealloc.m4 @@ -1,5 +1,5 @@ # eealloc.m4 serial 3 -dnl Copyright (C) 2003, 2009-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2009-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/environ.m4 b/m4/environ.m4 index bab85f13404..d971770860c 100644 --- a/m4/environ.m4 +++ b/m4/environ.m4 @@ -1,5 +1,5 @@ # environ.m4 serial 7 -dnl Copyright (C) 2001-2004, 2006-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2001-2004, 2006-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/errno_h.m4 b/m4/errno_h.m4 index dd4994f3d5d..51dfe92938d 100644 --- a/m4/errno_h.m4 +++ b/m4/errno_h.m4 @@ -1,5 +1,5 @@ # errno_h.m4 serial 13 -dnl Copyright (C) 2004, 2006, 2008-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2004, 2006, 2008-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/euidaccess.m4 b/m4/euidaccess.m4 index 39f28b39b0b..4aeb90a7e04 100644 --- a/m4/euidaccess.m4 +++ b/m4/euidaccess.m4 @@ -1,5 +1,5 @@ # euidaccess.m4 serial 15 -dnl Copyright (C) 2002-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/execinfo.m4 b/m4/execinfo.m4 index 37ee8de5927..75ab44beeea 100644 --- a/m4/execinfo.m4 +++ b/m4/execinfo.m4 @@ -1,6 +1,6 @@ # Check for GNU-style execinfo.h. -dnl Copyright 2012-2020 Free Software Foundation, Inc. +dnl Copyright 2012-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/explicit_bzero.m4 b/m4/explicit_bzero.m4 index a415e7b4f5e..d77ec5a3a5e 100644 --- a/m4/explicit_bzero.m4 +++ b/m4/explicit_bzero.m4 @@ -1,4 +1,4 @@ -dnl Copyright 2017-2020 Free Software Foundation, Inc. +dnl Copyright 2017-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/extensions.m4 b/m4/extensions.m4 index 44be1d15cbf..f7333acbd4f 100644 --- a/m4/extensions.m4 +++ b/m4/extensions.m4 @@ -1,7 +1,7 @@ # serial 21 -*- Autoconf -*- # Enable extensions on systems that normally disable them. -# Copyright (C) 2003, 2006-2020 Free Software Foundation, Inc. +# Copyright (C) 2003, 2006-2021 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/extern-inline.m4 b/m4/extern-inline.m4 index 75c50087bd0..a2acf126c87 100644 --- a/m4/extern-inline.m4 +++ b/m4/extern-inline.m4 @@ -1,6 +1,6 @@ dnl 'extern inline' a la ISO C99. -dnl Copyright 2012-2020 Free Software Foundation, Inc. +dnl Copyright 2012-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/faccessat.m4 b/m4/faccessat.m4 index a4ad31a469b..9d6b3635117 100644 --- a/m4/faccessat.m4 +++ b/m4/faccessat.m4 @@ -1,38 +1,13 @@ -# serial 9 +# serial 10 # See if we need to provide faccessat replacement. -dnl Copyright (C) 2009-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. # Written by Eric Blake. -AC_DEFUN([gl_FUNC_FACCESSAT_EOVERFLOW], -[ - AC_CHECK_FUNCS_ONCE([faccessat]) - if test "$ac_cv_func_faccessat" = yes; then - AC_CACHE_CHECK([whether faccessat works when stat would EOVERFLOW], - [gl_cv_func_faccessat_never_eoverflows], - [AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM([], - [[#ifdef __linux__ - #include <linux/version.h> - #if (! (KERNEL_VERSION (5, 8, 0) <= LINUX_VERSION_CODE \ - && 2 < (__GLIBC__ + (33 <= __GLIBC_MINOR__)))) - #error "faccessat might fail with EOVERFLOW" - #endif - #endif - ]])], - [gl_cv_func_faccessat_never_eoverflows=yes], - [gl_cv_func_faccessat_never_eoverflows=no])]) - if test "$gl_cv_func_faccessat_never_eoverflows" = yes; then - AC_DEFINE([FACCESSAT_NEVER_EOVERFLOWS], 1, - [Define to 1 if faccessat is EOVERFLOW-free.]) - fi - fi -]) - AC_DEFUN([gl_FUNC_FACCESSAT], [ AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) @@ -41,14 +16,12 @@ AC_DEFUN([gl_FUNC_FACCESSAT], dnl Persuade glibc <unistd.h> to declare faccessat(). AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) - AC_REQUIRE([gl_FUNC_FACCESSAT_EOVERFLOW]) - AC_CHECK_FUNCS_ONCE([faccessat]) if test $ac_cv_func_faccessat = no; then HAVE_FACCESSAT=0 else - case $gl_cv_func_lstat_dereferences_slashed_symlink,$gl_cv_func_faccessat_never_eoverflows in - *yes,*yes) ;; + case $gl_cv_func_lstat_dereferences_slashed_symlink in + *yes) ;; *) REPLACE_FACCESSAT=1 ;; esac fi diff --git a/m4/fchmodat.m4 b/m4/fchmodat.m4 index cf5c87999c5..09380327799 100644 --- a/m4/fchmodat.m4 +++ b/m4/fchmodat.m4 @@ -1,5 +1,5 @@ # fchmodat.m4 serial 5 -dnl Copyright (C) 2004-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2004-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/fcntl.m4 b/m4/fcntl.m4 index 547ff40b804..f6264345c1b 100644 --- a/m4/fcntl.m4 +++ b/m4/fcntl.m4 @@ -1,5 +1,5 @@ # fcntl.m4 serial 11 -dnl Copyright (C) 2009-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/fcntl_h.m4 b/m4/fcntl_h.m4 index 6b253937fd1..e63a82f10a2 100644 --- a/m4/fcntl_h.m4 +++ b/m4/fcntl_h.m4 @@ -1,6 +1,6 @@ -# serial 16 +# serial 17 # Configure fcntl.h. -dnl Copyright (C) 2006-2007, 2009-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2007, 2009-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -42,6 +42,9 @@ AC_DEFUN([gl_FCNTL_H_DEFAULTS], GNULIB_NONBLOCKING=0; AC_SUBST([GNULIB_NONBLOCKING]) GNULIB_OPEN=0; AC_SUBST([GNULIB_OPEN]) GNULIB_OPENAT=0; AC_SUBST([GNULIB_OPENAT]) + dnl Support Microsoft deprecated alias function names by default. + GNULIB_MDA_CREAT=1; AC_SUBST([GNULIB_MDA_CREAT]) + GNULIB_MDA_OPEN=1; AC_SUBST([GNULIB_MDA_OPEN]) dnl Assume proper GNU behavior unless another module says otherwise. HAVE_FCNTL=1; AC_SUBST([HAVE_FCNTL]) HAVE_OPENAT=1; AC_SUBST([HAVE_OPENAT]) diff --git a/m4/fdopendir.m4 b/m4/fdopendir.m4 index 9937a74ea8d..d42838087b5 100644 --- a/m4/fdopendir.m4 +++ b/m4/fdopendir.m4 @@ -1,7 +1,7 @@ # serial 14 # See if we need to provide fdopendir. -dnl Copyright (C) 2009-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/filemode.m4 b/m4/filemode.m4 index 8bbfcdbafe0..4dc24efbd3c 100644 --- a/m4/filemode.m4 +++ b/m4/filemode.m4 @@ -1,5 +1,5 @@ # filemode.m4 serial 9 -dnl Copyright (C) 2002, 2005-2006, 2009-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2005-2006, 2009-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/flexmember.m4 b/m4/flexmember.m4 index 90f3dddc660..49b1c752dae 100644 --- a/m4/flexmember.m4 +++ b/m4/flexmember.m4 @@ -1,7 +1,7 @@ # serial 5 # Check for flexible array member support. -# Copyright (C) 2006, 2009-2020 Free Software Foundation, Inc. +# Copyright (C) 2006, 2009-2021 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/fpending.m4 b/m4/fpending.m4 index edabcec5f0b..131356ad46a 100644 --- a/m4/fpending.m4 +++ b/m4/fpending.m4 @@ -1,6 +1,6 @@ # serial 23 -# Copyright (C) 2000-2001, 2004-2020 Free Software Foundation, Inc. +# Copyright (C) 2000-2001, 2004-2021 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/fpieee.m4 b/m4/fpieee.m4 index d5c9aefa813..3f16957fbd2 100644 --- a/m4/fpieee.m4 +++ b/m4/fpieee.m4 @@ -1,5 +1,5 @@ # fpieee.m4 serial 2 -*- coding: utf-8 -*- -dnl Copyright (C) 2007, 2009-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/free.m4 b/m4/free.m4 index bf9fc31d9b4..d671376b0bb 100644 --- a/m4/free.m4 +++ b/m4/free.m4 @@ -1,5 +1,5 @@ # free.m4 serial 5 -# Copyright (C) 2003-2005, 2009-2020 Free Software Foundation, Inc. +# Copyright (C) 2003-2005, 2009-2021 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/fstatat.m4 b/m4/fstatat.m4 index 19583ed1e40..d730e46d303 100644 --- a/m4/fstatat.m4 +++ b/m4/fstatat.m4 @@ -1,5 +1,5 @@ # fstatat.m4 serial 4 -dnl Copyright (C) 2004-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2004-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/fsusage.m4 b/m4/fsusage.m4 index c15cfca4d3e..d005579f9e0 100644 --- a/m4/fsusage.m4 +++ b/m4/fsusage.m4 @@ -1,7 +1,7 @@ # serial 35 # Obtaining file system usage information. -# Copyright (C) 1997-1998, 2000-2001, 2003-2020 Free Software Foundation, Inc. +# Copyright (C) 1997-1998, 2000-2001, 2003-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/fsync.m4 b/m4/fsync.m4 index c86c0e6a53d..6dc8cd1c0fa 100644 --- a/m4/fsync.m4 +++ b/m4/fsync.m4 @@ -1,5 +1,5 @@ # fsync.m4 serial 2 -dnl Copyright (C) 2008-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/futimens.m4 b/m4/futimens.m4 index 145b8ff0d51..2e9f53e5a81 100644 --- a/m4/futimens.m4 +++ b/m4/futimens.m4 @@ -1,7 +1,7 @@ # serial 9 # See if we need to provide futimens replacement. -dnl Copyright (C) 2009-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/getdtablesize.m4 b/m4/getdtablesize.m4 index af328644adb..8fbc941898f 100644 --- a/m4/getdtablesize.m4 +++ b/m4/getdtablesize.m4 @@ -1,5 +1,5 @@ # getdtablesize.m4 serial 8 -dnl Copyright (C) 2008-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/getgroups.m4 b/m4/getgroups.m4 index e3441621b25..bd746cdf88f 100644 --- a/m4/getgroups.m4 +++ b/m4/getgroups.m4 @@ -3,7 +3,7 @@ dnl From Jim Meyering. dnl A wrapper around AC_FUNC_GETGROUPS. -# Copyright (C) 1996-1997, 1999-2004, 2008-2020 Free Software Foundation, Inc. +# Copyright (C) 1996-1997, 1999-2004, 2008-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/getloadavg.m4 b/m4/getloadavg.m4 index 9fe328efc02..bba22169497 100644 --- a/m4/getloadavg.m4 +++ b/m4/getloadavg.m4 @@ -1,6 +1,6 @@ # Check for getloadavg. -# Copyright (C) 1992-1996, 1999-2000, 2002-2003, 2006, 2008-2020 Free Software +# Copyright (C) 1992-1996, 1999-2000, 2002-2003, 2006, 2008-2021 Free Software # Foundation, Inc. # This file is free software; the Free Software Foundation diff --git a/m4/getopt.m4 b/m4/getopt.m4 index 595483d58cb..bb95c5ea28e 100644 --- a/m4/getopt.m4 +++ b/m4/getopt.m4 @@ -1,5 +1,5 @@ # getopt.m4 serial 47 -dnl Copyright (C) 2002-2006, 2008-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2008-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/getrandom.m4 b/m4/getrandom.m4 index d6da71a2c83..5f174dc7eb3 100644 --- a/m4/getrandom.m4 +++ b/m4/getrandom.m4 @@ -1,5 +1,5 @@ # getrandom.m4 serial 8 -dnl Copyright 2020 Free Software Foundation, Inc. +dnl Copyright 2020-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/gettime.m4 b/m4/gettime.m4 index e65455a2ff9..de7c33046c2 100644 --- a/m4/gettime.m4 +++ b/m4/gettime.m4 @@ -1,5 +1,5 @@ # gettime.m4 serial 9 -dnl Copyright (C) 2002, 2004-2006, 2009-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2004-2006, 2009-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/gettimeofday.m4 b/m4/gettimeofday.m4 index 578ed49b077..3c200815740 100644 --- a/m4/gettimeofday.m4 +++ b/m4/gettimeofday.m4 @@ -1,6 +1,6 @@ # serial 28 -# Copyright (C) 2001-2003, 2005, 2007, 2009-2020 Free Software Foundation, Inc. +# Copyright (C) 2001-2003, 2005, 2007, 2009-2021 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/glibc21.m4 b/m4/glibc21.m4 index ece484b5ae9..74a781aa1c9 100644 --- a/m4/glibc21.m4 +++ b/m4/glibc21.m4 @@ -1,6 +1,6 @@ # glibc21.m4 serial 5 -dnl Copyright (C) 2000-2002, 2004, 2008, 2010-2020 Free Software Foundation, -dnl Inc. +dnl Copyright (C) 2000-2002, 2004, 2008, 2010-2021 Free Software +dnl Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/gnulib-common.m4 b/m4/gnulib-common.m4 index 2c0ae9bef40..535359b2cf6 100644 --- a/m4/gnulib-common.m4 +++ b/m4/gnulib-common.m4 @@ -1,5 +1,5 @@ # gnulib-common.m4 serial 63 -dnl Copyright (C) 2007-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 index 0971636c33d..ad109520dd1 100644 --- a/m4/gnulib-comp.m4 +++ b/m4/gnulib-comp.m4 @@ -1,5 +1,5 @@ # DO NOT EDIT! GENERATED AUTOMATICALLY! -# Copyright (C) 2002-2020 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 Free Software Foundation, Inc. # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -1077,6 +1077,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/limits.in.h lib/lstat.c lib/malloc/scratch_buffer.h + lib/malloc/scratch_buffer_dupfree.c lib/malloc/scratch_buffer_grow.c lib/malloc/scratch_buffer_grow_preserve.c lib/malloc/scratch_buffer_set_array_size.c @@ -1216,7 +1217,6 @@ AC_DEFUN([gl_FILE_LIST], [ m4/gettime.m4 m4/gettimeofday.m4 m4/gl-openssl.m4 - m4/glibc21.m4 m4/gnulib-common.m4 m4/group-member.m4 m4/ieee754-h.m4 diff --git a/m4/group-member.m4 b/m4/group-member.m4 index ad7368ceecb..7a7bb40afcb 100644 --- a/m4/group-member.m4 +++ b/m4/group-member.m4 @@ -1,6 +1,6 @@ # serial 14 -# Copyright (C) 1999-2001, 2003-2007, 2009-2020 Free Software Foundation, Inc. +# Copyright (C) 1999-2001, 2003-2007, 2009-2021 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/ieee754-h.m4 b/m4/ieee754-h.m4 index 8ec4583348e..68af3bd7ebe 100644 --- a/m4/ieee754-h.m4 +++ b/m4/ieee754-h.m4 @@ -1,6 +1,6 @@ # Configure ieee754-h module -dnl Copyright 2018-2020 Free Software Foundation, Inc. +dnl Copyright 2018-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/include_next.m4 b/m4/include_next.m4 index 9221d9f7d5f..bdd542bc64d 100644 --- a/m4/include_next.m4 +++ b/m4/include_next.m4 @@ -1,5 +1,5 @@ # include_next.m4 serial 26 -dnl Copyright (C) 2006-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/inttypes.m4 b/m4/inttypes.m4 index 84b1654ea26..f56e94a8881 100644 --- a/m4/inttypes.m4 +++ b/m4/inttypes.m4 @@ -1,5 +1,5 @@ # inttypes.m4 serial 32 -dnl Copyright (C) 2006-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/largefile.m4 b/m4/largefile.m4 index c4cc835bea0..cadb16dc972 100644 --- a/m4/largefile.m4 +++ b/m4/largefile.m4 @@ -1,7 +1,7 @@ # Enable large files on systems where this is not the default. # Enable support for files on Linux file systems with 64-bit inode numbers. -# Copyright 1992-1996, 1998-2020 Free Software Foundation, Inc. +# Copyright 1992-1996, 1998-2021 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/lchmod.m4 b/m4/lchmod.m4 index a86a304f5f1..3d181be051e 100644 --- a/m4/lchmod.m4 +++ b/m4/lchmod.m4 @@ -1,6 +1,6 @@ #serial 8 -dnl Copyright (C) 2005-2006, 2008-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2005-2006, 2008-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/libgmp.m4 b/m4/libgmp.m4 index 1025f06a775..c630a19e640 100644 --- a/m4/libgmp.m4 +++ b/m4/libgmp.m4 @@ -1,6 +1,6 @@ # libgmp.m4 serial 5 # Configure the GMP library or a replacement. -dnl Copyright 2020 Free Software Foundation, Inc. +dnl Copyright 2020-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/limits-h.m4 b/m4/limits-h.m4 index 0b4f092a432..70dbb7dcfa0 100644 --- a/m4/limits-h.m4 +++ b/m4/limits-h.m4 @@ -1,6 +1,6 @@ dnl Check whether limits.h has needed features. -dnl Copyright 2016-2020 Free Software Foundation, Inc. +dnl Copyright 2016-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/lstat.m4 b/m4/lstat.m4 index 3c2b214b857..62e9db29a73 100644 --- a/m4/lstat.m4 +++ b/m4/lstat.m4 @@ -1,6 +1,6 @@ # serial 33 -# Copyright (C) 1997-2001, 2003-2020 Free Software Foundation, Inc. +# Copyright (C) 1997-2001, 2003-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/malloca.m4 b/m4/malloca.m4 index 930199da14a..7ee33773d25 100644 --- a/m4/malloca.m4 +++ b/m4/malloca.m4 @@ -1,6 +1,6 @@ # malloca.m4 serial 2 -dnl Copyright (C) 2003-2004, 2006-2007, 2009-2020 Free Software Foundation, -dnl Inc. +dnl Copyright (C) 2003-2004, 2006-2007, 2009-2021 Free Software +dnl Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/manywarnings.m4 b/m4/manywarnings.m4 index a37cd15b69a..53ab1534036 100644 --- a/m4/manywarnings.m4 +++ b/m4/manywarnings.m4 @@ -1,5 +1,5 @@ # manywarnings.m4 serial 21 -dnl Copyright (C) 2008-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/mbstate_t.m4 b/m4/mbstate_t.m4 index 226f1228dde..e7fe3580dbc 100644 --- a/m4/mbstate_t.m4 +++ b/m4/mbstate_t.m4 @@ -1,5 +1,5 @@ # mbstate_t.m4 serial 14 -dnl Copyright (C) 2000-2002, 2008-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2000-2002, 2008-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/md5.m4 b/m4/md5.m4 index ca213ed055f..021b352aac0 100644 --- a/m4/md5.m4 +++ b/m4/md5.m4 @@ -1,5 +1,5 @@ # md5.m4 serial 14 -dnl Copyright (C) 2002-2006, 2008-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2008-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/memmem.m4 b/m4/memmem.m4 index 35a5bb19d1a..e2a785f48d4 100644 --- a/m4/memmem.m4 +++ b/m4/memmem.m4 @@ -1,5 +1,5 @@ # memmem.m4 serial 27 -dnl Copyright (C) 2002-2004, 2007-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2004, 2007-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/mempcpy.m4 b/m4/mempcpy.m4 index 899f12a880a..c5ee2af8ccd 100644 --- a/m4/mempcpy.m4 +++ b/m4/mempcpy.m4 @@ -1,5 +1,5 @@ # mempcpy.m4 serial 11 -dnl Copyright (C) 2003-2004, 2006-2007, 2009-2020 Free Software Foundation, +dnl Copyright (C) 2003-2004, 2006-2007, 2009-2021 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/memrchr.m4 b/m4/memrchr.m4 index 95990ed6b76..d0c05896e54 100644 --- a/m4/memrchr.m4 +++ b/m4/memrchr.m4 @@ -1,5 +1,5 @@ # memrchr.m4 serial 10 -dnl Copyright (C) 2002-2003, 2005-2007, 2009-2020 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2007, 2009-2021 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/minmax.m4 b/m4/minmax.m4 index e5b28b0b8b4..e21a6879a09 100644 --- a/m4/minmax.m4 +++ b/m4/minmax.m4 @@ -1,5 +1,5 @@ # minmax.m4 serial 4 -dnl Copyright (C) 2005, 2009-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2005, 2009-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/mkostemp.m4 b/m4/mkostemp.m4 index 3e5b5555582..46534d48ef5 100644 --- a/m4/mkostemp.m4 +++ b/m4/mkostemp.m4 @@ -1,5 +1,5 @@ # mkostemp.m4 serial 2 -dnl Copyright (C) 2009-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/mktime.m4 b/m4/mktime.m4 index 4e7e423fa54..245649e774a 100644 --- a/m4/mktime.m4 +++ b/m4/mktime.m4 @@ -1,5 +1,5 @@ # serial 35 -dnl Copyright (C) 2002-2003, 2005-2007, 2009-2020 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2007, 2009-2021 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/mode_t.m4 b/m4/mode_t.m4 index f1909517c2d..3bd4b89fee2 100644 --- a/m4/mode_t.m4 +++ b/m4/mode_t.m4 @@ -1,5 +1,5 @@ # mode_t.m4 serial 2 -dnl Copyright (C) 2009-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/multiarch.m4 b/m4/multiarch.m4 index 2c61afbd76e..f1678d9f6ee 100644 --- a/m4/multiarch.m4 +++ b/m4/multiarch.m4 @@ -1,5 +1,5 @@ # multiarch.m4 serial 9 -dnl Copyright (C) 2008-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/nocrash.m4 b/m4/nocrash.m4 index 637a0ea45be..27412cd2e8c 100644 --- a/m4/nocrash.m4 +++ b/m4/nocrash.m4 @@ -1,5 +1,5 @@ # nocrash.m4 serial 5 -dnl Copyright (C) 2005, 2009-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2005, 2009-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/nstrftime.m4 b/m4/nstrftime.m4 index e4eb87de0b9..4674442810b 100644 --- a/m4/nstrftime.m4 +++ b/m4/nstrftime.m4 @@ -1,6 +1,6 @@ # serial 36 -# Copyright (C) 1996-1997, 1999-2007, 2009-2020 Free Software Foundation, Inc. +# Copyright (C) 1996-1997, 1999-2007, 2009-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/off_t.m4 b/m4/off_t.m4 index 6e19af881ed..bdec43c804e 100644 --- a/m4/off_t.m4 +++ b/m4/off_t.m4 @@ -1,5 +1,5 @@ # off_t.m4 serial 1 -dnl Copyright (C) 2012-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2012-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/open-cloexec.m4 b/m4/open-cloexec.m4 index 11652d5f81c..542a90f42a7 100644 --- a/m4/open-cloexec.m4 +++ b/m4/open-cloexec.m4 @@ -1,6 +1,6 @@ # Test whether O_CLOEXEC is defined. -dnl Copyright 2017-2020 Free Software Foundation, Inc. +dnl Copyright 2017-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/open-slash.m4 b/m4/open-slash.m4 index 5d84f2b548a..e619039e873 100644 --- a/m4/open-slash.m4 +++ b/m4/open-slash.m4 @@ -1,5 +1,5 @@ # open-slash.m4 serial 2 -dnl Copyright (C) 2007-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/open.m4 b/m4/open.m4 index 552eedf8c53..c63438650df 100644 --- a/m4/open.m4 +++ b/m4/open.m4 @@ -1,5 +1,5 @@ # open.m4 serial 15 -dnl Copyright (C) 2007-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/pathmax.m4 b/m4/pathmax.m4 index bb4fdeba750..e67c656659b 100644 --- a/m4/pathmax.m4 +++ b/m4/pathmax.m4 @@ -1,5 +1,5 @@ # pathmax.m4 serial 11 -dnl Copyright (C) 2002-2003, 2005-2006, 2009-2020 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2006, 2009-2021 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/pid_t.m4 b/m4/pid_t.m4 index c7abceeecba..b7650a10f13 100644 --- a/m4/pid_t.m4 +++ b/m4/pid_t.m4 @@ -1,5 +1,5 @@ # pid_t.m4 serial 4 -dnl Copyright (C) 2020 Free Software Foundation, Inc. +dnl Copyright (C) 2020-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/pipe2.m4 b/m4/pipe2.m4 index d36821ed1aa..43d547cb401 100644 --- a/m4/pipe2.m4 +++ b/m4/pipe2.m4 @@ -1,5 +1,5 @@ # pipe2.m4 serial 2 -dnl Copyright (C) 2009-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/pselect.m4 b/m4/pselect.m4 index 08a5823c6f9..538fe7dc122 100644 --- a/m4/pselect.m4 +++ b/m4/pselect.m4 @@ -1,5 +1,5 @@ # pselect.m4 serial 9 -dnl Copyright (C) 2011-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/pthread_sigmask.m4 b/m4/pthread_sigmask.m4 index 030862de015..eb4c7849655 100644 --- a/m4/pthread_sigmask.m4 +++ b/m4/pthread_sigmask.m4 @@ -1,5 +1,5 @@ # pthread_sigmask.m4 serial 19 -dnl Copyright (C) 2011-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/rawmemchr.m4 b/m4/rawmemchr.m4 index c5bf04189c6..f92846543cc 100644 --- a/m4/rawmemchr.m4 +++ b/m4/rawmemchr.m4 @@ -1,5 +1,5 @@ # rawmemchr.m4 serial 2 -dnl Copyright (C) 2003, 2007-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2007-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/readlink.m4 b/m4/readlink.m4 index c7f436a3125..352788c65d0 100644 --- a/m4/readlink.m4 +++ b/m4/readlink.m4 @@ -1,5 +1,5 @@ # readlink.m4 serial 16 -dnl Copyright (C) 2003, 2007, 2009-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2007, 2009-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/readlinkat.m4 b/m4/readlinkat.m4 index 73e343f746d..1ced6721856 100644 --- a/m4/readlinkat.m4 +++ b/m4/readlinkat.m4 @@ -1,7 +1,7 @@ # serial 6 # See if we need to provide readlinkat replacement. -dnl Copyright (C) 2009-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/regex.m4 b/m4/regex.m4 index e723f591216..850c572228a 100644 --- a/m4/regex.m4 +++ b/m4/regex.m4 @@ -1,6 +1,6 @@ -# serial 70 +# serial 71 -# Copyright (C) 1996-2001, 2003-2020 Free Software Foundation, Inc. +# Copyright (C) 1996-2001, 2003-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -354,7 +354,6 @@ AC_DEFUN([gl_PREREQ_REGEX], AC_REQUIRE([AC_C_RESTRICT]) AC_REQUIRE([AC_TYPE_MBSTATE_T]) AC_REQUIRE([gl_EEMALLOC]) - AC_REQUIRE([gl_GLIBC21]) AC_CHECK_HEADERS([libintl.h]) AC_CHECK_FUNCS_ONCE([isblank iswctype]) AC_CHECK_DECLS([isblank], [], [], [[#include <ctype.h>]]) diff --git a/m4/sha1.m4 b/m4/sha1.m4 index 35e3f7580ef..fdba7a6f7b1 100644 --- a/m4/sha1.m4 +++ b/m4/sha1.m4 @@ -1,5 +1,5 @@ # sha1.m4 serial 12 -dnl Copyright (C) 2002-2006, 2008-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2008-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sha256.m4 b/m4/sha256.m4 index 85ff1d5ba8a..f49899c84cc 100644 --- a/m4/sha256.m4 +++ b/m4/sha256.m4 @@ -1,5 +1,5 @@ # sha256.m4 serial 8 -dnl Copyright (C) 2005, 2008-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2005, 2008-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sha512.m4 b/m4/sha512.m4 index fe1592a2600..b45fdf50f61 100644 --- a/m4/sha512.m4 +++ b/m4/sha512.m4 @@ -1,5 +1,5 @@ # sha512.m4 serial 9 -dnl Copyright (C) 2005-2006, 2008-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2005-2006, 2008-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sig2str.m4 b/m4/sig2str.m4 index 415290c4dee..8951bbd7f0c 100644 --- a/m4/sig2str.m4 +++ b/m4/sig2str.m4 @@ -1,5 +1,5 @@ # serial 7 -dnl Copyright (C) 2002, 2005-2006, 2009-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2005-2006, 2009-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sigdescr_np.m4 b/m4/sigdescr_np.m4 index f0f3f979e83..f6fa63140c4 100644 --- a/m4/sigdescr_np.m4 +++ b/m4/sigdescr_np.m4 @@ -1,5 +1,5 @@ # sigdescr_np.m4 serial 1 -dnl Copyright (C) 2020 Free Software Foundation, Inc. +dnl Copyright (C) 2020-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/signal_h.m4 b/m4/signal_h.m4 index b2629809f18..ff9f0251fd9 100644 --- a/m4/signal_h.m4 +++ b/m4/signal_h.m4 @@ -1,5 +1,5 @@ # signal_h.m4 serial 19 -dnl Copyright (C) 2007-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/socklen.m4 b/m4/socklen.m4 index 251960b0ac0..eca1d1b9462 100644 --- a/m4/socklen.m4 +++ b/m4/socklen.m4 @@ -1,5 +1,5 @@ # socklen.m4 serial 11 -dnl Copyright (C) 2005-2007, 2009-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2005-2007, 2009-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/ssize_t.m4 b/m4/ssize_t.m4 index 6c0a588873c..f0ed509fcc5 100644 --- a/m4/ssize_t.m4 +++ b/m4/ssize_t.m4 @@ -1,5 +1,5 @@ # ssize_t.m4 serial 5 (gettext-0.18.2) -dnl Copyright (C) 2001-2003, 2006, 2010-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2001-2003, 2006, 2010-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/st_dm_mode.m4 b/m4/st_dm_mode.m4 index 5dad161c3b2..b39c3ee9976 100644 --- a/m4/st_dm_mode.m4 +++ b/m4/st_dm_mode.m4 @@ -1,6 +1,7 @@ # serial 6 -# Copyright (C) 1998-1999, 2001, 2009-2020 Free Software Foundation, Inc. +# Copyright (C) 1998-1999, 2001, 2009-2021 Free Software Foundation, +# Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/stat-time.m4 b/m4/stat-time.m4 index 0ac3f7272e3..df1c2a7453a 100644 --- a/m4/stat-time.m4 +++ b/m4/stat-time.m4 @@ -1,6 +1,6 @@ # Checks for stat-related time functions. -# Copyright (C) 1998-1999, 2001, 2003, 2005-2007, 2009-2020 Free Software +# Copyright (C) 1998-1999, 2001, 2003, 2005-2007, 2009-2021 Free Software # Foundation, Inc. # This file is free software; the Free Software Foundation diff --git a/m4/std-gnu11.m4 b/m4/std-gnu11.m4 index b5ab8abed02..7b1a042af1b 100644 --- a/m4/std-gnu11.m4 +++ b/m4/std-gnu11.m4 @@ -9,7 +9,7 @@ m4_version_prereq([2.70], [], [ -# Copyright (C) 2001-2020 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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/m4/stdalign.m4 b/m4/stdalign.m4 index dcf778e6456..8dcb634d55b 100644 --- a/m4/stdalign.m4 +++ b/m4/stdalign.m4 @@ -1,6 +1,6 @@ # Check for stdalign.h that conforms to C11. -dnl Copyright 2011-2020 Free Software Foundation, Inc. +dnl Copyright 2011-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/stddef_h.m4 b/m4/stddef_h.m4 index d8bc8ff64e4..18e872f483e 100644 --- a/m4/stddef_h.m4 +++ b/m4/stddef_h.m4 @@ -1,6 +1,6 @@ dnl A placeholder for <stddef.h>, for platforms that have issues. # stddef_h.m4 serial 7 -dnl Copyright (C) 2009-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/stdint.m4 b/m4/stdint.m4 index adaea3e5826..a785b44ed17 100644 --- a/m4/stdint.m4 +++ b/m4/stdint.m4 @@ -1,5 +1,5 @@ # stdint.m4 serial 58 -dnl Copyright (C) 2001-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2001-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/stdio_h.m4 b/m4/stdio_h.m4 index 6003a31b382..4c3f24accaa 100644 --- a/m4/stdio_h.m4 +++ b/m4/stdio_h.m4 @@ -1,5 +1,5 @@ -# stdio_h.m4 serial 51 -dnl Copyright (C) 2007-2020 Free Software Foundation, Inc. +# stdio_h.m4 serial 52 +dnl Copyright (C) 2007-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -180,6 +180,13 @@ AC_DEFUN([gl_STDIO_H_DEFAULTS], GNULIB_VPRINTF_POSIX=0; AC_SUBST([GNULIB_VPRINTF_POSIX]) GNULIB_VSNPRINTF=0; AC_SUBST([GNULIB_VSNPRINTF]) GNULIB_VSPRINTF_POSIX=0; AC_SUBST([GNULIB_VSPRINTF_POSIX]) + dnl Support Microsoft deprecated alias function names by default. + GNULIB_MDA_FCLOSEALL=1; AC_SUBST([GNULIB_MDA_FCLOSEALL]) + GNULIB_MDA_FDOPEN=1; AC_SUBST([GNULIB_MDA_FDOPEN]) + GNULIB_MDA_FILENO=1; AC_SUBST([GNULIB_MDA_FILENO]) + GNULIB_MDA_GETW=1; AC_SUBST([GNULIB_MDA_GETW]) + GNULIB_MDA_PUTW=1; AC_SUBST([GNULIB_MDA_PUTW]) + GNULIB_MDA_TEMPNAM=1; AC_SUBST([GNULIB_MDA_TEMPNAM]) dnl Assume proper GNU behavior unless another module says otherwise. HAVE_DECL_FCLOSEALL=1; AC_SUBST([HAVE_DECL_FCLOSEALL]) HAVE_DECL_FPURGE=1; AC_SUBST([HAVE_DECL_FPURGE]) diff --git a/m4/stdlib_h.m4 b/m4/stdlib_h.m4 index 7e03b9a6d58..5a02972e05d 100644 --- a/m4/stdlib_h.m4 +++ b/m4/stdlib_h.m4 @@ -1,5 +1,5 @@ -# stdlib_h.m4 serial 54 -dnl Copyright (C) 2007-2020 Free Software Foundation, Inc. +# stdlib_h.m4 serial 55 +dnl Copyright (C) 2007-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -95,6 +95,12 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS], GNULIB_UNLOCKPT=0; AC_SUBST([GNULIB_UNLOCKPT]) GNULIB_UNSETENV=0; AC_SUBST([GNULIB_UNSETENV]) GNULIB_WCTOMB=0; AC_SUBST([GNULIB_WCTOMB]) + dnl Support Microsoft deprecated alias function names by default. + GNULIB_MDA_ECVT=1; AC_SUBST([GNULIB_MDA_ECVT]) + GNULIB_MDA_FCVT=1; AC_SUBST([GNULIB_MDA_FCVT]) + GNULIB_MDA_GCVT=1; AC_SUBST([GNULIB_MDA_GCVT]) + GNULIB_MDA_MKTEMP=1; AC_SUBST([GNULIB_MDA_MKTEMP]) + GNULIB_MDA_PUTENV=1; AC_SUBST([GNULIB_MDA_PUTENV]) dnl Assume proper GNU behavior unless another module says otherwise. HAVE__EXIT=1; AC_SUBST([HAVE__EXIT]) HAVE_ALIGNED_ALLOC=1; AC_SUBST([HAVE_ALIGNED_ALLOC]) diff --git a/m4/stpcpy.m4 b/m4/stpcpy.m4 index 0f0fa9eaaed..28db4f45dfe 100644 --- a/m4/stpcpy.m4 +++ b/m4/stpcpy.m4 @@ -1,5 +1,5 @@ # stpcpy.m4 serial 8 -dnl Copyright (C) 2002, 2007, 2009-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2007, 2009-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/string_h.m4 b/m4/string_h.m4 index 29796b8629f..3e65355735c 100644 --- a/m4/string_h.m4 +++ b/m4/string_h.m4 @@ -1,11 +1,11 @@ # Configure a GNU-like replacement for <string.h>. -# Copyright (C) 2007-2020 Free Software Foundation, Inc. +# Copyright (C) 2007-2021 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 27 +# serial 28 # Written by Paul Eggert. @@ -86,6 +86,9 @@ AC_DEFUN([gl_HEADER_STRING_H_DEFAULTS], GNULIB_STRSIGNAL=0; AC_SUBST([GNULIB_STRSIGNAL]) GNULIB_STRVERSCMP=0; AC_SUBST([GNULIB_STRVERSCMP]) HAVE_MBSLEN=0; AC_SUBST([HAVE_MBSLEN]) + dnl Support Microsoft deprecated alias function names by default. + GNULIB_MDA_MEMCCPY=1; AC_SUBST([GNULIB_MDA_MEMCCPY]) + GNULIB_MDA_STRDUP=1; AC_SUBST([GNULIB_MDA_STRDUP]) dnl Assume proper GNU behavior unless another module says otherwise. HAVE_EXPLICIT_BZERO=1; AC_SUBST([HAVE_EXPLICIT_BZERO]) HAVE_FFSL=1; AC_SUBST([HAVE_FFSL]) diff --git a/m4/strnlen.m4 b/m4/strnlen.m4 index 71b8e1baffe..bb9a680fdc4 100644 --- a/m4/strnlen.m4 +++ b/m4/strnlen.m4 @@ -1,5 +1,5 @@ # strnlen.m4 serial 13 -dnl Copyright (C) 2002-2003, 2005-2007, 2009-2020 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2007, 2009-2021 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/strtoimax.m4 b/m4/strtoimax.m4 index 4958e3dcd50..d767d574510 100644 --- a/m4/strtoimax.m4 +++ b/m4/strtoimax.m4 @@ -1,5 +1,5 @@ # strtoimax.m4 serial 16 -dnl Copyright (C) 2002-2004, 2006, 2009-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2004, 2006, 2009-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/strtoll.m4 b/m4/strtoll.m4 index edcde3b5582..d2c9e5310d1 100644 --- a/m4/strtoll.m4 +++ b/m4/strtoll.m4 @@ -1,5 +1,5 @@ # strtoll.m4 serial 8 -dnl Copyright (C) 2002, 2004, 2006, 2008-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2004, 2006, 2008-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/symlink.m4 b/m4/symlink.m4 index 9cfdf93943c..209decee4c4 100644 --- a/m4/symlink.m4 +++ b/m4/symlink.m4 @@ -1,7 +1,7 @@ # serial 9 # See if we need to provide symlink replacement. -dnl Copyright (C) 2009-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sys_random_h.m4 b/m4/sys_random_h.m4 index 8c5d53703be..45e0469ba05 100644 --- a/m4/sys_random_h.m4 +++ b/m4/sys_random_h.m4 @@ -1,5 +1,5 @@ # sys_random_h.m4 serial 5 -dnl Copyright (C) 2020 Free Software Foundation, Inc. +dnl Copyright (C) 2020-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sys_select_h.m4 b/m4/sys_select_h.m4 index fa19bb65f6e..4b33d312e55 100644 --- a/m4/sys_select_h.m4 +++ b/m4/sys_select_h.m4 @@ -1,5 +1,5 @@ # sys_select_h.m4 serial 20 -dnl Copyright (C) 2006-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sys_socket_h.m4 b/m4/sys_socket_h.m4 index bf902f08108..503cb9668b7 100644 --- a/m4/sys_socket_h.m4 +++ b/m4/sys_socket_h.m4 @@ -1,5 +1,5 @@ # sys_socket_h.m4 serial 25 -dnl Copyright (C) 2005-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2005-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sys_stat_h.m4 b/m4/sys_stat_h.m4 index 929144d155b..e8eac71b466 100644 --- a/m4/sys_stat_h.m4 +++ b/m4/sys_stat_h.m4 @@ -1,5 +1,5 @@ -# sys_stat_h.m4 serial 34 -*- Autoconf -*- -dnl Copyright (C) 2006-2020 Free Software Foundation, Inc. +# sys_stat_h.m4 serial 36 -*- Autoconf -*- +dnl Copyright (C) 2006-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -71,6 +71,7 @@ AC_DEFUN([gl_SYS_STAT_H_DEFAULTS], GNULIB_GETUMASK=0; AC_SUBST([GNULIB_GETUMASK]) GNULIB_LCHMOD=0; AC_SUBST([GNULIB_LCHMOD]) GNULIB_LSTAT=0; AC_SUBST([GNULIB_LSTAT]) + GNULIB_MKDIR=0; AC_SUBST([GNULIB_MKDIR]) GNULIB_MKDIRAT=0; AC_SUBST([GNULIB_MKDIRAT]) GNULIB_MKFIFO=0; AC_SUBST([GNULIB_MKFIFO]) GNULIB_MKFIFOAT=0; AC_SUBST([GNULIB_MKFIFOAT]) @@ -79,6 +80,10 @@ AC_DEFUN([gl_SYS_STAT_H_DEFAULTS], GNULIB_STAT=0; AC_SUBST([GNULIB_STAT]) GNULIB_UTIMENSAT=0; AC_SUBST([GNULIB_UTIMENSAT]) GNULIB_OVERRIDES_STRUCT_STAT=0; AC_SUBST([GNULIB_OVERRIDES_STRUCT_STAT]) + dnl Support Microsoft deprecated alias function names by default. + GNULIB_MDA_CHMOD=1; AC_SUBST([GNULIB_MDA_CHMOD]) + GNULIB_MDA_MKDIR=1; AC_SUBST([GNULIB_MDA_MKDIR]) + GNULIB_MDA_UMASK=1; AC_SUBST([GNULIB_MDA_UMASK]) dnl Assume proper GNU behavior unless another module says otherwise. HAVE_FCHMODAT=1; AC_SUBST([HAVE_FCHMODAT]) HAVE_FSTATAT=1; AC_SUBST([HAVE_FSTATAT]) diff --git a/m4/sys_time_h.m4 b/m4/sys_time_h.m4 index 8fc8599242d..64f133d5133 100644 --- a/m4/sys_time_h.m4 +++ b/m4/sys_time_h.m4 @@ -1,7 +1,7 @@ # Configure a replacement for <sys/time.h>. # serial 9 -# Copyright (C) 2007, 2009-2020 Free Software Foundation, Inc. +# Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/sys_types_h.m4 b/m4/sys_types_h.m4 index c3a691becdf..2172c836d95 100644 --- a/m4/sys_types_h.m4 +++ b/m4/sys_types_h.m4 @@ -1,5 +1,5 @@ # sys_types_h.m4 serial 11 -dnl Copyright (C) 2011-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/tempname.m4 b/m4/tempname.m4 index da439f07b58..14c796d3eb3 100644 --- a/m4/tempname.m4 +++ b/m4/tempname.m4 @@ -1,6 +1,6 @@ #serial 5 -# Copyright (C) 2006-2007, 2009-2020 Free Software Foundation, Inc. +# Copyright (C) 2006-2007, 2009-2021 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/time_h.m4 b/m4/time_h.m4 index a15c09dc07b..07e6967e45b 100644 --- a/m4/time_h.m4 +++ b/m4/time_h.m4 @@ -1,8 +1,8 @@ # Configure a more-standard replacement for <time.h>. -# Copyright (C) 2000-2001, 2003-2007, 2009-2020 Free Software Foundation, Inc. +# Copyright (C) 2000-2001, 2003-2007, 2009-2021 Free Software Foundation, Inc. -# serial 12 +# serial 13 # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -116,6 +116,8 @@ AC_DEFUN([gl_HEADER_TIME_H_DEFAULTS], GNULIB_TIME_R=0; AC_SUBST([GNULIB_TIME_R]) GNULIB_TIME_RZ=0; AC_SUBST([GNULIB_TIME_RZ]) GNULIB_TZSET=0; AC_SUBST([GNULIB_TZSET]) + dnl Support Microsoft deprecated alias function names by default. + GNULIB_MDA_TZSET=1; AC_SUBST([GNULIB_MDA_TZSET]) dnl Assume proper GNU behavior unless another module says otherwise. HAVE_DECL_LOCALTIME_R=1; AC_SUBST([HAVE_DECL_LOCALTIME_R]) HAVE_NANOSLEEP=1; AC_SUBST([HAVE_NANOSLEEP]) diff --git a/m4/time_r.m4 b/m4/time_r.m4 index 0e86d4496c5..713e93ac263 100644 --- a/m4/time_r.m4 +++ b/m4/time_r.m4 @@ -1,6 +1,6 @@ dnl Reentrant time functions: localtime_r, gmtime_r. -dnl Copyright (C) 2003, 2006-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2006-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/time_rz.m4 b/m4/time_rz.m4 index 30161c01e63..34ef0bab4b9 100644 --- a/m4/time_rz.m4 +++ b/m4/time_rz.m4 @@ -1,6 +1,6 @@ dnl Time zone functions: tzalloc, localtime_rz, etc. -dnl Copyright (C) 2015-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2015-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/timegm.m4 b/m4/timegm.m4 index 67c0c3b5f1b..098c857e7f2 100644 --- a/m4/timegm.m4 +++ b/m4/timegm.m4 @@ -1,5 +1,5 @@ # timegm.m4 serial 12 -dnl Copyright (C) 2003, 2007, 2009-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2007, 2009-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/timer_time.m4 b/m4/timer_time.m4 index fdb288df24b..f0e5785e9aa 100644 --- a/m4/timer_time.m4 +++ b/m4/timer_time.m4 @@ -1,5 +1,5 @@ # timer_time.m4 serial 4 -dnl Copyright (C) 2011-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/timespec.m4 b/m4/timespec.m4 index e71628dc318..40307d4f607 100644 --- a/m4/timespec.m4 +++ b/m4/timespec.m4 @@ -1,6 +1,6 @@ #serial 15 -# Copyright (C) 2000-2001, 2003-2007, 2009-2020 Free Software Foundation, Inc. +# Copyright (C) 2000-2001, 2003-2007, 2009-2021 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/tm_gmtoff.m4 b/m4/tm_gmtoff.m4 index 41517d8abfb..2743999fbc1 100644 --- a/m4/tm_gmtoff.m4 +++ b/m4/tm_gmtoff.m4 @@ -1,5 +1,5 @@ # tm_gmtoff.m4 serial 3 -dnl Copyright (C) 2002, 2009-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2009-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/unistd_h.m4 b/m4/unistd_h.m4 index b26d2c88dde..0f26fb908d3 100644 --- a/m4/unistd_h.m4 +++ b/m4/unistd_h.m4 @@ -1,5 +1,5 @@ -# unistd_h.m4 serial 83 -dnl Copyright (C) 2006-2020 Free Software Foundation, Inc. +# unistd_h.m4 serial 85 +dnl Copyright (C) 2006-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -42,6 +42,7 @@ AC_DEFUN([gl_UNISTD_H], # endif #endif ]], [access chdir chown copy_file_range dup dup2 dup3 environ euidaccess + execl execle execlp execv execve execvp execvpe faccessat fchdir fchownat fdatasync fsync ftruncate getcwd getdomainname getdtablesize getentropy getgroups gethostname getlogin getlogin_r getpagesize getpass @@ -79,6 +80,13 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS], GNULIB_DUP3=0; AC_SUBST([GNULIB_DUP3]) GNULIB_ENVIRON=0; AC_SUBST([GNULIB_ENVIRON]) GNULIB_EUIDACCESS=0; AC_SUBST([GNULIB_EUIDACCESS]) + GNULIB_EXECL=0; AC_SUBST([GNULIB_EXECL]) + GNULIB_EXECLE=0; AC_SUBST([GNULIB_EXECLE]) + GNULIB_EXECLP=0; AC_SUBST([GNULIB_EXECLP]) + GNULIB_EXECV=0; AC_SUBST([GNULIB_EXECV]) + GNULIB_EXECVE=0; AC_SUBST([GNULIB_EXECVE]) + GNULIB_EXECVP=0; AC_SUBST([GNULIB_EXECVP]) + GNULIB_EXECVPE=0; AC_SUBST([GNULIB_EXECVPE]) GNULIB_FACCESSAT=0; AC_SUBST([GNULIB_FACCESSAT]) GNULIB_FCHDIR=0; AC_SUBST([GNULIB_FCHDIR]) GNULIB_FCHOWNAT=0; AC_SUBST([GNULIB_FCHOWNAT]) @@ -123,11 +131,34 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS], GNULIB_UNLINKAT=0; AC_SUBST([GNULIB_UNLINKAT]) GNULIB_USLEEP=0; AC_SUBST([GNULIB_USLEEP]) GNULIB_WRITE=0; AC_SUBST([GNULIB_WRITE]) + dnl Support Microsoft deprecated alias function names by default. + GNULIB_MDA_ACCESS=1; AC_SUBST([GNULIB_MDA_ACCESS]) + GNULIB_MDA_CHDIR=1; AC_SUBST([GNULIB_MDA_CHDIR]) + GNULIB_MDA_CLOSE=1; AC_SUBST([GNULIB_MDA_CLOSE]) + GNULIB_MDA_DUP=1; AC_SUBST([GNULIB_MDA_DUP]) + GNULIB_MDA_DUP2=1; AC_SUBST([GNULIB_MDA_DUP2]) + GNULIB_MDA_EXECL=1; AC_SUBST([GNULIB_MDA_EXECL]) + GNULIB_MDA_EXECLE=1; AC_SUBST([GNULIB_MDA_EXECLE]) + GNULIB_MDA_EXECLP=1; AC_SUBST([GNULIB_MDA_EXECLP]) + GNULIB_MDA_EXECV=1; AC_SUBST([GNULIB_MDA_EXECV]) + GNULIB_MDA_EXECVE=1; AC_SUBST([GNULIB_MDA_EXECVE]) + GNULIB_MDA_EXECVP=1; AC_SUBST([GNULIB_MDA_EXECVP]) + GNULIB_MDA_EXECVPE=1; AC_SUBST([GNULIB_MDA_EXECVPE]) + GNULIB_MDA_GETCWD=1; AC_SUBST([GNULIB_MDA_GETCWD]) + GNULIB_MDA_GETPID=1; AC_SUBST([GNULIB_MDA_GETPID]) + GNULIB_MDA_ISATTY=1; AC_SUBST([GNULIB_MDA_ISATTY]) + GNULIB_MDA_LSEEK=1; AC_SUBST([GNULIB_MDA_LSEEK]) + GNULIB_MDA_READ=1; AC_SUBST([GNULIB_MDA_READ]) + GNULIB_MDA_RMDIR=1; AC_SUBST([GNULIB_MDA_RMDIR]) + GNULIB_MDA_SWAB=1; AC_SUBST([GNULIB_MDA_SWAB]) + GNULIB_MDA_UNLINK=1; AC_SUBST([GNULIB_MDA_UNLINK]) + GNULIB_MDA_WRITE=1; AC_SUBST([GNULIB_MDA_WRITE]) dnl Assume proper GNU behavior unless another module says otherwise. HAVE_CHOWN=1; AC_SUBST([HAVE_CHOWN]) HAVE_COPY_FILE_RANGE=1; AC_SUBST([HAVE_COPY_FILE_RANGE]) HAVE_DUP3=1; AC_SUBST([HAVE_DUP3]) HAVE_EUIDACCESS=1; AC_SUBST([HAVE_EUIDACCESS]) + HAVE_EXECVPE=1; AC_SUBST([HAVE_EXECVPE]) HAVE_FACCESSAT=1; AC_SUBST([HAVE_FACCESSAT]) HAVE_FCHDIR=1; AC_SUBST([HAVE_FCHDIR]) HAVE_FCHOWNAT=1; AC_SUBST([HAVE_FCHOWNAT]) @@ -176,6 +207,13 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS], REPLACE_CLOSE=0; AC_SUBST([REPLACE_CLOSE]) REPLACE_DUP=0; AC_SUBST([REPLACE_DUP]) REPLACE_DUP2=0; AC_SUBST([REPLACE_DUP2]) + REPLACE_EXECL=0; AC_SUBST([REPLACE_EXECL]) + REPLACE_EXECLE=0; AC_SUBST([REPLACE_EXECLE]) + REPLACE_EXECLP=0; AC_SUBST([REPLACE_EXECLP]) + REPLACE_EXECV=0; AC_SUBST([REPLACE_EXECV]) + REPLACE_EXECVE=0; AC_SUBST([REPLACE_EXECVE]) + REPLACE_EXECVP=0; AC_SUBST([REPLACE_EXECVP]) + REPLACE_EXECVPE=0; AC_SUBST([REPLACE_EXECVPE]) REPLACE_FACCESSAT=0; AC_SUBST([REPLACE_FACCESSAT]) REPLACE_FCHOWNAT=0; AC_SUBST([REPLACE_FCHOWNAT]) REPLACE_FTRUNCATE=0; AC_SUBST([REPLACE_FTRUNCATE]) diff --git a/m4/unlocked-io.m4 b/m4/unlocked-io.m4 index 38658e63ac4..a2dc8a144af 100644 --- a/m4/unlocked-io.m4 +++ b/m4/unlocked-io.m4 @@ -1,6 +1,6 @@ # unlocked-io.m4 serial 15 -# Copyright (C) 1998-2006, 2009-2020 Free Software Foundation, Inc. +# Copyright (C) 1998-2006, 2009-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/utimens.m4 b/m4/utimens.m4 index 3d31085fc6d..2ee4ef9ec95 100644 --- a/m4/utimens.m4 +++ b/m4/utimens.m4 @@ -1,4 +1,4 @@ -dnl Copyright (C) 2003-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2003-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/utimensat.m4 b/m4/utimensat.m4 index e9e4f26b1c1..bdabe24c568 100644 --- a/m4/utimensat.m4 +++ b/m4/utimensat.m4 @@ -1,7 +1,7 @@ # serial 7 # See if we need to provide utimensat replacement. -dnl Copyright (C) 2009-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/utimes.m4 b/m4/utimes.m4 index 877bfd2a735..0440e78532f 100644 --- a/m4/utimes.m4 +++ b/m4/utimes.m4 @@ -1,7 +1,7 @@ # Detect some bugs in glibc's implementation of utimes. # serial 8 -dnl Copyright (C) 2003-2005, 2009-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2003-2005, 2009-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/vararrays.m4 b/m4/vararrays.m4 index 9524a6ddd33..36946acc239 100644 --- a/m4/vararrays.m4 +++ b/m4/vararrays.m4 @@ -4,7 +4,7 @@ # From Paul Eggert -# Copyright (C) 2001, 2009-2020 Free Software Foundation, Inc. +# Copyright (C) 2001, 2009-2021 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/warnings.m4 b/m4/warnings.m4 index d4e4b073453..9e24d898e8f 100644 --- a/m4/warnings.m4 +++ b/m4/warnings.m4 @@ -1,5 +1,5 @@ # warnings.m4 serial 16 -dnl Copyright (C) 2008-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/wchar_t.m4 b/m4/wchar_t.m4 index e48d4649322..34db10e5cc0 100644 --- a/m4/wchar_t.m4 +++ b/m4/wchar_t.m4 @@ -1,5 +1,5 @@ # wchar_t.m4 serial 4 (gettext-0.18.2) -dnl Copyright (C) 2002-2003, 2008-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2003, 2008-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/zzgnulib.m4 b/m4/zzgnulib.m4 index 98fa68f51a6..b9533847cb7 100644 --- a/m4/zzgnulib.m4 +++ b/m4/zzgnulib.m4 @@ -1,5 +1,5 @@ # zzgnulib.m4 serial 1 -dnl Copyright (C) 2020 Free Software Foundation, Inc. +dnl Copyright (C) 2020-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/make-dist b/make-dist index de4f343ddd4..606fdd9e3a0 100755 --- a/make-dist +++ b/make-dist @@ -1,7 +1,7 @@ #!/bin/sh ### make-dist: create an Emacs distribution tar file from current srcdir -## Copyright (C) 1995, 1997-1998, 2000-2020 Free Software Foundation, +## Copyright (C) 1995, 1997-1998, 2000-2021 Free Software Foundation, ## Inc. ## This file is part of GNU Emacs. @@ -190,7 +190,7 @@ if [ ! "${version}" ]; then exit 1 fi -echo Version number is $version +echo Version number is "$version" if [ $update = yes ]; then if ! grep -q "tree holds version *${version}" README; then @@ -257,8 +257,8 @@ if [ $check = yes ]; then bogosities= while read elc; do el=`echo $elc | sed 's/c$//'` - [ -r $el ] || continue - [ $elc -nt $el ] || bogosities="$bogosities $elc" + [ -r "$el" ] || continue + [ "$elc" -nt "$el" ] || bogosities="$bogosities $elc" done < $temp_elc if [ x"${bogosities}" != x"" ]; then @@ -271,7 +271,7 @@ if [ $check = yes ]; then bogosities= for file in $losers; do - grep -q "^;.*no-byte-compile: t" $file && continue + grep -q "^;.*no-byte-compile: t" "$file" && continue case $file in site-init.el | site-load.el | site-start.el | default.el) continue ;; esac @@ -295,8 +295,8 @@ if [ $check = yes ]; then info=`sed -n 's/^@setfilename //p' $texi | sed 's|.*info/||'` [ x"${info}" != x"" ] || continue info=info/$info - [ -r $info ] || continue - [ $info -nt $texi ] || bogosities="$bogosities $info" + [ -r "$info" ] || continue + [ "$info" -nt "$texi" ] || bogosities="$bogosities $info" done < $temp_el rm -f $temp_el @@ -424,7 +424,7 @@ if [ $verbose = yes ] && (mkdir --verbose ${tempdir}) >/dev/null 2>&1; then mkdir_verbose='mkdir --verbose' else mkdir $tempdir || exit - mkdir_verbose=mkdir + mkdir_verbose="mkdir" fi # file_to_skip is normally empty to link every file, @@ -467,7 +467,7 @@ while read file; do case $file in MANIFEST) ln $manifest $tempdir/MANIFEST || exit ;; $file_to_skip) continue ;; - *) ln $file $tempdir/$file || exit ;; + *) ln "$file" $tempdir/"$file" || exit ;; esac done <$manifest @@ -476,7 +476,7 @@ if [ "${newer}" ]; then ## We remove .elc files unconditionally, on the theory that anyone picking ## up an incremental distribution already has a running Emacs to byte-compile ## them with. - find ${tempdir} \( -name '*.elc' -o ! -newer ${newer} \) \ + find ${tempdir} \( -name '*.elc' -o ! -newer "${newer}" \) \ -exec rm -f {} \; || exit fi @@ -487,12 +487,12 @@ if [ "${make_tar}" = yes ]; then sed -e 's/^:/.:/' -e 's/::/:.:/g' -e 's/:$/:./' -e 's/:/ /g' ` for dir in ${temppath}; do - [ -x ${dir}/$default_gzip ] || continue + [ -x "${dir}"/$default_gzip ] || continue found=1; break done if [ "$found" = "0" ]; then echo "WARNING: '$default_gzip' not found, will not compress" >&2 - default_gzip=cat + default_gzip="cat" fi case "${default_gzip}" in bzip2) gzip_extension=.bz2 ;; @@ -518,7 +518,7 @@ if [ "${make_tar}" = yes ]; then $default_gzip <$emacsname.tar fi;; esac - ) >$emacsname.tar$gzip_extension || exit + ) >$emacsname.tar"$gzip_extension" || exit fi ## Why are we deleting the staging directory if clean_up is no? diff --git a/modules/modhelp.py b/modules/modhelp.py index 13fd3b07652..07dfdf3f736 100755 --- a/modules/modhelp.py +++ b/modules/modhelp.py @@ -2,7 +2,7 @@ # Module helper script. -# Copyright 2015-2020 Free Software Foundation, Inc. +# Copyright 2015-2021 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/msdos/ChangeLog.1 b/msdos/ChangeLog.1 index 210cecd2173..ce94d415ea2 100644 --- a/msdos/ChangeLog.1 +++ b/msdos/ChangeLog.1 @@ -1550,7 +1550,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 1994-1999, 2001-2020 Free Software Foundation, Inc. + Copyright (C) 1994-1999, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/msdos/INSTALL b/msdos/INSTALL index a67c4d59754..6bb71434d46 100644 --- a/msdos/INSTALL +++ b/msdos/INSTALL @@ -1,6 +1,6 @@ GNU Emacs Installation Guide for the DJGPP (a.k.a. MS-DOS) port -Copyright (C) 1992, 1994, 1996-1997, 2000-2020 Free Software Foundation, +Copyright (C) 1992, 1994, 1996-1997, 2000-2021 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/msdos/README b/msdos/README index d1073741c67..9feaed89459 100644 --- a/msdos/README +++ b/msdos/README @@ -1,4 +1,4 @@ -Copyright (C) 2001-2020 Free Software Foundation, Inc. +Copyright (C) 2001-2021 Free Software Foundation, Inc. See the end of the file for license conditions. @@ -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-2020 Free Software Foundation, Inc. +# Copyright (C) 1993, 2002-2021 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/msdos/autogen/Makefile.in b/msdos/autogen/Makefile.in index 42a4656f9d5..0bdc4087522 100644 --- a/msdos/autogen/Makefile.in +++ b/msdos/autogen/Makefile.in @@ -1,7 +1,7 @@ # Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2009, 2013-2020 Free Software Foundation, Inc. +# Copyright (C) 1994-2009, 2013-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -13,7 +13,7 @@ @SET_MAKE@ -# Copyright (C) 2002-2020 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 Free Software Foundation, Inc. # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -36,7 +36,7 @@ # Generated by gnulib-tool. # Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=close --avoid=dup --avoid=fchdir --avoid=fstat --avoid=malloc-posix --avoid=msvc-inval --avoid=msvc-nothrow --avoid=open --avoid=openat-die --avoid=opendir --avoid=raise --avoid=save-cwd --avoid=select --avoid=sigprocmask --avoid=sys_types --avoid=threadlib --makefile-name=gnulib.mk --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca-opt byteswap c-ctype c-strcase careadlinkat close-stream count-one-bits count-trailing-zeros crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dtotimespec dup2 environ execinfo faccessat fcntl fcntl-h fdatasync fdopendir filemode fstatat fsync getloadavg getopt-gnu gettime gettimeofday intprops largefile lstat manywarnings memrchr mkostemp mktime pipe2 pselect pthread_sigmask putenv qacl readlink readlinkat sig2str socklen stat-time stdalign stdarg stdbool stdio strftime strtoimax strtoumax symlink sys_stat sys_time time timer-time timespec-add timespec-sub unsetenv utimens warnings -# Copyright (C) 2002-2020 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 Free Software Foundation, Inc. # # This file 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/msdos/autogen/config.in b/msdos/autogen/config.in index 6475d99d6f1..263cba15a28 100644 --- a/msdos/autogen/config.in +++ b/msdos/autogen/config.in @@ -2,7 +2,7 @@ /* GNU Emacs site configuration template file. -Copyright (C) 1988, 1993-1994, 1999-2002, 2004-2020 Free Software +Copyright (C) 1988, 1993-1994, 1999-2002, 2004-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/msdos/depfiles.bat b/msdos/depfiles.bat index f3c4b33d186..131f2fc04d4 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-2020 Free Software Foundation, Inc.
+rem Copyright (C) 2011-2021 Free Software Foundation, Inc.
rem This file is part of GNU Emacs.
diff --git a/msdos/inttypes.h b/msdos/inttypes.h index 88ffae70a85..28633ca9ffe 100644 --- a/msdos/inttypes.h +++ b/msdos/inttypes.h @@ -1,6 +1,6 @@ /* Replacement inttypes.h file for building GNU Emacs on MS-DOS with DJGPP. -Copyright (C) 2011-2020 Free Software Foundation, Inc. +Copyright (C) 2011-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/msdos/mainmake.v2 b/msdos/mainmake.v2 index 57c44795437..f22ebea5907 100644 --- a/msdos/mainmake.v2 +++ b/msdos/mainmake.v2 @@ -1,6 +1,6 @@ # Top-level Makefile for Emacs under MS-DOS/DJGPP v2.0 or higher. -*-makefile-*- -# Copyright (C) 1996-2020 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp index 8e181224357..5d82af66d95 100644 --- a/msdos/sed1v2.inp +++ b/msdos/sed1v2.inp @@ -2,7 +2,7 @@ # Configuration script for src/Makefile under DJGPP v2.x # ---------------------------------------------------------------------- # -# Copyright (C) 1996-1997, 1999-2020 Free Software Foundation, Inc. +# Copyright (C) 1996-1997, 1999-2021 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/msdos/sed1x.inp b/msdos/sed1x.inp index 8d10375c90d..30c242dcb95 100644 --- a/msdos/sed1x.inp +++ b/msdos/sed1x.inp @@ -2,7 +2,7 @@ # Extra configuration script for src/makefile for DesqView/X # ---------------------------------------------------------------------- # -# Copyright (C) 1994-1997, 1999-2020 Free Software Foundation, Inc. +# Copyright (C) 1994-1997, 1999-2021 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp index e79dc4600c1..ce45a7c80e9 100644 --- a/msdos/sed2v2.inp +++ b/msdos/sed2v2.inp @@ -2,7 +2,7 @@ # Configuration script for src/config.h under DJGPP v2.x # ---------------------------------------------------------------------- # -# Copyright (C) 1993-1997, 1999-2000, 2002-2020 Free Software +# Copyright (C) 1993-1997, 1999-2000, 2002-2021 Free Software # Foundation, Inc. # # This file is part of GNU Emacs. @@ -27,7 +27,7 @@ #ifndef MSDOS\ #define MSDOS\ #endif -/^#undef COPYRIGHT *$/s/^.*$/#define COPYRIGHT "Copyright (C) 2020 Free Software Foundation, Inc."/ +/^#undef COPYRIGHT *$/s/^.*$/#define COPYRIGHT "Copyright (C) 2021 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/ diff --git a/msdos/sed2x.inp b/msdos/sed2x.inp index 054cd91cd6c..00b5f07d1b5 100644 --- a/msdos/sed2x.inp +++ b/msdos/sed2x.inp @@ -2,7 +2,7 @@ # Extra configuration script for src/config.h for DesqView/X # ---------------------------------------------------------------------- # -# Copyright (C) 1994, 2001-2020 Free Software Foundation, Inc. +# Copyright (C) 1994, 2001-2021 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/msdos/sed3v2.inp b/msdos/sed3v2.inp index 37ad23ab755..8b9bb0679bd 100644 --- a/msdos/sed3v2.inp +++ b/msdos/sed3v2.inp @@ -2,7 +2,7 @@ # Configuration script for lib-src/makefile under DJGPP v2 # ---------------------------------------------------------------------- # -# Copyright (C) 1996, 1998, 2000-2020 Free Software Foundation, Inc. +# Copyright (C) 1996, 1998, 2000-2021 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/msdos/sed4.inp b/msdos/sed4.inp index 6997a574966..09d3523d86a 100644 --- a/msdos/sed4.inp +++ b/msdos/sed4.inp @@ -2,7 +2,7 @@ # Configuration script for src/paths.h # ---------------------------------------------------------------------- # -# Copyright (C) 1994, 2001-2020 Free Software Foundation, Inc. +# Copyright (C) 1994, 2001-2021 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/msdos/sed5x.inp b/msdos/sed5x.inp index 3f593f1aa19..3639a07c3c9 100644 --- a/msdos/sed5x.inp +++ b/msdos/sed5x.inp @@ -2,7 +2,7 @@ # Configuration script for oldxmenu/makefile for DesqView/X # ---------------------------------------------------------------------- # -# Copyright (C) 1994, 2001-2020 Free Software Foundation, Inc. +# Copyright (C) 1994, 2001-2021 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/msdos/sed6.inp b/msdos/sed6.inp index cb2a30391bd..a0ab94599d3 100644 --- a/msdos/sed6.inp +++ b/msdos/sed6.inp @@ -3,7 +3,7 @@ # doc/lispintro/Makefile, and doc/misc/Makefile under DJGPP v2.x # --------------------------------------------------------------------------- # -# Copyright (C) 1997, 2000-2020 Free Software Foundation, Inc. +# Copyright (C) 1997, 2000-2021 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/msdos/sedadmin.inp b/msdos/sedadmin.inp index ac9f38fce54..9f6dacad5dc 100644 --- a/msdos/sedadmin.inp +++ b/msdos/sedadmin.inp @@ -2,7 +2,7 @@ # Configuration script for admin/unidata/Makefile under DJGPP v2.x # ---------------------------------------------------------------------- # -# Copyright (C) 2014-2020 Free Software Foundation, Inc. +# Copyright (C) 2014-2021 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/msdos/sedalloc.inp b/msdos/sedalloc.inp index e2d6a56ee5d..90377dd5d8d 100644 --- a/msdos/sedalloc.inp +++ b/msdos/sedalloc.inp @@ -2,7 +2,7 @@ # Configuration script for SYSTEM_MALLOC/REL_ALLOC in src/config.h # ---------------------------------------------------------------------- # -# Copyright (C) 2008-2020 Free Software Foundation, Inc. +# Copyright (C) 2008-2021 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/msdos/sedleim.inp b/msdos/sedleim.inp index c4e6e7501b6..1d5ee7a6872 100644 --- a/msdos/sedleim.inp +++ b/msdos/sedleim.inp @@ -2,7 +2,7 @@ # Configuration script for leim/Makefile under DJGPP v2.x # ---------------------------------------------------------------------- # -# Copyright (C) 1999-2020 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/msdos/sedlibcf.inp b/msdos/sedlibcf.inp index a071e163783..38c54e678eb 100644 --- a/msdos/sedlibcf.inp +++ b/msdos/sedlibcf.inp @@ -5,7 +5,7 @@ # files whose names are invalid on DOS 8+3 filesystems. # ---------------------------------------------------------------------- # -# Copyright (C) 2011-2020 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/msdos/sedlibmk.inp b/msdos/sedlibmk.inp index 519d5baeb8c..825be849680 100644 --- a/msdos/sedlibmk.inp +++ b/msdos/sedlibmk.inp @@ -2,7 +2,7 @@ # Configuration script for lib/Makefile under DJGPP v2.x # ---------------------------------------------------------------------- # -# Copyright (C) 2011-2020 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/msdos/sedlisp.inp b/msdos/sedlisp.inp index d62c0f9211e..5b3dc26ec5c 100644 --- a/msdos/sedlisp.inp +++ b/msdos/sedlisp.inp @@ -2,7 +2,7 @@ # Configuration script for lisp/Makefile under DJGPP v2.x # ---------------------------------------------------------------------- # -# Copyright (C) 2000-2020 Free Software Foundation, Inc. +# Copyright (C) 2000-2021 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/nextstep/ChangeLog.1 b/nextstep/ChangeLog.1 index 5d866e6e274..8e7e2783ad1 100644 --- a/nextstep/ChangeLog.1 +++ b/nextstep/ChangeLog.1 @@ -312,7 +312,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 2008-2020 Free Software Foundation, Inc. + Copyright (C) 2008-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nextstep/INSTALL b/nextstep/INSTALL index ac344196c8f..148be2d05c4 100644 --- a/nextstep/INSTALL +++ b/nextstep/INSTALL @@ -1,4 +1,4 @@ -Copyright (C) 2008-2020 Free Software Foundation, Inc. +Copyright (C) 2008-2021 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/nextstep/Makefile.in b/nextstep/Makefile.in index 15e8bd9187b..3168fee76c0 100644 --- a/nextstep/Makefile.in +++ b/nextstep/Makefile.in @@ -1,6 +1,6 @@ ### @configure_input@ -## Copyright (C) 2012-2020 Free Software Foundation, Inc. +## Copyright (C) 2012-2021 Free Software Foundation, Inc. ## This file is part of GNU Emacs. diff --git a/nextstep/README b/nextstep/README index 3ad226bfbe5..141a5b21fe7 100644 --- a/nextstep/README +++ b/nextstep/README @@ -105,7 +105,7 @@ future development. ---------------------------------------------------------------------- -Copyright 2008-2020 Free Software Foundation, Inc. +Copyright 2008-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nextstep/templates/Info.plist.in b/nextstep/templates/Info.plist.in index 1f074b04578..66cde9f4eeb 100644 --- a/nextstep/templates/Info.plist.in +++ b/nextstep/templates/Info.plist.in @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- -Copyright (C) 2008-2020 Free Software Foundation, Inc. +Copyright (C) 2008-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nt/ChangeLog.1 b/nt/ChangeLog.1 index 187a59c7184..247f10a7335 100644 --- a/nt/ChangeLog.1 +++ b/nt/ChangeLog.1 @@ -3548,7 +3548,7 @@ ;; add-log-time-zone-rule: t ;; End: - Copyright (C) 1995-1999, 2001-2020 Free Software Foundation, Inc. + Copyright (C) 1995-1999, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nt/INSTALL b/nt/INSTALL index 27fb5f096f7..9f543151a94 100644 --- a/nt/INSTALL +++ b/nt/INSTALL @@ -1,7 +1,7 @@ Building and Installing Emacs on MS-Windows using the MSYS and MinGW tools - Copyright (C) 2013-2020 Free Software Foundation, Inc. + Copyright (C) 2013-2021 Free Software Foundation, Inc. See the end of the file for license conditions. The MSYS/MinGW build described here is supported on versions of diff --git a/nt/INSTALL.W64 b/nt/INSTALL.W64 index 4724116ebcc..8f0d0c9528f 100644 --- a/nt/INSTALL.W64 +++ b/nt/INSTALL.W64 @@ -1,7 +1,7 @@ Building and Installing Emacs on 64-bit MS-Windows using MSYS2 and MinGW-w64 - Copyright (c) 2015-2020 Free Software Foundation, Inc. + Copyright (c) 2015-2021 Free Software Foundation, Inc. See the end of the file for license conditions. This document describes how to compile a 64-bit GNU Emacs using MSYS2 diff --git a/nt/Makefile.in b/nt/Makefile.in index 6bdf824ba9f..aa3a76280ef 100644 --- a/nt/Makefile.in +++ b/nt/Makefile.in @@ -1,6 +1,6 @@ ### @configure_input@ -# Copyright (C) 2013-2020 Free Software Foundation, Inc. +# Copyright (C) 2013-2021 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/nt/README b/nt/README index bc028c8a24f..3da31d018b9 100644 --- a/nt/README +++ b/nt/README @@ -1,6 +1,6 @@ Emacs for Windows NT/2000 and Windows 95/98/ME - Copyright (C) 2001-2020 Free Software Foundation, Inc. + Copyright (C) 2001-2021 Free Software Foundation, Inc. See the end of the file for license conditions. This directory contains support for compiling and running GNU Emacs on diff --git a/nt/README.W32 b/nt/README.W32 index 9c8d20472a9..ed5673334ad 100644 --- a/nt/README.W32 +++ b/nt/README.W32 @@ -1,4 +1,4 @@ -Copyright (C) 2001-2020 Free Software Foundation, Inc. +Copyright (C) 2001-2021 Free Software Foundation, Inc. See the end of the file for license conditions. Emacs version 28.0.50 for MS-Windows diff --git a/nt/addpm.c b/nt/addpm.c index 19a40220203..f54a6ea9f7c 100644 --- a/nt/addpm.c +++ b/nt/addpm.c @@ -1,5 +1,5 @@ /* Add entries to the GNU Emacs Program Manager folder. - Copyright (C) 1995, 2001-2020 Free Software Foundation, Inc. + Copyright (C) 1995, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nt/cmdproxy.c b/nt/cmdproxy.c index 51390012be7..224f68b1e85 100644 --- a/nt/cmdproxy.c +++ b/nt/cmdproxy.c @@ -1,5 +1,5 @@ /* Proxy shell designed for use with Emacs on Windows 95 and NT. - Copyright (C) 1997, 2001-2020 Free Software Foundation, Inc. + Copyright (C) 1997, 2001-2021 Free Software Foundation, Inc. Accepts subset of Unix sh(1) command-line options, for compatibility with elisp code written for Unix. When possible, executes external diff --git a/nt/configure.bat b/nt/configure.bat index 8d436690e4f..0cb1a632e2b 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-2020 Free Software Foundation, Inc.
+rem Copyright (C) 1999-2021 Free Software Foundation, Inc.
rem This file is part of GNU Emacs.
diff --git a/nt/ddeclient.c b/nt/ddeclient.c index a1a1999f701..c577bfcfa93 100644 --- a/nt/ddeclient.c +++ b/nt/ddeclient.c @@ -1,5 +1,5 @@ /* Simple client interface to DDE servers. - Copyright (C) 1998, 2001-2020 Free Software Foundation, Inc. + Copyright (C) 1998, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nt/emacs.rc.in b/nt/emacs.rc.in index b551e588cad..ed217887c5d 100644 --- a/nt/emacs.rc.in +++ b/nt/emacs.rc.in @@ -31,7 +31,7 @@ BEGIN VALUE "FileDescription", "GNU Emacs: The extensible self-documenting text editor\0" VALUE "FileVersion", "@comma_space_version@\0" VALUE "InternalName", "Emacs\0" - VALUE "LegalCopyright", "Copyright (C) 2001-2020\0" + VALUE "LegalCopyright", "Copyright (C) 2001-2021\0" VALUE "OriginalFilename", "emacs.exe" VALUE "ProductName", "Emacs\0" VALUE "ProductVersion", "@comma_space_version@\0" diff --git a/nt/emacsclient.rc.in b/nt/emacsclient.rc.in index ebb117f0e6b..c061f06528e 100644 --- a/nt/emacsclient.rc.in +++ b/nt/emacsclient.rc.in @@ -25,7 +25,7 @@ BEGIN VALUE "FileDescription", "GNU EmacsClient: Client for the extensible self-documenting text editor\0" VALUE "FileVersion", "@comma_space_version@\0" VALUE "InternalName", "EmacsClient\0" - VALUE "LegalCopyright", "Copyright (C) 2001-2020\0" + VALUE "LegalCopyright", "Copyright (C) 2001-2021\0" VALUE "OriginalFilename", "emacsclientw.exe" VALUE "ProductName", "EmacsClient\0" VALUE "ProductVersion", "@comma_space_version@\0" diff --git a/nt/epaths.nt b/nt/epaths.nt index a61bcb944b8..a75ed52a34a 100644 --- a/nt/epaths.nt +++ b/nt/epaths.nt @@ -12,7 +12,7 @@ the host system (e.g., i686-pc-mingw32), and @SRC@ by the root of the Emacs source tree used to build Emacs. */ /* -Copyright (C) 1993, 1995, 1997, 1999, 2001-2020 Free Software +Copyright (C) 1993, 1995, 1997, 1999, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nt/gnulib-cfg.mk b/nt/gnulib-cfg.mk index b84626d903d..5cdbde6bb5b 100644 --- a/nt/gnulib-cfg.mk +++ b/nt/gnulib-cfg.mk @@ -1,6 +1,6 @@ # Configurations for ../lib/gnulib.mk. # -# Copyright 2017-2020 Free Software Foundation, Inc. +# Copyright 2017-2021 Free Software Foundation, Inc. # # This file 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/nt/icons/README b/nt/icons/README index 9502e17437f..a8849b2eeec 100644 --- a/nt/icons/README +++ b/nt/icons/README @@ -2,13 +2,13 @@ COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES File: emacs.ico Author: Kentaro Ohkouchi <nanasess@fsm.ne.jp> -Copyright (C) 2008-2020 Free Software Foundation, Inc. +Copyright (C) 2008-2021 Free Software Foundation, Inc. License: GNU General Public License version 3 or later File: emacs22.ico Author: Andrew Zhilin -Copyright (C) 2005-2020 Free Software Foundation, Inc. +Copyright (C) 2005-2021 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 <rgd at bigfoot.com> -Copyright (C) 1999, 2001-2020 Free Software Foundation, Inc. +Copyright (C) 1999, 2001-2021 Free Software Foundation, Inc. License: GNU General Public License version 3 or later (see COPYING) <http://users.adelphia.net/~rob.davenport/gnuicons.html> diff --git a/nt/inc/grp.h b/nt/inc/grp.h index 342dfba7098..41511477dbf 100644 --- a/nt/inc/grp.h +++ b/nt/inc/grp.h @@ -1,6 +1,6 @@ /* Replacement grp.h file for building GNU Emacs on Windows. -Copyright (C) 2003-2020 Free Software Foundation, Inc. +Copyright (C) 2003-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nt/inc/inttypes.h b/nt/inc/inttypes.h index 3ac73a780e0..89c000238f8 100644 --- a/nt/inc/inttypes.h +++ b/nt/inc/inttypes.h @@ -1,6 +1,6 @@ /* Replacement inttypes.h file for building GNU Emacs on Windows with MSVC. -Copyright (C) 2011-2020 Free Software Foundation, Inc. +Copyright (C) 2011-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nt/inc/langinfo.h b/nt/inc/langinfo.h index 243a6a52ab7..86f4ce5bd9a 100644 --- a/nt/inc/langinfo.h +++ b/nt/inc/langinfo.h @@ -1,6 +1,6 @@ /* Replacement langinfo.h file for building GNU Emacs on Windows. -Copyright (C) 2006-2020 Free Software Foundation, Inc. +Copyright (C) 2006-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nt/inc/ms-w32.h b/nt/inc/ms-w32.h index 2c754f93e8f..aad51b59cfe 100644 --- a/nt/inc/ms-w32.h +++ b/nt/inc/ms-w32.h @@ -1,6 +1,6 @@ /* System description file for Windows NT. -Copyright (C) 1993-1995, 2001-2020 Free Software Foundation, Inc. +Copyright (C) 1993-1995, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nt/inc/nl_types.h b/nt/inc/nl_types.h index 28ec639d075..8926f75f79d 100644 --- a/nt/inc/nl_types.h +++ b/nt/inc/nl_types.h @@ -1,6 +1,6 @@ /* Replacement nl_types.h file for building GNU Emacs on Windows. -Copyright (C) 2006-2020 Free Software Foundation, Inc. +Copyright (C) 2006-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nt/inc/stdint.h b/nt/inc/stdint.h index c06c97e7132..0ee3d4a9ffc 100644 --- a/nt/inc/stdint.h +++ b/nt/inc/stdint.h @@ -1,6 +1,6 @@ /* Replacement stdint.h file for building GNU Emacs on Windows. -Copyright (C) 2011-2020 Free Software Foundation, Inc. +Copyright (C) 2011-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nt/inc/sys/resource.h b/nt/inc/sys/resource.h index e03c2243e27..d35f89b8cdf 100644 --- a/nt/inc/sys/resource.h +++ b/nt/inc/sys/resource.h @@ -1,6 +1,6 @@ /* A limited emulation of sys/resource.h. -Copyright (C) 2016-2020 Free Software Foundation, Inc. +Copyright (C) 2016-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nt/inc/sys/socket.h b/nt/inc/sys/socket.h index 94ed2aa35d2..48b24628f88 100644 --- a/nt/inc/sys/socket.h +++ b/nt/inc/sys/socket.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1995, 2001-2020 Free Software Foundation, Inc. +/* Copyright (C) 1995, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nt/inc/sys/stat.h b/nt/inc/sys/stat.h index f58d5ab6573..aa93bd4af44 100644 --- a/nt/inc/sys/stat.h +++ b/nt/inc/sys/stat.h @@ -1,7 +1,7 @@ /* sys/stat.h supplied with MSVCRT uses too narrow data types for inode and user/group id, so we replace them with our own. -Copyright (C) 2008-2020 Free Software Foundation, Inc. +Copyright (C) 2008-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nt/inc/sys/wait.h b/nt/inc/sys/wait.h index 0dff5203f4e..481ad9c38b5 100644 --- a/nt/inc/sys/wait.h +++ b/nt/inc/sys/wait.h @@ -1,6 +1,6 @@ /* A limited emulation of sys/wait.h on Posix systems. -Copyright (C) 2012-2020 Free Software Foundation, Inc. +Copyright (C) 2012-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nt/preprep.c b/nt/preprep.c index 21eda0ee5e7..78ed1c32381 100644 --- a/nt/preprep.c +++ b/nt/preprep.c @@ -1,5 +1,5 @@ /* Pre-process emacs.exe for profiling by MSVC. - Copyright (C) 1999, 2001-2020 Free Software Foundation, Inc. + Copyright (C) 1999, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nt/runemacs.c b/nt/runemacs.c index 32fdc2b3074..308e856be2a 100644 --- a/nt/runemacs.c +++ b/nt/runemacs.c @@ -1,6 +1,6 @@ /* runemacs --- Simple program to start Emacs with its console window hidden. -Copyright (C) 2001-2020 Free Software Foundation, Inc. +Copyright (C) 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/oldXMenu/Activate.c b/oldXMenu/Activate.c index c919d65ee7d..91439eacc2f 100644 --- a/oldXMenu/Activate.c +++ b/oldXMenu/Activate.c @@ -3,7 +3,7 @@ #include "copyright.h" /* -Copyright (C) 2001-2020 Free Software Foundation, Inc. +Copyright (C) 2001-2021 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/oldXMenu/ChangeLog.1 b/oldXMenu/ChangeLog.1 index bae205ae623..c237774a3f2 100644 --- a/oldXMenu/ChangeLog.1 +++ b/oldXMenu/ChangeLog.1 @@ -712,7 +712,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 1993-1999, 2001-2020 Free Software Foundation, Inc. + Copyright (C) 1993-1999, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/oldXMenu/Create.c b/oldXMenu/Create.c index 3d1a3bfc0e4..7eb17c508d5 100644 --- a/oldXMenu/Create.c +++ b/oldXMenu/Create.c @@ -3,7 +3,7 @@ #include "copyright.h" /* -Copyright (C) 1993-1994, 2001-2020 Free Software Foundation, Inc. +Copyright (C) 1993-1994, 2001-2021 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/oldXMenu/FindSel.c b/oldXMenu/FindSel.c index 58c27c5881a..e2a5dbbdcd4 100644 --- a/oldXMenu/FindSel.c +++ b/oldXMenu/FindSel.c @@ -3,7 +3,7 @@ #include "copyright.h" /* -Copyright (C) 2001-2020 Free Software Foundation, Inc. +Copyright (C) 2001-2021 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/oldXMenu/Internal.c b/oldXMenu/Internal.c index c81db9838f9..f489e27beab 100644 --- a/oldXMenu/Internal.c +++ b/oldXMenu/Internal.c @@ -3,7 +3,7 @@ #include "copyright.h" /* -Copyright (C) 1993, 1996, 2001-2020 Free Software Foundation, Inc. +Copyright (C) 1993, 1996, 2001-2021 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/oldXMenu/Makefile.in b/oldXMenu/Makefile.in index 9c814fd2219..7ae355b568d 100644 --- a/oldXMenu/Makefile.in +++ b/oldXMenu/Makefile.in @@ -15,7 +15,7 @@ ## without express or implied warranty. -## Copyright (C) 2001-2020 Free Software Foundation, Inc. +## Copyright (C) 2001-2021 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/oldXMenu/deps.mk b/oldXMenu/deps.mk index 9744c4818f1..f1876bf7695 100644 --- a/oldXMenu/deps.mk +++ b/oldXMenu/deps.mk @@ -15,7 +15,7 @@ ## without express or implied warranty. -## Copyright (C) 2001-2020 Free Software Foundation, Inc. +## Copyright (C) 2001-2021 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/oldXMenu/insque.c b/oldXMenu/insque.c index 72a0cc8c0c5..c09d1292aa6 100644 --- a/oldXMenu/insque.c +++ b/oldXMenu/insque.c @@ -1,5 +1,5 @@ /* -Copyright (C) 1993-1998, 2001-2020 Free Software Foundation, Inc. +Copyright (C) 1993-1998, 2001-2021 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/src/.gdbinit b/src/.gdbinit index 78536fc01fb..f74e295f7ea 100644 --- a/src/.gdbinit +++ b/src/.gdbinit @@ -1,4 +1,4 @@ -# Copyright (C) 1992-1998, 2000-2020 Free Software Foundation, Inc. +# Copyright (C) 1992-1998, 2000-2021 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/src/ChangeLog.1 b/src/ChangeLog.1 index 4ca7f90e7f7..3429aa4947b 100644 --- a/src/ChangeLog.1 +++ b/src/ChangeLog.1 @@ -3521,7 +3521,7 @@ * minibuf.c: Don't allow entry to minibuffer while minibuffer is selected. - Copyright (C) 1985-1986, 2001-2020 Free Software Foundation, Inc. + Copyright (C) 1985-1986, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/ChangeLog.10 b/src/ChangeLog.10 index fbbd3608909..bba161d3428 100644 --- a/src/ChangeLog.10 +++ b/src/ChangeLog.10 @@ -27912,7 +27912,7 @@ See ChangeLog.9 for earlier changes. ;; add-log-time-zone-rule: t ;; End: - Copyright (C) 2001-2020 Free Software Foundation, Inc. + Copyright (C) 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/ChangeLog.11 b/src/ChangeLog.11 index cf9e87a6a80..41c35babda0 100644 --- a/src/ChangeLog.11 +++ b/src/ChangeLog.11 @@ -31385,7 +31385,7 @@ See ChangeLog.10 for earlier changes. ;; coding: utf-8 ;; End: - Copyright (C) 2007-2020 Free Software Foundation, Inc. + Copyright (C) 2007-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/ChangeLog.12 b/src/ChangeLog.12 index 04983fe03e6..77540ee5b11 100644 --- a/src/ChangeLog.12 +++ b/src/ChangeLog.12 @@ -22936,7 +22936,7 @@ See ChangeLog.11 for earlier changes. ;; coding: utf-8 ;; End: - Copyright (C) 2011-2020 Free Software Foundation, Inc. + Copyright (C) 2011-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/ChangeLog.13 b/src/ChangeLog.13 index 87055d70315..3fb23ceff3d 100644 --- a/src/ChangeLog.13 +++ b/src/ChangeLog.13 @@ -17905,7 +17905,7 @@ See ChangeLog.12 for earlier changes. ;; coding: utf-8 ;; End: - Copyright (C) 2011-2020 Free Software Foundation, Inc. + Copyright (C) 2011-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/ChangeLog.2 b/src/ChangeLog.2 index a499350253e..44c575c564e 100644 --- a/src/ChangeLog.2 +++ b/src/ChangeLog.2 @@ -4771,7 +4771,7 @@ See ChangeLog.1 for earlier changes. - Copyright (C) 1986-1988, 2001-2020 Free Software Foundation, Inc. + Copyright (C) 1986-1988, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/ChangeLog.3 b/src/ChangeLog.3 index 4e403058837..1cae9bfc655 100644 --- a/src/ChangeLog.3 +++ b/src/ChangeLog.3 @@ -16503,7 +16503,7 @@ See ChangeLog.2 for earlier changes. ;; coding: utf-8 ;; End: - Copyright (C) 1993, 2001-2020 Free Software Foundation, Inc. + Copyright (C) 1993, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/ChangeLog.4 b/src/ChangeLog.4 index cc8d22ceeb1..f34e4cb0f5e 100644 --- a/src/ChangeLog.4 +++ b/src/ChangeLog.4 @@ -6906,7 +6906,7 @@ See ChangeLog.3 for earlier changes. ;; coding: utf-8 ;; End: - Copyright (C) 1993-1994, 2001-2020 Free Software Foundation, Inc. + Copyright (C) 1993-1994, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/ChangeLog.5 b/src/ChangeLog.5 index 56bfb9f9eff..af0f6b9c388 100644 --- a/src/ChangeLog.5 +++ b/src/ChangeLog.5 @@ -7148,7 +7148,7 @@ See ChangeLog.4 for earlier changes. ;; coding: utf-8 ;; End: - Copyright (C) 1994-1995, 2001-2020 Free Software Foundation, Inc. + Copyright (C) 1994-1995, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/ChangeLog.6 b/src/ChangeLog.6 index 391d5fb8a52..709148569ed 100644 --- a/src/ChangeLog.6 +++ b/src/ChangeLog.6 @@ -5358,7 +5358,7 @@ See ChangeLog.5 for earlier changes. ;; coding: utf-8 ;; End: - Copyright (C) 1995-1996, 2001-2020 Free Software Foundation, Inc. + Copyright (C) 1995-1996, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/ChangeLog.7 b/src/ChangeLog.7 index bb3e1997ec7..7e9a085e505 100644 --- a/src/ChangeLog.7 +++ b/src/ChangeLog.7 @@ -11091,7 +11091,7 @@ See ChangeLog.6 for earlier changes. ;; coding: utf-8 ;; End: - Copyright (C) 1997-1998, 2001-2020 Free Software Foundation, Inc. + Copyright (C) 1997-1998, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/ChangeLog.8 b/src/ChangeLog.8 index c7b99a443d5..8587a14f2ce 100644 --- a/src/ChangeLog.8 +++ b/src/ChangeLog.8 @@ -13979,7 +13979,7 @@ See ChangeLog.7 for earlier changes. - Copyright (C) 1999, 2001-2020 Free Software Foundation, Inc. + Copyright (C) 1999, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/ChangeLog.9 b/src/ChangeLog.9 index 0c1f72a6787..25a17e74fe7 100644 --- a/src/ChangeLog.9 +++ b/src/ChangeLog.9 @@ -13294,7 +13294,7 @@ See ChangeLog.8 for earlier changes. ;; coding: utf-8 ;; End: - Copyright (C) 2001-2020 Free Software Foundation, Inc. + Copyright (C) 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/Makefile.in b/src/Makefile.in index c2641740bcc..9e105c157b9 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,6 +1,6 @@ ### @configure_input@ -# Copyright (C) 1985, 1987-1988, 1993-1995, 1999-2020 Free Software +# Copyright (C) 1985, 1987-1988, 1993-1995, 1999-2021 Free Software # Foundation, Inc. # This file is part of GNU Emacs. @@ -343,7 +343,7 @@ HAVE_PDUMPER = @HAVE_PDUMPER@ ## ARM Macs require that all code have a valid signature. Since pump ## invalidates the signature, we must re-sign to fix it. -DO_CODESIGN=$(patsubst arm-apple-darwin%,yes,@configuration@) +DO_CODESIGN=$(patsubst aarch64-apple-darwin%,yes,@configuration@) # 'make' verbosity. AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ diff --git a/src/README b/src/README index fbebf6b95f5..1f42449eddc 100644 --- a/src/README +++ b/src/README @@ -1,4 +1,4 @@ -Copyright (C) 2001-2020 Free Software Foundation, Inc. +Copyright (C) 2001-2021 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/src/alloc.c b/src/alloc.c index bdf721e5270..350fec25a02 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -1,6 +1,6 @@ /* Storage allocation and gc for GNU Emacs Lisp interpreter. -Copyright (C) 1985-1986, 1988, 1993-1995, 1997-2020 Free Software +Copyright (C) 1985-1986, 1988, 1993-1995, 1997-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/atimer.c b/src/atimer.c index a7daf9dcf5b..9b198675ab4 100644 --- a/src/atimer.c +++ b/src/atimer.c @@ -1,5 +1,5 @@ /* Asynchronous timers. - Copyright (C) 2000-2020 Free Software Foundation, Inc. + Copyright (C) 2000-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/atimer.h b/src/atimer.h index 660d77c9392..e3e283a75c0 100644 --- a/src/atimer.h +++ b/src/atimer.h @@ -1,5 +1,5 @@ /* Asynchronous timers. - Copyright (C) 2000-2020 Free Software Foundation, Inc. + Copyright (C) 2000-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/bidi.c b/src/bidi.c index ef062addd16..1413ba6b888 100644 --- a/src/bidi.c +++ b/src/bidi.c @@ -1,6 +1,6 @@ /* Low-level bidirectional buffer/string-scanning functions for GNU Emacs. -Copyright (C) 2000-2001, 2004-2005, 2009-2020 Free Software Foundation, +Copyright (C) 2000-2001, 2004-2005, 2009-2021 Free Software Foundation, Inc. Author: Eli Zaretskii <eliz@gnu.org> diff --git a/src/bignum.c b/src/bignum.c index dce5908a1e4..1ac75c19e24 100644 --- a/src/bignum.c +++ b/src/bignum.c @@ -1,6 +1,6 @@ /* Big numbers for Emacs. -Copyright 2018-2020 Free Software Foundation, Inc. +Copyright 2018-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/bignum.h b/src/bignum.h index 251a19e338a..33a540e9093 100644 --- a/src/bignum.h +++ b/src/bignum.h @@ -1,6 +1,6 @@ /* Big numbers for Emacs. -Copyright 2018-2020 Free Software Foundation, Inc. +Copyright 2018-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/blockinput.h b/src/blockinput.h index f94e62dd461..8e4657b27c7 100644 --- a/src/blockinput.h +++ b/src/blockinput.h @@ -1,5 +1,5 @@ /* blockinput.h - interface to blocking complicated interrupt-driven input. - Copyright (C) 1989, 1993, 2001-2020 Free Software Foundation, Inc. + Copyright (C) 1989, 1993, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/buffer.c b/src/buffer.c index 9e44345616e..81f7d922fdb 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -1,6 +1,6 @@ /* Buffer manipulation primitives for GNU Emacs. -Copyright (C) 1985-1989, 1993-1995, 1997-2020 Free Software Foundation, +Copyright (C) 1985-1989, 1993-1995, 1997-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/buffer.h b/src/buffer.h index b8c5162be4a..790291f1185 100644 --- a/src/buffer.h +++ b/src/buffer.h @@ -1,6 +1,6 @@ /* Header file for the buffer manipulation primitives. -Copyright (C) 1985-1986, 1993-1995, 1997-2020 Free Software Foundation, +Copyright (C) 1985-1986, 1993-1995, 1997-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/bytecode.c b/src/bytecode.c index 1c3b6eac0d1..4fd41acab85 100644 --- a/src/bytecode.c +++ b/src/bytecode.c @@ -1,5 +1,5 @@ /* Execution of byte code produced by bytecomp.el. - Copyright (C) 1985-1988, 1993, 2000-2020 Free Software Foundation, + Copyright (C) 1985-1988, 1993, 2000-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/callint.c b/src/callint.c index d172af9e30b..d3f49bc35d1 100644 --- a/src/callint.c +++ b/src/callint.c @@ -1,5 +1,5 @@ /* Call a Lisp function interactively. - Copyright (C) 1985-1986, 1993-1995, 1997, 2000-2020 Free Software + Copyright (C) 1985-1986, 1993-1995, 1997, 2000-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/callproc.c b/src/callproc.c index 3ecd6880274..8d2a5619eb8 100644 --- a/src/callproc.c +++ b/src/callproc.c @@ -1,6 +1,6 @@ /* Synchronous subprocess invocation for GNU Emacs. -Copyright (C) 1985-1988, 1993-1995, 1999-2020 Free Software Foundation, +Copyright (C) 1985-1988, 1993-1995, 1999-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -30,6 +30,11 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */ #include "lisp.h" +#ifdef SETUP_SLAVE_PTY +# include <sys/stream.h> +# include <sys/stropts.h> +#endif + #ifdef WINDOWSNT #include <sys/socket.h> /* for fcntl */ #include <windows.h> diff --git a/src/casefiddle.c b/src/casefiddle.c index debd2412238..a948bb3bc88 100644 --- a/src/casefiddle.c +++ b/src/casefiddle.c @@ -1,7 +1,7 @@ /* -*- coding: utf-8 -*- */ /* GNU Emacs case conversion functions. -Copyright (C) 1985, 1994, 1997-1999, 2001-2020 Free Software Foundation, +Copyright (C) 1985, 1994, 1997-1999, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/casetab.c b/src/casetab.c index 07cda36d95d..4699857cb8a 100644 --- a/src/casetab.c +++ b/src/casetab.c @@ -1,5 +1,5 @@ /* GNU Emacs routines to deal with case tables. - Copyright (C) 1993-1994, 2001-2020 Free Software Foundation, Inc. + Copyright (C) 1993-1994, 2001-2021 Free Software Foundation, Inc. Author: Howard Gayle diff --git a/src/category.c b/src/category.c index c80571ecd4f..ec8f61f7f00 100644 --- a/src/category.c +++ b/src/category.c @@ -1,6 +1,6 @@ /* GNU Emacs routines to deal with category tables. -Copyright (C) 1998, 2001-2020 Free Software Foundation, Inc. +Copyright (C) 1998, 2001-2021 Free Software Foundation, Inc. Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 National Institute of Advanced Industrial Science and Technology (AIST) diff --git a/src/ccl.c b/src/ccl.c index 796698eb1ce..7c033afc882 100644 --- a/src/ccl.c +++ b/src/ccl.c @@ -1,5 +1,5 @@ /* CCL (Code Conversion Language) interpreter. - Copyright (C) 2001-2020 Free Software Foundation, Inc. + Copyright (C) 2001-2021 Free Software Foundation, Inc. Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 National Institute of Advanced Industrial Science and Technology (AIST) @@ -1151,7 +1151,7 @@ ccl_driver (struct ccl_program *ccl, int *source, int *destination, int src_size if (!INT_DIVIDE_OVERFLOW (reg[rrr], i)) reg[rrr] /= i; break; - case CCL_MOD: reg[rrr] %= i; break; + case CCL_MOD: if (!i) CCL_INVALID_CMD; reg[rrr] = i == -1 ? 0 : reg[rrr] % i; diff --git a/src/character.c b/src/character.c index 00b73293a3f..a599a0355f4 100644 --- a/src/character.c +++ b/src/character.c @@ -1,6 +1,6 @@ /* Basic character support. -Copyright (C) 2001-2020 Free Software Foundation, Inc. +Copyright (C) 2001-2021 Free Software Foundation, Inc. Copyright (C) 1995, 1997, 1998, 2001 Electrotechnical Laboratory, JAPAN. Licensed to the Free Software Foundation. Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 diff --git a/src/charset.c b/src/charset.c index f6b5173fad4..eb388d1868b 100644 --- a/src/charset.c +++ b/src/charset.c @@ -1,6 +1,6 @@ /* Basic character set support. -Copyright (C) 2001-2020 Free Software Foundation, Inc. +Copyright (C) 2001-2021 Free Software Foundation, Inc. Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 diff --git a/src/charset.h b/src/charset.h index 62b28e6c8f0..97122d82a65 100644 --- a/src/charset.h +++ b/src/charset.h @@ -1,5 +1,5 @@ /* Header for charset handler. - Copyright (C) 2001-2020 Free Software Foundation, Inc. + Copyright (C) 2001-2021 Free Software Foundation, Inc. Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 National Institute of Advanced Industrial Science and Technology (AIST) @@ -1,5 +1,5 @@ /* Cursor motion subroutines for GNU Emacs. - Copyright (C) 1985, 1995, 2001-2020 Free Software Foundation, Inc. + Copyright (C) 1985, 1995, 2001-2021 Free Software Foundation, Inc. based primarily on public domain code written by Chris Torek This file is part of GNU Emacs. @@ -1,5 +1,5 @@ /* Cursor motion calculation definitions for GNU Emacs - Copyright (C) 1985, 1989, 2001-2020 Free Software Foundation, Inc. + Copyright (C) 1985, 1989, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/cmds.c b/src/cmds.c index c29cf00dad1..798fd68a920 100644 --- a/src/cmds.c +++ b/src/cmds.c @@ -1,6 +1,6 @@ /* Simple built-in editing commands. -Copyright (C) 1985, 1993-1998, 2001-2020 Free Software Foundation, Inc. +Copyright (C) 1985, 1993-1998, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/coding.c b/src/coding.c index 8c2443889d4..739dd6adcb5 100644 --- a/src/coding.c +++ b/src/coding.c @@ -1,5 +1,5 @@ /* Coding system handler (conversion, detection, etc). - Copyright (C) 2001-2020 Free Software Foundation, Inc. + Copyright (C) 2001-2021 Free Software Foundation, Inc. Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 National Institute of Advanced Industrial Science and Technology (AIST) diff --git a/src/coding.h b/src/coding.h index 9ad1e954f8d..d06bed3f5d9 100644 --- a/src/coding.h +++ b/src/coding.h @@ -1,5 +1,5 @@ /* Header for coding system handler. - Copyright (C) 2001-2020 Free Software Foundation, Inc. + Copyright (C) 2001-2021 Free Software Foundation, Inc. Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 National Institute of Advanced Industrial Science and Technology (AIST) diff --git a/src/commands.h b/src/commands.h index 81e9b7e4da9..a09858d050d 100644 --- a/src/commands.h +++ b/src/commands.h @@ -1,5 +1,5 @@ /* Definitions needed by most editing commands. - Copyright (C) 1985, 1994, 2001-2020 Free Software Foundation, Inc. + Copyright (C) 1985, 1994, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/composite.c b/src/composite.c index 66c1e86aae1..f1c011223b2 100644 --- a/src/composite.c +++ b/src/composite.c @@ -1,5 +1,5 @@ /* Composite sequence support. - Copyright (C) 2001-2020 Free Software Foundation, Inc. + Copyright (C) 2001-2021 Free Software Foundation, Inc. Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H14PRO021 diff --git a/src/composite.h b/src/composite.h index bdf63fed10e..c5d3c0faabb 100644 --- a/src/composite.h +++ b/src/composite.h @@ -1,5 +1,5 @@ /* Header for composite sequence handler. - Copyright (C) 2001-2020 Free Software Foundation, Inc. + Copyright (C) 2001-2021 Free Software Foundation, Inc. Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H14PRO021 diff --git a/src/conf_post.h b/src/conf_post.h index 1ef4ff33428..bd56f29e287 100644 --- a/src/conf_post.h +++ b/src/conf_post.h @@ -1,6 +1,6 @@ /* conf_post.h --- configure.ac includes this via AH_BOTTOM -Copyright (C) 1988, 1993-1994, 1999-2002, 2004-2020 Free Software +Copyright (C) 1988, 1993-1994, 1999-2002, 2004-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/cygw32.c b/src/cygw32.c index d402669ec14..b11d94d3a62 100644 --- a/src/cygw32.c +++ b/src/cygw32.c @@ -1,5 +1,5 @@ /* Cygwin support routines. - Copyright (C) 2011-2020 Free Software Foundation, Inc. + Copyright (C) 2011-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/cygw32.h b/src/cygw32.h index 647211b3209..19cb77539bb 100644 --- a/src/cygw32.h +++ b/src/cygw32.h @@ -1,5 +1,5 @@ /* Header for Cygwin support routines. - Copyright (C) 2011-2020 Free Software Foundation, Inc. + Copyright (C) 2011-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/data.c b/src/data.c index c5476495bd6..3cf5bbbdd56 100644 --- a/src/data.c +++ b/src/data.c @@ -1,5 +1,5 @@ /* Primitive operations on Lisp data types for GNU Emacs Lisp interpreter. - Copyright (C) 1985-1986, 1988, 1993-1995, 1997-2020 Free Software + Copyright (C) 1985-1986, 1988, 1993-1995, 1997-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/dbusbind.c b/src/dbusbind.c index dc4db5c8513..c005474d440 100644 --- a/src/dbusbind.c +++ b/src/dbusbind.c @@ -1,5 +1,5 @@ /* Elisp bindings for D-Bus. - Copyright (C) 2007-2020 Free Software Foundation, Inc. + Copyright (C) 2007-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -132,23 +132,36 @@ static bool xd_in_read_queued_messages = 0; #define XD_BASIC_DBUS_TYPE(type) \ (dbus_type_is_valid (type) && dbus_type_is_basic (type)) #else -#define XD_BASIC_DBUS_TYPE(type) \ - ((type == DBUS_TYPE_BYTE) \ - || (type == DBUS_TYPE_BOOLEAN) \ - || (type == DBUS_TYPE_INT16) \ - || (type == DBUS_TYPE_UINT16) \ - || (type == DBUS_TYPE_INT32) \ - || (type == DBUS_TYPE_UINT32) \ - || (type == DBUS_TYPE_INT64) \ - || (type == DBUS_TYPE_UINT64) \ - || (type == DBUS_TYPE_DOUBLE) \ - || (type == DBUS_TYPE_STRING) \ - || (type == DBUS_TYPE_OBJECT_PATH) \ - || (type == DBUS_TYPE_SIGNATURE) \ #ifdef DBUS_TYPE_UNIX_FD - || (type == DBUS_TYPE_UNIX_FD) \ +#define XD_BASIC_DBUS_TYPE(type) \ + ((type == DBUS_TYPE_BYTE) \ + || (type == DBUS_TYPE_BOOLEAN) \ + || (type == DBUS_TYPE_INT16) \ + || (type == DBUS_TYPE_UINT16) \ + || (type == DBUS_TYPE_INT32) \ + || (type == DBUS_TYPE_UINT32) \ + || (type == DBUS_TYPE_INT64) \ + || (type == DBUS_TYPE_UINT64) \ + || (type == DBUS_TYPE_DOUBLE) \ + || (type == DBUS_TYPE_STRING) \ + || (type == DBUS_TYPE_OBJECT_PATH) \ + || (type == DBUS_TYPE_SIGNATURE) \ + || (type == DBUS_TYPE_UNIX_FD)) +#else +#define XD_BASIC_DBUS_TYPE(type) \ + ((type == DBUS_TYPE_BYTE) \ + || (type == DBUS_TYPE_BOOLEAN) \ + || (type == DBUS_TYPE_INT16) \ + || (type == DBUS_TYPE_UINT16) \ + || (type == DBUS_TYPE_INT32) \ + || (type == DBUS_TYPE_UINT32) \ + || (type == DBUS_TYPE_INT64) \ + || (type == DBUS_TYPE_UINT64) \ + || (type == DBUS_TYPE_DOUBLE) \ + || (type == DBUS_TYPE_STRING) \ + || (type == DBUS_TYPE_OBJECT_PATH) \ + || (type == DBUS_TYPE_SIGNATURE)) #endif - ) #endif /* This was a macro. On Solaris 2.11 it was said to compile for diff --git a/src/decompress.c b/src/decompress.c index afd43e13ac6..17224f61234 100644 --- a/src/decompress.c +++ b/src/decompress.c @@ -1,5 +1,5 @@ /* Interface to zlib. - Copyright (C) 2013-2020 Free Software Foundation, Inc. + Copyright (C) 2013-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/deps.mk b/src/deps.mk index 4d162eeb0f2..eda2ed63382 100644 --- a/src/deps.mk +++ b/src/deps.mk @@ -1,6 +1,6 @@ ### deps.mk --- src/Makefile fragment for GNU Emacs -## Copyright (C) 1985, 1987-1988, 1993-1995, 1999-2020 Free Software +## Copyright (C) 1985, 1987-1988, 1993-1995, 1999-2021 Free Software ## Foundation, Inc. ## This file is part of GNU Emacs. diff --git a/src/dired.c b/src/dired.c index feb5f05cb18..ebcf77bc263 100644 --- a/src/dired.c +++ b/src/dired.c @@ -1,5 +1,5 @@ /* Lisp functions for making directory listings. - Copyright (C) 1985-1986, 1993-1994, 1999-2020 Free Software + Copyright (C) 1985-1986, 1993-1994, 1999-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/dispextern.h b/src/dispextern.h index c76822ff390..3ad98b8344e 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -1,6 +1,6 @@ /* Interface definitions for display code. -Copyright (C) 1985, 1993-1994, 1997-2020 Free Software Foundation, Inc. +Copyright (C) 1985, 1993-1994, 1997-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/dispnew.c b/src/dispnew.c index e0a64761904..36a6dd8a091 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -1,6 +1,6 @@ /* Updating of data structures for redisplay. -Copyright (C) 1985-1988, 1993-1995, 1997-2020 Free Software Foundation, +Copyright (C) 1985-1988, 1993-1995, 1997-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/disptab.h b/src/disptab.h index d5453474d95..adf411b805d 100644 --- a/src/disptab.h +++ b/src/disptab.h @@ -1,5 +1,5 @@ /* Things for GLYPHS and glyph tables. - Copyright (C) 1993, 2001-2020 Free Software Foundation, Inc. + Copyright (C) 1993, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/dmpstruct.awk b/src/dmpstruct.awk index a25bcf6f404..c7b93da3bcb 100644 --- a/src/dmpstruct.awk +++ b/src/dmpstruct.awk @@ -1,4 +1,4 @@ -# Copyright (C) 2018-2020 Free Software Foundation, Inc. +# Copyright (C) 2018-2021 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/src/doc.c b/src/doc.c index de904b42e2a..01f4368e3b6 100644 --- a/src/doc.c +++ b/src/doc.c @@ -1,6 +1,6 @@ /* Record indices of function doc strings stored in a file. -*- coding: utf-8 -*- -Copyright (C) 1985-1986, 1993-1995, 1997-2020 Free Software Foundation, +Copyright (C) 1985-1986, 1993-1995, 1997-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -82,10 +82,7 @@ Lisp_Object get_doc_string (Lisp_Object filepos, bool unibyte, bool definition) { char *from, *to, *name, *p, *p1; - int fd; - int offset; - EMACS_INT position; - Lisp_Object file, tem, pos; + Lisp_Object file, pos; ptrdiff_t count = SPECPDL_INDEX (); USE_SAFE_ALLOCA; @@ -102,7 +99,7 @@ get_doc_string (Lisp_Object filepos, bool unibyte, bool definition) else return Qnil; - position = eabs (XFIXNUM (pos)); + EMACS_INT position = eabs (XFIXNUM (pos)); if (!STRINGP (Vdoc_directory)) return Qnil; @@ -113,7 +110,7 @@ get_doc_string (Lisp_Object filepos, bool unibyte, bool definition) /* Put the file name in NAME as a C string. If it is relative, combine it with Vdoc_directory. */ - tem = Ffile_name_absolute_p (file); + Lisp_Object tem = Ffile_name_absolute_p (file); file = ENCODE_FILE (file); Lisp_Object docdir = NILP (tem) ? ENCODE_FILE (Vdoc_directory) : empty_unibyte_string; @@ -123,7 +120,7 @@ get_doc_string (Lisp_Object filepos, bool unibyte, bool definition) name = SAFE_ALLOCA (docdir_sizemax + SBYTES (file)); lispstpcpy (lispstpcpy (name, docdir), file); - fd = emacs_open (name, O_RDONLY, 0); + int fd = emacs_open (name, O_RDONLY, 0); if (fd < 0) { if (will_dump_p ()) @@ -150,7 +147,7 @@ get_doc_string (Lisp_Object filepos, bool unibyte, bool definition) /* Seek only to beginning of disk block. */ /* Make sure we read at least 1024 bytes before `position' so we can check the leading text for consistency. */ - offset = min (position, max (1024, position % (8 * 1024))); + int offset = min (position, max (1024, position % (8 * 1024))); if (TYPE_MAXIMUM (off_t) < position || lseek (fd, position - offset, 0) < 0) error ("Position %"pI"d out of range in doc string file \"%s\"", @@ -164,7 +161,6 @@ get_doc_string (Lisp_Object filepos, bool unibyte, bool definition) { ptrdiff_t space_left = (get_doc_string_buffer_size - 1 - (p - get_doc_string_buffer)); - int nread; /* Allocate or grow the buffer if we need to. */ if (space_left <= 0) @@ -182,7 +178,7 @@ get_doc_string (Lisp_Object filepos, bool unibyte, bool definition) If we read the same block last time, maybe skip this? */ if (space_left > 1024 * 8) space_left = 1024 * 8; - nread = emacs_read_quit (fd, p, space_left); + int nread = emacs_read_quit (fd, p, space_left); if (nread < 0) report_file_error ("Read error on documentation file", file); p[nread] = 0; @@ -240,10 +236,8 @@ get_doc_string (Lisp_Object filepos, bool unibyte, bool definition) { if (*from == 1) { - int c; - from++; - c = *from++; + int c = *from++; if (c == 1) *to++ = c; else if (c == '0') @@ -313,10 +307,8 @@ Unless a non-nil second argument RAW is given, the string is passed through `substitute-command-keys'. */) (Lisp_Object function, Lisp_Object raw) { - Lisp_Object fun; - Lisp_Object funcar; Lisp_Object doc; - bool try_reload = 1; + bool try_reload = true; documentation: @@ -330,7 +322,7 @@ string is passed through `substitute-command-keys'. */) raw); } - fun = Findirect_function (function, Qnil); + Lisp_Object fun = Findirect_function (function, Qnil); if (NILP (fun)) xsignal1 (Qvoid_function, function); if (CONSP (fun) && EQ (XCAR (fun), Qmacro)) @@ -367,7 +359,7 @@ string is passed through `substitute-command-keys'. */) } else if (CONSP (fun)) { - funcar = XCAR (fun); + Lisp_Object funcar = XCAR (fun); if (!SYMBOLP (funcar)) xsignal1 (Qinvalid_function, fun); else if (EQ (funcar, Qkeymap)) @@ -411,7 +403,7 @@ string is passed through `substitute-command-keys'. */) try_reload = reread_doc_file (Fcar_safe (doc)); if (try_reload) { - try_reload = 0; + try_reload = false; goto documentation; } } @@ -435,7 +427,7 @@ This differs from `get' in that it can refer to strings stored in the aren't strings. */) (Lisp_Object symbol, Lisp_Object prop, Lisp_Object raw) { - bool try_reload = 1; + bool try_reload = true; Lisp_Object tem; documentation_property: @@ -467,7 +459,7 @@ aren't strings. */) try_reload = reread_doc_file (Fcar_safe (doc)); if (try_reload) { - try_reload = 0; + try_reload = false; goto documentation_property; } } @@ -497,9 +489,7 @@ store_function_docstring (Lisp_Object obj, EMACS_INT offset) fun = XCDR (fun); if (CONSP (fun)) { - Lisp_Object tem; - - tem = XCAR (fun); + Lisp_Object tem = XCAR (fun); if (EQ (tem, Qlambda) || EQ (tem, Qautoload) || (EQ (tem, Qclosure) && (fun = XCDR (fun), 1))) { diff --git a/src/doprnt.c b/src/doprnt.c index 7b742ad255a..b6b5978c891 100644 --- a/src/doprnt.c +++ b/src/doprnt.c @@ -1,7 +1,7 @@ /* Output like sprintf to a buffer of specified size. -*- coding: utf-8 -*- Also takes args differently: pass one pointer to the end of the format string in addition to the format string itself. - Copyright (C) 1985, 2001-2020 Free Software Foundation, Inc. + Copyright (C) 1985, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/dosfns.c b/src/dosfns.c index 7a6605dece6..10023c8c7f1 100644 --- a/src/dosfns.c +++ b/src/dosfns.c @@ -1,6 +1,6 @@ /* MS-DOS specific Lisp utilities. Coded by Manabu Higashida, 1991. Major changes May-July 1993 Morten Welinder (only 10% original code left) - Copyright (C) 1991, 1993, 1996-1998, 2001-2020 Free Software + Copyright (C) 1991, 1993, 1996-1998, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/dosfns.h b/src/dosfns.h index bae199b6f6c..6ad2a034707 100644 --- a/src/dosfns.h +++ b/src/dosfns.h @@ -2,7 +2,7 @@ Coded by Manabu Higashida, 1991. Modified by Morten Welinder, 1993-1994. -Copyright (C) 1991, 1994-1995, 1997, 1999, 2001-2020 Free Software +Copyright (C) 1991, 1994-1995, 1997, 1999, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/dynlib.c b/src/dynlib.c index b3fd815e68c..1338e9109c9 100644 --- a/src/dynlib.c +++ b/src/dynlib.c @@ -1,6 +1,6 @@ /* Portable API for dynamic loading. -Copyright 2015-2020 Free Software Foundation, Inc. +Copyright 2015-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/dynlib.h b/src/dynlib.h index cb3454b5563..e20d8891a23 100644 --- a/src/dynlib.h +++ b/src/dynlib.h @@ -1,6 +1,6 @@ /* Portable API for dynamic loading. -Copyright 2015-2020 Free Software Foundation, Inc. +Copyright 2015-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/editfns.c b/src/editfns.c index e4c4141ef5e..6f04c998915 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -1,6 +1,6 @@ /* Lisp functions pertaining to editing. -*- coding: utf-8 -*- -Copyright (C) 1985-1987, 1989, 1993-2020 Free Software Foundation, Inc. +Copyright (C) 1985-1987, 1989, 1993-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/emacs-icon.h b/src/emacs-icon.h index c3fd7f3ce28..87790bbc29e 100644 --- a/src/emacs-icon.h +++ b/src/emacs-icon.h @@ -1,7 +1,7 @@ /* XPM */ /* Emacs icon -Copyright (C) 2008-2020 Free Software Foundation, Inc. +Copyright (C) 2008-2021 Free Software Foundation, Inc. Author: Kentaro Ohkouchi <nanasess@fsm.ne.jp> Nicolas Petton <nicolas@petton.fr> diff --git a/src/emacs-module.c b/src/emacs-module.c index b7cd835c83c..894dffcf21e 100644 --- a/src/emacs-module.c +++ b/src/emacs-module.c @@ -1,6 +1,6 @@ /* emacs-module.c - Module loading and runtime implementation -Copyright (C) 2015-2020 Free Software Foundation, Inc. +Copyright (C) 2015-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/emacs-module.h.in b/src/emacs-module.h.in index 6a39d507c84..2989b439109 100644 --- a/src/emacs-module.h.in +++ b/src/emacs-module.h.in @@ -1,6 +1,6 @@ /* emacs-module.h - GNU Emacs module API. -Copyright (C) 2015-2020 Free Software Foundation, Inc. +Copyright (C) 2015-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/emacs.c b/src/emacs.c index 4b3f4c7305a..5d9317ada17 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -1,6 +1,6 @@ /* Fully extensible Emacs, running on Unix, intended for GNU. -Copyright (C) 1985-1987, 1993-1995, 1997-1999, 2001-2020 Free Software +Copyright (C) 1985-1987, 1993-1995, 1997-1999, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/emacsgtkfixed.c b/src/emacsgtkfixed.c index ea9465d5536..996ded2acaa 100644 --- a/src/emacsgtkfixed.c +++ b/src/emacsgtkfixed.c @@ -1,7 +1,7 @@ /* A Gtk Widget that inherits GtkFixed, but can be shrunk. This file is only use when compiling with Gtk+ 3. -Copyright (C) 2011-2020 Free Software Foundation, Inc. +Copyright (C) 2011-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/emacsgtkfixed.h b/src/emacsgtkfixed.h index b230a4d4d8a..78879764d86 100644 --- a/src/emacsgtkfixed.h +++ b/src/emacsgtkfixed.h @@ -1,7 +1,7 @@ /* A Gtk Widget that inherits GtkFixed, but can be shrunk. This file is only use when compiling with Gtk+ 3. -Copyright (C) 2011-2020 Free Software Foundation, Inc. +Copyright (C) 2011-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/epaths.in b/src/epaths.in index 5b6c650b0da..0c72610c6c1 100644 --- a/src/epaths.in +++ b/src/epaths.in @@ -1,6 +1,6 @@ /* Hey Emacs, this is -*- C -*- code! */ /* -Copyright (C) 1993, 1995, 1997, 1999, 2001-2020 Free Software +Copyright (C) 1993, 1995, 1997, 1999, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/eval.c b/src/eval.c index 368fa0944a1..e83df8ce221 100644 --- a/src/eval.c +++ b/src/eval.c @@ -1,6 +1,6 @@ /* Evaluator for GNU Emacs Lisp interpreter. -Copyright (C) 1985-1987, 1993-1995, 1999-2020 Free Software Foundation, +Copyright (C) 1985-1987, 1993-1995, 1999-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/fileio.c b/src/fileio.c index 23b4523c944..741e297d29c 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -1,6 +1,6 @@ /* File IO for GNU Emacs. -Copyright (C) 1985-1988, 1993-2020 Free Software Foundation, Inc. +Copyright (C) 1985-1988, 1993-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/filelock.c b/src/filelock.c index 39febd366d8..35baa0c6668 100644 --- a/src/filelock.c +++ b/src/filelock.c @@ -1,6 +1,6 @@ /* Lock files for editing. -Copyright (C) 1985-1987, 1993-1994, 1996, 1998-2020 Free Software +Copyright (C) 1985-1987, 1993-1994, 1996, 1998-2021 Free Software Foundation, Inc. Author: Richard King diff --git a/src/firstfile.c b/src/firstfile.c index 9dc70df9d3c..2733e1b5d64 100644 --- a/src/firstfile.c +++ b/src/firstfile.c @@ -1,5 +1,5 @@ /* Mark beginning of data space to dump as pure, for GNU Emacs. - Copyright (C) 1997, 2001-2020 Free Software Foundation, Inc. + Copyright (C) 1997, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/floatfns.c b/src/floatfns.c index 235e3b4cdfe..aadae4fd9d6 100644 --- a/src/floatfns.c +++ b/src/floatfns.c @@ -1,6 +1,6 @@ /* Primitive operations on floating point for GNU Emacs Lisp interpreter. -Copyright (C) 1988, 1993-1994, 1999, 2001-2020 Free Software Foundation, +Copyright (C) 1988, 1993-1994, 1999, 2001-2021 Free Software Foundation, Inc. Author: Wolfgang Rupprecht (according to ack.texi) diff --git a/src/fns.c b/src/fns.c index 2de1d26dd31..5fcc54f0d1f 100644 --- a/src/fns.c +++ b/src/fns.c @@ -1,6 +1,6 @@ /* Random utility Lisp functions. -Copyright (C) 1985-1987, 1993-1995, 1997-2020 Free Software Foundation, +Copyright (C) 1985-1987, 1993-1995, 1997-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/font.c b/src/font.c index 5f9db2ebb8c..a59ebe216b8 100644 --- a/src/font.c +++ b/src/font.c @@ -1,6 +1,6 @@ /* font.c -- "Font" primitives. -Copyright (C) 2006-2020 Free Software Foundation, Inc. +Copyright (C) 2006-2021 Free Software Foundation, Inc. Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H13PRO009 diff --git a/src/font.h b/src/font.h index 8614e7fa10a..d3e15306427 100644 --- a/src/font.h +++ b/src/font.h @@ -1,5 +1,5 @@ /* font.h -- Interface definition for font handling. - Copyright (C) 2006-2020 Free Software Foundation, Inc. + Copyright (C) 2006-2021 Free Software Foundation, Inc. Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H13PRO009 diff --git a/src/fontset.c b/src/fontset.c index 8c86075c07e..332be6c39d1 100644 --- a/src/fontset.c +++ b/src/fontset.c @@ -1,6 +1,6 @@ /* Fontset handler. -Copyright (C) 2001-2020 Free Software Foundation, Inc. +Copyright (C) 2001-2021 Free Software Foundation, Inc. Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 National Institute of Advanced Industrial Science and Technology (AIST) diff --git a/src/fontset.h b/src/fontset.h index f8a6b1d62d2..42cca50d381 100644 --- a/src/fontset.h +++ b/src/fontset.h @@ -1,5 +1,5 @@ /* Header for fontset handler. - Copyright (C) 1998, 2001-2020 Free Software Foundation, Inc. + Copyright (C) 1998, 2001-2021 Free Software Foundation, Inc. Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 National Institute of Advanced Industrial Science and Technology (AIST) diff --git a/src/frame.c b/src/frame.c index 164c05cae85..45ee96e9620 100644 --- a/src/frame.c +++ b/src/frame.c @@ -1,6 +1,6 @@ /* Generic frame functions. -Copyright (C) 1993-1995, 1997, 1999-2020 Free Software Foundation, Inc. +Copyright (C) 1993-1995, 1997, 1999-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/frame.h b/src/frame.h index 16ecfd311c3..8cf41dc0046 100644 --- a/src/frame.h +++ b/src/frame.h @@ -1,5 +1,5 @@ /* Define frame-object for GNU Emacs. - Copyright (C) 1993-1994, 1999-2020 Free Software Foundation, Inc. + Copyright (C) 1993-1994, 1999-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/fringe.c b/src/fringe.c index 75496692d53..65c9a84ac99 100644 --- a/src/fringe.c +++ b/src/fringe.c @@ -1,5 +1,5 @@ /* Fringe handling (split from xdisp.c). - Copyright (C) 1985-1988, 1993-1995, 1997-2020 Free Software + Copyright (C) 1985-1988, 1993-1995, 1997-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/ftcrfont.c b/src/ftcrfont.c index b89510704e1..db417b3e77d 100644 --- a/src/ftcrfont.c +++ b/src/ftcrfont.c @@ -1,5 +1,5 @@ /* ftcrfont.c -- FreeType font driver on cairo. - Copyright (C) 2015-2020 Free Software Foundation, Inc. + Copyright (C) 2015-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/ftfont.c b/src/ftfont.c index 6fca9c85093..0603dd9ce68 100644 --- a/src/ftfont.c +++ b/src/ftfont.c @@ -1,5 +1,5 @@ /* ftfont.c -- FreeType font driver. - Copyright (C) 2006-2020 Free Software Foundation, Inc. + Copyright (C) 2006-2021 Free Software Foundation, Inc. Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H13PRO009 diff --git a/src/getpagesize.h b/src/getpagesize.h index f033d9739d1..ec497d04040 100644 --- a/src/getpagesize.h +++ b/src/getpagesize.h @@ -1,5 +1,5 @@ /* Emulate getpagesize on systems that lack it. - Copyright (C) 1986, 1992, 1995, 2001-2020 Free Software Foundation, + Copyright (C) 1986, 1992, 1995, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/gfilenotify.c b/src/gfilenotify.c index d083afc2fca..4da61569435 100644 --- a/src/gfilenotify.c +++ b/src/gfilenotify.c @@ -1,5 +1,5 @@ /* Filesystem notifications support with glib API. - Copyright (C) 2013-2020 Free Software Foundation, Inc. + Copyright (C) 2013-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/gmalloc.c b/src/gmalloc.c index 3560c744539..66008ea69b2 100644 --- a/src/gmalloc.c +++ b/src/gmalloc.c @@ -1,5 +1,5 @@ /* Declarations for `malloc' and friends. - Copyright (C) 1990-1993, 1995-1996, 1999, 2002-2007, 2013-2020 Free + Copyright (C) 1990-1993, 1995-1996, 1999, 2002-2007, 2013-2021 Free Software Foundation, Inc. Written May 1989 by Mike Haertel. diff --git a/src/gnutls.c b/src/gnutls.c index 0010553a9d4..b995ffffa60 100644 --- a/src/gnutls.c +++ b/src/gnutls.c @@ -1,5 +1,5 @@ /* GnuTLS glue for GNU Emacs. - Copyright (C) 2010-2020 Free Software Foundation, Inc. + Copyright (C) 2010-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/gnutls.h b/src/gnutls.h index 5f4ad603476..5fa08f8b129 100644 --- a/src/gnutls.h +++ b/src/gnutls.h @@ -1,5 +1,5 @@ /* GnuTLS glue for GNU Emacs. - Copyright (C) 2010-2020 Free Software Foundation, Inc. + Copyright (C) 2010-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/gtkutil.c b/src/gtkutil.c index 807ee17fa30..11e59b9fae5 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -1,6 +1,6 @@ /* Functions for creating and updating GTK widgets. -Copyright (C) 2003-2020 Free Software Foundation, Inc. +Copyright (C) 2003-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/gtkutil.h b/src/gtkutil.h index 5419167cd78..31a12cd5d3c 100644 --- a/src/gtkutil.h +++ b/src/gtkutil.h @@ -1,6 +1,6 @@ /* Definitions and headers for GTK widgets. -Copyright (C) 2003-2020 Free Software Foundation, Inc. +Copyright (C) 2003-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/hbfont.c b/src/hbfont.c index 82b115e6868..e9f4085b1ae 100644 --- a/src/hbfont.c +++ b/src/hbfont.c @@ -1,5 +1,5 @@ /* hbfont.c -- Platform-independent support for HarfBuzz font driver. - Copyright (C) 2019-2020 Free Software Foundation, Inc. + Copyright (C) 2019-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/image.c b/src/image.c index e99ba09f515..a124cf91ba0 100644 --- a/src/image.c +++ b/src/image.c @@ -1,6 +1,6 @@ /* Functions for image support on window system. -Copyright (C) 1989, 1992-2020 Free Software Foundation, Inc. +Copyright (C) 1989, 1992-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/indent.c b/src/indent.c index 4ecf02b6b96..0a6b460f753 100644 --- a/src/indent.c +++ b/src/indent.c @@ -1,5 +1,5 @@ /* Indentation functions. - Copyright (C) 1985-1988, 1993-1995, 1998, 2000-2020 Free Software + Copyright (C) 1985-1988, 1993-1995, 1998, 2000-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/indent.h b/src/indent.h index 6058429ede5..776fe7ba4b9 100644 --- a/src/indent.h +++ b/src/indent.h @@ -1,5 +1,5 @@ /* Definitions for interface to indent.c - Copyright (C) 1985-1986, 2001-2020 Free Software Foundation, Inc. + Copyright (C) 1985-1986, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/inotify.c b/src/inotify.c index 549a82b4013..df6145d7025 100644 --- a/src/inotify.c +++ b/src/inotify.c @@ -1,6 +1,6 @@ /* Inotify support for Emacs -Copyright (C) 2012-2020 Free Software Foundation, Inc. +Copyright (C) 2012-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/insdel.c b/src/insdel.c index 6e245971085..e38b091f542 100644 --- a/src/insdel.c +++ b/src/insdel.c @@ -1,5 +1,5 @@ /* Buffer insertion/deletion and gap motion for GNU Emacs. -*- coding: utf-8 -*- - Copyright (C) 1985-1986, 1993-1995, 1997-2020 Free Software + Copyright (C) 1985-1986, 1993-1995, 1997-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/intervals.c b/src/intervals.c index 0257591a142..f88a41f2549 100644 --- a/src/intervals.c +++ b/src/intervals.c @@ -1,5 +1,5 @@ /* Code for doing intervals. - Copyright (C) 1993-1995, 1997-1998, 2001-2020 Free Software + Copyright (C) 1993-1995, 1997-1998, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/intervals.h b/src/intervals.h index 9a7ba910a10..c1b19345d2e 100644 --- a/src/intervals.h +++ b/src/intervals.h @@ -1,5 +1,5 @@ /* Definitions and global variables for intervals. - Copyright (C) 1993-1994, 2000-2020 Free Software Foundation, Inc. + Copyright (C) 1993-1994, 2000-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/json.c b/src/json.c index 744c40a1bef..2901a20811a 100644 --- a/src/json.c +++ b/src/json.c @@ -1,6 +1,6 @@ /* JSON parsing and serialization. -Copyright (C) 2017-2020 Free Software Foundation, Inc. +Copyright (C) 2017-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/keyboard.c b/src/keyboard.c index 54232aaea1e..d2f0cb405f0 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -1,6 +1,6 @@ /* Keyboard and mouse input; editor command loop. -Copyright (C) 1985-1989, 1993-1997, 1999-2020 Free Software Foundation, +Copyright (C) 1985-1989, 1993-1997, 1999-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -3647,7 +3647,8 @@ kbd_buffer_unget_event (struct selection_input_event *event) #define INPUT_EVENT_POS_MAX \ ((ptrdiff_t) min (PTRDIFF_MAX, min (TYPE_MAXIMUM (Time) / 2, \ MOST_POSITIVE_FIXNUM))) -#define INPUT_EVENT_POS_MIN (-1 - INPUT_EVENT_POS_MAX) +#define INPUT_EVENT_POS_MIN (PTRDIFF_MIN < -INPUT_EVENT_POS_MAX \ + ? -1 - INPUT_EVENT_POS_MAX : PTRDIFF_MIN) /* Return a Time that encodes position POS. POS must be in range. */ diff --git a/src/keyboard.h b/src/keyboard.h index 24e9a007888..91c6f4604f9 100644 --- a/src/keyboard.h +++ b/src/keyboard.h @@ -1,5 +1,5 @@ /* Declarations useful when processing input. - Copyright (C) 1985-1987, 1993, 2001-2020 Free Software Foundation, + Copyright (C) 1985-1987, 1993, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/keymap.c b/src/keymap.c index ca2d33dba47..f9aac6d7313 100644 --- a/src/keymap.c +++ b/src/keymap.c @@ -1,5 +1,5 @@ /* Manipulation of keymaps - Copyright (C) 1985-1988, 1993-1995, 1998-2020 Free Software + Copyright (C) 1985-1988, 1993-1995, 1998-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -218,15 +218,13 @@ when reading a key-sequence to be looked-up in this keymap. */) Lisp_Object get_keymap (Lisp_Object object, bool error_if_not_keymap, bool autoload) { - Lisp_Object tem; - autoload_retry: if (NILP (object)) goto end; if (CONSP (object) && EQ (XCAR (object), Qkeymap)) return object; - tem = indirect_function (object); + Lisp_Object tem = indirect_function (object); if (CONSP (tem)) { if (EQ (XCAR (tem), Qkeymap)) @@ -265,12 +263,10 @@ get_keymap (Lisp_Object object, bool error_if_not_keymap, bool autoload) static Lisp_Object keymap_parent (Lisp_Object keymap, bool autoload) { - Lisp_Object list; - keymap = get_keymap (keymap, 1, autoload); /* Skip past the initial element `keymap'. */ - list = XCDR (keymap); + Lisp_Object list = XCDR (keymap); for (; CONSP (list); list = XCDR (list)) { /* See if there is another `keymap'. */ @@ -306,8 +302,6 @@ DEFUN ("set-keymap-parent", Fset_keymap_parent, Sset_keymap_parent, 2, 2, 0, Return PARENT. PARENT should be nil or another keymap. */) (Lisp_Object keymap, Lisp_Object parent) { - Lisp_Object list, prev; - /* Flush any reverse-map cache. */ where_is_cache = Qnil; where_is_cache_keymaps = Qt; @@ -323,10 +317,10 @@ Return PARENT. PARENT should be nil or another keymap. */) } /* Skip past the initial element `keymap'. */ - prev = keymap; + Lisp_Object prev = keymap; while (1) { - list = XCDR (prev); + Lisp_Object list = XCDR (prev); /* If there is a parent keymap here, replace it. If we came to the end, add the parent in PREV. */ if (!CONSP (list) || KEYMAPP (list)) @@ -805,14 +799,10 @@ store_in_keymap (Lisp_Object keymap, register Lisp_Object idx, Lisp_Object def) towards the front of the alist and character lookups in dense keymaps will remain fast. Otherwise, this just points at the front of the keymap. */ - Lisp_Object insertion_point; - - insertion_point = keymap; + Lisp_Object insertion_point = keymap; for (tail = XCDR (keymap); CONSP (tail); tail = XCDR (tail)) { - Lisp_Object elt; - - elt = XCAR (tail); + Lisp_Object elt = XCAR (tail); if (VECTORP (elt)) { if (FIXNATP (idx) && XFIXNAT (idx) < ASIZE (elt)) @@ -1018,9 +1008,8 @@ copy_keymap_1 (Lisp_Object keymap, int depth) } else if (VECTORP (elt)) { - int i; elt = Fcopy_sequence (elt); - for (i = 0; i < ASIZE (elt); i++) + for (int i = 0; i < ASIZE (elt); i++) ASET (elt, i, copy_keymap_item (AREF (elt, i), depth + 1)); } else if (CONSP (elt)) @@ -1097,24 +1086,19 @@ binding is altered. If there is no binding for KEY, the new pair binding KEY to DEF is added at the front of KEYMAP. */) (Lisp_Object keymap, Lisp_Object key, Lisp_Object def) { - ptrdiff_t idx; - Lisp_Object c; - Lisp_Object cmd; - bool metized = 0; - int meta_bit; - ptrdiff_t length; + bool metized = false; keymap = get_keymap (keymap, 1, 1); - length = CHECK_VECTOR_OR_STRING (key); + ptrdiff_t length = CHECK_VECTOR_OR_STRING (key); if (length == 0) return Qnil; if (SYMBOLP (def) && !EQ (Vdefine_key_rebound_commands, Qt)) Vdefine_key_rebound_commands = Fcons (def, Vdefine_key_rebound_commands); - meta_bit = (VECTORP (key) || (STRINGP (key) && STRING_MULTIBYTE (key)) - ? meta_modifier : 0x80); + int meta_bit = (VECTORP (key) || (STRINGP (key) && STRING_MULTIBYTE (key)) + ? meta_modifier : 0x80); if (VECTORP (def) && ASIZE (def) > 0 && CONSP (AREF (def, 0))) { /* DEF is apparently an XEmacs-style keyboard macro. */ @@ -1130,10 +1114,10 @@ binding KEY to DEF is added at the front of KEYMAP. */) def = tmp; } - idx = 0; + ptrdiff_t idx = 0; while (1) { - c = Faref (key, make_fixnum (idx)); + Lisp_Object c = Faref (key, make_fixnum (idx)); if (CONSP (c)) { @@ -1153,14 +1137,14 @@ binding KEY to DEF is added at the front of KEYMAP. */) && !metized) { c = meta_prefix_char; - metized = 1; + metized = true; } else { if (FIXNUMP (c)) XSETINT (c, XFIXNUM (c) & ~meta_bit); - metized = 0; + metized = false; idx++; } @@ -1173,7 +1157,7 @@ binding KEY to DEF is added at the front of KEYMAP. */) if (idx == length) return store_in_keymap (keymap, c, def); - cmd = access_keymap (keymap, c, 0, 1, 1); + Lisp_Object cmd = access_keymap (keymap, c, 0, 1, 1); /* If this key is undefined, make it a prefix. */ if (NILP (cmd)) @@ -1250,23 +1234,19 @@ third optional argument ACCEPT-DEFAULT is non-nil, `lookup-key' will recognize the default bindings, just as `read-key-sequence' does. */) (Lisp_Object keymap, Lisp_Object key, Lisp_Object accept_default) { - ptrdiff_t idx; - Lisp_Object cmd; - Lisp_Object c; - ptrdiff_t length; bool t_ok = !NILP (accept_default); if (!CONSP (keymap) && !NILP (keymap)) keymap = get_keymap (keymap, true, true); - length = CHECK_VECTOR_OR_STRING (key); + ptrdiff_t length = CHECK_VECTOR_OR_STRING (key); if (length == 0) return keymap; - idx = 0; + ptrdiff_t idx = 0; while (1) { - c = Faref (key, make_fixnum (idx++)); + Lisp_Object c = Faref (key, make_fixnum (idx++)); if (CONSP (c) && lucid_event_type_list_p (c)) c = Fevent_convert_list (c); @@ -1280,7 +1260,7 @@ recognize the default bindings, just as `read-key-sequence' does. */) if (!FIXNUMP (c) && !SYMBOLP (c) && !CONSP (c) && !STRINGP (c)) message_with_string ("Key sequence contains invalid event %s", c, 1); - cmd = access_keymap (keymap, c, t_ok, 0, 1); + Lisp_Object cmd = access_keymap (keymap, c, t_ok, 0, 1); if (idx == length) return cmd; @@ -1299,9 +1279,7 @@ recognize the default bindings, just as `read-key-sequence' does. */) static Lisp_Object define_as_prefix (Lisp_Object keymap, Lisp_Object c) { - Lisp_Object cmd; - - cmd = Fmake_sparse_keymap (Qnil); + Lisp_Object cmd = Fmake_sparse_keymap (Qnil); store_in_keymap (keymap, c, cmd); return cmd; @@ -1322,15 +1300,12 @@ append_key (Lisp_Object key_sequence, Lisp_Object key) static void silly_event_symbol_error (Lisp_Object c) { - Lisp_Object parsed, base, name, assoc; - int modifiers; - - parsed = parse_modifiers (c); - modifiers = XFIXNAT (XCAR (XCDR (parsed))); - base = XCAR (parsed); - name = Fsymbol_name (base); + Lisp_Object parsed = parse_modifiers (c); + int modifiers = XFIXNAT (XCAR (XCDR (parsed))); + Lisp_Object base = XCAR (parsed); + Lisp_Object name = Fsymbol_name (base); /* This alist includes elements such as ("RET" . "\\r"). */ - assoc = Fassoc (name, exclude_keys, Qnil); + Lisp_Object assoc = Fassoc (name, exclude_keys, Qnil); if (! NILP (assoc)) { @@ -1391,16 +1366,14 @@ ptrdiff_t current_minor_maps (Lisp_Object **modeptr, Lisp_Object **mapptr) { ptrdiff_t i = 0; - int list_number = 0; Lisp_Object alist, assoc, var, val; - Lisp_Object emulation_alists; + Lisp_Object emulation_alists = Vemulation_mode_map_alists; Lisp_Object lists[2]; - emulation_alists = Vemulation_mode_map_alists; lists[0] = Vminor_mode_overriding_map_alist; lists[1] = Vminor_mode_map_alist; - for (list_number = 0; list_number < 2; list_number++) + for (int list_number = 0; list_number < 2; list_number++) { if (CONSP (emulation_alists)) { @@ -1526,9 +1499,7 @@ like in the respective argument of `key-binding'. */) if (CONSP (position)) { - Lisp_Object window; - - window = POSN_WINDOW (position); + Lisp_Object window = POSN_WINDOW (position); if (WINDOWP (window) && BUFFERP (XWINDOW (window)->contents) @@ -1557,7 +1528,7 @@ like in the respective argument of `key-binding'. */) if (NILP (XCDR (keymaps))) { Lisp_Object *maps; - int nmaps, i; + int nmaps; ptrdiff_t pt = click_position (position); /* This usually returns the buffer's local map, but that can be overridden by a `local-map' property. */ @@ -1575,9 +1546,7 @@ like in the respective argument of `key-binding'. */) if (POSN_INBUFFER_P (position)) { - Lisp_Object pos; - - pos = POSN_BUFFER_POSN (position); + Lisp_Object pos = POSN_BUFFER_POSN (position); if (FIXNUMP (pos) && XFIXNUM (pos) >= BEG && XFIXNUM (pos) <= Z) { @@ -1597,15 +1566,13 @@ like in the respective argument of `key-binding'. */) if (CONSP (string) && STRINGP (XCAR (string))) { - Lisp_Object pos, map; - - pos = XCDR (string); + Lisp_Object pos = XCDR (string); string = XCAR (string); if (FIXNUMP (pos) && XFIXNUM (pos) >= 0 && XFIXNUM (pos) < SCHARS (string)) { - map = Fget_text_property (pos, Qlocal_map, string); + Lisp_Object map = Fget_text_property (pos, Qlocal_map, string); if (!NILP (map)) local_map = map; @@ -1623,7 +1590,7 @@ like in the respective argument of `key-binding'. */) /* Now put all the minor mode keymaps on the list. */ nmaps = current_minor_maps (0, &maps); - for (i = --nmaps; i >= 0; i--) + for (int i = --nmaps; i >= 0; i--) if (!NILP (maps[i])) keymaps = Fcons (maps[i], keymaps); @@ -1667,18 +1634,15 @@ specified buffer position instead of point are used. */) (Lisp_Object key, Lisp_Object accept_default, Lisp_Object no_remap, Lisp_Object position) { - Lisp_Object value; - if (NILP (position) && VECTORP (key)) { - Lisp_Object event; - if (ASIZE (key) == 0) return Qnil; /* mouse events may have a symbolic prefix indicating the scrollbar or mode line */ - event = AREF (key, SYMBOLP (AREF (key, 0)) && ASIZE (key) > 1 ? 1 : 0); + Lisp_Object event + = AREF (key, SYMBOLP (AREF (key, 0)) && ASIZE (key) > 1 ? 1 : 0); /* We are not interested in locations without event data */ @@ -1690,8 +1654,8 @@ specified buffer position instead of point are used. } } - value = Flookup_key (Fcurrent_active_maps (Qt, position), - key, accept_default); + Lisp_Object value = Flookup_key (Fcurrent_active_maps (Qt, position), + key, accept_default); if (NILP (value) || FIXNUMP (value)) return Qnil; @@ -1720,8 +1684,7 @@ If optional argument ACCEPT-DEFAULT is non-nil, recognize default bindings; see the description of `lookup-key' for more details about this. */) (Lisp_Object keys, Lisp_Object accept_default) { - register Lisp_Object map; - map = BVAR (current_buffer, keymap); + register Lisp_Object map = BVAR (current_buffer, keymap); if (NILP (map)) return Qnil; return Flookup_key (map, keys, accept_default); @@ -1760,15 +1723,11 @@ bindings; see the description of `lookup-key' for more details about this. */) (Lisp_Object key, Lisp_Object accept_default) { Lisp_Object *modes, *maps; - int nmaps; - Lisp_Object binding; - int i, j; - - nmaps = current_minor_maps (&modes, &maps); - - binding = Qnil; + int nmaps = current_minor_maps (&modes, &maps); + Lisp_Object binding = Qnil; - for (i = j = 0; i < nmaps; i++) + int j; + for (int i = j = 0; i < nmaps; i++) if (!NILP (maps[i]) && !NILP (binding = Flookup_key (maps[i], key, accept_default)) && !FIXNUMP (binding)) @@ -1795,8 +1754,7 @@ string for the map. This is required to use the keymap as a menu. This function returns COMMAND. */) (Lisp_Object command, Lisp_Object mapvar, Lisp_Object name) { - Lisp_Object map; - map = Fmake_sparse_keymap (name); + Lisp_Object map = Fmake_sparse_keymap (name); Ffset (command, map); if (!NILP (mapvar)) Fset (mapvar, map); @@ -1942,8 +1900,7 @@ then the value includes only maps for prefixes that start with PREFIX. */) { /* If a prefix was specified, start with the keymap (if any) for that prefix, so we don't waste time considering other prefixes. */ - Lisp_Object tem; - tem = Flookup_key (keymap, prefix, Qt); + Lisp_Object tem = Flookup_key (keymap, prefix, Qt); /* Flookup_key may give us nil, or a number, if the prefix is not defined in this particular map. It might even give us a list that isn't a keymap. */ @@ -2406,7 +2363,6 @@ where_is_internal (Lisp_Object definition, Lisp_Object keymaps, bool noindirect, bool nomenus) { Lisp_Object maps = Qnil; - Lisp_Object found; struct where_is_internal_data data; /* Only important use of caching is for the menubar @@ -2432,7 +2388,7 @@ where_is_internal (Lisp_Object definition, Lisp_Object keymaps, we're filling it up. */ where_is_cache = Qnil; - found = keymaps; + Lisp_Object found = keymaps; while (CONSP (found)) { maps = @@ -2541,8 +2497,7 @@ The optional 5th arg NO-REMAP alters how command remapping is handled: /* Whether or not we're handling remapped sequences. This is needed because remapping is not done recursively by Fcommand_remapping: you can't remap a remapped command. */ - bool remapped = 0; - Lisp_Object tem = Qnil; + bool remapped = false; /* Refresh the C version of the modifier preference. */ where_is_preferred_modifier @@ -2556,7 +2511,7 @@ The optional 5th arg NO-REMAP alters how command remapping is handled: else keymaps = Fcurrent_active_maps (Qnil, Qnil); - tem = Fcommand_remapping (definition, Qnil, keymaps); + Lisp_Object tem = Fcommand_remapping (definition, Qnil, keymaps); /* If `definition' is remapped to `tem', then OT1H no key will run that command (since they will run `tem' instead), so we should return nil; but OTOH all keys bound to `definition' (or to `tem') @@ -2598,7 +2553,7 @@ The optional 5th arg NO-REMAP alters how command remapping is handled: considered remapped sequences yet, copy them over and process them. */ || (!remapped && (sequences = remapped_sequences, - remapped = 1, + remapped = true, CONSP (sequences)))) { Lisp_Object sequence, function; @@ -2744,9 +2699,7 @@ The optional argument MENUS, if non-nil, says to mention menu bindings. \(Ordinarily these are omitted from the output.) */) (Lisp_Object buffer, Lisp_Object prefix, Lisp_Object menus) { - Lisp_Object outbuf, shadow; Lisp_Object nomenu = NILP (menus) ? Qt : Qnil; - Lisp_Object start1; const char *alternate_heading = "\ @@ -2756,17 +2709,16 @@ You type Translation\n\ CHECK_BUFFER (buffer); - shadow = Qnil; - outbuf = Fcurrent_buffer (); + Lisp_Object shadow = Qnil; + Lisp_Object outbuf = Fcurrent_buffer (); /* Report on alternates for keys. */ if (STRINGP (KVAR (current_kboard, Vkeyboard_translate_table)) && !NILP (prefix)) { - int c; const unsigned char *translate = SDATA (KVAR (current_kboard, Vkeyboard_translate_table)); int translate_len = SCHARS (KVAR (current_kboard, Vkeyboard_translate_table)); - for (c = 0; c < translate_len; c++) + for (int c = 0; c < translate_len; c++) if (translate[c] != c) { char buf[KEY_DESCRIPTION_SIZE]; @@ -2803,7 +2755,7 @@ You type Translation\n\ } /* Print the (major mode) local map. */ - start1 = Qnil; + Lisp_Object start1 = Qnil; if (!NILP (KVAR (current_kboard, Voverriding_terminal_local_map))) start1 = KVAR (current_kboard, Voverriding_terminal_local_map); @@ -2832,14 +2784,13 @@ You type Translation\n\ else { /* Print the minor mode and major mode keymaps. */ - int i, nmaps; Lisp_Object *modes, *maps; /* Temporarily switch to `buffer', so that we can get that buffer's minor modes correctly. */ Fset_buffer (buffer); - nmaps = current_minor_maps (&modes, &maps); + int nmaps = current_minor_maps (&modes, &maps); Fset_buffer (outbuf); start1 = get_local_map (BUF_PT (XBUFFER (buffer)), @@ -2855,7 +2806,7 @@ You type Translation\n\ } /* Print the minor mode maps. */ - for (i = 0; i < nmaps; i++) + for (int i = 0; i < nmaps; i++) { /* The title for a minor mode keymap is constructed at run time. @@ -3042,21 +2993,11 @@ describe_vector (Lisp_Object vector, Lisp_Object prefix, Lisp_Object args, bool partial, Lisp_Object shadow, Lisp_Object entire_map, bool keymap_p, bool mention_shadow) { - Lisp_Object definition; - Lisp_Object tem2; Lisp_Object elt_prefix = Qnil; - int i; - Lisp_Object suppress; - Lisp_Object kludge; - bool first = 1; + Lisp_Object suppress = Qnil; + bool first = true; /* Range of elements to be handled. */ int from, to, stop; - Lisp_Object character; - int starting_i; - - suppress = Qnil; - - definition = Qnil; if (!keymap_p) { @@ -3071,7 +3012,7 @@ describe_vector (Lisp_Object vector, Lisp_Object prefix, Lisp_Object args, /* This vector gets used to present single keys to Flookup_key. Since that is done once per vector element, we don't want to cons up a fresh vector every time. */ - kludge = make_nil_vector (1); + Lisp_Object kludge = make_nil_vector (1); if (partial) suppress = intern ("suppress-keymap"); @@ -3082,12 +3023,12 @@ describe_vector (Lisp_Object vector, Lisp_Object prefix, Lisp_Object args, else stop = to = ASIZE (vector); - for (i = from; ; i++) + for (int i = from; ; i++) { - bool this_shadowed = 0; + bool this_shadowed = false; Lisp_Object shadowed_by = Qnil; int range_beg, range_end; - Lisp_Object val; + Lisp_Object val, tem2; maybe_quit (); @@ -3098,7 +3039,7 @@ describe_vector (Lisp_Object vector, Lisp_Object prefix, Lisp_Object args, stop = to; } - starting_i = i; + int starting_i = i; if (CHAR_TABLE_P (vector)) { @@ -3108,21 +3049,19 @@ describe_vector (Lisp_Object vector, Lisp_Object prefix, Lisp_Object args, } else val = AREF (vector, i); - definition = get_keyelt (val, 0); + Lisp_Object definition = get_keyelt (val, 0); if (NILP (definition)) continue; /* Don't mention suppressed commands. */ if (SYMBOLP (definition) && partial) { - Lisp_Object tem; - - tem = Fget (definition, suppress); + Lisp_Object tem = Fget (definition, suppress); if (!NILP (tem)) continue; } - character = make_fixnum (starting_i); + Lisp_Object character = make_fixnum (starting_i); ASET (kludge, 0, character); /* If this binding is shadowed by some other map, ignore it. */ @@ -3133,7 +3072,7 @@ describe_vector (Lisp_Object vector, Lisp_Object prefix, Lisp_Object args, if (!NILP (shadowed_by) && !EQ (shadowed_by, definition)) { if (mention_shadow) - this_shadowed = 1; + this_shadowed = true; else continue; } @@ -3143,9 +3082,7 @@ describe_vector (Lisp_Object vector, Lisp_Object prefix, Lisp_Object args, one in the same keymap. */ if (!NILP (entire_map)) { - Lisp_Object tem; - - tem = Flookup_key (entire_map, kludge, Qt); + Lisp_Object tem = Flookup_key (entire_map, kludge, Qt); if (!EQ (tem, definition)) continue; @@ -3154,7 +3091,7 @@ describe_vector (Lisp_Object vector, Lisp_Object prefix, Lisp_Object args, if (first) { insert ("\n", 1); - first = 0; + first = false; } /* Output the prefix that applies to every entry in this map. */ @@ -3164,9 +3101,9 @@ describe_vector (Lisp_Object vector, Lisp_Object prefix, Lisp_Object args, insert1 (Fkey_description (kludge, prefix)); /* Find all consecutive characters or rows that have the same - definition. But, VECTOR is a char-table, we had better put a - boundary between normal characters (-#x3FFF7F) and 8-bit - characters (#x3FFF80-). */ + definition. But, if VECTOR is a char-table, we had better + put a boundary between normal characters (-#x3FFF7F) and + 8-bit characters (#x3FFF80-). */ if (CHAR_TABLE_P (vector)) { while (i + 1 < stop @@ -3189,12 +3126,11 @@ describe_vector (Lisp_Object vector, Lisp_Object prefix, Lisp_Object args, if they are, that they are shadowed by the same command. */ if (CHAR_TABLE_P (vector) && i != starting_i) { - Lisp_Object tem; Lisp_Object key = make_nil_vector (1); for (int j = starting_i + 1; j <= i; j++) { ASET (key, 0, make_fixnum (j)); - tem = shadow_lookup (shadow, key, Qt, 0); + Lisp_Object tem = shadow_lookup (shadow, key, Qt, 0); if (NILP (Fequal (tem, shadowed_by))) i = j - 1; } diff --git a/src/keymap.h b/src/keymap.h index 2f7df2bd955..072c09348e2 100644 --- a/src/keymap.h +++ b/src/keymap.h @@ -1,5 +1,5 @@ /* Functions to manipulate keymaps. - Copyright (C) 2001-2020 Free Software Foundation, Inc. + Copyright (C) 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/kqueue.c b/src/kqueue.c index 590b747ef7c..0a0650d2081 100644 --- a/src/kqueue.c +++ b/src/kqueue.c @@ -1,6 +1,6 @@ /* Filesystem notifications support with kqueue API. -Copyright (C) 2015-2020 Free Software Foundation, Inc. +Copyright (C) 2015-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/lastfile.c b/src/lastfile.c index 7ddfe23d3dd..7df6cf10b12 100644 --- a/src/lastfile.c +++ b/src/lastfile.c @@ -1,5 +1,5 @@ /* Mark end of data space to dump as pure, for GNU Emacs. - Copyright (C) 1985, 2001-2020 Free Software Foundation, Inc. + Copyright (C) 1985, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/lcms.c b/src/lcms.c index 924bdd299dc..b998c8c4eb2 100644 --- a/src/lcms.c +++ b/src/lcms.c @@ -1,5 +1,5 @@ /* Interface to Little CMS - Copyright (C) 2017-2020 Free Software Foundation, Inc. + Copyright (C) 2017-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/lisp.h b/src/lisp.h index 6f00ae84517..8906957ece4 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -1,6 +1,6 @@ /* Fundamental definitions for GNU Emacs Lisp interpreter. -*- coding: utf-8 -*- -Copyright (C) 1985-1987, 1993-1995, 1997-2020 Free Software Foundation, +Copyright (C) 1985-1987, 1993-1995, 1997-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/lread.c b/src/lread.c index cba28a8c1d8..e308fa88699 100644 --- a/src/lread.c +++ b/src/lread.c @@ -1,6 +1,6 @@ /* Lisp parsing and input streams. -Copyright (C) 1985-1989, 1993-1995, 1997-2020 Free Software Foundation, +Copyright (C) 1985-1989, 1993-1995, 1997-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/macfont.h b/src/macfont.h index 1341030f353..0ec11f513c0 100644 --- a/src/macfont.h +++ b/src/macfont.h @@ -1,5 +1,5 @@ /* Interface definition for macOS Core text font backend. - Copyright (C) 2009-2020 Free Software Foundation, Inc. + Copyright (C) 2009-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/macfont.m b/src/macfont.m index 904814647f9..d86f09f4850 100644 --- a/src/macfont.m +++ b/src/macfont.m @@ -1,5 +1,5 @@ /* Font driver on macOS Core text. - Copyright (C) 2009-2020 Free Software Foundation, Inc. + Copyright (C) 2009-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/macros.c b/src/macros.c index 6006c863729..c8ce94e63b1 100644 --- a/src/macros.c +++ b/src/macros.c @@ -1,6 +1,6 @@ /* Keyboard macros. -Copyright (C) 1985-1986, 1993, 2000-2020 Free Software Foundation, Inc. +Copyright (C) 1985-1986, 1993, 2000-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/macros.h b/src/macros.h index d1d516bd837..23167a0763d 100644 --- a/src/macros.h +++ b/src/macros.h @@ -1,5 +1,5 @@ /* Definitions for keyboard macro interpretation in GNU Emacs. - Copyright (C) 1985, 2001-2020 Free Software Foundation, Inc. + Copyright (C) 1985, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/marker.c b/src/marker.c index 64f210db88b..59791513170 100644 --- a/src/marker.c +++ b/src/marker.c @@ -1,5 +1,5 @@ /* Markers: examining, setting and deleting. - Copyright (C) 1985, 1997-1998, 2001-2020 Free Software Foundation, + Copyright (C) 1985, 1997-1998, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/menu.c b/src/menu.c index e4fda572cd8..3b1d7402571 100644 --- a/src/menu.c +++ b/src/menu.c @@ -1,6 +1,6 @@ /* Platform-independent code for terminal communications. -Copyright (C) 1986, 1988, 1993-1994, 1996, 1999-2020 Free Software +Copyright (C) 1986, 1988, 1993-1994, 1996, 1999-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/menu.h b/src/menu.h index 44749ade75a..6c67ab20bb0 100644 --- a/src/menu.h +++ b/src/menu.h @@ -1,5 +1,5 @@ /* Functions to manipulate menus. - Copyright (C) 2008-2020 Free Software Foundation, Inc. + Copyright (C) 2008-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/minibuf.c b/src/minibuf.c index 1940564a80a..8b235690199 100644 --- a/src/minibuf.c +++ b/src/minibuf.c @@ -1,6 +1,6 @@ /* Minibuffer input and completion. -Copyright (C) 1985-1986, 1993-2020 Free Software Foundation, Inc. +Copyright (C) 1985-1986, 1993-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/msdos.c b/src/msdos.c index b5f06c99c3d..5da01c9e7ca 100644 --- a/src/msdos.c +++ b/src/msdos.c @@ -1,6 +1,6 @@ /* MS-DOS specific C utilities. -*- coding: cp850 -*- -Copyright (C) 1993-1997, 1999-2020 Free Software Foundation, Inc. +Copyright (C) 1993-1997, 1999-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/msdos.h b/src/msdos.h index e08195ca6ad..f7d3b0d7029 100644 --- a/src/msdos.h +++ b/src/msdos.h @@ -1,5 +1,5 @@ /* MS-DOS specific C utilities, interface. - Copyright (C) 1993, 2001-2020 Free Software Foundation, Inc. + Copyright (C) 1993, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/nsfns.m b/src/nsfns.m index f3c5a9ef679..ee2daea0723 100644 --- a/src/nsfns.m +++ b/src/nsfns.m @@ -1,6 +1,6 @@ /* Functions for the NeXT/Open/GNUstep and macOS window system. -Copyright (C) 1989, 1992-1994, 2005-2006, 2008-2020 Free Software +Copyright (C) 1989, 1992-1994, 2005-2006, 2008-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/nsfont.m b/src/nsfont.m index 9e4caca9102..f4f0d281674 100644 --- a/src/nsfont.m +++ b/src/nsfont.m @@ -1,6 +1,6 @@ /* Font back-end driver for the NeXT/Open/GNUstep and macOS window system. See font.h - Copyright (C) 2006-2020 Free Software Foundation, Inc. + Copyright (C) 2006-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/nsgui.h b/src/nsgui.h index 0536ef0c0a9..e4038d32267 100644 --- a/src/nsgui.h +++ b/src/nsgui.h @@ -1,5 +1,5 @@ /* Definitions and headers for communication on the NeXT/Open/GNUstep API. - Copyright (C) 1995, 2005, 2008-2020 Free Software Foundation, Inc. + Copyright (C) 1995, 2005, 2008-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/nsimage.m b/src/nsimage.m index c47a2b2d64a..f0014b50b9b 100644 --- a/src/nsimage.m +++ b/src/nsimage.m @@ -1,5 +1,5 @@ /* Image support for the NeXT/Open/GNUstep and macOS window system. - Copyright (C) 1989, 1992-1994, 2005-2006, 2008-2020 Free Software + Copyright (C) 1989, 1992-1994, 2005-2006, 2008-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/nsmenu.m b/src/nsmenu.m index efad978316e..9b56958100a 100644 --- a/src/nsmenu.m +++ b/src/nsmenu.m @@ -1,5 +1,5 @@ /* NeXT/Open/GNUstep and macOS Cocoa menu and toolbar module. - Copyright (C) 2007-2020 Free Software Foundation, Inc. + Copyright (C) 2007-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -47,21 +47,11 @@ Carbon version by Yamamoto Mitsuharu. */ #endif -#if 0 -/* Include lisp -> C common menu parsing code. */ -#define ENCODE_MENU_STRING(str) ENCODE_UTF_8 (str) -#include "nsmenu_common.c" -#endif - extern long context_menu_value; EmacsMenu *svcsMenu; /* Nonzero means a menu is currently active. */ static int popup_activated_flag; -/* Nonzero means we are tracking and updating menus. */ -static int trackingMenu; - - /* NOTE: toolbar implementation is at end, following complete menu implementation. */ @@ -75,11 +65,22 @@ static int trackingMenu; /* Supposed to discard menubar and free storage. Since we share the menubar among frames and update its context for the focused window, - there is nothing to do here. */ + we do not discard the menu. We do, however, want to remove any + existing menu items. */ void free_frame_menubar (struct frame *f) { - return; + id menu = [NSApp mainMenu]; + for (int i = [menu numberOfItems] - 1 ; i >= 0; i--) + { + NSMenuItem *item = [menu itemAtIndex:i]; + NSString *title = [item title]; + + if ([ns_app_name isEqualToString:title]) + continue; + + [menu removeItemAtIndex:i]; + } } @@ -98,16 +99,19 @@ popup_activated (void) 3) deep_p, submenu = non-nil: Update contents of a single submenu. -------------------------------------------------------------------------- */ static void -ns_update_menubar (struct frame *f, bool deep_p, EmacsMenu *submenu) +ns_update_menubar (struct frame *f, bool deep_p) { NSAutoreleasePool *pool; - id menu = [NSApp mainMenu]; - static EmacsMenu *last_submenu = nil; BOOL needsSet = NO; + id menu = [NSApp mainMenu]; bool owfi; + Lisp_Object items; widget_value *wv, *first_wv, *prev_wv = 0; int i; + int *submenu_start, *submenu_end; + bool *submenu_top_level_items; + int *submenu_n_panes; #if NSMENUPROFILE struct timeb tb; @@ -116,7 +120,7 @@ ns_update_menubar (struct frame *f, bool deep_p, EmacsMenu *submenu) NSTRACE ("ns_update_menubar"); - if (f != SELECTED_FRAME ()) + if (f != SELECTED_FRAME () || FRAME_EXTERNAL_MENU_BAR (f) == 0) return; XSETFRAME (Vmenu_updating_frame, f); /*fprintf (stderr, "ns_update_menubar: frame: %p\tdeep: %d\tsub: %p\n", f, deep_p, submenu); */ @@ -141,115 +145,102 @@ ns_update_menubar (struct frame *f, bool deep_p, EmacsMenu *submenu) t = -(1000*tb.time+tb.millitm); #endif -#ifdef NS_IMPL_GNUSTEP - deep_p = 1; /* until GNUstep NSMenu implements the Panther delegation model */ -#endif - if (deep_p) { - /* Fully parse one or more of the submenus. */ - int n = 0; - int *submenu_start, *submenu_end; - bool *submenu_top_level_items; - int *submenu_n_panes; + /* Make a widget-value tree representing the entire menu trees. */ + struct buffer *prev = current_buffer; Lisp_Object buffer; ptrdiff_t specpdl_count = SPECPDL_INDEX (); int previous_menu_items_used = f->menu_bar_items_used; Lisp_Object *previous_items = alloca (previous_menu_items_used * sizeof *previous_items); + int subitems; - /* lisp preliminaries */ buffer = XWINDOW (FRAME_SELECTED_WINDOW (f))->contents; specbind (Qinhibit_quit, Qt); + /* Don't let the debugger step into this code + because it is not reentrant. */ specbind (Qdebug_on_next_call, Qnil); + record_unwind_save_match_data (); if (NILP (Voverriding_local_map_menu_flag)) { specbind (Qoverriding_terminal_local_map, Qnil); specbind (Qoverriding_local_map, Qnil); } + set_buffer_internal_1 (XBUFFER (buffer)); - /* TODO: for some reason this is not needed in other terms, - but some menu updates call Info-extract-pointer which causes - abort-on-error if waiting-for-input. Needs further investigation. */ + /* TODO: for some reason this is not needed in other terms, but + some menu updates call Info-extract-pointer which causes + abort-on-error if waiting-for-input. Needs further + investigation. */ owfi = waiting_for_input; waiting_for_input = 0; - /* lucid hook and possible reset */ + /* Run the Lucid hook. */ safe_run_hooks (Qactivate_menubar_hook); + + /* If it has changed current-menubar from previous value, + really recompute the menubar from the value. */ if (! NILP (Vlucid_menu_bar_dirty_flag)) call0 (Qrecompute_lucid_menubar); safe_run_hooks (Qmenu_bar_update_hook); fset_menu_bar_items (f, menu_bar_items (FRAME_MENU_BAR_ITEMS (f))); - /* Now ready to go */ items = FRAME_MENU_BAR_ITEMS (f); - /* Save the frame's previous menu bar contents data */ + /* Save the frame's previous menu bar contents data. */ if (previous_menu_items_used) - memcpy (previous_items, aref_addr (f->menu_bar_vector, 0), - previous_menu_items_used * sizeof (Lisp_Object)); + memcpy (previous_items, xvector_contents (f->menu_bar_vector), + previous_menu_items_used * word_size); - /* parse stage 1: extract from lisp */ + /* Fill in menu_items with the current menu bar contents. + This can evaluate Lisp code. */ save_menu_items (); menu_items = f->menu_bar_vector; menu_items_allocated = VECTORP (menu_items) ? ASIZE (menu_items) : 0; - submenu_start = alloca (ASIZE (items) * sizeof *submenu_start); - submenu_end = alloca (ASIZE (items) * sizeof *submenu_end); - submenu_n_panes = alloca (ASIZE (items) * sizeof *submenu_n_panes); - submenu_top_level_items = alloca (ASIZE (items) + subitems = ASIZE (items) / 4; + submenu_start = alloca ((subitems + 1) * sizeof *submenu_start); + submenu_end = alloca (subitems * sizeof *submenu_end); + submenu_n_panes = alloca (subitems * sizeof *submenu_n_panes); + submenu_top_level_items = alloca (subitems * sizeof *submenu_top_level_items); init_menu_items (); - for (i = 0; i < ASIZE (items); i += 4) + for (i = 0; i < subitems; i++) { Lisp_Object key, string, maps; - key = AREF (items, i); - string = AREF (items, i + 1); - maps = AREF (items, i + 2); + key = AREF (items, 4 * i); + string = AREF (items, 4 * i + 1); + maps = AREF (items, 4 * i + 2); if (NILP (string)) break; - /* FIXME: we'd like to only parse the needed submenu, but this - was causing crashes in the _common parsing code: need to make - sure proper initialization done. */ - /* if (submenu && strcmp ([[submenu title] UTF8String], SSDATA (string))) - continue; */ - submenu_start[i] = menu_items_used; menu_items_n_panes = 0; - submenu_top_level_items[i] = parse_single_submenu (key, string, maps); + submenu_top_level_items[i] + = parse_single_submenu (key, string, maps); submenu_n_panes[i] = menu_items_n_panes; + submenu_end[i] = menu_items_used; - n++; } + submenu_start[i] = -1; finish_menu_items (); waiting_for_input = owfi; + /* Convert menu_items into widget_value trees + to display the menu. This cannot evaluate Lisp code. */ - if (submenu && n == 0) - { - /* should have found a menu for this one but didn't */ - fprintf (stderr, "ERROR: did not find lisp menu for submenu '%s'.\n", - [[submenu title] UTF8String]); - discard_menu_items (); - unbind_to (specpdl_count, Qnil); - unblock_input (); - return; - } - - /* parse stage 2: insert into lucid 'widget_value' structures - [comments in other terms say not to evaluate lisp code here] */ wv = make_widget_value ("menubar", NULL, true, Qnil); wv->button_type = BUTTON_TYPE_NONE; first_wv = wv; - for (i = 0; i < 4*n; i += 4) + for (i = 0; submenu_start[i] >= 0; i++) { menu_items_n_panes = submenu_n_panes[i]; wv = digest_single_submenu (submenu_start[i], submenu_end[i], @@ -259,169 +250,79 @@ ns_update_menubar (struct frame *f, bool deep_p, EmacsMenu *submenu) else first_wv->contents = wv; /* Don't set wv->name here; GC during the loop might relocate it. */ - wv->enabled = 1; + wv->enabled = true; wv->button_type = BUTTON_TYPE_NONE; prev_wv = wv; } set_buffer_internal_1 (prev); - /* Compare the new menu items with previous, and leave off if no change. */ - /* FIXME: following other terms here, but seems like this should be - done before parse stage 2 above, since its results aren't used. */ - if (previous_menu_items_used - && (!submenu || (submenu && submenu == last_submenu)) - && menu_items_used == previous_menu_items_used) - { - for (i = 0; i < previous_menu_items_used; i++) - /* FIXME: this ALWAYS fails on Buffers menu items.. something - about their strings causes them to change every time, so we - double-check failures. */ - if (!EQ (previous_items[i], AREF (menu_items, i))) - if (!(STRINGP (previous_items[i]) - && STRINGP (AREF (menu_items, i)) - && !strcmp (SSDATA (previous_items[i]), - SSDATA (AREF (menu_items, i))))) - break; - if (i == previous_menu_items_used) - { - /* No change. */ + /* If there has been no change in the Lisp-level contents + of the menu bar, skip redisplaying it. Just exit. */ -#if NSMENUPROFILE - ftime (&tb); - t += 1000*tb.time+tb.millitm; - fprintf (stderr, "NO CHANGE! CUTTING OUT after %ld msec.\n", t); -#endif + /* Compare the new menu items with the ones computed last time. */ + for (i = 0; i < previous_menu_items_used; i++) + if (menu_items_used == i + || (!EQ (previous_items[i], AREF (menu_items, i)))) + break; + if (i == menu_items_used && i == previous_menu_items_used && i != 0) + { + /* The menu items have not changed. Don't bother updating + the menus in any form, since it would be a no-op. */ + free_menubar_widget_value_tree (first_wv); + discard_menu_items (); + unbind_to (specpdl_count, Qnil); + return; + } - free_menubar_widget_value_tree (first_wv); - discard_menu_items (); - unbind_to (specpdl_count, Qnil); - unblock_input (); - return; - } - } /* The menu items are different, so store them in the frame. */ - /* FIXME: this is not correct for single-submenu case. */ fset_menu_bar_vector (f, menu_items); f->menu_bar_items_used = menu_items_used; - /* Calls restore_menu_items, etc., as they were outside. */ + /* This undoes save_menu_items. */ unbind_to (specpdl_count, Qnil); - /* Parse stage 2a: now GC cannot happen during the lifetime of the - widget_value, so it's safe to store data from a Lisp_String. */ + /* Now GC cannot happen during the lifetime of the widget_value, + so it's safe to store data from a Lisp_String. */ wv = first_wv->contents; for (i = 0; i < ASIZE (items); i += 4) { Lisp_Object string; string = AREF (items, i + 1); if (NILP (string)) - break; - - wv->name = SSDATA (string); + break; + wv->name = SSDATA (string); update_submenu_strings (wv->contents); - wv = wv->next; + wv = wv->next; } - /* Now, update the NS menu; if we have a submenu, use that, otherwise - create a new menu for each sub and fill it. */ - if (submenu) - { - const char *submenuTitle = [[submenu title] UTF8String]; - for (wv = first_wv->contents; wv; wv = wv->next) - { - if (!strcmp (submenuTitle, wv->name)) - { - [submenu fillWithWidgetValue: wv->contents]; - last_submenu = submenu; - break; - } - } - } - else - { - [menu fillWithWidgetValue: first_wv->contents frame: f]; - } - } else { - static int n_previous_strings = 0; - static char previous_strings[100][10]; - static struct frame *last_f = NULL; - int n; - Lisp_Object string; + /* Make a widget-value tree containing + just the top level menu bar strings. */ wv = make_widget_value ("menubar", NULL, true, Qnil); wv->button_type = BUTTON_TYPE_NONE; first_wv = wv; - /* Make widget-value tree with just the top level menu bar strings. */ items = FRAME_MENU_BAR_ITEMS (f); - if (NILP (items)) - { - free_menubar_widget_value_tree (first_wv); - unblock_input (); - return; - } - - - /* Check if no change: this mechanism is a bit rough, but ready. */ - n = ASIZE (items) / 4; - if (f == last_f && n_previous_strings == n) - { - for (i = 0; i<n; i++) - { - string = AREF (items, 4*i+1); - - if (EQ (string, make_fixnum (0))) // FIXME: Why??? --Stef - continue; - if (NILP (string)) - { - if (previous_strings[i][0]) - break; - else - continue; - } - else if (memcmp (previous_strings[i], SDATA (string), - min (10, SBYTES (string) + 1))) - break; - } - - if (i == n) - { - free_menubar_widget_value_tree (first_wv); - unblock_input (); - return; - } - } - - [menu clear]; for (i = 0; i < ASIZE (items); i += 4) { + Lisp_Object string; + string = AREF (items, i + 1); if (NILP (string)) break; - if (n < 100) - memcpy (previous_strings[i/4], SDATA (string), - min (10, SBYTES (string) + 1)); - wv = make_widget_value (SSDATA (string), NULL, true, Qnil); wv->button_type = BUTTON_TYPE_NONE; + /* This prevents lwlib from assuming this + menu item is really supposed to be empty. */ + /* The intptr_t cast avoids a warning. + This value just has to be different from small integers. */ wv->call_data = (void *) (intptr_t) (-1); -#ifdef NS_IMPL_COCOA - /* We'll update the real copy under app menu when time comes. */ - if (!strcmp ("Services", wv->name)) - { - /* But we need to make sure it will update on demand. */ - [svcsMenu setFrame: f]; - } - else -#endif - [menu addSubmenuWithTitle: wv->name forFrame: f]; - if (prev_wv) prev_wv->next = wv; else @@ -429,15 +330,58 @@ ns_update_menubar (struct frame *f, bool deep_p, EmacsMenu *submenu) prev_wv = wv; } - last_f = f; - if (n < 100) - n_previous_strings = n; + /* Forget what we thought we knew about what is in the + detailed contents of the menu bar menus. + Changing the top level always destroys the contents. */ + f->menu_bar_items_used = 0; + } + + /* Now, update the NS menu. */ + i = 0; + + /* Make sure we skip the "application" menu, which is always the + first entry in our top-level menu. */ + if (i < [menu numberOfItems]) + { + NSString *title = [[menu itemAtIndex:i] title]; + if ([ns_app_name isEqualToString:title]) + i += 1; + } + + for (wv = first_wv->contents; wv; wv = wv->next) + { + EmacsMenu *submenu; + + if (i < [menu numberOfItems]) + { + NSString *titleStr = [NSString stringWithUTF8String: wv->name]; + NSMenuItem *item = [menu itemAtIndex:i]; + submenu = (EmacsMenu*)[item submenu]; + + [item setTitle:titleStr]; + [submenu setTitle:titleStr]; + [submenu removeAllItems]; + } else - n_previous_strings = 0; + submenu = [menu addSubmenuWithTitle: wv->name]; + + if ([[submenu title] isEqualToString:@"Help"]) + [NSApp setHelpMenu:submenu]; + + if (deep_p) + [submenu fillWithWidgetValue: wv->contents]; + i += 1; } - free_menubar_widget_value_tree (first_wv); + while (i < [menu numberOfItems]) + { + /* Remove any extra items. */ + [menu removeItemAtIndex:i]; + } + + + free_menubar_widget_value_tree (first_wv); #if NSMENUPROFILE ftime (&tb); @@ -460,21 +404,10 @@ ns_update_menubar (struct frame *f, bool deep_p, EmacsMenu *submenu) void set_frame_menubar (struct frame *f, bool first_time, bool deep_p) { - ns_update_menubar (f, deep_p, nil); -} - -void -ns_activate_menubar (struct frame *f) -{ -#ifdef NS_IMPL_COCOA - ns_update_menubar (f, true, nil); - ns_check_pending_open_menu (); -#endif + ns_update_menubar (f, deep_p); } - - /* ========================================================================== Menu: class implementation @@ -490,97 +423,31 @@ ns_activate_menubar (struct frame *f) /* override designated initializer */ - (instancetype)initWithTitle: (NSString *)title { - frame = 0; if ((self = [super initWithTitle: title])) [self setAutoenablesItems: NO]; - return self; -} - - -/* used for top-level */ -- (instancetype)initWithTitle: (NSString *)title frame: (struct frame *)f -{ - [self initWithTitle: title]; - frame = f; -#ifdef NS_IMPL_COCOA [self setDelegate: self]; -#endif - return self; -} - - -- (void)setFrame: (struct frame *)f -{ - frame = f; -} - -#ifdef NS_IMPL_COCOA --(void)trackingNotification:(NSNotification *)notification -{ - /* Update menu in menuNeedsUpdate only while tracking menus. */ - trackingMenu = ([notification name] == NSMenuDidBeginTrackingNotification - ? 1 : 0); - if (! trackingMenu) ns_check_menu_open (nil); -} - -- (void)menuWillOpen:(NSMenu *)menu -{ - ++trackingMenu; -#if MAC_OS_X_VERSION_MIN_REQUIRED < 1070 - // On 10.6 we get repeated calls, only the one for NSSystemDefined is "real". - if ( -#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070 - NSAppKitVersionNumber < NSAppKitVersionNumber10_7 && -#endif - [[NSApp currentEvent] type] != NSEventTypeSystemDefined) - return; -#endif + needsUpdate = YES; - /* When dragging from one menu to another, we get willOpen followed by didClose, - i.e. trackingMenu == 3 in willOpen and then 2 after didClose. - We have updated all menus, so avoid doing it when trackingMenu == 3. */ - if (trackingMenu == 2) - ns_check_menu_open (menu); -} - -- (void)menuDidClose:(NSMenu *)menu -{ - --trackingMenu; + return self; } -#endif /* NS_IMPL_COCOA */ /* Delegate method called when a submenu is being opened: run a 'deep' call to set_frame_menubar. */ + +/* TODO: GNUstep calls this method when the menu is still being built + which throws it into an infinite loop. One possible solution is to + use menuWillOpen instead, but the Apple docs explicitly warn + against changing the contents of the menu in it. I don't know what + the right thing to do for GNUstep is. */ - (void)menuNeedsUpdate: (NSMenu *)menu { - if (!FRAME_LIVE_P (frame)) + if (!FRAME_LIVE_P (SELECTED_FRAME ())) return; - /* Cocoa/Carbon will request update on every keystroke - via IsMenuKeyEvent -> CheckMenusForKeyEvent. These are not needed - since key equivalents are handled through emacs. - On Leopard, even keystroke events generate SystemDefined event. - Third-party applications that enhance mouse / trackpad - interaction, or also VNC/Remote Desktop will send events - of type AppDefined rather than SysDefined. - Menus will fail to show up if they haven't been initialized. - AppDefined events may lack timing data. - - Thus, we rely on the didBeginTrackingNotification notification - as above to indicate the need for updates. - From 10.6 on, we could also use -[NSMenu propertiesToUpdate]: In the - key press case, NSMenuPropertyItemImage (e.g.) won't be set. - */ - if (trackingMenu == 0) - return; -/*fprintf (stderr, "Updating menu '%s'\n", [[self title] UTF8String]); NSLog (@"%@\n", event); */ -#ifdef NS_IMPL_GNUSTEP - /* Don't know how to do this for anything other than Mac OS X 10.5 and later. - This is wrong, as it might run Lisp code in the event loop. */ - ns_update_menubar (frame, true, self); -#endif + if (needsUpdate) + ns_update_menubar (SELECTED_FRAME (), true); } @@ -593,33 +460,8 @@ ns_activate_menubar (struct frame *f) } -/* Parse a widget_value's key rep (examples: 's-p', 's-S', '(C-x C-s)', '<f13>') - into an accelerator string. We are only able to display a single character - for an accelerator, together with an optional modifier combination. (Under - Carbon more control was possible, but in Cocoa multi-char strings passed to - NSMenuItem get ignored. For now we try to display a super-single letter - combo, and return the others as strings to be appended to the item title. - (This is signaled by setting keyEquivModMask to 0 for now.) */ --(NSString *)parseKeyEquiv: (const char *)key -{ - const char *tpos = key; - keyEquivModMask = NSEventModifierFlagCommand; - - if (!key || !*key) - return @""; - - while (*tpos == ' ' || *tpos == '(') - tpos++; - if ((*tpos == 's') && (*(tpos+1) == '-')) - { - return [NSString stringWithFormat: @"%c", tpos[2]]; - } - keyEquivModMask = 0; /* signal */ - return [NSString stringWithUTF8String: tpos]; -} - - - (NSMenuItem *)addItemWithWidgetValue: (void *)wvptr + attributes: (NSDictionary *)attributes { NSMenuItem *item; widget_value *wv = (widget_value *)wvptr; @@ -627,36 +469,33 @@ ns_activate_menubar (struct frame *f) if (menu_separator_name_p (wv->name)) { item = [NSMenuItem separatorItem]; - [self addItem: item]; } else { - NSString *title, *keyEq; - title = [NSString stringWithUTF8String: wv->name]; + NSString *title = [NSString stringWithUTF8String: wv->name]; if (title == nil) title = @"< ? >"; /* (get out in the open so we know about it) */ - keyEq = [self parseKeyEquiv: wv->key]; -#ifdef NS_IMPL_COCOA - /* macOS mangles modifier strings longer than one character. */ - if (keyEquivModMask == 0) - { - title = [title stringByAppendingFormat: @" (%@)", keyEq]; - item = [self addItemWithTitle: (NSString *)title - action: @selector (menuDown:) - keyEquivalent: @""]; - } - else + item = [[[NSMenuItem alloc] init] autorelease]; + if (wv->key) { -#endif - item = [self addItemWithTitle: (NSString *)title - action: @selector (menuDown:) - keyEquivalent: keyEq]; + NSString *key = [NSString stringWithUTF8String: wv->key]; #ifdef NS_IMPL_COCOA - } + /* Cocoa only permits a single key (with modifiers) as + keyEquivalent, so we put them in the title string + in a tab-separated column. */ + title = [title stringByAppendingFormat: @"\t%@", key]; +#else + [item setKeyEquivalent: key]; #endif - [item setKeyEquivalentModifierMask: keyEquivModMask]; + } + NSAttributedString *atitle = [[[NSAttributedString alloc] + initWithString: title + attributes: attributes] + autorelease]; + [item setAction: @selector (menuDown:)]; + [item setAttributedTitle: atitle]; [item setEnabled: wv->enabled]; /* Draw radio buttons and tickboxes. */ @@ -669,52 +508,145 @@ ns_activate_menubar (struct frame *f) [item setTag: (NSInteger)wv->call_data]; } + [self addItem: item]; return item; } /* convenience */ --(void)clear +-(void)removeAllItems { +#ifdef NS_IMPL_COCOA + [super removeAllItems]; +#else + /* GNUstep doesn't have removeAllItems yet, so do it + manually. */ int n; for (n = [self numberOfItems]-1; n >= 0; n--) - { - NSMenuItem *item = [self itemAtIndex: n]; - NSString *title = [item title]; - if ([ns_app_name isEqualToString: title] - && ![item isSeparatorItem]) - continue; - [self removeItemAtIndex: n]; - } + [self removeItemAtIndex: n]; +#endif + + needsUpdate = YES; } -- (void)fillWithWidgetValue: (void *)wvptr +typedef struct { + const char *from, *to; +} subst_t; + +/* Standard keyboard symbols used in menus. */ +static const subst_t key_symbols[] = { + {"<backspace>", "⌫"}, + {"DEL", "⌫"}, + {"<deletechar>", "⌦"}, + {"<return>", "↩"}, + {"RET", "↩"}, + {"<left>", "←"}, + {"<right>", "→"}, + {"<up>", "↑"}, + {"<down>", "↓"}, + {"<prior>", "⇞"}, + {"<next>", "⇟"}, + {"<home>", "↖"}, + {"<end>", "↘"}, + {"<tab>", "⇥"}, + {"TAB", "⇥"}, + {"<backtab>", "⇤"}, +}; + +/* Transform the key sequence KEY into something prettier by + substituting keyboard symbols. */ +static char * +prettify_key (const char *key) { - [self fillWithWidgetValue: wvptr frame: (struct frame *)nil]; + while (*key == ' ') key++; + + int len = strlen (key); + char *buf = xmalloc (len + 1); + memcpy (buf, key, len + 1); + for (int i = 0; i < ARRAYELTS (key_symbols); i++) + { + ptrdiff_t fromlen = strlen (key_symbols[i].from); + char *p = buf; + while (p < buf + len) + { + char *match = memmem (buf, len, key_symbols[i].from, fromlen); + if (!match) + break; + ptrdiff_t tolen = strlen (key_symbols[i].to); + eassert (tolen <= fromlen); + memcpy (match, key_symbols[i].to, tolen); + memmove (match + tolen, match + fromlen, + len - (match + fromlen - buf) + 1); + len -= fromlen - tolen; + p = match + tolen; + } + } + Lisp_Object result = build_string (buf); + xfree (buf); + return SSDATA (result); } -- (void)fillWithWidgetValue: (void *)wvptr frame: (struct frame *)f +- (void)fillWithWidgetValue: (void *)wvptr { - widget_value *wv = (widget_value *)wvptr; + widget_value *first_wv = (widget_value *)wvptr; + NSFont *menuFont = [NSFont menuFontOfSize:0]; + NSDictionary *attributes = nil; + +#ifdef NS_IMPL_COCOA + /* Cocoa doesn't allow multi-key sequences in its menu display, so + work around it by using tabs to split the title into two + columns. */ + NSDictionary *font_attribs = @{NSFontAttributeName: menuFont}; + CGFloat maxNameWidth = 0; + CGFloat maxKeyWidth = 0; + + /* Determine the maximum width of all menu items. */ + for (widget_value *wv = first_wv; wv != NULL; wv = wv->next) + if (!menu_separator_name_p (wv->name)) + { + NSString *name = [NSString stringWithUTF8String: wv->name]; + NSSize nameSize = [name sizeWithAttributes: font_attribs]; + maxNameWidth = MAX(maxNameWidth, nameSize.width); + if (wv->key) + { + wv->key = prettify_key (wv->key); + NSString *key = [NSString stringWithUTF8String: wv->key]; + NSSize keySize = [key sizeWithAttributes: font_attribs]; + maxKeyWidth = MAX(maxKeyWidth, keySize.width); + } + } + + /* Put some space between the names and keys. */ + CGFloat maxWidth = maxNameWidth + maxKeyWidth + 40; + + /* Set a right-aligned tab stop at the maximum width, so that the + key will appear immediately to the left of it. */ + NSTextTab *tab = + [[[NSTextTab alloc] initWithTextAlignment: NSTextAlignmentRight + location: maxWidth + options: @{}] autorelease]; + NSMutableParagraphStyle *pstyle = [[[NSMutableParagraphStyle alloc] init] + autorelease]; + [pstyle setTabStops: @[tab]]; + attributes = @{NSParagraphStyleAttributeName: pstyle}; +#endif /* clear existing contents */ - [self clear]; + [self removeAllItems]; /* add new contents */ - for (; wv != NULL; wv = wv->next) + for (widget_value *wv = first_wv; wv != NULL; wv = wv->next) { - NSMenuItem *item = [self addItemWithWidgetValue: wv]; + NSMenuItem *item = [self addItemWithWidgetValue: wv + attributes: attributes]; if (wv->contents) { EmacsMenu *submenu; - if (f) - submenu = [[EmacsMenu alloc] initWithTitle: [item title] frame:f]; - else - submenu = [[EmacsMenu alloc] initWithTitle: [item title]]; + submenu = [[EmacsMenu alloc] initWithTitle: [item title]]; [self setSubmenu: submenu forItem: item]; [submenu fillWithWidgetValue: wv->contents]; @@ -723,6 +655,8 @@ ns_activate_menubar (struct frame *f) } } + needsUpdate = NO; + #ifdef NS_IMPL_GNUSTEP if ([[self window] isVisible]) [self sizeToFit]; @@ -731,13 +665,13 @@ ns_activate_menubar (struct frame *f) /* Adds an empty submenu and returns it. */ -- (EmacsMenu *)addSubmenuWithTitle: (const char *)title forFrame: (struct frame *)f +- (EmacsMenu *)addSubmenuWithTitle: (const char *)title { NSString *titleStr = [NSString stringWithUTF8String: title]; NSMenuItem *item = [self addItemWithTitle: titleStr action: (SEL)nil /*@selector (menuDown:) */ keyEquivalent: @""]; - EmacsMenu *submenu = [[EmacsMenu alloc] initWithTitle: titleStr frame: f]; + EmacsMenu *submenu = [[EmacsMenu alloc] initWithTitle: titleStr]; [self setSubmenu: submenu forItem: item]; [submenu release]; return submenu; @@ -1022,15 +956,12 @@ update_frame_tool_bar (struct frame *f) int i, k = 0; EmacsView *view = FRAME_NS_VIEW (f); EmacsToolbar *toolbar = [view toolbar]; - int oldh; NSTRACE ("update_frame_tool_bar"); if (view == nil || toolbar == nil) return; block_input (); - oldh = FRAME_TOOLBAR_HEIGHT (f); - #ifdef NS_IMPL_COCOA [toolbar clearActive]; #else @@ -1881,12 +1812,6 @@ DEFUN ("menu-or-popup-active-p", Fmenu_or_popup_active_p, Smenu_or_popup_active_ void syms_of_nsmenu (void) { -#ifndef NS_IMPL_COCOA - /* Don't know how to keep track of this in Next/Open/GNUstep. Always - update menus there. */ - trackingMenu = 1; - PDUMPER_REMEMBER_SCALAR (trackingMenu); -#endif defsubr (&Sns_reset_menu); defsubr (&Smenu_or_popup_active_p); diff --git a/src/nsselect.m b/src/nsselect.m index 95fce4d0f78..27db9248e46 100644 --- a/src/nsselect.m +++ b/src/nsselect.m @@ -1,5 +1,5 @@ /* NeXT/Open/GNUstep / macOS Cocoa selection processing for emacs. - Copyright (C) 1993-1994, 2005-2006, 2008-2020 Free Software + Copyright (C) 1993-1994, 2005-2006, 2008-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/nsterm.h b/src/nsterm.h index 94472ec1070..3fb64494f76 100644 --- a/src/nsterm.h +++ b/src/nsterm.h @@ -1,5 +1,5 @@ /* Definitions and headers for communication with NeXT/Open/GNUstep API. - Copyright (C) 1989, 1993, 2005, 2008-2020 Free Software Foundation, + Copyright (C) 1989, 1993, 2005, 2008-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -414,6 +414,7 @@ typedef id instancetype; ========================================================================== */ @class EmacsToolbar; +@class EmacsSurface; #ifdef NS_IMPL_COCOA @interface EmacsView : NSView <NSTextInput, NSWindowDelegate> @@ -435,7 +436,7 @@ typedef id instancetype; BOOL fs_is_native; BOOL in_fullscreen_transition; #ifdef NS_DRAW_TO_BUFFER - CGContextRef drawingBuffer; + EmacsSurface *surface; #endif @public struct frame *emacsframe; @@ -478,7 +479,7 @@ typedef id instancetype; #ifdef NS_DRAW_TO_BUFFER - (void)focusOnDrawingBuffer; -- (void)createDrawingBuffer; +- (void)unfocusDrawingBuffer; #endif - (void)copyRect:(NSRect)srcRect to:(NSRect)dstRect; @@ -513,25 +514,17 @@ typedef id instancetype; ========================================================================== */ -#ifdef NS_IMPL_COCOA @interface EmacsMenu : NSMenu <NSMenuDelegate> -#else -@interface EmacsMenu : NSMenu -#endif { - struct frame *frame; - unsigned long keyEquivModMask; + BOOL needsUpdate; } -- (instancetype)initWithTitle: (NSString *)title frame: (struct frame *)f; -- (void)setFrame: (struct frame *)f; - (void)menuNeedsUpdate: (NSMenu *)menu; /* (delegate method) */ -- (NSString *)parseKeyEquiv: (const char *)key; -- (NSMenuItem *)addItemWithWidgetValue: (void *)wvptr; +- (NSMenuItem *)addItemWithWidgetValue: (void *)wvptr + attributes: (NSDictionary *)attributes; - (void)fillWithWidgetValue: (void *)wvptr; -- (void)fillWithWidgetValue: (void *)wvptr frame: (struct frame *)f; -- (EmacsMenu *)addSubmenuWithTitle: (const char *)title forFrame: (struct frame *)f; -- (void) clear; +- (EmacsMenu *)addSubmenuWithTitle: (const char *)title; +- (void) removeAllItems; - (Lisp_Object)runMenuAt: (NSPoint)p forFrame: (struct frame *)f keymaps: (bool)keymaps; @end @@ -712,6 +705,25 @@ typedef id instancetype; + (CGFloat)scrollerWidth; @end +#ifdef NS_DRAW_TO_BUFFER +@interface EmacsSurface : NSObject +{ + NSMutableArray *cache; + NSSize size; + CGColorSpaceRef colorSpace; + IOSurfaceRef currentSurface; + IOSurfaceRef lastSurface; + CGContextRef context; +} +- (id) initWithSize: (NSSize)s ColorSpace: (CGColorSpaceRef)cs; +- (void) dealloc; +- (NSSize) getSize; +- (CGContextRef) getContext; +- (void) releaseContext; +- (IOSurfaceRef) getSurface; +@end +#endif + /* ========================================================================== @@ -1130,8 +1142,6 @@ extern int ns_lisp_to_color (Lisp_Object color, NSColor **col); extern NSColor *ns_lookup_indexed_color (unsigned long idx, struct frame *f); extern unsigned long ns_index_color (NSColor *color, struct frame *f); extern const char *ns_get_pending_menu_title (void); -extern void ns_check_menu_open (NSMenu *menu); -extern void ns_check_pending_open_menu (void); #endif /* Implemented in nsfns, published in nsterm. */ diff --git a/src/nsterm.m b/src/nsterm.m index 2a117a07801..a4ee1476933 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -1,6 +1,6 @@ /* NeXT/Open/GNUstep / macOS communication module. -*- coding: utf-8 -*- -Copyright (C) 1989, 1993-1994, 2005-2006, 2008-2020 Free Software +Copyright (C) 1989, 1993-1994, 2005-2006, 2008-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -72,6 +72,10 @@ GNUstep port and post-20 update by Adrian Robert (arobert@cogsci.ucsd.edu) #include <Carbon/Carbon.h> #endif +#ifdef NS_DRAW_TO_BUFFER +#include <IOSurface/IOSurface.h> +#endif + static EmacsMenu *dockMenu; #ifdef NS_IMPL_COCOA static EmacsMenu *mainMenu; @@ -310,24 +314,6 @@ static struct { NULL, 0, 0 }; -#ifdef NS_IMPL_COCOA -/* - * State for pending menu activation: - * MENU_NONE Normal state - * MENU_PENDING A menu has been clicked on, but has been canceled so we can - * run lisp to update the menu. - * MENU_OPENING Menu is up to date, and the click event is redone so the menu - * will open. - */ -#define MENU_NONE 0 -#define MENU_PENDING 1 -#define MENU_OPENING 2 -static int menu_will_open_state = MENU_NONE; - -/* Saved position for menu click. */ -static CGPoint menu_mouse_point; -#endif - /* Convert modifiers in a NeXTstep event to emacs style modifiers. */ #define NS_FUNCTION_KEY_MASK 0x800000 #define NSLeftControlKeyMask (0x000001 | NSEventModifierFlagControl) @@ -1165,7 +1151,7 @@ ns_update_end (struct frame *f) if ([FRAME_NS_VIEW (f) wantsUpdateLayer]) { #endif - [NSGraphicsContext setCurrentContext:nil]; + [FRAME_NS_VIEW (f) unfocusDrawingBuffer]; #if MAC_OS_X_VERSION_MIN_REQUIRED < 101400 } else @@ -1273,6 +1259,8 @@ ns_unfocus (struct frame *f) if ([FRAME_NS_VIEW (f) wantsUpdateLayer]) { #endif + if (! ns_updating_frame) + [FRAME_NS_VIEW (f) unfocusDrawingBuffer]; [FRAME_NS_VIEW (f) setNeedsDisplay:YES]; #if MAC_OS_X_VERSION_MIN_REQUIRED < 101400 } @@ -3404,6 +3392,8 @@ ns_draw_window_cursor (struct window *w, struct glyph_row *glyph_row, /* Prevent the cursor from being drawn outside the text area. */ r = NSIntersectionRect (r, ns_row_rect (w, glyph_row, TEXT_AREA)); + ns_focus (f, &r, 1); + face = FACE_FROM_ID_OR_NULL (f, phys_cursor_glyph->face_id); if (face && NS_FACE_BACKGROUND (face) == ns_index_color (FRAME_CURSOR_COLOR (f), f)) @@ -3414,8 +3404,6 @@ ns_draw_window_cursor (struct window *w, struct glyph_row *glyph_row, else [FRAME_CURSOR_COLOR (f) set]; - ns_focus (f, &r, 1); - switch (cursor_type) { case DEFAULT_CURSOR: @@ -4607,79 +4595,6 @@ check_native_fs () } #endif -/* GNUstep does not have cancelTracking. */ -#ifdef NS_IMPL_COCOA -/* Check if menu open should be canceled or continued as normal. */ -void -ns_check_menu_open (NSMenu *menu) -{ - /* Click in menu bar? */ - NSArray *a = [[NSApp mainMenu] itemArray]; - int i; - BOOL found = NO; - - if (menu == nil) // Menu tracking ended. - { - if (menu_will_open_state == MENU_OPENING) - menu_will_open_state = MENU_NONE; - return; - } - - for (i = 0; ! found && i < [a count]; i++) - found = menu == [[a objectAtIndex:i] submenu]; - if (found) - { - if (menu_will_open_state == MENU_NONE && emacs_event) - { - NSEvent *theEvent = [NSApp currentEvent]; - struct frame *emacsframe = SELECTED_FRAME (); - - /* On macOS, the following can cause an event loop when the - Spotlight for Help search field is populated. Avoid this by - not postponing mouse drag and non-user-generated mouse down - events (Bug#31371). */ - if (([theEvent type] == NSEventTypeLeftMouseDown) - && [theEvent eventNumber]) - { - [menu cancelTracking]; - menu_will_open_state = MENU_PENDING; - emacs_event->kind = MENU_BAR_ACTIVATE_EVENT; - EV_TRAILER (theEvent); - - CGEventRef ourEvent = CGEventCreate (NULL); - menu_mouse_point = CGEventGetLocation (ourEvent); - CFRelease (ourEvent); - } - } - else if (menu_will_open_state == MENU_OPENING) - { - menu_will_open_state = MENU_NONE; - } - } -} - -/* Redo saved menu click if state is MENU_PENDING. */ -void -ns_check_pending_open_menu () -{ - if (menu_will_open_state == MENU_PENDING) - { - CGEventSourceRef source - = CGEventSourceCreate (kCGEventSourceStateHIDSystemState); - - CGEventRef event = CGEventCreateMouseEvent (source, - kCGEventLeftMouseDown, - menu_mouse_point, - kCGMouseButtonLeft); - CGEventSetType (event, kCGEventLeftMouseDown); - CGEventPost (kCGHIDEventTap, event); - CFRelease (event); - CFRelease (source); - - menu_will_open_state = MENU_OPENING; - } -} -#endif /* NS_IMPL_COCOA */ static int ns_read_socket (struct terminal *terminal, struct input_event *hold_quit) @@ -4788,7 +4703,8 @@ ns_select (int nfds, fd_set *readfds, fd_set *writefds, return -1; } - for (k = 0; k < nfds+1; k++) + eassert (nfds <= FD_SETSIZE); + for (k = 0; k < nfds; k++) { if (readfds && FD_ISSET(k, readfds)) ++nr; if (writefds && FD_ISSET(k, writefds)) ++nr; @@ -5164,15 +5080,13 @@ ns_judge_scroll_bars (struct frame *f) id view; EmacsView *eview = FRAME_NS_VIEW (f); NSArray *subviews = [[eview superview] subviews]; - BOOL removed = NO; NSTRACE ("ns_judge_scroll_bars"); for (i = [subviews count]-1; i >= 0; --i) { view = [subviews objectAtIndex: i]; if (![view isKindOfClass: [EmacsScroller class]]) continue; - if ([view judge]) - removed = YES; + [view judge]; } } @@ -5416,7 +5330,6 @@ ns_create_terminal (struct ns_display_info *dpyinfo) terminal->set_new_font_hook = ns_new_font; terminal->implicit_set_name_hook = ns_implicitly_set_name; terminal->menu_show_hook = ns_menu_show; - terminal->activate_menubar_hook = ns_activate_menubar; terminal->popup_dialog_hook = ns_popup_dialog; terminal->set_vertical_scroll_bar_hook = ns_set_vertical_scroll_bar; terminal->set_horizontal_scroll_bar_hook = ns_set_horizontal_scroll_bar; @@ -5661,15 +5574,6 @@ ns_term_init (Lisp_Object display_name) [NSApp setServicesMenu: svcsMenu]; /* Needed at least on Cocoa, to get dock menu to show windows */ [NSApp setWindowsMenu: [[NSMenu alloc] init]]; - - [[NSNotificationCenter defaultCenter] - addObserver: mainMenu - selector: @selector (trackingNotification:) - name: NSMenuDidBeginTrackingNotification object: mainMenu]; - [[NSNotificationCenter defaultCenter] - addObserver: mainMenu - selector: @selector (trackingNotification:) - name: NSMenuDidEndTrackingNotification object: mainMenu]; } #endif /* macOS menu setup */ @@ -6367,7 +6271,7 @@ not_in_argv (NSString *arg) object:nil]; #ifdef NS_DRAW_TO_BUFFER - CGContextRelease (drawingBuffer); + [surface release]; #endif [toolbar release]; @@ -7390,8 +7294,9 @@ not_in_argv (NSString *arg) if ([self wantsUpdateLayer]) { CGFloat scale = [[self window] backingScaleFactor]; - int oldw = (CGFloat)CGBitmapContextGetWidth (drawingBuffer) / scale; - int oldh = (CGFloat)CGBitmapContextGetHeight (drawingBuffer) / scale; + NSSize size = [surface getSize]; + int oldw = size.width / scale; + int oldh = size.height / scale; NSTRACE_SIZE ("Original size", NSMakeSize (oldw, oldh)); @@ -7401,6 +7306,9 @@ not_in_argv (NSString *arg) NSTRACE_MSG ("No change"); return; } + + [surface release]; + surface = nil; } #endif @@ -7413,9 +7321,6 @@ not_in_argv (NSString *arg) FRAME_PIXEL_TO_TEXT_HEIGHT (emacsframe, newh), 0, YES, 0, 1); -#ifdef NS_DRAW_TO_BUFFER - [self createDrawingBuffer]; -#endif SET_FRAME_GARBAGED (emacsframe); cancel_mouse_face (emacsframe); } @@ -7686,10 +7591,6 @@ not_in_argv (NSString *arg) [NSApp registerServicesMenuSendTypes: ns_send_types returnTypes: [NSArray array]]; -#ifdef NS_DRAW_TO_BUFFER - [self createDrawingBuffer]; -#endif - /* Set up view resize notifications. */ [self setPostsFrameChangedNotifications:YES]; [[NSNotificationCenter defaultCenter] @@ -8409,45 +8310,41 @@ not_in_argv (NSString *arg) #ifdef NS_DRAW_TO_BUFFER -- (void)createDrawingBuffer - /* Create and store a new CGGraphicsContext for Emacs to draw into. - - We can't do this in GNUstep as there's no equivalent, so under - GNUstep we retain the old method of drawing direct to the - EmacsView. */ +- (void)focusOnDrawingBuffer { - NSTRACE ("EmacsView createDrawingBuffer]"); + CGFloat scale = [[self window] backingScaleFactor]; - if (! [self wantsUpdateLayer]) - return; + NSTRACE ("[EmacsView focusOnDrawingBuffer]"); - NSGraphicsContext *screen; - CGColorSpaceRef colorSpace = [[[self window] colorSpace] CGColorSpace]; - CGFloat scale = [[self window] backingScaleFactor]; - NSRect frame = [self frame]; + if (! surface) + { + NSRect frame = [self frame]; + NSSize s = NSMakeSize (NSWidth (frame) * scale, NSHeight (frame) * scale); - if (drawingBuffer != nil) - CGContextRelease (drawingBuffer); + surface = [[EmacsSurface alloc] initWithSize:s + ColorSpace:[[[self window] colorSpace] + CGColorSpace]]; + } - drawingBuffer = CGBitmapContextCreate (nil, NSWidth (frame) * scale, NSHeight (frame) * scale, - 8, 0, colorSpace, - kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host); + CGContextRef context = [surface getContext]; - /* This fixes the scale to match the backing scale factor, and flips the image. */ - CGContextTranslateCTM(drawingBuffer, 0, NSHeight (frame) * scale); - CGContextScaleCTM(drawingBuffer, scale, -scale); + CGContextTranslateCTM(context, 0, [surface getSize].height); + CGContextScaleCTM(context, scale, -scale); + + [NSGraphicsContext + setCurrentContext:[NSGraphicsContext + graphicsContextWithCGContext:context + flipped:YES]]; } -- (void)focusOnDrawingBuffer +- (void)unfocusDrawingBuffer { - NSTRACE ("EmacsView focusOnDrawingBuffer]"); + NSTRACE ("[EmacsView unfocusDrawingBuffer]"); - NSGraphicsContext *buf = - [NSGraphicsContext - graphicsContextWithCGContext:drawingBuffer flipped:YES]; - - [NSGraphicsContext setCurrentContext:buf]; + [NSGraphicsContext setCurrentContext:nil]; + [surface releaseContext]; + [self setNeedsDisplay:YES]; } @@ -8456,11 +8353,11 @@ not_in_argv (NSString *arg) { NSTRACE ("EmacsView windowDidChangeBackingProperties:]"); - if (! [self wantsUpdateLayer]) - return; - NSRect frame = [self frame]; - [self createDrawingBuffer]; + + [surface release]; + surface = nil; + ns_clear_frame (emacsframe); expose_frame (emacsframe, 0, 0, NSWidth (frame), NSHeight (frame)); } @@ -8478,33 +8375,28 @@ not_in_argv (NSString *arg) if ([self wantsUpdateLayer]) { #endif - CGImageRef copy; - NSRect frame = [self frame]; - NSAffineTransform *setOrigin = [NSAffineTransform transform]; - - [[NSGraphicsContext currentContext] saveGraphicsState]; - - /* Set the clipping before messing with the buffer's - orientation. */ - NSRectClip (dstRect); - - /* Unflip the buffer as the copied image will be unflipped, and - offset the top left so when we draw back into the buffer the - correct part of the image is drawn. */ - CGContextScaleCTM(drawingBuffer, 1, -1); - CGContextTranslateCTM(drawingBuffer, - NSMinX (dstRect) - NSMinX (srcRect), - -NSHeight (frame) - (NSMinY (dstRect) - NSMinY (srcRect))); - - /* Take a copy of the buffer and then draw it back to the buffer, - limited by the clipping rectangle. */ - copy = CGBitmapContextCreateImage (drawingBuffer); - CGContextDrawImage (drawingBuffer, frame, copy); - - CGImageRelease (copy); - - [[NSGraphicsContext currentContext] restoreGraphicsState]; - [self setNeedsDisplayInRect:dstRect]; + double scale = [[self window] backingScaleFactor]; + CGContextRef context = [[NSGraphicsContext currentContext] CGContext]; + int bpp = CGBitmapContextGetBitsPerPixel (context) / 8; + void *pixels = CGBitmapContextGetData (context); + int rowSize = CGBitmapContextGetBytesPerRow (context); + int srcRowSize = NSWidth (srcRect) * scale * bpp; + void *srcPixels = pixels + (int)(NSMinY (srcRect) * scale * rowSize + + NSMinX (srcRect) * scale * bpp); + void *dstPixels = pixels + (int)(NSMinY (dstRect) * scale * rowSize + + NSMinX (dstRect) * scale * bpp); + + if (NSIntersectsRect (srcRect, dstRect) + && NSMinY (srcRect) < NSMinY (dstRect)) + for (int y = NSHeight (srcRect) * scale - 1 ; y >= 0 ; y--) + memmove (dstPixels + y * rowSize, + srcPixels + y * rowSize, + srcRowSize); + else + for (int y = 0 ; y < NSHeight (srcRect) * scale ; y++) + memmove (dstPixels + y * rowSize, + srcPixels + y * rowSize, + srcRowSize); #if MAC_OS_X_VERSION_MIN_REQUIRED < 101400 } @@ -8545,9 +8437,12 @@ not_in_argv (NSString *arg) { NSTRACE ("[EmacsView updateLayer]"); - CGImageRef contentsImage = CGBitmapContextCreateImage(drawingBuffer); - [[self layer] setContents:(id)contentsImage]; - CGImageRelease(contentsImage); + /* This can fail to update the screen if the same surface is + provided twice in a row, even if its contents have changed. + There's a private method, -[CALayer setContentsChanged], that we + could use to force it, but we shouldn't often get the same + surface twice in a row. */ + [[self layer] setContents:(id)[surface getSurface]]; } #endif @@ -9590,6 +9485,210 @@ not_in_argv (NSString *arg) @end /* EmacsScroller */ +#ifdef NS_DRAW_TO_BUFFER + +/* ========================================================================== + + A class to handle the screen buffer. + + ========================================================================== */ + +@implementation EmacsSurface + + +/* An IOSurface is a pixel buffer that is efficiently copied to VRAM + for display. In order to use an IOSurface we must first lock it, + write to it, then unlock it. At this point it is transferred to + VRAM and if we modify it during this transfer we may see corruption + of the output. To avoid this problem we can check if the surface + is "in use", and if it is then avoid using it. Unfortunately to + avoid writing to a surface that's in use, but still maintain the + ability to draw to the screen at any time, we need to keep a cache + of multiple surfaces that we can use at will. + + The EmacsSurface class maintains this cache of surfaces, and + handles the conversion to a CGGraphicsContext that AppKit can use + to draw on. + + The cache is simple: if a free surface is found it is removed from + the cache and set as the "current" surface. Once Emacs is done + with drawing to the current surface, the previous surface that was + drawn to is added to the cache for reuse, and the current one is + set as the last surface. If no free surfaces are found in the + cache then a new one is created. + + When AppKit wants to update the screen, we provide it with the last + surface, as that has the most recent data. + + FIXME: It is possible for the cache to grow if Emacs draws faster + than the surfaces can be drawn to the screen, so there should + probably be some sort of pruning job that removes excess + surfaces. */ + + +- (id) initWithSize: (NSSize)s + ColorSpace: (CGColorSpaceRef)cs +{ + NSTRACE ("[EmacsSurface initWithSize:ColorSpace:]"); + + [super init]; + + cache = [[NSMutableArray arrayWithCapacity:3] retain]; + size = s; + colorSpace = cs; + + return self; +} + + +- (void) dealloc +{ + if (context) + CGContextRelease (context); + + if (currentSurface) + CFRelease (currentSurface); + if (lastSurface) + CFRelease (lastSurface); + + for (id object in cache) + CFRelease ((IOSurfaceRef)object); + + [cache removeAllObjects]; + + [super dealloc]; +} + + +/* Return the size values our cached data is using. */ +- (NSSize) getSize +{ + return size; +} + + +/* Return a CGContextRef that can be used for drawing to the screen. + This must ALWAYS be paired with a call to releaseContext, and the + calls cannot be nested. */ +- (CGContextRef) getContext +{ + IOSurfaceRef surface = NULL; + + NSTRACE ("[EmacsSurface getContextWithSize:]"); + NSTRACE_MSG (@"IOSurface count: %lu", [cache count] + (lastSurface ? 1 : 0)); + + for (id object in cache) + { + if (!IOSurfaceIsInUse ((IOSurfaceRef)object)) + { + surface = (IOSurfaceRef)object; + [cache removeObject:object]; + break; + } + } + + if (!surface) + { + int bytesPerRow = IOSurfaceAlignProperty (kIOSurfaceBytesPerRow, + size.width * 4); + + surface = IOSurfaceCreate + ((CFDictionaryRef)@{(id)kIOSurfaceWidth:[NSNumber numberWithInt:size.width], + (id)kIOSurfaceHeight:[NSNumber numberWithInt:size.height], + (id)kIOSurfaceBytesPerRow:[NSNumber numberWithInt:bytesPerRow], + (id)kIOSurfaceBytesPerElement:[NSNumber numberWithInt:4], + (id)kIOSurfacePixelFormat:[NSNumber numberWithUnsignedInt:'BGRA']}); + } + + IOReturn lockStatus = IOSurfaceLock (surface, 0, nil); + if (lockStatus != kIOReturnSuccess) + NSLog (@"Failed to lock surface: %x", lockStatus); + + [self copyContentsTo:surface]; + + currentSurface = surface; + + context = CGBitmapContextCreate (IOSurfaceGetBaseAddress (currentSurface), + IOSurfaceGetWidth (currentSurface), + IOSurfaceGetHeight (currentSurface), + 8, + IOSurfaceGetBytesPerRow (currentSurface), + colorSpace, + (kCGImageAlphaPremultipliedFirst + | kCGBitmapByteOrder32Host)); + return context; +} + + +/* Releases the CGGraphicsContext and unlocks the associated + IOSurface, so it will be sent to VRAM. */ +- (void) releaseContext +{ + NSTRACE ("[EmacsSurface releaseContextAndGetSurface]"); + + CGContextRelease (context); + context = NULL; + + IOReturn lockStatus = IOSurfaceUnlock (currentSurface, 0, nil); + if (lockStatus != kIOReturnSuccess) + NSLog (@"Failed to unlock surface: %x", lockStatus); + + /* Put lastSurface back on the end of the cache. It may not have + been displayed on the screen yet, but we probably want the new + data and not some stale data anyway. */ + if (lastSurface) + [cache addObject:(id)lastSurface]; + lastSurface = currentSurface; + currentSurface = NULL; +} + + +/* Get the IOSurface that we want to draw to the screen. */ +- (IOSurfaceRef) getSurface +{ + /* lastSurface always contains the most up-to-date and complete data. */ + return lastSurface; +} + + +/* Copy the contents of lastSurface to DESTINATION. This is required + every time we want to use an IOSurface as its contents are probably + blanks (if it's new), or stale. */ +- (void) copyContentsTo: (IOSurfaceRef) destination +{ + IOReturn lockStatus; + void *sourceData, *destinationData; + int numBytes = IOSurfaceGetAllocSize (destination); + + NSTRACE ("[EmacsSurface copyContentsTo:]"); + + if (! lastSurface) + return; + + lockStatus = IOSurfaceLock (lastSurface, kIOSurfaceLockReadOnly, nil); + if (lockStatus != kIOReturnSuccess) + NSLog (@"Failed to lock source surface: %x", lockStatus); + + sourceData = IOSurfaceGetBaseAddress (lastSurface); + destinationData = IOSurfaceGetBaseAddress (destination); + + /* Since every IOSurface should have the exact same settings, a + memcpy seems like the fastest way to copy the data from one to + the other. */ + memcpy (destinationData, sourceData, numBytes); + + lockStatus = IOSurfaceUnlock (lastSurface, kIOSurfaceLockReadOnly, nil); + if (lockStatus != kIOReturnSuccess) + NSLog (@"Failed to unlock source surface: %x", lockStatus); +} + + +@end /* EmacsSurface */ + + +#endif + + #ifdef NS_IMPL_GNUSTEP /* Dummy class to get rid of startup warnings. */ @implementation EmacsDocument diff --git a/src/nsxwidget.h b/src/nsxwidget.h index dcdb26cb34c..9cc90b0d09a 100644 --- a/src/nsxwidget.h +++ b/src/nsxwidget.h @@ -1,6 +1,6 @@ /* Header for NS Cocoa part of xwidget and webkit widget. -Copyright (C) 2019-2020 Free Software Foundation, Inc. +Copyright (C) 2019-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/nsxwidget.m b/src/nsxwidget.m index 915fd8b59ce..eff5f0a9ce8 100644 --- a/src/nsxwidget.m +++ b/src/nsxwidget.m @@ -1,6 +1,6 @@ /* NS Cocoa part implementation of xwidget and webkit widget. -Copyright (C) 2019-2020 Free Software Foundation, Inc. +Copyright (C) 2019-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/pdumper.c b/src/pdumper.c index a9c43a463db..e549478e7d7 100644 --- a/src/pdumper.c +++ b/src/pdumper.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2018-2020 Free Software Foundation, Inc. +/* Copyright (C) 2018-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/pdumper.h b/src/pdumper.h index c4baeaf8f94..24e99e22c7a 100644 --- a/src/pdumper.h +++ b/src/pdumper.h @@ -1,6 +1,6 @@ /* Header file for the portable dumper. -Copyright (C) 2016, 2018-2020 Free Software Foundation, Inc. +Copyright (C) 2016, 2018-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/print.c b/src/print.c index 6284561921b..e7228a05f27 100644 --- a/src/print.c +++ b/src/print.c @@ -1,6 +1,6 @@ /* Lisp object printing and output streams. -Copyright (C) 1985-1986, 1988, 1993-1995, 1997-2020 Free Software +Copyright (C) 1985-1986, 1988, 1993-1995, 1997-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/process.c b/src/process.c index 28ab15c9038..06d750d3368 100644 --- a/src/process.c +++ b/src/process.c @@ -1,6 +1,6 @@ /* Asynchronous subprocess control for GNU Emacs. -Copyright (C) 1985-1988, 1993-1996, 1998-1999, 2001-2020 Free Software +Copyright (C) 1985-1988, 1993-1996, 1998-1999, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -80,15 +80,6 @@ static struct rlimit nofile_limit; #endif -#ifdef NEED_BSDTTY -#include <bsdtty.h> -#endif - -#ifdef USG5_4 -# include <sys/stream.h> -# include <sys/stropts.h> -#endif - #ifdef HAVE_UTIL_H #include <util.h> #endif @@ -465,6 +456,7 @@ add_read_fd (int fd, fd_callback func, void *data) { add_keyboard_wait_descriptor (fd); + eassert (0 <= fd && fd < FD_SETSIZE); fd_callback_info[fd].func = func; fd_callback_info[fd].data = data; } @@ -485,6 +477,7 @@ static void add_process_read_fd (int fd) { add_non_keyboard_read_fd (fd); + eassert (0 <= fd && fd < FD_SETSIZE); fd_callback_info[fd].flags |= PROCESS_FD; } @@ -495,6 +488,7 @@ delete_read_fd (int fd) { delete_keyboard_wait_descriptor (fd); + eassert (0 <= fd && fd < FD_SETSIZE); if (fd_callback_info[fd].flags == 0) { fd_callback_info[fd].func = 0; @@ -534,6 +528,7 @@ recompute_max_desc (void) { int fd; + eassert (max_desc < FD_SETSIZE); for (fd = max_desc; fd >= 0; --fd) { if (fd_callback_info[fd].flags != 0) @@ -542,6 +537,7 @@ recompute_max_desc (void) break; } } + eassert (max_desc < FD_SETSIZE); } /* Stop monitoring file descriptor FD for when write is possible. */ @@ -549,6 +545,7 @@ recompute_max_desc (void) void delete_write_fd (int fd) { + eassert (0 <= fd && fd < FD_SETSIZE); if ((fd_callback_info[fd].flags & NON_BLOCKING_CONNECT_FD) != 0) { if (--num_pending_connects < 0) @@ -571,6 +568,7 @@ compute_input_wait_mask (fd_set *mask) int fd; FD_ZERO (mask); + eassert (max_desc < FD_SETSIZE); for (fd = 0; fd <= max_desc; ++fd) { if (fd_callback_info[fd].thread != NULL @@ -593,6 +591,7 @@ compute_non_process_wait_mask (fd_set *mask) int fd; FD_ZERO (mask); + eassert (max_desc < FD_SETSIZE); for (fd = 0; fd <= max_desc; ++fd) { if (fd_callback_info[fd].thread != NULL @@ -616,6 +615,7 @@ compute_non_keyboard_wait_mask (fd_set *mask) int fd; FD_ZERO (mask); + eassert (max_desc < FD_SETSIZE); for (fd = 0; fd <= max_desc; ++fd) { if (fd_callback_info[fd].thread != NULL @@ -639,6 +639,7 @@ compute_write_mask (fd_set *mask) int fd; FD_ZERO (mask); + eassert (max_desc < FD_SETSIZE); for (fd = 0; fd <= max_desc; ++fd) { if (fd_callback_info[fd].thread != NULL @@ -660,6 +661,7 @@ clear_waiting_thread_info (void) { int fd; + eassert (max_desc < FD_SETSIZE); for (fd = 0; fd <= max_desc; ++fd) { if (fd_callback_info[fd].waiting_thread == current_thread) @@ -936,8 +938,10 @@ update_processes_for_thread_death (Lisp_Object dying_thread) struct Lisp_Process *proc = XPROCESS (process); pset_thread (proc, Qnil); + eassert (proc->infd < FD_SETSIZE); if (proc->infd >= 0) fd_callback_info[proc->infd].thread = NULL; + eassert (proc->outfd < FD_SETSIZE); if (proc->outfd >= 0) fd_callback_info[proc->outfd].thread = NULL; } @@ -1378,8 +1382,10 @@ If THREAD is nil, the process is unlocked. */) proc = XPROCESS (process); pset_thread (proc, thread); + eassert (proc->infd < FD_SETSIZE); if (proc->infd >= 0) fd_callback_info[proc->infd].thread = tstate; + eassert (proc->outfd < FD_SETSIZE); if (proc->outfd >= 0) fd_callback_info[proc->outfd].thread = tstate; @@ -2099,6 +2105,9 @@ create_process (Lisp_Object process, char **new_argv, Lisp_Object current_dir) } } + if (FD_SETSIZE <= inchannel || FD_SETSIZE <= outchannel) + report_file_errno ("Creating pipe", Qnil, EMFILE); + #ifndef WINDOWSNT if (emacs_pipe (p->open_fd + READ_FROM_EXEC_MONITOR) != 0) report_file_error ("Creating pipe", Qnil); @@ -2108,6 +2117,7 @@ create_process (Lisp_Object process, char **new_argv, Lisp_Object current_dir) fcntl (outchannel, F_SETFL, O_NONBLOCK); /* Record this as an active process, with its channels. */ + eassert (0 <= inchannel && inchannel < FD_SETSIZE); chan_process[inchannel] = process; p->infd = inchannel; p->outfd = outchannel; @@ -2194,6 +2204,8 @@ create_pty (Lisp_Object process) if (pty_fd >= 0) { p->open_fd[SUBPROCESS_STDIN] = pty_fd; + if (FD_SETSIZE <= pty_fd) + report_file_errno ("Opening pty", Qnil, EMFILE); #if ! defined (USG) || defined (USG_SUBTTY_WORKS) /* On most USG systems it does not work to open the pty's tty here, then close it and reopen it in the child. */ @@ -2215,6 +2227,7 @@ create_pty (Lisp_Object process) /* Record this as an active process, with its channels. As a result, child_setup will close Emacs's side of the pipes. */ + eassert (0 <= pty_fd && pty_fd < FD_SETSIZE); chan_process[pty_fd] = process; p->infd = pty_fd; p->outfd = pty_fd; @@ -2300,6 +2313,9 @@ usage: (make-pipe-process &rest ARGS) */) outchannel = p->open_fd[WRITE_TO_SUBPROCESS]; inchannel = p->open_fd[READ_FROM_SUBPROCESS]; + if (FD_SETSIZE <= inchannel || FD_SETSIZE <= outchannel) + report_file_errno ("Creating pipe", Qnil, EMFILE); + fcntl (inchannel, F_SETFL, O_NONBLOCK); fcntl (outchannel, F_SETFL, O_NONBLOCK); @@ -2308,6 +2324,7 @@ usage: (make-pipe-process &rest ARGS) */) #endif /* Record this as an active process, with its channels. */ + eassert (0 <= inchannel && inchannel < FD_SETSIZE); chan_process[inchannel] = proc; p->infd = inchannel; p->outfd = outchannel; @@ -2637,6 +2654,7 @@ set up yet, this function will block until socket setup has completed. */) return Qnil; channel = XPROCESS (process)->infd; + eassert (0 <= channel && channel < FD_SETSIZE); return conv_sockaddr_to_lisp (datagram_address[channel].sa, datagram_address[channel].len); } @@ -2665,6 +2683,7 @@ set up yet, this function will block until socket setup has completed. */) channel = XPROCESS (process)->infd; len = get_lisp_to_sockaddr_size (address, &family); + eassert (0 <= channel && channel < FD_SETSIZE); if (len == 0 || datagram_address[channel].len != len) return Qnil; conv_lisp_to_sockaddr (family, address, datagram_address[channel].sa, len); @@ -3039,10 +3058,13 @@ usage: (make-serial-process &rest ARGS) */) fd = serial_open (port); p->open_fd[SUBPROCESS_STDIN] = fd; + if (FD_SETSIZE <= fd) + report_file_errno ("Opening serial port", port, EMFILE); p->infd = fd; p->outfd = fd; if (fd > max_desc) max_desc = fd; + eassert (0 <= fd && fd < FD_SETSIZE); chan_process[fd] = proc; buffer = Fplist_get (contact, QCbuffer); @@ -3213,6 +3235,7 @@ finish_after_tls_connection (Lisp_Object proc) Fplist_get (contact, QChost), Fplist_get (contact, QCservice)); + eassert (p->outfd < FD_SETSIZE); if (NILP (result)) { pset_status (p, list2 (Qfailed, @@ -3258,6 +3281,7 @@ connect_network_socket (Lisp_Object proc, Lisp_Object addrinfos, if (!NILP (use_external_socket_p)) { socket_to_use = external_sock_fd; + eassert (socket_to_use < FD_SETSIZE); /* Ensure we don't consume the external socket twice. */ external_sock_fd = -1; @@ -3299,6 +3323,14 @@ connect_network_socket (Lisp_Object proc, Lisp_Object addrinfos, xerrno = errno; continue; } + /* Reject file descriptors that would be too large. */ + if (FD_SETSIZE <= s) + { + emacs_close (s); + s = -1; + xerrno = EMFILE; + continue; + } } if (p->is_non_blocking_client && ! (SOCK_NONBLOCK && socket_to_use < 0)) @@ -3463,6 +3495,7 @@ connect_network_socket (Lisp_Object proc, Lisp_Object addrinfos, #ifdef DATAGRAM_SOCKETS if (p->socktype == SOCK_DGRAM) { + eassert (0 <= s && s < FD_SETSIZE); if (datagram_address[s].sa) emacs_abort (); @@ -3527,6 +3560,7 @@ connect_network_socket (Lisp_Object proc, Lisp_Object addrinfos, inch = s; outch = s; + eassert (0 <= inch && inch < FD_SETSIZE); chan_process[inch] = proc; fcntl (inch, F_SETFL, O_NONBLOCK); @@ -3553,6 +3587,7 @@ connect_network_socket (Lisp_Object proc, Lisp_Object addrinfos, if (! (connecting_status (p->status) && EQ (XCDR (p->status), addrinfos))) pset_status (p, Fcons (Qconnect, addrinfos)); + eassert (0 <= inch && inch < FD_SETSIZE); if ((fd_callback_info[inch].flags & NON_BLOCKING_CONNECT_FD) == 0) add_non_blocking_write_fd (inch); } @@ -4543,12 +4578,13 @@ network_lookup_address_info_1 (Lisp_Object host, const char *service, DEFUN ("network-lookup-address-info", Fnetwork_lookup_address_info, Snetwork_lookup_address_info, 1, 2, 0, - doc: /* Look up ip address info of NAME. + doc: /* Look up Internet Protocol (IP) address info of NAME. Optional parameter FAMILY controls whether to look up IPv4 or IPv6 addresses. The default of nil means both, symbol `ipv4' means IPv4 only, symbol `ipv6' means IPv6 only. Returns a list of addresses, or nil if none were found. Each address is a vector of integers, as per -the description of ADDRESS in `make-network-process'. */) +the description of ADDRESS in `make-network-process'. In case of +error displays the error message. */) (Lisp_Object name, Lisp_Object family) { Lisp_Object addresses = Qnil; @@ -4620,6 +4656,7 @@ deactivate_process (Lisp_Object proc) close_process_fd (&p->open_fd[i]); inchannel = p->infd; + eassert (inchannel < FD_SETSIZE); if (inchannel >= 0) { p->infd = -1; @@ -4756,6 +4793,13 @@ server_accept_connection (Lisp_Object server, int channel) s = accept4 (channel, &saddr.sa, &len, SOCK_CLOEXEC); + if (FD_SETSIZE <= s) + { + emacs_close (s); + s = -1; + errno = EMFILE; + } + if (s < 0) { int code = errno; @@ -4853,6 +4897,7 @@ server_accept_connection (Lisp_Object server, int channel) Lisp_Object name = Fformat (nargs, args); Lisp_Object proc = make_process (name); + eassert (0 <= s && s < FD_SETSIZE); chan_process[s] = proc; fcntl (s, F_SETFL, O_NONBLOCK); @@ -5132,6 +5177,8 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd, if (! NILP (wait_for_cell) && ! NILP (XCAR (wait_for_cell))) break; + eassert (max_desc < FD_SETSIZE); + #if defined HAVE_GETADDRINFO_A || defined HAVE_GNUTLS { Lisp_Object process_list_head, aproc; @@ -5875,6 +5922,7 @@ read_process_output (Lisp_Object proc, int channel) { ssize_t nbytes; struct Lisp_Process *p = XPROCESS (proc); + eassert (0 <= channel && channel < FD_SETSIZE); struct coding_system *coding = proc_decode_coding_system[channel]; int carryover = p->decoding_carryover; ptrdiff_t readmax = clip_to_bounds (1, read_process_output_max, PTRDIFF_MAX); @@ -6039,6 +6087,7 @@ read_and_dispose_of_process_output (struct Lisp_Process *p, char *chars, proc_encode_coding_system[p->outfd] surely points to a valid memory because p->outfd will be changed once EOF is sent to the process. */ + eassert (p->outfd < FD_SETSIZE); if (NILP (p->encode_coding_system) && p->outfd >= 0 && proc_encode_coding_system[p->outfd]) { @@ -6278,6 +6327,7 @@ send_process (Lisp_Object proc, const char *buf, ptrdiff_t len, if (p->outfd < 0) error ("Output file descriptor of %s is closed", SDATA (p->name)); + eassert (p->outfd < FD_SETSIZE); coding = proc_encode_coding_system[p->outfd]; Vlast_coding_system_used = CODING_ID_NAME (coding->id); @@ -6387,6 +6437,7 @@ send_process (Lisp_Object proc, const char *buf, ptrdiff_t len, /* Send this batch, using one or more write calls. */ ptrdiff_t written = 0; int outfd = p->outfd; + eassert (0 <= outfd && outfd < FD_SETSIZE); #ifdef DATAGRAM_SOCKETS if (DATAGRAM_CHAN_P (outfd)) { @@ -6837,6 +6888,7 @@ traffic. */) struct Lisp_Process *p; p = XPROCESS (process); + eassert (p->infd < FD_SETSIZE); if (EQ (p->command, Qt) && p->infd >= 0 && (!EQ (p->filter, Qt) || EQ (p->status, Qlisten))) @@ -6964,6 +7016,7 @@ process has been transmitted to the serial port. */) outfd = XPROCESS (proc)->outfd; + eassert (outfd < FD_SETSIZE); if (outfd >= 0) coding = proc_encode_coding_system[outfd]; @@ -7011,11 +7064,13 @@ process has been transmitted to the serial port. */) p->open_fd[WRITE_TO_SUBPROCESS] = new_outfd; p->outfd = new_outfd; + eassert (0 <= new_outfd && new_outfd < FD_SETSIZE); if (!proc_encode_coding_system[new_outfd]) proc_encode_coding_system[new_outfd] = xmalloc (sizeof (struct coding_system)); if (old_outfd >= 0) { + eassert (old_outfd < FD_SETSIZE); *proc_encode_coding_system[new_outfd] = *proc_encode_coding_system[old_outfd]; memset (proc_encode_coding_system[old_outfd], 0, @@ -7464,6 +7519,7 @@ DEFUN ("process-filter-multibyte-p", Fprocess_filter_multibyte_p, struct Lisp_Process *p = XPROCESS (process); if (p->infd < 0) return Qnil; + eassert (p->infd < FD_SETSIZE); struct coding_system *coding = proc_decode_coding_system[p->infd]; return (CODING_FOR_UNIBYTE (coding) ? Qnil : Qt); } @@ -7497,6 +7553,7 @@ keyboard_bit_set (fd_set *mask) { int fd; + eassert (max_desc < FD_SETSIZE); for (fd = 0; fd <= max_desc; fd++) if (FD_ISSET (fd, mask) && ((fd_callback_info[fd].flags & (FOR_READ | KEYBOARD_FD)) @@ -7744,6 +7801,7 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd, void add_timer_wait_descriptor (int fd) { + eassert (0 <= fd && fd < FD_SETSIZE); add_read_fd (fd, timerfd_callback, NULL); fd_callback_info[fd].flags &= ~KEYBOARD_FD; } @@ -7806,6 +7864,7 @@ setup_process_coding_systems (Lisp_Object process) if (inch < 0 || outch < 0) return; + eassert (0 <= inch && inch < FD_SETSIZE); if (!proc_decode_coding_system[inch]) proc_decode_coding_system[inch] = xmalloc (sizeof (struct coding_system)); coding_system = p->decode_coding_system; @@ -7817,6 +7876,7 @@ setup_process_coding_systems (Lisp_Object process) } setup_coding_system (coding_system, proc_decode_coding_system[inch]); + eassert (0 <= outch && outch < FD_SETSIZE); if (!proc_encode_coding_system[outch]) proc_encode_coding_system[outch] = xmalloc (sizeof (struct coding_system)); setup_coding_system (p->encode_coding_system, diff --git a/src/process.h b/src/process.h index a783a31cb86..d041ada5867 100644 --- a/src/process.h +++ b/src/process.h @@ -1,5 +1,5 @@ /* Definitions for asynchronous process control in GNU Emacs. - Copyright (C) 1985, 1994, 2001-2020 Free Software Foundation, Inc. + Copyright (C) 1985, 1994, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/profiler.c b/src/profiler.c index 9d2e828f221..21ae2447aa4 100644 --- a/src/profiler.c +++ b/src/profiler.c @@ -1,6 +1,6 @@ /* Profiler implementation. -Copyright (C) 2012-2020 Free Software Foundation, Inc. +Copyright (C) 2012-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/puresize.h b/src/puresize.h index 7611f6e53f4..811d0b4d369 100644 --- a/src/puresize.h +++ b/src/puresize.h @@ -1,5 +1,5 @@ /* How much read-only Lisp storage a dumped Emacs needs. - Copyright (C) 1993, 2001-2020 Free Software Foundation, Inc. + Copyright (C) 1993, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/ralloc.c b/src/ralloc.c index a7cac137329..02689265f2e 100644 --- a/src/ralloc.c +++ b/src/ralloc.c @@ -1,5 +1,5 @@ /* Block-relocating memory allocator. - Copyright (C) 1993, 1995, 2000-2020 Free Software Foundation, Inc. + Copyright (C) 1993, 1995, 2000-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/regex-emacs.c b/src/regex-emacs.c index 904ca0c7b95..8350e54b54a 100644 --- a/src/regex-emacs.c +++ b/src/regex-emacs.c @@ -1,6 +1,6 @@ /* Emacs regular expression matching and search - Copyright (C) 1993-2020 Free Software Foundation, Inc. + Copyright (C) 1993-2021 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/src/regex-emacs.h b/src/regex-emacs.h index 354408bb2a7..027ab655580 100644 --- a/src/regex-emacs.h +++ b/src/regex-emacs.h @@ -1,6 +1,6 @@ /* Emacs regular expression API - Copyright (C) 1985, 1989-1993, 1995, 2000-2020 Free Software + Copyright (C) 1985, 1989-1993, 1995, 2000-2021 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/src/region-cache.c b/src/region-cache.c index 836296764d1..b75a9691b5d 100644 --- a/src/region-cache.c +++ b/src/region-cache.c @@ -1,6 +1,6 @@ /* Caching facts about regions of the buffer, for optimization. -Copyright (C) 1985-1989, 1993, 1995, 2001-2020 Free Software Foundation, +Copyright (C) 1985-1989, 1993, 1995, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/region-cache.h b/src/region-cache.h index 46e45a2fbdb..128215718d8 100644 --- a/src/region-cache.h +++ b/src/region-cache.h @@ -1,6 +1,6 @@ /* Header file: Caching facts about regions of the buffer, for optimization. -Copyright (C) 1985-1986, 1993, 1995, 2001-2020 Free Software Foundation, +Copyright (C) 1985-1986, 1993, 1995, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/scroll.c b/src/scroll.c index 145c256048a..9042888d1f2 100644 --- a/src/scroll.c +++ b/src/scroll.c @@ -1,6 +1,6 @@ /* Calculate what line insertion or deletion to do, and do it -Copyright (C) 1985-1986, 1990, 1993-1994, 2001-2020 Free Software +Copyright (C) 1985-1986, 1990, 1993-1994, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/search.c b/src/search.c index 50d82fd289d..c757bf3d1f2 100644 --- a/src/search.c +++ b/src/search.c @@ -1,6 +1,6 @@ /* String search routines for GNU Emacs. -Copyright (C) 1985-1987, 1993-1994, 1997-1999, 2001-2020 Free Software +Copyright (C) 1985-1987, 1993-1994, 1997-1999, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/sheap.c b/src/sheap.c index 7d6429c532c..5401e791b07 100644 --- a/src/sheap.c +++ b/src/sheap.c @@ -1,7 +1,7 @@ /* simulate `sbrk' with an array in .bss, for `unexec' support for Cygwin; complete rewrite of xemacs Cygwin `unexec' code - Copyright (C) 2004-2020 Free Software Foundation, Inc. + Copyright (C) 2004-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/sheap.h b/src/sheap.h index 50f602a4467..f1004d6c2e5 100644 --- a/src/sheap.h +++ b/src/sheap.h @@ -1,6 +1,6 @@ /* Static heap allocation for GNU Emacs. -Copyright 2016-2020 Free Software Foundation, Inc. +Copyright 2016-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/sound.c b/src/sound.c index f74c4769a44..e5f66f8f529 100644 --- a/src/sound.c +++ b/src/sound.c @@ -1,6 +1,6 @@ /* sound.c -- sound support. -Copyright (C) 1998-1999, 2001-2020 Free Software Foundation, Inc. +Copyright (C) 1998-1999, 2001-2021 Free Software Foundation, Inc. Author: Gerd Moellmann <gerd@gnu.org> diff --git a/src/syntax.c b/src/syntax.c index df07809aaaf..9fbf88535f3 100644 --- a/src/syntax.c +++ b/src/syntax.c @@ -1,5 +1,5 @@ /* GNU Emacs routines to deal with syntax tables; also word and list parsing. - Copyright (C) 1985, 1987, 1993-1995, 1997-1999, 2001-2020 Free + Copyright (C) 1985, 1987, 1993-1995, 1997-1999, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/syntax.h b/src/syntax.h index a2ec3301bab..66ee139a967 100644 --- a/src/syntax.h +++ b/src/syntax.h @@ -1,6 +1,6 @@ /* Declarations having to do with GNU Emacs syntax tables. -Copyright (C) 1985, 1993-1994, 1997-1998, 2001-2020 Free Software +Copyright (C) 1985, 1993-1994, 1997-1998, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/sysdep.c b/src/sysdep.c index eeb9d184940..6ede06b1aa3 100644 --- a/src/sysdep.c +++ b/src/sysdep.c @@ -1,5 +1,5 @@ /* Interfaces to system-dependent kernel and library entries. - Copyright (C) 1985-1988, 1993-1995, 1999-2020 Free Software + Copyright (C) 1985-1988, 1993-1995, 1999-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/sysselect.h b/src/sysselect.h index ecba1f329ee..017c02b77f4 100644 --- a/src/sysselect.h +++ b/src/sysselect.h @@ -1,5 +1,5 @@ /* sysselect.h - System-dependent definitions for the select function. - Copyright (C) 1995, 2001-2020 Free Software Foundation, Inc. + Copyright (C) 1995, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/syssignal.h b/src/syssignal.h index a3e462b5385..285a3c548ba 100644 --- a/src/syssignal.h +++ b/src/syssignal.h @@ -1,6 +1,6 @@ /* syssignal.h - System-dependent definitions for signals. -Copyright (C) 1993, 1999, 2001-2020 Free Software Foundation, Inc. +Copyright (C) 1993, 1999, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/sysstdio.h b/src/sysstdio.h index 461019273bd..d4df3d74567 100644 --- a/src/sysstdio.h +++ b/src/sysstdio.h @@ -1,6 +1,6 @@ /* Standard I/O for Emacs. -Copyright 2013-2020 Free Software Foundation, Inc. +Copyright 2013-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/systhread.c b/src/systhread.c index ebd75526495..c68853cacac 100644 --- a/src/systhread.c +++ b/src/systhread.c @@ -1,5 +1,5 @@ /* System thread definitions -Copyright (C) 2012-2020 Free Software Foundation, Inc. +Copyright (C) 2012-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/systhread.h b/src/systhread.h index 73c764a9401..0f47d7c1a8a 100644 --- a/src/systhread.h +++ b/src/systhread.h @@ -1,5 +1,5 @@ /* System thread definitions -Copyright (C) 2012-2020 Free Software Foundation, Inc. +Copyright (C) 2012-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/systime.h b/src/systime.h index b59a3d1c690..08ab5bdde33 100644 --- a/src/systime.h +++ b/src/systime.h @@ -1,5 +1,5 @@ /* systime.h - System-dependent definitions for time manipulations. - Copyright (C) 1993-1994, 2002-2020 Free Software Foundation, Inc. + Copyright (C) 1993-1994, 2002-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/systty.h b/src/systty.h index 43fe824123f..c19b4b35f18 100644 --- a/src/systty.h +++ b/src/systty.h @@ -1,5 +1,5 @@ /* systty.h - System-dependent definitions for terminals. - Copyright (C) 1993-1994, 2001-2020 Free Software Foundation, Inc. + Copyright (C) 1993-1994, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/syswait.h b/src/syswait.h index 57b0f70eced..42e8c408549 100644 --- a/src/syswait.h +++ b/src/syswait.h @@ -1,5 +1,5 @@ /* Define wait system call interface for Emacs. - Copyright (C) 1993-1995, 2000-2020 Free Software Foundation, Inc. + Copyright (C) 1993-1995, 2000-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/term.c b/src/term.c index fee3b555751..a87f9c745ce 100644 --- a/src/term.c +++ b/src/term.c @@ -1,5 +1,5 @@ /* Terminal control module for terminals described by TERMCAP - Copyright (C) 1985-1987, 1993-1995, 1998, 2000-2020 Free Software + Copyright (C) 1985-1987, 1993-1995, 1998, 2000-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/termcap.c b/src/termcap.c index 1ace4c93103..227dbeb7d92 100644 --- a/src/termcap.c +++ b/src/termcap.c @@ -1,5 +1,5 @@ /* Work-alike for termcap, plus extra features. - Copyright (C) 1985-1986, 1993-1995, 2000-2008, 2011, 2013-2020 Free + Copyright (C) 1985-1986, 1993-1995, 2000-2008, 2011, 2013-2021 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/src/termchar.h b/src/termchar.h index c967e7d04f4..f50c1bfb6ea 100644 --- a/src/termchar.h +++ b/src/termchar.h @@ -1,5 +1,5 @@ /* Flags and parameters describing terminal's characteristics. - Copyright (C) 1985-1986, 2001-2020 Free Software Foundation, Inc. + Copyright (C) 1985-1986, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/termhooks.h b/src/termhooks.h index e94959ca9a3..85a47c071b6 100644 --- a/src/termhooks.h +++ b/src/termhooks.h @@ -1,6 +1,6 @@ /* Parameters and display hooks for terminal devices. -Copyright (C) 1985-1986, 1993-1994, 2001-2020 Free Software Foundation, +Copyright (C) 1985-1986, 1993-1994, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/terminal.c b/src/terminal.c index e3b666ba61d..b83adc596bb 100644 --- a/src/terminal.c +++ b/src/terminal.c @@ -1,5 +1,5 @@ /* Functions related to terminal devices. - Copyright (C) 2005-2020 Free Software Foundation, Inc. + Copyright (C) 2005-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/terminfo.c b/src/terminfo.c index 0765996401f..15aff317f15 100644 --- a/src/terminfo.c +++ b/src/terminfo.c @@ -1,5 +1,5 @@ /* Interface from Emacs to terminfo. - Copyright (C) 1985-1986, 2001-2020 Free Software Foundation, Inc. + Copyright (C) 1985-1986, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/termopts.h b/src/termopts.h index 5c5caeab52f..0a3dfa092fc 100644 --- a/src/termopts.h +++ b/src/termopts.h @@ -1,5 +1,5 @@ /* Flags and parameters describing user options for handling the terminal. - Copyright (C) 1985-1986, 1990, 2001-2020 Free Software Foundation, + Copyright (C) 1985-1986, 1990, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/textprop.c b/src/textprop.c index 0876badc873..d7d6a669232 100644 --- a/src/textprop.c +++ b/src/textprop.c @@ -1,5 +1,5 @@ /* Interface code for dealing with text properties. - Copyright (C) 1993-1995, 1997, 1999-2020 Free Software Foundation, + Copyright (C) 1993-1995, 1997, 1999-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/thread.c b/src/thread.c index 7ab1e6de1fc..f74f6111486 100644 --- a/src/thread.c +++ b/src/thread.c @@ -1,5 +1,5 @@ /* Threading code. -Copyright (C) 2012-2020 Free Software Foundation, Inc. +Copyright (C) 2012-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/thread.h b/src/thread.h index 9697e49f09f..cf3ce922c46 100644 --- a/src/thread.h +++ b/src/thread.h @@ -1,5 +1,5 @@ /* Thread definitions -Copyright (C) 2012-2020 Free Software Foundation, Inc. +Copyright (C) 2012-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/timefns.c b/src/timefns.c index 4a28f707a3b..f0e2e97f555 100644 --- a/src/timefns.c +++ b/src/timefns.c @@ -1,6 +1,6 @@ /* Timestamp functions for Emacs -Copyright (C) 1985-1987, 1989, 1993-2020 Free Software Foundation, Inc. +Copyright (C) 1985-1987, 1989, 1993-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/tparam.c b/src/tparam.c index 6afef2ef849..c89a9bde9a0 100644 --- a/src/tparam.c +++ b/src/tparam.c @@ -1,5 +1,5 @@ /* Merge parameters into a termcap entry string. - Copyright (C) 1985, 1987, 1993, 1995, 2000-2008, 2013-2020 Free + Copyright (C) 1985, 1987, 1993, 1995, 2000-2008, 2013-2021 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/src/tparam.h b/src/tparam.h index 5cab1479ade..893c3cac12c 100644 --- a/src/tparam.h +++ b/src/tparam.h @@ -1,6 +1,6 @@ /* Interface definitions for termcap entries. -Copyright (C) 2011-2020 Free Software Foundation, Inc. +Copyright (C) 2011-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/undo.c b/src/undo.c index 0fcd8af240a..2db401ebc7e 100644 --- a/src/undo.c +++ b/src/undo.c @@ -1,5 +1,5 @@ /* undo handling for GNU Emacs. - Copyright (C) 1990, 1993-1994, 2000-2020 Free Software Foundation, + Copyright (C) 1990, 1993-1994, 2000-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/unexaix.c b/src/unexaix.c index 0e57b25c51d..949750f4933 100644 --- a/src/unexaix.c +++ b/src/unexaix.c @@ -1,5 +1,5 @@ /* Dump an executable file. - Copyright (C) 1985-1988, 1999, 2001-2020 Free Software Foundation, + Copyright (C) 1985-1988, 1999, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/unexcoff.c b/src/unexcoff.c index 3daa9d149b1..c4b2f6ebea7 100644 --- a/src/unexcoff.c +++ b/src/unexcoff.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1985-1988, 1992-1994, 2001-2020 Free Software +/* Copyright (C) 1985-1988, 1992-1994, 2001-2021 Free Software * Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/unexcw.c b/src/unexcw.c index 83efbc74bb1..7a80b05963b 100644 --- a/src/unexcw.c +++ b/src/unexcw.c @@ -1,7 +1,7 @@ /* unexec() support for Cygwin; complete rewrite of xemacs Cygwin unexec() code - Copyright (C) 2004-2020 Free Software Foundation, Inc. + Copyright (C) 2004-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/unexelf.c b/src/unexelf.c index 2506cc61175..b5cded5cfda 100644 --- a/src/unexelf.c +++ b/src/unexelf.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1985-1988, 1990, 1992, 1999-2020 Free Software +/* Copyright (C) 1985-1988, 1990, 1992, 1999-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/unexmacosx.c b/src/unexmacosx.c index 8cf68bb92e1..f226f1b6c19 100644 --- a/src/unexmacosx.c +++ b/src/unexmacosx.c @@ -1,5 +1,5 @@ /* Dump Emacs in Mach-O format for use on macOS. - Copyright (C) 2001-2020 Free Software Foundation, Inc. + Copyright (C) 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/unexw32.c b/src/unexw32.c index 3c0f33557dd..1c60e3da0ee 100644 --- a/src/unexw32.c +++ b/src/unexw32.c @@ -1,5 +1,5 @@ /* unexec for GNU Emacs on Windows NT. - Copyright (C) 1994, 2001-2020 Free Software Foundation, Inc. + Copyright (C) 1994, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/vm-limit.c b/src/vm-limit.c index 1a07ecfb323..b9058d04352 100644 --- a/src/vm-limit.c +++ b/src/vm-limit.c @@ -1,5 +1,5 @@ /* Functions for memory limit warnings. - Copyright (C) 1990, 1992, 2001-2020 Free Software Foundation, Inc. + Copyright (C) 1990, 1992, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w16select.c b/src/w16select.c index 75933526db1..37239137cf0 100644 --- a/src/w16select.c +++ b/src/w16select.c @@ -1,6 +1,6 @@ /* 16-bit Windows Selection processing for emacs on MS-Windows -Copyright (C) 1996-1997, 2001-2020 Free Software Foundation, Inc. +Copyright (C) 1996-1997, 2001-2021 Free Software Foundation, Inc. Author: Dale P. Smith <dpsm@en.com> diff --git a/src/w32.c b/src/w32.c index 0d38eae7fea..202acb7d5fd 100644 --- a/src/w32.c +++ b/src/w32.c @@ -1,6 +1,6 @@ /* Utility and Unix shadow routines for GNU Emacs on the Microsoft Windows API. -Copyright (C) 1994-1995, 2000-2020 Free Software Foundation, Inc. +Copyright (C) 1994-1995, 2000-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -8667,6 +8667,11 @@ pipe2 (int * phandles, int pipe2_flags) { _close (phandles[0]); _close (phandles[1]); + /* Since we close the handles, set them to -1, so as to + avoid an assertion violation if the caller then tries to + close the handle again (emacs_close will abort otherwise + if errno is EBADF). */ + phandles[0] = phandles[1] = -1; errno = EMFILE; rc = -1; } diff --git a/src/w32.h b/src/w32.h index e23ea6a675d..3f8eb250cc1 100644 --- a/src/w32.h +++ b/src/w32.h @@ -2,7 +2,7 @@ #define EMACS_W32_H /* Support routines for the NT version of Emacs. - Copyright (C) 1994, 2001-2020 Free Software Foundation, Inc. + Copyright (C) 1994, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32common.h b/src/w32common.h index bd01fd40401..90e88876aba 100644 --- a/src/w32common.h +++ b/src/w32common.h @@ -1,5 +1,5 @@ /* Common functions for Microsoft Windows builds of Emacs - Copyright (C) 2012-2020 Free Software Foundation, Inc. + Copyright (C) 2012-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32console.c b/src/w32console.c index 72df888b749..cb9e288e880 100644 --- a/src/w32console.c +++ b/src/w32console.c @@ -1,5 +1,5 @@ /* Terminal hooks for GNU Emacs on the Microsoft Windows API. - Copyright (C) 1992, 1999, 2001-2020 Free Software Foundation, Inc. + Copyright (C) 1992, 1999, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32cygwinx.c b/src/w32cygwinx.c index 2d729834600..b58febc4e04 100644 --- a/src/w32cygwinx.c +++ b/src/w32cygwinx.c @@ -1,6 +1,6 @@ /* Common functions for the Microsoft Windows and Cygwin builds. -Copyright (C) 2018-2020 Free Software Foundation, Inc. +Copyright (C) 2018-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32fns.c b/src/w32fns.c index 36bee0676ba..c1e18ff7fad 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -1,6 +1,6 @@ /* Graphical user interface functions for the Microsoft Windows API. -Copyright (C) 1989, 1992-2020 Free Software Foundation, Inc. +Copyright (C) 1989, 1992-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32font.c b/src/w32font.c index c1d5f25d251..6b9ab0468cd 100644 --- a/src/w32font.c +++ b/src/w32font.c @@ -1,5 +1,5 @@ /* Font backend for the Microsoft Windows API. - Copyright (C) 2007-2020 Free Software Foundation, Inc. + Copyright (C) 2007-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32font.h b/src/w32font.h index a76f8c30cec..cf2bf3c2421 100644 --- a/src/w32font.h +++ b/src/w32font.h @@ -1,5 +1,5 @@ /* Shared GDI and Uniscribe Font backend declarations for the Windows API. - Copyright (C) 2007-2020 Free Software Foundation, Inc. + Copyright (C) 2007-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32gui.h b/src/w32gui.h index f6cfa9fb87e..d2c34bd00a9 100644 --- a/src/w32gui.h +++ b/src/w32gui.h @@ -1,5 +1,5 @@ /* Definitions and headers for communication on the Microsoft Windows API. - Copyright (C) 1995, 2001-2020 Free Software Foundation, Inc. + Copyright (C) 1995, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32heap.c b/src/w32heap.c index a72bed62caf..e002f72608a 100644 --- a/src/w32heap.c +++ b/src/w32heap.c @@ -1,5 +1,5 @@ /* Heap management routines for GNU Emacs on the Microsoft Windows API. - Copyright (C) 1994, 2001-2020 Free Software Foundation, Inc. + Copyright (C) 1994, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32heap.h b/src/w32heap.h index 5c062671494..0b34f8a356a 100644 --- a/src/w32heap.h +++ b/src/w32heap.h @@ -1,5 +1,5 @@ /* Heap management routines (including unexec) for GNU Emacs on Windows NT. - Copyright (C) 1994, 2001-2020 Free Software Foundation, Inc. + Copyright (C) 1994, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32image.c b/src/w32image.c index 70b2eb29b87..cc1a6eba22b 100644 --- a/src/w32image.c +++ b/src/w32image.c @@ -1,6 +1,6 @@ /* Implementation of MS-Windows native image API via the GDI+ library. -Copyright (C) 2020 Free Software Foundation, Inc. +Copyright (C) 2020-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32inevt.c b/src/w32inevt.c index 7023e7144a3..1a80a001974 100644 --- a/src/w32inevt.c +++ b/src/w32inevt.c @@ -1,5 +1,5 @@ /* Input event support for Emacs on the Microsoft Windows API. - Copyright (C) 1992-1993, 1995, 2001-2020 Free Software Foundation, + Copyright (C) 1992-1993, 1995, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32inevt.h b/src/w32inevt.h index 3426ac6251f..f0097716f35 100644 --- a/src/w32inevt.h +++ b/src/w32inevt.h @@ -1,5 +1,5 @@ /* Input routines for GNU Emacs on the Microsoft Windows API. - Copyright (C) 1995, 2001-2020 Free Software Foundation, Inc. + Copyright (C) 1995, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32menu.c b/src/w32menu.c index da2db78a940..8bf0c462030 100644 --- a/src/w32menu.c +++ b/src/w32menu.c @@ -1,5 +1,5 @@ /* Menu support for GNU Emacs on the Microsoft Windows API. - Copyright (C) 1986, 1988, 1993-1994, 1996, 1998-1999, 2001-2020 Free + Copyright (C) 1986, 1988, 1993-1994, 1996, 1998-1999, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32notify.c b/src/w32notify.c index 0871abb6027..b9e90633923 100644 --- a/src/w32notify.c +++ b/src/w32notify.c @@ -1,6 +1,6 @@ /* Filesystem notifications support for GNU Emacs on the Microsoft Windows API. -Copyright (C) 2012-2020 Free Software Foundation, Inc. +Copyright (C) 2012-2021 Free Software Foundation, Inc. Author: Eli Zaretskii <eliz@gnu.org> diff --git a/src/w32proc.c b/src/w32proc.c index 66cdf7de461..2b6cb9c1e1d 100644 --- a/src/w32proc.c +++ b/src/w32proc.c @@ -1,6 +1,6 @@ /* Process support for GNU Emacs on the Microsoft Windows API. -Copyright (C) 1992, 1995, 1999-2020 Free Software Foundation, Inc. +Copyright (C) 1992, 1995, 1999-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32reg.c b/src/w32reg.c index 9ef50afce33..9794162bd09 100644 --- a/src/w32reg.c +++ b/src/w32reg.c @@ -1,6 +1,6 @@ /* Emulate the X Resource Manager through the registry. -Copyright (C) 1990, 1993-1994, 2001-2020 Free Software Foundation, Inc. +Copyright (C) 1990, 1993-1994, 2001-2021 Free Software Foundation, Inc. Author: Kevin Gallo diff --git a/src/w32select.c b/src/w32select.c index e754e1f1ed2..85f8e5556a2 100644 --- a/src/w32select.c +++ b/src/w32select.c @@ -1,6 +1,6 @@ /* Selection processing for Emacs on the Microsoft Windows API. -Copyright (C) 1993-1994, 2001-2020 Free Software Foundation, Inc. +Copyright (C) 1993-1994, 2001-2021 Free Software Foundation, Inc. Author: Kevin Gallo Benjamin Riefenstahl diff --git a/src/w32select.h b/src/w32select.h index 2cdc51994a3..7ed8696ea98 100644 --- a/src/w32select.h +++ b/src/w32select.h @@ -1,6 +1,6 @@ /* Selection processing for Emacs on the Microsoft W32 API. -Copyright (C) 1993-1994, 2001-2020 Free Software Foundation, Inc. +Copyright (C) 1993-1994, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32term.c b/src/w32term.c index 989b056ff2e..e5a8a823b48 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -1,6 +1,6 @@ /* Implementation of GUI terminal on the Microsoft Windows API. -Copyright (C) 1989, 1993-2020 Free Software Foundation, Inc. +Copyright (C) 1989, 1993-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32term.h b/src/w32term.h index 694493c6c82..7d351df871d 100644 --- a/src/w32term.h +++ b/src/w32term.h @@ -1,5 +1,5 @@ /* Definitions and headers for communication on the Microsoft Windows API. - Copyright (C) 1995, 2001-2020 Free Software Foundation, Inc. + Copyright (C) 1995, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32uniscribe.c b/src/w32uniscribe.c index 7a84b21f9da..0df1ff298f1 100644 --- a/src/w32uniscribe.c +++ b/src/w32uniscribe.c @@ -1,6 +1,6 @@ /* Font backend for the Microsoft W32 Uniscribe API. Windows-specific parts of the HarfBuzz font backend. - Copyright (C) 2008-2020 Free Software Foundation, Inc. + Copyright (C) 2008-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32xfns.c b/src/w32xfns.c index 70cee559f3c..712214b591b 100644 --- a/src/w32xfns.c +++ b/src/w32xfns.c @@ -1,5 +1,5 @@ /* Functions taken directly from X sources for use with the Microsoft Windows API. - Copyright (C) 1989, 1992-1995, 1999, 2001-2020 Free Software + Copyright (C) 1989, 1992-1995, 1999, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/widget.c b/src/widget.c index b141612b539..43f0307b4e0 100644 --- a/src/widget.c +++ b/src/widget.c @@ -1,5 +1,5 @@ /* The emacs frame widget. - Copyright (C) 1992-1993, 2000-2020 Free Software Foundation, Inc. + Copyright (C) 1992-1993, 2000-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/widget.h b/src/widget.h index 7ec5b63e128..105bc6646d1 100644 --- a/src/widget.h +++ b/src/widget.h @@ -1,5 +1,5 @@ /* The emacs frame widget public header file. - Copyright (C) 1993, 2001-2020 Free Software Foundation, Inc. + Copyright (C) 1993, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/widgetprv.h b/src/widgetprv.h index cf7cad7c01a..58620a05b2a 100644 --- a/src/widgetprv.h +++ b/src/widgetprv.h @@ -1,5 +1,5 @@ /* The emacs frame widget private header file. - Copyright (C) 1993, 2001-2020 Free Software Foundation, Inc. + Copyright (C) 1993, 2001-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/window.c b/src/window.c index 5db166e345e..ba8682eed7c 100644 --- a/src/window.c +++ b/src/window.c @@ -1,6 +1,6 @@ /* Window creation, deletion and examination for GNU Emacs. Does not include redisplay. - Copyright (C) 1985-1987, 1993-1998, 2000-2020 Free Software + Copyright (C) 1985-1987, 1993-1998, 2000-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/window.h b/src/window.h index 167d1be7abb..1f94fc0252f 100644 --- a/src/window.h +++ b/src/window.h @@ -1,5 +1,5 @@ /* Window definitions for GNU Emacs. - Copyright (C) 1985-1986, 1993, 1995, 1997-2020 Free Software + Copyright (C) 1985-1986, 1993, 1995, 1997-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/xdisp.c b/src/xdisp.c index b5adee51055..64ec0abad48 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -1,6 +1,6 @@ /* Display generation from window structure and buffer text. -Copyright (C) 1985-1988, 1993-1995, 1997-2020 Free Software Foundation, +Copyright (C) 1985-1988, 1993-1995, 1997-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -1114,7 +1114,8 @@ static ptrdiff_t display_count_lines (ptrdiff_t, ptrdiff_t, ptrdiff_t, static void pint2str (register char *, register int, register ptrdiff_t); static int display_string (const char *, Lisp_Object, Lisp_Object, - ptrdiff_t, ptrdiff_t, struct it *, int, int, int, int); + ptrdiff_t, ptrdiff_t, struct it *, int, int, int, + int); static void compute_line_metrics (struct it *); static void run_redisplay_end_trigger_hook (struct it *); static bool get_overlay_strings (struct it *, ptrdiff_t); @@ -25451,14 +25452,62 @@ display_mode_line (struct window *w, enum face_id face_id, Lisp_Object format) format_mode_line_unwind_data (NULL, NULL, Qnil, false)); - mode_line_target = MODE_LINE_DISPLAY; - /* Temporarily make frame's keyboard the current kboard so that kboard-local variables in the mode_line_format will get the right values. */ push_kboard (FRAME_KBOARD (it.f)); record_unwind_save_match_data (); - display_mode_element (&it, 0, 0, 0, format, Qnil, false); + + if (NILP (Vmode_line_compact)) + { + mode_line_target = MODE_LINE_DISPLAY; + display_mode_element (&it, 0, 0, 0, format, Qnil, false); + } + else + { + Lisp_Object mode_string = Fformat_mode_line (format, Qnil, Qnil, Qnil); + if (EQ (Vmode_line_compact, Qlong) + && WINDOW_TOTAL_COLS (w) >= SCHARS (mode_string)) + { + /* The window is wide enough; just display the mode line we + just computed. */ + display_string (NULL, mode_string, Qnil, + 0, 0, &it, 0, 0, 0, + STRING_MULTIBYTE (mode_string)); + } + else + { + /* Compress the mode line. */ + ptrdiff_t i = 0, i_byte = 0, start = 0; + int prev = 0; + + while (i < SCHARS (mode_string)) + { + int c = fetch_string_char_advance (mode_string, &i, &i_byte); + if (c == ' ' && prev == ' ') + { + display_string (NULL, + Fsubstring (mode_string, make_fixnum (start), + make_fixnum (i - 1)), + Qnil, 0, 0, &it, 0, 0, 0, + STRING_MULTIBYTE (mode_string)); + /* Skip past the rest of the space characters. */ + while (c == ' ' && i < SCHARS (mode_string)) + c = fetch_string_char_advance (mode_string, &i, &i_byte); + start = i - 1; + } + prev = c; + } + + /* Display the final bit. */ + if (start < i) + display_string (NULL, + Fsubstring (mode_string, make_fixnum (start), + make_fixnum (i - 1)), + Qnil, 0, 0, &it, 0, 0, 0, + STRING_MULTIBYTE (mode_string)); + } + } pop_kboard (); unbind_to (count, Qnil); @@ -27090,6 +27139,7 @@ display_string (const char *string, Lisp_Object lisp_string, Lisp_Object face_st with index START. */ reseat_to_string (it, NILP (lisp_string) ? string : NULL, lisp_string, start, precision, field_width, multibyte); + if (string && STRINGP (lisp_string)) /* LISP_STRING is the one returned by decode_mode_spec. We should ignore its text properties. */ @@ -34805,6 +34855,14 @@ wide as that tab on the display. */); The face used for trailing whitespace is `trailing-whitespace'. */); Vshow_trailing_whitespace = Qnil; + DEFVAR_LISP ("mode-line-compact", Vmode_line_compact, + doc: /* Non-nil means that mode lines should be compact. +This means that repeating spaces will be replaced with a single space. +If this variable is `long', only mode lines that are wider than the +currently selected window are compressed. */); + Vmode_line_compact = Qnil; + DEFSYM (Qlong, "long"); + DEFVAR_LISP ("nobreak-char-display", Vnobreak_char_display, doc: /* Control highlighting of non-ASCII space and hyphen chars. If the value is t, Emacs highlights non-ASCII chars which have the diff --git a/src/xfaces.c b/src/xfaces.c index 73a536b19c6..b3b19a9cb2e 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -1,6 +1,6 @@ /* xfaces.c -- "Face" primitives. -Copyright (C) 1993-1994, 1998-2020 Free Software Foundation, Inc. +Copyright (C) 1993-1994, 1998-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/xfns.c b/src/xfns.c index abe293e903e..9ab537ca8d9 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -1,6 +1,6 @@ /* Functions for the X Window System. -Copyright (C) 1989, 1992-2020 Free Software Foundation, Inc. +Copyright (C) 1989, 1992-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -2321,24 +2321,6 @@ hack_wm_protocols (struct frame *f, Widget widget) static XFontSet xic_create_xfontset (struct frame *); static XIMStyle best_xim_style (XIMStyles *); - -/* Supported XIM styles, ordered by preference. */ - -static const XIMStyle supported_xim_styles[] = -{ - XIMPreeditPosition | XIMStatusArea, - XIMPreeditPosition | XIMStatusNothing, - XIMPreeditPosition | XIMStatusNone, - XIMPreeditNothing | XIMStatusArea, - XIMPreeditNothing | XIMStatusNothing, - XIMPreeditNothing | XIMStatusNone, - XIMPreeditNone | XIMStatusArea, - XIMPreeditNone | XIMStatusNothing, - XIMPreeditNone | XIMStatusNone, - 0, -}; - - #if defined HAVE_X_WINDOWS && defined USE_X_TOOLKIT /* Create an X fontset on frame F with base font name BASE_FONTNAME. */ @@ -2622,15 +2604,8 @@ xic_free_xfontset (struct frame *f) static XIMStyle best_xim_style (XIMStyles *xim) { - int i, j; - int nr_supported = ARRAYELTS (supported_xim_styles); - - for (i = 0; i < nr_supported; ++i) - for (j = 0; j < xim->count_styles; ++j) - if (supported_xim_styles[i] == xim->supported_styles[j]) - return supported_xim_styles[i]; - - /* Return the default style. */ + /* Return the default style. This is what GTK3 uses and + should work fine with all modern input methods. */ return XIMPreeditNothing | XIMStatusNothing; } diff --git a/src/xfont.c b/src/xfont.c index 32f63c3f7ce..0570ee96a90 100644 --- a/src/xfont.c +++ b/src/xfont.c @@ -1,5 +1,5 @@ /* xfont.c -- X core font driver. - Copyright (C) 2006-2020 Free Software Foundation, Inc. + Copyright (C) 2006-2021 Free Software Foundation, Inc. Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H13PRO009 diff --git a/src/xftfont.c b/src/xftfont.c index eb60d219a72..f7349316366 100644 --- a/src/xftfont.c +++ b/src/xftfont.c @@ -1,5 +1,5 @@ /* xftfont.c -- XFT font driver. - Copyright (C) 2006-2020 Free Software Foundation, Inc. + Copyright (C) 2006-2021 Free Software Foundation, Inc. Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H13PRO009 diff --git a/src/xgselect.c b/src/xgselect.c index be70107b756..0d91d55bad6 100644 --- a/src/xgselect.c +++ b/src/xgselect.c @@ -1,6 +1,6 @@ /* Function for handling the GLib event loop. -Copyright (C) 2009-2020 Free Software Foundation, Inc. +Copyright (C) 2009-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/xgselect.h b/src/xgselect.h index 512bf3ad85f..2142a236b23 100644 --- a/src/xgselect.h +++ b/src/xgselect.h @@ -1,6 +1,6 @@ /* Header for xg_select. -Copyright (C) 2009-2020 Free Software Foundation, Inc. +Copyright (C) 2009-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/xmenu.c b/src/xmenu.c index dba7e88f486..ea3813a64e2 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -1,6 +1,6 @@ /* X Communication module for terminals which understand the X protocol. -Copyright (C) 1986, 1988, 1993-1994, 1996, 1999-2020 Free Software +Copyright (C) 1986, 1988, 1993-1994, 1996, 1999-2021 Free Software Foundation, Inc. Author: Jon Arnold diff --git a/src/xml.c b/src/xml.c index d7da86404f6..495988ab232 100644 --- a/src/xml.c +++ b/src/xml.c @@ -1,5 +1,5 @@ /* Interface to libxml2. - Copyright (C) 2010-2020 Free Software Foundation, Inc. + Copyright (C) 2010-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/xrdb.c b/src/xrdb.c index 3d7f715c88f..7d84762978f 100644 --- a/src/xrdb.c +++ b/src/xrdb.c @@ -1,5 +1,5 @@ /* Deal with the X Resource Manager. - Copyright (C) 1990, 1993-1994, 2000-2020 Free Software Foundation, + Copyright (C) 1990, 1993-1994, 2000-2021 Free Software Foundation, Inc. Author: Joseph Arceneaux diff --git a/src/xselect.c b/src/xselect.c index 383aebf96c8..030f6240712 100644 --- a/src/xselect.c +++ b/src/xselect.c @@ -1,5 +1,5 @@ /* X Selection processing for Emacs. - Copyright (C) 1993-1997, 2000-2020 Free Software Foundation, Inc. + Copyright (C) 1993-1997, 2000-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/xsettings.c b/src/xsettings.c index 1ba1021e40b..58dfd43ad18 100644 --- a/src/xsettings.c +++ b/src/xsettings.c @@ -1,6 +1,6 @@ /* Functions for handling font and other changes dynamically. -Copyright (C) 2009-2020 Free Software Foundation, Inc. +Copyright (C) 2009-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/xsettings.h b/src/xsettings.h index f29ce77c7f0..26717fc08cb 100644 --- a/src/xsettings.h +++ b/src/xsettings.h @@ -1,6 +1,6 @@ /* Functions for handle font changes dynamically. -Copyright (C) 2009-2020 Free Software Foundation, Inc. +Copyright (C) 2009-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/xsmfns.c b/src/xsmfns.c index 203085e24f1..10565a4b25f 100644 --- a/src/xsmfns.c +++ b/src/xsmfns.c @@ -1,7 +1,7 @@ /* Session management module for systems which understand the X Session management protocol. -Copyright (C) 2002-2020 Free Software Foundation, Inc. +Copyright (C) 2002-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/xterm.c b/src/xterm.c index 7f8728e47c4..0a86738cc20 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -1,6 +1,6 @@ /* X Communication module for terminals which understand the X protocol. -Copyright (C) 1989, 1993-2020 Free Software Foundation, Inc. +Copyright (C) 1989, 1993-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -9706,7 +9706,7 @@ x_draw_window_cursor (struct window *w, struct glyph_row *glyph_row, int x, #ifdef HAVE_X_I18N if (w == XWINDOW (f->selected_window)) - if (FRAME_XIC (f) && (FRAME_XIC_STYLE (f) & XIMPreeditPosition)) + if (FRAME_XIC (f)) xic_set_preeditarea (w, x, y); #endif } @@ -10389,11 +10389,8 @@ xim_instantiate_callback (Display *display, XPointer client_data, XPointer call_ create_frame_xic (f); if (FRAME_XIC_STYLE (f) & XIMStatusArea) xic_set_statusarea (f); - if (FRAME_XIC_STYLE (f) & XIMPreeditPosition) - { - struct window *w = XWINDOW (f->selected_window); - xic_set_preeditarea (w, w->cursor.x, w->cursor.y); - } + struct window *w = XWINDOW (f->selected_window); + xic_set_preeditarea (w, w->cursor.x, w->cursor.y); } } diff --git a/src/xterm.h b/src/xterm.h index 0f8ba5e82b4..ebc42b7dd55 100644 --- a/src/xterm.h +++ b/src/xterm.h @@ -1,5 +1,5 @@ /* Definitions and headers for communication with X protocol. - Copyright (C) 1989, 1993-1994, 1998-2020 Free Software Foundation, + Copyright (C) 1989, 1993-1994, 1998-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/xwidget.c b/src/xwidget.c index accde65b523..e4b42e6e0c6 100644 --- a/src/xwidget.c +++ b/src/xwidget.c @@ -1,6 +1,6 @@ /* Support for embedding graphical components in a buffer. -Copyright (C) 2011-2020 Free Software Foundation, Inc. +Copyright (C) 2011-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/xwidget.h b/src/xwidget.h index 40ad8ae8334..591f23489db 100644 --- a/src/xwidget.h +++ b/src/xwidget.h @@ -1,6 +1,6 @@ /* Support for embedding graphical components in a buffer. -Copyright (C) 2011-2020 Free Software Foundation, Inc. +Copyright (C) 2011-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/test/ChangeLog.1 b/test/ChangeLog.1 index 2bf014d0a95..7085b9ea10c 100644 --- a/test/ChangeLog.1 +++ b/test/ChangeLog.1 @@ -2952,7 +2952,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 2008-2020 Free Software Foundation, Inc. + Copyright (C) 2008-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/test/Makefile.in b/test/Makefile.in index c14ef41a544..d89ba821168 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -1,6 +1,6 @@ ### @configure_input@ -# Copyright (C) 2010-2020 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/test/README b/test/README index 3365f18cf7e..ec566cb58dc 100644 --- a/test/README +++ b/test/README @@ -1,4 +1,4 @@ -Copyright (C) 2008-2020 Free Software Foundation, Inc. +Copyright (C) 2008-2021 Free Software Foundation, Inc. See the end of the file for license conditions. This directory contains files intended to test various aspects of diff --git a/test/lib-src/emacsclient-tests.el b/test/lib-src/emacsclient-tests.el index a502bb782f2..8bad9c04e00 100644 --- a/test/lib-src/emacsclient-tests.el +++ b/test/lib-src/emacsclient-tests.el @@ -1,6 +1,6 @@ ;;; emacsclient-tests.el --- Test emacsclient -*- lexical-binding:t -*- -;; Copyright (C) 2016-2020 Free Software Foundation, Inc. +;; Copyright (C) 2016-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/abbrev-tests.el b/test/lisp/abbrev-tests.el index 288ea1ae987..2a42d5636d3 100644 --- a/test/lisp/abbrev-tests.el +++ b/test/lisp/abbrev-tests.el @@ -1,6 +1,6 @@ ;;; abbrev-tests.el --- Test suite for abbrevs -*- lexical-binding: t; -*- -;; Copyright (C) 2015-2020 Free Software Foundation, Inc. +;; Copyright (C) 2015-2021 Free Software Foundation, Inc. ;; Author: Eli Zaretskii <eliz@gnu.org> ;; Keywords: abbrevs diff --git a/test/lisp/align-resources/align-post.c b/test/lisp/align-resources/align-post.c new file mode 100644 index 00000000000..157e1d6242a --- /dev/null +++ b/test/lisp/align-resources/align-post.c @@ -0,0 +1,3 @@ +int +main (int argc, + char *argv[]); diff --git a/test/lisp/align-resources/align-post.java b/test/lisp/align-resources/align-post.java new file mode 100644 index 00000000000..e0ea8e727f1 --- /dev/null +++ b/test/lisp/align-resources/align-post.java @@ -0,0 +1,9 @@ +class X +{ + String field1; + String[] field2; + int field3; + int[] field4; + X field5; + X[] field6; +} diff --git a/test/lisp/align-resources/align-pre.c b/test/lisp/align-resources/align-pre.c new file mode 100644 index 00000000000..b1774181a40 --- /dev/null +++ b/test/lisp/align-resources/align-pre.c @@ -0,0 +1,3 @@ +int +main (int argc, + char *argv[]); diff --git a/test/lisp/align-resources/align-pre.java b/test/lisp/align-resources/align-pre.java new file mode 100644 index 00000000000..fe7a87a9393 --- /dev/null +++ b/test/lisp/align-resources/align-pre.java @@ -0,0 +1,9 @@ +class X +{ + String field1; + String[] field2; + int field3; + int[] field4; + X field5; + X[] field6; +} diff --git a/test/lisp/align-tests.el b/test/lisp/align-tests.el new file mode 100644 index 00000000000..a9c36e30e19 --- /dev/null +++ b/test/lisp/align-tests.el @@ -0,0 +1,47 @@ +;;; align-tests.el --- Test suite for aligns -*- lexical-binding: t; -*- + +;; Copyright (C) 2015-2021 Free Software Foundation, Inc. + +;; This file is part of GNU Emacs. + +;; GNU Emacs is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. + +;;; Commentary: + +;;; Code: + +(require 'ert) +(require 'ert-x) +(require 'align) + +(defun test-align-compare (file function) + (should (equal + (with-temp-buffer + (insert-file-contents (ert-resource-file (format file "pre"))) + (funcall function) + (align (point-min) (point-max)) + (buffer-substring-no-properties (point-min) (point-max))) + (with-temp-buffer + (insert-file-contents (ert-resource-file (format file "post"))) + (buffer-string))))) + +(ert-deftest align-java () + (test-align-compare "align-%s.java" #'java-mode)) + +(ert-deftest align-c () + (test-align-compare "align-%s.c" #'c-mode)) + +(provide 'align-tests) + +;;; align-tests.el ends here diff --git a/test/lisp/allout-tests.el b/test/lisp/allout-tests.el index c979d085c89..3a346fd1e2d 100644 --- a/test/lisp/allout-tests.el +++ b/test/lisp/allout-tests.el @@ -1,6 +1,6 @@ ;;; allout-tests.el --- Tests for allout.el -*- lexical-binding: t -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/allout-widgets-tests.el b/test/lisp/allout-widgets-tests.el index 2b1bcaa6de3..59ff6783697 100644 --- a/test/lisp/allout-widgets-tests.el +++ b/test/lisp/allout-widgets-tests.el @@ -1,6 +1,6 @@ ;;; allout-widgets-tests.el --- Tests for allout-widgets.el -*- lexical-binding: t -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/ansi-color-tests.el b/test/lisp/ansi-color-tests.el index 5c3da875f8c..107dc8e400b 100644 --- a/test/lisp/ansi-color-tests.el +++ b/test/lisp/ansi-color-tests.el @@ -1,6 +1,6 @@ ;;; ansi-color-tests.el --- Test suite for ansi-color -*- lexical-binding: t; -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; Author: Pablo Barbáchano <pablob@amazon.com> ;; Keywords: ansi diff --git a/test/lisp/apropos-tests.el b/test/lisp/apropos-tests.el index 4c5522d14c2..7eaa64207f1 100644 --- a/test/lisp/apropos-tests.el +++ b/test/lisp/apropos-tests.el @@ -1,6 +1,6 @@ ;;; apropos-tests.el --- Tests for apropos.el -*- lexical-binding: t; -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; Author: Simen Heggestøyl <simenheg@gmail.com> ;; Keywords: diff --git a/test/lisp/arc-mode-tests.el b/test/lisp/arc-mode-tests.el index e92a4d28c6f..5c6af9b45cf 100644 --- a/test/lisp/arc-mode-tests.el +++ b/test/lisp/arc-mode-tests.el @@ -1,6 +1,6 @@ ;;; arc-mode-tests.el --- Test suite for arc-mode. -*- lexical-binding: t -*- -;; Copyright (C) 2017-2020 Free Software Foundation, Inc. +;; Copyright (C) 2017-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/auth-source-pass-tests.el b/test/lisp/auth-source-pass-tests.el index 677abb33cc9..bfbef53db97 100644 --- a/test/lisp/auth-source-pass-tests.el +++ b/test/lisp/auth-source-pass-tests.el @@ -1,6 +1,6 @@ ;;; auth-source-pass-tests.el --- Tests for auth-source-pass.el -*- lexical-binding: t; -*- -;; Copyright (C) 2013, 2017-2020 Free Software Foundation, Inc. +;; Copyright (C) 2013, 2017-2021 Free Software Foundation, Inc. ;; Author: Damien Cassou <damien.cassou@gmail.com> diff --git a/test/lisp/auth-source-tests.el b/test/lisp/auth-source-tests.el index 4c3005c3efe..19216d3c24a 100644 --- a/test/lisp/auth-source-tests.el +++ b/test/lisp/auth-source-tests.el @@ -1,6 +1,6 @@ ;;; auth-source-tests.el --- Tests for auth-source.el -*- lexical-binding: t; -*- -;; Copyright (C) 2015-2020 Free Software Foundation, Inc. +;; Copyright (C) 2015-2021 Free Software Foundation, Inc. ;; Author: Damien Cassou <damien@cassou.me>, ;; Nicolas Petton <nicolas@petton.fr> diff --git a/test/lisp/autoinsert-tests.el b/test/lisp/autoinsert-tests.el index eafa9c6c02c..7ec4bf63791 100644 --- a/test/lisp/autoinsert-tests.el +++ b/test/lisp/autoinsert-tests.el @@ -1,6 +1,6 @@ ;;; autoinsert-tests.el --- Tests for autoinsert.el -*- lexical-binding: t; -*- -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; Author: Simen Heggestøyl <simenheg@gmail.com> ;; Keywords: diff --git a/test/lisp/autorevert-tests.el b/test/lisp/autorevert-tests.el index 84f87003fcf..6da515bb2c8 100644 --- a/test/lisp/autorevert-tests.el +++ b/test/lisp/autorevert-tests.el @@ -1,6 +1,6 @@ ;;; auto-revert-tests.el --- Tests of auto-revert -*- lexical-binding: t -*- -;; Copyright (C) 2015-2020 Free Software Foundation, Inc. +;; Copyright (C) 2015-2021 Free Software Foundation, Inc. ;; Author: Michael Albinus <michael.albinus@gmx.de> diff --git a/test/lisp/battery-tests.el b/test/lisp/battery-tests.el index 8d7cc7fccf3..e34d59102bc 100644 --- a/test/lisp/battery-tests.el +++ b/test/lisp/battery-tests.el @@ -1,6 +1,6 @@ ;;; battery-tests.el --- tests for battery.el -*- lexical-binding: t -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/bookmark-tests.el b/test/lisp/bookmark-tests.el index 6745e4c1d8a..9c33a27288a 100644 --- a/test/lisp/bookmark-tests.el +++ b/test/lisp/bookmark-tests.el @@ -1,6 +1,6 @@ ;;; bookmark-tests.el --- Tests for bookmark.el -*- lexical-binding: t -*- -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; Author: Stefan Kangas <stefankangas@gmail.com> diff --git a/test/lisp/buff-menu-tests.el b/test/lisp/buff-menu-tests.el index 7d7824bf9c4..18c988656d3 100644 --- a/test/lisp/buff-menu-tests.el +++ b/test/lisp/buff-menu-tests.el @@ -1,6 +1,6 @@ ;;; buff-menu-tests.el --- Test suite for buff-menu.el -*- lexical-binding: t -*- -;; Copyright (C) 2016-2020 Free Software Foundation, Inc. +;; Copyright (C) 2016-2021 Free Software Foundation, Inc. ;; Author: Tino Calancha <tino.calancha@gmail.com> diff --git a/test/lisp/button-tests.el b/test/lisp/button-tests.el index b463366c33b..e0944afa344 100644 --- a/test/lisp/button-tests.el +++ b/test/lisp/button-tests.el @@ -1,6 +1,6 @@ ;;; button-tests.el --- tests for button.el -*- lexical-binding: t -*- -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/calc/calc-tests.el b/test/lisp/calc/calc-tests.el index b59f4dc988f..bdcf78e020a 100644 --- a/test/lisp/calc/calc-tests.el +++ b/test/lisp/calc/calc-tests.el @@ -1,6 +1,6 @@ ;;; calc-tests.el --- tests for calc -*- lexical-binding: t; -*- -;; Copyright (C) 2014-2020 Free Software Foundation, Inc. +;; Copyright (C) 2014-2021 Free Software Foundation, Inc. ;; Author: Leo Liu <sdl.web@gmail.com> ;; Keywords: maint diff --git a/test/lisp/calendar/cal-julian-tests.el b/test/lisp/calendar/cal-julian-tests.el index 76118b3d7f5..db3a4909fa4 100644 --- a/test/lisp/calendar/cal-julian-tests.el +++ b/test/lisp/calendar/cal-julian-tests.el @@ -1,6 +1,6 @@ ;;; cal-julian-tests.el --- tests for calendar/cal-julian.el -*- lexical-binding:t -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; Author: Stefan Kangas <stefankangas@gmail.com> diff --git a/test/lisp/calendar/icalendar-tests.el b/test/lisp/calendar/icalendar-tests.el index 8b44f639475..7993a1fd806 100644 --- a/test/lisp/calendar/icalendar-tests.el +++ b/test/lisp/calendar/icalendar-tests.el @@ -1,6 +1,6 @@ ;; icalendar-tests.el --- Test suite for icalendar.el -*- lexical-binding:t -*- -;; Copyright (C) 2005, 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2005, 2008-2021 Free Software Foundation, Inc. ;; Author: Ulf Jasper <ulf.jasper@web.de> ;; Created: March 2005 diff --git a/test/lisp/calendar/iso8601-tests.el b/test/lisp/calendar/iso8601-tests.el index c835f5792b9..618e5b12386 100644 --- a/test/lisp/calendar/iso8601-tests.el +++ b/test/lisp/calendar/iso8601-tests.el @@ -1,6 +1,6 @@ ;;; iso8601-tests.el --- tests for calendar/iso8601.el -*- lexical-binding:t -*- -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/calendar/lunar-tests.el b/test/lisp/calendar/lunar-tests.el index d2647aac03a..5f1f6782f1a 100644 --- a/test/lisp/calendar/lunar-tests.el +++ b/test/lisp/calendar/lunar-tests.el @@ -1,6 +1,6 @@ ;;; lunar-tests.el --- tests for calendar/lunar.el -*- lexical-binding:t -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; Author: Stefan Kangas <stefankangas@gmail.com> diff --git a/test/lisp/calendar/parse-time-tests.el b/test/lisp/calendar/parse-time-tests.el index e1801a57307..b90fe0bd85b 100644 --- a/test/lisp/calendar/parse-time-tests.el +++ b/test/lisp/calendar/parse-time-tests.el @@ -1,6 +1,6 @@ ;; parse-time-tests.el --- Test suite for parse-time.el -*- lexical-binding:t -*- -;; Copyright (C) 2016-2020 Free Software Foundation, Inc. +;; Copyright (C) 2016-2021 Free Software Foundation, Inc. ;; Author: Lars Ingebrigtsen <larsi@gnus.org> diff --git a/test/lisp/calendar/solar-tests.el b/test/lisp/calendar/solar-tests.el index 441beafe71c..7a37f8db558 100644 --- a/test/lisp/calendar/solar-tests.el +++ b/test/lisp/calendar/solar-tests.el @@ -1,6 +1,6 @@ ;;; solar-tests.el --- tests for solar.el -*- lexical-binding: t -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/calendar/time-date-tests.el b/test/lisp/calendar/time-date-tests.el index 76a5641f34d..4568947c0b3 100644 --- a/test/lisp/calendar/time-date-tests.el +++ b/test/lisp/calendar/time-date-tests.el @@ -1,6 +1,6 @@ ;;; time-date-tests.el --- tests for calendar/time-date.el -*- lexical-binding:t -*- -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/calendar/todo-mode-tests.el b/test/lisp/calendar/todo-mode-tests.el index 6ed55121988..6fa2b9d7c35 100644 --- a/test/lisp/calendar/todo-mode-tests.el +++ b/test/lisp/calendar/todo-mode-tests.el @@ -1,6 +1,6 @@ ;;; todo-mode-tests.el --- tests for todo-mode.el -*- lexical-binding: t; -*- -;; Copyright (C) 2017-2020 Free Software Foundation, Inc. +;; Copyright (C) 2017-2021 Free Software Foundation, Inc. ;; Author: Stephen Berman <stephen.berman@gmx.net> ;; Keywords: calendar diff --git a/test/lisp/cedet/semantic-utest-c.el b/test/lisp/cedet/semantic-utest-c.el index c776a0fbaac..a7cbe116c2e 100644 --- a/test/lisp/cedet/semantic-utest-c.el +++ b/test/lisp/cedet/semantic-utest-c.el @@ -1,6 +1,6 @@ ;;; semantic-utest-c.el --- C based parsing tests. -*- lexical-binding:t -*- -;; Copyright (C) 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2008-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/test/lisp/cedet/semantic-utest-fmt.el b/test/lisp/cedet/semantic-utest-fmt.el index c2f2bb7226c..d6e5ce7a0fd 100644 --- a/test/lisp/cedet/semantic-utest-fmt.el +++ b/test/lisp/cedet/semantic-utest-fmt.el @@ -1,6 +1,6 @@ ;;; cedet/semantic-utest-fmt.el --- Parsing / Formatting tests -*- lexical-binding:t -*- -;;; Copyright (C) 2003-2004, 2007-2020 Free Software Foundation, Inc. +;;; Copyright (C) 2003-2004, 2007-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/test/lisp/cedet/semantic-utest-ia.el b/test/lisp/cedet/semantic-utest-ia.el index ea1a7790985..7210f66b0a7 100644 --- a/test/lisp/cedet/semantic-utest-ia.el +++ b/test/lisp/cedet/semantic-utest-ia.el @@ -1,6 +1,6 @@ ;;; semantic-utest-ia.el --- Analyzer unit tests -*- lexical-binding:t -*- -;; Copyright (C) 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2008-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/test/lisp/cedet/semantic-utest.el b/test/lisp/cedet/semantic-utest.el index bcbd7d686e3..c0099386f1c 100644 --- a/test/lisp/cedet/semantic-utest.el +++ b/test/lisp/cedet/semantic-utest.el @@ -1,6 +1,6 @@ ;;; semantic-utest.el --- Tests for semantic's parsing system. -*- lexical-binding:t -*- -;;; Copyright (C) 2003-2004, 2007-2020 Free Software Foundation, Inc. +;;; Copyright (C) 2003-2004, 2007-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/test/lisp/cedet/srecode-utest-getset.el b/test/lisp/cedet/srecode-utest-getset.el index fc66ac4edf2..0497dea505d 100644 --- a/test/lisp/cedet/srecode-utest-getset.el +++ b/test/lisp/cedet/srecode-utest-getset.el @@ -1,6 +1,6 @@ ;;; srecode/test-getset.el --- Test the getset inserter. -*- lexical-binding:t -*- -;; Copyright (C) 2008, 2009, 2011, 2019-2020 Free Software Foundation, Inc +;; Copyright (C) 2008, 2009, 2011, 2019-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/cedet/srecode-utest-template.el b/test/lisp/cedet/srecode-utest-template.el index 7c5bbc599a3..57d8a648050 100644 --- a/test/lisp/cedet/srecode-utest-template.el +++ b/test/lisp/cedet/srecode-utest-template.el @@ -1,6 +1,6 @@ ;;; srecode/test.el --- SRecode Core Template tests. -*- lexical-binding:t -*- -;; Copyright (C) 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2008-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/char-fold-tests.el b/test/lisp/char-fold-tests.el index 599d9d614f9..063c893516f 100644 --- a/test/lisp/char-fold-tests.el +++ b/test/lisp/char-fold-tests.el @@ -1,6 +1,6 @@ ;;; char-fold-tests.el --- Tests for char-fold.el -*- lexical-binding: t; -*- -;; Copyright (C) 2013-2020 Free Software Foundation, Inc. +;; Copyright (C) 2013-2021 Free Software Foundation, Inc. ;; Author: Artur Malabarba <bruce.connor.am@gmail.com> diff --git a/test/lisp/color-tests.el b/test/lisp/color-tests.el index 3fb9bd5c097..2493476a66a 100644 --- a/test/lisp/color-tests.el +++ b/test/lisp/color-tests.el @@ -1,6 +1,6 @@ ;;; color-tests.el --- Tests for color.el -*- lexical-binding: t; -*- -;; Copyright (C) 2017-2020 Free Software Foundation, Inc. +;; Copyright (C) 2017-2021 Free Software Foundation, Inc. ;; Author: Simen Heggestøyl <simenheg@gmail.com> ;; Keywords: diff --git a/test/lisp/comint-tests.el b/test/lisp/comint-tests.el index 923f588e9e6..de1bc548e18 100644 --- a/test/lisp/comint-tests.el +++ b/test/lisp/comint-tests.el @@ -1,6 +1,6 @@ ;;; comint-tests.el -*- lexical-binding:t -*- -;; Copyright (C) 2010-2020 Free Software Foundation, Inc. +;; Copyright (C) 2010-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/completion-tests.el b/test/lisp/completion-tests.el index 7473bbbb0c5..c13fb2e44b7 100644 --- a/test/lisp/completion-tests.el +++ b/test/lisp/completion-tests.el @@ -1,6 +1,6 @@ ;;; completion-tests.el --- Tests for completion.el -*- lexical-binding: t -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/cus-edit-tests.el b/test/lisp/cus-edit-tests.el index bb88b8dd9fa..95f62e0d7ea 100644 --- a/test/lisp/cus-edit-tests.el +++ b/test/lisp/cus-edit-tests.el @@ -1,6 +1,6 @@ ;;; cus-edit-tests.el --- Tests for cus-edit.el -*- lexical-binding: t -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/custom-tests.el b/test/lisp/custom-tests.el index 232e3bed439..10854c71d56 100644 --- a/test/lisp/custom-tests.el +++ b/test/lisp/custom-tests.el @@ -1,6 +1,6 @@ ;;; custom-tests.el --- tests for custom.el -*- lexical-binding: t -*- -;; Copyright (C) 2018-2020 Free Software Foundation, Inc. +;; Copyright (C) 2018-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/dabbrev-tests.el b/test/lisp/dabbrev-tests.el index 06c5c0655a7..0b20dcf9213 100644 --- a/test/lisp/dabbrev-tests.el +++ b/test/lisp/dabbrev-tests.el @@ -1,6 +1,6 @@ ;;; dabbrev-tests.el --- Test suite for dabbrev. -*- lexical-binding:t -*- -;; Copyright (C) 2016-2020 Free Software Foundation, Inc. +;; Copyright (C) 2016-2021 Free Software Foundation, Inc. ;; Author: Alan Third <alan@idiocy.org> ;; Keywords: dabbrev diff --git a/test/lisp/delim-col-tests.el b/test/lisp/delim-col-tests.el index c46c0f78e9f..838fc92e826 100644 --- a/test/lisp/delim-col-tests.el +++ b/test/lisp/delim-col-tests.el @@ -1,6 +1,6 @@ ;;; delim-col-tests.el --- Tests for delim-col.el -*- lexical-binding: t; -*- -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; Author: Stefan Kangas <stefankangas@gmail.com> diff --git a/test/lisp/descr-text-tests.el b/test/lisp/descr-text-tests.el index b060dffb0ff..6ba455b50d4 100644 --- a/test/lisp/descr-text-tests.el +++ b/test/lisp/descr-text-tests.el @@ -1,6 +1,6 @@ ;;; descr-text-test.el --- ERT tests for descr-text.el -*- lexical-binding: t -*- -;; Copyright (C) 2014, 2016-2020 Free Software Foundation, Inc. +;; Copyright (C) 2014, 2016-2021 Free Software Foundation, Inc. ;; Author: Michal Nazarewicz <mina86@mina86.com> diff --git a/test/lisp/dired-aux-tests.el b/test/lisp/dired-aux-tests.el index 6bb8ced1f30..7f1743f88d7 100644 --- a/test/lisp/dired-aux-tests.el +++ b/test/lisp/dired-aux-tests.el @@ -1,6 +1,6 @@ ;;; dired-aux-tests.el --- Test suite for dired-aux. -*- lexical-binding: t -*- -;; Copyright (C) 2017-2020 Free Software Foundation, Inc. +;; Copyright (C) 2017-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/dired-tests.el b/test/lisp/dired-tests.el index 66f8ed95b89..aac78c64c69 100644 --- a/test/lisp/dired-tests.el +++ b/test/lisp/dired-tests.el @@ -1,6 +1,6 @@ ;;; dired-tests.el --- Test suite. -*- lexical-binding: t -*- -;; Copyright (C) 2015-2020 Free Software Foundation, Inc. +;; Copyright (C) 2015-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/dired-x-tests.el b/test/lisp/dired-x-tests.el index 245e36efb79..5b51c997e36 100644 --- a/test/lisp/dired-x-tests.el +++ b/test/lisp/dired-x-tests.el @@ -1,6 +1,6 @@ ;;; dired-x-tests.el --- Test suite for dired-x. -*- lexical-binding: t -*- -;; Copyright (C) 2017-2020 Free Software Foundation, Inc. +;; Copyright (C) 2017-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/dom-tests.el b/test/lisp/dom-tests.el index f743df78fd5..dbe3a15dac1 100644 --- a/test/lisp/dom-tests.el +++ b/test/lisp/dom-tests.el @@ -1,6 +1,6 @@ ;;; dom-tests.el --- Tests for dom.el -*- lexical-binding: t; -*- -;; Copyright (C) 2016-2020 Free Software Foundation, Inc. +;; Copyright (C) 2016-2021 Free Software Foundation, Inc. ;; Author: Simen Heggestøyl <simenheg@gmail.com> ;; Keywords: diff --git a/test/lisp/electric-tests.el b/test/lisp/electric-tests.el index 5f63f6831b3..1b7beeaa366 100644 --- a/test/lisp/electric-tests.el +++ b/test/lisp/electric-tests.el @@ -1,6 +1,6 @@ ;;; electric-tests.el --- tests for electric.el -;; Copyright (C) 2013-2020 Free Software Foundation, Inc. +;; Copyright (C) 2013-2021 Free Software Foundation, Inc. ;; Author: João Távora <joaotavora@gmail.com> ;; Keywords: diff --git a/test/lisp/elide-head-tests.el b/test/lisp/elide-head-tests.el index c9ef26a8181..4b9a559ac75 100644 --- a/test/lisp/elide-head-tests.el +++ b/test/lisp/elide-head-tests.el @@ -1,6 +1,6 @@ ;;; elide-head-tests.el --- Tests for elide-head.el -*- lexical-binding: t; -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; Author: Simen Heggestøyl <simenheg@gmail.com> ;; Keywords: diff --git a/test/lisp/emacs-lisp/backquote-tests.el b/test/lisp/emacs-lisp/backquote-tests.el index d1e6494ba66..a196d0b8866 100644 --- a/test/lisp/emacs-lisp/backquote-tests.el +++ b/test/lisp/emacs-lisp/backquote-tests.el @@ -1,6 +1,6 @@ ;;; backquote-tests.el --- Tests for backquote.el -*- lexical-binding: t -*- -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/emacs-lisp/backtrace-tests.el b/test/lisp/emacs-lisp/backtrace-tests.el index fbc71e0ec86..5c4e5305ecc 100644 --- a/test/lisp/emacs-lisp/backtrace-tests.el +++ b/test/lisp/emacs-lisp/backtrace-tests.el @@ -1,6 +1,6 @@ ;;; backtrace-tests.el --- Tests for backtraces -*- lexical-binding: t; -*- -;; Copyright (C) 2018-2020 Free Software Foundation, Inc. +;; Copyright (C) 2018-2021 Free Software Foundation, Inc. ;; Author: Gemini Lasswell diff --git a/test/lisp/emacs-lisp/benchmark-tests.el b/test/lisp/emacs-lisp/benchmark-tests.el index 7cca0d1ed70..71bb52f82fc 100644 --- a/test/lisp/emacs-lisp/benchmark-tests.el +++ b/test/lisp/emacs-lisp/benchmark-tests.el @@ -1,6 +1,6 @@ ;;; benchmark-tests.el --- Test suite for benchmark. -*- lexical-binding: t -*- -;; Copyright (C) 2017-2020 Free Software Foundation, Inc. +;; Copyright (C) 2017-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/emacs-lisp/bindat-tests.el b/test/lisp/emacs-lisp/bindat-tests.el index 842ef10bc57..a9a881987c0 100644 --- a/test/lisp/emacs-lisp/bindat-tests.el +++ b/test/lisp/emacs-lisp/bindat-tests.el @@ -1,6 +1,6 @@ ;;; bindat-tests.el --- tests for bindat.el -*- lexical-binding: t; coding: utf-8; -*- -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/emacs-lisp/bytecomp-resources/warn-wide-docstring-autoload.el b/test/lisp/emacs-lisp/bytecomp-resources/warn-wide-docstring-autoload.el new file mode 100644 index 00000000000..96deb1bbb0a --- /dev/null +++ b/test/lisp/emacs-lisp/bytecomp-resources/warn-wide-docstring-autoload.el @@ -0,0 +1,3 @@ +;;; -*- lexical-binding: t -*- +(autoload 'foox "foo" + "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx") diff --git a/test/lisp/emacs-lisp/bytecomp-resources/warn-wide-docstring-custom-declare-variable.el b/test/lisp/emacs-lisp/bytecomp-resources/warn-wide-docstring-custom-declare-variable.el new file mode 100644 index 00000000000..2a4700bfda5 --- /dev/null +++ b/test/lisp/emacs-lisp/bytecomp-resources/warn-wide-docstring-custom-declare-variable.el @@ -0,0 +1,4 @@ +;;; -*- lexical-binding: t -*- +(custom-declare-variable + 'foo t + "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx") diff --git a/test/lisp/emacs-lisp/bytecomp-resources/warn-wide-docstring-defalias.el b/test/lisp/emacs-lisp/bytecomp-resources/warn-wide-docstring-defalias.el new file mode 100644 index 00000000000..a4235d22bd3 --- /dev/null +++ b/test/lisp/emacs-lisp/bytecomp-resources/warn-wide-docstring-defalias.el @@ -0,0 +1,3 @@ +;;; -*- lexical-binding: t -*- +(defalias 'foo #'ignore + "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx") diff --git a/test/lisp/emacs-lisp/bytecomp-resources/warn-wide-docstring-defconst.el b/test/lisp/emacs-lisp/bytecomp-resources/warn-wide-docstring-defconst.el new file mode 100644 index 00000000000..946f01989a0 --- /dev/null +++ b/test/lisp/emacs-lisp/bytecomp-resources/warn-wide-docstring-defconst.el @@ -0,0 +1,3 @@ +;;; -*- lexical-binding: t -*- +(defconst foo-bar nil + "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx") diff --git a/test/lisp/emacs-lisp/bytecomp-resources/warn-wide-docstring-define-abbrev-table.el b/test/lisp/emacs-lisp/bytecomp-resources/warn-wide-docstring-define-abbrev-table.el new file mode 100644 index 00000000000..3da9ccd48c6 --- /dev/null +++ b/test/lisp/emacs-lisp/bytecomp-resources/warn-wide-docstring-define-abbrev-table.el @@ -0,0 +1,3 @@ +;;; -*- lexical-binding: t -*- +(define-abbrev-table 'foo () + "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx") diff --git a/test/lisp/emacs-lisp/bytecomp-resources/warn-wide-docstring-define-obsolete-function-alias.el b/test/lisp/emacs-lisp/bytecomp-resources/warn-wide-docstring-define-obsolete-function-alias.el new file mode 100644 index 00000000000..fea841b12ec --- /dev/null +++ b/test/lisp/emacs-lisp/bytecomp-resources/warn-wide-docstring-define-obsolete-function-alias.el @@ -0,0 +1,3 @@ +;;; -*- lexical-binding: t -*- +(define-obsolete-function-alias 'foo #'ignore "99.1" + "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx") diff --git a/test/lisp/emacs-lisp/bytecomp-resources/warn-wide-docstring-define-obsolete-variable-alias.el b/test/lisp/emacs-lisp/bytecomp-resources/warn-wide-docstring-define-obsolete-variable-alias.el new file mode 100644 index 00000000000..2d5f201cb65 --- /dev/null +++ b/test/lisp/emacs-lisp/bytecomp-resources/warn-wide-docstring-define-obsolete-variable-alias.el @@ -0,0 +1,3 @@ +;;; -*- lexical-binding: t -*- +(define-obsolete-variable-alias 'foo 'ignore "99.1" + "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx") diff --git a/test/lisp/emacs-lisp/bytecomp-resources/warn-wide-docstring-defun.el b/test/lisp/emacs-lisp/bytecomp-resources/warn-wide-docstring-defun.el new file mode 100644 index 00000000000..94b0e80c979 --- /dev/null +++ b/test/lisp/emacs-lisp/bytecomp-resources/warn-wide-docstring-defun.el @@ -0,0 +1,3 @@ +;;; -*- lexical-binding: t -*- +(defun foo () + "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx") diff --git a/test/lisp/emacs-lisp/bytecomp-resources/warn-wide-docstring-defvar.el b/test/lisp/emacs-lisp/bytecomp-resources/warn-wide-docstring-defvar.el new file mode 100644 index 00000000000..99aacd09cbd --- /dev/null +++ b/test/lisp/emacs-lisp/bytecomp-resources/warn-wide-docstring-defvar.el @@ -0,0 +1,6 @@ +;;; -*- lexical-binding: t -*- +(defvar foo-bar nil + "multiline +foo +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +bar") diff --git a/test/lisp/emacs-lisp/bytecomp-resources/warn-wide-docstring-defvaralias.el b/test/lisp/emacs-lisp/bytecomp-resources/warn-wide-docstring-defvaralias.el new file mode 100644 index 00000000000..52fdc17f5bf --- /dev/null +++ b/test/lisp/emacs-lisp/bytecomp-resources/warn-wide-docstring-defvaralias.el @@ -0,0 +1,3 @@ +;;; -*- lexical-binding: t -*- +(defvaralias 'foo-bar #'ignore + "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx") diff --git a/test/lisp/emacs-lisp/bytecomp-resources/warn-wide-docstring-ignore-fill-column.el b/test/lisp/emacs-lisp/bytecomp-resources/warn-wide-docstring-ignore-fill-column.el new file mode 100644 index 00000000000..1ff554f3704 --- /dev/null +++ b/test/lisp/emacs-lisp/bytecomp-resources/warn-wide-docstring-ignore-fill-column.el @@ -0,0 +1,7 @@ +;;; -*- lexical-binding: t -*- +(defvar foo-bar nil + "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx") + +;; Local Variables: +;; fill-column: 100 +;; End: diff --git a/test/lisp/emacs-lisp/bytecomp-resources/warn-wide-docstring-ignore-override.el b/test/lisp/emacs-lisp/bytecomp-resources/warn-wide-docstring-ignore-override.el new file mode 100644 index 00000000000..0bcf7b1d63b --- /dev/null +++ b/test/lisp/emacs-lisp/bytecomp-resources/warn-wide-docstring-ignore-override.el @@ -0,0 +1,8 @@ +;;; -*- lexical-binding: t -*- +(defvar foo-bar nil + "123456789012345") + +;; Local Variables: +;; byte-compile-docstring-max-column: 10 +;; fill-column: 20 +;; End: diff --git a/test/lisp/emacs-lisp/bytecomp-resources/warn-wide-docstring-ignore.el b/test/lisp/emacs-lisp/bytecomp-resources/warn-wide-docstring-ignore.el new file mode 100644 index 00000000000..c80ddd180d9 --- /dev/null +++ b/test/lisp/emacs-lisp/bytecomp-resources/warn-wide-docstring-ignore.el @@ -0,0 +1,7 @@ +;;; -*- lexical-binding: t -*- +(defvar foo-bar nil + "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx") + +;; Local Variables: +;; byte-compile-docstring-max-column: 100 +;; End: diff --git a/test/lisp/emacs-lisp/bytecomp-resources/warn-wide-docstring-multiline-first.el b/test/lisp/emacs-lisp/bytecomp-resources/warn-wide-docstring-multiline-first.el new file mode 100644 index 00000000000..2563dbbb3b9 --- /dev/null +++ b/test/lisp/emacs-lisp/bytecomp-resources/warn-wide-docstring-multiline-first.el @@ -0,0 +1,5 @@ +;;; -*- lexical-binding: t -*- +(defvar foo-bar nil + "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +This is a multiline docstring where the first line is long. +foobar") diff --git a/test/lisp/emacs-lisp/bytecomp-resources/warn-wide-docstring-multiline.el b/test/lisp/emacs-lisp/bytecomp-resources/warn-wide-docstring-multiline.el new file mode 100644 index 00000000000..9ae7bc9b9f0 --- /dev/null +++ b/test/lisp/emacs-lisp/bytecomp-resources/warn-wide-docstring-multiline.el @@ -0,0 +1,6 @@ +;;; -*- lexical-binding: t -*- +(defvar foo-bar nil + "This is a multiline docstring. +But it's not the first line that is long. +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +foobar") diff --git a/test/lisp/emacs-lisp/bytecomp-tests.el b/test/lisp/emacs-lisp/bytecomp-tests.el index 4a6e28f7c7c..5e5f99dbdab 100644 --- a/test/lisp/emacs-lisp/bytecomp-tests.el +++ b/test/lisp/emacs-lisp/bytecomp-tests.el @@ -1,6 +1,6 @@ ;;; bytecomp-tests.el -*- lexical-binding:t -*- -;; Copyright (C) 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2008-2021 Free Software Foundation, Inc. ;; Author: Shigeru Fukaya <shigeru.fukaya@gmail.com> ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> @@ -540,6 +540,16 @@ Subtests signal errors if something goes wrong." (bytecomp--with-warning-test "foo.*lacks a prefix" '(defvar foo nil))) +(defvar bytecomp-tests--docstring (make-string 100 ?x)) + +(ert-deftest bytecomp-warn-wide-docstring/defconst () + (bytecomp--with-warning-test "defconst.*foo.*wider than.*characters" + `(defconst foo t ,bytecomp-tests--docstring))) + +(ert-deftest bytecomp-warn-wide-docstring/defvar () + (bytecomp--with-warning-test "defvar.*foo.*wider than.*characters" + `(defvar foo t ,bytecomp-tests--docstring))) + (defmacro bytecomp--define-warning-file-test (file re-warning &optional reverse) `(ert-deftest ,(intern (format "bytecomp/%s" file)) () :expected-result ,(if reverse :failed :passed) @@ -639,6 +649,67 @@ Subtests signal errors if something goes wrong." (bytecomp--define-warning-file-test "warn-variable-set-nonvariable.el" "variable reference to nonvariable") +(bytecomp--define-warning-file-test + "warn-wide-docstring-autoload.el" + "autoload.*foox.*wider than.*characters") + +(bytecomp--define-warning-file-test + "warn-wide-docstring-custom-declare-variable.el" + "custom-declare-variable.*foo.*wider than.*characters") + +(bytecomp--define-warning-file-test + "warn-wide-docstring-defalias.el" + "defalias.*foo.*wider than.*characters") + +(bytecomp--define-warning-file-test + "warn-wide-docstring-defconst.el" + "defconst.*foo.*wider than.*characters") + +(bytecomp--define-warning-file-test + "warn-wide-docstring-define-abbrev-table.el" + "define-abbrev.*foo.*wider than.*characters") + +(bytecomp--define-warning-file-test + "warn-wide-docstring-define-obsolete-function-alias.el" + "defalias.*foo.*wider than.*characters") + +(bytecomp--define-warning-file-test + "warn-wide-docstring-define-obsolete-variable-alias.el" + "defvaralias.*foo.*wider than.*characters") + +;; TODO: We don't yet issue warnings for defuns. +(bytecomp--define-warning-file-test + "warn-wide-docstring-defun.el" + "wider than.*characters" 'reverse) + +(bytecomp--define-warning-file-test + "warn-wide-docstring-defvar.el" + "defvar.*foo.*wider than.*characters") + +(bytecomp--define-warning-file-test + "warn-wide-docstring-defvaralias.el" + "defvaralias.*foo.*wider than.*characters") + +(bytecomp--define-warning-file-test + "warn-wide-docstring-ignore-fill-column.el" + "defvar.*foo.*wider than.*characters" 'reverse) + +(bytecomp--define-warning-file-test + "warn-wide-docstring-ignore-override.el" + "defvar.*foo.*wider than.*characters" 'reverse) + +(bytecomp--define-warning-file-test + "warn-wide-docstring-ignore.el" + "defvar.*foo.*wider than.*characters" 'reverse) + +(bytecomp--define-warning-file-test + "warn-wide-docstring-multiline-first.el" + "defvar.*foo.*wider than.*characters") + +(bytecomp--define-warning-file-test + "warn-wide-docstring-multiline.el" + "defvar.*foo.*wider than.*characters") + ;;;; Macro expansion. diff --git a/test/lisp/emacs-lisp/cconv-tests.el b/test/lisp/emacs-lisp/cconv-tests.el index 0ea9742be49..517373386e3 100644 --- a/test/lisp/emacs-lisp/cconv-tests.el +++ b/test/lisp/emacs-lisp/cconv-tests.el @@ -1,6 +1,6 @@ ;;; cconv-tests.el -*- lexical-binding: t -*- -;; Copyright (C) 2018-2020 Free Software Foundation, Inc. +;; Copyright (C) 2018-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/emacs-lisp/check-declare-tests.el b/test/lisp/emacs-lisp/check-declare-tests.el index bb9542114c4..9552bf0e397 100644 --- a/test/lisp/emacs-lisp/check-declare-tests.el +++ b/test/lisp/emacs-lisp/check-declare-tests.el @@ -1,6 +1,6 @@ ;;; check-declare-tests.el --- Tests for check-declare.el -*- lexical-binding: t; -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; Author: Simen Heggestøyl <simenheg@gmail.com> ;; Keywords: diff --git a/test/lisp/emacs-lisp/checkdoc-tests.el b/test/lisp/emacs-lisp/checkdoc-tests.el index c12d0d37311..cf7baf4ce44 100644 --- a/test/lisp/emacs-lisp/checkdoc-tests.el +++ b/test/lisp/emacs-lisp/checkdoc-tests.el @@ -1,6 +1,6 @@ ;;; checkdoc-tests.el --- unit tests for checkdoc.el -*- lexical-binding: t; -*- -;; Copyright (C) 2016-2020 Free Software Foundation, Inc. +;; Copyright (C) 2016-2021 Free Software Foundation, Inc. ;; Author: Philipp Stephani <phst@google.com> diff --git a/test/lisp/emacs-lisp/cl-extra-tests.el b/test/lisp/emacs-lisp/cl-extra-tests.el index 7546c149377..f3c308725ac 100644 --- a/test/lisp/emacs-lisp/cl-extra-tests.el +++ b/test/lisp/emacs-lisp/cl-extra-tests.el @@ -1,6 +1,6 @@ ;;; cl-extra-tests.el --- tests for emacs-lisp/cl-extra.el -*- lexical-binding:t -*- -;; Copyright (C) 2013-2020 Free Software Foundation, Inc. +;; Copyright (C) 2013-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/emacs-lisp/cl-generic-tests.el b/test/lisp/emacs-lisp/cl-generic-tests.el index 9582907e511..4a01623cb88 100644 --- a/test/lisp/emacs-lisp/cl-generic-tests.el +++ b/test/lisp/emacs-lisp/cl-generic-tests.el @@ -1,6 +1,6 @@ ;;; cl-generic-tests.el --- Tests for cl-generic.el functionality -*- lexical-binding: t; -*- -;; Copyright (C) 2015-2020 Free Software Foundation, Inc. +;; Copyright (C) 2015-2021 Free Software Foundation, Inc. ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> diff --git a/test/lisp/emacs-lisp/cl-lib-tests.el b/test/lisp/emacs-lisp/cl-lib-tests.el index 40dd7e4eeb0..97a44c43ef7 100644 --- a/test/lisp/emacs-lisp/cl-lib-tests.el +++ b/test/lisp/emacs-lisp/cl-lib-tests.el @@ -1,6 +1,6 @@ ;;; cl-lib-tests.el --- tests for emacs-lisp/cl-lib.el -*- lexical-binding:t -*- -;; Copyright (C) 2013-2020 Free Software Foundation, Inc. +;; Copyright (C) 2013-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/emacs-lisp/cl-macs-tests.el b/test/lisp/emacs-lisp/cl-macs-tests.el index 29ae95e2771..446983c2e3e 100644 --- a/test/lisp/emacs-lisp/cl-macs-tests.el +++ b/test/lisp/emacs-lisp/cl-macs-tests.el @@ -1,6 +1,6 @@ ;;; cl-macs-tests.el --- tests for emacs-lisp/cl-macs.el -*- lexical-binding:t -*- -;; Copyright (C) 2017-2020 Free Software Foundation, Inc. +;; Copyright (C) 2017-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/emacs-lisp/cl-preloaded-tests.el b/test/lisp/emacs-lisp/cl-preloaded-tests.el index c64391698ee..97cb204f775 100644 --- a/test/lisp/emacs-lisp/cl-preloaded-tests.el +++ b/test/lisp/emacs-lisp/cl-preloaded-tests.el @@ -1,6 +1,6 @@ ;;; cl-preloaded-tests.el --- unit tests for cl-preloaded.el -*- lexical-binding: t; -*- -;; Copyright (C) 2017-2020 Free Software Foundation, Inc. +;; Copyright (C) 2017-2021 Free Software Foundation, Inc. ;; Author: Philipp Stephani <phst@google.com> ;; This file is part of GNU Emacs. diff --git a/test/lisp/emacs-lisp/cl-print-tests.el b/test/lisp/emacs-lisp/cl-print-tests.el index ca5db8d9474..199795106a3 100644 --- a/test/lisp/emacs-lisp/cl-print-tests.el +++ b/test/lisp/emacs-lisp/cl-print-tests.el @@ -1,6 +1,6 @@ ;;; cl-print-tests.el --- Test suite for the cl-print facility. -*- lexical-binding:t -*- -;; Copyright (C) 2017-2020 Free Software Foundation, Inc. +;; Copyright (C) 2017-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/emacs-lisp/cl-seq-tests.el b/test/lisp/emacs-lisp/cl-seq-tests.el index 7e0f5384542..d0fad8907d5 100644 --- a/test/lisp/emacs-lisp/cl-seq-tests.el +++ b/test/lisp/emacs-lisp/cl-seq-tests.el @@ -1,6 +1,6 @@ ;;; cl-seq-tests.el --- Tests for cl-seq.el functionality -*- lexical-binding: t; -*- -;; Copyright (C) 2015-2020 Free Software Foundation, Inc. +;; Copyright (C) 2015-2021 Free Software Foundation, Inc. ;; Author: Nicolas Richard <youngfrog@members.fsf.org> diff --git a/test/lisp/emacs-lisp/copyright-tests.el b/test/lisp/emacs-lisp/copyright-tests.el index 77b9e05da67..7deb8b53a2e 100644 --- a/test/lisp/emacs-lisp/copyright-tests.el +++ b/test/lisp/emacs-lisp/copyright-tests.el @@ -1,6 +1,6 @@ ;;; copyright-tests.el --- tests for copyright.el -*- lexical-binding: t -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/emacs-lisp/derived-tests.el b/test/lisp/emacs-lisp/derived-tests.el index d79c41ea44f..9c8e6c33b4c 100644 --- a/test/lisp/emacs-lisp/derived-tests.el +++ b/test/lisp/emacs-lisp/derived-tests.el @@ -1,6 +1,6 @@ ;;; derived-tests.el --- tests for derived.el -*- lexical-binding: t; -*- -;; Copyright (C) 2017-2020 Free Software Foundation, Inc. +;; Copyright (C) 2017-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/emacs-lisp/easy-mmode-tests.el b/test/lisp/emacs-lisp/easy-mmode-tests.el index bbd01970b5b..77eaed62579 100644 --- a/test/lisp/emacs-lisp/easy-mmode-tests.el +++ b/test/lisp/emacs-lisp/easy-mmode-tests.el @@ -1,6 +1,6 @@ ;;; easy-mmode-tests.el --- tests for easy-mmode.el -*- lexical-binding: t -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/emacs-lisp/edebug-resources/edebug-test-code.el b/test/lisp/emacs-lisp/edebug-resources/edebug-test-code.el index 7be057db8b2..a3010f9e354 100644 --- a/test/lisp/emacs-lisp/edebug-resources/edebug-test-code.el +++ b/test/lisp/emacs-lisp/edebug-resources/edebug-test-code.el @@ -1,6 +1,6 @@ ;;; edebug-test-code.el --- Sample code for the Edebug test suite -*- lexical-binding:t -*- -;; Copyright (C) 2017-2020 Free Software Foundation, Inc. +;; Copyright (C) 2017-2021 Free Software Foundation, Inc. ;; Author: Gemini Lasswell diff --git a/test/lisp/emacs-lisp/edebug-tests.el b/test/lisp/emacs-lisp/edebug-tests.el index 2c340c44408..d60a6cb3d50 100644 --- a/test/lisp/emacs-lisp/edebug-tests.el +++ b/test/lisp/emacs-lisp/edebug-tests.el @@ -1,6 +1,6 @@ ;;; edebug-tests.el --- Edebug test suite -*- lexical-binding:t -*- -;; Copyright (C) 2017-2020 Free Software Foundation, Inc. +;; Copyright (C) 2017-2021 Free Software Foundation, Inc. ;; Author: Gemini Lasswell diff --git a/test/lisp/emacs-lisp/eieio-tests/eieio-test-methodinvoke.el b/test/lisp/emacs-lisp/eieio-tests/eieio-test-methodinvoke.el index 73c3ea82e2d..285616a7806 100644 --- a/test/lisp/emacs-lisp/eieio-tests/eieio-test-methodinvoke.el +++ b/test/lisp/emacs-lisp/eieio-tests/eieio-test-methodinvoke.el @@ -1,6 +1,6 @@ ;;; eieio-testsinvoke.el -- eieio tests for method invocation -*- lexical-binding:t -*- -;; Copyright (C) 2005, 2008, 2010, 2013-2020 Free Software Foundation, +;; Copyright (C) 2005, 2008, 2010, 2013-2021 Free Software Foundation, ;; Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/test/lisp/emacs-lisp/eieio-tests/eieio-test-persist.el b/test/lisp/emacs-lisp/eieio-tests/eieio-test-persist.el index 6979da8482b..ddbef02c35a 100644 --- a/test/lisp/emacs-lisp/eieio-tests/eieio-test-persist.el +++ b/test/lisp/emacs-lisp/eieio-tests/eieio-test-persist.el @@ -1,6 +1,6 @@ ;;; eieio-test-persist.el --- Tests for eieio-persistent class -*- lexical-binding:t -*- -;; Copyright (C) 2011-2020 Free Software Foundation, Inc. +;; Copyright (C) 2011-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/test/lisp/emacs-lisp/eieio-tests/eieio-tests.el b/test/lisp/emacs-lisp/eieio-tests/eieio-tests.el index 21adc91e555..a47fb8053b9 100644 --- a/test/lisp/emacs-lisp/eieio-tests/eieio-tests.el +++ b/test/lisp/emacs-lisp/eieio-tests/eieio-tests.el @@ -1,6 +1,6 @@ ;;; eieio-tests.el -- eieio test routines -*- lexical-binding: t -*- -;; Copyright (C) 1999-2003, 2005-2010, 2012-2020 Free Software +;; Copyright (C) 1999-2003, 2005-2010, 2012-2021 Free Software ;; Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/test/lisp/emacs-lisp/ert-tests.el b/test/lisp/emacs-lisp/ert-tests.el index a0c56be0cb0..40cb432708e 100644 --- a/test/lisp/emacs-lisp/ert-tests.el +++ b/test/lisp/emacs-lisp/ert-tests.el @@ -1,6 +1,6 @@ ;;; ert-tests.el --- ERT's self-tests -*- lexical-binding: t -*- -;; Copyright (C) 2007-2008, 2010-2020 Free Software Foundation, Inc. +;; Copyright (C) 2007-2008, 2010-2021 Free Software Foundation, Inc. ;; Author: Christian Ohler <ohler@gnu.org> diff --git a/test/lisp/emacs-lisp/ert-x-tests.el b/test/lisp/emacs-lisp/ert-x-tests.el index f342bff0472..f46fa63e4ce 100644 --- a/test/lisp/emacs-lisp/ert-x-tests.el +++ b/test/lisp/emacs-lisp/ert-x-tests.el @@ -1,6 +1,6 @@ ;;; ert-x-tests.el --- Tests for ert-x.el -*- lexical-binding:t -*- -;; Copyright (C) 2008, 2010-2020 Free Software Foundation, Inc. +;; Copyright (C) 2008, 2010-2021 Free Software Foundation, Inc. ;; Author: Phil Hagelberg ;; Christian Ohler <ohler@gnu.org> diff --git a/test/lisp/emacs-lisp/faceup-resources/faceup-test-mode.el b/test/lisp/emacs-lisp/faceup-resources/faceup-test-mode.el index 6e9d50fc38f..9040cc07270 100644 --- a/test/lisp/emacs-lisp/faceup-resources/faceup-test-mode.el +++ b/test/lisp/emacs-lisp/faceup-resources/faceup-test-mode.el @@ -1,6 +1,6 @@ ;;; faceup-test-mode.el --- Dummy major mode for testing `faceup'. -*- lexical-binding:t -*- -;; Copyright (C) 2014-2020 Free Software Foundation, Inc. +;; Copyright (C) 2014-2021 Free Software Foundation, Inc. ;; Author: Anders Lindgren ;; Keywords: languages, faces diff --git a/test/lisp/emacs-lisp/faceup-resources/faceup-test-this-file-directory.el b/test/lisp/emacs-lisp/faceup-resources/faceup-test-this-file-directory.el index d8ab02b650e..3303e7b178d 100644 --- a/test/lisp/emacs-lisp/faceup-resources/faceup-test-this-file-directory.el +++ b/test/lisp/emacs-lisp/faceup-resources/faceup-test-this-file-directory.el @@ -1,6 +1,6 @@ ;;; faceup-test-this-file-directory.el --- Support file for faceup tests -*- lexical-binding:t -*- -;; Copyright (C) 2014-2020 Free Software Foundation, Inc. +;; Copyright (C) 2014-2021 Free Software Foundation, Inc. ;; Author: Anders Lindgren ;; Keywords: languages, faces diff --git a/test/lisp/emacs-lisp/faceup-tests/faceup-test-basics.el b/test/lisp/emacs-lisp/faceup-tests/faceup-test-basics.el index 3c9ec76cdf7..0c7e001cc75 100644 --- a/test/lisp/emacs-lisp/faceup-tests/faceup-test-basics.el +++ b/test/lisp/emacs-lisp/faceup-tests/faceup-test-basics.el @@ -1,6 +1,6 @@ ;;; faceup-test-basics.el --- Tests for the `faceup' package. -*- lexical-binding:t -*- -;; Copyright (C) 2014-2020 Free Software Foundation, Inc. +;; Copyright (C) 2014-2021 Free Software Foundation, Inc. ;; Author: Anders Lindgren ;; Keywords: languages, faces diff --git a/test/lisp/emacs-lisp/faceup-tests/faceup-test-files.el b/test/lisp/emacs-lisp/faceup-tests/faceup-test-files.el index a87c16d66c0..16e172692c0 100644 --- a/test/lisp/emacs-lisp/faceup-tests/faceup-test-files.el +++ b/test/lisp/emacs-lisp/faceup-tests/faceup-test-files.el @@ -1,6 +1,6 @@ ;;; faceup-test-files.el --- Self test of `faceup' using dummy major mode. -*- lexical-binding:t -*- -;; Copyright (C) 2014-2020 Free Software Foundation, Inc. +;; Copyright (C) 2014-2021 Free Software Foundation, Inc. ;; Author: Anders Lindgren ;; Keywords: languages, faces diff --git a/test/lisp/emacs-lisp/find-func-tests.el b/test/lisp/emacs-lisp/find-func-tests.el index 03df4bb9ff4..28a9a7ecda3 100644 --- a/test/lisp/emacs-lisp/find-func-tests.el +++ b/test/lisp/emacs-lisp/find-func-tests.el @@ -1,6 +1,6 @@ ;;; find-func-tests.el --- Unit tests for find-func.el -*- lexical-binding: t; -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> ;; Keywords: @@ -27,6 +27,7 @@ ;;; Code: (require 'ert-x) ;For `ert-run-keys'. +(require 'find-func) (ert-deftest find-func-tests--library-completion () ;bug#43393 ;; FIXME: How can we make this work in batch (see also @@ -43,6 +44,68 @@ (concat data-directory (kbd "n x / TAB RET")) (read-library-name))))) +(ert-deftest find-func-tests--locate-symbols () + (should (cdr + (find-function-search-for-symbol + #'goto-line nil "simple"))) + (should (cdr + (find-function-search-for-symbol + 'minibuffer-history 'defvar "simple"))) + (should (cdr + (find-function-search-for-symbol + 'with-current-buffer nil "subr"))) + (should (cdr + (find-function-search-for-symbol + 'font-lock-warning-face 'defface "font-lock"))) + (should-not (cdr + (find-function-search-for-symbol + 'wrong-variable 'defvar "simple"))) + (should-not (cdr + (find-function-search-for-symbol + 'wrong-function nil "simple"))) + (should (cdr (find-function-noselect #'goto-line))) + (should (cdr (find-function-noselect #'goto-char))) + ;; Setting LISP-ONLY and passing a primitive should error. + (should-error (find-function-noselect #'goto-char t)) + (should-error (find-function-noselect 'wrong-function))) + +(defun test-locate-helper (func &optional expected-result) + "Assert on the result of `find-function-library' for FUNC. +EXPECTED-RESULT is an alist (FUNC . LIBRARY) with the +expected function symbol and function library, respectively." + (cl-destructuring-bind (orig-function . library) + (find-function-library func) + (cl-destructuring-bind (expected-func . expected-library) + expected-result + (should (eq orig-function expected-func)) + (should (and + (not (string-empty-p expected-library)) + (string-match-p expected-library library)))))) + +(ert-deftest find-func-tests--locate-library () + (test-locate-helper #'goto-line '(goto-line . "simple")) + (test-locate-helper #'forward-char '(forward-char . "cmds.c")) + (should-error (test-locate-helper 'wrong-function))) + +(ert-deftest find-func-tests--locate-adviced-symbols () + (defun my-message () + (message "Hello!")) + (advice-add #'mark-sexp :around 'my-message) + (test-locate-helper #'mark-sexp '(mark-sexp . "lisp")) + (advice-remove #'mark-sexp 'my-message)) + +(ert-deftest find-func-tests--find-library-verbose () + (find-function-library #'join-line nil t) + (with-current-buffer "*Messages*" + (save-excursion + (goto-char (point-max)) + (skip-chars-backward "\n") + (should (string-match-p + ".join-line. is an alias for .delete-indentation." + (buffer-substring + (line-beginning-position) + (point))))))) + ;; Avoid a byte-compilation warning that may confuse people reading ;; the result of the following test. (declare-function compilation--message->loc nil "compile") diff --git a/test/lisp/emacs-lisp/float-sup-tests.el b/test/lisp/emacs-lisp/float-sup-tests.el index 9f9a3daa28b..9e87928c232 100644 --- a/test/lisp/emacs-lisp/float-sup-tests.el +++ b/test/lisp/emacs-lisp/float-sup-tests.el @@ -1,6 +1,6 @@ ;;; float-sup-tests.el --- Tests for float-sup.el -*- lexical-binding:t -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/emacs-lisp/generator-tests.el b/test/lisp/emacs-lisp/generator-tests.el index 72eee07be8c..ffcd16ad094 100644 --- a/test/lisp/emacs-lisp/generator-tests.el +++ b/test/lisp/emacs-lisp/generator-tests.el @@ -1,6 +1,6 @@ ;;; generator-tests.el --- Testing generators -*- lexical-binding: t -*- -;; Copyright (C) 2015-2020 Free Software Foundation, Inc. +;; Copyright (C) 2015-2021 Free Software Foundation, Inc. ;; Author: Daniel Colascione <dancol@dancol.org> ;; Keywords: diff --git a/test/lisp/emacs-lisp/gv-tests.el b/test/lisp/emacs-lisp/gv-tests.el index 8fc6b514692..b9850eca8b9 100644 --- a/test/lisp/emacs-lisp/gv-tests.el +++ b/test/lisp/emacs-lisp/gv-tests.el @@ -1,6 +1,6 @@ ;;; gv-tests.el --- tests for gv.el -*- lexical-binding: t; -*- -;; Copyright (C) 2017-2020 Free Software Foundation, Inc. +;; Copyright (C) 2017-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/emacs-lisp/let-alist-tests.el b/test/lisp/emacs-lisp/let-alist-tests.el index d283ecbe926..d856696da24 100644 --- a/test/lisp/emacs-lisp/let-alist-tests.el +++ b/test/lisp/emacs-lisp/let-alist-tests.el @@ -1,6 +1,6 @@ ;;; let-alist.el --- tests for file handling. -*- lexical-binding: t; -*- -;; Copyright (C) 2012-2020 Free Software Foundation, Inc. +;; Copyright (C) 2012-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/emacs-lisp/lisp-mode-tests.el b/test/lisp/emacs-lisp/lisp-mode-tests.el index d1183d83f6a..85db3a00c8e 100644 --- a/test/lisp/emacs-lisp/lisp-mode-tests.el +++ b/test/lisp/emacs-lisp/lisp-mode-tests.el @@ -1,6 +1,6 @@ ;;; lisp-mode-tests.el --- Test Lisp editing commands -*- lexical-binding: t; -*- -;; Copyright (C) 2017-2020 Free Software Foundation, Inc. +;; Copyright (C) 2017-2021 Free Software Foundation, Inc. ;; GNU Emacs 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/test/lisp/emacs-lisp/lisp-tests.el b/test/lisp/emacs-lisp/lisp-tests.el index 437b907ba13..fd07011137a 100644 --- a/test/lisp/emacs-lisp/lisp-tests.el +++ b/test/lisp/emacs-lisp/lisp-tests.el @@ -1,6 +1,6 @@ ;;; lisp-tests.el --- Test Lisp editing commands -*- lexical-binding: t; -*- -;; Copyright (C) 2013-2020 Free Software Foundation, Inc. +;; Copyright (C) 2013-2021 Free Software Foundation, Inc. ;; Author: Aaron S. Hawley <aaron.s.hawley@gmail.com> ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> diff --git a/test/lisp/emacs-lisp/map-tests.el b/test/lisp/emacs-lisp/map-tests.el index 1888baf6017..9a2cd42a211 100644 --- a/test/lisp/emacs-lisp/map-tests.el +++ b/test/lisp/emacs-lisp/map-tests.el @@ -1,6 +1,6 @@ ;;; map-tests.el --- Tests for map.el -*- lexical-binding:t -*- -;; Copyright (C) 2015-2020 Free Software Foundation, Inc. +;; Copyright (C) 2015-2021 Free Software Foundation, Inc. ;; Author: Nicolas Petton <nicolas@petton.fr> ;; Maintainer: emacs-devel@gnu.org diff --git a/test/lisp/emacs-lisp/memory-report-tests.el b/test/lisp/emacs-lisp/memory-report-tests.el index b67ec6c0103..da5f4f5700f 100644 --- a/test/lisp/emacs-lisp/memory-report-tests.el +++ b/test/lisp/emacs-lisp/memory-report-tests.el @@ -1,6 +1,6 @@ ;;; memory-report-tests.el --- tests for memory-report.el -*- lexical-binding: t -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/emacs-lisp/nadvice-tests.el b/test/lisp/emacs-lisp/nadvice-tests.el index a955df0a696..358d9025ad5 100644 --- a/test/lisp/emacs-lisp/nadvice-tests.el +++ b/test/lisp/emacs-lisp/nadvice-tests.el @@ -1,6 +1,6 @@ ;;; nadvice-tests.el --- Test suite for the new advice thingy. -*- lexical-binding:t -*- -;; Copyright (C) 2012-2020 Free Software Foundation, Inc. +;; Copyright (C) 2012-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/emacs-lisp/package-resources/signed/update-signatures.sh b/test/lisp/emacs-lisp/package-resources/signed/update-signatures.sh index a48c9bb1aa2..ca16f8b27a1 100755 --- a/test/lisp/emacs-lisp/package-resources/signed/update-signatures.sh +++ b/test/lisp/emacs-lisp/package-resources/signed/update-signatures.sh @@ -2,7 +2,7 @@ # Generate a new key and update the signatures for tests. -# Copyright (C) 2020 Free Software Foundation, Inc. +# Copyright (C) 2020-2021 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/test/lisp/emacs-lisp/package-tests.el b/test/lisp/emacs-lisp/package-tests.el index 23267545f83..67d647d3b9e 100644 --- a/test/lisp/emacs-lisp/package-tests.el +++ b/test/lisp/emacs-lisp/package-tests.el @@ -1,6 +1,6 @@ ;;; package-tests.el --- Tests for the Emacs package system -*- lexical-binding:t -*- -;; Copyright (C) 2013-2020 Free Software Foundation, Inc. +;; Copyright (C) 2013-2021 Free Software Foundation, Inc. ;; Author: Daniel Hackney <dan@haxney.org> ;; Version: 1.0 @@ -405,9 +405,9 @@ Must called from within a `tar-mode' buffer." (ert-deftest package-test-list-filter-by-name () "Ensure package list is filtered correctly by package name." (with-package-menu-test () - (package-menu-filter-by-name "tetris") + (package-menu-filter-by-name "ansi-color") (goto-char (point-min)) - (should (re-search-forward "^\\s-+tetris" nil t)) + (should (re-search-forward "^\\s-+ansi-color" nil t)) (should (= (count-lines (point-min) (point-max)) 1)))) (ert-deftest package-test-list-filter-by-status () @@ -463,7 +463,7 @@ Must called from within a `tar-mode' buffer." "Ensure package list filter is cleared correctly." (with-package-menu-test (let ((num-packages (count-lines (point-min) (point-max)))) - (package-menu-filter-by-name "tetris") + (package-menu-filter-by-name "ansi-color") (should (= (count-lines (point-min) (point-max)) 1)) (package-menu-clear-filter) (should (= (count-lines (point-min) (point-max)) num-packages))))) diff --git a/test/lisp/emacs-lisp/pcase-tests.el b/test/lisp/emacs-lisp/pcase-tests.el index ac512416b71..1b06c6e7543 100644 --- a/test/lisp/emacs-lisp/pcase-tests.el +++ b/test/lisp/emacs-lisp/pcase-tests.el @@ -1,6 +1,6 @@ ;;; pcase-tests.el --- Test suite for pcase macro. -*- lexical-binding:t -*- -;; Copyright (C) 2012-2020 Free Software Foundation, Inc. +;; Copyright (C) 2012-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/emacs-lisp/pp-tests.el b/test/lisp/emacs-lisp/pp-tests.el index 8e8de08a408..b04030cc432 100644 --- a/test/lisp/emacs-lisp/pp-tests.el +++ b/test/lisp/emacs-lisp/pp-tests.el @@ -1,6 +1,6 @@ ;;; pp-tests.el --- Test suite for pretty printer. -*- lexical-binding: t -*- -;; Copyright (C) 2017-2020 Free Software Foundation, Inc. +;; Copyright (C) 2017-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/emacs-lisp/regexp-opt-tests.el b/test/lisp/emacs-lisp/regexp-opt-tests.el index ff93b8b759e..940feb5e828 100644 --- a/test/lisp/emacs-lisp/regexp-opt-tests.el +++ b/test/lisp/emacs-lisp/regexp-opt-tests.el @@ -1,6 +1,6 @@ ;;; regexp-opt-tests.el --- Tests for regexp-opt.el -*- lexical-binding: t -*- -;; Copyright (C) 2013-2020 Free Software Foundation, Inc. +;; Copyright (C) 2013-2021 Free Software Foundation, Inc. ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> ;; Keywords: internal diff --git a/test/lisp/emacs-lisp/ring-tests.el b/test/lisp/emacs-lisp/ring-tests.el index e348165366e..55df4f36685 100644 --- a/test/lisp/emacs-lisp/ring-tests.el +++ b/test/lisp/emacs-lisp/ring-tests.el @@ -1,6 +1,6 @@ ;;; ring-tests.el --- Tests for ring.el -*- lexical-binding: t; -*- -;; Copyright (C) 2016-2020 Free Software Foundation, Inc. +;; Copyright (C) 2016-2021 Free Software Foundation, Inc. ;; Author: Simen Heggestøyl <simenheg@gmail.com> ;; Keywords: diff --git a/test/lisp/emacs-lisp/rmc-tests.el b/test/lisp/emacs-lisp/rmc-tests.el index 5add24c479a..9d8f3d48014 100644 --- a/test/lisp/emacs-lisp/rmc-tests.el +++ b/test/lisp/emacs-lisp/rmc-tests.el @@ -1,6 +1,6 @@ ;;; rmc-tests.el --- Test suite for rmc.el -*- lexical-binding: t -*- -;; Copyright (C) 2017-2020 Free Software Foundation, Inc. +;; Copyright (C) 2017-2021 Free Software Foundation, Inc. ;; Author: Tino Calancha <tino.calancha@gmail.com> ;; Keywords: diff --git a/test/lisp/emacs-lisp/rx-tests.el b/test/lisp/emacs-lisp/rx-tests.el index d2e11cf06aa..63d7c7b91ea 100644 --- a/test/lisp/emacs-lisp/rx-tests.el +++ b/test/lisp/emacs-lisp/rx-tests.el @@ -1,6 +1,6 @@ ;;; rx-tests.el --- tests for rx.el -*- lexical-binding: t -*- -;; Copyright (C) 2016-2020 Free Software Foundation, Inc. +;; Copyright (C) 2016-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/emacs-lisp/seq-tests.el b/test/lisp/emacs-lisp/seq-tests.el index a6a80952360..670398354a6 100644 --- a/test/lisp/emacs-lisp/seq-tests.el +++ b/test/lisp/emacs-lisp/seq-tests.el @@ -1,6 +1,6 @@ ;;; seq-tests.el --- Tests for seq.el -*- lexical-binding:t -*- -;; Copyright (C) 2014-2020 Free Software Foundation, Inc. +;; Copyright (C) 2014-2021 Free Software Foundation, Inc. ;; Author: Nicolas Petton <nicolas@petton.fr> ;; Maintainer: emacs-devel@gnu.org diff --git a/test/lisp/emacs-lisp/shadow-tests.el b/test/lisp/emacs-lisp/shadow-tests.el index 5d6215ab6f3..52d1d21cee1 100644 --- a/test/lisp/emacs-lisp/shadow-tests.el +++ b/test/lisp/emacs-lisp/shadow-tests.el @@ -1,6 +1,6 @@ ;;; shadow-tests.el --- Test suite for shadow. -*- lexical-binding: t -*- -;; Copyright (C) 2018-2020 Free Software Foundation, Inc. +;; Copyright (C) 2018-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/emacs-lisp/subr-x-tests.el b/test/lisp/emacs-lisp/subr-x-tests.el index b17185ab0d3..112f3c1dac1 100644 --- a/test/lisp/emacs-lisp/subr-x-tests.el +++ b/test/lisp/emacs-lisp/subr-x-tests.el @@ -1,6 +1,6 @@ ;;; subr-x-tests.el --- Testing the extended lisp routines -*- lexical-binding:t -*- -;; Copyright (C) 2014-2020 Free Software Foundation, Inc. +;; Copyright (C) 2014-2021 Free Software Foundation, Inc. ;; Author: Fabián E. Gallina <fgallina@gnu.org> ;; Keywords: diff --git a/test/lisp/emacs-lisp/syntax-tests.el b/test/lisp/emacs-lisp/syntax-tests.el index 9d4c4113fdd..1ae1cbc93ff 100644 --- a/test/lisp/emacs-lisp/syntax-tests.el +++ b/test/lisp/emacs-lisp/syntax-tests.el @@ -1,6 +1,6 @@ ;;; syntax-tests.el --- tests for syntax.el -*- lexical-binding: t; -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/emacs-lisp/tabulated-list-test.el b/test/lisp/emacs-lisp/tabulated-list-test.el index 7486e2b9333..db1ce312586 100644 --- a/test/lisp/emacs-lisp/tabulated-list-test.el +++ b/test/lisp/emacs-lisp/tabulated-list-test.el @@ -1,6 +1,6 @@ ;;; tabulated-list-test.el --- Tests for emacs-lisp/tabulated-list.el -*- lexical-binding: t; -*- -;; Copyright (C) 2015-2020 Free Software Foundation, Inc. +;; Copyright (C) 2015-2021 Free Software Foundation, Inc. ;; Author: Artur Malabarba <bruce.connor.am@gmail.com> diff --git a/test/lisp/emacs-lisp/testcover-resources/testcases.el b/test/lisp/emacs-lisp/testcover-resources/testcases.el index 77edf2fec22..5dbf2272b1a 100644 --- a/test/lisp/emacs-lisp/testcover-resources/testcases.el +++ b/test/lisp/emacs-lisp/testcover-resources/testcases.el @@ -1,6 +1,6 @@ ;;;; testcases.el -- Test cases for testcover-tests.el -;; Copyright (C) 2017-2020 Free Software Foundation, Inc. +;; Copyright (C) 2017-2021 Free Software Foundation, Inc. ;; Author: Gemini Lasswell diff --git a/test/lisp/emacs-lisp/testcover-tests.el b/test/lisp/emacs-lisp/testcover-tests.el index 9e7a3bf31e3..9f0312d85ff 100644 --- a/test/lisp/emacs-lisp/testcover-tests.el +++ b/test/lisp/emacs-lisp/testcover-tests.el @@ -1,6 +1,6 @@ ;;; testcover-tests.el --- Testcover test suite -*- lexical-binding:t -*- -;; Copyright (C) 2017-2020 Free Software Foundation, Inc. +;; Copyright (C) 2017-2021 Free Software Foundation, Inc. ;; Author: Gemini Lasswell diff --git a/test/lisp/emacs-lisp/text-property-search-tests.el b/test/lisp/emacs-lisp/text-property-search-tests.el index f643e49aa5e..90f06c3c4c0 100644 --- a/test/lisp/emacs-lisp/text-property-search-tests.el +++ b/test/lisp/emacs-lisp/text-property-search-tests.el @@ -1,6 +1,6 @@ ;;; text-property-search-tests.el --- Testing text-property-search -*- lexical-binding:t -*- -;; Copyright (C) 2018-2020 Free Software Foundation, Inc. +;; Copyright (C) 2018-2021 Free Software Foundation, Inc. ;; Author: Lars Ingebrigtsen <larsi@gnus.org> ;; Keywords: diff --git a/test/lisp/emacs-lisp/thunk-tests.el b/test/lisp/emacs-lisp/thunk-tests.el index 67ec415d6dd..1a8537f3b79 100644 --- a/test/lisp/emacs-lisp/thunk-tests.el +++ b/test/lisp/emacs-lisp/thunk-tests.el @@ -1,6 +1,6 @@ ;;; thunk-tests.el --- Tests for thunk.el -*- lexical-binding: t -*- -;; Copyright (C) 2015-2020 Free Software Foundation, Inc. +;; Copyright (C) 2015-2021 Free Software Foundation, Inc. ;; Author: Nicolas Petton <nicolas@petton.fr> ;; Maintainer: emacs-devel@gnu.org diff --git a/test/lisp/emacs-lisp/timer-tests.el b/test/lisp/emacs-lisp/timer-tests.el index bc712ee960f..74da33eff69 100644 --- a/test/lisp/emacs-lisp/timer-tests.el +++ b/test/lisp/emacs-lisp/timer-tests.el @@ -1,6 +1,6 @@ ;;; timer-tests.el --- tests for timers -*- lexical-binding:t -*- -;; Copyright (C) 2013-2020 Free Software Foundation, Inc. +;; Copyright (C) 2013-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/emacs-lisp/unsafep-tests.el b/test/lisp/emacs-lisp/unsafep-tests.el index 06c40d28ca9..b2a48d80675 100644 --- a/test/lisp/emacs-lisp/unsafep-tests.el +++ b/test/lisp/emacs-lisp/unsafep-tests.el @@ -2,7 +2,7 @@ ;; Author: Jonathan Yavner <jyavner@member.fsf.org> -;; Copyright (C) 2002-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/emacs-lisp/warnings-tests.el b/test/lisp/emacs-lisp/warnings-tests.el index 02c09b41ca5..aa394634827 100644 --- a/test/lisp/emacs-lisp/warnings-tests.el +++ b/test/lisp/emacs-lisp/warnings-tests.el @@ -2,7 +2,7 @@ ;; Author: Stefan Kangas <stefankangas@gmail.com> -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/emulation/viper-tests.el b/test/lisp/emulation/viper-tests.el index b981938fe19..0d999763b61 100644 --- a/test/lisp/emulation/viper-tests.el +++ b/test/lisp/emulation/viper-tests.el @@ -1,6 +1,6 @@ ;;; viper-tests.el --- tests for viper. -*- lexical-binding:t -*- -;; Copyright (C) 2016-2020 Free Software Foundation, Inc. +;; Copyright (C) 2016-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/epg-tests.el b/test/lisp/epg-tests.el index 87d19e8b294..741574f0adf 100644 --- a/test/lisp/epg-tests.el +++ b/test/lisp/epg-tests.el @@ -1,6 +1,6 @@ ;;; epg-tests.el --- Test suite for epg.el -*- lexical-binding: t -*- -;; Copyright (C) 2013-2020 Free Software Foundation, Inc. +;; Copyright (C) 2013-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/erc/erc-tests.el b/test/lisp/erc/erc-tests.el index 27f48fa8131..26e14b98e91 100644 --- a/test/lisp/erc/erc-tests.el +++ b/test/lisp/erc/erc-tests.el @@ -1,6 +1,6 @@ ;;; erc-tests.el --- Tests for erc. -*- lexical-binding:t -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; Author: Lars Ingebrigtsen <larsi@gnus.org> diff --git a/test/lisp/erc/erc-track-tests.el b/test/lisp/erc/erc-track-tests.el index 41240947bcf..0ce93bd45c6 100644 --- a/test/lisp/erc/erc-track-tests.el +++ b/test/lisp/erc/erc-track-tests.el @@ -1,6 +1,6 @@ ;;; erc-track-tests.el --- Tests for erc-track. -*- lexical-binding:t -*- -;; Copyright (C) 2016-2020 Free Software Foundation, Inc. +;; Copyright (C) 2016-2021 Free Software Foundation, Inc. ;; Author: Mario Lang <mlang@delysid.org> ;; Author: Vivek Dasmohapatra <vivek@etla.org> diff --git a/test/lisp/eshell/em-hist-tests.el b/test/lisp/eshell/em-hist-tests.el index 5bb16f64a46..ec65397fd63 100644 --- a/test/lisp/eshell/em-hist-tests.el +++ b/test/lisp/eshell/em-hist-tests.el @@ -1,6 +1,6 @@ ;;; tests/em-hist-tests.el --- em-hist test suite -*- lexical-binding:t -*- -;; Copyright (C) 2017-2020 Free Software Foundation, Inc. +;; Copyright (C) 2017-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/eshell/em-ls-tests.el b/test/lisp/eshell/em-ls-tests.el index 975701e3838..fc2cd9c8e14 100644 --- a/test/lisp/eshell/em-ls-tests.el +++ b/test/lisp/eshell/em-ls-tests.el @@ -1,6 +1,6 @@ ;;; tests/em-ls-tests.el --- em-ls test suite -*- lexical-binding:t -*- -;; Copyright (C) 2017-2020 Free Software Foundation, Inc. +;; Copyright (C) 2017-2021 Free Software Foundation, Inc. ;; Author: Tino Calancha <tino.calancha@gmail.com> diff --git a/test/lisp/eshell/esh-opt-tests.el b/test/lisp/eshell/esh-opt-tests.el index caba153cf73..0c99da64b2e 100644 --- a/test/lisp/eshell/esh-opt-tests.el +++ b/test/lisp/eshell/esh-opt-tests.el @@ -1,6 +1,6 @@ ;;; tests/esh-opt-tests.el --- esh-opt test suite -*- lexical-binding:t -*- -;; Copyright (C) 2018-2020 Free Software Foundation, Inc. +;; Copyright (C) 2018-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/eshell/eshell-tests.el b/test/lisp/eshell/eshell-tests.el index 1b93fb0fbbc..4dac7024f41 100644 --- a/test/lisp/eshell/eshell-tests.el +++ b/test/lisp/eshell/eshell-tests.el @@ -1,6 +1,6 @@ ;;; tests/eshell-tests.el --- Eshell test suite -*- lexical-binding:t -*- -;; Copyright (C) 1999-2020 Free Software Foundation, Inc. +;; Copyright (C) 1999-2021 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/test/lisp/faces-resources/faces-test-dark-theme.el b/test/lisp/faces-resources/faces-test-dark-theme.el index a5e2ca43627..f3ef6b67fa7 100644 --- a/test/lisp/faces-resources/faces-test-dark-theme.el +++ b/test/lisp/faces-resources/faces-test-dark-theme.el @@ -1,6 +1,6 @@ ;;; faces-test-dark-theme.el --- A dark theme from tests ;;; -*- lexical-binding: t; -*- -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/faces-resources/faces-test-light-theme.el b/test/lisp/faces-resources/faces-test-light-theme.el index b2f7ec69742..390b8461644 100644 --- a/test/lisp/faces-resources/faces-test-light-theme.el +++ b/test/lisp/faces-resources/faces-test-light-theme.el @@ -1,6 +1,6 @@ ;;; faces-test-light-theme.el --- A dark theme from tests ;;; -*- lexical-binding: t; -*- -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/faces-tests.el b/test/lisp/faces-tests.el index bdd18a5ac58..6e77259fe1b 100644 --- a/test/lisp/faces-tests.el +++ b/test/lisp/faces-tests.el @@ -1,6 +1,6 @@ ;;; faces-tests.el --- Tests for faces.el -*- lexical-binding: t; -*- -;; Copyright (C) 2013-2020 Free Software Foundation, Inc. +;; Copyright (C) 2013-2021 Free Software Foundation, Inc. ;; Author: Artur Malabarba <bruce.connor.am@gmail.com> ;; Keywords: diff --git a/test/lisp/ffap-tests.el b/test/lisp/ffap-tests.el index ca8c10831fd..3ceb392d7fb 100644 --- a/test/lisp/ffap-tests.el +++ b/test/lisp/ffap-tests.el @@ -1,6 +1,6 @@ ;;; ffap-tests.el --- Test suite for ffap.el -*- lexical-binding: t -*- -;; Copyright (C) 2016-2020 Free Software Foundation, Inc. +;; Copyright (C) 2016-2021 Free Software Foundation, Inc. ;; Author: Tino Calancha <tino.calancha@gmail.com> diff --git a/test/lisp/filenotify-tests.el b/test/lisp/filenotify-tests.el index 25017dd3261..047109a96a2 100644 --- a/test/lisp/filenotify-tests.el +++ b/test/lisp/filenotify-tests.el @@ -1,6 +1,6 @@ ;;; filenotify-tests.el --- Tests of file notifications -*- lexical-binding: t; -*- -;; Copyright (C) 2013-2020 Free Software Foundation, Inc. +;; Copyright (C) 2013-2021 Free Software Foundation, Inc. ;; Author: Michael Albinus <michael.albinus@gmx.de> diff --git a/test/lisp/files-tests.el b/test/lisp/files-tests.el index 8818099a223..149cc689ae9 100644 --- a/test/lisp/files-tests.el +++ b/test/lisp/files-tests.el @@ -1,6 +1,6 @@ ;;; files-tests.el --- tests for files.el. -*- lexical-binding: t; -*- -;; Copyright (C) 2012-2020 Free Software Foundation, Inc. +;; Copyright (C) 2012-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/files-x-tests.el b/test/lisp/files-x-tests.el index 6b05e6a88c3..e97e2c325ec 100644 --- a/test/lisp/files-x-tests.el +++ b/test/lisp/files-x-tests.el @@ -1,6 +1,6 @@ ;;; files-x-tests.el --- tests for files-x.el. -*- lexical-binding: t -*- -;; Copyright (C) 2016-2020 Free Software Foundation, Inc. +;; Copyright (C) 2016-2021 Free Software Foundation, Inc. ;; Author: Michael Albinus <michael.albinus@gmx.de> diff --git a/test/lisp/font-lock-tests.el b/test/lisp/font-lock-tests.el index 477c43091e3..eba51f2885d 100644 --- a/test/lisp/font-lock-tests.el +++ b/test/lisp/font-lock-tests.el @@ -1,6 +1,6 @@ ;;; font-lock-tests.el --- Test suite for font-lock. -*- lexical-binding: t -*- -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/format-spec-tests.el b/test/lisp/format-spec-tests.el index 11882217afb..ff2abdeaad5 100644 --- a/test/lisp/format-spec-tests.el +++ b/test/lisp/format-spec-tests.el @@ -1,6 +1,6 @@ ;;; format-spec-tests.el --- tests for format-spec.el -*- lexical-binding: t -*- -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. @@ -178,4 +178,14 @@ (should (equal (format-spec "foo %>4b zot" '((?b . "longbar"))) "foo long zot"))) +(ert-deftest format-spec-split () + (should (equal (format-spec "foo %b bar" '((?b . "zot")) nil t) + '("foo " "zot" " bar"))) + (should (equal (format-spec "%b bar" '((?b . "zot")) nil t) + '("zot" " bar"))) + (should (equal (format-spec "%b" '((?b . "zot")) nil t) + '("zot"))) + (should (equal (format-spec "foo %b" '((?b . "zot")) nil t) + '("foo " "zot")))) + ;;; format-spec-tests.el ends here diff --git a/test/lisp/gnus/gnus-icalendar-tests.el b/test/lisp/gnus/gnus-icalendar-tests.el index dd265b4fa97..90c3a34a5c0 100644 --- a/test/lisp/gnus/gnus-icalendar-tests.el +++ b/test/lisp/gnus/gnus-icalendar-tests.el @@ -1,6 +1,6 @@ ;;; gnus-icalendar-tests.el --- tests -*- lexical-binding: t; -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; Author: Jan Tatarik <jan.tatarik@gmail.com> ;; Keywords: diff --git a/test/lisp/gnus/gnus-search-tests.el b/test/lisp/gnus/gnus-search-tests.el index 5bae9cb14d0..63469f8d518 100644 --- a/test/lisp/gnus/gnus-search-tests.el +++ b/test/lisp/gnus/gnus-search-tests.el @@ -1,6 +1,6 @@ ;;; gnus-search-tests.el --- Tests for Gnus' search routines -*- lexical-binding: t; -*- -;; Copyright (C) 2017 Free Software Foundation, Inc. +;; Copyright (C) 2017, 2021 Free Software Foundation, Inc. ;; Author: Eric Abrahamsen <eric@ericabrahamsen.net> ;; Keywords: diff --git a/test/lisp/gnus/gnus-test-headers.el b/test/lisp/gnus/gnus-test-headers.el index 958360a088b..a240784ee01 100644 --- a/test/lisp/gnus/gnus-test-headers.el +++ b/test/lisp/gnus/gnus-test-headers.el @@ -1,6 +1,6 @@ ;;; gnus-test-headers.el --- Tests for Gnus header-related functions -*- lexical-binding: t; -*- -;; Copyright (C) 2018-2020 Free Software Foundation, Inc. +;; Copyright (C) 2018-2021 Free Software Foundation, Inc. ;; Author: Eric Abrahamsen <eric@ericabrahamsen.net> diff --git a/test/lisp/gnus/gnus-tests.el b/test/lisp/gnus/gnus-tests.el index fb1b204f042..6602e67a347 100644 --- a/test/lisp/gnus/gnus-tests.el +++ b/test/lisp/gnus/gnus-tests.el @@ -1,6 +1,6 @@ ;;; gnus-tests.el --- Wrapper for the Gnus tests -*- lexical-binding:t -*- -;; Copyright (C) 2011-2020 Free Software Foundation, Inc. +;; Copyright (C) 2011-2021 Free Software Foundation, Inc. ;; Author: Teodor Zlatanov <tzz@lifelogs.com> diff --git a/test/lisp/gnus/gnus-util-tests.el b/test/lisp/gnus/gnus-util-tests.el index 5a5e66594fa..7f64b96303f 100644 --- a/test/lisp/gnus/gnus-util-tests.el +++ b/test/lisp/gnus/gnus-util-tests.el @@ -1,5 +1,5 @@ ;;; gnus-util-tests.el --- Selectived tests only. -*- lexical-binding:t -*- -;; Copyright (C) 2015-2020 Free Software Foundation, Inc. +;; Copyright (C) 2015-2021 Free Software Foundation, Inc. ;; Author: Jens Lechtenbörger <jens.lechtenboerger@fsfe.org> diff --git a/test/lisp/gnus/message-tests.el b/test/lisp/gnus/message-tests.el index 99a4ae463a6..8650053b682 100644 --- a/test/lisp/gnus/message-tests.el +++ b/test/lisp/gnus/message-tests.el @@ -1,6 +1,6 @@ ;;; message-mode-tests.el --- Tests for message-mode -*- lexical-binding: t; -*- -;; Copyright (C) 2015-2020 Free Software Foundation, Inc. +;; Copyright (C) 2015-2021 Free Software Foundation, Inc. ;; Author: João Távora <joaotavora@gmail.com> diff --git a/test/lisp/gnus/mml-sec-tests.el b/test/lisp/gnus/mml-sec-tests.el index e3a8c81cc65..b743187030f 100644 --- a/test/lisp/gnus/mml-sec-tests.el +++ b/test/lisp/gnus/mml-sec-tests.el @@ -1,5 +1,5 @@ ;;; mml-sec-tests.el --- Tests mml-sec.el, see README-mml-secure.txt. -*- lexical-binding:t -*- -;; Copyright (C) 2015, 2020 Free Software Foundation, Inc. +;; Copyright (C) 2015, 2020-2021 Free Software Foundation, Inc. ;; Author: Jens Lechtenbörger <jens.lechtenboerger@fsfe.org> diff --git a/test/lisp/gnus/nnrss-tests.el b/test/lisp/gnus/nnrss-tests.el index a4040c908fe..9821ec76fb4 100644 --- a/test/lisp/gnus/nnrss-tests.el +++ b/test/lisp/gnus/nnrss-tests.el @@ -1,6 +1,6 @@ ;;; nnrss-tests.el --- tests for gnus/nnrss.el -*- lexical-binding:t -*- -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/help-fns-tests.el b/test/lisp/help-fns-tests.el index 11dbca48655..099d627f355 100644 --- a/test/lisp/help-fns-tests.el +++ b/test/lisp/help-fns-tests.el @@ -1,6 +1,6 @@ ;;; help-fns-tests.el --- tests for help-fns.el -*- lexical-binding: t -*- -;; Copyright (C) 2014-2020 Free Software Foundation, Inc. +;; Copyright (C) 2014-2021 Free Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org diff --git a/test/lisp/help-mode-tests.el b/test/lisp/help-mode-tests.el index 2b9552a8d81..e0e82c9cc1a 100644 --- a/test/lisp/help-mode-tests.el +++ b/test/lisp/help-mode-tests.el @@ -1,6 +1,6 @@ ;;; help-mode-tests.el --- Tests for help-mode.el -*- lexical-binding: t; -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; Author: Simen Heggestøyl <simenheg@gmail.com> ;; Keywords: diff --git a/test/lisp/help-tests.el b/test/lisp/help-tests.el index 49cb40b29d9..95557c95eb7 100644 --- a/test/lisp/help-tests.el +++ b/test/lisp/help-tests.el @@ -1,6 +1,6 @@ ;;; help-tests.el --- Tests for help.el -*- lexical-binding: t; -*- -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; Author: Juanma Barranquero <lekktu@gmail.com> ;; Eli Zaretskii <eliz@gnu.org> diff --git a/test/lisp/hfy-cmap-tests.el b/test/lisp/hfy-cmap-tests.el index 4cdc6ffc827..7e0be3753b3 100644 --- a/test/lisp/hfy-cmap-tests.el +++ b/test/lisp/hfy-cmap-tests.el @@ -1,6 +1,6 @@ ;;; hfy-cmap-tests.el --- tests for hfy-cmap.el -*- lexical-binding: t -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/hi-lock-tests.el b/test/lisp/hi-lock-tests.el index d30a6d08001..199512fe7de 100644 --- a/test/lisp/hi-lock-tests.el +++ b/test/lisp/hi-lock-tests.el @@ -1,6 +1,6 @@ ;;; hi-lock-tests.el --- Tests for hi-lock.el -*- lexical-binding: t; -*- -;; Copyright (C) 2017-2020 Free Software Foundation, Inc. +;; Copyright (C) 2017-2021 Free Software Foundation, Inc. ;; Author: Tino Calancha <tino.calancha@gmail.com> ;; Keywords: diff --git a/test/lisp/htmlfontify-tests.el b/test/lisp/htmlfontify-tests.el index 4e48db32789..879131cae32 100644 --- a/test/lisp/htmlfontify-tests.el +++ b/test/lisp/htmlfontify-tests.el @@ -1,6 +1,6 @@ ;;; htmlfontify-tests.el --- Test suite. -*- lexical-binding: t -*- -;; Copyright (C) 2015-2020 Free Software Foundation, Inc. +;; Copyright (C) 2015-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/ibuffer-tests.el b/test/lisp/ibuffer-tests.el index 2211cae305b..a51079180a5 100644 --- a/test/lisp/ibuffer-tests.el +++ b/test/lisp/ibuffer-tests.el @@ -1,6 +1,6 @@ ;;; ibuffer-tests.el --- Test suite. -*- lexical-binding: t -*- -;; Copyright (C) 2015-2020 Free Software Foundation, Inc. +;; Copyright (C) 2015-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/ido-tests.el b/test/lisp/ido-tests.el index 1bca4cdb706..90a64b2fd21 100644 --- a/test/lisp/ido-tests.el +++ b/test/lisp/ido-tests.el @@ -1,6 +1,6 @@ ;;; ido-tests.el --- unit tests for ido.el -*- lexical-binding: t; -*- -;; Copyright (C) 2017-2020 Free Software Foundation, Inc. +;; Copyright (C) 2017-2021 Free Software Foundation, Inc. ;; Author: Philipp Stephani <phst@google.com> diff --git a/test/lisp/image-file-tests.el b/test/lisp/image-file-tests.el index ad7c26ee46c..d3290f6f4c6 100644 --- a/test/lisp/image-file-tests.el +++ b/test/lisp/image-file-tests.el @@ -1,6 +1,6 @@ ;;; image-file-tests.el --- Test suite for image-files -*- lexical-binding: t; -*- -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/image-tests.el b/test/lisp/image-tests.el index 0355e78184c..ab7585ca050 100644 --- a/test/lisp/image-tests.el +++ b/test/lisp/image-tests.el @@ -1,6 +1,6 @@ ;;; image-tests.el --- tests for image.el -*- lexical-binding: t -*- -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/image/exif-tests.el b/test/lisp/image/exif-tests.el index 9e5da46b508..ddbee75467e 100644 --- a/test/lisp/image/exif-tests.el +++ b/test/lisp/image/exif-tests.el @@ -1,6 +1,6 @@ ;;; exif-tests.el --- tests for exif.el -*- lexical-binding: t -*- -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/image/gravatar-tests.el b/test/lisp/image/gravatar-tests.el index 43c3024721e..2324dc5e8b4 100644 --- a/test/lisp/image/gravatar-tests.el +++ b/test/lisp/image/gravatar-tests.el @@ -1,6 +1,6 @@ ;;; gravatar-tests.el --- tests for gravatar.el -*- lexical-binding: t -*- -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/imenu-tests.el b/test/lisp/imenu-tests.el index e5cdb9e65d1..17f2501f67d 100644 --- a/test/lisp/imenu-tests.el +++ b/test/lisp/imenu-tests.el @@ -1,6 +1,6 @@ ;;; imenu-tests.el --- Test suite for imenu. -*- lexical-binding:t -*- -;; Copyright (C) 2013-2020 Free Software Foundation, Inc. +;; Copyright (C) 2013-2021 Free Software Foundation, Inc. ;; Author: Masatake YAMATO <yamato@redhat.com> ;; Keywords: tools convenience diff --git a/test/lisp/info-xref-tests.el b/test/lisp/info-xref-tests.el index 940aa7d8ad1..95af21fb591 100644 --- a/test/lisp/info-xref-tests.el +++ b/test/lisp/info-xref-tests.el @@ -1,6 +1,6 @@ ;;; info-xref.el --- tests for info-xref.el -*- lexical-binding:t -*- -;; Copyright (C) 2013-2020 Free Software Foundation, Inc. +;; Copyright (C) 2013-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/international/ccl-tests.el b/test/lisp/international/ccl-tests.el index 16e591f1dd5..0f765e4ff88 100644 --- a/test/lisp/international/ccl-tests.el +++ b/test/lisp/international/ccl-tests.el @@ -1,6 +1,6 @@ ;;; ccl-tests.el --- unit tests for ccl.el -*- lexical-binding:t -*- -;; Copyright (C) 2018-2020 Free Software Foundation, Inc. +;; Copyright (C) 2018-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/international/mule-tests.el b/test/lisp/international/mule-tests.el index 9520d9d8633..7727c118b2c 100644 --- a/test/lisp/international/mule-tests.el +++ b/test/lisp/international/mule-tests.el @@ -1,6 +1,6 @@ ;;; mule-tests.el --- unit tests for mule.el -*- lexical-binding: t; -*- -;; Copyright (C) 2017-2020 Free Software Foundation, Inc. +;; Copyright (C) 2017-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/international/mule-util-tests.el b/test/lisp/international/mule-util-tests.el index 0524dad88da..6518be66dbe 100644 --- a/test/lisp/international/mule-util-tests.el +++ b/test/lisp/international/mule-util-tests.el @@ -1,6 +1,6 @@ ;;; mule-util-tests.el --- tests for international/mule-util.el -*- lexical-binding:t -*- -;; Copyright (C) 2002-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/international/ucs-normalize-tests.el b/test/lisp/international/ucs-normalize-tests.el index 2c60bd318a2..a2da73767bc 100644 --- a/test/lisp/international/ucs-normalize-tests.el +++ b/test/lisp/international/ucs-normalize-tests.el @@ -1,6 +1,6 @@ ;;; ucs-normalize --- tests for international/ucs-normalize.el -*- lexical-binding: t -*- -;; Copyright (C) 2002-2020 Free Software Foundation, Inc. +;; Copyright (C) 2002-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/isearch-tests.el b/test/lisp/isearch-tests.el index 516077ac1f8..9f3ac373126 100644 --- a/test/lisp/isearch-tests.el +++ b/test/lisp/isearch-tests.el @@ -1,6 +1,6 @@ ;;; isearch-tests.el --- Tests for isearch.el -*- lexical-binding: t; -*- -;; Copyright (C) 2013-2020 Free Software Foundation, Inc. +;; Copyright (C) 2013-2021 Free Software Foundation, Inc. ;; Author: Artur Malabarba <bruce.connor.am@gmail.com> diff --git a/test/lisp/jit-lock-tests.el b/test/lisp/jit-lock-tests.el index dfa74cf35e7..121966b2b77 100644 --- a/test/lisp/jit-lock-tests.el +++ b/test/lisp/jit-lock-tests.el @@ -1,6 +1,6 @@ ;;; jit-lock-tests.el --- tests for jit-lock -*- lexical-binding:t -*- -;; Copyright (C) 2016-2020 Free Software Foundation, Inc. +;; Copyright (C) 2016-2021 Free Software Foundation, Inc. ;; Author: Dmitry Gutov <dgutov@yandex.ru> diff --git a/test/lisp/json-tests.el b/test/lisp/json-tests.el index 8ac454467d3..11b61d8b47e 100644 --- a/test/lisp/json-tests.el +++ b/test/lisp/json-tests.el @@ -1,6 +1,6 @@ ;;; json-tests.el --- Test suite for json.el -*- lexical-binding:t -*- -;; Copyright (C) 2015-2020 Free Software Foundation, Inc. +;; Copyright (C) 2015-2021 Free Software Foundation, Inc. ;; Author: Dmitry Gutov <dgutov@yandex.ru> diff --git a/test/lisp/jsonrpc-tests.el b/test/lisp/jsonrpc-tests.el index 1ef83daed24..ea340c370d1 100644 --- a/test/lisp/jsonrpc-tests.el +++ b/test/lisp/jsonrpc-tests.el @@ -1,6 +1,6 @@ ;;; jsonrpc-tests.el --- tests for jsonrpc.el -*- lexical-binding: t; -*- -;; Copyright (C) 2018-2020 Free Software Foundation, Inc. +;; Copyright (C) 2018-2021 Free Software Foundation, Inc. ;; Author: João Távora <joaotavora@gmail.com> ;; Keywords: tests diff --git a/test/lisp/kmacro-tests.el b/test/lisp/kmacro-tests.el index bb18c828140..c8910720763 100644 --- a/test/lisp/kmacro-tests.el +++ b/test/lisp/kmacro-tests.el @@ -1,6 +1,6 @@ ;;; kmacro-tests.el --- Tests for kmacro.el -*- lexical-binding: t; -*- -;; Copyright (C) 2017-2020 Free Software Foundation, Inc. +;; Copyright (C) 2017-2021 Free Software Foundation, Inc. ;; Author: Gemini Lasswell <gazally@runbox.com> diff --git a/test/lisp/ls-lisp-tests.el b/test/lisp/ls-lisp-tests.el index e08e406619a..e386398eea2 100644 --- a/test/lisp/ls-lisp-tests.el +++ b/test/lisp/ls-lisp-tests.el @@ -1,6 +1,6 @@ ;;; ls-lisp-tests.el --- tests for ls-lisp.el -*- lexical-binding: t-*- -;; Copyright (C) 2017-2020 Free Software Foundation, Inc. +;; Copyright (C) 2017-2021 Free Software Foundation, Inc. ;; Author: Tino Calancha <tino.calancha@gmail.com> ;; Keywords: diff --git a/test/lisp/mail/flow-fill-tests.el b/test/lisp/mail/flow-fill-tests.el index c2e4178b7d4..ec5b984dc04 100644 --- a/test/lisp/mail/flow-fill-tests.el +++ b/test/lisp/mail/flow-fill-tests.el @@ -1,6 +1,6 @@ ;;; flow-fill-tests.el --- Tests for flow-fill.el -*- lexical-binding: t -*- -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/mail/footnote-tests.el b/test/lisp/mail/footnote-tests.el index 6594aa2b3e5..731ba3e706b 100644 --- a/test/lisp/mail/footnote-tests.el +++ b/test/lisp/mail/footnote-tests.el @@ -1,6 +1,6 @@ ;;; footnote-tests.el --- Tests for footnote-mode -*- lexical-binding: t; -*- -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> ;; Keywords: diff --git a/test/lisp/mail/qp-tests.el b/test/lisp/mail/qp-tests.el index 8d704499334..89f02894ea8 100644 --- a/test/lisp/mail/qp-tests.el +++ b/test/lisp/mail/qp-tests.el @@ -1,6 +1,6 @@ ;;; qp-tests.el --- Tests for qp.el -*- lexical-binding:t; coding:utf-8 -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; Author: Stefan Kangas <stefankangas@gmail.com> diff --git a/test/lisp/mail/rfc2045-tests.el b/test/lisp/mail/rfc2045-tests.el index edd7a88c69e..ac547aabe5b 100644 --- a/test/lisp/mail/rfc2045-tests.el +++ b/test/lisp/mail/rfc2045-tests.el @@ -1,6 +1,6 @@ ;;; rfc2045-tests.el --- Tests for rfc2045.el -*- lexical-binding:t -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; Author: Stefan Kangas <stefankangas@gmail.com> diff --git a/test/lisp/mail/rfc2047-tests.el b/test/lisp/mail/rfc2047-tests.el index 7a99e851004..befcbc018bc 100644 --- a/test/lisp/mail/rfc2047-tests.el +++ b/test/lisp/mail/rfc2047-tests.el @@ -1,6 +1,6 @@ ;;; rfc2047-tests.el --- tests for rfc2047.el -*- lexical-binding: t -*- -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/mail/rfc2368-tests.el b/test/lisp/mail/rfc2368-tests.el index c35b8e33ad5..f997ea3ecb4 100644 --- a/test/lisp/mail/rfc2368-tests.el +++ b/test/lisp/mail/rfc2368-tests.el @@ -1,6 +1,6 @@ ;;; rfc2368-tests.el --- Tests for rfc2368.el -*- lexical-binding:t -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/mail/rfc822-tests.el b/test/lisp/mail/rfc822-tests.el index d13966c59cc..3e36a61a1f3 100644 --- a/test/lisp/mail/rfc822-tests.el +++ b/test/lisp/mail/rfc822-tests.el @@ -1,6 +1,6 @@ ;;; rfc822-tests.el --- Tests for rfc822.el -*- lexical-binding:t -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/mail/rmail-tests.el b/test/lisp/mail/rmail-tests.el index f96c31c7f00..f533401496b 100644 --- a/test/lisp/mail/rmail-tests.el +++ b/test/lisp/mail/rmail-tests.el @@ -1,6 +1,6 @@ ;;; rmail-tests.el --- Test suite. -*- lexical-binding: t -*- -;; Copyright (C) 2015-2020 Free Software Foundation, Inc. +;; Copyright (C) 2015-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/mail/rmailmm-tests.el b/test/lisp/mail/rmailmm-tests.el index 645bb96d113..a022008b534 100644 --- a/test/lisp/mail/rmailmm-tests.el +++ b/test/lisp/mail/rmailmm-tests.el @@ -1,6 +1,6 @@ ;;; rmailmm-tests.el --- Tests for rmailmm.el -*- lexical-binding:t -*- -;; Copyright (C) 2006-2020 Free Software Foundation, Inc. +;; Copyright (C) 2006-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/mail/uudecode-tests.el b/test/lisp/mail/uudecode-tests.el index 17566250a92..6ff767562e3 100644 --- a/test/lisp/mail/uudecode-tests.el +++ b/test/lisp/mail/uudecode-tests.el @@ -1,6 +1,6 @@ ;;; uudecode-tests.el --- Tests for uudecode.el -*- lexical-binding: t -*- -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; Author: Stefan Kangas <stefankangas@gmail.com> diff --git a/test/lisp/makesum-tests.el b/test/lisp/makesum-tests.el index d4dd832730c..2b57af78186 100644 --- a/test/lisp/makesum-tests.el +++ b/test/lisp/makesum-tests.el @@ -1,6 +1,6 @@ ;;; makesum-tests.el --- Tests for makesum.el -*- lexical-binding: t; -*- -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; Author: Simen Heggestøyl <simenheg@gmail.com> ;; Keywords: diff --git a/test/lisp/man-tests.el b/test/lisp/man-tests.el index ddf22ecd404..7fb0c5e9443 100644 --- a/test/lisp/man-tests.el +++ b/test/lisp/man-tests.el @@ -1,6 +1,6 @@ ;;; man-tests.el --- Test suite for man. -*- lexical-binding:t -*- -;; Copyright (C) 2013-2020 Free Software Foundation, Inc. +;; Copyright (C) 2013-2021 Free Software Foundation, Inc. ;; Author: Wolfgang Jenkner <wjenkner@inode.at> ;; Keywords: help, internal, unix diff --git a/test/lisp/md4-tests.el b/test/lisp/md4-tests.el index 5c995ff56c9..ac7eedec6aa 100644 --- a/test/lisp/md4-tests.el +++ b/test/lisp/md4-tests.el @@ -1,6 +1,6 @@ ;;; md4-tests.el --- tests for md4.el -*- lexical-binding: t -*- -;; Copyright (C) 2017-2020 Free Software Foundation, Inc. +;; Copyright (C) 2017-2021 Free Software Foundation, Inc. ;; Author: Mark Oteiza <mvoteiza@udel.edu> ;; Maintainer: emacs-devel@gnu.org diff --git a/test/lisp/minibuffer-tests.el b/test/lisp/minibuffer-tests.el index 32734794413..3ebca14a284 100644 --- a/test/lisp/minibuffer-tests.el +++ b/test/lisp/minibuffer-tests.el @@ -1,6 +1,6 @@ ;;; completion-tests.el --- Tests for completion functions -*- lexical-binding: t; -*- -;; Copyright (C) 2013-2020 Free Software Foundation, Inc. +;; Copyright (C) 2013-2021 Free Software Foundation, Inc. ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> ;; Keywords: diff --git a/test/lisp/misc-tests.el b/test/lisp/misc-tests.el index fbcbfb7d0cc..a519fd1ee62 100644 --- a/test/lisp/misc-tests.el +++ b/test/lisp/misc-tests.el @@ -1,6 +1,6 @@ ;;; misc-tests.el --- Tests for misc.el -*- lexical-binding:t -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; Author: Stefan Kangas <stefankangas@gmail.com> diff --git a/test/lisp/mouse-tests.el b/test/lisp/mouse-tests.el index d520da7af5c..56411d0365f 100644 --- a/test/lisp/mouse-tests.el +++ b/test/lisp/mouse-tests.el @@ -1,6 +1,6 @@ ;;; mouse-tests.el --- unit tests for mouse.el -*- lexical-binding: t; -*- -;; Copyright (C) 2016-2020 Free Software Foundation, Inc. +;; Copyright (C) 2016-2021 Free Software Foundation, Inc. ;; Author: Philipp Stephani <phst@google.com> diff --git a/test/lisp/mwheel-tests.el b/test/lisp/mwheel-tests.el index 315f25edae8..058f1a8afb1 100644 --- a/test/lisp/mwheel-tests.el +++ b/test/lisp/mwheel-tests.el @@ -1,6 +1,6 @@ ;;; mwheel-tests.el --- tests for mwheel.el -*- lexical-binding:t -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/net/browse-url-tests.el b/test/lisp/net/browse-url-tests.el index b2b27d2ae7b..898bef8513b 100644 --- a/test/lisp/net/browse-url-tests.el +++ b/test/lisp/net/browse-url-tests.el @@ -1,6 +1,6 @@ ;;; browse-url-tests.el --- Tests for browse-url.el -*- lexical-binding: t; -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; Author: Simen Heggestøyl <simenheg@gmail.com> ;; Keywords: diff --git a/test/lisp/net/dbus-tests.el b/test/lisp/net/dbus-tests.el index 3cfb4b7d9e7..34a2af188f0 100644 --- a/test/lisp/net/dbus-tests.el +++ b/test/lisp/net/dbus-tests.el @@ -1,6 +1,6 @@ ;;; dbus-tests.el --- Tests of D-Bus integration into Emacs -*- lexical-binding:t -*- -;; Copyright (C) 2013-2020 Free Software Foundation, Inc. +;; Copyright (C) 2013-2021 Free Software Foundation, Inc. ;; Author: Michael Albinus <michael.albinus@gmx.de> diff --git a/test/lisp/net/dig-tests.el b/test/lisp/net/dig-tests.el index 1b14384634e..780985cb6d3 100644 --- a/test/lisp/net/dig-tests.el +++ b/test/lisp/net/dig-tests.el @@ -1,6 +1,6 @@ ;;; dig-tests.el --- Tests for dig.el -*- lexical-binding:t -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/net/gnutls-tests.el b/test/lisp/net/gnutls-tests.el index 5205f0b851f..76c00b7eaac 100644 --- a/test/lisp/net/gnutls-tests.el +++ b/test/lisp/net/gnutls-tests.el @@ -1,6 +1,6 @@ ;;; gnutls-tests.el --- Test suite for gnutls.el -*- lexical-binding:t -*- -;; Copyright (C) 2017-2020 Free Software Foundation, Inc. +;; Copyright (C) 2017-2021 Free Software Foundation, Inc. ;; Author: Ted Zlatanov <tzz@lifelogs.com> diff --git a/test/lisp/net/hmac-md5-tests.el b/test/lisp/net/hmac-md5-tests.el index 30d221ec87b..8e01353fa3f 100644 --- a/test/lisp/net/hmac-md5-tests.el +++ b/test/lisp/net/hmac-md5-tests.el @@ -1,6 +1,6 @@ ;;; hmac-md5-tests.el --- Tests for hmac-md5.el -*- lexical-binding:t -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/net/mailcap-tests.el b/test/lisp/net/mailcap-tests.el index 0ebbec61159..a1a08322c0f 100644 --- a/test/lisp/net/mailcap-tests.el +++ b/test/lisp/net/mailcap-tests.el @@ -1,6 +1,6 @@ ;;; mailcap-tests.el --- tests for mailcap.el -*- lexical-binding: t -*- -;; Copyright (C) 2017-2020 Free Software Foundation, Inc. +;; Copyright (C) 2017-2021 Free Software Foundation, Inc. ;; Author: Mark Oteiza <mvoteiza@udel.edu> diff --git a/test/lisp/net/netrc-tests.el b/test/lisp/net/netrc-tests.el index 291943990ad..1328b191494 100644 --- a/test/lisp/net/netrc-tests.el +++ b/test/lisp/net/netrc-tests.el @@ -1,6 +1,6 @@ ;;; netrc-tests.el --- Tests for netrc.el -*- lexical-binding:t -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; Author: Stefan Kangas <stefankangas@gmail.com> diff --git a/test/lisp/net/network-stream-tests.el b/test/lisp/net/network-stream-tests.el index 07eb2823282..e0a06a28eec 100644 --- a/test/lisp/net/network-stream-tests.el +++ b/test/lisp/net/network-stream-tests.el @@ -1,6 +1,6 @@ ;;; network-stream-tests.el --- tests for network processes -*- lexical-binding: t; -*- -;; Copyright (C) 2016-2020 Free Software Foundation, Inc. +;; Copyright (C) 2016-2021 Free Software Foundation, Inc. ;; Author: Lars Ingebrigtsen <larsi@gnus.org> diff --git a/test/lisp/net/newsticker-tests.el b/test/lisp/net/newsticker-tests.el index 5552fa8c1a6..e08f3110161 100644 --- a/test/lisp/net/newsticker-tests.el +++ b/test/lisp/net/newsticker-tests.el @@ -1,6 +1,6 @@ ;;; newsticker-tests.el --- Test suite for newsticker. -*- lexical-binding:t -*- -;; Copyright (C) 2003-2020 Free Software Foundation, Inc. +;; Copyright (C) 2003-2021 Free Software Foundation, Inc. ;; Author: Ulf Jasper <ulf.jasper@web.de> ;; Keywords: News, RSS, Atom diff --git a/test/lisp/net/nsm-tests.el b/test/lisp/net/nsm-tests.el index c547533bce2..88c30c20395 100644 --- a/test/lisp/net/nsm-tests.el +++ b/test/lisp/net/nsm-tests.el @@ -1,6 +1,6 @@ ;;; network-stream-tests.el --- tests for network security manager -*- lexical-binding: t; -*- -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; Author: Robert Pluim <rpluim@gmail.com> diff --git a/test/lisp/net/ntlm-tests.el b/test/lisp/net/ntlm-tests.el index e515ebe2635..6408ac13349 100644 --- a/test/lisp/net/ntlm-tests.el +++ b/test/lisp/net/ntlm-tests.el @@ -1,6 +1,6 @@ ;;; ntlm-tests.el --- tests for ntlm.el -*- lexical-binding: t -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/net/puny-tests.el b/test/lisp/net/puny-tests.el index 7dac39795b6..b37168f5ca7 100644 --- a/test/lisp/net/puny-tests.el +++ b/test/lisp/net/puny-tests.el @@ -1,6 +1,6 @@ ;;; puny-tests.el --- tests for net/puny.el -*- coding: utf-8; lexical-binding:t -*- -;; Copyright (C) 2017-2020 Free Software Foundation, Inc. +;; Copyright (C) 2017-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/net/rcirc-tests.el b/test/lisp/net/rcirc-tests.el index cbd1c2be830..fd96b7ba714 100644 --- a/test/lisp/net/rcirc-tests.el +++ b/test/lisp/net/rcirc-tests.el @@ -1,6 +1,6 @@ ;;; rcirc-tests.el --- Tests for rcirc -*- lexical-binding:t -*- -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. ;; diff --git a/test/lisp/net/rfc2104-tests.el b/test/lisp/net/rfc2104-tests.el index e7d5a7f30e5..f3498e760a3 100644 --- a/test/lisp/net/rfc2104-tests.el +++ b/test/lisp/net/rfc2104-tests.el @@ -1,6 +1,6 @@ ;;; rfc2104-tests.el --- Tests of RFC2104 hashes -*- lexical-binding:t -*- -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; Author: Lars Ingebrigtsen <larsi@gnus.org> diff --git a/test/lisp/net/sasl-scram-rfc-tests.el b/test/lisp/net/sasl-scram-rfc-tests.el index 09e05b62a25..3e9879a49d4 100644 --- a/test/lisp/net/sasl-scram-rfc-tests.el +++ b/test/lisp/net/sasl-scram-rfc-tests.el @@ -1,6 +1,6 @@ ;;; sasl-scram-rfc-tests.el --- tests for SCRAM -*- lexical-binding: t; -*- -;; Copyright (C) 2014-2020 Free Software Foundation, Inc. +;; Copyright (C) 2014-2021 Free Software Foundation, Inc. ;; Author: Magnus Henoch <magnus.henoch@gmail.com> diff --git a/test/lisp/net/secrets-tests.el b/test/lisp/net/secrets-tests.el index 1e2cf3aef66..b392c4d1847 100644 --- a/test/lisp/net/secrets-tests.el +++ b/test/lisp/net/secrets-tests.el @@ -1,6 +1,6 @@ ;;; secrets-tests.el --- Tests of Secret Service API -*- lexical-binding: t -*- -;; Copyright (C) 2018-2020 Free Software Foundation, Inc. +;; Copyright (C) 2018-2021 Free Software Foundation, Inc. ;; Author: Michael Albinus <michael.albinus@gmx.de> diff --git a/test/lisp/net/shr-tests.el b/test/lisp/net/shr-tests.el index abc4f6a656b..a06e31a4f88 100644 --- a/test/lisp/net/shr-tests.el +++ b/test/lisp/net/shr-tests.el @@ -1,6 +1,6 @@ ;;; network-stream-tests.el --- tests for network processes -*- lexical-binding: t; -*- -;; Copyright (C) 2016-2020 Free Software Foundation, Inc. +;; Copyright (C) 2016-2021 Free Software Foundation, Inc. ;; Author: Lars Ingebrigtsen <larsi@gnus.org> diff --git a/test/lisp/net/tramp-archive-tests.el b/test/lisp/net/tramp-archive-tests.el index 97c22fd2feb..6a6b56f4a1d 100644 --- a/test/lisp/net/tramp-archive-tests.el +++ b/test/lisp/net/tramp-archive-tests.el @@ -1,6 +1,6 @@ ;;; tramp-archive-tests.el --- Tests of file archive access -*- lexical-binding:t -*- -;; Copyright (C) 2017-2020 Free Software Foundation, Inc. +;; Copyright (C) 2017-2021 Free Software Foundation, Inc. ;; Author: Michael Albinus <michael.albinus@gmx.de> diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el index c8756627936..896b9978e7c 100644 --- a/test/lisp/net/tramp-tests.el +++ b/test/lisp/net/tramp-tests.el @@ -1,6 +1,6 @@ ;;; tramp-tests.el --- Tests of remote file access -*- lexical-binding:t -*- -;; Copyright (C) 2013-2020 Free Software Foundation, Inc. +;; Copyright (C) 2013-2021 Free Software Foundation, Inc. ;; Author: Michael Albinus <michael.albinus@gmx.de> @@ -4475,23 +4475,30 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'." "Define ert test `TEST-direct-async' for direct async processes. If UNSTABLE is non-nil, the test is tagged as `:unstable'." (declare (indent 1)) - `(ert-deftest ,(intern (concat (symbol-name test) "-direct-async")) () - ,docstring - :tags (if ,unstable '(:expensive-test :unstable) '(:expensive-test)) - (skip-unless (tramp--test-enabled)) - (let ((default-directory tramp-test-temporary-file-directory) - (ert-test (ert-get-test ',test)) - (tramp-connection-properties - (cons '(nil "direct-async-process" t) tramp-connection-properties))) - (skip-unless (tramp-direct-async-process-p)) - ;; For whatever reason, it doesn't cooperate with the "mock" method. - (skip-unless (not (tramp--test-mock-p))) - ;; We do expect an established connection already, - ;; `file-truename' does it by side-effect. Suppress - ;; `tramp--test-enabled', in order to keep the connection. - (cl-letf (((symbol-function #'tramp--test-enabled) (lambda nil t))) - (file-truename tramp-test-temporary-file-directory) - (funcall (ert-test-body ert-test)))))) + ;; `make-process' supports file name handlers since Emacs 27. + (when (let ((file-name-handler-alist '(("" . (lambda (&rest _) t))))) + (ignore-errors (make-process :file-handler t))) + `(ert-deftest ,(intern (concat (symbol-name test) "-direct-async")) () + ,docstring + :tags (if ,unstable '(:expensive-test :unstable) '(:expensive-test)) + (skip-unless (tramp--test-enabled)) + (let ((default-directory tramp-test-temporary-file-directory) + (ert-test (ert-get-test ',test)) + (tramp-connection-properties + (cons '(nil "direct-async-process" t) + tramp-connection-properties))) + (skip-unless (tramp-direct-async-process-p)) + ;; For whatever reason, it doesn't cooperate with the "mock" method. + (skip-unless (not (tramp--test-mock-p))) + ;; We do expect an established connection already, + ;; `file-truename' does it by side-effect. Suppress + ;; `tramp--test-enabled', in order to keep the connection. + ;; Suppress "Process ... finished" messages. + (cl-letf (((symbol-function #'tramp--test-enabled) (lambda nil t)) + ((symbol-function #'internal-default-process-sentinel) + #'ignore)) + (file-truename tramp-test-temporary-file-directory) + (funcall (ert-test-body ert-test))))))) (tramp--test--deftest-direct-async-process tramp-test29-start-file-process "Check direct async `start-file-process'.") @@ -4704,8 +4711,7 @@ If UNSTABLE is non-nil, the test is tagged as `:unstable'." (command output-buffer &optional error-buffer input) "Like `async-shell-command', reading the output. INPUT, if non-nil, is a string sent to the process." - (async-shell-command command output-buffer error-buffer) - (let ((proc (get-buffer-process output-buffer)) + (let ((proc (async-shell-command command output-buffer error-buffer)) (delete-exited-processes t)) (cl-letf (((symbol-function #'shell-command-sentinel) #'ignore)) (when (stringp input) @@ -4818,7 +4824,7 @@ INPUT, if non-nil, is a string sent to the process." (should (= cols async-shell-command-width)))))) (tramp--test--deftest-direct-async-process tramp-test32-shell-command - "Check direct async `shell-command'.") + "Check direct async `shell-command'." 'unstable) ;; This test is inspired by Bug#39067. (ert-deftest tramp-test32-shell-command-dont-erase-buffer () @@ -6452,7 +6458,7 @@ process sentinels. They shall not disturb each other." (ignore-errors (delete-directory tmp-name 'recursive)))))) ;; (tramp--test--deftest-direct-async-process tramp-test43-asynchronous-requests -;; "Check parallel direct asynchronous requests.") +;; "Check parallel direct asynchronous requests." 'unstable) ;; This test is inspired by Bug#29163. (ert-deftest tramp-test44-auto-load () diff --git a/test/lisp/net/webjump-tests.el b/test/lisp/net/webjump-tests.el index 47569c948f5..f767099925c 100644 --- a/test/lisp/net/webjump-tests.el +++ b/test/lisp/net/webjump-tests.el @@ -1,6 +1,6 @@ ;;; webjump-tests.el --- Tests for webjump.el -*- lexical-binding: t; -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; Author: Simen Heggestøyl <simenheg@gmail.com> ;; Keywords: diff --git a/test/lisp/nxml/nxml-mode-tests.el b/test/lisp/nxml/nxml-mode-tests.el index 54d3bd8d132..4baab1f7600 100644 --- a/test/lisp/nxml/nxml-mode-tests.el +++ b/test/lisp/nxml/nxml-mode-tests.el @@ -1,6 +1,6 @@ ;;; nxml-mode-tests.el --- Test NXML Mode -*- lexical-binding: t; -*- -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; GNU Emacs 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/test/lisp/nxml/xsd-regexp-tests.el b/test/lisp/nxml/xsd-regexp-tests.el index 4c0b3b1a3b7..4dbc8999247 100644 --- a/test/lisp/nxml/xsd-regexp-tests.el +++ b/test/lisp/nxml/xsd-regexp-tests.el @@ -1,6 +1,6 @@ ;;; xsd-regexp-tests.el --- Test NXML Mode -*- lexical-binding: t; -*- -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; GNU Emacs 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/test/lisp/obarray-tests.el b/test/lisp/obarray-tests.el index 4b9b4e4a10e..45d82c75c15 100644 --- a/test/lisp/obarray-tests.el +++ b/test/lisp/obarray-tests.el @@ -1,6 +1,6 @@ ;;; obarray-tests.el --- Tests for obarray -*- lexical-binding: t; -*- -;; Copyright (C) 2015-2020 Free Software Foundation, Inc. +;; Copyright (C) 2015-2021 Free Software Foundation, Inc. ;; Author: Przemysław Wojnowski <esperanto@cumego.com> diff --git a/test/lisp/obsolete/cl-tests.el b/test/lisp/obsolete/cl-tests.el index 3f3fda3638e..4a5f4f872b6 100644 --- a/test/lisp/obsolete/cl-tests.el +++ b/test/lisp/obsolete/cl-tests.el @@ -1,6 +1,6 @@ ;;; cl-tests.el --- tests for emacs-lisp/cl.el -*- lexical-binding:t -*- -;; Copyright (C) 2018-2020 Free Software Foundation, Inc. +;; Copyright (C) 2018-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/org/org-tests.el b/test/lisp/org/org-tests.el index 6e91dd28649..c1985a46a40 100644 --- a/test/lisp/org/org-tests.el +++ b/test/lisp/org/org-tests.el @@ -1,6 +1,6 @@ ;;; org-tests.el --- tests for org/org.el -*- lexical-binding:t -*- -;; Copyright (C) 2018-2020 Free Software Foundation, Inc. +;; Copyright (C) 2018-2021 Free Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org diff --git a/test/lisp/paren-tests.el b/test/lisp/paren-tests.el index b732b8626ab..c4bec5d86de 100644 --- a/test/lisp/paren-tests.el +++ b/test/lisp/paren-tests.el @@ -1,6 +1,6 @@ ;;; paren-tests.el --- Tests for paren.el -*- lexical-binding: t; -*- -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; Author: Simen Heggestøyl <simenheg@gmail.com> ;; Keywords: diff --git a/test/lisp/password-cache-tests.el b/test/lisp/password-cache-tests.el index 55ebbfce7fe..11cb65cc163 100644 --- a/test/lisp/password-cache-tests.el +++ b/test/lisp/password-cache-tests.el @@ -1,6 +1,6 @@ ;;; password-cache-tests.el --- Tests for password-cache.el -*- lexical-binding: t -*- -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; Author: Stefan Kangas <stefankangas@gmail.com> diff --git a/test/lisp/pcmpl-linux-tests.el b/test/lisp/pcmpl-linux-tests.el index 91a9965483a..1b795ad706e 100644 --- a/test/lisp/pcmpl-linux-tests.el +++ b/test/lisp/pcmpl-linux-tests.el @@ -1,6 +1,6 @@ ;;; pcmpl-linux-tests.el --- Tests for pcmpl-linux.el -*- lexical-binding: t -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/play/animate-tests.el b/test/lisp/play/animate-tests.el index 7c41d3b7761..62527244670 100644 --- a/test/lisp/play/animate-tests.el +++ b/test/lisp/play/animate-tests.el @@ -1,6 +1,6 @@ ;;; animate-tests.el --- Tests for animate.el -*- lexical-binding:t -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/play/dissociate-tests.el b/test/lisp/play/dissociate-tests.el index e8d903109fc..e2f1e03101a 100644 --- a/test/lisp/play/dissociate-tests.el +++ b/test/lisp/play/dissociate-tests.el @@ -1,6 +1,6 @@ ;;; dissociate-tests.el --- Tests for dissociate.el -*- lexical-binding:t -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/play/fortune-tests.el b/test/lisp/play/fortune-tests.el index 97263405e8a..3b85febaf00 100644 --- a/test/lisp/play/fortune-tests.el +++ b/test/lisp/play/fortune-tests.el @@ -1,6 +1,6 @@ ;;; fortune-tests.el --- Tests for fortune.el -*- lexical-binding: t -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/play/life-tests.el b/test/lisp/play/life-tests.el index 38726bbc416..cdc507b5767 100644 --- a/test/lisp/play/life-tests.el +++ b/test/lisp/play/life-tests.el @@ -1,6 +1,6 @@ ;;; life-tests.el --- Tests for life.el -*- lexical-binding:t -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; Author: Stefan Kangas <stefankangas@gmail.com> diff --git a/test/lisp/play/morse-tests.el b/test/lisp/play/morse-tests.el index ded4ef64586..7e03952970f 100644 --- a/test/lisp/play/morse-tests.el +++ b/test/lisp/play/morse-tests.el @@ -1,6 +1,6 @@ ;;; morse-tests.el --- Tests for morse.el -*- lexical-binding: t -*- -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; Author: Stefan Kangas <stefankangas@gmail.com> diff --git a/test/lisp/play/studly-tests.el b/test/lisp/play/studly-tests.el index 6b6e205b3e6..87e16fdd333 100644 --- a/test/lisp/play/studly-tests.el +++ b/test/lisp/play/studly-tests.el @@ -1,6 +1,6 @@ ;;; studly-tests.el --- Tests for studly.el -*- lexical-binding: t -*- -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; Author: Stefan Kangas <stefankangas@gmail.com> diff --git a/test/lisp/progmodes/asm-mode-tests.el b/test/lisp/progmodes/asm-mode-tests.el index 72d0f00777d..6ae4fdf5850 100644 --- a/test/lisp/progmodes/asm-mode-tests.el +++ b/test/lisp/progmodes/asm-mode-tests.el @@ -1,6 +1,6 @@ ;;; asm-mode-tests.el --- Tests for asm-mode.el -*- lexical-binding: t; -*- -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; Author: Simen Heggestøyl <simenheg@gmail.com> ;; Keywords: diff --git a/test/lisp/progmodes/autoconf-tests.el b/test/lisp/progmodes/autoconf-tests.el index 63cf2889ee2..3d347feaf65 100644 --- a/test/lisp/progmodes/autoconf-tests.el +++ b/test/lisp/progmodes/autoconf-tests.el @@ -1,6 +1,6 @@ ;;; autoconf-tests.el --- Tests for autoconf.el -*- lexical-binding: t; -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; Author: Simen Heggestøyl <simenheg@gmail.com> ;; Keywords: diff --git a/test/lisp/progmodes/bat-mode-tests.el b/test/lisp/progmodes/bat-mode-tests.el index 2afa5c3785f..78145124fb4 100644 --- a/test/lisp/progmodes/bat-mode-tests.el +++ b/test/lisp/progmodes/bat-mode-tests.el @@ -1,6 +1,6 @@ ;;; bat-mode-tests.el --- Tests for bat-mode.el -*- lexical-binding: t; -*- -;; Copyright (C) 2017-2020 Free Software Foundation, Inc. +;; Copyright (C) 2017-2021 Free Software Foundation, Inc. ;; Author: Vladimir Panteleev <vladimir@thecybershadow.net> ;; Keywords: diff --git a/test/lisp/progmodes/cc-mode-tests.el b/test/lisp/progmodes/cc-mode-tests.el index 64d52a952b6..a3a8ff208ed 100644 --- a/test/lisp/progmodes/cc-mode-tests.el +++ b/test/lisp/progmodes/cc-mode-tests.el @@ -1,6 +1,6 @@ ;;; cc-mode-tests.el --- Test suite for cc-mode. -*- lexical-binding: t; -*- -;; Copyright (C) 2016-2020 Free Software Foundation, Inc. +;; Copyright (C) 2016-2021 Free Software Foundation, Inc. ;; Author: Michal Nazarewicz <mina86@mina86.com> ;; Keywords: internal diff --git a/test/lisp/progmodes/compile-tests.el b/test/lisp/progmodes/compile-tests.el index 74d7c7682e1..da6a1e641c7 100644 --- a/test/lisp/progmodes/compile-tests.el +++ b/test/lisp/progmodes/compile-tests.el @@ -1,6 +1,6 @@ ;;; compile-tests.el --- Test suite for compile.el. -*- lexical-binding: t; -*- -;; Copyright (C) 2011-2020 Free Software Foundation, Inc. +;; Copyright (C) 2011-2021 Free Software Foundation, Inc. ;; Author: Chong Yidong <cyd@stupidchicken.com> ;; Keywords: internal diff --git a/test/lisp/progmodes/cperl-mode-tests.el b/test/lisp/progmodes/cperl-mode-tests.el index cb2d067a610..46e687f14d0 100644 --- a/test/lisp/progmodes/cperl-mode-tests.el +++ b/test/lisp/progmodes/cperl-mode-tests.el @@ -1,6 +1,6 @@ ;;; cperl-mode-tests --- Test for cperl-mode -*- lexical-binding: t -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; Author: Harald Jörg <haj@posteo.de> ;; Maintainer: Harald Jörg diff --git a/test/lisp/progmodes/elisp-mode-tests.el b/test/lisp/progmodes/elisp-mode-tests.el index 6c30e4f664b..a10d5dab906 100644 --- a/test/lisp/progmodes/elisp-mode-tests.el +++ b/test/lisp/progmodes/elisp-mode-tests.el @@ -1,6 +1,6 @@ ;;; elisp-mode-tests.el --- Tests for emacs-lisp-mode -*- lexical-binding: t; -*- -;; Copyright (C) 2015-2020 Free Software Foundation, Inc. +;; Copyright (C) 2015-2021 Free Software Foundation, Inc. ;; Author: Dmitry Gutov <dgutov@yandex.ru> ;; Author: Stephen Leake <stephen_leake@member.fsf.org> diff --git a/test/lisp/progmodes/etags-tests.el b/test/lisp/progmodes/etags-tests.el index 79368cd193f..35a2592e76f 100644 --- a/test/lisp/progmodes/etags-tests.el +++ b/test/lisp/progmodes/etags-tests.el @@ -1,6 +1,6 @@ ;;; etags-tests.el --- Test suite for etags.el. -*- lexical-binding:t -*- -;; Copyright (C) 2016-2020 Free Software Foundation, Inc. +;; Copyright (C) 2016-2021 Free Software Foundation, Inc. ;; Author: Eli Zaretskii <eliz@gnu.org> diff --git a/test/lisp/progmodes/f90-tests.el b/test/lisp/progmodes/f90-tests.el index b8a3f7e8401..b3d12229d8f 100644 --- a/test/lisp/progmodes/f90-tests.el +++ b/test/lisp/progmodes/f90-tests.el @@ -1,6 +1,6 @@ ;;; f90-tests.el --- tests for progmodes/f90.el -*- lexical-binding:t -*- -;; Copyright (C) 2011-2020 Free Software Foundation, Inc. +;; Copyright (C) 2011-2021 Free Software Foundation, Inc. ;; Author: Glenn Morris <rgm@gnu.org> ;; Maintainer: emacs-devel@gnu.org diff --git a/test/lisp/progmodes/flymake-tests.el b/test/lisp/progmodes/flymake-tests.el index df72b523a9d..bda1b663c22 100644 --- a/test/lisp/progmodes/flymake-tests.el +++ b/test/lisp/progmodes/flymake-tests.el @@ -1,6 +1,6 @@ ;;; flymake-tests.el --- Test suite for flymake -*- lexical-binding: t -*- -;; Copyright (C) 2011-2020 Free Software Foundation, Inc. +;; Copyright (C) 2011-2021 Free Software Foundation, Inc. ;; Author: Eduard Wiebe <usenet@pusto.de> diff --git a/test/lisp/progmodes/gdb-mi-tests.el b/test/lisp/progmodes/gdb-mi-tests.el index 64b7a266635..ab482214afb 100644 --- a/test/lisp/progmodes/gdb-mi-tests.el +++ b/test/lisp/progmodes/gdb-mi-tests.el @@ -1,6 +1,6 @@ ;;; gdb-mi-tests.el --- tests for gdb-mi.el -*- lexical-binding: t -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/progmodes/glasses-tests.el b/test/lisp/progmodes/glasses-tests.el index 277a9cc1927..633c7bf2dbe 100644 --- a/test/lisp/progmodes/glasses-tests.el +++ b/test/lisp/progmodes/glasses-tests.el @@ -1,6 +1,6 @@ ;;; glasses-tests.el --- Tests for glasses.el -*- lexical-binding: t; -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; Author: Simen Heggestøyl <simenheg@gmail.com> ;; Keywords: diff --git a/test/lisp/progmodes/js-tests.el b/test/lisp/progmodes/js-tests.el index 6c3a618b949..cb7011e9a77 100644 --- a/test/lisp/progmodes/js-tests.el +++ b/test/lisp/progmodes/js-tests.el @@ -1,6 +1,6 @@ ;;; js-tests.el --- Test suite for js-mode -*- lexical-binding:t -*- -;; Copyright (C) 2017-2020 Free Software Foundation, Inc. +;; Copyright (C) 2017-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/progmodes/opascal-tests.el b/test/lisp/progmodes/opascal-tests.el index 70a4ebfa70d..682f2c6cb6b 100644 --- a/test/lisp/progmodes/opascal-tests.el +++ b/test/lisp/progmodes/opascal-tests.el @@ -1,6 +1,6 @@ ;;; opascal-tests.el --- tests for opascal.el -*- lexical-binding: t -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/progmodes/pascal-tests.el b/test/lisp/progmodes/pascal-tests.el index ed4c6fb03e0..e9c705806b3 100644 --- a/test/lisp/progmodes/pascal-tests.el +++ b/test/lisp/progmodes/pascal-tests.el @@ -1,6 +1,6 @@ ;;; pascal-tests.el --- tests for pascal.el -*- lexical-binding: t -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/progmodes/perl-mode-tests.el b/test/lisp/progmodes/perl-mode-tests.el index a2ea972c103..9f6800ccd63 100644 --- a/test/lisp/progmodes/perl-mode-tests.el +++ b/test/lisp/progmodes/perl-mode-tests.el @@ -1,6 +1,6 @@ ;;; perl-mode-tests --- Test for perl-mode -*- lexical-binding: t -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/progmodes/ps-mode-tests.el b/test/lisp/progmodes/ps-mode-tests.el index 61cf4c62511..eccc862ee3d 100644 --- a/test/lisp/progmodes/ps-mode-tests.el +++ b/test/lisp/progmodes/ps-mode-tests.el @@ -1,6 +1,6 @@ ;;; ps-mode-tests.el --- Test suite for ps-mode -*- lexical-binding:t -*- -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/progmodes/python-tests.el b/test/lisp/progmodes/python-tests.el index 64626333c44..3e653cb568a 100644 --- a/test/lisp/progmodes/python-tests.el +++ b/test/lisp/progmodes/python-tests.el @@ -1,6 +1,6 @@ ;;; python-tests.el --- Test suite for python.el -*- lexical-binding:t -*- -;; Copyright (C) 2013-2020 Free Software Foundation, Inc. +;; Copyright (C) 2013-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/progmodes/ruby-mode-resources/ruby.rb b/test/lisp/progmodes/ruby-mode-resources/ruby.rb index 95928030396..434237cf638 100644 --- a/test/lisp/progmodes/ruby-mode-resources/ruby.rb +++ b/test/lisp/progmodes/ruby-mode-resources/ruby.rb @@ -475,3 +475,11 @@ top test( foo bar, { tee: qux } + +# Bug#42846, bug#18644 + +:foo= +# indent here +2 = 3 +:foo= if true +{:abc=>4} # not indented, and '=' is not highlighted diff --git a/test/lisp/progmodes/ruby-mode-tests.el b/test/lisp/progmodes/ruby-mode-tests.el index 97ac1e1ecd9..67b592e9070 100644 --- a/test/lisp/progmodes/ruby-mode-tests.el +++ b/test/lisp/progmodes/ruby-mode-tests.el @@ -1,6 +1,6 @@ ;;; ruby-mode-tests.el --- Test suite for ruby-mode -*- lexical-binding:t -*- -;; Copyright (C) 2012-2020 Free Software Foundation, Inc. +;; Copyright (C) 2012-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/progmodes/scheme-tests.el b/test/lisp/progmodes/scheme-tests.el index e3736bd411e..8f2f75f81c2 100644 --- a/test/lisp/progmodes/scheme-tests.el +++ b/test/lisp/progmodes/scheme-tests.el @@ -1,6 +1,6 @@ ;;; scheme-tests.el --- Test suite for scheme.el -*- lexical-binding:t -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/progmodes/sql-tests.el b/test/lisp/progmodes/sql-tests.el index 91805ab7251..21dd0649529 100644 --- a/test/lisp/progmodes/sql-tests.el +++ b/test/lisp/progmodes/sql-tests.el @@ -1,6 +1,6 @@ ;;; sql-tests.el --- Tests for sql.el -*- lexical-binding: t; -*- -;; Copyright (C) 2016-2020 Free Software Foundation, Inc. +;; Copyright (C) 2016-2021 Free Software Foundation, Inc. ;; Author: Simen Heggestøyl <simenheg@gmail.com> ;; Keywords: diff --git a/test/lisp/progmodes/subword-tests.el b/test/lisp/progmodes/subword-tests.el index 6aeee76110b..28a9445e01f 100644 --- a/test/lisp/progmodes/subword-tests.el +++ b/test/lisp/progmodes/subword-tests.el @@ -1,6 +1,6 @@ ;;; subword-tests.el --- Testing the subword rules -*- lexical-binding:t -*- -;; Copyright (C) 2011-2020 Free Software Foundation, Inc. +;; Copyright (C) 2011-2021 Free Software Foundation, Inc. ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> ;; Keywords: diff --git a/test/lisp/progmodes/tcl-tests.el b/test/lisp/progmodes/tcl-tests.el index fb5a19d3d0c..8ff85470ece 100644 --- a/test/lisp/progmodes/tcl-tests.el +++ b/test/lisp/progmodes/tcl-tests.el @@ -1,6 +1,6 @@ ;;; tcl-tests.el --- Test suite for tcl-mode -*- lexical-binding:t -*- -;; Copyright (C) 2018-2020 Free Software Foundation, Inc. +;; Copyright (C) 2018-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/progmodes/xref-tests.el b/test/lisp/progmodes/xref-tests.el index e220d09dada..eaafc5888c7 100644 --- a/test/lisp/progmodes/xref-tests.el +++ b/test/lisp/progmodes/xref-tests.el @@ -1,6 +1,6 @@ ;;; xref-tests.el --- tests for xref -*- lexical-binding:t -*- -;; Copyright (C) 2016-2020 Free Software Foundation, Inc. +;; Copyright (C) 2016-2021 Free Software Foundation, Inc. ;; Author: Dmitry Gutov <dgutov@yandex.ru> @@ -27,27 +27,34 @@ (require 'xref) (require 'cl-lib) -(defvar xref-tests-data-dir +(defvar xref-tests--data-dir (expand-file-name "xref-resources/" (file-name-directory (or load-file-name buffer-file-name)))) +(defun xref-tests--matches-in-data-dir (regexp &optional files) + (xref-matches-in-directory regexp (or files "*") xref-tests--data-dir nil)) + +(defun xref-tests--locations-in-data-dir (regexp &optional files) + (let ((matches (xref-tests--matches-in-data-dir regexp files))) + ;; Sort in order to guarantee an order independent from the + ;; filesystem traversal. + (cl-sort (mapcar #'xref-item-location matches) + #'string< + :key #'xref-location-group))) + (ert-deftest xref-matches-in-directory-finds-none-for-some-regexp () - (should (null (xref-matches-in-directory "zzz" "*" xref-tests-data-dir nil)))) + (should (null (xref-tests--matches-in-data-dir "zzz")))) (ert-deftest xref-matches-in-directory-finds-some-for-bar () - (let* ((matches (xref-matches-in-directory "bar" "*" xref-tests-data-dir nil)) - (locs (cl-sort (mapcar #'xref-item-location matches) - #'string< - :key #'xref-location-group))) - (should (= 2 (length matches))) + (let ((locs (xref-tests--locations-in-data-dir "bar"))) + (should (= 2 (length locs))) (should (string-match-p "file1\\.txt\\'" (xref-location-group (nth 0 locs)))) (should (string-match-p "file2\\.txt\\'" (xref-location-group (nth 1 locs)))))) (ert-deftest xref-matches-in-directory-finds-two-matches-on-the-same-line () - (let* ((matches (xref-matches-in-directory "foo" "*" xref-tests-data-dir nil)) - (locs (mapcar #'xref-item-location matches))) - (should (= 2 (length matches))) + (let ((locs (xref-tests--locations-in-data-dir "foo"))) + (should (= 2 (length locs))) (should (string-match-p "file1\\.txt\\'" (xref-location-group (nth 0 locs)))) (should (string-match-p "file1\\.txt\\'" (xref-location-group (nth 1 locs)))) (should (equal 1 (xref-location-line (nth 0 locs)))) @@ -56,15 +63,14 @@ (should (equal 4 (xref-location-column (nth 1 locs)))))) (ert-deftest xref-matches-in-directory-finds-an-empty-line-regexp-match () - (let* ((matches (xref-matches-in-directory "^$" "*" xref-tests-data-dir nil)) - (locs (mapcar #'xref-item-location matches))) - (should (= 1 (length matches))) + (let ((locs (xref-tests--locations-in-data-dir "^$"))) + (should (= 1 (length locs))) (should (string-match-p "file2\\.txt\\'" (xref-location-group (nth 0 locs)))) (should (equal 1 (xref-location-line (nth 0 locs)))) (should (equal 0 (xref-location-column (nth 0 locs)))))) (ert-deftest xref--buf-pairs-iterator-groups-markers-by-buffers-1 () - (let* ((xrefs (xref-matches-in-directory "foo" "*" xref-tests-data-dir nil)) + (let* ((xrefs (xref-tests--matches-in-data-dir "foo")) (iter (xref--buf-pairs-iterator xrefs)) (cons (funcall iter :next))) (should (null (funcall iter :next))) @@ -72,7 +78,7 @@ (should (= 2 (length (cdr cons)))))) (ert-deftest xref--buf-pairs-iterator-groups-markers-by-buffers-2 () - (let* ((xrefs (xref-matches-in-directory "bar" "*" xref-tests-data-dir nil)) + (let* ((xrefs (xref-tests--matches-in-data-dir "bar")) (iter (xref--buf-pairs-iterator xrefs)) (cons1 (funcall iter :next)) (cons2 (funcall iter :next))) @@ -82,7 +88,7 @@ (should (= 1 (length (cdr cons2)))))) (ert-deftest xref--buf-pairs-iterator-cleans-up-markers () - (let* ((xrefs (xref-matches-in-directory "bar" "*" xref-tests-data-dir nil)) + (let* ((xrefs (xref-tests--matches-in-data-dir "bar")) (iter (xref--buf-pairs-iterator xrefs)) (cons1 (funcall iter :next)) (cons2 (funcall iter :next))) @@ -91,3 +97,34 @@ (should (null (marker-position (cdr (nth 0 (cdr cons1)))))) (should (null (marker-position (car (nth 0 (cdr cons2)))))) (should (null (marker-position (cdr (nth 0 (cdr cons2)))))))) + +(ert-deftest xref--xref-file-name-display-is-abs () + (let ((xref-file-name-display 'abs)) + (should (equal (delete-dups + (mapcar 'xref-location-group + (xref-tests--locations-in-data-dir "\\(bar\\|foo\\)"))) + (list + (concat xref-tests--data-dir "file1.txt") + (concat xref-tests--data-dir "file2.txt")))))) + +(ert-deftest xref--xref-file-name-display-is-nondirectory () + (let ((xref-file-name-display 'nondirectory)) + (should (equal (delete-dups + (mapcar 'xref-location-group + (xref-tests--locations-in-data-dir "\\(bar\\|foo\\)"))) + (list + "file1.txt" + "file2.txt"))))) + +(ert-deftest xref--xref-file-name-display-is-relative-to-project-root () + (let* ((data-parent-dir + (file-name-directory (directory-file-name xref-tests--data-dir))) + (project-find-functions + #'(lambda (_) (cons 'transient data-parent-dir))) + (xref-file-name-display 'project-relative)) + (should (equal (delete-dups + (mapcar 'xref-location-group + (xref-tests--locations-in-data-dir "\\(bar\\|foo\\)"))) + (list + "xref-resources/file1.txt" + "xref-resources/file2.txt"))))) diff --git a/test/lisp/ps-print-tests.el b/test/lisp/ps-print-tests.el index cae86f600f2..b25e88622d8 100644 --- a/test/lisp/ps-print-tests.el +++ b/test/lisp/ps-print-tests.el @@ -1,6 +1,6 @@ ;;; ps-print-tests.el --- Test suite for ps-print.el -*- lexical-binding: t; -*- -;; Copyright (C) 2015-2020 Free Software Foundation, Inc. +;; Copyright (C) 2015-2021 Free Software Foundation, Inc. ;; Author: Phillip Lord <phillip.lord@russet.org.uk> diff --git a/test/lisp/register-tests.el b/test/lisp/register-tests.el index cfad442b470..537a66737b0 100644 --- a/test/lisp/register-tests.el +++ b/test/lisp/register-tests.el @@ -1,6 +1,6 @@ ;;; register-tests.el --- tests for register.el -*- lexical-binding: t-*- -;; Copyright (C) 2017-2020 Free Software Foundation, Inc. +;; Copyright (C) 2017-2021 Free Software Foundation, Inc. ;; Author: Tino Calancha <tino.calancha@gmail.com> ;; Keywords: diff --git a/test/lisp/replace-tests.el b/test/lisp/replace-tests.el index aed14c33572..8c2682a1f13 100644 --- a/test/lisp/replace-tests.el +++ b/test/lisp/replace-tests.el @@ -1,6 +1,6 @@ ;;; replace-tests.el --- tests for replace.el. -*- lexical-binding:t -*- -;; Copyright (C) 2010-2020 Free Software Foundation, Inc. +;; Copyright (C) 2010-2021 Free Software Foundation, Inc. ;; Author: Nicolas Richard <youngfrog@members.fsf.org> ;; Author: Juri Linkov <juri@jurta.org> diff --git a/test/lisp/rot13-tests.el b/test/lisp/rot13-tests.el index 2b12a464524..374d4ebaa81 100644 --- a/test/lisp/rot13-tests.el +++ b/test/lisp/rot13-tests.el @@ -1,6 +1,6 @@ ;;; rot13-tests.el --- Tests for rot13.el -*- lexical-binding: t; -*- -;; Copyright (C) 2016-2020 Free Software Foundation, Inc. +;; Copyright (C) 2016-2021 Free Software Foundation, Inc. ;; Author: Simen Heggestøyl <simenheg@gmail.com> ;; Keywords: diff --git a/test/lisp/saveplace-tests.el b/test/lisp/saveplace-tests.el index 8d31e282180..17199ed443a 100644 --- a/test/lisp/saveplace-tests.el +++ b/test/lisp/saveplace-tests.el @@ -1,6 +1,6 @@ ;;; saveplace-tests.el --- Tests for saveplace.el -*- lexical-binding:t -*- -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; Author: Stefan Kangas <stefankangas@gmail.com> diff --git a/test/lisp/scroll-lock-tests.el b/test/lisp/scroll-lock-tests.el index 08f0aeb4089..8391a75f49c 100644 --- a/test/lisp/scroll-lock-tests.el +++ b/test/lisp/scroll-lock-tests.el @@ -1,6 +1,6 @@ ;;; scroll-lock-tests.el --- Test suite for scroll-lock -*- lexical-binding: t -*- -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/ses-tests.el b/test/lisp/ses-tests.el index 4080944f296..04f255dcd4c 100644 --- a/test/lisp/ses-tests.el +++ b/test/lisp/ses-tests.el @@ -1,6 +1,6 @@ ;;; ses-tests.el --- Tests for ses.el -*- lexical-binding: t; -*- -;; Copyright (C) 2015-2020 Free Software Foundation, Inc. +;; Copyright (C) 2015-2021 Free Software Foundation, Inc. ;; Author: Vincent Belaïche <vincentb1@users.sourceforge.net> diff --git a/test/lisp/shadowfile-tests.el b/test/lisp/shadowfile-tests.el index eed9cb534b1..0c2d7123dd7 100644 --- a/test/lisp/shadowfile-tests.el +++ b/test/lisp/shadowfile-tests.el @@ -1,6 +1,6 @@ ;;; shadowfile-tests.el --- Tests of shadowfile -*- lexical-binding:t -*- -;; Copyright (C) 2018-2020 Free Software Foundation, Inc. +;; Copyright (C) 2018-2021 Free Software Foundation, Inc. ;; Author: Michael Albinus <michael.albinus@gmx.de> diff --git a/test/lisp/shell-tests.el b/test/lisp/shell-tests.el index 606de15c9a6..d918de771b7 100644 --- a/test/lisp/shell-tests.el +++ b/test/lisp/shell-tests.el @@ -1,6 +1,6 @@ ;;; shell-tests.el -*- lexical-binding:t -*- -;; Copyright (C) 2010-2020 Free Software Foundation, Inc. +;; Copyright (C) 2010-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/simple-tests.el b/test/lisp/simple-tests.el index 786dd1647aa..7b022811a5c 100644 --- a/test/lisp/simple-tests.el +++ b/test/lisp/simple-tests.el @@ -1,6 +1,6 @@ ;;; simple-test.el --- Tests for simple.el -*- lexical-binding: t; -*- -;; Copyright (C) 2015-2020 Free Software Foundation, Inc. +;; Copyright (C) 2015-2021 Free Software Foundation, Inc. ;; Author: Artur Malabarba <bruce.connor.am@gmail.com> diff --git a/test/lisp/so-long-tests/autoload-longlines-mode-tests.el b/test/lisp/so-long-tests/autoload-longlines-mode-tests.el index fd7e030e77a..696206efe20 100644 --- a/test/lisp/so-long-tests/autoload-longlines-mode-tests.el +++ b/test/lisp/so-long-tests/autoload-longlines-mode-tests.el @@ -1,6 +1,6 @@ ;;; autoload-longlines-mode-tests.el --- Test suite for so-long.el -*- lexical-binding: t; -*- -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; Author: Phil Sainty <psainty@orcon.net.nz> ;; Keywords: convenience diff --git a/test/lisp/so-long-tests/autoload-major-mode-tests.el b/test/lisp/so-long-tests/autoload-major-mode-tests.el index f81a28490dc..87adf826abb 100644 --- a/test/lisp/so-long-tests/autoload-major-mode-tests.el +++ b/test/lisp/so-long-tests/autoload-major-mode-tests.el @@ -1,6 +1,6 @@ ;;; autoload-major-mode-tests.el --- Test suite for so-long.el -*- lexical-binding: t; -*- -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; Author: Phil Sainty <psainty@orcon.net.nz> ;; Keywords: convenience diff --git a/test/lisp/so-long-tests/autoload-minor-mode-tests.el b/test/lisp/so-long-tests/autoload-minor-mode-tests.el index e611cfba1c0..4980a7e1bc6 100644 --- a/test/lisp/so-long-tests/autoload-minor-mode-tests.el +++ b/test/lisp/so-long-tests/autoload-minor-mode-tests.el @@ -1,6 +1,6 @@ ;;; autoload-minor-mode-tests.el --- Test suite for so-long.el -*- lexical-binding: t; -*- -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; Author: Phil Sainty <psainty@orcon.net.nz> ;; Keywords: convenience diff --git a/test/lisp/so-long-tests/so-long-tests-helpers.el b/test/lisp/so-long-tests/so-long-tests-helpers.el index 3f7bb368172..ab4d9c6c137 100644 --- a/test/lisp/so-long-tests/so-long-tests-helpers.el +++ b/test/lisp/so-long-tests/so-long-tests-helpers.el @@ -1,6 +1,6 @@ ;;; so-long-tests-helpers.el --- Test suite for so-long.el -*- lexical-binding: t; -*- -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; Author: Phil Sainty <psainty@orcon.net.nz> ;; Keywords: convenience diff --git a/test/lisp/so-long-tests/so-long-tests.el b/test/lisp/so-long-tests/so-long-tests.el index b72ee2fd612..a6d8721ffc8 100644 --- a/test/lisp/so-long-tests/so-long-tests.el +++ b/test/lisp/so-long-tests/so-long-tests.el @@ -1,6 +1,6 @@ ;;; so-long-tests.el --- Test suite for so-long.el -*- lexical-binding: t; -*- -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; Author: Phil Sainty <psainty@orcon.net.nz> ;; Keywords: convenience diff --git a/test/lisp/so-long-tests/spelling-tests.el b/test/lisp/so-long-tests/spelling-tests.el index 478a02750fa..0be8555bdd2 100644 --- a/test/lisp/so-long-tests/spelling-tests.el +++ b/test/lisp/so-long-tests/spelling-tests.el @@ -1,6 +1,6 @@ ;;; spelling-tests.el --- Test suite for so-long.el -*- lexical-binding: t; -*- -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; Author: Phil Sainty <psainty@orcon.net.nz> ;; Keywords: convenience diff --git a/test/lisp/sort-tests.el b/test/lisp/sort-tests.el index 9033745e0d4..62b89c1825d 100644 --- a/test/lisp/sort-tests.el +++ b/test/lisp/sort-tests.el @@ -1,6 +1,6 @@ ;;; sort-tests.el --- Tests for sort.el -*- lexical-binding: t; -*- -;; Copyright (C) 2015-2020 Free Software Foundation, Inc. +;; Copyright (C) 2015-2021 Free Software Foundation, Inc. ;; Author: Artur Malabarba <bruce.connor.am@gmail.com> diff --git a/test/lisp/soundex-tests.el b/test/lisp/soundex-tests.el index 4170d66afb6..aa3609e5db3 100644 --- a/test/lisp/soundex-tests.el +++ b/test/lisp/soundex-tests.el @@ -1,6 +1,6 @@ ;;; soundex-tests.el --- tests for soundex.el -*- lexical-binding: t -*- -;; Copyright (C) 2017-2020 Free Software Foundation, Inc. +;; Copyright (C) 2017-2021 Free Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org diff --git a/test/lisp/startup-tests.el b/test/lisp/startup-tests.el index 314ffc93e4a..109d909622a 100644 --- a/test/lisp/startup-tests.el +++ b/test/lisp/startup-tests.el @@ -1,6 +1,6 @@ ;;; startup-tests.el --- unit tests for startup.el -*- lexical-binding: t; -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; Author: Philipp Stephani <phst@google.com> diff --git a/test/lisp/subr-tests.el b/test/lisp/subr-tests.el index 4a274a94899..bbb3b02a8fe 100644 --- a/test/lisp/subr-tests.el +++ b/test/lisp/subr-tests.el @@ -1,6 +1,6 @@ ;;; subr-tests.el --- Tests for subr.el -*- lexical-binding:t -*- -;; Copyright (C) 2015-2020 Free Software Foundation, Inc. +;; Copyright (C) 2015-2021 Free Software Foundation, Inc. ;; Author: Oleh Krehel <ohwoeowho@gmail.com>, ;; Nicolas Petton <nicolas@petton.fr> @@ -597,6 +597,26 @@ See https://debbugs.gnu.org/cgi/bugreport.cgi?bug=19350." (undo-boundary) (undo) (should (equal (buffer-string) "")))) + +(defvar subr--ordered nil) + +(ert-deftest subr--add-to-ordered-list-eq () + (setq subr--ordered nil) + (add-to-ordered-list 'subr--ordered 'b 2) + (should (equal subr--ordered '(b))) + (add-to-ordered-list 'subr--ordered 'c 3) + (should (equal subr--ordered '(b c))) + (add-to-ordered-list 'subr--ordered 'a 1) + (should (equal subr--ordered '(a b c))) + (add-to-ordered-list 'subr--ordered 'e) + (should (equal subr--ordered '(a b c e))) + (add-to-ordered-list 'subr--ordered 'd 4) + (should (equal subr--ordered '(a b c d e))) + (add-to-ordered-list 'subr--ordered 'e) + (should (equal subr--ordered '(a b c d e))) + (add-to-ordered-list 'subr--ordered 'b 5) + (should (equal subr--ordered '(a c d b e)))) + ;;; Apropos. diff --git a/test/lisp/tabify-tests.el b/test/lisp/tabify-tests.el index 1fde67b6141..4896e4a1aa3 100644 --- a/test/lisp/tabify-tests.el +++ b/test/lisp/tabify-tests.el @@ -1,6 +1,6 @@ ;;; tabify-tests.el --- tests for tabify.el -*- lexical-binding: t -*- -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; Author: Stefan Kangas <stefankangas@gmail.com> diff --git a/test/lisp/tar-mode-tests.el b/test/lisp/tar-mode-tests.el index f05389df60f..48a127157dd 100644 --- a/test/lisp/tar-mode-tests.el +++ b/test/lisp/tar-mode-tests.el @@ -1,6 +1,6 @@ ;;; tar-mode-tests.el --- Test suite for tar-mode. -*- lexical-binding: t -*- -;; Copyright (C) 2017-2020 Free Software Foundation, Inc. +;; Copyright (C) 2017-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/tempo-tests.el b/test/lisp/tempo-tests.el index bfe475910da..7594c360ad4 100644 --- a/test/lisp/tempo-tests.el +++ b/test/lisp/tempo-tests.el @@ -1,6 +1,6 @@ ;;; tempo-tests.el --- Test suite for tempo.el -*- lexical-binding: t; -*- -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; Author: Federico Tedin <federicotedin@gmail.com> ;; Keywords: abbrev diff --git a/test/lisp/term-tests.el b/test/lisp/term-tests.el index b9e492138ad..503cb5d7aab 100644 --- a/test/lisp/term-tests.el +++ b/test/lisp/term-tests.el @@ -1,6 +1,6 @@ ;;; term-tests.el --- tests for term.el -*- lexical-binding: t -*- -;; Copyright (C) 2017, 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2017, 2019-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/term/tty-colors-tests.el b/test/lisp/term/tty-colors-tests.el index 968c699cbbb..ba29a9c376e 100644 --- a/test/lisp/term/tty-colors-tests.el +++ b/test/lisp/term/tty-colors-tests.el @@ -1,6 +1,6 @@ ;;; tty-colors-tests.el --- tests for tty-colors.el -*- lexical-binding: t -*- -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/textmodes/bibtex-tests.el b/test/lisp/textmodes/bibtex-tests.el index 56bd54efb74..010808ce48f 100644 --- a/test/lisp/textmodes/bibtex-tests.el +++ b/test/lisp/textmodes/bibtex-tests.el @@ -1,6 +1,6 @@ ;;; bibtex-tests.el --- Test suite for bibtex. -*- lexical-binding:t -*- -;; Copyright (C) 2013-2020 Free Software Foundation, Inc. +;; Copyright (C) 2013-2021 Free Software Foundation, Inc. ;; Keywords: bibtex diff --git a/test/lisp/textmodes/conf-mode-tests.el b/test/lisp/textmodes/conf-mode-tests.el index 7e094e8a7c2..9c4fd1afdfe 100644 --- a/test/lisp/textmodes/conf-mode-tests.el +++ b/test/lisp/textmodes/conf-mode-tests.el @@ -1,6 +1,6 @@ ;;; conf-mode-tests.el --- Test suite for conf mode -*- lexical-binding: t; -*- -;; Copyright (C) 2016-2020 Free Software Foundation, Inc. +;; Copyright (C) 2016-2021 Free Software Foundation, Inc. ;; Author: J. Alexander Branham <alex.branham@gmail.com> ;; Keywords: internal diff --git a/test/lisp/textmodes/css-mode-tests.el b/test/lisp/textmodes/css-mode-tests.el index 476fd326e66..97f5abf1156 100644 --- a/test/lisp/textmodes/css-mode-tests.el +++ b/test/lisp/textmodes/css-mode-tests.el @@ -1,6 +1,6 @@ ;;; css-mode-tests.el --- Test suite for CSS mode -*- lexical-binding: t; -*- -;; Copyright (C) 2016-2020 Free Software Foundation, Inc. +;; Copyright (C) 2016-2021 Free Software Foundation, Inc. ;; Author: Simen Heggestøyl <simenheg@gmail.com> ;; Keywords: internal diff --git a/test/lisp/textmodes/dns-mode-tests.el b/test/lisp/textmodes/dns-mode-tests.el index 6eca9327ce8..694d683d546 100644 --- a/test/lisp/textmodes/dns-mode-tests.el +++ b/test/lisp/textmodes/dns-mode-tests.el @@ -1,6 +1,6 @@ ;;; dns-mode-tests.el --- Test suite for dns-mode -*- lexical-binding: t; -*- -;; Copyright (C) 2017-2020 Free Software Foundation, Inc. +;; Copyright (C) 2017-2021 Free Software Foundation, Inc. ;; Author: Peder O. Klingenberg <peder@klingenberg.no> ;; Keywords: dns zone diff --git a/test/lisp/textmodes/fill-tests.el b/test/lisp/textmodes/fill-tests.el index 833d74decdd..f2c63a93d3e 100644 --- a/test/lisp/textmodes/fill-tests.el +++ b/test/lisp/textmodes/fill-tests.el @@ -1,6 +1,6 @@ ;;; fill-test.el --- ERT tests for fill.el -*- lexical-binding: t -*- -;; Copyright (C) 2017-2020 Free Software Foundation, Inc. +;; Copyright (C) 2017-2021 Free Software Foundation, Inc. ;; Author: Marcin Borkowski <mbork@mbork.pl> ;; Keywords: text, wp diff --git a/test/lisp/textmodes/mhtml-mode-tests.el b/test/lisp/textmodes/mhtml-mode-tests.el index 1840e8b4016..ad386bf1bdb 100644 --- a/test/lisp/textmodes/mhtml-mode-tests.el +++ b/test/lisp/textmodes/mhtml-mode-tests.el @@ -1,6 +1,6 @@ ;;; mhtml-mode-tests.el --- Tests for mhtml-mode -*- lexical-binding:t -*- -;; Copyright (C) 2017-2020 Free Software Foundation, Inc. +;; Copyright (C) 2017-2021 Free Software Foundation, Inc. ;; Keywords: tests diff --git a/test/lisp/textmodes/page-tests.el b/test/lisp/textmodes/page-tests.el index 79aabd88dc5..c02d125c2ad 100644 --- a/test/lisp/textmodes/page-tests.el +++ b/test/lisp/textmodes/page-tests.el @@ -1,6 +1,6 @@ ;;; page-tests.el --- Tests for page.el -*- lexical-binding: t; -*- -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; Author: Simen Heggestøyl <simenheg@gmail.com> ;; Keywords: diff --git a/test/lisp/textmodes/paragraphs-tests.el b/test/lisp/textmodes/paragraphs-tests.el index 0b264e7e184..bf7f37090f5 100644 --- a/test/lisp/textmodes/paragraphs-tests.el +++ b/test/lisp/textmodes/paragraphs-tests.el @@ -1,6 +1,6 @@ ;;; paragraphs-tests.el --- Tests for paragraphs.el -*- lexical-binding: t; -*- -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; Author: Stefan Kangas <stefankangas@gmail.com> diff --git a/test/lisp/textmodes/po-tests.el b/test/lisp/textmodes/po-tests.el index a098290ce15..c75cb5eae74 100644 --- a/test/lisp/textmodes/po-tests.el +++ b/test/lisp/textmodes/po-tests.el @@ -1,6 +1,6 @@ ;;; po-tests.el --- Tests for po.el -*- lexical-binding: t; -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; Author: Simen Heggestøyl <simenheg@gmail.com> ;; Keywords: diff --git a/test/lisp/textmodes/reftex-tests.el b/test/lisp/textmodes/reftex-tests.el index 42a060b395e..b824e05f6d5 100644 --- a/test/lisp/textmodes/reftex-tests.el +++ b/test/lisp/textmodes/reftex-tests.el @@ -1,6 +1,6 @@ ;;; reftex-tests.el --- Test suite for reftex. -*- lexical-binding: t -*- -;; Copyright (C) 2013-2020 Free Software Foundation, Inc. +;; Copyright (C) 2013-2021 Free Software Foundation, Inc. ;; Author: Rüdiger Sonderfeld <ruediger@c-plusplus.de> ;; Keywords: internal diff --git a/test/lisp/textmodes/sgml-mode-tests.el b/test/lisp/textmodes/sgml-mode-tests.el index a4457307b35..697c96c78e5 100644 --- a/test/lisp/textmodes/sgml-mode-tests.el +++ b/test/lisp/textmodes/sgml-mode-tests.el @@ -1,6 +1,6 @@ ;;; sgml-mode-tests.el --- Tests for sgml-mode -*- lexical-binding:t -*- -;; Copyright (C) 2015-2020 Free Software Foundation, Inc. +;; Copyright (C) 2015-2021 Free Software Foundation, Inc. ;; Author: Przemysław Wojnowski <esperanto@cumego.com> ;; Keywords: tests diff --git a/test/lisp/textmodes/tildify-tests.el b/test/lisp/textmodes/tildify-tests.el index 61f80cc9531..59c23943304 100644 --- a/test/lisp/textmodes/tildify-tests.el +++ b/test/lisp/textmodes/tildify-tests.el @@ -1,6 +1,6 @@ ;;; tildify-test.el --- ERT tests for tildify.el -*- lexical-binding: t -*- -;; Copyright (C) 2014-2020 Free Software Foundation, Inc. +;; Copyright (C) 2014-2021 Free Software Foundation, Inc. ;; Author: Michal Nazarewicz <mina86@mina86.com> ;; Version: 4.5 diff --git a/test/lisp/textmodes/underline-tests.el b/test/lisp/textmodes/underline-tests.el index 3fbb586da08..481c9cca42e 100644 --- a/test/lisp/textmodes/underline-tests.el +++ b/test/lisp/textmodes/underline-tests.el @@ -1,6 +1,6 @@ ;;; underline-tests.el --- Tests for underline.el -*- lexical-binding: t; -*- -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; Author: Stefan Kangas <stefankangas@gmail.com> diff --git a/test/lisp/thingatpt-tests.el b/test/lisp/thingatpt-tests.el index f02aeaeef6a..c43c81af9fd 100644 --- a/test/lisp/thingatpt-tests.el +++ b/test/lisp/thingatpt-tests.el @@ -1,6 +1,6 @@ ;;; thingatpt.el --- tests for thing-at-point. -*- lexical-binding:t -*- -;; Copyright (C) 2013-2020 Free Software Foundation, Inc. +;; Copyright (C) 2013-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/thread-tests.el b/test/lisp/thread-tests.el index 849ca07ddf3..4aed5057ff0 100644 --- a/test/lisp/thread-tests.el +++ b/test/lisp/thread-tests.el @@ -1,6 +1,6 @@ ;;; thread-tests.el --- Test suite for thread.el -*- lexical-binding: t; -*- -;; Copyright (C) 2018-2020 Free Software Foundation, Inc. +;; Copyright (C) 2018-2021 Free Software Foundation, Inc. ;; Author: Gemini Lasswell <gazally@runbox.com> ;; Keywords: threads diff --git a/test/lisp/time-stamp-tests.el b/test/lisp/time-stamp-tests.el index e75e84b0221..81488c3df19 100644 --- a/test/lisp/time-stamp-tests.el +++ b/test/lisp/time-stamp-tests.el @@ -1,6 +1,6 @@ ;;; time-stamp-tests.el --- tests for time-stamp.el -*- lexical-binding: t -*- -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/time-tests.el b/test/lisp/time-tests.el index 2d327b959cc..3cf8b540cbc 100644 --- a/test/lisp/time-tests.el +++ b/test/lisp/time-tests.el @@ -1,6 +1,6 @@ ;;; time-tests.el --- Tests for time.el -*- lexical-binding: t; -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; Author: Stefan Kangas <stefankangas@gmail.com> diff --git a/test/lisp/timezone-tests.el b/test/lisp/timezone-tests.el index 8992e3e80e9..9f6961409e6 100644 --- a/test/lisp/timezone-tests.el +++ b/test/lisp/timezone-tests.el @@ -1,6 +1,6 @@ ;;; timezone-tests.el --- Tests for timezone.el -*- lexical-binding: t; -*- -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; Author: Stefan Kangas <stefankangas@gmail.com> diff --git a/test/lisp/url/url-auth-tests.el b/test/lisp/url/url-auth-tests.el index d3acdef8535..ff30f100250 100644 --- a/test/lisp/url/url-auth-tests.el +++ b/test/lisp/url/url-auth-tests.el @@ -1,6 +1,6 @@ ;;; url-auth-tests.el --- Test suite for url-auth. -*- lexical-binding:t -*- -;; Copyright (C) 2015-2020 Free Software Foundation, Inc. +;; Copyright (C) 2015-2021 Free Software Foundation, Inc. ;; Author: Jarno Malmari <jarno@malmari.fi> diff --git a/test/lisp/url/url-domsuf-tests.el b/test/lisp/url/url-domsuf-tests.el index a4fffb06311..d084c7a8bcb 100644 --- a/test/lisp/url/url-domsuf-tests.el +++ b/test/lisp/url/url-domsuf-tests.el @@ -1,6 +1,6 @@ ;;; url-domsuf-tests.el --- Tests for url-domsuf.el -*- lexical-binding:t -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/url/url-expand-tests.el b/test/lisp/url/url-expand-tests.el index 3b0b6fbd41a..52124dfedd8 100644 --- a/test/lisp/url/url-expand-tests.el +++ b/test/lisp/url/url-expand-tests.el @@ -1,6 +1,6 @@ ;;; url-expand-tests.el --- Test suite for relative URI/URL resolution. -*- lexical-binding:t -*- -;; Copyright (C) 2012-2020 Free Software Foundation, Inc. +;; Copyright (C) 2012-2021 Free Software Foundation, Inc. ;; Author: Alain Schneble <a.s@realize.ch> ;; Version: 1.0 diff --git a/test/lisp/url/url-file-tests.el b/test/lisp/url/url-file-tests.el index 810504faf2c..18365c79693 100644 --- a/test/lisp/url/url-file-tests.el +++ b/test/lisp/url/url-file-tests.el @@ -1,6 +1,6 @@ ;;; url-file-tests.el --- Test suite for url-file. -*- lexical-binding: t -*- -;; Copyright (C) 2018-2020 Free Software Foundation, Inc. +;; Copyright (C) 2018-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/url/url-future-tests.el b/test/lisp/url/url-future-tests.el index 43668036b69..8b0e20c4dde 100644 --- a/test/lisp/url/url-future-tests.el +++ b/test/lisp/url/url-future-tests.el @@ -1,6 +1,6 @@ ;;; url-future-tests.el --- Test suite for url-future. -*- lexical-binding:t -*- -;; Copyright (C) 2011-2020 Free Software Foundation, Inc. +;; Copyright (C) 2011-2021 Free Software Foundation, Inc. ;; Author: Teodor Zlatanov <tzz@lifelogs.com> ;; Keywords: data diff --git a/test/lisp/url/url-handlers-test.el b/test/lisp/url/url-handlers-test.el index 57692e53a70..7e5a60363da 100644 --- a/test/lisp/url/url-handlers-test.el +++ b/test/lisp/url/url-handlers-test.el @@ -1,6 +1,6 @@ ;;; url-handlers-test.el --- Test suite for url-handlers.el -*- lexical-binding: t; -*- -;; Copyright (C) 2018-2020 Free Software Foundation, Inc. +;; Copyright (C) 2018-2021 Free Software Foundation, Inc. ;; Author: Nicolas Petton <nicolas@petton.fr> diff --git a/test/lisp/url/url-misc-tests.el b/test/lisp/url/url-misc-tests.el index 7b1467c9456..40c6edbd618 100644 --- a/test/lisp/url/url-misc-tests.el +++ b/test/lisp/url/url-misc-tests.el @@ -1,6 +1,6 @@ ;;; url-misc-tests.el --- Test suite for url-misc. -*- lexical-binding: t -*- -;; Copyright (C) 2018-2020 Free Software Foundation, Inc. +;; Copyright (C) 2018-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/url/url-parse-tests.el b/test/lisp/url/url-parse-tests.el index 6ec46479a6f..2418af40aca 100644 --- a/test/lisp/url/url-parse-tests.el +++ b/test/lisp/url/url-parse-tests.el @@ -1,6 +1,6 @@ ;;; url-parse-tests.el --- Test suite for URI/URL parsing. -*- lexical-binding:t -*- -;; Copyright (C) 2012-2020 Free Software Foundation, Inc. +;; Copyright (C) 2012-2021 Free Software Foundation, Inc. ;; Author: Alain Schneble <a.s@realize.ch> ;; Version: 1.0 diff --git a/test/lisp/url/url-tramp-tests.el b/test/lisp/url/url-tramp-tests.el index 965b9ea0888..63d752ac3a0 100644 --- a/test/lisp/url/url-tramp-tests.el +++ b/test/lisp/url/url-tramp-tests.el @@ -1,6 +1,6 @@ ;;; url-tramp-tests.el --- Test suite for Tramp / URL conversion. -*- lexical-binding:t -*- -;; Copyright (C) 2017-2020 Free Software Foundation, Inc. +;; Copyright (C) 2017-2021 Free Software Foundation, Inc. ;; Author: Michael Albinus <michael.albinus@gmx.de> diff --git a/test/lisp/url/url-util-tests.el b/test/lisp/url/url-util-tests.el index 0416331b032..57b67a04ccf 100644 --- a/test/lisp/url/url-util-tests.el +++ b/test/lisp/url/url-util-tests.el @@ -1,6 +1,6 @@ ;;; url-util-tests.el --- Test suite for url-util. -*- lexical-binding:t -*- -;; Copyright (C) 2012-2020 Free Software Foundation, Inc. +;; Copyright (C) 2012-2021 Free Software Foundation, Inc. ;; Author: Teodor Zlatanov <tzz@lifelogs.com> ;; Keywords: data diff --git a/test/lisp/vc/add-log-tests.el b/test/lisp/vc/add-log-tests.el index f256945ee42..dc2b9961c6c 100644 --- a/test/lisp/vc/add-log-tests.el +++ b/test/lisp/vc/add-log-tests.el @@ -1,6 +1,6 @@ ;;; add-log-tests.el --- Test suite for add-log. -*- lexical-binding:t -*- -;; Copyright (C) 2013-2020 Free Software Foundation, Inc. +;; Copyright (C) 2013-2021 Free Software Foundation, Inc. ;; Author: Masatake YAMATO <yamato@redhat.com> ;; Keywords: vc tools diff --git a/test/lisp/vc/diff-mode-tests.el b/test/lisp/vc/diff-mode-tests.el index b25836405cc..f4e5c89afb4 100644 --- a/test/lisp/vc/diff-mode-tests.el +++ b/test/lisp/vc/diff-mode-tests.el @@ -1,6 +1,6 @@ ;;; diff-mode-tests.el --- Tests for diff-mode.el -*- lexical-binding:t -*- -;; Copyright (C) 2017-2020 Free Software Foundation, Inc. +;; Copyright (C) 2017-2021 Free Software Foundation, Inc. ;; Author: Dima Kogan <dima@secretsauce.net> ;; Maintainer: emacs-devel@gnu.org diff --git a/test/lisp/vc/ediff-diff-tests.el b/test/lisp/vc/ediff-diff-tests.el index e6d52053d0c..001db8b0c4a 100644 --- a/test/lisp/vc/ediff-diff-tests.el +++ b/test/lisp/vc/ediff-diff-tests.el @@ -1,6 +1,6 @@ ;;; ediff-diff-tests.el --- Unit tests for ediff-diff.el -*- lexical-binding: t; -*- -;; Copyright (C) 2017-2020 Free Software Foundation, Inc. +;; Copyright (C) 2017-2021 Free Software Foundation, Inc. ;; Author: Philipp Stephani <phst@google.com> diff --git a/test/lisp/vc/ediff-ptch-tests.el b/test/lisp/vc/ediff-ptch-tests.el index 15270d68cb5..a464db2349d 100644 --- a/test/lisp/vc/ediff-ptch-tests.el +++ b/test/lisp/vc/ediff-ptch-tests.el @@ -1,6 +1,6 @@ ;;; ediff-ptch-tests.el --- Tests for ediff-ptch.el -*- lexical-binding:t -*- -;; Copyright (C) 2016-2020 Free Software Foundation, Inc. +;; Copyright (C) 2016-2021 Free Software Foundation, Inc. ;; Author: Tino Calancha <tino.calancha@gmail.com> diff --git a/test/lisp/vc/log-edit-tests.el b/test/lisp/vc/log-edit-tests.el index 86a40a97b19..84e363ad691 100644 --- a/test/lisp/vc/log-edit-tests.el +++ b/test/lisp/vc/log-edit-tests.el @@ -1,6 +1,6 @@ ;;; log-edit-tests.el --- Unit tests for log-edit.el -*- lexical-binding: t; -*- -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/vc/smerge-mode-tests.el b/test/lisp/vc/smerge-mode-tests.el index 5b15a0931d1..2c8f48618e5 100644 --- a/test/lisp/vc/smerge-mode-tests.el +++ b/test/lisp/vc/smerge-mode-tests.el @@ -1,6 +1,6 @@ ;;; smerge-mode-tests.el --- Tests for smerge-mode.el -*- lexical-binding:t -*- -;; Copyright (C) 2017-2020 Free Software Foundation, Inc. +;; Copyright (C) 2017-2021 Free Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org diff --git a/test/lisp/vc/vc-bzr-tests.el b/test/lisp/vc/vc-bzr-tests.el index bd26f7979dc..aeab51ec261 100644 --- a/test/lisp/vc/vc-bzr-tests.el +++ b/test/lisp/vc/vc-bzr-tests.el @@ -1,6 +1,6 @@ ;;; vc-bzr.el --- tests for vc/vc-bzr.el -*- lexical-binding: t -*- -;; Copyright (C) 2011-2020 Free Software Foundation, Inc. +;; Copyright (C) 2011-2021 Free Software Foundation, Inc. ;; Author: Glenn Morris <rgm@gnu.org> ;; Maintainer: emacs-devel@gnu.org diff --git a/test/lisp/vc/vc-hg-tests.el b/test/lisp/vc/vc-hg-tests.el index e4a20bbf2da..2edd4b6fd71 100644 --- a/test/lisp/vc/vc-hg-tests.el +++ b/test/lisp/vc/vc-hg-tests.el @@ -1,6 +1,6 @@ ;;; vc-hg-tests.el --- tests for vc/vc-hg.el -*- lexical-binding:t -*- -;; Copyright (C) 2016-2020 Free Software Foundation, Inc. +;; Copyright (C) 2016-2021 Free Software Foundation, Inc. ;; Author: Dmitry Gutov <dgutov@yandex.ru> ;; Maintainer: emacs-devel@gnu.org diff --git a/test/lisp/vc/vc-tests.el b/test/lisp/vc/vc-tests.el index a2936cca824..5430535c5ed 100644 --- a/test/lisp/vc/vc-tests.el +++ b/test/lisp/vc/vc-tests.el @@ -1,6 +1,6 @@ ;;; vc-tests.el --- Tests of different backends of vc.el -*- lexical-binding:t -*- -;; Copyright (C) 2014-2020 Free Software Foundation, Inc. +;; Copyright (C) 2014-2021 Free Software Foundation, Inc. ;; Author: Michael Albinus <michael.albinus@gmx.de> diff --git a/test/lisp/version-tests.el b/test/lisp/version-tests.el index 8fbd4a19fc5..ef2e9453052 100644 --- a/test/lisp/version-tests.el +++ b/test/lisp/version-tests.el @@ -1,6 +1,6 @@ ;;; version-tests.el --- Tests for version.el -*- lexical-binding: t -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/wdired-tests.el b/test/lisp/wdired-tests.el index f876967bf98..ba276e24d96 100644 --- a/test/lisp/wdired-tests.el +++ b/test/lisp/wdired-tests.el @@ -1,6 +1,6 @@ ;;; wdired-tests.el --- tests for wdired.el -*- lexical-binding: t; -*- -;; Copyright (C) 2018-2020 Free Software Foundation, Inc. +;; Copyright (C) 2018-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/whitespace-tests.el b/test/lisp/whitespace-tests.el index cb3189c3d9e..9f54a4fd340 100644 --- a/test/lisp/whitespace-tests.el +++ b/test/lisp/whitespace-tests.el @@ -1,6 +1,6 @@ ;;; whitespace-tests.el --- Test suite for whitespace -*- lexical-binding: t -*- -;; Copyright (C) 2016-2020 Free Software Foundation, Inc. +;; Copyright (C) 2016-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/wid-edit-tests.el b/test/lisp/wid-edit-tests.el index 1bd429736ea..35235c65665 100644 --- a/test/lisp/wid-edit-tests.el +++ b/test/lisp/wid-edit-tests.el @@ -1,6 +1,6 @@ ;;; wid-edit-tests.el --- tests for wid-edit.el -*- lexical-binding: t -*- -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/xdg-tests.el b/test/lisp/xdg-tests.el index c2a16006c35..67cd9401937 100644 --- a/test/lisp/xdg-tests.el +++ b/test/lisp/xdg-tests.el @@ -1,6 +1,6 @@ ;;; xdg-tests.el --- tests for xdg.el -*- lexical-binding: t -*- -;; Copyright (C) 2017-2020 Free Software Foundation, Inc. +;; Copyright (C) 2017-2021 Free Software Foundation, Inc. ;; Author: Mark Oteiza <mvoteiza@udel.edu> ;; Maintainer: emacs-devel@gnu.org diff --git a/test/lisp/xml-tests.el b/test/lisp/xml-tests.el index d09336c0080..cd3e1138f4b 100644 --- a/test/lisp/xml-tests.el +++ b/test/lisp/xml-tests.el @@ -1,6 +1,6 @@ ;;; xml-parse-tests.el --- Test suite for XML parsing. -*- lexical-binding:t -*- -;; Copyright (C) 2012-2020 Free Software Foundation, Inc. +;; Copyright (C) 2012-2021 Free Software Foundation, Inc. ;; Author: Chong Yidong <cyd@stupidchicken.com> ;; Keywords: internal diff --git a/test/lisp/xt-mouse-tests.el b/test/lisp/xt-mouse-tests.el index 12840df13fe..72659ddf99b 100644 --- a/test/lisp/xt-mouse-tests.el +++ b/test/lisp/xt-mouse-tests.el @@ -1,6 +1,6 @@ ;;; xt-mouse-tests.el --- Test suite for xt-mouse. -*- lexical-binding: t; -*- -;; Copyright (C) 2016-2020 Free Software Foundation, Inc. +;; Copyright (C) 2016-2021 Free Software Foundation, Inc. ;; Author: Philipp Stephani <phst@google.com> diff --git a/test/manual/biditest.el b/test/manual/biditest.el index c4ee96a79c6..dc78ef55b03 100644 --- a/test/manual/biditest.el +++ b/test/manual/biditest.el @@ -1,6 +1,6 @@ ;;; biditest.el --- test bidi reordering in GNU Emacs display engine. -;; Copyright (C) 2013-2020 Free Software Foundation, Inc. +;; Copyright (C) 2013-2021 Free Software Foundation, Inc. ;; Author: Eli Zaretskii ;; Maintainer: emacs-devel@gnu.org diff --git a/test/manual/cedet/cedet-utests.el b/test/manual/cedet/cedet-utests.el index ee6be438dd3..7805fce2d12 100644 --- a/test/manual/cedet/cedet-utests.el +++ b/test/manual/cedet/cedet-utests.el @@ -1,6 +1,6 @@ ;;; cedet-utests.el --- Run all unit tests in the CEDET suite. -;; Copyright (C) 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2008-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/test/manual/cedet/ede-tests.el b/test/manual/cedet/ede-tests.el index 0fa7539e139..eb3132398a6 100644 --- a/test/manual/cedet/ede-tests.el +++ b/test/manual/cedet/ede-tests.el @@ -1,6 +1,6 @@ ;;; ede-tests.el --- Some tests for the Emacs Development Environment -;; Copyright (C) 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2008-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/test/manual/cedet/semantic-tests.el b/test/manual/cedet/semantic-tests.el index a0899cb9326..716bcc7abed 100644 --- a/test/manual/cedet/semantic-tests.el +++ b/test/manual/cedet/semantic-tests.el @@ -1,6 +1,6 @@ ;;; semantic-utest.el --- Miscellaneous Semantic tests. -;;; Copyright (C) 2003-2004, 2007-2020 Free Software Foundation, Inc. +;;; Copyright (C) 2003-2004, 2007-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/test/manual/cedet/srecode-tests.el b/test/manual/cedet/srecode-tests.el index 7c42dfbd000..ebc3261f817 100644 --- a/test/manual/cedet/srecode-tests.el +++ b/test/manual/cedet/srecode-tests.el @@ -1,6 +1,6 @@ ;;; srecode-tests.el --- Some tests for CEDET's srecode -;; Copyright (C) 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2008-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/test/manual/cedet/tests/test-fmt.cpp b/test/manual/cedet/tests/test-fmt.cpp index 31cd6296f3d..ab869c1ce00 100644 --- a/test/manual/cedet/tests/test-fmt.cpp +++ b/test/manual/cedet/tests/test-fmt.cpp @@ -1,6 +1,6 @@ /** test-fmt.cpp --- Signatures, and format answers for testing * - * Copyright (C) 2012, 2016, 2019-2020 Free Software Foundation + * Copyright (C) 2012, 2016, 2019-2021 Free Software Foundation, Inc. * * Author: Eric M. Ludlam <zappo@gnu.org> * diff --git a/test/manual/cedet/tests/test-fmt.el b/test/manual/cedet/tests/test-fmt.el index 39641dc865c..122571323b2 100644 --- a/test/manual/cedet/tests/test-fmt.el +++ b/test/manual/cedet/tests/test-fmt.el @@ -1,6 +1,6 @@ ;;; test-fmt.el --- test semantic tag formatting -;;; Copyright (C) 2012, 2019-2020 Free Software Foundation, Inc. +;;; Copyright (C) 2012, 2019-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/test/manual/cedet/tests/test.c b/test/manual/cedet/tests/test.c index daecb544792..2cdaf4fb0ab 100644 --- a/test/manual/cedet/tests/test.c +++ b/test/manual/cedet/tests/test.c @@ -1,6 +1,6 @@ /* test.c --- Semantic unit test for C. - Copyright (C) 2001-2020 Free Software Foundation, Inc. + Copyright (C) 2001-2021 Free Software Foundation, Inc. Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/test/manual/cedet/tests/test.el b/test/manual/cedet/tests/test.el index f82e3fbdbcf..3bc945d89f8 100644 --- a/test/manual/cedet/tests/test.el +++ b/test/manual/cedet/tests/test.el @@ -1,6 +1,6 @@ ;;; test.el --- Unit test file for Semantic Emacs Lisp support. -;; Copyright (C) 2005-2020 Free Software Foundation, Inc. +;; Copyright (C) 2005-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/test/manual/cedet/tests/test.make b/test/manual/cedet/tests/test.make index 2da09841a06..9841567b6b2 100644 --- a/test/manual/cedet/tests/test.make +++ b/test/manual/cedet/tests/test.make @@ -1,6 +1,6 @@ # test.make --- Semantic unit test for Make -*- makefile -*- -# Copyright (C) 2001-2002, 2010-2020 Free Software Foundation, Inc. +# Copyright (C) 2001-2002, 2010-2021 Free Software Foundation, Inc. # Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/test/manual/cedet/tests/test.srt b/test/manual/cedet/tests/test.srt index 24769ec0e6e..38e6f9ed7b7 100644 --- a/test/manual/cedet/tests/test.srt +++ b/test/manual/cedet/tests/test.srt @@ -1,6 +1,6 @@ ;; test.srt --- unit test support file for semantic-utest-ia -;; Copyright (C) 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2008-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/test/manual/cedet/tests/testdoublens.cpp b/test/manual/cedet/tests/testdoublens.cpp index e25e6049c11..ea3afc72a69 100644 --- a/test/manual/cedet/tests/testdoublens.cpp +++ b/test/manual/cedet/tests/testdoublens.cpp @@ -1,6 +1,6 @@ // testdoublens.cpp --- semantic-ia-utest completion engine unit tests -// Copyright (C) 2008-2020 Free Software Foundation, Inc. +// Copyright (C) 2008-2021 Free Software Foundation, Inc. // Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/test/manual/cedet/tests/testdoublens.hpp b/test/manual/cedet/tests/testdoublens.hpp index 4338f285a94..e8c9b345b28 100644 --- a/test/manual/cedet/tests/testdoublens.hpp +++ b/test/manual/cedet/tests/testdoublens.hpp @@ -1,6 +1,6 @@ // testdoublens.hpp --- Header file used in one of the Semantic tests -// Copyright (C) 2008-2020 Free Software Foundation, Inc. +// Copyright (C) 2008-2021 Free Software Foundation, Inc. // Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/test/manual/cedet/tests/testjavacomp.java b/test/manual/cedet/tests/testjavacomp.java index 09ec4e0b7f0..bfc016903c8 100644 --- a/test/manual/cedet/tests/testjavacomp.java +++ b/test/manual/cedet/tests/testjavacomp.java @@ -1,6 +1,6 @@ // testjavacomp.java --- Semantic unit test for Java -// Copyright (C) 2009-2020 Free Software Foundation, Inc. +// Copyright (C) 2009-2021 Free Software Foundation, Inc. // Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/test/manual/cedet/tests/testlocalvars.cpp b/test/manual/cedet/tests/testlocalvars.cpp index f4853facf16..9d2329a0fa8 100644 --- a/test/manual/cedet/tests/testlocalvars.cpp +++ b/test/manual/cedet/tests/testlocalvars.cpp @@ -1,6 +1,6 @@ // testlocalvars.java --- Semantic unit test for Java -// Copyright (C) 2009-2020 Free Software Foundation, Inc. +// Copyright (C) 2009-2021 Free Software Foundation, Inc. // Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/test/manual/cedet/tests/testnsp.cpp b/test/manual/cedet/tests/testnsp.cpp index b72a44c8ca8..db1603cead2 100644 --- a/test/manual/cedet/tests/testnsp.cpp +++ b/test/manual/cedet/tests/testnsp.cpp @@ -1,6 +1,6 @@ /* testnsp.cpp --- semantic-ia-utest completion engine unit tests - Copyright (C) 2008-2020 Free Software Foundation, Inc. + Copyright (C) 2008-2021 Free Software Foundation, Inc. Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/test/manual/cedet/tests/testpolymorph.cpp b/test/manual/cedet/tests/testpolymorph.cpp index 2a24a599f90..e4befcf0ff5 100644 --- a/test/manual/cedet/tests/testpolymorph.cpp +++ b/test/manual/cedet/tests/testpolymorph.cpp @@ -1,6 +1,6 @@ /** testpolymorph.cpp --- A sequence of polymorphism examples. * - * Copyright (C) 2009-2020 Free Software Foundation, Inc. + * Copyright (C) 2009-2021 Free Software Foundation, Inc. * * Author: Eric M. Ludlam <zappo@gnu.org> * diff --git a/test/manual/cedet/tests/testspp.c b/test/manual/cedet/tests/testspp.c index 8acdb1ba26b..2698f48d5f9 100644 --- a/test/manual/cedet/tests/testspp.c +++ b/test/manual/cedet/tests/testspp.c @@ -1,6 +1,6 @@ /* testspp.cpp --- Semantic unit test for the C preprocessor - Copyright (C) 2007-2020 Free Software Foundation, Inc. + Copyright (C) 2007-2021 Free Software Foundation, Inc. Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/test/manual/cedet/tests/testsppcomplete.c b/test/manual/cedet/tests/testsppcomplete.c index b2612fa45c8..084d6a8687d 100644 --- a/test/manual/cedet/tests/testsppcomplete.c +++ b/test/manual/cedet/tests/testsppcomplete.c @@ -1,6 +1,6 @@ /* testesppcomplete.cpp --- semantic-ia-utest completion engine unit tests - Copyright (C) 2008-2020 Free Software Foundation, Inc. + Copyright (C) 2008-2021 Free Software Foundation, Inc. Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/test/manual/cedet/tests/testsppreplace.c b/test/manual/cedet/tests/testsppreplace.c index a9ea9a7428f..42a22e14b09 100644 --- a/test/manual/cedet/tests/testsppreplace.c +++ b/test/manual/cedet/tests/testsppreplace.c @@ -1,5 +1,5 @@ /* testsppreplace.c --- unit test for CPP/SPP Replacement - Copyright (C) 2007-2020 Free Software Foundation, Inc. + Copyright (C) 2007-2021 Free Software Foundation, Inc. Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/test/manual/cedet/tests/testsppreplaced.c b/test/manual/cedet/tests/testsppreplaced.c index 25175426605..d546d61bff6 100644 --- a/test/manual/cedet/tests/testsppreplaced.c +++ b/test/manual/cedet/tests/testsppreplaced.c @@ -1,5 +1,5 @@ /* testsppreplaced.c --- unit test for CPP/SPP Replacement - Copyright (C) 2007-2020 Free Software Foundation, Inc. + Copyright (C) 2007-2021 Free Software Foundation, Inc. Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/test/manual/cedet/tests/teststruct.cpp b/test/manual/cedet/tests/teststruct.cpp index 10217c11ac7..6659b5557b8 100644 --- a/test/manual/cedet/tests/teststruct.cpp +++ b/test/manual/cedet/tests/teststruct.cpp @@ -1,6 +1,6 @@ // teststruct.cpp --- semantic-ia-utest completion engine unit tests -// Copyright (C) 2008-2020 Free Software Foundation, Inc. +// Copyright (C) 2008-2021 Free Software Foundation, Inc. // Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/test/manual/cedet/tests/testsubclass.cpp b/test/manual/cedet/tests/testsubclass.cpp index 8a2e8d7e308..409950cce2f 100644 --- a/test/manual/cedet/tests/testsubclass.cpp +++ b/test/manual/cedet/tests/testsubclass.cpp @@ -1,6 +1,6 @@ // testsubclass.cpp --- unit test for analyzer and complex C++ inheritance -// Copyright (C) 2007-2020 Free Software Foundation, Inc. +// Copyright (C) 2007-2021 Free Software Foundation, Inc. // Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/test/manual/cedet/tests/testsubclass.hh b/test/manual/cedet/tests/testsubclass.hh index cbca24d3f64..5d795b32b10 100644 --- a/test/manual/cedet/tests/testsubclass.hh +++ b/test/manual/cedet/tests/testsubclass.hh @@ -1,6 +1,6 @@ // testsubclass.hh --- unit test for analyzer and complex C++ inheritance -// Copyright (C) 2007-2020 Free Software Foundation, Inc. +// Copyright (C) 2007-2021 Free Software Foundation, Inc. // Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/test/manual/cedet/tests/testtemplates.cpp b/test/manual/cedet/tests/testtemplates.cpp index 6f376e7f8ff..ed7a057df0b 100644 --- a/test/manual/cedet/tests/testtemplates.cpp +++ b/test/manual/cedet/tests/testtemplates.cpp @@ -1,6 +1,6 @@ // testtemplates.cpp --- semantic-ia-utest completion engine unit tests -// Copyright (C) 2008-2020 Free Software Foundation, Inc. +// Copyright (C) 2008-2021 Free Software Foundation, Inc. // Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/test/manual/cedet/tests/testtypedefs.cpp b/test/manual/cedet/tests/testtypedefs.cpp index 9d257763327..c82535f9581 100644 --- a/test/manual/cedet/tests/testtypedefs.cpp +++ b/test/manual/cedet/tests/testtypedefs.cpp @@ -1,6 +1,6 @@ // testtypedefs.cpp --- Sample with some fake bits out of std::string -// Copyright (C) 2008-2020 Free Software Foundation, Inc. +// Copyright (C) 2008-2021 Free Software Foundation, Inc. // Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/test/manual/cedet/tests/testusing.cpp b/test/manual/cedet/tests/testusing.cpp index df6ab2f510d..6f6c8542633 100644 --- a/test/manual/cedet/tests/testusing.cpp +++ b/test/manual/cedet/tests/testusing.cpp @@ -1,6 +1,6 @@ // testusing.cpp --- semantic-ia-utest completion engine unit tests -// Copyright (C) 2008-2020 Free Software Foundation, Inc. +// Copyright (C) 2008-2021 Free Software Foundation, Inc. // Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/test/manual/cedet/tests/testusing.hh b/test/manual/cedet/tests/testusing.hh index cd703f00747..d3b690f8542 100644 --- a/test/manual/cedet/tests/testusing.hh +++ b/test/manual/cedet/tests/testusing.hh @@ -1,6 +1,6 @@ // testusing.hh --- semantic-ia-utest completion engine unit tests -// Copyright (C) 2008-2020 Free Software Foundation, Inc. +// Copyright (C) 2008-2021 Free Software Foundation, Inc. // Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/test/manual/cedet/tests/testvarnames.c b/test/manual/cedet/tests/testvarnames.c index 940c0ffc50b..e796eb285c6 100644 --- a/test/manual/cedet/tests/testvarnames.c +++ b/test/manual/cedet/tests/testvarnames.c @@ -1,6 +1,6 @@ /* testvarnames.cpp --- semantic-ia-utest completion engine unit tests - Copyright (C) 2008-2020 Free Software Foundation, Inc. + Copyright (C) 2008-2021 Free Software Foundation, Inc. Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/test/manual/cedet/tests/testvarnames.java b/test/manual/cedet/tests/testvarnames.java index c1cbf6e75a7..7ed9785fc07 100644 --- a/test/manual/cedet/tests/testvarnames.java +++ b/test/manual/cedet/tests/testvarnames.java @@ -1,6 +1,6 @@ // testvarnames.java --- Semantic unit test for Java -// Copyright (C) 2009-2020 Free Software Foundation, Inc. +// Copyright (C) 2009-2021 Free Software Foundation, Inc. // Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/test/manual/cedet/tests/testwisent.wy b/test/manual/cedet/tests/testwisent.wy index cc600e474c8..49eb5780f4b 100644 --- a/test/manual/cedet/tests/testwisent.wy +++ b/test/manual/cedet/tests/testwisent.wy @@ -1,6 +1,6 @@ ;; testwisent.wy --- unit test support file for semantic-utest-ia -;; Copyright (C) 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2008-2021 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/test/manual/etags/c-src/abbrev.c b/test/manual/etags/c-src/abbrev.c index 44563d6046a..039addc5a30 100644 --- a/test/manual/etags/c-src/abbrev.c +++ b/test/manual/etags/c-src/abbrev.c @@ -1,5 +1,5 @@ /* Primitives for word-abbrev mode. - Copyright (C) 1985-1986, 1993, 1996, 1998, 2016-2020 Free Software + Copyright (C) 1985-1986, 1993, 1996, 1998, 2016-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/test/manual/etags/c-src/emacs/src/gmalloc.c b/test/manual/etags/c-src/emacs/src/gmalloc.c index e847e44f2a8..f56a243465b 100644 --- a/test/manual/etags/c-src/emacs/src/gmalloc.c +++ b/test/manual/etags/c-src/emacs/src/gmalloc.c @@ -1,5 +1,5 @@ /* Declarations for `malloc' and friends. - Copyright (C) 1990-1993, 1995-1996, 1999, 2002-2007, 2013-2020 Free + Copyright (C) 1990-1993, 1995-1996, 1999, 2002-2007, 2013-2021 Free Software Foundation, Inc. Written May 1989 by Mike Haertel. diff --git a/test/manual/etags/c-src/emacs/src/keyboard.c b/test/manual/etags/c-src/emacs/src/keyboard.c index e869363152b..db86515ef09 100644 --- a/test/manual/etags/c-src/emacs/src/keyboard.c +++ b/test/manual/etags/c-src/emacs/src/keyboard.c @@ -1,6 +1,6 @@ /* Keyboard and mouse input; editor command loop. -Copyright (C) 1985-1989, 1993-1997, 1999-2020 Free Software Foundation, +Copyright (C) 1985-1989, 1993-1997, 1999-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/test/manual/etags/c-src/emacs/src/lisp.h b/test/manual/etags/c-src/emacs/src/lisp.h index eceef4c00d1..e2744a1bf3e 100644 --- a/test/manual/etags/c-src/emacs/src/lisp.h +++ b/test/manual/etags/c-src/emacs/src/lisp.h @@ -1,6 +1,6 @@ /* Fundamental definitions for GNU Emacs Lisp interpreter. -Copyright (C) 1985-1987, 1993-1995, 1997-2020 Free Software Foundation, +Copyright (C) 1985-1987, 1993-1995, 1997-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/test/manual/etags/c-src/emacs/src/regex.h b/test/manual/etags/c-src/emacs/src/regex.h index 367aadaffc3..3e871303ea2 100644 --- a/test/manual/etags/c-src/emacs/src/regex.h +++ b/test/manual/etags/c-src/emacs/src/regex.h @@ -1,7 +1,7 @@ /* Definitions for data structures and routines for the regular expression library, version 0.12. - Copyright (C) 1985, 1989-1993, 1995, 2000-2020 Free Software + Copyright (C) 1985, 1989-1993, 1995, 2000-2021 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/test/manual/etags/c-src/etags.c b/test/manual/etags/c-src/etags.c index 2dd48978b12..7105ad5cba5 100644 --- a/test/manual/etags/c-src/etags.c +++ b/test/manual/etags/c-src/etags.c @@ -28,7 +28,7 @@ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -Copyright (C) 1984, 1987-1989, 1993-1995, 1998-2020 Free Software +Copyright (C) 1984, 1987-1989, 1993-1995, 1998-2021 Free Software Foundation, Inc. This file is not considered part of GNU Emacs. diff --git a/test/manual/etags/c-src/exit.c b/test/manual/etags/c-src/exit.c index 556ee93b4f2..93b3563d832 100644 --- a/test/manual/etags/c-src/exit.c +++ b/test/manual/etags/c-src/exit.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 2016-2020 Free Software Foundation, Inc. +/* Copyright (C) 1991, 2016-2021 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or diff --git a/test/manual/etags/c-src/exit.strange_suffix b/test/manual/etags/c-src/exit.strange_suffix index 556ee93b4f2..93b3563d832 100644 --- a/test/manual/etags/c-src/exit.strange_suffix +++ b/test/manual/etags/c-src/exit.strange_suffix @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 2016-2020 Free Software Foundation, Inc. +/* Copyright (C) 1991, 2016-2021 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or diff --git a/test/manual/etags/c-src/getopt.h b/test/manual/etags/c-src/getopt.h index eff9032b532..ec74c836f10 100644 --- a/test/manual/etags/c-src/getopt.h +++ b/test/manual/etags/c-src/getopt.h @@ -1,5 +1,5 @@ /* Declarations for getopt. - Copyright (C) 1989-1992, 2016-2020 Free Software Foundation, Inc. + Copyright (C) 1989-1992, 2016-2021 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 the diff --git a/test/manual/etags/c-src/sysdep.h b/test/manual/etags/c-src/sysdep.h index 3cafc9ee92e..187692f5c7c 100644 --- a/test/manual/etags/c-src/sysdep.h +++ b/test/manual/etags/c-src/sysdep.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1992-1993, 2016-2020 Free Software Foundation, Inc. +/* Copyright (C) 1992-1993, 2016-2021 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or diff --git a/test/manual/etags/el-src/emacs/lisp/progmodes/etags.el b/test/manual/etags/el-src/emacs/lisp/progmodes/etags.el index 3a999864f86..36f6624472d 100644 --- a/test/manual/etags/el-src/emacs/lisp/progmodes/etags.el +++ b/test/manual/etags/el-src/emacs/lisp/progmodes/etags.el @@ -1,6 +1,6 @@ ;;; etags.el --- etags facility for Emacs -*- lexical-binding: t -*- -;; Copyright (C) 1985-1986, 1988-1989, 1992-1996, 1998, 2000-2020 Free +;; Copyright (C) 1985-1986, 1988-1989, 1992-1996, 1998, 2000-2021 Free ;; Software Foundation, Inc. ;; Author: Roland McGrath <roland@gnu.org> diff --git a/test/manual/etags/tex-src/texinfo.tex b/test/manual/etags/tex-src/texinfo.tex index 8d84f513ba5..a04371d1c90 100644 --- a/test/manual/etags/tex-src/texinfo.tex +++ b/test/manual/etags/tex-src/texinfo.tex @@ -1,6 +1,6 @@ %% TeX macros to handle texinfo files -% Copyright (C) 1985--1986, 1988, 1990--1991, 2016--2020 Free Software +% Copyright (C) 1985--1986, 1988, 1990--1991, 2016--2021 Free Software % Foundation, Inc. %This texinfo.tex file is free software; you can redistribute it and/or diff --git a/test/manual/etags/y-src/cccp.c b/test/manual/etags/y-src/cccp.c index 89241cdc395..7156414b64e 100644 --- a/test/manual/etags/y-src/cccp.c +++ b/test/manual/etags/y-src/cccp.c @@ -320,7 +320,7 @@ static const short yycheck[] = #line 3 "/usr/share/bison/bison.simple" /* Skeleton output parser for bison, - Copyright (C) 1984, 1989-1990, 2000-2001, 2016-2020 Free Software + Copyright (C) 1984, 1989-1990, 2000-2001, 2016-2021 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/test/manual/etags/y-src/parse.c b/test/manual/etags/y-src/parse.c index 0415c4a1180..f90d31505f0 100644 --- a/test/manual/etags/y-src/parse.c +++ b/test/manual/etags/y-src/parse.c @@ -28,7 +28,7 @@ #line 1 "y-src/parse.y" -/* Copyright (C) 1990, 1992-1993, 2016-2020 Free Software Foundation, +/* Copyright (C) 1990, 1992-1993, 2016-2021 Free Software Foundation, * Inc. This file is part of Oleo, the GNU Spreadsheet. diff --git a/test/manual/etags/y-src/parse.y b/test/manual/etags/y-src/parse.y index eeef44cc6eb..7985da525be 100644 --- a/test/manual/etags/y-src/parse.y +++ b/test/manual/etags/y-src/parse.y @@ -1,5 +1,5 @@ %{ -/* Copyright (C) 1990, 1992-1993, 2016-2020 Free Software Foundation, +/* Copyright (C) 1990, 1992-1993, 2016-2021 Free Software Foundation, * Inc. This file is part of Oleo, the GNU Spreadsheet. diff --git a/test/manual/image-circular-tests.el b/test/manual/image-circular-tests.el index 33ea3ea9547..3d1d23234b7 100644 --- a/test/manual/image-circular-tests.el +++ b/test/manual/image-circular-tests.el @@ -1,6 +1,6 @@ -;;; image-tests.el --- Test suite for image-related functions. +;;; image-circular-tests.el --- test image functions with circular objects -;; Copyright (C) 2019 Free Software Foundation, Inc. +;; Copyright (C) 2019, 2021 Free Software Foundation, Inc. ;; Author: Pip Cet <pipcet@gmail.com> ;; Keywords: internal @@ -61,84 +61,5 @@ (and (equal (image-size spec1 t) (cons 1 1)) (equal (image-size spec2 t) (cons 1 1)))))) -(provide 'image-tests) -;;; image-tests.el ends here. -;;; image-tests.el --- tests for image.el -*- lexical-binding: t -*- - -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. - -;; This file is part of GNU Emacs. - -;; GNU Emacs is free software: you can redistribute it and/or modify -;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation, either version 3 of the License, or -;; (at your option) any later version. - -;; GNU Emacs is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;; GNU General Public License for more details. - -;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. - -;;; Code: - -(require 'ert) -(require 'image) -(eval-when-compile - (require 'cl-lib)) - -(defconst image-tests--emacs-images-directory - (expand-file-name "../etc/images" (getenv "EMACS_TEST_DIRECTORY")) - "Directory containing Emacs images.") - -(ert-deftest image--set-property () - "Test `image--set-property' behavior." - (let ((image (list 'image))) - ;; Add properties. - (setf (image-property image :scale) 1) - (should (equal image '(image :scale 1))) - (setf (image-property image :width) 8) - (should (equal image '(image :scale 1 :width 8))) - (setf (image-property image :height) 16) - (should (equal image '(image :scale 1 :width 8 :height 16))) - ;; Delete properties. - (setf (image-property image :type) nil) - (should (equal image '(image :scale 1 :width 8 :height 16))) - (setf (image-property image :scale) nil) - (should (equal image '(image :width 8 :height 16))) - (setf (image-property image :height) nil) - (should (equal image '(image :width 8))) - (setf (image-property image :width) nil) - (should (equal image '(image))))) - -(ert-deftest image-type-from-file-header-test () - "Test image-type-from-file-header." - (should (eq (if (image-type-available-p 'svg) 'svg) - (image-type-from-file-header - (expand-file-name "splash.svg" - image-tests--emacs-images-directory))))) - -(ert-deftest image-rotate () - "Test `image-rotate'." - (cl-letf* ((image (list 'image)) - ((symbol-function 'image--get-imagemagick-and-warn) - (lambda () image))) - (let ((current-prefix-arg '(4))) - (call-interactively #'image-rotate)) - (should (equal image '(image :rotation 270.0))) - (call-interactively #'image-rotate) - (should (equal image '(image :rotation 0.0))) - (image-rotate) - (should (equal image '(image :rotation 90.0))) - (image-rotate 0) - (should (equal image '(image :rotation 90.0))) - (image-rotate 1) - (should (equal image '(image :rotation 91.0))) - (image-rotate 1234.5) - (should (equal image '(image :rotation 245.5))) - (image-rotate -154.5) - (should (equal image '(image :rotation 91.0))))) - -;;; image-tests.el ends here +(provide 'image-circular-tests) +;;; image-circular-tests.el ends here. diff --git a/test/manual/image-size-tests.el b/test/manual/image-size-tests.el index 159e9025ae3..489b3972932 100644 --- a/test/manual/image-size-tests.el +++ b/test/manual/image-size-tests.el @@ -1,6 +1,6 @@ ;;; image-size-tests.el -- tests for image scaling -;; Copyright (C) 2017-2020 Free Software Foundation, Inc. +;; Copyright (C) 2017-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/manual/image-transforms-tests.el b/test/manual/image-transforms-tests.el index 13d74a7c4b5..5342b5edcae 100644 --- a/test/manual/image-transforms-tests.el +++ b/test/manual/image-transforms-tests.el @@ -1,6 +1,6 @@ ;;; image-transform-tests.el --- Test suite for image transforms. -*- lexical-binding: t -*- -;; Copyright (C) 2019-2020 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; Author: Alan Third <alan@idiocy.org> ;; Keywords: internal diff --git a/test/manual/indent/pascal.pas b/test/manual/indent/pascal.pas index 35ee5215a59..a166eedbc5d 100644 --- a/test/manual/indent/pascal.pas +++ b/test/manual/indent/pascal.pas @@ -1,6 +1,6 @@ { GPC demo program for the CRT unit. -Copyright (C) 1999-2006, 2013-2020 Free Software Foundation, Inc. +Copyright (C) 1999-2006, 2013-2021 Free Software Foundation, Inc. Author: Frank Heckenbach <frank@pascal.gnu.de> diff --git a/test/manual/redisplay-testsuite.el b/test/manual/redisplay-testsuite.el index 46f4a923296..48f3788b54e 100644 --- a/test/manual/redisplay-testsuite.el +++ b/test/manual/redisplay-testsuite.el @@ -1,6 +1,6 @@ ;;; redisplay-testsuite.el --- Test suite for redisplay. -;; Copyright (C) 2009-2020 Free Software Foundation, Inc. +;; Copyright (C) 2009-2021 Free Software Foundation, Inc. ;; Author: Chong Yidong <cyd@stupidchicken.com> ;; Keywords: internal diff --git a/test/manual/scroll-tests.el b/test/manual/scroll-tests.el index 937e0b12799..2f40b2bb696 100644 --- a/test/manual/scroll-tests.el +++ b/test/manual/scroll-tests.el @@ -1,6 +1,6 @@ ;;; scroll-tests.el -- tests for scrolling -*- lexical-binding: t -*- -;; Copyright (C) 2017-2020 Free Software Foundation, Inc. +;; Copyright (C) 2017-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/src/alloc-tests.el b/test/src/alloc-tests.el index aa1ab1648f8..1324c2d3b4d 100644 --- a/test/src/alloc-tests.el +++ b/test/src/alloc-tests.el @@ -1,6 +1,6 @@ ;;; alloc-tests.el --- alloc tests -*- lexical-binding: t -*- -;; Copyright (C) 2015-2020 Free Software Foundation, Inc. +;; Copyright (C) 2015-2021 Free Software Foundation, Inc. ;; Author: Daniel Colascione <dancol@dancol.org> ;; Keywords: diff --git a/test/src/buffer-tests.el b/test/src/buffer-tests.el index dd8927457ae..123f2e8eabb 100644 --- a/test/src/buffer-tests.el +++ b/test/src/buffer-tests.el @@ -1,6 +1,6 @@ ;;; buffer-tests.el --- tests for buffer.c functions -*- lexical-binding: t -*- -;; Copyright (C) 2015-2020 Free Software Foundation, Inc. +;; Copyright (C) 2015-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/src/callint-tests.el b/test/src/callint-tests.el index 42dae424476..0df58877102 100644 --- a/test/src/callint-tests.el +++ b/test/src/callint-tests.el @@ -1,6 +1,6 @@ ;;; callint-tests.el --- unit tests for callint.c -*- lexical-binding: t; -*- -;; Copyright (C) 2018-2020 Free Software Foundation, Inc. +;; Copyright (C) 2018-2021 Free Software Foundation, Inc. ;; Author: Philipp Stephani <phst@google.com> diff --git a/test/src/callproc-tests.el b/test/src/callproc-tests.el index 1617d5e33d3..7262abbe0d0 100644 --- a/test/src/callproc-tests.el +++ b/test/src/callproc-tests.el @@ -1,6 +1,6 @@ ;;; callproc-tests.el --- callproc.c tests -*- lexical-binding: t -*- -;; Copyright (C) 2016-2020 Free Software Foundation, Inc. +;; Copyright (C) 2016-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/src/casefiddle-tests.el b/test/src/casefiddle-tests.el index 3eba4cfd78b..9fa54dcaf43 100644 --- a/test/src/casefiddle-tests.el +++ b/test/src/casefiddle-tests.el @@ -1,6 +1,6 @@ ;;; casefiddle-tests.el --- tests for casefiddle.c functions -*- lexical-binding: t -*- -;; Copyright (C) 2015-2016, 2018-2020 Free Software Foundation, Inc. +;; Copyright (C) 2015-2016, 2018-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/src/charset-tests.el b/test/src/charset-tests.el index 86a0d6ffc1a..5c46627c163 100644 --- a/test/src/charset-tests.el +++ b/test/src/charset-tests.el @@ -1,6 +1,6 @@ ;;; charset-tests.el --- Tests for charset.c -*- lexical-binding: t -*- -;; Copyright 2017-2020 Free Software Foundation, Inc. +;; Copyright 2017-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/src/chartab-tests.el b/test/src/chartab-tests.el index 4d52dc367c8..bf37fb51cf5 100644 --- a/test/src/chartab-tests.el +++ b/test/src/chartab-tests.el @@ -1,6 +1,6 @@ ;;; chartab-tests.el --- Tests for char-tab.c -*- lexical-binding: t -*- -;; Copyright (C) 2016-2020 Free Software Foundation, Inc. +;; Copyright (C) 2016-2021 Free Software Foundation, Inc. ;; Author: Eli Zaretskii <eliz@gnu.org> @@ -49,5 +49,25 @@ (#xe0e00 . #xe0ef6) ))) +(ert-deftest chartab-test-char-table-p () + (should (char-table-p (make-char-table 'foo))) + (should (not (char-table-p (make-hash-table))))) + +(ert-deftest chartab-test-char-table-subtype () + (should (eq (char-table-subtype (make-char-table 'foo)) 'foo))) + +(ert-deftest chartab-test-char-table-parent () + (should (eq (char-table-parent (make-char-table 'foo)) nil)) + (let ((parent (make-char-table 'foo)) + (child (make-char-table 'bar))) + (set-char-table-parent child parent) + (should (eq (char-table-parent child) parent)))) + +(ert-deftest chartab-test-char-table-extra-slot () + ;; Use any type with extra slots, e.g. 'case-table. + (let ((tbl (make-char-table 'case-table))) + (set-char-table-extra-slot tbl 1 'bar) + (should (eq (char-table-extra-slot tbl 1) 'bar)))) + (provide 'chartab-tests) ;;; chartab-tests.el ends here diff --git a/test/src/cmds-tests.el b/test/src/cmds-tests.el index 302b00c6760..681bfb30164 100644 --- a/test/src/cmds-tests.el +++ b/test/src/cmds-tests.el @@ -1,6 +1,6 @@ ;;; cmds-tests.el --- Testing some Emacs commands -*- lexical-binding: t -*- -;; Copyright (C) 2013-2020 Free Software Foundation, Inc. +;; Copyright (C) 2013-2021 Free Software Foundation, Inc. ;; Author: Nicolas Richard <youngfrog@members.fsf.org> ;; Keywords: diff --git a/test/src/coding-tests.el b/test/src/coding-tests.el index 82883a045c8..0bdcff22ce5 100644 --- a/test/src/coding-tests.el +++ b/test/src/coding-tests.el @@ -1,6 +1,6 @@ ;;; coding-tests.el --- tests for text encoding and decoding -*- lexical-binding: t -*- -;; Copyright (C) 2013-2020 Free Software Foundation, Inc. +;; Copyright (C) 2013-2021 Free Software Foundation, Inc. ;; Author: Eli Zaretskii <eliz@gnu.org> ;; Author: Kenichi Handa <handa@gnu.org> diff --git a/test/src/data-tests.el b/test/src/data-tests.el index c5fc3eaa11a..03d867f18a8 100644 --- a/test/src/data-tests.el +++ b/test/src/data-tests.el @@ -1,6 +1,6 @@ ;;; data-tests.el --- tests for src/data.c -*- lexical-binding:t -*- -;; Copyright (C) 2013-2020 Free Software Foundation, Inc. +;; Copyright (C) 2013-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/src/decompress-tests.el b/test/src/decompress-tests.el index 0a328396818..67a7fefb05e 100644 --- a/test/src/decompress-tests.el +++ b/test/src/decompress-tests.el @@ -1,6 +1,6 @@ ;;; decompress-tests.el --- Test suite for decompress. -*- lexical-binding: t -*- -;; Copyright (C) 2013-2020 Free Software Foundation, Inc. +;; Copyright (C) 2013-2021 Free Software Foundation, Inc. ;; Author: Lars Ingebrigtsen <larsi@gnus.org> diff --git a/test/src/editfns-tests.el b/test/src/editfns-tests.el index de0aeabfe78..64f9137865b 100644 --- a/test/src/editfns-tests.el +++ b/test/src/editfns-tests.el @@ -1,6 +1,6 @@ ;;; editfns-tests.el -- tests for editfns.c -*- lexical-binding:t -*- -;; Copyright (C) 2016-2020 Free Software Foundation, Inc. +;; Copyright (C) 2016-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/src/emacs-module-resources/mod-test.c b/test/src/emacs-module-resources/mod-test.c index 30ad352cf8b..ad59cfc18cd 100644 --- a/test/src/emacs-module-resources/mod-test.c +++ b/test/src/emacs-module-resources/mod-test.c @@ -1,6 +1,6 @@ /* Test GNU Emacs modules. -Copyright 2015-2020 Free Software Foundation, Inc. +Copyright 2015-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/test/src/emacs-module-tests.el b/test/src/emacs-module-tests.el index bf26ffb935c..af5bc2a0baf 100644 --- a/test/src/emacs-module-tests.el +++ b/test/src/emacs-module-tests.el @@ -1,6 +1,6 @@ ;;; emacs-module-tests --- Test GNU Emacs modules. -*- lexical-binding: t; -*- -;; Copyright 2015-2020 Free Software Foundation, Inc. +;; Copyright 2015-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/src/eval-tests.el b/test/src/eval-tests.el index 297db81f5ab..b2b7dfefda5 100644 --- a/test/src/eval-tests.el +++ b/test/src/eval-tests.el @@ -1,6 +1,6 @@ ;;; eval-tests.el --- unit tests for src/eval.c -*- lexical-binding: t; -*- -;; Copyright (C) 2016-2020 Free Software Foundation, Inc. +;; Copyright (C) 2016-2021 Free Software Foundation, Inc. ;; Author: Philipp Stephani <phst@google.com> diff --git a/test/src/fileio-tests.el b/test/src/fileio-tests.el index 8d46abf342a..7f193d4eeab 100644 --- a/test/src/fileio-tests.el +++ b/test/src/fileio-tests.el @@ -1,6 +1,6 @@ ;;; unit tests for src/fileio.c -*- lexical-binding: t; -*- -;; Copyright 2017-2020 Free Software Foundation, Inc. +;; Copyright 2017-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/src/floatfns-tests.el b/test/src/floatfns-tests.el index 8c56674d4fd..4a3c03d833e 100644 --- a/test/src/floatfns-tests.el +++ b/test/src/floatfns-tests.el @@ -1,6 +1,6 @@ ;;; floatfns-tests.el --- tests for floating point operations -*- lexical-binding: t -*- -;; Copyright 2017-2020 Free Software Foundation, Inc. +;; Copyright 2017-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/src/fns-tests.el b/test/src/fns-tests.el index e66dad44a1a..a9daf878b81 100644 --- a/test/src/fns-tests.el +++ b/test/src/fns-tests.el @@ -1,6 +1,6 @@ ;;; fns-tests.el --- tests for src/fns.c -*- lexical-binding:t -*- -;; Copyright (C) 2014-2020 Free Software Foundation, Inc. +;; Copyright (C) 2014-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/src/font-tests.el b/test/src/font-tests.el index cfc6f4c31b7..de153b8de9b 100644 --- a/test/src/font-tests.el +++ b/test/src/font-tests.el @@ -1,6 +1,6 @@ ;;; font-tests.el --- Test suite for font-related functions. -*- lexical-binding: t -*- -;; Copyright (C) 2011-2020 Free Software Foundation, Inc. +;; Copyright (C) 2011-2021 Free Software Foundation, Inc. ;; Author: Chong Yidong <cyd@stupidchicken.com> ;; Keywords: internal diff --git a/test/src/indent-tests.el b/test/src/indent-tests.el index 7d1a6ce6dc3..10f1202949b 100644 --- a/test/src/indent-tests.el +++ b/test/src/indent-tests.el @@ -1,6 +1,6 @@ ;;; indent-tests.el --- tests for src/indent.c -*- lexical-binding:t -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/src/inotify-tests.el b/test/src/inotify-tests.el index d42fe1b0086..5572c7d7a0f 100644 --- a/test/src/inotify-tests.el +++ b/test/src/inotify-tests.el @@ -1,6 +1,6 @@ ;;; inotify-tests.el --- Test suite for inotify. -*- lexical-binding: t -*- -;; Copyright (C) 2012-2020 Free Software Foundation, Inc. +;; Copyright (C) 2012-2021 Free Software Foundation, Inc. ;; Author: Rüdiger Sonderfeld <ruediger@c-plusplus.de> ;; Keywords: internal diff --git a/test/src/json-tests.el b/test/src/json-tests.el index 028f92f29d3..4be11b8c81a 100644 --- a/test/src/json-tests.el +++ b/test/src/json-tests.el @@ -1,6 +1,6 @@ ;;; json-tests.el --- unit tests for json.c -*- lexical-binding: t; -*- -;; Copyright (C) 2017-2020 Free Software Foundation, Inc. +;; Copyright (C) 2017-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/src/keyboard-tests.el b/test/src/keyboard-tests.el index 970a53555f9..607d2eafd45 100644 --- a/test/src/keyboard-tests.el +++ b/test/src/keyboard-tests.el @@ -1,6 +1,6 @@ ;;; keyboard-tests.el --- Tests for keyboard.c -*- lexical-binding: t -*- -;; Copyright (C) 2017-2020 Free Software Foundation, Inc. +;; Copyright (C) 2017-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/src/keymap-tests.el b/test/src/keymap-tests.el index f58dac87401..74fb3c892db 100644 --- a/test/src/keymap-tests.el +++ b/test/src/keymap-tests.el @@ -1,6 +1,6 @@ ;;; keymap-tests.el --- Test suite for src/keymap.c -*- lexical-binding: t -*- -;; Copyright (C) 2015-2020 Free Software Foundation, Inc. +;; Copyright (C) 2015-2021 Free Software Foundation, Inc. ;; Author: Juanma Barranquero <lekktu@gmail.com> ;; Stefan Kangas <stefankangas@gmail.com> diff --git a/test/src/lcms-tests.el b/test/src/lcms-tests.el index 4430d696807..40a48f1e9bb 100644 --- a/test/src/lcms-tests.el +++ b/test/src/lcms-tests.el @@ -1,6 +1,6 @@ ;;; lcms-tests.el --- tests for Little CMS interface -*- lexical-binding: t -*- -;; Copyright (C) 2017-2020 Free Software Foundation, Inc. +;; Copyright (C) 2017-2021 Free Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org diff --git a/test/src/lread-tests.el b/test/src/lread-tests.el index 825b74e6234..edf88214f97 100644 --- a/test/src/lread-tests.el +++ b/test/src/lread-tests.el @@ -1,6 +1,6 @@ ;;; lread-tests.el --- tests for lread.c -*- lexical-binding: t; -*- -;; Copyright (C) 2016-2020 Free Software Foundation, Inc. +;; Copyright (C) 2016-2021 Free Software Foundation, Inc. ;; Author: Philipp Stephani <phst@google.com> diff --git a/test/src/marker-tests.el b/test/src/marker-tests.el index 37140f8a10b..234a0b35ea7 100644 --- a/test/src/marker-tests.el +++ b/test/src/marker-tests.el @@ -1,6 +1,6 @@ ;;; marker-tests.el --- tests for marker.c functions -*- lexical-binding: t -*- -;; Copyright (C) 2016-2020 Free Software Foundation, Inc. +;; Copyright (C) 2016-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/src/minibuf-tests.el b/test/src/minibuf-tests.el index 13f5fac585b..b9cd255462d 100644 --- a/test/src/minibuf-tests.el +++ b/test/src/minibuf-tests.el @@ -1,6 +1,6 @@ ;;; minibuf-tests.el --- tests for minibuf.c functions -*- lexical-binding: t -*- -;; Copyright (C) 2016-2020 Free Software Foundation, Inc. +;; Copyright (C) 2016-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/src/print-tests.el b/test/src/print-tests.el index 202555adb3b..0d2ea6e3834 100644 --- a/test/src/print-tests.el +++ b/test/src/print-tests.el @@ -1,6 +1,6 @@ ;;; print-tests.el --- tests for src/print.c -*- lexical-binding: t; -*- -;; Copyright (C) 2014-2020 Free Software Foundation, Inc. +;; Copyright (C) 2014-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/src/process-tests.el b/test/src/process-tests.el index e15ad47f968..cddf955853e 100644 --- a/test/src/process-tests.el +++ b/test/src/process-tests.el @@ -1,6 +1,6 @@ ;;; process-tests.el --- Testing the process facilities -*- lexical-binding: t -*- -;; Copyright (C) 2013-2020 Free Software Foundation, Inc. +;; Copyright (C) 2013-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. @@ -23,8 +23,11 @@ ;;; Code: +(require 'cl-lib) (require 'ert) (require 'puny) +(require 'rx) +(require 'subr-x) ;; Timeout in seconds; the test fails if the timeout is reached. (defvar process-test-sentinel-wait-timeout 2.0) @@ -47,13 +50,15 @@ (ert-deftest process-test-sentinel-accept-process-output () (skip-unless (executable-find "bash")) + (with-timeout (60 (ert-fail "Test timed out")) (should (process-test-sentinel-wait-function-working-p - #'accept-process-output))) + #'accept-process-output)))) (ert-deftest process-test-sentinel-sit-for () (skip-unless (executable-find "bash")) + (with-timeout (60 (ert-fail "Test timed out")) (should - (process-test-sentinel-wait-function-working-p (lambda () (sit-for 0.01 t))))) + (process-test-sentinel-wait-function-working-p (lambda () (sit-for 0.01 t)))))) (when (eq system-type 'windows-nt) (ert-deftest process-test-quoted-batfile () @@ -79,6 +84,7 @@ (ert-deftest process-test-stderr-buffer () (skip-unless (executable-find "bash")) + (with-timeout (60 (ert-fail "Test timed out")) (let* ((stdout-buffer (generate-new-buffer "*stdout*")) (stderr-buffer (generate-new-buffer "*stderr*")) (proc (make-process :name "test" @@ -103,10 +109,11 @@ (looking-at "hello stdout!"))) (should (with-current-buffer stderr-buffer (goto-char (point-min)) - (looking-at "hello stderr!"))))) + (looking-at "hello stderr!")))))) (ert-deftest process-test-stderr-filter () (skip-unless (executable-find "bash")) + (with-timeout (60 (ert-fail "Test timed out")) (let* ((sentinel-called nil) (stderr-sentinel-called nil) (stdout-output nil) @@ -145,10 +152,11 @@ (should (equal 1 (with-current-buffer stderr-buffer (point-max)))) (should (equal "hello stderr!\n" - (mapconcat #'identity (nreverse stderr-output) ""))))) + (mapconcat #'identity (nreverse stderr-output) "")))))) (ert-deftest set-process-filter-t () "Test setting process filter to t and back." ;; Bug#36591 + (with-timeout (60 (ert-fail "Test timed out")) (with-temp-buffer (let* ((print-level nil) (print-length nil) @@ -180,11 +188,12 @@ (line-beginning-position) (point-max)) "2> ")) (accept-process-output proc)) ; Read "Two". - (should (equal (buffer-string) "0> one\n1> two\n2> "))))) + (should (equal (buffer-string) "0> one\n1> two\n2> ")))))) (ert-deftest start-process-should-not-modify-arguments () "`start-process' must not modify its arguments in-place." ;; See bug#21831. + (with-timeout (60 (ert-fail "Test timed out")) (let* ((path (pcase system-type ((or 'windows-nt 'ms-dos) ;; Make sure the file name uses forward slashes. @@ -198,11 +207,12 @@ (should (process-live-p (condition-case nil (start-process "" nil path) (error nil)))) - (should (equal path samepath)))) + (should (equal path samepath))))) (ert-deftest make-process/noquery-stderr () "Checks that Bug#30031 is fixed." (skip-unless (executable-find "sleep")) + (with-timeout (60 (ert-fail "Test timed out")) (with-temp-buffer (let* ((previous-processes (process-list)) (process (make-process :name "sleep" @@ -217,7 +227,7 @@ (should new-processes) (dolist (process new-processes) (should-not (process-query-on-exit-flag process)))) - (kill-process process))))) + (kill-process process)))))) ;; Return t if OUTPUT could have been generated by merging the INPUTS somehow. (defun process-tests--mixable (output &rest inputs) @@ -233,6 +243,7 @@ (ert-deftest make-process/mix-stderr () "Check that `make-process' mixes the output streams if STDERR is nil." (skip-unless (executable-find "bash")) + (with-timeout (60 (ert-fail "Test timed out")) ;; Frequent random (?) failures on hydra.nixos.org, with no process output. ;; Maybe this test should be tagged unstable? See bug#31214. (skip-unless (not (getenv "EMACS_HYDRA_CI"))) @@ -251,11 +262,12 @@ (should (eq (process-exit-status process) 0)) (should (process-tests--mixable (string-to-list (buffer-string)) (string-to-list "stdout\n") - (string-to-list "stderr\n")))))) + (string-to-list "stderr\n"))))))) (ert-deftest make-process-w32-debug-spawn-error () "Check that debugger runs on `make-process' failure (Bug#33016)." (skip-unless (eq system-type 'windows-nt)) + (with-timeout (60 (ert-fail "Test timed out")) (let* ((debug-on-error t) (have-called-debugger nil) (debugger (lambda (&rest _) @@ -271,11 +283,12 @@ ;; code. (make-process :name "test" :command '("c:/No-Such-Command")) (error :got-error)))) - (should have-called-debugger))) + (should have-called-debugger)))) (ert-deftest make-process/file-handler/found () - "Check that the ‘:file-handler’ argument of ‘make-process’ + "Check that the `:file-handler’ argument of `make-process’ works as expected if a file name handler is found." + (with-timeout (60 (ert-fail "Test timed out")) (let ((file-handler-calls 0)) (cl-flet ((file-handler (&rest args) @@ -292,27 +305,29 @@ works as expected if a file name handler is found." :command '("/some/binary") :file-handler t) 'fake-process)) - (should (= file-handler-calls 1)))))) + (should (= file-handler-calls 1))))))) (ert-deftest make-process/file-handler/not-found () - "Check that the ‘:file-handler’ argument of ‘make-process’ + "Check that the `:file-handler’ argument of `make-process’ works as expected if no file name handler is found." + (with-timeout (60 (ert-fail "Test timed out")) (let ((file-name-handler-alist ()) (default-directory invocation-directory) (program (expand-file-name invocation-name invocation-directory))) (should (processp (make-process :name "name" :command (list program "--version") - :file-handler t))))) + :file-handler t)))))) (ert-deftest make-process/file-handler/disable () - "Check ‘make-process’ works as expected if it shouldn’t use the + "Check `make-process’ works as expected if it shouldn’t use the file name handler." + (with-timeout (60 (ert-fail "Test timed out")) (let ((file-name-handler-alist (list (cons (rx bos "test-handler:") #'process-tests--file-handler))) (default-directory "test-handler:/dir/") (program (expand-file-name invocation-name invocation-directory))) (should (processp (make-process :name "name" - :command (list program "--version")))))) + :command (list program "--version"))))))) (defun process-tests--file-handler (operation &rest _args) (cl-ecase operation @@ -325,48 +340,419 @@ file name handler." (ert-deftest make-process/stop () "Check that `make-process' doesn't accept a `:stop' key. See Bug#30460." + (with-timeout (60 (ert-fail "Test timed out")) (should-error (make-process :name "test" :command (list (expand-file-name invocation-name invocation-directory)) - :stop t))) + :stop t)))) ;; All the following tests require working DNS, which appears not to ;; be the case for hydra.nixos.org, so disable them there for now. (ert-deftest lookup-family-specification () - "network-lookup-address-info should only accept valid family symbols." + "`network-lookup-address-info' should only accept valid family symbols." (skip-unless (not (getenv "EMACS_HYDRA_CI"))) + (with-timeout (60 (ert-fail "Test timed out")) (should-error (network-lookup-address-info "google.com" 'both)) (should (network-lookup-address-info "google.com" 'ipv4)) (when (featurep 'make-network-process '(:family ipv6)) - (should (network-lookup-address-info "google.com" 'ipv6)))) + (should (network-lookup-address-info "google.com" 'ipv6))))) (ert-deftest lookup-unicode-domains () - "Unicode domains should fail" + "Unicode domains should fail." (skip-unless (not (getenv "EMACS_HYDRA_CI"))) + (with-timeout (60 (ert-fail "Test timed out")) (should-error (network-lookup-address-info "faß.de")) - (should (network-lookup-address-info (puny-encode-domain "faß.de")))) + (should (network-lookup-address-info (puny-encode-domain "faß.de"))))) (ert-deftest unibyte-domain-name () - "Unibyte domain names should work" + "Unibyte domain names should work." (skip-unless (not (getenv "EMACS_HYDRA_CI"))) - (should (network-lookup-address-info (string-to-unibyte "google.com")))) + (with-timeout (60 (ert-fail "Test timed out")) + (should (network-lookup-address-info (string-to-unibyte "google.com"))))) (ert-deftest lookup-google () - "Check that we can look up google IP addresses" + "Check that we can look up google IP addresses." (skip-unless (not (getenv "EMACS_HYDRA_CI"))) + (with-timeout (60 (ert-fail "Test timed out")) (let ((addresses-both (network-lookup-address-info "google.com")) (addresses-v4 (network-lookup-address-info "google.com" 'ipv4))) (should addresses-both) (should addresses-v4)) (when (featurep 'make-network-process '(:family ipv6)) - (should (network-lookup-address-info "google.com" 'ipv6)))) + (should (network-lookup-address-info "google.com" 'ipv6))))) (ert-deftest non-existent-lookup-failure () + "Check that looking up non-existent domain returns nil." (skip-unless (not (getenv "EMACS_HYDRA_CI"))) - "Check that looking up non-existent domain returns nil" - (should (eq nil (network-lookup-address-info "emacs.invalid")))) + (with-timeout (60 (ert-fail "Test timed out")) + (should (eq nil (network-lookup-address-info "emacs.invalid"))))) + +(defmacro process-tests--ignore-EMFILE (&rest body) + "Evaluate BODY, ignoring EMFILE errors." + (declare (indent 0) (debug t)) + (let ((err (make-symbol "err")) + (message (make-symbol "message"))) + `(let ((,message (process-tests--EMFILE-message))) + (condition-case ,err + ,(macroexp-progn body) + (file-error + ;; If we couldn't determine the EMFILE message, just ignore + ;; all `file-error' signals. + (and ,message + (not (string-equal (caddr ,err) ,message)) + (signal (car ,err) (cdr ,err)))))))) + +(defmacro process-tests--with-buffers (var &rest body) + "Bind VAR to nil and evaluate BODY. +Afterwards, kill all buffers in the list VAR. BODY should add +some buffer objects to VAR." + (declare (indent 1) (debug (symbolp body))) + (cl-check-type var symbol) + `(let ((,var nil)) + (unwind-protect + ,(macroexp-progn body) + (mapc #'kill-buffer ,var)))) + +(defmacro process-tests--with-processes (var &rest body) + "Bind VAR to nil and evaluate BODY. +Afterwards, delete all processes in the list VAR. BODY should +add some process objects to VAR." + (declare (indent 1) (debug (symbolp body))) + (cl-check-type var symbol) + `(let ((,var nil)) + (unwind-protect + ,(macroexp-progn body) + (mapc #'delete-process ,var)))) + +(defmacro process-tests--with-raised-rlimit (&rest body) + "Evaluate BODY using a higher limit for the number of open files. +Attempt to set the resource limit for the number of open files +temporarily to the highest possible value." + (declare (indent 0) (debug t)) + (let ((prlimit (make-symbol "prlimit")) + (soft (make-symbol "soft")) + (hard (make-symbol "hard")) + (pid-arg (make-symbol "pid-arg"))) + `(let ((,prlimit (executable-find "prlimit")) + (,pid-arg (format "--pid=%d" (emacs-pid))) + (,soft nil) (,hard nil)) + (cl-flet ((set-limit + (value) + (cl-check-type value natnum) + (when ,prlimit + (call-process ,prlimit nil nil nil + ,pid-arg + (format "--nofile=%d:" value))))) + (when ,prlimit + (with-temp-buffer + (when (eql (call-process ,prlimit nil t nil + ,pid-arg "--nofile" + "--raw" "--noheadings" + "--output=SOFT,HARD") + 0) + (goto-char (point-min)) + (when (looking-at (rx (group (+ digit)) (+ blank) + (group (+ digit)) ?\n)) + (setq ,soft (string-to-number + (match-string-no-properties 1)) + ,hard (string-to-number + (match-string-no-properties 2)))))) + (and ,soft ,hard (< ,soft ,hard) + (set-limit ,hard))) + (unwind-protect + ,(macroexp-progn body) + (when ,soft (set-limit ,soft))))))) + +(defmacro process-tests--fd-setsize-test (&rest body) + "Run BODY as a test for FD_SETSIZE overflow. +Try to generate pipe processes until we are close to the +FD_SETSIZE limit. Within BODY, only a small number of file +descriptors should still be available. Furthermore, raise the +maximum number of open files in the Emacs process above +FD_SETSIZE." + (declare (indent 0) (debug t)) + (let ((process (make-symbol "process")) + (processes (make-symbol "processes")) + (buffer (make-symbol "buffer")) + (buffers (make-symbol "buffers")) + ;; FD_SETSIZE is typically 1024 on Unix-like systems. On + ;; MS-Windows we artificially limit FD_SETSIZE to 64, see the + ;; commentary in w32proc.c. + (fd-setsize (if (eq system-type 'windows-nt) 64 1024))) + `(process-tests--with-raised-rlimit + (process-tests--with-buffers ,buffers + (process-tests--with-processes ,processes + ;; First, allocate enough pipes to definitely exceed the + ;; FD_SETSIZE limit. + (cl-loop for i from 1 to ,(1+ fd-setsize) + for ,buffer = (generate-new-buffer + (format " *pipe %d*" i)) + do (push ,buffer ,buffers) + for ,process = (process-tests--ignore-EMFILE + (make-pipe-process + :name (format "pipe %d" i) + ;; Prevent delete-process from + ;; trying to read from pipe + ;; processes that didn't exit + ;; yet, because no one is + ;; writing to those pipes, and + ;; the read will stall. + :stop (eq system-type 'windows-nt) + :buffer ,buffer + :coding 'no-conversion + :noquery t)) + while ,process + do (push ,process ,processes)) + (unless (cddr ,processes) + (ert-fail "Couldn't allocate enough pipes")) + ;; Delete two pipes to test more edge cases. + (delete-process (pop ,processes)) + (delete-process (pop ,processes)) + ,@body))))) + +(defmacro process-tests--with-temp-file (var &rest body) + "Bind VAR to the name of a new regular file and evaluate BODY. +Afterwards, delete the file." + (declare (indent 1) (debug (symbolp body))) + (cl-check-type var symbol) + (let ((file (make-symbol "file"))) + `(let ((,file (make-temp-file "emacs-test-"))) + (unwind-protect + (let ((,var ,file)) + ,@body) + (delete-file ,file))))) + +(defmacro process-tests--with-temp-directory (var &rest body) + "Bind VAR to the name of a new directory and evaluate BODY. +Afterwards, delete the directory." + (declare (indent 1) (debug (symbolp body))) + (cl-check-type var symbol) + (let ((dir (make-symbol "dir"))) + `(let ((,dir (make-temp-file "emacs-test-" :dir))) + (unwind-protect + (let ((,var ,dir)) + ,@body) + (delete-directory ,dir :recursive))))) + +;; Tests for FD_SETSIZE overflow (Bug#24325). The following tests +;; generate lots of process objects of the various kinds. Running the +;; tests with assertions enabled should not result in any crashes due +;; to file descriptor set overflow. These tests first generate lots +;; of unused pipe processes to fill up the file descriptor space. +;; Then, they create a few instances of the process type under test. + +(ert-deftest process-tests/fd-setsize-no-crash/make-process () + "Check that Emacs doesn't crash when trying to use more than +FD_SETSIZE file descriptors (Bug#24325)." + (with-timeout (60 (ert-fail "Test timed out")) + (let ((sleep (executable-find "sleep"))) + (skip-unless sleep) + (dolist (conn-type '(pipe pty)) + (ert-info ((format "Connection type `%s'" conn-type)) + (process-tests--fd-setsize-test + (process-tests--with-processes processes + ;; Start processes until we exhaust the file descriptor + ;; set size. We assume that each process requires at + ;; least one file descriptor. + (dotimes (i 10) + (let ((process + ;; Failure to allocate more file descriptors + ;; should signal `file-error', but not crash. + ;; Since we don't know the exact limit, we + ;; ignore `file-error'. + (process-tests--ignore-EMFILE + (make-process :name (format "test %d" i) + :command (list sleep "5") + :connection-type conn-type + :coding 'no-conversion + :noquery t)))) + (when process (push process processes)))) + ;; We should have managed to start at least one process. + (should processes) + (dolist (process processes) + (while (accept-process-output process)) + (should (eq (process-status process) 'exit)) + ;; If there's an error between fork and exec, Emacs + ;; will use exit statuses between 125 and 127, see + ;; process.h. This can happen if the child process + ;; tries to set up terminal device but fails due to + ;; file number limits. We don't treat this as an + ;; error. + (should (memql (process-exit-status process) + '(0 125 126 127))))))))))) + +(ert-deftest process-tests/fd-setsize-no-crash/make-pipe-process () + "Check that Emacs doesn't crash when trying to use more than +FD_SETSIZE file descriptors (Bug#24325)." + (with-timeout (60 (ert-fail "Test timed out")) + (process-tests--fd-setsize-test + (process-tests--with-buffers buffers + (process-tests--with-processes processes + ;; Start processes until we exhaust the file descriptor set + ;; size. We assume that each process requires at least one + ;; file descriptor. + (dotimes (i 10) + (let ((buffer (generate-new-buffer (format " *%d*" i)))) + (push buffer buffers) + (let ((process + ;; Failure to allocate more file descriptors + ;; should signal `file-error', but not crash. + ;; Since we don't know the exact limit, we ignore + ;; `file-error'. + (process-tests--ignore-EMFILE + (make-pipe-process :name (format "test %d" i) + :buffer buffer + :coding 'no-conversion + :noquery t)))) + (when process (push process processes))))) + ;; We should have managed to start at least one process. + (should processes)))))) + +(ert-deftest process-tests/fd-setsize-no-crash/make-network-process () + "Check that Emacs doesn't crash when trying to use more than +FD_SETSIZE file descriptors (Bug#24325)." + (skip-unless (featurep 'make-network-process '(:server t))) + (skip-unless (featurep 'make-network-process '(:family local))) + (with-timeout (60 (ert-fail "Test timed out")) + (process-tests--with-temp-directory directory + (process-tests--with-processes processes + (let* ((num-clients 10) + (socket-name (expand-file-name "socket" directory)) + ;; Run a UNIX server to connect to. + (server (make-network-process :name "server" + :server num-clients + :buffer nil + :service socket-name + :family 'local + :coding 'no-conversion + :noquery t))) + (push server processes) + (process-tests--fd-setsize-test + ;; Start processes until we exhaust the file descriptor + ;; set size. We assume that each process requires at + ;; least one file descriptor. + (dotimes (i num-clients) + (let ((client + ;; Failure to allocate more file descriptors + ;; should signal `file-error', but not crash. + ;; Since we don't know the exact limit, we ignore + ;; `file-error'. + (process-tests--ignore-EMFILE + (make-network-process + :name (format "client %d" i) + :service socket-name + :family 'local + :coding 'no-conversion + :noquery t)))) + (when client (push client processes)))) + ;; We should have managed to start at least one process. + (should processes))))))) + +(ert-deftest process-tests/fd-setsize-no-crash/make-serial-process () + "Check that Emacs doesn't crash when trying to use more than +FD_SETSIZE file descriptors (Bug#24325)." + (with-timeout (60 (ert-fail "Test timed out")) + (skip-unless (file-executable-p shell-file-name)) + (skip-unless (executable-find "tty")) + (skip-unless (executable-find "sleep")) + ;; `process-tests--new-pty' probably only works with GNU Bash. + (skip-unless (string-equal + (file-name-nondirectory shell-file-name) "bash")) + (process-tests--with-processes processes + ;; In order to use `make-serial-process', we need to create some + ;; pseudoterminals. The easiest way to do that is to start a + ;; normal process using the `pty' connection type. We need to + ;; ensure that the terminal stays around while we connect to it. + ;; Create the host processes before the dummy pipes so we have a + ;; high chance of succeeding here. + (let ((tty-names ())) + (dotimes (_ 10) + (cl-destructuring-bind + (host tty-name) (process-tests--new-pty) + (should (processp host)) + (push host processes) + (should tty-name) + (should (file-exists-p tty-name)) + (push tty-name tty-names))) + (process-tests--fd-setsize-test + (process-tests--with-processes processes + (process-tests--with-buffers buffers + (dolist (tty-name tty-names) + (let ((buffer (generate-new-buffer + (format " *%s*" tty-name)))) + (push buffer buffers) + ;; Failure to allocate more file descriptors should + ;; signal `file-error', but not crash. Since we + ;; don't know the exact limit, we ignore + ;; `file-error'. + (let ((process (process-tests--ignore-EMFILE + (make-serial-process + :name (format "test %s" tty-name) + :port tty-name + :speed 9600 + :buffer buffer + :coding 'no-conversion + :noquery t)))) + (when process (push process processes)))))) + ;; We should have managed to start at least one process. + (should processes))))))) + +(defvar process-tests--EMFILE-message :unknown + "Cached result of the function `process-tests--EMFILE-message'.") + +(defun process-tests--EMFILE-message () + "Return the error message for the EMFILE POSIX error. +Return nil if that can't be determined." + (when (eq process-tests--EMFILE-message :unknown) + (setq process-tests--EMFILE-message + (with-temp-buffer + (when (eql (ignore-error 'file-error + (call-process "errno" nil t nil "EMFILE")) + 0) + (goto-char (point-min)) + (when (looking-at (rx "EMFILE" (+ blank) (+ digit) + (+ blank) (group (+ nonl)))) + (match-string-no-properties 1)))))) + process-tests--EMFILE-message) + +(defun process-tests--new-pty () + "Allocate a new pseudoterminal. +Return a list (PROCESS TTY-NAME)." + ;; The command below will typically only work with GNU Bash. + (should (string-equal (file-name-nondirectory shell-file-name) + "bash")) + (process-tests--with-temp-file temp-file + (should-not (file-remote-p temp-file)) + (let* ((command (list shell-file-name shell-command-switch + (format "tty > %s && sleep 60" + (shell-quote-argument + (file-name-unquote temp-file))))) + (process (make-process :name "tty host" + :command command + :buffer nil + :coding 'utf-8-unix + :connection-type 'pty + :noquery t)) + (tty-name nil) + (coding-system-for-read 'utf-8-unix) + (coding-system-for-write 'utf-8-unix)) + ;; Wait until TTY name has arrived. + (with-timeout (2 (message "Timed out waiting for TTY name")) + (while (and (process-live-p process) (not tty-name)) + (sleep-for 0.1) + (when-let ((attributes (file-attributes temp-file))) + (when (cl-plusp (file-attribute-size attributes)) + (with-temp-buffer + (insert-file-contents temp-file) + (goto-char (point-max)) + ;; `tty' has printed a trailing newline. + (skip-chars-backward "\n") + (unless (bobp) + (setq tty-name (buffer-substring-no-properties + (point-min) (point))))))))) + (list process tty-name)))) (provide 'process-tests) -;; process-tests.el ends here. +;;; process-tests.el ends here diff --git a/test/src/regex-emacs-tests.el b/test/src/regex-emacs-tests.el index 34d4067db47..0607eacf397 100644 --- a/test/src/regex-emacs-tests.el +++ b/test/src/regex-emacs-tests.el @@ -1,6 +1,6 @@ ;;; regex-emacs-tests.el --- tests for regex-emacs.c -*- lexical-binding: t -*- -;; Copyright (C) 2015-2020 Free Software Foundation, Inc. +;; Copyright (C) 2015-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/src/syntax-tests.el b/test/src/syntax-tests.el index edee01ec585..479b818935f 100644 --- a/test/src/syntax-tests.el +++ b/test/src/syntax-tests.el @@ -1,6 +1,6 @@ ;;; syntax-tests.el --- tests for syntax.c functions -*- lexical-binding: t -*- -;; Copyright (C) 2017-2020 Free Software Foundation, Inc. +;; Copyright (C) 2017-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/src/textprop-tests.el b/test/src/textprop-tests.el index 365d2c7a7b7..b083588e645 100644 --- a/test/src/textprop-tests.el +++ b/test/src/textprop-tests.el @@ -1,6 +1,6 @@ ;;; textprop-tests.el --- Test suite for text properties. -*- lexical-binding: t -*- -;; Copyright (C) 2015-2020 Free Software Foundation, Inc. +;; Copyright (C) 2015-2021 Free Software Foundation, Inc. ;; Author: Wolfgang Jenkner <wjenkner@inode.at> ;; Keywords: internal diff --git a/test/src/thread-tests.el b/test/src/thread-tests.el index df34a2b66eb..f14d2426ef0 100644 --- a/test/src/thread-tests.el +++ b/test/src/thread-tests.el @@ -1,6 +1,6 @@ ;;; threads.el --- tests for threads. -*- lexical-binding: t -*- -;; Copyright (C) 2012-2020 Free Software Foundation, Inc. +;; Copyright (C) 2012-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/src/timefns-tests.el b/test/src/timefns-tests.el index b35a5287946..e55bd1eb4ee 100644 --- a/test/src/timefns-tests.el +++ b/test/src/timefns-tests.el @@ -1,6 +1,6 @@ ;;; timefns-tests.el -- tests for timefns.c -*- lexical-binding: t -*- -;; Copyright (C) 2016-2020 Free Software Foundation, Inc. +;; Copyright (C) 2016-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/src/undo-tests.el b/test/src/undo-tests.el index 182e2df93bc..055bf102dfc 100644 --- a/test/src/undo-tests.el +++ b/test/src/undo-tests.el @@ -1,6 +1,6 @@ ;;; undo-tests.el --- Tests of primitive-undo -*- lexical-binding: t -*- -;; Copyright (C) 2012-2020 Free Software Foundation, Inc. +;; Copyright (C) 2012-2021 Free Software Foundation, Inc. ;; Author: Aaron S. Hawley <aaron.s.hawley@gmail.com> diff --git a/test/src/xdisp-tests.el b/test/src/xdisp-tests.el index a7e05a57de9..d13ce77a997 100644 --- a/test/src/xdisp-tests.el +++ b/test/src/xdisp-tests.el @@ -1,6 +1,6 @@ ;;; xdisp-tests.el --- tests for xdisp.c functions -*- lexical-binding: t -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/src/xfaces-tests.el b/test/src/xfaces-tests.el index bde3a354229..0a7ef55b2b6 100644 --- a/test/src/xfaces-tests.el +++ b/test/src/xfaces-tests.el @@ -1,6 +1,6 @@ ;;; xfaces-tests.el --- tests for xfaces.c -*- lexical-binding: t -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/src/xml-tests.el b/test/src/xml-tests.el index 800f400b3ca..632cf965fa2 100644 --- a/test/src/xml-tests.el +++ b/test/src/xml-tests.el @@ -1,6 +1,6 @@ ;;; xml-tests.el --- Test suite for libxml parsing. -*- lexical-binding: t -*- -;; Copyright (C) 2014-2020 Free Software Foundation, Inc. +;; Copyright (C) 2014-2021 Free Software Foundation, Inc. ;; Author: Ulf Jasper <ulf.jasper@web.de> ;; Keywords: internal |
