Update years in copyright notice; nfc.

18 files changed, 130 insertions, 120 deletions

diff --git a/lisp/term/AT386.el b/lisp/term/AT386.el
index 8b239a706ef..22768730e70 100644
--- a/lisp/term/AT386.el
+++ b/lisp/term/AT386.el
@@ -3,7 +3,7 @@
 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
 ;; Keywords: terminals
 
-;; Copyright (C) 1992 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/term/bg-mouse.el b/lisp/term/bg-mouse.el
index 017a92d5770..00484c11532 100644
--- a/lisp/term/bg-mouse.el
+++ b/lisp/term/bg-mouse.el
@@ -1,6 +1,6 @@
 ;;; bg-mouse.el --- GNU Emacs code for BBN Bitgraph mouse
 
-;; Copyright (C) 2001 Free Software Foundation, Inc. Oct 1985.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: John Robinson <jr@bbn-unix.arpa>
 ;;	Stephen Gildea <gildea@bbn.com>
diff --git a/lisp/term/internal.el b/lisp/term/internal.el
index 17c3fc91993..1a266b0706f 100644
--- a/lisp/term/internal.el
+++ b/lisp/term/internal.el
@@ -1,6 +1,7 @@
 ;;; internal.el --- support for PC internal terminal -*- coding: raw-text; no-byte-compile: t -*-
 
-;; Copyright (C) 1993, 1994, 1998, 1999, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1994, 1998, 1999, 2001, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Morten Welinder <terra@diku.dk>
 
diff --git a/lisp/term/iris-ansi.el b/lisp/term/iris-ansi.el
index ef59860b606..e62434d2865 100644
--- a/lisp/term/iris-ansi.el
+++ b/lisp/term/iris-ansi.el
@@ -1,6 +1,6 @@
 ;;; iris-ansi.el --- configure Emacs for SGI xwsh and winterm apps -*- no-byte-compile: t -*-
 
-;; Copyright (C) 1997, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: Dan Nicolaescu <dann@ics.uci.edu>
 
@@ -58,28 +58,28 @@
   (define-key function-key-map "\e[006q" [f6])
   (define-key function-key-map "\e[018q" [S-f6])
   (define-key function-key-map "\e[030q" [C-f6])
-  
+
 
   (define-key function-key-map "\e[007q" [f7])
   (define-key function-key-map "\e[019q" [S-f7])
   (define-key function-key-map "\e[031q" [C-f7])
-  
-  
+
+
   (define-key function-key-map "\e[008q" [f8])
   (define-key function-key-map "\e[020q" [S-f8])
   (define-key function-key-map "\e[032q" [C-f8])
-  
+
 
   (define-key function-key-map "\e[009q" [f9])
   (define-key function-key-map "\e[021q" [S-f9])
   (define-key function-key-map "\e[033q" [C-f9])
-  
-  
+
+
   (define-key function-key-map "\e[010q" [f10])
   (define-key function-key-map "\e[022q" [S-f10])
   (define-key function-key-map "\e[034q" [C-f10])
-  
-  
+
+
   (define-key function-key-map "\e[011q" [f11])
   (define-key function-key-map "\e[023q" [S-f11])
   (define-key function-key-map "\e[035q" [C-f11])
@@ -89,102 +89,102 @@
   (define-key function-key-map "\e[024q" [S-f12])
   (define-key function-key-map "\e[036q" [C-f12])
   (define-key function-key-map "\e[048q" [M-f12])
-  
-  
+
+
   (define-key function-key-map "\e[057q" [?\C-`])
   (define-key function-key-map "\e[115q" [?\M-`])
-  
+
   (define-key function-key-map "\e[049q" [?\C-1])
   (define-key function-key-map "\e[058q" [?\M-1])
-  
-  
+
+
   (define-key function-key-map "\e[059q" [?\M-2])
-  
+
   (define-key function-key-map "\e[050q" [?\C-3])
   (define-key function-key-map "\e[060q" [?\M-3])
-  
+
   (define-key function-key-map "\e[051q" [?\C-4])
   (define-key function-key-map "\e[061q" [?\M-4])
-  
+
   (define-key function-key-map "\e[052q" [?\C-5])
   (define-key function-key-map "\e[062q" [?\M-5])
-  
+
 
   (define-key function-key-map "\e[063q" [?\M-6])
-  
+
   (define-key function-key-map "\e[053q" [?\C-7])
   (define-key function-key-map "\e[064q" [?\M-7])
-  
+
   (define-key function-key-map "\e[054q" [?\C-8])
   (define-key function-key-map "\e[065q" [?\M-8])
-  
+
   (define-key function-key-map "\e[055q" [?\C-9])
   (define-key function-key-map "\e[066q" [?\M-9])
-  
+
   (define-key function-key-map "\e[056q" [?\C-0])
   (define-key function-key-map "\e[067q" [?\M-0])
-  
+
   (define-key function-key-map "\e[068q" [?\M--])
-  
+
   (define-key function-key-map "\e[069q" [?\C-=])
   (define-key function-key-map "\e[070q" [?\M-=])
-  
+
   ;; I don't know what to do with those.
   ;;(define-key function-key-map "^H" [<del>])
   ;;(define-key function-key-map "^H" [S-<del>])
   ;;(define-key function-key-map "\177" [C-<del>])
   ;;(define-key function-key-map "\e[071q" [M-<del>])
-  
+
   (define-key function-key-map "\e[Z" [?\S-\t])
   (define-key function-key-map "\e[072q" [?\C-\t])
   ;; This only works if you remove the M-TAB keybing from the system.4Dwmrc
   ;; our your ~/.4Dwmrc, if you use the 4Dwm window manager.
   (define-key function-key-map "\e[073q" [?\M-\t])
-  
+
   (define-key function-key-map "\e[074q" [?\M-q])
 
   (define-key function-key-map "\e[075q" [?\M-w])
-  
+
   (define-key function-key-map "\e[076q" [?\M-e])
 
   (define-key function-key-map "\e[077q" [?\M-r])
-  
+
   (define-key function-key-map "\e[078q" [?\M-t])
-  
+
   (define-key function-key-map "\e[079q" [?\M-y])
-  
+
   (define-key function-key-map "\e[080q" [?\M-u])
-  
+
   (define-key function-key-map "\e[081q" [?\M-i])
 
   (define-key function-key-map "\e[082q" [?\M-o])
-  
+
   (define-key function-key-map "\e[083q" [?\M-p])
-  
+
   (define-key function-key-map "\e[084q" [?\M-\[])
-  
+
   (define-key function-key-map "\e[085q" [?\M-\]])
-  
+
   (define-key function-key-map "\e[086q" [?\M-\\])
-  
+
   (define-key function-key-map "\e[087q" [?\M-a])
-  
+
   (define-key function-key-map "\e[088q" [?\M-s])
-  
+
   (define-key function-key-map "\e[089q" [?\M-d])
-  
+
   (define-key function-key-map "\e[090q" [?\M-f])
-  
+
   (define-key function-key-map "\e[091q" [?\M-g])
-  
+
   (define-key function-key-map "\e[092q" [?\M-h])
-  
+
   (define-key function-key-map "\e[093q" [?\M-j])
-  
+
   (define-key function-key-map "\e[094q" [?\M-k])
-  
+
   (define-key function-key-map "\e[095q" [?\M-l])
-  
+
   (define-key function-key-map "\e[096q" [?\C-\;])
   (define-key function-key-map "\e[097q" [?\M-:]) ;; we are cheating
 						  ;; here, this is
@@ -195,41 +195,41 @@
 
   (define-key function-key-map "\e[098q" [?\C-'])
   (define-key function-key-map "\e[099q" [?\M-'])
-  
+
   (define-key function-key-map "\e[100q" [?\M-\n])
-  
+
   (define-key function-key-map "\e[101q" [?\M-z])
-  
+
   (define-key function-key-map "\e[102q" [?\M-x])
-  
+
   (define-key function-key-map "\e[103q" [?\M-c])
-  
+
   (define-key function-key-map "\e[104q" [?\M-v])
-  
+
   (define-key function-key-map "\e[105q" [?\M-b])
-  
+
   (define-key function-key-map "\e[106q" [M-n])
-  
+
   (define-key function-key-map "\e[107q" [M-m])
-  
+
   (define-key function-key-map "\e[108q" [?\C-,])
   (define-key function-key-map "\e[109q" [?\M-,])
-  
+
   (define-key function-key-map "\e[110q" [?\C-.])
   (define-key function-key-map "\e[111q" [?\M-.])
-  
+
   (define-key function-key-map "\e[112q" [?\C-/])
   (define-key function-key-map "\e[113q" [?\M-/])
-  
+
   (define-key function-key-map "\e[139q" [insert])
   (define-key function-key-map "\e[139q" [S-insert])
   (define-key function-key-map "\e[140q" [C-insert])
   (define-key function-key-map "\e[141q" [M-insert])
-  
+
   (define-key function-key-map "\e[H" [home])
   (define-key function-key-map "\e[143q" [S-home])
   (define-key function-key-map "\e[144q" [C-home])
-  
+
 
   (define-key function-key-map "\e[150q" [prior])
   (define-key function-key-map "\e[151q" [S-prior]) ;; those don't
@@ -238,90 +238,90 @@
 						    ;; anything
   (define-key function-key-map "\e[152q" [C-prior])
 
-  
-  ;; (define-key function-key-map "^?" [delete]) 
+
+  ;; (define-key function-key-map "^?" [delete])
   (define-key function-key-map "\e[P" [S-delete])
   (define-key function-key-map "\e[142q" [C-delete])
   (define-key function-key-map "\e[M" [M-delete])
-  
+
   (define-key function-key-map "\e[146q" [end])
   (define-key function-key-map "\e[147q" [S-end]) ;; those don't seem
 						  ;; to generate
 						  ;; anything
   (define-key function-key-map "\e[148q" [C-end])
-  
+
   (define-key function-key-map "\e[154q" [next])
   (define-key function-key-map "\e[155q" [S-next])
   (define-key function-key-map "\e[156q" [C-next])
-  
+
 
   (define-key function-key-map "\e[161q" [S-up])
   (define-key function-key-map "\e[162q" [C-up])
   (define-key function-key-map "\e[163q" [M-up])
-  
+
   (define-key function-key-map "\e[158q" [S-left])
   (define-key function-key-map "\e[159q" [C-left])
   (define-key function-key-map "\e[160q" [M-left])
-  
+
   (define-key function-key-map "\e[164q" [S-down])
   (define-key function-key-map "\e[165q" [C-down])
   (define-key function-key-map "\e[166q" [M-down])
-  
+
   (define-key function-key-map "\e[167q" [S-right])
   (define-key function-key-map "\e[168q" [C-right])
   (define-key function-key-map "\e[169q" [M-right])
-  
+
   ;; Keypad functions, most of those are untested.
   (define-key function-key-map "\e[179q" [?\C-/])
   (define-key function-key-map "\e[180q" [?\M-/])
-  
+
   (define-key function-key-map "\e[187q" [?\C-*])
   (define-key function-key-map "\e[188q" [?\M-*])
-  
+
   (define-key function-key-map "\e[198q" [?\C--])
   (define-key function-key-map "\e[199q" [?\M--])
-  
+
   ;; Something else takes care of home, up, prior, down, left, right, next
   ;;(define-key function-key-map "\e[H" [home])
   (define-key function-key-map "\e[172q" [C-home])
-  
+
   ;;(define-key function-key-map "\e[A" [up])
   (define-key function-key-map "\e[182q" [C-up])
-  
-  
+
+
   ;;(define-key function-key-map "\e[150q" [prior])
   (define-key function-key-map "\e[190q" [C-prior])
-  
-  
+
+
   (define-key function-key-map "\e[200q" [?\C-+])
   (define-key function-key-map "\e[201q" [?\M-+])
-  
+
   ;;(define-key function-key-map "\e[D" [left])
   (define-key function-key-map "\e[174q" [C-left])
 
-  
+
   (define-key function-key-map "\e[000q" [begin])
   (define-key function-key-map "\e[184q" [C-begin])
 
-  
+
   ;;(define-key function-key-map "\e[C" [right])
   (define-key function-key-map "\e[192q" [C-right])
-  
+
   ;;(define-key function-key-map "\e[146q" [end])
   (define-key function-key-map "\e[176q" [C-end])
-  
+
   ;;(define-key function-key-map "\e[B" [down])
   (define-key function-key-map "\e[186q" [C-down])
-  
+
   ;;(define-key function-key-map "\e[154q" [next])
   (define-key function-key-map "\e[194q" [C-next])
-  
-  
+
+
   (define-key function-key-map "\e[100q" [M-enter])
-  
+
   (define-key function-key-map "\e[139q" [insert])
   (define-key function-key-map "\e[178q" [C-inset])
-  
+
   (define-key function-key-map "\e[P" [delete])
   (define-key function-key-map "\e[196q" [C-delete])
   (define-key function-key-map "\e[197q" [M-delete]))
diff --git a/lisp/term/mac-win.el b/lisp/term/mac-win.el
index 26fbf437dbd..1af90eb750f 100644
--- a/lisp/term/mac-win.el
+++ b/lisp/term/mac-win.el
@@ -1,7 +1,7 @@
 ;;; mac-win.el --- parse switches controlling interface with Mac window system -*-coding: iso-2022-7bit;-*-
 
-;; Copyright (C) 1999, 2000, 2002, 2003, 2005
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Andrew Choi <akochoi@mac.com>
 ;; Keywords: terminals
@@ -1501,7 +1501,7 @@ in `selection-converter-alist', which see."
     (char-table-extra-slot translation-table 0)))
 
 (let
-    ((encoding-vector 
+    ((encoding-vector
       (vconcat
        (make-vector 32 nil)
        ;; mac-dingbats (32..126) -> emacs-mule mapping
diff --git a/lisp/term/news.el b/lisp/term/news.el
index f8a4934f8bc..014ecb1cc13 100644
--- a/lisp/term/news.el
+++ b/lisp/term/news.el
@@ -1,6 +1,7 @@
 ;;; news.el --- keypad and function key bindings for the Sony NEWS keyboard -*- no-byte-compile: t -*-
 
-;; Copyright (C) 1989, 1993, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1989, 1993, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: FSF
 ;; Keywords: terminals
@@ -29,7 +30,7 @@
 ;;; Code:
 
 (defun terminal-init-news ()
-  "Terminal initialization function for news."  
+  "Terminal initialization function for news."
   (if (boundp 'news-fkey-prefix)
       nil
     ;; The terminal initialization should already have set up some keys
diff --git a/lisp/term/pc-win.el b/lisp/term/pc-win.el
index 529903d06b0..bdaef8813e7 100644
--- a/lisp/term/pc-win.el
+++ b/lisp/term/pc-win.el
@@ -1,6 +1,7 @@
 ;;; pc-win.el --- setup support for `PC windows' (whatever that is)
 
-;; Copyright (C) 1994, 1996, 1997, 1999, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 1996, 1997, 1999, 2001, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Morten Welinder <terra@diku.dk>
 ;; Maintainer: FSF
diff --git a/lisp/term/rxvt.el b/lisp/term/rxvt.el
index f0e9dd7b5b1..1b4e5a6f61f 100644
--- a/lisp/term/rxvt.el
+++ b/lisp/term/rxvt.el
@@ -1,6 +1,6 @@
 ;;; rxvt.el --- define function key sequences and standard colors for rxvt
 
-;; Copyright (C) 2002, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: Eli Zaretskii
 ;; Keywords: terminals
@@ -36,7 +36,7 @@
   ;; function-key-map. This substitution is needed because if a key
   ;; definition if found in function-key-map, there are no further
   ;; lookups in other keymaps.
-  (substitute-key-definition [f11] [S-f1] function-key-map) 
+  (substitute-key-definition [f11] [S-f1] function-key-map)
   (substitute-key-definition [f12] [S-f2] function-key-map)
   (substitute-key-definition [f13] [S-f3] function-key-map)
   (substitute-key-definition [f14] [S-f4] function-key-map)
@@ -47,7 +47,7 @@
   (substitute-key-definition [f19] [S-f9] function-key-map)
   (substitute-key-definition [f20] [S-f10] function-key-map)
 
-  (substitute-key-definition [f23] [C-f1] function-key-map) 
+  (substitute-key-definition [f23] [C-f1] function-key-map)
   (substitute-key-definition [f24] [C-f2] function-key-map)
   (substitute-key-definition [f25] [C-f3] function-key-map)
   (substitute-key-definition [f26] [C-f4] function-key-map)
@@ -58,7 +58,7 @@
   (substitute-key-definition [f31] [C-f9] function-key-map)
   (substitute-key-definition [f32] [C-f10] function-key-map)
 
-  (substitute-key-definition [f33] [C-S-f1] function-key-map) 
+  (substitute-key-definition [f33] [C-S-f1] function-key-map)
   (substitute-key-definition [f34] [C-S-f2] function-key-map)
   (substitute-key-definition [f35] [C-S-f3] function-key-map)
   (substitute-key-definition [f36] [C-S-f4] function-key-map)
diff --git a/lisp/term/sun-mouse.el b/lisp/term/sun-mouse.el
index d0126404a2b..06fe5fd440d 100644
--- a/lisp/term/sun-mouse.el
+++ b/lisp/term/sun-mouse.el
@@ -1,6 +1,6 @@
 ;;; sun-mouse.el --- mouse handling for Sun windows
 
-;; Copyright (C) 1987 Free Software Foundation, Inc.
+;; Copyright (C) 1987, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: Jeff Peck
 ;; Maintainer: FSF
diff --git a/lisp/term/sun.el b/lisp/term/sun.el
index 7d857ca1266..3963a18efdb 100644
--- a/lisp/term/sun.el
+++ b/lisp/term/sun.el
@@ -1,6 +1,7 @@
 ;;; sun.el --- keybinding for standard default sunterm keys
 
-;; Copyright (C) 1987, 2001, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1987, 2001, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Jeff Peck <peck@sun.com>
 ;; Keywords: terminals
@@ -253,7 +254,7 @@
       (while hooks
 	(eval (car hooks))
 	(setq hooks (cdr hooks)))))
-  
+
   (define-key ctl-x-map "\C-@" 'sun-mouse-once))
 
 (defun emacstool-init ()
diff --git a/lisp/term/sup-mouse.el b/lisp/term/sup-mouse.el
index cf4de575877..54da5b34505 100644
--- a/lisp/term/sup-mouse.el
+++ b/lisp/term/sup-mouse.el
@@ -1,6 +1,7 @@
 ;;; sup-mouse.el --- supdup mouse support for lisp machines
 
-;; Copyright (C) Free Software Foundation 1985, 1986
+;; Copyright (C) 1985, 1986, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Wolfgang Rupprecht
 ;; Maintainer: FSF
diff --git a/lisp/term/tty-colors.el b/lisp/term/tty-colors.el
index 9a5eb5aa83f..d3aee8e64f0 100644
--- a/lisp/term/tty-colors.el
+++ b/lisp/term/tty-colors.el
@@ -1,6 +1,7 @@
 ;;; tty-colors.el --- color support for character terminals
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Eli Zaretskii
 ;; Maintainer: FSF
diff --git a/lisp/term/tvi970.el b/lisp/term/tvi970.el
index f7bc8c852a9..23eea911b79 100644
--- a/lisp/term/tvi970.el
+++ b/lisp/term/tvi970.el
@@ -3,7 +3,7 @@
 ;; Author: Jim Blandy <jimb@occs.cs.oberlin.edu>, January 1992
 ;; Keywords: terminals
 
-;; Copyright (C) 1992, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/term/vt100.el b/lisp/term/vt100.el
index 6b44e941813..3f744a5212a 100644
--- a/lisp/term/vt100.el
+++ b/lisp/term/vt100.el
@@ -1,6 +1,7 @@
 ;;; vt100.el --- define VT100 function key sequences in function-key-map
 
-;; Copyright (C) 1989, 1993 Free Software Foundation, Inc.
+;; Copyright (C) 1989, 1993, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: FSF
 ;; Keywords: terminals
@@ -41,7 +42,7 @@
 (defun terminal-init-vt100 ()
   "Terminal initialization function for vt100."
   (load "term/lk201" nil t))
-  
+
 ;;; Controlling the screen width.
 (defvar vt100-wide-mode (= (frame-width) 132)
   "t if vt100 is in 132-column mode.")
diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index 844fc087dcf..b66efc09ca2 100644
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -1,6 +1,7 @@
 ;;; w32-win.el --- parse switches controlling interface with W32 window system
 
-;; Copyright (C) 1993, 1994, 2003, 2005  Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1994, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Kevin Gallo
 ;; Keywords: terminals
@@ -108,8 +109,8 @@ Switch to a buffer editing the last file dropped."
 	   (y (cdr coords)))
       (if (and (> x 0) (> y 0))
 	  (set-frame-selected-window nil window))
-      (mapcar (lambda (file-name) 
-		(dnd-handle-one-url window 'private 
+      (mapcar (lambda (file-name)
+		(dnd-handle-one-url window 'private
 				    (concat "file:" file-name)))
 		(car (cdr (cdr event)))))
   (raise-frame)))
diff --git a/lisp/term/wyse50.el b/lisp/term/wyse50.el
index 64c489d7204..75f43420013 100644
--- a/lisp/term/wyse50.el
+++ b/lisp/term/wyse50.el
@@ -1,6 +1,7 @@
 ;;; wyse50.el --- terminal support code for Wyse 50 -*- no-byte-compile: t -*-
 
-;; Copyright (C) 1989, 1993, 1994, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1989, 1993, 1994, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Daniel Pfeiffer <occitan@esperanto.org>,
 ;;	Jim Blandy <jimb@occs.cs.oberlin.edu>
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index 7a61a3a70fb..78e73f65c53 100644
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -1,6 +1,7 @@
 ;;; x-win.el --- parse relevant switches and set up for X  -*-coding: iso-2022-7bit;-*-
 
-;; Copyright (C) 1993, 1994, 2001, 2002, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: FSF
 ;; Keywords: terminals, i18n
@@ -2242,7 +2243,7 @@ order until succeed.")
     (if text
 	(remove-text-properties 0 (length text) '(foreign-selection nil) text))
     text))
-      
+
 ;;; Return the value of the current X selection.
 ;;; Consult the selection, and the cut buffer.  Treat empty strings
 ;;; as if they were unset.
diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el
index d0c26aa4b94..3be1a50823e 100644
--- a/lisp/term/xterm.el
+++ b/lisp/term/xterm.el
@@ -1,6 +1,6 @@
 ;;; xterm.el --- define function key sequences and standard colors for xterm
 
-;; Copyright (C) 1995, 2002, 2005  Free Software Foundation, Inc.
+;; Copyright (C) 1995, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: FSF
 ;; Keywords: terminals
@@ -33,7 +33,7 @@
   ;; better in that case to use rxvt's initializion function.
   (if (and (getenv "COLORTERM")
 	   (string-match "\\`rxvt" (getenv "COLORTERM")))
-      (progn 
+      (progn
 	(load "term/rxvt")
 	(terminal-init-rxvt))
 
@@ -45,7 +45,7 @@
     ;; function-key-map. This substitution is needed because if a key
     ;; definition if found in function-key-map, there are no further
     ;; lookups in other keymaps.
-    (substitute-key-definition [f13] [S-f1] function-key-map) 
+    (substitute-key-definition [f13] [S-f1] function-key-map)
     (substitute-key-definition [f14] [S-f2] function-key-map)
     (substitute-key-definition [f15] [S-f3] function-key-map)
     (substitute-key-definition [f16] [S-f4] function-key-map)
@@ -58,7 +58,7 @@
     (substitute-key-definition [f23] [S-f11] function-key-map)
     (substitute-key-definition [f24] [S-f12] function-key-map)
 
-    (substitute-key-definition [f25] [C-f1] function-key-map) 
+    (substitute-key-definition [f25] [C-f1] function-key-map)
     (substitute-key-definition [f26] [C-f2] function-key-map)
     (substitute-key-definition [f27] [C-f3] function-key-map)
     (substitute-key-definition [f28] [C-f4] function-key-map)
@@ -71,7 +71,7 @@
     (substitute-key-definition [f35] [C-f11] function-key-map)
     (substitute-key-definition [f36] [C-f12] function-key-map)
 
-    (substitute-key-definition [f37] [C-S-f1] function-key-map) 
+    (substitute-key-definition [f37] [C-S-f1] function-key-map)
     (substitute-key-definition [f38] [C-S-f2] function-key-map)
     (substitute-key-definition [f39] [C-S-f3] function-key-map)
     (substitute-key-definition [f40] [C-S-f4] function-key-map)
@@ -84,7 +84,7 @@
     (substitute-key-definition [f47] [C-S-f11] function-key-map)
     (substitute-key-definition [f48] [C-S-f12] function-key-map)
 
-    (substitute-key-definition [f49] [A-f1] function-key-map) 
+    (substitute-key-definition [f49] [A-f1] function-key-map)
     (substitute-key-definition [f50] [A-f2] function-key-map)
     (substitute-key-definition [f51] [A-f3] function-key-map)
     (substitute-key-definition [f52] [A-f4] function-key-map)