[Emacs-diffs] Changes to emacs/lisp/url/url-cookie.el

[Juanma Barranquero]

Index: emacs/lisp/url/url-cookie.el
diff -c emacs/lisp/url/url-cookie.el:1.6 emacs/lisp/url/url-cookie.el:1.7
*** emacs/lisp/url/url-cookie.el:1.6    Sun Oct 10 20:36:30 2004
--- emacs/lisp/url/url-cookie.el        Mon May 16 10:07:31 2005
***************
*** 208,220 ****
         (cur-date (and exp (timezone-parse-date (current-time-string))))
         (exp-date (and exp (timezone-parse-date exp)))
         (cur-greg (and cur-date (timezone-absolute-from-gregorian
!                                 (string-to-int (aref cur-date 1))
!                                 (string-to-int (aref cur-date 2))
!                                 (string-to-int (aref cur-date 0)))))
         (exp-greg (and exp (timezone-absolute-from-gregorian
!                            (string-to-int (aref exp-date 1))
!                            (string-to-int (aref exp-date 2))
!                            (string-to-int (aref exp-date 0)))))
         (diff-in-days (and exp (- cur-greg exp-greg)))
         )
      (cond
--- 208,220 ----
         (cur-date (and exp (timezone-parse-date (current-time-string))))
         (exp-date (and exp (timezone-parse-date exp)))
         (cur-greg (and cur-date (timezone-absolute-from-gregorian
!                                 (string-to-number (aref cur-date 1))
!                                 (string-to-number (aref cur-date 2))
!                                 (string-to-number (aref cur-date 0)))))
         (exp-greg (and exp (timezone-absolute-from-gregorian
!                            (string-to-number (aref exp-date 1))
!                            (string-to-number (aref exp-date 2))
!                            (string-to-number (aref exp-date 0)))))
         (diff-in-days (and exp (- cur-greg exp-greg)))
         )
      (cond
***************
*** 224,235 ****
       (t                                       ; Expires sometime today, check 
times
        (let* ((cur-time (timezone-parse-time (aref cur-date 3)))
             (exp-time (timezone-parse-time (aref exp-date 3)))
!            (cur-norm (+ (* 360 (string-to-int (aref cur-time 2)))
!                         (*  60 (string-to-int (aref cur-time 1)))
!                         (*   1 (string-to-int (aref cur-time 0)))))
!            (exp-norm (+ (* 360 (string-to-int (aref exp-time 2)))
!                         (*  60 (string-to-int (aref exp-time 1)))
!                         (*   1 (string-to-int (aref exp-time 0))))))
        (> (- cur-norm exp-norm) 1))))))
  
  ;;;###autoload
--- 224,235 ----
       (t                                       ; Expires sometime today, check 
times
        (let* ((cur-time (timezone-parse-time (aref cur-date 3)))
             (exp-time (timezone-parse-time (aref exp-date 3)))
!            (cur-norm (+ (* 360 (string-to-number (aref cur-time 2)))
!                         (*  60 (string-to-number (aref cur-time 1)))
!                         (*   1 (string-to-number (aref cur-time 0)))))
!            (exp-norm (+ (* 360 (string-to-number (aref exp-time 2)))
!                         (*  60 (string-to-number (aref exp-time 1)))
!                         (*   1 (string-to-number (aref exp-time 0))))))
        (> (- cur-norm exp-norm) 1))))))
  
  ;;;###autoload