[Emacs-diffs] Changes to emacs/lisp/calendar/icalendar.el

[Glenn Morris]

Index: emacs/lisp/calendar/icalendar.el
diff -c emacs/lisp/calendar/icalendar.el:1.7 
emacs/lisp/calendar/icalendar.el:1.8
*** emacs/lisp/calendar/icalendar.el:1.7        Thu Feb 24 18:22:28 2005
--- emacs/lisp/calendar/icalendar.el    Fri Mar  4 17:16:33 2005
***************
*** 90,96 ****
  
  ;;; Code:
  
! (defconst icalendar-version 0.10
    "Version number of icalendar.el.")
  
  ;; ======================================================================
--- 90,96 ----
  
  ;;; Code:
  
! (defconst icalendar-version 0.11
    "Version number of icalendar.el.")
  
  ;; ======================================================================
***************
*** 415,422 ****
    "Return ISODURATIONSTRING in format like `decode-time'.
  Converts from ISO-8601 to Emacs representation.  If ISODURATIONSTRING
  specifies UTC time (trailing letter Z) the decoded time is given in
! the local time zone! FIXME: TZID-attributes are ignored....! FIXME:
! multiple comma-separated values should be allowed!"
    (if isodurationstring
        (save-match-data
          (string-match
--- 415,424 ----
    "Return ISODURATIONSTRING in format like `decode-time'.
  Converts from ISO-8601 to Emacs representation.  If ISODURATIONSTRING
  specifies UTC time (trailing letter Z) the decoded time is given in
! the local time zone!
! 
! FIXME: TZID-attributes are ignored....!
! FIXME: multiple comma-separated values should be allowed!"
    (if isodurationstring
        (save-match-data
          (string-match
***************
*** 672,678 ****
  ;; Export -- convert emacs-diary to icalendar
  ;; ======================================================================
  
! ;; User function
  (defun icalendar-export-file (diary-filename ical-filename)
    "Export diary file to iCalendar format.
  All diary entries in the file DIARY-FILENAME are converted to iCalendar
--- 674,680 ----
  ;; Export -- convert emacs-diary to icalendar
  ;; ======================================================================
  
! ;;;###autoload
  (defun icalendar-export-file (diary-filename ical-filename)
    "Export diary file to iCalendar format.
  All diary entries in the file DIARY-FILENAME are converted to iCalendar
***************
*** 686,692 ****
  (defalias 'icalendar-convert-diary-to-ical 'icalendar-export-file)
  (make-obsolete 'icalendar-convert-diary-to-ical 'icalendar-export-file)
  
! ;; User function
  (defun icalendar-export-region (min max ical-filename)
    "Export region in diary file to iCalendar format.
  All diary entries in the region from MIN to MAX in the current buffer are
--- 688,694 ----
  (defalias 'icalendar-convert-diary-to-ical 'icalendar-export-file)
  (make-obsolete 'icalendar-convert-diary-to-ical 'icalendar-export-file)
  
! ;;;###autoload
  (defun icalendar-export-region (min max ical-filename)
    "Export region in diary file to iCalendar format.
  All diary entries in the region from MIN to MAX in the current buffer are
***************
*** 1112,1118 ****
  ;; Import -- convert icalendar to emacs-diary
  ;; ======================================================================
  
! ;; User function
  (defun icalendar-import-file (ical-filename diary-filename
                                              &optional non-marking)
    "Import a iCalendar file and append to a diary file.
--- 1114,1120 ----
  ;; Import -- convert icalendar to emacs-diary
  ;; ======================================================================
  
! ;;;###autoload
  (defun icalendar-import-file (ical-filename diary-filename
                                              &optional non-marking)
    "Import a iCalendar file and append to a diary file.
***************
*** 1129,1135 ****
      (set-buffer (find-file ical-filename))
      (icalendar-import-buffer diary-filename t non-marking)))
  
! ;; User function
  (defun icalendar-import-buffer (&optional diary-file do-not-ask
                                            non-marking)
    "Extract iCalendar events from current buffer.
--- 1131,1137 ----
      (set-buffer (find-file ical-filename))
      (icalendar-import-buffer diary-filename t non-marking)))
  
! ;;;###autoload
  (defun icalendar-import-buffer (&optional diary-file do-not-ask
                                            non-marking)
    "Extract iCalendar events from current buffer.
***************
*** 1423,1432 ****
               ((not (string= start-d end-d))
                (icalendar--dmsg "non-recurring event")
                (let ((ds (icalendar--datetime-to-diary-date dtstart))
!                     (de (icalendar--datetime-to-diary-date
!                          (icalendar--decode-isodatetime
!                           (icalendar--get-event-property e 'DTEND)
!                           -1))))
                  (setq diary-string
                        (format "%%%%(and (diary-block %s %s))"
                                ds de)))
--- 1425,1431 ----
               ((not (string= start-d end-d))
                (icalendar--dmsg "non-recurring event")
                (let ((ds (icalendar--datetime-to-diary-date dtstart))
!                     (de (icalendar--datetime-to-diary-date dtend)))
                  (setq diary-string
                        (format "%%%%(and (diary-block %s %s))"
                                ds de)))