summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/version.el6
2 files changed, 8 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5f18632feec..4f305a65dbb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-28 Stefan Monnier <monnier@iro.umontreal.ca>
+
+ * version.el (emacs-major-version, emacs-minor-version):
+ string-to-int -> string-to-number.
+
2007-02-28 Juanma Barranquero <lekktu@gmail.com>
* help.el (where-is): Fail gracefully when not passed a command.
diff --git a/lisp/version.el b/lisp/version.el
index fce42b67f06..fcc95ed0c11 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.")
@@ -92,5 +92,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