diff options
| author | Paul Eggert | 2020-01-01 01:08:16 +0000 |
|---|---|---|
| committer | Paul Eggert | 2020-01-01 01:08:16 +0000 |
| commit | c6fb86b40bebf597fccbe4eba58ceea83bd9700f (patch) | |
| tree | ab703ac6f4e85e6df08c467bc48cb7ae670f5ba9 /lisp/vc | |
| parent | 47f66e1aaf01d72e3b0db6eadbab378bfac96681 (diff) | |
| parent | 186152ba400b58d2d278c52d2e3d896decae767e (diff) | |
| download | emacs-c6fb86b40bebf597fccbe4eba58ceea83bd9700f.tar.gz emacs-c6fb86b40bebf597fccbe4eba58ceea83bd9700f.zip | |
Merge from origin/emacs-27
186152ba40 Pacify gcc -Wunused-function on Ubuntu 18.04.3
4cd143aded Fix copyright years by hand
365e01cc9f Update copyright year to 2020
cd2c156163 ; * etc/NEWS: Make the description of XDG fallback more ac...
# Conflicts:
# etc/NEWS
# etc/refcards/ru-refcard.tex
Diffstat (limited to 'lisp/vc')
40 files changed, 40 insertions, 40 deletions
diff --git a/lisp/vc/add-log.el b/lisp/vc/add-log.el index 5c27a65ea12..d302fb16eda 100644 --- a/lisp/vc/add-log.el +++ b/lisp/vc/add-log.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; add-log.el --- change log maintenance commands for Emacs | 1 | ;;; add-log.el --- change log maintenance commands for Emacs |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1985-1986, 1988, 1993-1994, 1997-1998, 2000-2019 Free | 3 | ;; Copyright (C) 1985-1986, 1988, 1993-1994, 1997-1998, 2000-2020 Free |
| 4 | ;; Software Foundation, Inc. | 4 | ;; Software Foundation, Inc. |
| 5 | 5 | ||
| 6 | ;; Maintainer: emacs-devel@gnu.org | 6 | ;; Maintainer: emacs-devel@gnu.org |
diff --git a/lisp/vc/compare-w.el b/lisp/vc/compare-w.el index 02c08af8b20..c7da8940f9c 100644 --- a/lisp/vc/compare-w.el +++ b/lisp/vc/compare-w.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; compare-w.el --- compare text between windows for Emacs | 1 | ;;; compare-w.el --- compare text between windows for Emacs |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1986, 1989, 1993, 1997, 2001-2019 Free Software | 3 | ;; Copyright (C) 1986, 1989, 1993, 1997, 2001-2020 Free Software |
| 4 | ;; Foundation, Inc. | 4 | ;; Foundation, Inc. |
| 5 | 5 | ||
| 6 | ;; Maintainer: emacs-devel@gnu.org | 6 | ;; Maintainer: emacs-devel@gnu.org |
diff --git a/lisp/vc/cvs-status.el b/lisp/vc/cvs-status.el index ccc8e5f4720..6192b934cb1 100644 --- a/lisp/vc/cvs-status.el +++ b/lisp/vc/cvs-status.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; cvs-status.el --- major mode for browsing `cvs status' output -*- lexical-binding: t -*- | 1 | ;;; cvs-status.el --- major mode for browsing `cvs status' output -*- lexical-binding: t -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1999-2019 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1999-2020 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> | 5 | ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> |
| 6 | ;; Keywords: pcl-cvs cvs status tree vc tools | 6 | ;; Keywords: pcl-cvs cvs status tree vc tools |
diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el index b7d59bef8ab..2dbab802086 100644 --- a/lisp/vc/diff-mode.el +++ b/lisp/vc/diff-mode.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; diff-mode.el --- a mode for viewing/editing context diffs -*- lexical-binding: t -*- | 1 | ;;; diff-mode.el --- a mode for viewing/editing context diffs -*- lexical-binding: t -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1998-2019 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1998-2020 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> | 5 | ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> |
| 6 | ;; Keywords: convenience patch diff vc | 6 | ;; Keywords: convenience patch diff vc |
diff --git a/lisp/vc/diff.el b/lisp/vc/diff.el index 5b055a1620f..9e7e771963c 100644 --- a/lisp/vc/diff.el +++ b/lisp/vc/diff.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; diff.el --- run `diff' -*- lexical-binding: t -*- | 1 | ;;; diff.el --- run `diff' -*- lexical-binding: t -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1992, 1994, 1996, 2001-2019 Free Software Foundation, | 3 | ;; Copyright (C) 1992, 1994, 1996, 2001-2020 Free Software Foundation, |
| 4 | ;; Inc. | 4 | ;; Inc. |
| 5 | 5 | ||
| 6 | ;; Author: Frank Bresz | 6 | ;; Author: Frank Bresz |
diff --git a/lisp/vc/ediff-diff.el b/lisp/vc/ediff-diff.el index dded160c577..ef466741b24 100644 --- a/lisp/vc/ediff-diff.el +++ b/lisp/vc/ediff-diff.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; ediff-diff.el --- diff-related utilities -*- lexical-binding:t -*- | 1 | ;;; ediff-diff.el --- diff-related utilities -*- lexical-binding:t -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1994-2019 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1994-2020 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> | 5 | ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> |
| 6 | ;; Package: ediff | 6 | ;; Package: ediff |
diff --git a/lisp/vc/ediff-help.el b/lisp/vc/ediff-help.el index f291d40bc24..57cb0017ef5 100644 --- a/lisp/vc/ediff-help.el +++ b/lisp/vc/ediff-help.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; ediff-help.el --- Code related to the contents of Ediff help buffers -*- lexical-binding:t -*- | 1 | ;;; ediff-help.el --- Code related to the contents of Ediff help buffers -*- lexical-binding:t -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1996-2019 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1996-2020 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> | 5 | ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> |
| 6 | ;; Package: ediff | 6 | ;; Package: ediff |
diff --git a/lisp/vc/ediff-hook.el b/lisp/vc/ediff-hook.el index 2aa03cc930b..ed29da13878 100644 --- a/lisp/vc/ediff-hook.el +++ b/lisp/vc/ediff-hook.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; ediff-hook.el --- setup for Ediff's menus and autoloads -*- lexical-binding:t -*- | 1 | ;;; ediff-hook.el --- setup for Ediff's menus and autoloads -*- lexical-binding:t -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1995-2019 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1995-2020 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> | 5 | ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> |
| 6 | ;; Package: ediff | 6 | ;; Package: ediff |
diff --git a/lisp/vc/ediff-init.el b/lisp/vc/ediff-init.el index d30ba1a1cdf..676a5873134 100644 --- a/lisp/vc/ediff-init.el +++ b/lisp/vc/ediff-init.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; ediff-init.el --- Macros, variables, and defsubsts used by Ediff -*- lexical-binding:t -*- | 1 | ;;; ediff-init.el --- Macros, variables, and defsubsts used by Ediff -*- lexical-binding:t -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1994-2019 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1994-2020 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> | 5 | ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> |
| 6 | ;; Package: ediff | 6 | ;; Package: ediff |
diff --git a/lisp/vc/ediff-merg.el b/lisp/vc/ediff-merg.el index 4e17dbeaefa..22656761d91 100644 --- a/lisp/vc/ediff-merg.el +++ b/lisp/vc/ediff-merg.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; ediff-merg.el --- merging utilities -*- lexical-binding:t -*- | 1 | ;;; ediff-merg.el --- merging utilities -*- lexical-binding:t -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1994-2019 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1994-2020 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> | 5 | ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> |
| 6 | ;; Package: ediff | 6 | ;; Package: ediff |
diff --git a/lisp/vc/ediff-mult.el b/lisp/vc/ediff-mult.el index 4dc0485e7e5..fee87e8352e 100644 --- a/lisp/vc/ediff-mult.el +++ b/lisp/vc/ediff-mult.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; ediff-mult.el --- support for multi-file/multi-buffer processing in Ediff -*- lexical-binding:t -*- | 1 | ;;; ediff-mult.el --- support for multi-file/multi-buffer processing in Ediff -*- lexical-binding:t -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1995-2019 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1995-2020 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> | 5 | ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> |
| 6 | ;; Package: ediff | 6 | ;; Package: ediff |
diff --git a/lisp/vc/ediff-ptch.el b/lisp/vc/ediff-ptch.el index 8e8f96e6d60..cb0ae6ff6e1 100644 --- a/lisp/vc/ediff-ptch.el +++ b/lisp/vc/ediff-ptch.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; ediff-ptch.el --- Ediff's patch support -*- lexical-binding:t -*- | 1 | ;;; ediff-ptch.el --- Ediff's patch support -*- lexical-binding:t -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1996-2019 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1996-2020 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> | 5 | ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> |
| 6 | ;; Package: ediff | 6 | ;; Package: ediff |
diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el index c7c5405bdd4..a8af9ba37a2 100644 --- a/lisp/vc/ediff-util.el +++ b/lisp/vc/ediff-util.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; ediff-util.el --- the core commands and utilities of ediff -*- lexical-binding:t -*- | 1 | ;;; ediff-util.el --- the core commands and utilities of ediff -*- lexical-binding:t -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1994-2019 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1994-2020 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> | 5 | ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> |
| 6 | ;; Package: ediff | 6 | ;; Package: ediff |
diff --git a/lisp/vc/ediff-vers.el b/lisp/vc/ediff-vers.el index 3826edad891..a95606fad5e 100644 --- a/lisp/vc/ediff-vers.el +++ b/lisp/vc/ediff-vers.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; ediff-vers.el --- version control interface to Ediff -*- lexical-binding:t -*- | 1 | ;;; ediff-vers.el --- version control interface to Ediff -*- lexical-binding:t -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1995-1997, 2001-2019 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1995-1997, 2001-2020 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> | 5 | ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> |
| 6 | ;; Package: ediff | 6 | ;; Package: ediff |
diff --git a/lisp/vc/ediff-wind.el b/lisp/vc/ediff-wind.el index 028995a4e58..7b2e1109c87 100644 --- a/lisp/vc/ediff-wind.el +++ b/lisp/vc/ediff-wind.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; ediff-wind.el --- window manipulation utilities -*- lexical-binding:t -*- | 1 | ;;; ediff-wind.el --- window manipulation utilities -*- lexical-binding:t -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1994-1997, 2000-2019 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1994-1997, 2000-2020 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> | 5 | ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> |
| 6 | ;; Package: ediff | 6 | ;; Package: ediff |
diff --git a/lisp/vc/ediff.el b/lisp/vc/ediff.el index d207d75a601..133d2109f5b 100644 --- a/lisp/vc/ediff.el +++ b/lisp/vc/ediff.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; ediff.el --- a comprehensive visual interface to diff & patch -*- lexical-binding:t -*- | 1 | ;;; ediff.el --- a comprehensive visual interface to diff & patch -*- lexical-binding:t -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1994-2019 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1994-2020 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> | 5 | ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> |
| 6 | ;; Created: February 2, 1994 | 6 | ;; Created: February 2, 1994 |
diff --git a/lisp/vc/log-edit.el b/lisp/vc/log-edit.el index 03eccf3815c..8b6168835f0 100644 --- a/lisp/vc/log-edit.el +++ b/lisp/vc/log-edit.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; log-edit.el --- Major mode for editing CVS commit messages -*- lexical-binding: t -*- | 1 | ;;; log-edit.el --- Major mode for editing CVS commit messages -*- lexical-binding: t -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1999-2019 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1999-2020 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> | 5 | ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> |
| 6 | ;; Keywords: pcl-cvs cvs commit log vc | 6 | ;; Keywords: pcl-cvs cvs commit log vc |
diff --git a/lisp/vc/log-view.el b/lisp/vc/log-view.el index 31d833c6f39..e1c2b976a49 100644 --- a/lisp/vc/log-view.el +++ b/lisp/vc/log-view.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; log-view.el --- Major mode for browsing revision log histories -*- lexical-binding: t -*- | 1 | ;;; log-view.el --- Major mode for browsing revision log histories -*- lexical-binding: t -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1999-2019 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1999-2020 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> | 5 | ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> |
| 6 | ;; Keywords: tools, vc | 6 | ;; Keywords: tools, vc |
diff --git a/lisp/vc/pcvs-defs.el b/lisp/vc/pcvs-defs.el index 8cac61a7d44..e558292f33b 100644 --- a/lisp/vc/pcvs-defs.el +++ b/lisp/vc/pcvs-defs.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; pcvs-defs.el --- variable definitions for PCL-CVS | 1 | ;;; pcvs-defs.el --- variable definitions for PCL-CVS |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1991-2019 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1991-2020 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> | 5 | ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> |
| 6 | ;; Keywords: pcl-cvs | 6 | ;; Keywords: pcl-cvs |
diff --git a/lisp/vc/pcvs-info.el b/lisp/vc/pcvs-info.el index 224bab314d7..9f8a168a0a8 100644 --- a/lisp/vc/pcvs-info.el +++ b/lisp/vc/pcvs-info.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; pcvs-info.el --- internal representation of a fileinfo entry | 1 | ;;; pcvs-info.el --- internal representation of a fileinfo entry |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1991-2019 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1991-2020 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> | 5 | ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> |
| 6 | ;; Keywords: pcl-cvs | 6 | ;; Keywords: pcl-cvs |
diff --git a/lisp/vc/pcvs-parse.el b/lisp/vc/pcvs-parse.el index 0596ccb9129..466c621311f 100644 --- a/lisp/vc/pcvs-parse.el +++ b/lisp/vc/pcvs-parse.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; pcvs-parse.el --- the CVS output parser | 1 | ;;; pcvs-parse.el --- the CVS output parser |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1991-2019 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1991-2020 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> | 5 | ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> |
| 6 | ;; Keywords: pcl-cvs | 6 | ;; Keywords: pcl-cvs |
diff --git a/lisp/vc/pcvs-util.el b/lisp/vc/pcvs-util.el index 5a50393d622..45703983b24 100644 --- a/lisp/vc/pcvs-util.el +++ b/lisp/vc/pcvs-util.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; pcvs-util.el --- utility functions for PCL-CVS | 1 | ;;; pcvs-util.el --- utility functions for PCL-CVS |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1991-2019 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1991-2020 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> | 5 | ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> |
| 6 | ;; Keywords: pcl-cvs | 6 | ;; Keywords: pcl-cvs |
diff --git a/lisp/vc/pcvs.el b/lisp/vc/pcvs.el index 4679996b35b..dcba504401c 100644 --- a/lisp/vc/pcvs.el +++ b/lisp/vc/pcvs.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; pcvs.el --- a front-end to CVS -*- lexical-binding:t -*- | 1 | ;;; pcvs.el --- a front-end to CVS -*- lexical-binding:t -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1991-2019 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1991-2020 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: The PCL-CVS Trust <pcl-cvs@cyclic.com> | 5 | ;; Author: The PCL-CVS Trust <pcl-cvs@cyclic.com> |
| 6 | ;; Per Cederqvist <ceder@lysator.liu.se> | 6 | ;; Per Cederqvist <ceder@lysator.liu.se> |
diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el index cbd5e77120b..d4984bbd38b 100644 --- a/lisp/vc/smerge-mode.el +++ b/lisp/vc/smerge-mode.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; smerge-mode.el --- Minor mode to resolve diff3 conflicts -*- lexical-binding: t -*- | 1 | ;;; smerge-mode.el --- Minor mode to resolve diff3 conflicts -*- lexical-binding: t -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1999-2019 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1999-2020 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> | 5 | ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> |
| 6 | ;; Keywords: vc, tools, revision control, merge, diff3, cvs, conflict | 6 | ;; Keywords: vc, tools, revision control, merge, diff3, cvs, conflict |
diff --git a/lisp/vc/vc-annotate.el b/lisp/vc/vc-annotate.el index 35b69b53ebd..d82cadc70dd 100644 --- a/lisp/vc/vc-annotate.el +++ b/lisp/vc/vc-annotate.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; vc-annotate.el --- VC Annotate Support -*- lexical-binding: t -*- | 1 | ;;; vc-annotate.el --- VC Annotate Support -*- lexical-binding: t -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1997-1998, 2000-2019 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1997-1998, 2000-2020 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Martin Lorentzson <emwson@emw.ericsson.se> | 5 | ;; Author: Martin Lorentzson <emwson@emw.ericsson.se> |
| 6 | ;; Maintainer: emacs-devel@gnu.org | 6 | ;; Maintainer: emacs-devel@gnu.org |
diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el index dcf3323866e..e5d307e7ede 100644 --- a/lisp/vc/vc-bzr.el +++ b/lisp/vc/vc-bzr.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; vc-bzr.el --- VC backend for the bzr revision control system -*- lexical-binding: t -*- | 1 | ;;; vc-bzr.el --- VC backend for the bzr revision control system -*- lexical-binding: t -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2006-2019 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2006-2020 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Dave Love <fx@gnu.org> | 5 | ;; Author: Dave Love <fx@gnu.org> |
| 6 | ;; Riccardo Murri <riccardo.murri@gmail.com> | 6 | ;; Riccardo Murri <riccardo.murri@gmail.com> |
diff --git a/lisp/vc/vc-cvs.el b/lisp/vc/vc-cvs.el index a9e79d7956c..16566a8902c 100644 --- a/lisp/vc/vc-cvs.el +++ b/lisp/vc/vc-cvs.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; vc-cvs.el --- non-resident support for CVS version-control -*- lexical-binding: t -*- | 1 | ;;; vc-cvs.el --- non-resident support for CVS version-control -*- lexical-binding: t -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1995, 1998-2019 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1995, 1998-2020 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: FSF (see vc.el for full credits) | 5 | ;; Author: FSF (see vc.el for full credits) |
| 6 | ;; Package: vc | 6 | ;; Package: vc |
diff --git a/lisp/vc/vc-dav.el b/lisp/vc/vc-dav.el index 693056c2b9a..d453cb41cea 100644 --- a/lisp/vc/vc-dav.el +++ b/lisp/vc/vc-dav.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; vc-dav.el --- vc.el support for WebDAV | 1 | ;;; vc-dav.el --- vc.el support for WebDAV |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2001, 2004-2019 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2001, 2004-2020 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Bill Perry <wmperry@gnu.org> | 5 | ;; Author: Bill Perry <wmperry@gnu.org> |
| 6 | ;; Keywords: url, vc | 6 | ;; Keywords: url, vc |
diff --git a/lisp/vc/vc-dir.el b/lisp/vc/vc-dir.el index ad25e8aa537..0c293526eda 100644 --- a/lisp/vc/vc-dir.el +++ b/lisp/vc/vc-dir.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; vc-dir.el --- Directory status display under VC -*- lexical-binding: t -*- | 1 | ;;; vc-dir.el --- Directory status display under VC -*- lexical-binding: t -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2007-2019 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2007-2020 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Dan Nicolaescu <dann@ics.uci.edu> | 5 | ;; Author: Dan Nicolaescu <dann@ics.uci.edu> |
| 6 | ;; Keywords: vc tools | 6 | ;; Keywords: vc tools |
diff --git a/lisp/vc/vc-dispatcher.el b/lisp/vc/vc-dispatcher.el index 40055091ef7..5ae300bf09b 100644 --- a/lisp/vc/vc-dispatcher.el +++ b/lisp/vc/vc-dispatcher.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; vc-dispatcher.el -- generic command-dispatcher facility. -*- lexical-binding: t -*- | 1 | ;;; vc-dispatcher.el -- generic command-dispatcher facility. -*- lexical-binding: t -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2008-2019 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2008-2020 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: FSF (see below for full credits) | 5 | ;; Author: FSF (see below for full credits) |
| 6 | ;; Keywords: vc tools | 6 | ;; Keywords: vc tools |
diff --git a/lisp/vc/vc-filewise.el b/lisp/vc/vc-filewise.el index c1cf1c2feaa..67c696ced29 100644 --- a/lisp/vc/vc-filewise.el +++ b/lisp/vc/vc-filewise.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; vc-filewise.el --- common functions for file-oriented back ends. | 1 | ;;; vc-filewise.el --- common functions for file-oriented back ends. |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1992-1996, 1998-2019 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1992-1996, 1998-2020 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: FSF (see vc.el for full credits) | 5 | ;; Author: FSF (see vc.el for full credits) |
| 6 | ;; Maintainer: emacs-devel@gnu.org | 6 | ;; Maintainer: emacs-devel@gnu.org |
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index c39ee64fca7..37bc53b3850 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; vc-git.el --- VC backend for the git version control system -*- lexical-binding: t -*- | 1 | ;;; vc-git.el --- VC backend for the git version control system -*- lexical-binding: t -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2006-2019 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2006-2020 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Alexandre Julliard <julliard@winehq.org> | 5 | ;; Author: Alexandre Julliard <julliard@winehq.org> |
| 6 | ;; Keywords: vc tools | 6 | ;; Keywords: vc tools |
diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el index 205303761a5..eac9a6fccc9 100644 --- a/lisp/vc/vc-hg.el +++ b/lisp/vc/vc-hg.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; vc-hg.el --- VC backend for the mercurial version control system -*- lexical-binding: t -*- | 1 | ;;; vc-hg.el --- VC backend for the mercurial version control system -*- lexical-binding: t -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2006-2019 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2006-2020 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Ivan Kanis | 5 | ;; Author: Ivan Kanis |
| 6 | ;; Maintainer: emacs-devel@gnu.org | 6 | ;; Maintainer: emacs-devel@gnu.org |
diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el index 2d9187642c0..345a28d3f1d 100644 --- a/lisp/vc/vc-hooks.el +++ b/lisp/vc/vc-hooks.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; vc-hooks.el --- resident support for version-control -*- lexical-binding:t -*- | 1 | ;;; vc-hooks.el --- resident support for version-control -*- lexical-binding:t -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1992-1996, 1998-2019 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1992-1996, 1998-2020 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: FSF (see vc.el for full credits) | 5 | ;; Author: FSF (see vc.el for full credits) |
| 6 | ;; Maintainer: emacs-devel@gnu.org | 6 | ;; Maintainer: emacs-devel@gnu.org |
diff --git a/lisp/vc/vc-mtn.el b/lisp/vc/vc-mtn.el index 91cc28021cf..092d8b53968 100644 --- a/lisp/vc/vc-mtn.el +++ b/lisp/vc/vc-mtn.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; vc-mtn.el --- VC backend for Monotone -*- lexical-binding: t -*- | 1 | ;;; vc-mtn.el --- VC backend for Monotone -*- lexical-binding: t -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2007-2019 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2007-2020 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> | 5 | ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> |
| 6 | ;; Keywords: vc | 6 | ;; Keywords: vc |
diff --git a/lisp/vc/vc-rcs.el b/lisp/vc/vc-rcs.el index d4485d88e48..00796e5d63f 100644 --- a/lisp/vc/vc-rcs.el +++ b/lisp/vc/vc-rcs.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; vc-rcs.el --- support for RCS version-control -*- lexical-binding:t -*- | 1 | ;;; vc-rcs.el --- support for RCS version-control -*- lexical-binding:t -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1992-2019 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1992-2020 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: FSF (see vc.el for full credits) | 5 | ;; Author: FSF (see vc.el for full credits) |
| 6 | ;; Maintainer: emacs-devel@gnu.org | 6 | ;; Maintainer: emacs-devel@gnu.org |
diff --git a/lisp/vc/vc-sccs.el b/lisp/vc/vc-sccs.el index b59d8178fe8..ba50c36832d 100644 --- a/lisp/vc/vc-sccs.el +++ b/lisp/vc/vc-sccs.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; vc-sccs.el --- support for SCCS version-control -*- lexical-binding:t -*- | 1 | ;;; vc-sccs.el --- support for SCCS version-control -*- lexical-binding:t -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1992-2019 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1992-2020 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: FSF (see vc.el for full credits) | 5 | ;; Author: FSF (see vc.el for full credits) |
| 6 | ;; Maintainer: emacs-devel@gnu.org | 6 | ;; Maintainer: emacs-devel@gnu.org |
diff --git a/lisp/vc/vc-src.el b/lisp/vc/vc-src.el index eb97a9aa5e3..db127ee726d 100644 --- a/lisp/vc/vc-src.el +++ b/lisp/vc/vc-src.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; vc-src.el --- support for SRC version-control -*- lexical-binding:t -*- | 1 | ;;; vc-src.el --- support for SRC version-control -*- lexical-binding:t -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1992-2019 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1992-2020 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: FSF (see vc.el for full credits) | 5 | ;; Author: FSF (see vc.el for full credits) |
| 6 | ;; Maintainer: emacs-devel@gnu.org | 6 | ;; Maintainer: emacs-devel@gnu.org |
diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el index a2081e1ab9e..d039bf3c6a3 100644 --- a/lisp/vc/vc-svn.el +++ b/lisp/vc/vc-svn.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; vc-svn.el --- non-resident support for Subversion version-control -*- lexical-binding:t -*- | 1 | ;;; vc-svn.el --- non-resident support for Subversion version-control -*- lexical-binding:t -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2003-2019 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2003-2020 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: FSF (see vc.el for full credits) | 5 | ;; Author: FSF (see vc.el for full credits) |
| 6 | ;; Maintainer: Stefan Monnier <monnier@gnu.org> | 6 | ;; Maintainer: Stefan Monnier <monnier@gnu.org> |
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index c5584188b31..f64b6c06310 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; vc.el --- drive a version-control system from within Emacs -*- lexical-binding:t -*- | 1 | ;;; vc.el --- drive a version-control system from within Emacs -*- lexical-binding:t -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1992-1998, 2000-2019 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1992-1998, 2000-2020 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: FSF (see below for full credits) | 5 | ;; Author: FSF (see below for full credits) |
| 6 | ;; Maintainer: emacs-devel@gnu.org | 6 | ;; Maintainer: emacs-devel@gnu.org |