Merged in changes from CVS trunk. Plus added lisp/term tweaks.

[gnu-emacs] / lisp / loadup.el

diff --git a/lisp/loadup.el b/lisp/loadup.el
index 36ed511f5846c9629bccaaed826d30628abfc379..e1d5e56e2a2d529f2ef56f1fee99a5481bf7adec 100644 (file)
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -1,6 +1,7 @@
 ;;; loadup.el --- load up standardly loaded Lisp files for Emacs
 
-;; Copyright (C) 1985, 1986, 1992, 1994, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1986, 1992, 1994, 2001, 2002, 2003,
+;;   2004, 2005 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal