tec/org-mode
tec
/
org-mode
forked from mirrors/org-mode
1
0
Fork 0
Code Pull Requests Releases Activity

Bug fixes.

This commit is contained in:
Carsten Dominik 2008-10-28 09:52:52 +01:00
parent 7c40034fd8
commit 99572d93b2
2 changed files with 33 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lisp/org-clock.el
View File

@ -33,6 +33,7 @@
(require 'calendar))
(declare-function calendar-absolute-from-iso "cal-iso" (&optional date))
(defvar org-time-stamp-formats)
(defgroup org-clock nil
"Options concerning clocking working time in Org-mode."
@ -1018,7 +1019,7 @@ the currently selected interval size."
;;Store clock
(insert (format ";; org-persist.el - %s at %s\n"
system-name (format-time-string
(cdr (org-time-stamp-formats)))))
(cdr org-time-stamp-formats))))
(if (and org-clock-persist (marker-buffer org-clock-marker)
(or (not org-clock-persist-query-save)
(y-or-n-p (concat "Save current clock ("
@ -1065,11 +1066,13 @@ a stored clock"
;; resume clock
(if (and (boundp 'resume-clock) org-clock-persist
(or (not org-clock-persist-query-resume)
(y-or-n-p "Resume clock ("
(with-current-buffer (find-file (car resume-clock))
(progn (goto-char (cdr resume-clock))
(looking-at org-complex-heading-regexp)
(match-string 4))) ")")))
(y-or-n-p
(concat
"Resume clock ("
(with-current-buffer (find-file (car resume-clock))
(progn (goto-char (cdr resume-clock))
(looking-at org-complex-heading-regexp)
(match-string 4))) ")"))))
(with-current-buffer (find-file (car resume-clock))
(progn (goto-char (cdr resume-clock))
(org-clock-in)))))

48
lisp/org.el
View File

@ -13915,30 +13915,30 @@ org-yank-adjusted-subtrees
\[1] Basically, the test checks if the first non-white line is a heading
and if there are no other headings with fewer stars."
(interactive)
(if org-yank-folded-subtrees
(let ((beg (point))
(subtreep (org-kill-is-subtree-p))
end)
(if (and subtreep org-yank-adjusted-subtrees)
(org-paste-subtree nil nil 'for-yank)
(call-interactively 'yank))
(setq end (point))
(goto-char beg)
(when (and (bolp) subtreep)
(or (looking-at outline-regexp)
(re-search-forward (concat "^" outline-regexp) end t))
(while (and (< (point) end) (looking-at outline-regexp))
(hide-subtree)
(org-cycle-show-empty-lines 'folded)
(condition-case nil
(outline-forward-same-level 1)
(error (goto-char end)))))
(goto-char end)
(skip-chars-forward " \t\n\r"))
(if (and subtreep org-yank-adjusted-subtrees)
(org-paste-subtree nil nil 'for-yank)
(call-interactively 'yank))))
(let ((subtreep (org-kill-is-subtree-p)))
(if org-yank-folded-subtrees
(let ((beg (point))
end)
(if (and subtreep org-yank-adjusted-subtrees)
(org-paste-subtree nil nil 'for-yank)
(call-interactively 'yank))
(setq end (point))
(goto-char beg)
(when (and (bolp) subtreep)
(or (looking-at outline-regexp)
(re-search-forward (concat "^" outline-regexp) end t))
(while (and (< (point) end) (looking-at outline-regexp))
(hide-subtree)
(org-cycle-show-empty-lines 'folded)
(condition-case nil
(outline-forward-same-level 1)
(error (goto-char end)))))
(goto-char end)
(skip-chars-forward " \t\n\r"))
(if (and subtreep org-yank-adjusted-subtrees)
(org-paste-subtree nil nil 'for-yank)
(call-interactively 'yank)))))
(define-key org-mode-map "\C-y" 'org-yank)
(defun org-invisible-p ()