comparison lisp/version.el @ 108340:486e3cc1b3a6

Merge from mainline.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Tue, 20 Apr 2010 22:41:29 +0000
parents c3a1d1b47790
children d4caa51ddfe2
comparison
equal deleted inserted replaced
108339:e88fb053fc02 108340:486e3cc1b3a6
30 ;;; Code: 30 ;;; Code:
31 31
32 (defconst emacs-copyright "Copyright (C) 2010 Free Software Foundation, Inc." "\ 32 (defconst emacs-copyright "Copyright (C) 2010 Free Software Foundation, Inc." "\
33 Short copyright string for this version of Emacs.") 33 Short copyright string for this version of Emacs.")
34 34
35 (defconst emacs-version "23.1.95" "\ 35 (defconst emacs-version "23.1.96" "\
36 Version numbers of this version of Emacs.") 36 Version numbers of this version of Emacs.")
37 37
38 (defconst emacs-major-version (progn (string-match "^[0-9]+" emacs-version) (string-to-number (match-string 0 emacs-version))) "\ 38 (defconst emacs-major-version (progn (string-match "^[0-9]+" emacs-version) (string-to-number (match-string 0 emacs-version))) "\
39 Major version number of this version of Emacs. 39 Major version number of this version of Emacs.
40 This variable first existed in version 19.23.") 40 This variable first existed in version 19.23.")