;;; timezone.el --- time zone package for GNU Emacs
-;; Copyright (C) 1990, 1991, 1992, 1993, 1996, 1999 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1991, 1992, 1993, 1996, 1999, 2002, 2003,
+;; 2004, 2005 Free Software Foundation, Inc.
;; Author: Masanobu Umeda
;; Maintainer: umerin@mse.kyutech.ac.jp
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
(time nil)
(zone nil)) ;This may be nil.
(cond ((string-match
- "\\([0-9]+\\)[ \t]+\\([^ \t,]+\\)[ \t]+\\([0-9]+\\)[ \t]+\\([0-9]+:[0-9:]+\\)[ \t]*\\([-+a-zA-Z0-9]+\\)" date)
+ "\\([0-9]+\\)[ \t]+\\([^ \t,]+\\)[ \t]+\\([0-9]+\\)[ \t]+\\([0-9]+:[0-9:]+\\)[ \t]+\\([-+a-zA-Z0-9]+\\)" date)
;; Styles: (1) and (2) with timezone and buggy timezone
;; This is most common in mail and news,
;; so it is worth trying first.
;; Unix Epoch, so are 2000+. Three-digit years are assumed to
;; be relative to 1900.
(if (< (length year) 4)
- (let ((y (string-to-int year)))
+ (let ((y (string-to-number year)))
(if (< y 69)
(setq y (+ y 100)))
(setq year (int-to-string (+ 1900 y)))))
;; +900
timezone))
(if (stringp timezone)
- (setq timezone (string-to-int timezone)))
+ (setq timezone (string-to-number timezone)))
;; Taking account of minute in timezone.
;; HHMM -> MM
(let* ((abszone (abs timezone))
If LOCAL is nil, it is assumed to be GMT.
If TIMEZONE is nil, use the local time zone."
(let* ((date (timezone-parse-date date))
- (year (string-to-int (aref date 0)))
+ (year (string-to-number (aref date 0)))
(year (cond ((< year 69)
(+ year 2000))
((< year 100)
((< year 1000) ; possible 3-digit years.
(+ year 1900))
(t year)))
- (month (string-to-int (aref date 1)))
- (day (string-to-int (aref date 2)))
+ (month (string-to-number (aref date 1)))
+ (day (string-to-number (aref date 2)))
(time (timezone-parse-time (aref date 3)))
- (hour (string-to-int (aref time 0)))
- (minute (string-to-int (aref time 1)))
- (second (string-to-int (aref time 2)))
+ (hour (string-to-number (aref time 0)))
+ (minute (string-to-number (aref time 1)))
+ (second (string-to-number (aref time 2)))
(local (or (aref date 4) local)) ;Use original if defined
(timezone
(or timezone