Merge changes from emacs-23 branch

[gnu-emacs] / lisp / version.el

diff --git a/lisp/version.el b/lisp/version.el
index 1187fea50dfaa0baff8abfc614f1e5d849cc27d1..f1146e8a5101ec65d74dae7b68409f38a278e0e5 100644 (file)
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -6,6 +6,7 @@
 
 ;; Maintainer: FSF
 ;; Keywords: internal
+;; Package: emacs
 
 ;; This file is part of GNU Emacs.
 
@@ -29,12 +30,6 @@
 
 ;;; Code:
 
-(defconst emacs-copyright "Copyright (C) 2011 Free Software Foundation, Inc." "\
-Short copyright string for this version of Emacs.")
-
-(defconst emacs-version "23.2.91" "\
-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.")