diff options
| author | Stefan Monnier | 2011-01-14 12:18:41 -0500 |
|---|---|---|
| committer | Stefan Monnier | 2011-01-14 12:18:41 -0500 |
| commit | 77ab81d0545e980c57c0a35510ade29a9e43b4cd (patch) | |
| tree | 258514dac7faab41642d8f319eb113c8a5f09690 /lisp/term | |
| parent | 8faba62c38f67693535c3471d867e66757b3b04e (diff) | |
| parent | fb724e553757e9d3344be443ab5f329afc9bf91c (diff) | |
| download | emacs-77ab81d0545e980c57c0a35510ade29a9e43b4cd.tar.gz emacs-77ab81d0545e980c57c0a35510ade29a9e43b4cd.zip | |
Merge from emacs-23
Diffstat (limited to 'lisp/term')
| -rw-r--r-- | lisp/term/AT386.el | 2 | ||||
| -rw-r--r-- | lisp/term/README | 2 | ||||
| -rw-r--r-- | lisp/term/common-win.el | 2 | ||||
| -rw-r--r-- | lisp/term/internal.el | 2 | ||||
| -rw-r--r-- | lisp/term/iris-ansi.el | 2 | ||||
| -rw-r--r-- | lisp/term/news.el | 2 | ||||
| -rw-r--r-- | lisp/term/ns-win.el | 2 | ||||
| -rw-r--r-- | lisp/term/pc-win.el | 4 | ||||
| -rw-r--r-- | lisp/term/rxvt.el | 2 | ||||
| -rw-r--r-- | lisp/term/sun.el | 2 | ||||
| -rw-r--r-- | lisp/term/sup-mouse.el | 2 | ||||
| -rw-r--r-- | lisp/term/tty-colors.el | 4 | ||||
| -rw-r--r-- | lisp/term/tvi970.el | 2 | ||||
| -rw-r--r-- | lisp/term/vt100.el | 2 | ||||
| -rw-r--r-- | lisp/term/w32-win.el | 2 | ||||
| -rw-r--r-- | lisp/term/w32console.el | 2 | ||||
| -rw-r--r-- | lisp/term/wyse50.el | 2 | ||||
| -rw-r--r-- | lisp/term/x-win.el | 2 | ||||
| -rw-r--r-- | lisp/term/xterm.el | 2 |
19 files changed, 21 insertions, 21 deletions
diff --git a/lisp/term/AT386.el b/lisp/term/AT386.el index 7b6f8f8e5a0..90725a781f5 100644 --- a/lisp/term/AT386.el +++ b/lisp/term/AT386.el | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | ;;; AT386.el --- terminal support package for IBM AT keyboards -*- no-byte-compile: t -*- | 1 | ;;; AT386.el --- terminal support package for IBM AT keyboards -*- no-byte-compile: t -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1992, 2001, 2002, 2003, 2004, 2005, | 3 | ;; Copyright (C) 1992, 2001, 2002, 2003, 2004, 2005, |
| 4 | ;; 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. | 4 | ;; 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. |
| 5 | 5 | ||
| 6 | ;; Author: Eric S. Raymond <esr@snark.thyrsus.com> | 6 | ;; Author: Eric S. Raymond <esr@snark.thyrsus.com> |
| 7 | ;; Keywords: terminals | 7 | ;; Keywords: terminals |
diff --git a/lisp/term/README b/lisp/term/README index 6593c0cabdf..385acee908c 100644 --- a/lisp/term/README +++ b/lisp/term/README | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 | 1 | Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 |
| 2 | Free Software Foundation, Inc. | 2 | Free Software Foundation, Inc. |
| 3 | See the end of the file for license conditions. | 3 | See the end of the file for license conditions. |
| 4 | 4 | ||
diff --git a/lisp/term/common-win.el b/lisp/term/common-win.el index f43056976a2..1759d601d54 100644 --- a/lisp/term/common-win.el +++ b/lisp/term/common-win.el | |||
| @@ -1,7 +1,7 @@ | |||
| 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, 2002, 2003, 2004, 2005, 2006, 2007, | 3 | ;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007, |
| 4 | ;; 2008, 2009, 2010 Free Software Foundation, Inc. | 4 | ;; 2008, 2009, 2010, 2011 Free Software Foundation, Inc. |
| 5 | 5 | ||
| 6 | ;; Maintainer: FSF | 6 | ;; Maintainer: FSF |
| 7 | ;; Keywords: terminals | 7 | ;; Keywords: terminals |
diff --git a/lisp/term/internal.el b/lisp/term/internal.el index 02a14233bf6..ab4c5ec39d5 100644 --- a/lisp/term/internal.el +++ b/lisp/term/internal.el | |||
| @@ -1,7 +1,7 @@ | |||
| 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, 2002, 2003, 2004, 2005, | 3 | ;; Copyright (C) 1993, 1994, 1998, 1999, 2001, 2002, 2003, 2004, 2005, |
| 4 | ;; 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. | 4 | ;; 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. |
| 5 | 5 | ||
| 6 | ;; Author: Morten Welinder <terra@diku.dk> | 6 | ;; Author: Morten Welinder <terra@diku.dk> |
| 7 | 7 | ||
diff --git a/lisp/term/iris-ansi.el b/lisp/term/iris-ansi.el index 84bc8243b63..82da165e0fa 100644 --- a/lisp/term/iris-ansi.el +++ b/lisp/term/iris-ansi.el | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | ;;; iris-ansi.el --- configure Emacs for SGI xwsh and winterm apps -*- no-byte-compile: t -*- | 1 | ;;; iris-ansi.el --- configure Emacs for SGI xwsh and winterm apps -*- no-byte-compile: t -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, | 3 | ;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, |
| 4 | ;; 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. | 4 | ;; 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. |
| 5 | 5 | ||
| 6 | ;; Author: Dan Nicolaescu <dann@ics.uci.edu> | 6 | ;; Author: Dan Nicolaescu <dann@ics.uci.edu> |
| 7 | 7 | ||
diff --git a/lisp/term/news.el b/lisp/term/news.el index 2b2678562d5..8918bee3b81 100644 --- a/lisp/term/news.el +++ b/lisp/term/news.el | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | ;;; news.el --- keypad and function key bindings for the Sony NEWS keyboard -*- no-byte-compile: t -*- | 1 | ;;; news.el --- keypad and function key bindings for the Sony NEWS keyboard -*- no-byte-compile: t -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1989, 1993, 2001, 2002, 2003, 2004, | 3 | ;; Copyright (C) 1989, 1993, 2001, 2002, 2003, 2004, |
| 4 | ;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. | 4 | ;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. |
| 5 | 5 | ||
| 6 | ;; Author: FSF | 6 | ;; Author: FSF |
| 7 | ;; Keywords: terminals | 7 | ;; Keywords: terminals |
diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el index 77a2d3f2bc0..4617b07d0b9 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 X window system | 1 | ;;; ns-win.el --- lisp side of interface with NeXT/Open/GNUstep/MacOS X window system |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1993, 1994, 2005, 2006, 2007, 2008, 2009, 2010 | 3 | ;; Copyright (C) 1993, 1994, 2005, 2006, 2007, 2008, 2009, 2010, 2011 |
| 4 | ;; Free Software Foundation, Inc. | 4 | ;; Free Software Foundation, Inc. |
| 5 | 5 | ||
| 6 | ;; Authors: Carl Edman | 6 | ;; Authors: Carl Edman |
diff --git a/lisp/term/pc-win.el b/lisp/term/pc-win.el index c13862a8da0..e4041bdef28 100644 --- a/lisp/term/pc-win.el +++ b/lisp/term/pc-win.el | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | ;;; pc-win.el --- setup support for `PC windows' (whatever that is) | 1 | ;;; pc-win.el --- setup support for `PC windows' (whatever that is) |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1994, 1996, 1997, 1999, 2001, 2002, 2003, 2004, 2005, | 3 | ;; Copyright (C) 1994, 1996, 1997, 1999, 2001, 2002, 2003, 2004, |
| 4 | ;; 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. | 4 | ;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. |
| 5 | 5 | ||
| 6 | ;; Author: Morten Welinder <terra@diku.dk> | 6 | ;; Author: Morten Welinder <terra@diku.dk> |
| 7 | ;; Maintainer: FSF | 7 | ;; Maintainer: FSF |
diff --git a/lisp/term/rxvt.el b/lisp/term/rxvt.el index b735e887944..18ceff62def 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, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 | 3 | ;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 |
| 4 | ;; Free Software Foundation, Inc. | 4 | ;; Free Software Foundation, Inc. |
| 5 | 5 | ||
| 6 | ;; Author: Eli Zaretskii | 6 | ;; Author: Eli Zaretskii |
diff --git a/lisp/term/sun.el b/lisp/term/sun.el index 383dfd6fdf3..705d67a2133 100644 --- a/lisp/term/sun.el +++ b/lisp/term/sun.el | |||
| @@ -1,7 +1,7 @@ | |||
| 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, 2002, 2003, 2004, | 3 | ;; Copyright (C) 1987, 2001, 2002, 2003, 2004, |
| 4 | ;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. | 4 | ;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. |
| 5 | 5 | ||
| 6 | ;; Author: Jeff Peck <peck@sun.com> | 6 | ;; Author: Jeff Peck <peck@sun.com> |
| 7 | ;; Keywords: terminals | 7 | ;; Keywords: terminals |
diff --git a/lisp/term/sup-mouse.el b/lisp/term/sup-mouse.el index 14e50063868..84b4a8d2702 100644 --- a/lisp/term/sup-mouse.el +++ b/lisp/term/sup-mouse.el | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | ;;; sup-mouse.el --- supdup mouse support for lisp machines | 1 | ;;; sup-mouse.el --- supdup mouse support for lisp machines |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, | 3 | ;; Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, |
| 4 | ;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. | 4 | ;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. |
| 5 | 5 | ||
| 6 | ;; Author: Wolfgang Rupprecht | 6 | ;; Author: Wolfgang Rupprecht |
| 7 | ;; Maintainer: FSF | 7 | ;; Maintainer: FSF |
diff --git a/lisp/term/tty-colors.el b/lisp/term/tty-colors.el index df45dc192a7..8705d9d8cba 100644 --- a/lisp/term/tty-colors.el +++ b/lisp/term/tty-colors.el | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | ;;; tty-colors.el --- color support for character terminals | 1 | ;;; tty-colors.el --- color support for character terminals |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, | 3 | ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, |
| 4 | ;; 2008, 2009, 2010 Free Software Foundation, Inc. | 4 | ;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. |
| 5 | 5 | ||
| 6 | ;; Author: Eli Zaretskii | 6 | ;; Author: Eli Zaretskii |
| 7 | ;; Maintainer: FSF | 7 | ;; Maintainer: FSF |
diff --git a/lisp/term/tvi970.el b/lisp/term/tvi970.el index 4476165febc..48e2464ebf6 100644 --- a/lisp/term/tvi970.el +++ b/lisp/term/tvi970.el | |||
| @@ -1,7 +1,7 @@ | |||
| 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, 2002, 2003, 2004, 2005, | 3 | ;; Copyright (C) 1992, 2001, 2002, 2003, 2004, 2005, |
| 4 | ;; 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. | 4 | ;; 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. |
| 5 | 5 | ||
| 6 | ;; Author: Jim Blandy <jimb@occs.cs.oberlin.edu> | 6 | ;; Author: Jim Blandy <jimb@occs.cs.oberlin.edu> |
| 7 | ;; Keywords: terminals | 7 | ;; Keywords: terminals |
diff --git a/lisp/term/vt100.el b/lisp/term/vt100.el index 24561fe835f..cc861e63865 100644 --- a/lisp/term/vt100.el +++ b/lisp/term/vt100.el | |||
| @@ -1,7 +1,7 @@ | |||
| 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, 2002, 2003, 2004, | 3 | ;; Copyright (C) 1989, 1993, 2001, 2002, 2003, 2004, |
| 4 | ;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. | 4 | ;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. |
| 5 | 5 | ||
| 6 | ;; Author: FSF | 6 | ;; Author: FSF |
| 7 | ;; Keywords: terminals | 7 | ;; Keywords: terminals |
diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el index df4057aba24..e160e0278d4 100644 --- a/lisp/term/w32-win.el +++ b/lisp/term/w32-win.el | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | ;;; w32-win.el --- parse switches controlling interface with W32 window system | 1 | ;;; w32-win.el --- parse switches controlling interface with W32 window system |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007, | 3 | ;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007, |
| 4 | ;; 2008, 2009, 2010 Free Software Foundation, Inc. | 4 | ;; 2008, 2009, 2010, 2011 Free Software Foundation, Inc. |
| 5 | 5 | ||
| 6 | ;; Author: Kevin Gallo | 6 | ;; Author: Kevin Gallo |
| 7 | ;; Keywords: terminals | 7 | ;; Keywords: terminals |
diff --git a/lisp/term/w32console.el b/lisp/term/w32console.el index 0d3aa934b9b..65cc3680aed 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, 2008, 2009, 2010 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2007, 2008, 2009, 2010, 2011 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 5cb2829f5f5..813f6be2485 100644 --- a/lisp/term/wyse50.el +++ b/lisp/term/wyse50.el | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | ;;; wyse50.el --- terminal support code for Wyse 50 -*- no-byte-compile: t -*- | 1 | ;;; wyse50.el --- terminal support code for Wyse 50 -*- no-byte-compile: t -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1989, 1993, 1994, 2001, 2002, 2003, 2004, | 3 | ;; Copyright (C) 1989, 1993, 1994, 2001, 2002, 2003, 2004, |
| 4 | ;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. | 4 | ;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. |
| 5 | 5 | ||
| 6 | ;; Author: Daniel Pfeiffer <occitan@esperanto.org>, | 6 | ;; Author: Daniel Pfeiffer <occitan@esperanto.org>, |
| 7 | ;; Jim Blandy <jimb@occs.cs.oberlin.edu> | 7 | ;; Jim Blandy <jimb@occs.cs.oberlin.edu> |
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el index afb706ab972..8d3ead687e6 100644 --- a/lisp/term/x-win.el +++ b/lisp/term/x-win.el | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | ;;; x-win.el --- parse relevant switches and set up for X -*-coding: iso-2022-7bit;-*- | 1 | ;;; x-win.el --- parse relevant switches and set up for X -*-coding: iso-2022-7bit;-*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007, | 3 | ;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007, |
| 4 | ;; 2008, 2009, 2010 Free Software Foundation, Inc. | 4 | ;; 2008, 2009, 2010, 2011 Free Software Foundation, Inc. |
| 5 | 5 | ||
| 6 | ;; Author: FSF | 6 | ;; Author: FSF |
| 7 | ;; Keywords: terminals, i18n | 7 | ;; Keywords: terminals, i18n |
diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el index ccedf4045e4..aacee8dd7bb 100644 --- a/lisp/term/xterm.el +++ b/lisp/term/xterm.el | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | ;;; xterm.el --- define function key sequences and standard colors for xterm | 1 | ;;; xterm.el --- define function key sequences and standard colors for xterm |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005, | 3 | ;; Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005, |
| 4 | ;; 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. | 4 | ;; 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. |
| 5 | 5 | ||
| 6 | ;; Author: FSF | 6 | ;; Author: FSF |
| 7 | ;; Keywords: terminals | 7 | ;; Keywords: terminals |