From: Carsten Dominik Date: Mon, 5 May 2008 15:09:49 +0000 (+0000) Subject: 2008-05-05 Carsten Dominik X-Git-Tag: emacs-pretest-22.2.90~142 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1da6c70183ee4c12114caf6276a764ddd3125da8;p=emacs.git 2008-05-05 Carsten Dominik * textmodes/org.el (org-read-date-get-relative): Interpret lone weekday abbreviation as relative to today. --- diff --git a/lisp/textmodes/org.el b/lisp/textmodes/org.el index 080615e4110..58bd84be574 100644 --- a/lisp/textmodes/org.el +++ b/lisp/textmodes/org.el @@ -18060,13 +18060,15 @@ WHAT is \"d\", \"w\", \"m\", or \"y\" for day, week, month, year. N is the number of WHATs to shift. DEF-FLAG is t when a double ++ or -- indicates shift relative to the DEFAULT date rather than TODAY." - (when (string-match - (concat - "\\`[ \t]*\\([-+]\\{1,2\\}\\)" - "\\([0-9]+\\)?" - "\\([dwmy]\\|\\(" (mapconcat 'car parse-time-weekdays "\\|") "\\)\\)?" - "\\([ \t]\\|$\\)") s) - (let* ((dir (if (match-end 1) + (when (and + (string-match + (concat + "\\`[ \t]*\\([-+]\\{0,2\\}\\)" + "\\([0-9]+\\)?" + "\\([dwmy]\\|\\(" (mapconcat 'car parse-time-weekdays "\\|") "\\)\\)?" + "\\([ \t]\\|$\\)") s) + (or (> (match-end 1) (match-beginning 1)) (match-end 4))) + (let* ((dir (if (> (match-end 1) (match-beginning 1)) (string-to-char (substring (match-string 1 s) -1)) ?+)) (rel (and (match-end 1) (= 2 (- (match-end 1) (match-beginning 1)))))