0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-08-20 01:18:50 +00:00

Merge branch 'hotfix-7.8.06'

This commit is contained in:
Bastien Guerry 2012-03-23 22:44:04 +01:00
commit 2bb3a09d53

View file

@ -15050,9 +15050,7 @@ plus or minus, it is relative to the date in DEFAULT-TIME. E.g.
+2w --> two weeks from today
++5 --> five days from default date
The function understands only English month and weekday abbreviations,
but this can be configured with the variables `parse-time-months' and
`parse-time-weekdays'.
The function understands only English month and weekday abbreviations.
While prompting, a calendar is popped up - you can also select the
date with the mouse (button 1). The calendar shows a period of three
@ -15448,6 +15446,28 @@ user."
(defvar parse-time-weekdays)
;; (defcustom org-parse-time-weekdays parse-time-weekdays
;; "Alist of day names and their position in the week."
;; :group 'org-time
;; :type '(alist :key-type (string :tag "Day name")
;; :value-type (integer :tag "Position")))
(setq parse-time-weekdays '(("sun" . 0)
("mon" . 1)
("tue" . 2)
("wed" . 3)
("thu" . 4)
("fri" . 5)
("sat" . 6)
("sunday" . 0)
("monday" . 1)
("tuesday" . 2)
("wednesday" . 3)
("thursday" . 4)
("lundi" . 1)
)
)
(defun org-read-date-get-relative (s today default)
"Check string S for special relative date string.
TODAY and DEFAULT are internal times, for today and for a default.