comparison lisp/calendar/icalendar.el @ 106617:78f92ffeb7ab

Fixed timezone handling problem in icalendar.el.

106616:9fd36368ff9b

	;; FIXME: we don't correctly handle WKST here.
	(if (and (string= freq "YEARLY") bymonth)
	    (cons
	     (concat
	      ;; Fake a name.
	      (if dst-p "(DST?)" "(STD?)")
	      ;; For TZ, OFFSET is added to the local time.  So,
	      ;; invert the values.
	      (if (eq (aref offset 0) ?-) "+" "-")
	      (substring offset 1 3)
	      ":"

	     ;; The start time.
	     (let* ((day (icalendar--get-weekday-number (substring byday -2)))
		    (week (if (eq day -1)
			      byday
			    (substring byday 0 -2))))
	       (concat "M" bymonth "." week "." (if (eq day -1) "0"
						  (int-to-string day))
		       ;; Start time.
		       "/"
		       (substring dtstart -6 -4)

      ;; Note: diary-make-entry will add a trailing blank char.... :(
      (funcall (if (fboundp 'diary-make-entry)
                   'diary-make-entry
                 'make-diary-entry)
               string non-marking diary-file)))
  ;; return diary-file in case it has been changed interactively
  diary-file)

;; ======================================================================
;; Examples

106617:78f92ffeb7ab

	;; FIXME: we don't correctly handle WKST here.
	(if (and (string= freq "YEARLY") bymonth)
	    (cons
	     (concat
	      ;; Fake a name.
	      (if dst-p "DST" "STD")
	      ;; For TZ, OFFSET is added to the local time.  So,
	      ;; invert the values.
	      (if (eq (aref offset 0) ?-) "+" "-")
	      (substring offset 1 3)
	      ":"

	     ;; The start time.
	     (let* ((day (icalendar--get-weekday-number (substring byday -2)))
		    (week (if (eq day -1)
			      byday
			    (substring byday 0 -2))))
               ;; "Translate" the icalendar way to specify the last
               ;; (sun|mon|...)day in month to the tzset way.
               (if (string= week "-1")  ; last day as icalendar calls it
                   (setq week "5"))     ; last day as tzset calls it
	       (concat "M" bymonth "." week "." (if (eq day -1) "0"
						  (int-to-string day))
		       ;; Start time.
		       "/"
		       (substring dtstart -6 -4)

      ;; Note: diary-make-entry will add a trailing blank char.... :(
      (funcall (if (fboundp 'diary-make-entry)
                   'diary-make-entry
                 'make-diary-entry)
               string non-marking diary-file)))
  ;; Würgaround to remove the trailing blank char
  (save-excursion
    (set-buffer (find-file diary-file))
    (goto-char (point-max))
    (if (= (char-before) ? )
        (delete-char -1)))
  ;; return diary-file in case it has been changed interactively
  diary-file)

;; ======================================================================
;; Examples