[Emacs-diffs] Changes to emacs/lisp/org/org.el,v

[Miles Bader]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Miles Bader <miles>     08/05/08 09:59:58

Index: org/org.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/org/org.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- org/org.el  6 May 2008 07:25:26 -0000       1.5
+++ org/org.el  8 May 2008 09:59:56 -0000       1.6
@@ -10311,13 +10311,15 @@
 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
+  (when (and
+        (string-match
         (concat
-         "\\`[ \t]*\\([-+]\\{1,2\\}\\)"
+          "\\`[ \t]*\\([-+]\\{0,2\\}\\)"
          "\\([0-9]+\\)?"
          "\\([dwmy]\\|\\(" (mapconcat 'car parse-time-weekdays "\\|") "\\)\\)?"
          "\\([ \t]\\|$\\)") s)
-    (let* ((dir (if (match-end 1)
+        (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)))))