diff options
author | Bastien Guerry <bzg@altern.org> | 2012-08-26 14:53:59 +0200 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2012-08-26 14:53:59 +0200 |
commit | d85e7bc10a234477694ec42c6fdfe0ec7b28dc0a (patch) | |
tree | 2a4bdd6f0cfdcc3ed9ee14c68cee60382fce2b44 | |
parent | 74d1658c601edc8d25d909aac566c5c1dd0f2e38 (diff) | |
download | org-mode-d85e7bc10a234477694ec42c6fdfe0ec7b28dc0a.tar.gz |
org-agenda.el: Fix bug when calling `org-agenda-kill' and `org-agenda-archive-with' with a non-nil value of `org-agenda-stick'
* org-agenda.el (org-agenda-kill, org-agenda-archive-with):
Fix bug when called with a non-nil value of `org-agenda-stick'.
Thanks to Moritz Ulrich for reporting this.
-rw-r--r-- | lisp/org-agenda.el | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index f856a28..c50c60a 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -7399,7 +7399,8 @@ Point is in the buffer where the item originated.") "Kill the entry or subtree belonging to the current agenda entry." (interactive) (or (eq major-mode 'org-agenda-mode) (error "Not in agenda")) - (let* ((marker (or (org-get-at-bol 'org-marker) + (let* ((bufname-orig (buffer-name)) + (marker (or (org-get-at-bol 'org-marker) (org-agenda-error))) (buffer (marker-buffer marker)) (pos (marker-position marker)) @@ -7424,7 +7425,8 @@ Point is in the buffer where the item originated.") (format "Delete entry with %d lines in buffer \"%s\"? " n (buffer-name buffer)))) (error "Abort")) - (org-remove-subtree-entries-from-agenda buffer dbeg dend) + (let ((org-agenda-buffer-name bufname-orig)) + (org-remove-subtree-entries-from-agenda buffer dbeg dend)) (with-current-buffer buffer (delete-region dbeg dend)) (message "Agenda item and source killed")))) @@ -7455,7 +7457,8 @@ Point is in the buffer where the item originated.") "Move the entry to the archive sibling." (interactive) (or (eq major-mode 'org-agenda-mode) (error "Not in agenda")) - (let* ((marker (or (org-get-at-bol 'org-marker) + (let* ((bufname-orig (buffer-name)) + (marker (or (org-get-at-bol 'org-marker) (org-agenda-error))) (buffer (marker-buffer marker)) (pos (marker-position marker))) @@ -7467,7 +7470,8 @@ Point is in the buffer where the item originated.") (error "Abort") (save-excursion (goto-char pos) - (org-remove-subtree-entries-from-agenda) + (let ((org-agenda-buffer-name bufname-orig)) + (org-remove-subtree-entries-from-agenda)) (org-back-to-heading t) (funcall cmd))) (error "Archiving works only in Org-mode files")))))) |