aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/term
diff options
context:
space:
mode:
authorPaul Eggert2018-12-31 17:57:29 -0800
committerPaul Eggert2018-12-31 17:57:29 -0800
commitba809612c06bcabd05dcbaae79da39dcb0925992 (patch)
tree2e2047c81e96710011e49fc0e492d3c58df442b5 /lisp/term
parentd9ba26ec2d56e8407094571769c847b78e7c524e (diff)
parent2fcf2dff00a55ece17f4342a934cb1d69ae1a743 (diff)
downloademacs-ba809612c06bcabd05dcbaae79da39dcb0925992.tar.gz
emacs-ba809612c06bcabd05dcbaae79da39dcb0925992.zip
Merge from origin/emacs-26
2fcf2df Fix copyright years by hand 26bed8b Update copyright year to 2019 2814292 Fix value of default frame height. (Bug#33921)
Diffstat (limited to 'lisp/term')
-rw-r--r--lisp/term/AT386.el2
-rw-r--r--lisp/term/README2
-rw-r--r--lisp/term/common-win.el2
-rw-r--r--lisp/term/internal.el2
-rw-r--r--lisp/term/iris-ansi.el2
-rw-r--r--lisp/term/konsole.el2
-rw-r--r--lisp/term/news.el2
-rw-r--r--lisp/term/ns-win.el2
-rw-r--r--lisp/term/pc-win.el2
-rw-r--r--lisp/term/rxvt.el2
-rw-r--r--lisp/term/screen.el2
-rw-r--r--lisp/term/sun.el2
-rw-r--r--lisp/term/tmux.el2
-rw-r--r--lisp/term/tty-colors.el2
-rw-r--r--lisp/term/tvi970.el2
-rw-r--r--lisp/term/vt100.el2
-rw-r--r--lisp/term/w32-win.el2
-rw-r--r--lisp/term/w32console.el2
-rw-r--r--lisp/term/wyse50.el2
-rw-r--r--lisp/term/x-win.el2
-rw-r--r--lisp/term/xterm.el2
21 files changed, 21 insertions, 21 deletions
diff --git a/lisp/term/AT386.el b/lisp/term/AT386.el
index cc6c5ca693c..b0cb953c5e2 100644
--- a/lisp/term/AT386.el
+++ b/lisp/term/AT386.el
@@ -1,6 +1,6 @@
1;;; AT386.el --- terminal support package for IBM AT keyboards 1;;; AT386.el --- terminal support package for IBM AT keyboards
2 2
3;; Copyright (C) 1992, 2001-2018 Free Software Foundation, Inc. 3;; Copyright (C) 1992, 2001-2019 Free Software Foundation, Inc.
4 4
5;; Author: Eric S. Raymond <esr@snark.thyrsus.com> 5;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
6;; Keywords: terminals 6;; Keywords: terminals
diff --git a/lisp/term/README b/lisp/term/README
index 4ab1a4300db..a9b131c7954 100644
--- a/lisp/term/README
+++ b/lisp/term/README
@@ -1,4 +1,4 @@
1Copyright (C) 1993, 2001-2018 Free Software Foundation, Inc. 1Copyright (C) 1993, 2001-2019 Free Software Foundation, Inc.
2See the end of the file for license conditions. 2See the end of the file for license conditions.
3 3
4 4
diff --git a/lisp/term/common-win.el b/lisp/term/common-win.el
index a482067ef39..b7a778fc004 100644
--- a/lisp/term/common-win.el
+++ b/lisp/term/common-win.el
@@ -1,6 +1,6 @@
1;;; common-win.el --- common part of handling window systems 1;;; common-win.el --- common part of handling window systems
2 2
3;; Copyright (C) 1993-1994, 2001-2018 Free Software Foundation, Inc. 3;; Copyright (C) 1993-1994, 2001-2019 Free Software Foundation, Inc.
4 4
5;; Maintainer: emacs-devel@gnu.org 5;; Maintainer: emacs-devel@gnu.org
6;; Keywords: terminals 6;; Keywords: terminals
diff --git a/lisp/term/internal.el b/lisp/term/internal.el
index 0cdf0c1a7c3..396521d676d 100644
--- a/lisp/term/internal.el
+++ b/lisp/term/internal.el
@@ -1,6 +1,6 @@
1;;; internal.el --- support for PC internal terminal 1;;; internal.el --- support for PC internal terminal
2 2
3;; Copyright (C) 1993-1994, 1998-1999, 2001-2018 Free Software 3;; Copyright (C) 1993-1994, 1998-1999, 2001-2019 Free Software
4;; Foundation, Inc. 4;; Foundation, Inc.
5 5
6;; Author: Morten Welinder <terra@diku.dk> 6;; Author: Morten Welinder <terra@diku.dk>
diff --git a/lisp/term/iris-ansi.el b/lisp/term/iris-ansi.el
index eb882daa0a9..23c67682085 100644
--- a/lisp/term/iris-ansi.el
+++ b/lisp/term/iris-ansi.el
@@ -1,6 +1,6 @@
1;;; iris-ansi.el --- configure Emacs for SGI xwsh and winterm apps 1;;; iris-ansi.el --- configure Emacs for SGI xwsh and winterm apps
2 2
3;; Copyright (C) 1997, 2001-2018 Free Software Foundation, Inc. 3;; Copyright (C) 1997, 2001-2019 Free Software Foundation, Inc.
4 4
5;; Author: Dan Nicolaescu <dann@ics.uci.edu> 5;; Author: Dan Nicolaescu <dann@ics.uci.edu>
6 6
diff --git a/lisp/term/konsole.el b/lisp/term/konsole.el
index 86a2150afc7..f2186ae6738 100644
--- a/lisp/term/konsole.el
+++ b/lisp/term/konsole.el
@@ -1,5 +1,5 @@
1;;; konsole.el --- terminal initialization for konsole 1;;; konsole.el --- terminal initialization for konsole
2;; Copyright (C) 2017-2018 Free Software Foundation, Inc. 2;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
3 3
4(require 'term/xterm) 4(require 'term/xterm)
5 5
diff --git a/lisp/term/news.el b/lisp/term/news.el
index 7cbbde412da..7ef80a532bb 100644
--- a/lisp/term/news.el
+++ b/lisp/term/news.el
@@ -1,6 +1,6 @@
1;;; news.el --- keypad and function key bindings for the Sony NEWS keyboard 1;;; news.el --- keypad and function key bindings for the Sony NEWS keyboard
2 2
3;; Copyright (C) 1989, 1993, 2001-2018 Free Software Foundation, Inc. 3;; Copyright (C) 1989, 1993, 2001-2019 Free Software Foundation, Inc.
4 4
5;; Author: FSF 5;; Author: FSF
6;; Keywords: terminals 6;; Keywords: terminals
diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el
index 09bbc7be636..c9f5bfef520 100644
--- a/lisp/term/ns-win.el
+++ b/lisp/term/ns-win.el
@@ -1,6 +1,6 @@
1;;; ns-win.el --- lisp side of interface with NeXT/Open/GNUstep/macOS window system -*- lexical-binding: t -*- 1;;; ns-win.el --- lisp side of interface with NeXT/Open/GNUstep/macOS window system -*- lexical-binding: t -*-
2 2
3;; Copyright (C) 1993-1994, 2005-2018 Free Software Foundation, Inc. 3;; Copyright (C) 1993-1994, 2005-2019 Free Software Foundation, Inc.
4 4
5;; Authors: Carl Edman 5;; Authors: Carl Edman
6;; Christian Limpach 6;; Christian Limpach
diff --git a/lisp/term/pc-win.el b/lisp/term/pc-win.el
index e0e412e1626..09275991cf5 100644
--- a/lisp/term/pc-win.el
+++ b/lisp/term/pc-win.el
@@ -1,6 +1,6 @@
1;;; pc-win.el --- setup support for `PC windows' (whatever that is) -*- lexical-binding:t -*- 1;;; pc-win.el --- setup support for `PC windows' (whatever that is) -*- lexical-binding:t -*-
2 2
3;; Copyright (C) 1994, 1996-1997, 1999, 2001-2018 Free Software 3;; Copyright (C) 1994, 1996-1997, 1999, 2001-2019 Free Software
4;; Foundation, Inc. 4;; Foundation, Inc.
5 5
6;; Author: Morten Welinder <terra@diku.dk> 6;; Author: Morten Welinder <terra@diku.dk>
diff --git a/lisp/term/rxvt.el b/lisp/term/rxvt.el
index 870282ae1c3..8376e5ac096 100644
--- a/lisp/term/rxvt.el
+++ b/lisp/term/rxvt.el
@@ -1,6 +1,6 @@
1;;; rxvt.el --- define function key sequences and standard colors for rxvt 1;;; rxvt.el --- define function key sequences and standard colors for rxvt
2 2
3;; Copyright (C) 2002-2018 Free Software Foundation, Inc. 3;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
4 4
5;; Author: Eli Zaretskii 5;; Author: Eli Zaretskii
6;; Keywords: terminals 6;; Keywords: terminals
diff --git a/lisp/term/screen.el b/lisp/term/screen.el
index dffcb0b18af..bb74901db4f 100644
--- a/lisp/term/screen.el
+++ b/lisp/term/screen.el
@@ -1,5 +1,5 @@
1;;; screen.el --- terminal initialization for screen and tmux -*- lexical-binding: t -*- 1;;; screen.el --- terminal initialization for screen and tmux -*- lexical-binding: t -*-
2;; Copyright (C) 1995, 2001-2018 Free Software Foundation, Inc. 2;; Copyright (C) 1995, 2001-2019 Free Software Foundation, Inc.
3 3
4(require 'term/xterm) 4(require 'term/xterm)
5 5
diff --git a/lisp/term/sun.el b/lisp/term/sun.el
index 34ed492c872..c9f531e3520 100644
--- a/lisp/term/sun.el
+++ b/lisp/term/sun.el
@@ -1,6 +1,6 @@
1;;; sun.el --- keybinding for standard default sunterm keys 1;;; sun.el --- keybinding for standard default sunterm keys
2 2
3;; Copyright (C) 1987, 2001-2018 Free Software Foundation, Inc. 3;; Copyright (C) 1987, 2001-2019 Free Software Foundation, Inc.
4 4
5;; Author: Jeff Peck <peck@sun.com> 5;; Author: Jeff Peck <peck@sun.com>
6;; Keywords: terminals 6;; Keywords: terminals
diff --git a/lisp/term/tmux.el b/lisp/term/tmux.el
index ca21d5e7ad5..c6c224455e1 100644
--- a/lisp/term/tmux.el
+++ b/lisp/term/tmux.el
@@ -1,5 +1,5 @@
1;;; tmux.el --- terminal initialization for tmux -*- lexical-binding: t -*- 1;;; tmux.el --- terminal initialization for tmux -*- lexical-binding: t -*-
2;; Copyright (C) 2017-2018 Free Software Foundation, Inc. 2;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
3 3
4(require 'term/xterm) 4(require 'term/xterm)
5 5
diff --git a/lisp/term/tty-colors.el b/lisp/term/tty-colors.el
index d9b272693b0..307586f2213 100644
--- a/lisp/term/tty-colors.el
+++ b/lisp/term/tty-colors.el
@@ -1,6 +1,6 @@
1;;; tty-colors.el --- color support for character terminals 1;;; tty-colors.el --- color support for character terminals
2 2
3;; Copyright (C) 1999-2018 Free Software Foundation, Inc. 3;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
4 4
5;; Author: Eli Zaretskii 5;; Author: Eli Zaretskii
6;; Maintainer: emacs-devel@gnu.org 6;; Maintainer: emacs-devel@gnu.org
diff --git a/lisp/term/tvi970.el b/lisp/term/tvi970.el
index 0c4b0ae73b6..3b748483eef 100644
--- a/lisp/term/tvi970.el
+++ b/lisp/term/tvi970.el
@@ -1,6 +1,6 @@
1;;; tvi970.el --- terminal support for the Televideo 970 1;;; tvi970.el --- terminal support for the Televideo 970
2 2
3;; Copyright (C) 1992, 2001-2018 Free Software Foundation, Inc. 3;; Copyright (C) 1992, 2001-2019 Free Software Foundation, Inc.
4 4
5;; Author: Jim Blandy <jimb@occs.cs.oberlin.edu> 5;; Author: Jim Blandy <jimb@occs.cs.oberlin.edu>
6;; Keywords: terminals 6;; Keywords: terminals
diff --git a/lisp/term/vt100.el b/lisp/term/vt100.el
index b61e557e2f8..81843ceb975 100644
--- a/lisp/term/vt100.el
+++ b/lisp/term/vt100.el
@@ -1,6 +1,6 @@
1;;; vt100.el --- define VT100 function key sequences in function-key-map 1;;; vt100.el --- define VT100 function key sequences in function-key-map
2 2
3;; Copyright (C) 1989, 1993, 2001-2018 Free Software Foundation, Inc. 3;; Copyright (C) 1989, 1993, 2001-2019 Free Software Foundation, Inc.
4 4
5;; Author: FSF 5;; Author: FSF
6;; Keywords: terminals 6;; Keywords: terminals
diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index dc57160d04f..beb7425ce55 100644
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -1,6 +1,6 @@
1;;; w32-win.el --- parse switches controlling interface with W32 window system -*- lexical-binding: t -*- 1;;; w32-win.el --- parse switches controlling interface with W32 window system -*- lexical-binding: t -*-
2 2
3;; Copyright (C) 1993-1994, 2001-2018 Free Software Foundation, Inc. 3;; Copyright (C) 1993-1994, 2001-2019 Free Software Foundation, Inc.
4 4
5;; Author: Kevin Gallo 5;; Author: Kevin Gallo
6;; Keywords: terminals 6;; Keywords: terminals
diff --git a/lisp/term/w32console.el b/lisp/term/w32console.el
index 75d68f8f589..fe75145c6a7 100644
--- a/lisp/term/w32console.el
+++ b/lisp/term/w32console.el
@@ -1,6 +1,6 @@
1;;; w32console.el -- Setup w32 console keys and colors. 1;;; w32console.el -- Setup w32 console keys and colors.
2 2
3;; Copyright (C) 2007-2018 Free Software Foundation, Inc. 3;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
4 4
5;; Author: FSF 5;; Author: FSF
6;; Keywords: terminals 6;; Keywords: terminals
diff --git a/lisp/term/wyse50.el b/lisp/term/wyse50.el
index 7e29828747b..17f87eb980d 100644
--- a/lisp/term/wyse50.el
+++ b/lisp/term/wyse50.el
@@ -1,6 +1,6 @@
1;;; wyse50.el --- terminal support code for Wyse 50 1;;; wyse50.el --- terminal support code for Wyse 50
2 2
3;; Copyright (C) 1989, 1993-1994, 2001-2018 Free Software Foundation, 3;; Copyright (C) 1989, 1993-1994, 2001-2019 Free Software Foundation,
4;; Inc. 4;; Inc.
5 5
6;; Author: Daniel Pfeiffer <occitan@esperanto.org>, 6;; Author: Daniel Pfeiffer <occitan@esperanto.org>,
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index f169b27bc47..56061371fe1 100644
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -1,6 +1,6 @@
1;;; x-win.el --- parse relevant switches and set up for X -*- lexical-binding:t -*- 1;;; x-win.el --- parse relevant switches and set up for X -*- lexical-binding:t -*-
2 2
3;; Copyright (C) 1993-1994, 2001-2018 Free Software Foundation, Inc. 3;; Copyright (C) 1993-1994, 2001-2019 Free Software Foundation, Inc.
4 4
5;; Author: FSF 5;; Author: FSF
6;; Keywords: terminals, i18n 6;; Keywords: terminals, i18n
diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el
index 00747afbdce..0973329fa3a 100644
--- a/lisp/term/xterm.el
+++ b/lisp/term/xterm.el
@@ -1,6 +1,6 @@
1;;; xterm.el --- define function key sequences and standard colors for xterm -*- lexical-binding: t -*- 1;;; xterm.el --- define function key sequences and standard colors for xterm -*- lexical-binding: t -*-
2 2
3;; Copyright (C) 1995, 2001-2018 Free Software Foundation, Inc. 3;; Copyright (C) 1995, 2001-2019 Free Software Foundation, Inc.
4 4
5;; Author: FSF 5;; Author: FSF
6;; Keywords: terminals 6;; Keywords: terminals