Merge changes from emacs-23 branch.

[bpt/emacs.git] / lisp / version.el

diff --git a/lisp/version.el b/lisp/version.el
index 41bdf40..770409b 100644 (file)
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -1,7 +1,7 @@
 ;;; version.el --- record version number of Emacs -*- no-byte-compile: t -*-
 
 ;; Copyright (C) 1985, 1992, 1994, 1995, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006, 2007, 2008, 2009
+;;   2004, 2005, 2006, 2007, 2008, 2009, 2010
 ;;   Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
@@ -29,12 +29,6 @@
 
 ;;; Code:
 
-(defconst emacs-copyright "Copyright (C) 2009 Free Software Foundation, Inc." "\
-Short copyright string for this version of Emacs.")
-
-(defconst emacs-version "23.1.90" "\
-Version numbers of this version of Emacs.")
-
 (defconst emacs-major-version (progn (string-match "^[0-9]+" emacs-version) (string-to-number (match-string 0 emacs-version))) "\
 Major version number of this version of Emacs.
 This variable first existed in version 19.23.")