Merge branch 'maint'

2015-08-13 22:53:27 +02:00 · 2015-08-13 22:53:27 +02:00 · e1e3cf0189
parent 2f2f266c24 0500bd09e2
commit e1e3cf0189
1 changed files with 1 additions and 1 deletions
--- a/lisp/org-clock.el
+++ b/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)