summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2013-01-03 12:37:13 (GMT)
committer Bastien Guerry <bzg@altern.org>2013-01-03 12:37:13 (GMT)
commit9c7fa8cca9a442370fa542aa90b41b60f1084a38 (patch)
tree4ad4006c4d0ff117643a59496acc4aa6f288b5aa
parentfc65e379b04c6a92dc515875d8fc260d959d50cb (diff)
parent7716b9c890061514541e040f7f5fbd67e0dccd00 (diff)
downloadorg-mode-9c7fa8cca9a442370fa542aa90b41b60f1084a38.zip
org-mode-9c7fa8cca9a442370fa542aa90b41b60f1084a38.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org-mobile.el24
1 files changed, 14 insertions, 10 deletions
diff --git a/lisp/org-mobile.el b/lisp/org-mobile.el
index 8c29888..2a083f0 100644
--- a/lisp/org-mobile.el
+++ b/lisp/org-mobile.el
@@ -310,12 +310,13 @@ Also exclude files matching `org-mobile-files-exclude-regexp'."
;;;###autoload
(defun org-mobile-push ()
- "Push the current state of Org affairs to the WebDAV directory.
+ "Push the current state of Org affairs to the target directory.
This will create the index file, copy all agenda files there, and also
create all custom agenda views, for upload to the mobile phone."
(interactive)
(let ((a-buffer (get-buffer org-agenda-buffer-name)))
- (let ((org-agenda-buffer-name "*SUMO*")
+ (let ((org-agenda-curbuf-name org-agenda-buffer-name)
+ (org-agenda-buffer-name "*SUMO*")
(org-agenda-tag-filter org-agenda-tag-filter)
(org-agenda-redo-command org-agenda-redo-command))
(save-excursion
@@ -335,15 +336,17 @@ create all custom agenda views, for upload to the mobile phone."
(org-mobile-create-index-file)
(message "Writing checksums...")
(org-mobile-write-checksums)
- (run-hooks 'org-mobile-post-push-hook))))
+ (run-hooks 'org-mobile-post-push-hook)))
+ (setq org-agenda-buffer-name org-agenda-curbuf-name
+ org-agenda-this-buffer-name org-agenda-curbuf-name))
(redraw-display)
- (when (and a-buffer (buffer-live-p a-buffer))
+ (when (buffer-live-p a-buffer)
(if (not (get-buffer-window a-buffer))
- (kill-buffer a-buffer)
- (let ((cw (selected-window)))
- (select-window (get-buffer-window a-buffer))
- (org-agenda-redo)
- (select-window cw)))))
+ (kill-buffer a-buffer)
+ (let ((cw (selected-window)))
+ (select-window (get-buffer-window a-buffer))
+ (org-agenda-redo)
+ (select-window cw)))))
(message "Files for mobile viewer staged"))
(defvar org-mobile-before-process-capture-hook nil
@@ -423,7 +426,8 @@ agenda view showing the flagged items."
(target-file (expand-file-name org-mobile-index-file
org-mobile-directory))
file link-name todo-kwds done-kwds tags drawers entry kwds dwds twds)
-
+ (when (stringp (car def-todo))
+ (setq def-todo (list (cons 'sequence def-todo))))
(org-agenda-prepare-buffers (mapcar 'car files-alist))
(setq done-kwds (org-uniquify org-done-keywords-for-agenda))
(setq todo-kwds (org-delete-all