瀏覽代碼

Merge branch 'maint'

Nicolas Goaziou 10 年之前
父節點
當前提交
e1e3cf0189
共有 1 個文件被更改,包括 1 次插入1 次删除
  1. 1 1
      lisp/org-clock.el

+ 1 - 1
lisp/org-clock.el

@@ -950,7 +950,7 @@ If necessary, clock-out of the currently active clock."
       (when drawer
 	(org-with-wide-buffer
 	 (let ((drawer-re (format "^[ \t]*:%s:[ \t]*$"
-				  (regexp-quote (or drawer "LOGBOOK"))))
+				  (regexp-quote (if (stringp drawer) drawer "LOGBOOK"))))
 	       (beg (save-excursion (outline-back-to-heading t) (point))))
 	   (catch 'exit
 	     (while (re-search-backward drawer-re beg t)