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 /admin/grammars | |
| 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 'admin/grammars')
| -rw-r--r-- | admin/grammars/Makefile.in | 2 | ||||
| -rw-r--r-- | admin/grammars/c.by | 2 | ||||
| -rw-r--r-- | admin/grammars/grammar.wy | 2 | ||||
| -rw-r--r-- | admin/grammars/java-tags.wy | 2 | ||||
| -rw-r--r-- | admin/grammars/js.wy | 2 | ||||
| -rw-r--r-- | admin/grammars/make.by | 2 | ||||
| -rw-r--r-- | admin/grammars/python.wy | 2 | ||||
| -rw-r--r-- | admin/grammars/scheme.by | 2 | ||||
| -rw-r--r-- | admin/grammars/srecode-template.wy | 2 |
9 files changed, 9 insertions, 9 deletions
diff --git a/admin/grammars/Makefile.in b/admin/grammars/Makefile.in index 2d9d0e8a47f..a170e089246 100644 --- a/admin/grammars/Makefile.in +++ b/admin/grammars/Makefile.in | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ### @configure_input@ | 1 | ### @configure_input@ |
| 2 | 2 | ||
| 3 | ## Copyright (C) 2013-2019 Free Software Foundation, Inc. | 3 | ## Copyright (C) 2013-2020 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ## This file is part of GNU Emacs. | 5 | ## This file is part of GNU Emacs. |
| 6 | 6 | ||
diff --git a/admin/grammars/c.by b/admin/grammars/c.by index 10ff860e21a..d12e6f95cb4 100644 --- a/admin/grammars/c.by +++ b/admin/grammars/c.by | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | ;;; c.by -- LL grammar for C/C++ language specification | 1 | ;;; c.by -- LL grammar for C/C++ language specification |
| 2 | ;; Copyright (C) 1999-2019 Free Software Foundation, Inc. | 2 | ;; Copyright (C) 1999-2020 Free Software Foundation, Inc. |
| 3 | ;; | 3 | ;; |
| 4 | ;; Author: Eric M. Ludlam <zappo@gnu.org> | 4 | ;; Author: Eric M. Ludlam <zappo@gnu.org> |
| 5 | ;; David Ponce <david@dponce.com> | 5 | ;; David Ponce <david@dponce.com> |
diff --git a/admin/grammars/grammar.wy b/admin/grammars/grammar.wy index 81fd1b0b79c..1ae2a903bdf 100644 --- a/admin/grammars/grammar.wy +++ b/admin/grammars/grammar.wy | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; semantic-grammar.wy -- LALR grammar of Semantic input grammars | 1 | ;;; semantic-grammar.wy -- LALR grammar of Semantic input grammars |
| 2 | ;; | 2 | ;; |
| 3 | ;; Copyright (C) 2002-2019 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2002-2020 Free Software Foundation, Inc. |
| 4 | ;; | 4 | ;; |
| 5 | ;; Author: David Ponce <david@dponce.com> | 5 | ;; Author: David Ponce <david@dponce.com> |
| 6 | ;; Created: 26 Aug 2002 | 6 | ;; Created: 26 Aug 2002 |
diff --git a/admin/grammars/java-tags.wy b/admin/grammars/java-tags.wy index db4f61c5b07..678b36cd0ae 100644 --- a/admin/grammars/java-tags.wy +++ b/admin/grammars/java-tags.wy | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; java-tags.wy -- Semantic LALR grammar for Java | 1 | ;;; java-tags.wy -- Semantic LALR grammar for Java |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2002-2019 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2002-2020 Free Software Foundation, Inc. |
| 4 | ;; | 4 | ;; |
| 5 | ;; Author: David Ponce <david@dponce.com> | 5 | ;; Author: David Ponce <david@dponce.com> |
| 6 | ;; Created: 26 Aug 2002 | 6 | ;; Created: 26 Aug 2002 |
diff --git a/admin/grammars/js.wy b/admin/grammars/js.wy index f5aca81d047..94837baf7c2 100644 --- a/admin/grammars/js.wy +++ b/admin/grammars/js.wy | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; javascript-jv.wy -- LALR grammar for Javascript | 1 | ;;; javascript-jv.wy -- LALR grammar for Javascript |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2005-2019 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2005-2020 Free Software Foundation, Inc. |
| 4 | ;; Copyright (C) 1998-2011 Ecma International. | 4 | ;; Copyright (C) 1998-2011 Ecma International. |
| 5 | 5 | ||
| 6 | ;; Author: Joakim Verona | 6 | ;; Author: Joakim Verona |
diff --git a/admin/grammars/make.by b/admin/grammars/make.by index 423c9529dec..7573d0cf9ec 100644 --- a/admin/grammars/make.by +++ b/admin/grammars/make.by | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; make.by -- BY notation for Makefiles. | 1 | ;;; make.by -- BY notation for Makefiles. |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1999-2019 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1999-2020 Free Software Foundation, Inc. |
| 4 | ;; | 4 | ;; |
| 5 | ;; Author: Eric M. Ludlam <zappo@gnu.org> | 5 | ;; Author: Eric M. Ludlam <zappo@gnu.org> |
| 6 | ;; David Ponce <david@dponce.com> | 6 | ;; David Ponce <david@dponce.com> |
diff --git a/admin/grammars/python.wy b/admin/grammars/python.wy index 0e926ad3636..5790461c73c 100644 --- a/admin/grammars/python.wy +++ b/admin/grammars/python.wy | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; python.wy -- LALR grammar for Python | 1 | ;;; python.wy -- LALR grammar for Python |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2002-2019 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2002-2020 Free Software Foundation, Inc. |
| 4 | ;; Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, | 4 | ;; Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, |
| 5 | ;; 2009, 2010 Python Software Foundation; All Rights Reserved | 5 | ;; 2009, 2010 Python Software Foundation; All Rights Reserved |
| 6 | 6 | ||
diff --git a/admin/grammars/scheme.by b/admin/grammars/scheme.by index a2750dde457..572cf564d75 100644 --- a/admin/grammars/scheme.by +++ b/admin/grammars/scheme.by | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; scheme.by -- Scheme BNF language specification | 1 | ;;; scheme.by -- Scheme BNF language specification |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2001-2019 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2001-2020 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; This file is part of GNU Emacs. | 5 | ;; This file is part of GNU Emacs. |
| 6 | 6 | ||
diff --git a/admin/grammars/srecode-template.wy b/admin/grammars/srecode-template.wy index b5481865ad6..c8d1492af23 100644 --- a/admin/grammars/srecode-template.wy +++ b/admin/grammars/srecode-template.wy | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; srecode-template.wy --- Semantic Recoder Template parser | 1 | ;;; srecode-template.wy --- Semantic Recoder Template parser |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2005-2019 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2005-2020 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Eric M. Ludlam <zappo@gnu.org> | 5 | ;; Author: Eric M. Ludlam <zappo@gnu.org> |
| 6 | ;; Keywords: syntax | 6 | ;; Keywords: syntax |