ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Marco Wahl 2015-01-12 13:02:20 +01:00
parent 86588d6501 ca21b7b86d
commit e0879b03d0
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lisp/org-agenda.el
View File

@ -52,7 +52,7 @@
(declare-function diary-add-to-list "diary-lib" (declare-function diary-add-to-list "diary-lib"
(date string specifier &optional marker globcolor literal)) (date string specifier &optional marker globcolor literal))
(declare-function calendar-absolute-from-iso "cal-iso" (date)) (declare-function calendar-iso-to-absolute "cal-iso" (date))
(declare-function calendar-astro-date-string "cal-julian" (&optional date)) (declare-function calendar-astro-date-string "cal-julian" (&optional date))
(declare-function calendar-bahai-date-string "cal-bahai" (&optional date)) (declare-function calendar-bahai-date-string "cal-bahai" (&optional date))
(declare-function calendar-chinese-date-string "cal-china" (&optional date)) (declare-function calendar-chinese-date-string "cal-china" (&optional date))
@ -8023,7 +8023,7 @@ so that the date SD will be in that range."
(setq y1 (org-small-year-to-year (/ n 100)) (setq y1 (org-small-year-to-year (/ n 100))
n (mod n 100))) n (mod n 100)))
(setq sd (setq sd
(calendar-absolute-from-iso (calendar-iso-to-absolute
(list n 1 (list n 1
(or y1 (nth 2 (calendar-iso-from-absolute sd))))))))) (or y1 (nth 2 (calendar-iso-from-absolute sd)))))))))
((eq span 'month) ((eq span 'month)

10
lisp/org-clock.el
View File

@ -32,7 +32,7 @@
(require 'cl)) (require 'cl))
(require 'org) (require 'org)
(declare-function calendar-absolute-from-iso "cal-iso" (&optional date)) (declare-function calendar-iso-to-absolute "cal-iso" (&optional date))
(declare-function notifications-notify "notifications" (&rest params)) (declare-function notifications-notify "notifications" (&rest params))
(declare-function org-pop-to-buffer-same-window "org-compat" (&optional buffer-or-name norecord label)) (declare-function org-pop-to-buffer-same-window "org-compat" (&optional buffer-or-name norecord label))
(declare-function org-element-property "org-element" (property element)) (declare-function org-element-property "org-element" (property element))
@ -2127,7 +2127,7 @@ If you can combine both, the month starting day will have priority."
(setq y (string-to-number (match-string 1 skey)) (setq y (string-to-number (match-string 1 skey))
w (string-to-number (match-string 2 skey))) w (string-to-number (match-string 2 skey)))
(setq date (calendar-gregorian-from-absolute (setq date (calendar-gregorian-from-absolute
(calendar-absolute-from-iso (list w 1 y)))) (calendar-iso-to-absolute (list w 1 y))))
(setq d (nth 1 date) month (car date) y (nth 2 date) (setq d (nth 1 date) month (car date) y (nth 2 date)
dow 1 dow 1
key 'week)) key 'week))
@ -2136,7 +2136,7 @@ If you can combine both, the month starting day will have priority."
(setq y (string-to-number (match-string 1 skey))) (setq y (string-to-number (match-string 1 skey)))
(setq q (string-to-number (match-string 2 skey))) (setq q (string-to-number (match-string 2 skey)))
(setq date (calendar-gregorian-from-absolute (setq date (calendar-gregorian-from-absolute
(calendar-absolute-from-iso (org-quarter-to-date q y)))) (calendar-iso-to-absolute (org-quarter-to-date q y))))
(setq d (nth 1 date) month (car date) y (nth 2 date) (setq d (nth 1 date) month (car date) y (nth 2 date)
dow 1 dow 1
key 'quarter)) key 'quarter))
@ -2271,7 +2271,7 @@ the currently selected interval size."
((and wp (string-match "w\\|W" wp) mw (> (length wp) 0)) ((and wp (string-match "w\\|W" wp) mw (> (length wp) 0))
(require 'cal-iso) (require 'cal-iso)
(setq date (calendar-gregorian-from-absolute (setq date (calendar-gregorian-from-absolute
(calendar-absolute-from-iso (list (+ mw n) 1 y)))) (calendar-iso-to-absolute (list (+ mw n) 1 y))))
(setq ins (format-time-string (setq ins (format-time-string
"%G-W%V" "%G-W%V"
(encode-time 0 0 0 (nth 1 date) (car date) (nth 2 date))))) (encode-time 0 0 0 (nth 1 date) (car date) (nth 2 date)))))
@ -2288,7 +2288,7 @@ the currently selected interval size."
y (- y 1)) y (- y 1))
()) ())
(setq date (calendar-gregorian-from-absolute (setq date (calendar-gregorian-from-absolute
(calendar-absolute-from-iso (org-quarter-to-date (+ mw n) y)))) (calendar-iso-to-absolute (org-quarter-to-date (+ mw n) y))))
(setq ins (format-time-string (setq ins (format-time-string
(concat (number-to-string y) "-Q" (number-to-string (+ mw n))) (concat (number-to-string y) "-Q" (number-to-string (+ mw n)))
(encode-time 0 0 0 (nth 1 date) (car date) (nth 2 date))))) (encode-time 0 0 0 (nth 1 date) (car date) (nth 2 date)))))

6
lisp/org.el
View File

@ -4443,7 +4443,7 @@ Normal means, no org-mode-specific context."
(defvar mark-active) (defvar mark-active)
;; Various packages ;; Various packages
(declare-function calendar-absolute-from-iso "cal-iso" (date)) (declare-function calendar-iso-to-absolute "cal-iso" (date))
(declare-function calendar-forward-day "cal-move" (arg)) (declare-function calendar-forward-day "cal-move" (arg))
(declare-function calendar-goto-date "cal-move" (date)) (declare-function calendar-goto-date "cal-move" (date))
(declare-function calendar-goto-today "cal-move" ()) (declare-function calendar-goto-today "cal-move" ())
@ -16993,7 +16993,7 @@ user."
day (or iso-weekday wday 1) day (or iso-weekday wday 1)
wday nil ; to make sure that the trigger below does not match wday nil ; to make sure that the trigger below does not match
iso-date (calendar-gregorian-from-absolute iso-date (calendar-gregorian-from-absolute
(calendar-absolute-from-iso (calendar-iso-to-absolute
(list iso-week day year)))) (list iso-week day year))))
; FIXME: Should we also push ISO weeks into the future? ; FIXME: Should we also push ISO weeks into the future?
; (when (and org-read-date-prefer-future ; (when (and org-read-date-prefer-future
@ -17002,7 +17002,7 @@ user."
; (time-to-days (current-time)))) ; (time-to-days (current-time))))
; (setq year (1+ year) ; (setq year (1+ year)
; iso-date (calendar-gregorian-from-absolute ; iso-date (calendar-gregorian-from-absolute
; (calendar-absolute-from-iso ; (calendar-iso-to-absolute
; (list iso-week day year))))) ; (list iso-week day year)))))
(setq month (car iso-date) (setq month (car iso-date)
year (nth 2 iso-date) year (nth 2 iso-date)