diff options
| author | Carsten Dominik | 2006-09-08 08:47:01 +0000 |
|---|---|---|
| committer | Carsten Dominik | 2006-09-08 08:47:01 +0000 |
| commit | e28844a4ae47d2b74875804c26c76fb2a59c579a (patch) | |
| tree | b03a0f3493450bca2adfcb6292a6fefac21517c2 | |
| parent | 4b87a4126ecb6e18a5966a94f83166596438997f (diff) | |
| download | emacs-e28844a4ae47d2b74875804c26c76fb2a59c579a.tar.gz emacs-e28844a4ae47d2b74875804c26c76fb2a59c579a.zip | |
(org-dblock-write:clocktable): Avoid infinite loop.
| -rw-r--r-- | lisp/textmodes/org.el | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/lisp/textmodes/org.el b/lisp/textmodes/org.el index ecbcd86d043..64fbb0542ff 100644 --- a/lisp/textmodes/org.el +++ b/lisp/textmodes/org.el | |||
| @@ -6204,15 +6204,15 @@ the returned times will be formatted strings." | |||
| 6204 | (while (setq p (next-single-property-change (point) :org-clock-minutes)) | 6204 | (while (setq p (next-single-property-change (point) :org-clock-minutes)) |
| 6205 | (goto-char p) | 6205 | (goto-char p) |
| 6206 | (when (setq time (get-text-property p :org-clock-minutes)) | 6206 | (when (setq time (get-text-property p :org-clock-minutes)) |
| 6207 | (beginning-of-line 1) | 6207 | (save-excursion |
| 6208 | (when (and (looking-at "\\(\\*+\\)[ \t]+\\(.*?\\)\\([ \t]+:[0-9a-zA-Z_@:]+:\\)?[ \t]*$") | 6208 | (beginning-of-line 1) |
| 6209 | (setq level (- (match-end 1) (match-beginning 1))) | 6209 | (when (and (looking-at "\\(\\*+\\)[ \t]+\\(.*?\\)\\([ \t]+:[0-9a-zA-Z_@:]+:\\)?[ \t]*$") |
| 6210 | (<= level maxlevel)) | 6210 | (setq level (- (match-end 1) (match-beginning 1))) |
| 6211 | (setq hlc (if emph (or (cdr (assoc level hlchars)) "") "") | 6211 | (<= level maxlevel)) |
| 6212 | hdl (match-string 2) | 6212 | (setq hlc (if emph (or (cdr (assoc level hlchars)) "") "") |
| 6213 | h (/ time 60) | 6213 | hdl (match-string 2) |
| 6214 | m (- time (* 60 h))) | 6214 | h (/ time 60) |
| 6215 | (save-excursion | 6215 | m (- time (* 60 h))) |
| 6216 | (goto-char ins) | 6216 | (goto-char ins) |
| 6217 | (if (= level 1) (insert-before-markers "|-\n")) | 6217 | (if (= level 1) (insert-before-markers "|-\n")) |
| 6218 | (insert-before-markers | 6218 | (insert-before-markers |