summaryrefslogtreecommitdiff
path: root/lisp/version.el
diff options
context:
space:
mode:
authorKaroly Lorentey <karoly@lorentey.hu>2007-04-22 11:42:03 +0000
committerKaroly Lorentey <karoly@lorentey.hu>2007-04-22 11:42:03 +0000
commit81088e260b086fe28f36964f32b6338210ec6fd8 (patch)
tree53d5af73ca0c971fe6925944d4d059caab5337a2 /lisp/version.el
parentfa1b1007cac59bafd16df7bd501ef2591dd77d62 (diff)
parenta6f0e674ebf44b1d37732b64070b804673481d28 (diff)
downloademacs-81088e260b086fe28f36964f32b6338210ec6fd8.tar.gz
Merged from emacs@sv.gnu.org
Patches applied: * emacs@sv.gnu.org/emacs--devo--0--patch-650 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-651 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-652 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-653 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-654 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-655 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-656 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-657 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-658 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-659 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-203 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-204 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-205 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-599
Diffstat (limited to 'lisp/version.el')
-rw-r--r--lisp/version.el6
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/version.el b/lisp/version.el
index 8e2e7e8453a..dda64ccb4f1 100644
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -32,13 +32,13 @@ Version numbers of this version of Emacs.")
(defconst emacs-major-version
(progn (string-match "^[0-9]+" emacs-version)
- (string-to-int (match-string 0 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.")
(defconst emacs-minor-version
(progn (string-match "^[0-9]+\\.\\([0-9]+\\)" emacs-version)
- (string-to-int (match-string 1 emacs-version)))
+ (string-to-number (match-string 1 emacs-version)))
"Minor version number of this version of Emacs.
This variable first existed in version 19.23.")
@@ -93,5 +93,5 @@ to the system configuration; look at `system-configuration' instead."
;;version-control: never
;;End:
-;;; arch-tag: e60dc445-6218-4a4c-a7df-f15a818642a0
+;; arch-tag: e60dc445-6218-4a4c-a7df-f15a818642a0
;;; version.el ends here