aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/term
diff options
context:
space:
mode:
authorMiles Bader2008-01-09 01:21:15 +0000
committerMiles Bader2008-01-09 01:21:15 +0000
commit430d2ee2919b2d4693780f2474ba40148442d206 (patch)
treeea4b697cc7403cfffa9f4dcad08c61345a1d31b0 /lisp/term
parentbcab78b72bd640d41c7b4268e05e9f3f9e2c69c1 (diff)
parent59ce725a3b68cbc324f01bc8dc5f9e07286431d1 (diff)
downloademacs-430d2ee2919b2d4693780f2474ba40148442d206.tar.gz
emacs-430d2ee2919b2d4693780f2474ba40148442d206.zip
Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-312
Diffstat (limited to 'lisp/term')
-rw-r--r--lisp/term/AT386.el2
-rw-r--r--lisp/term/README2
-rw-r--r--lisp/term/internal.el2
-rw-r--r--lisp/term/iris-ansi.el2
-rw-r--r--lisp/term/mac-win.el2
-rw-r--r--lisp/term/news.el2
-rw-r--r--lisp/term/pc-win.el2
-rw-r--r--lisp/term/rxvt.el2
-rw-r--r--lisp/term/sun.el2
-rw-r--r--lisp/term/sup-mouse.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/wyse50.el2
-rw-r--r--lisp/term/x-win.el27
-rw-r--r--lisp/term/xterm.el2
17 files changed, 18 insertions, 41 deletions
diff --git a/lisp/term/AT386.el b/lisp/term/AT386.el
index 748807f026f..8e418ecd326 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 Free Software Foundation, Inc. 4;; 2006, 2007, 2008 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 e5fb2da83ad..543bd352c05 100644
--- a/lisp/term/README
+++ b/lisp/term/README
@@ -1,4 +1,4 @@
1Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2007 1Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
2 Free Software Foundation, Inc. 2 Free Software Foundation, Inc.
3See the end of the file for license conditions. 3See the end of the file for license conditions.
4 4
diff --git a/lisp/term/internal.el b/lisp/term/internal.el
index fb13f48d6ba..0c7d9446992 100644
--- a/lisp/term/internal.el
+++ b/lisp/term/internal.el
@@ -1,7 +1,7 @@
1;;; internal.el --- support for PC internal terminal -*- coding: raw-text; no-byte-compile: t -*- 1;;; internal.el --- support for PC internal terminal -*- coding: raw-text; no-byte-compile: t -*-
2 2
3;; Copyright (C) 1993, 1994, 1998, 1999, 2001, 2002, 2003, 2004, 3;; Copyright (C) 1993, 1994, 1998, 1999, 2001, 2002, 2003, 2004,
4;; 2005, 2006, 2007 Free Software Foundation, Inc. 4;; 2005, 2006, 2007, 2008 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 d7e12095022..7089348ed13 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 Free Software Foundation, Inc. 4;; 2006, 2007, 2008 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/mac-win.el b/lisp/term/mac-win.el
index 641af430024..e9a06bbf00b 100644
--- a/lisp/term/mac-win.el
+++ b/lisp/term/mac-win.el
@@ -1,7 +1,7 @@
1;;; mac-win.el --- parse switches controlling interface with Mac window system -*-coding: utf-8 1;;; mac-win.el --- parse switches controlling interface with Mac window system -*-coding: utf-8
2 2
3;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 3;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
4;; 2005, 2006, 2007 Free Software Foundation, Inc. 4;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
5 5
6;; Author: Andrew Choi <akochoi@mac.com> 6;; Author: Andrew Choi <akochoi@mac.com>
7;; Keywords: terminals 7;; Keywords: terminals
diff --git a/lisp/term/news.el b/lisp/term/news.el
index 0ce303d2265..5f7195ca984 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 Free Software Foundation, Inc. 4;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
5 5
6;; Author: FSF 6;; Author: FSF
7;; Keywords: terminals 7;; Keywords: terminals
diff --git a/lisp/term/pc-win.el b/lisp/term/pc-win.el
index 2ddb4e40433..e3bb01eded9 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, 3;; Copyright (C) 1994, 1996, 1997, 1999, 2001, 2002, 2003, 2004,
4;; 2005, 2006, 2007 Free Software Foundation, Inc. 4;; 2005, 2006, 2007, 2008 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 c96c8a6e290..60f5acd2546 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 Free Software Foundation, Inc. 3;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 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/sun.el b/lisp/term/sun.el
index 22b29c92790..54bb45a5c18 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 Free Software Foundation, Inc. 4;; 2005, 2006, 2007, 2008 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 3d8b6873bc1..3486aebf016 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 Free Software Foundation, Inc. 4;; 2005, 2006, 2007, 2008 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 5622efa022d..c314d4fada7 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, 3;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
4;; 2005, 2006, 2007 Free Software Foundation, Inc. 4;; 2005, 2006, 2007, 2008 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 7e4ca062143..c40b201d0b5 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 Free Software Foundation, Inc. 4;; 2006, 2007, 2008 Free Software Foundation, Inc.
5 5
6;; Author: Jim Blandy <jimb@occs.cs.oberlin.edu>, January 1992 6;; Author: Jim Blandy <jimb@occs.cs.oberlin.edu>, January 1992
7;; Keywords: terminals 7;; Keywords: terminals
diff --git a/lisp/term/vt100.el b/lisp/term/vt100.el
index 17627db8923..10a15619f84 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 Free Software Foundation, Inc. 4;; 2005, 2006, 2007, 2008 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 bdaeaf1b52e..ca7a8c46d0a 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, 3;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004,
4;; 2005, 2006, 2007 Free Software Foundation, Inc. 4;; 2005, 2006, 2007, 2008 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/wyse50.el b/lisp/term/wyse50.el
index 7c66be9397c..2076d3cbbda 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 Free Software Foundation, Inc. 4;; 2005, 2006, 2007, 2008 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 b8a8097d0aa..f5ec4c27480 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, 3;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004,
4;; 2005, 2006, 2007 Free Software Foundation, Inc. 4;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
5 5
6;; Author: FSF 6;; Author: FSF
7;; Keywords: terminals, i18n 7;; Keywords: terminals, i18n
@@ -1228,30 +1228,7 @@ XConsortium: rgb.txt,v 10.41 94/02/20 18:39:36 rws Exp")
1228 "Return the appropriate value of `system-key-alist' for VENDOR. 1228 "Return the appropriate value of `system-key-alist' for VENDOR.
1229VENDOR is a string containing the name of the X Server's vendor, 1229VENDOR is a string containing the name of the X Server's vendor,
1230as returned by `x-server-vendor'." 1230as returned by `x-server-vendor'."
1231 ;; Fixme: Drop Apollo now? 1231 (cond ((or (string-equal vendor "Hewlett-Packard Incorporated")
1232 (cond ((string-equal vendor "Apollo Computer Inc.")
1233 '((65280 . linedel)
1234 (65281 . chardel)
1235 (65282 . copy)
1236 (65283 . cut)
1237 (65284 . paste)
1238 (65285 . move)
1239 (65286 . grow)
1240 (65287 . cmd)
1241 (65288 . shell)
1242 (65289 . leftbar)
1243 (65290 . rightbar)
1244 (65291 . leftbox)
1245 (65292 . rightbox)
1246 (65293 . upbox)
1247 (65294 . downbox)
1248 (65295 . pop)
1249 (65296 . read)
1250 (65297 . edit)
1251 (65298 . save)
1252 (65299 . exit)
1253 (65300 . repeat)))
1254 ((or (string-equal vendor "Hewlett-Packard Incorporated")
1255 (string-equal vendor "Hewlett-Packard Company")) 1232 (string-equal vendor "Hewlett-Packard Company"))
1256 '(( 168 . mute-acute) 1233 '(( 168 . mute-acute)
1257 ( 169 . mute-grave) 1234 ( 169 . mute-grave)
diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el
index fbc4c861bf9..2fd8d47afac 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 Free Software Foundation, Inc. 4;; 2006, 2007, 2008 Free Software Foundation, Inc.
5 5
6;; Author: FSF 6;; Author: FSF
7;; Keywords: terminals 7;; Keywords: terminals
generated by cgit v1.2.1 (git 2.18.0) at 2026-04-24 07:58:58 +0000