Mercurial > emacs
changeset 100489:9e7c4de60dcd
2008-12-18 Carsten Dominik <dominik@science.uva.nl>
* org-agenda.el (org-agenda-change-all-lines): Remove FORCE-TAGS
argument, get the current tags directly.
(org-agenda-set-tags): Leave getting current tags to
`org-agenda-change-all-lines'.
| author | Carsten Dominik <dominik@science.uva.nl> |
|---|---|
| date | Thu, 18 Dec 2008 10:15:08 +0000 |
| parents | f78faec87eae |
| children | c5d38073ec91 |
| files | lisp/org/org-agenda.el |
| diffstat | 1 files changed, 10 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/org/org-agenda.el Thu Dec 18 10:14:30 2008 +0000 +++ b/lisp/org/org-agenda.el Thu Dec 18 10:15:08 2008 +0000 @@ -5068,8 +5068,7 @@ (org-add-note)))) (defun org-agenda-change-all-lines (newhead hdmarker - &optional fixface just-this - force-tags) + &optional fixface just-this) "Change all lines in the agenda buffer which match HDMARKER. The new content of the line will be NEWHEAD (as modified by `org-format-agenda-item'). HDMARKER is checked with @@ -5080,6 +5079,12 @@ If FORCE-TAGS is non nil, the car of it returns the new tags." (let* ((inhibit-read-only t) (line (org-current-line)) + (thetags + (and hdmarker (markerp hdmarker) + (with-current-buffer (marker-buffer hdmarker) + (save-excursion (save-restriction (widen) + (goto-char hdmarker) + (org-get-tags-at)))))) props m pl undone-face done-face finish new dotime cat tags) (save-excursion (goto-char (point-max)) @@ -5092,9 +5097,7 @@ (setq props (text-properties-at (point)) dotime (get-text-property (point) 'dotime) cat (get-text-property (point) 'org-category) - tags (if force-tags - (car force-tags) - (get-text-property (point) 'tags)) + tags thetags new (org-format-agenda-item "x" newhead cat tags dotime 'noprefix) pl (get-text-property (point) 'prefix-length) undone-face (get-text-property (point) 'undone-face) @@ -5197,7 +5200,7 @@ (buffer (marker-buffer hdmarker)) (pos (marker-position hdmarker)) (inhibit-read-only t) - newhead tags) + newhead) (org-with-remote-undo buffer (with-current-buffer buffer (widen) @@ -5209,10 +5212,9 @@ (org-flag-heading nil))) ; show the next heading (goto-char pos) (call-interactively 'org-set-tags) - (setq tags (org-get-tags-at)) (end-of-line 1) (setq newhead (org-get-heading))) - (org-agenda-change-all-lines newhead hdmarker nil nil (list tags)) + (org-agenda-change-all-lines newhead hdmarker) (beginning-of-line 1))))) (defun org-agenda-toggle-archive-tag ()