浏览代码

Bugfix: recognize timestamps with an abbreviated format for days.

Emacs recently (when?) changed the abbreviated format for days.
The clock was confused when trying to mach this format.  This patch
by Nicolas Goaziou fixes it.
Bastien Guerry 15 年之前
父节点
当前提交
1a79ec6e31
共有 2 个文件被更改,包括 6 次插入1 次删除
  1. 5 0
      lisp/ChangeLog
  2. 1 1
      lisp/org-clock.el

+ 5 - 0
lisp/ChangeLog

@@ -1,3 +1,8 @@
+2009-07-29  Nicolas Goaziou <n.goaziou@neuf.fr>  (tiny change)
+
+	* org-clock.el (org-clock-in): Bugfix: recognize timestamps with
+	an abbreviated format for days.
+
 2009-07-27  Bastien Guerry  <bzg@altern.org>
 2009-07-27  Bastien Guerry  <bzg@altern.org>
 
 
 	* org-protocol.el (org-protocol-default-template-key): New
 	* org-protocol.el (org-protocol-default-template-key): New

+ 1 - 1
lisp/org-clock.el

@@ -558,7 +558,7 @@ the clocking selection, associated with the letter `d'."
 		   (looking-at
 		   (looking-at
 		    (concat "^[ \t]* " org-clock-string
 		    (concat "^[ \t]* " org-clock-string
 			    " \\[\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}"
 			    " \\[\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}"
-			    " +\\sw+ +[012][0-9]:[0-5][0-9]\\)\\][ \t]*$")))
+			    " +\\sw+\.? +[012][0-9]:[0-5][0-9]\\)\\][ \t]*$")))
 	      (message "Matched %s" (match-string 1))
 	      (message "Matched %s" (match-string 1))
 	      (setq ts (concat "[" (match-string 1) "]"))
 	      (setq ts (concat "[" (match-string 1) "]"))
 	      (goto-char (match-end 1))
 	      (goto-char (match-end 1))