From 3f4ad90975ec6ec3f23d7463a9203fdb898092a4 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Thu, 3 Jan 2013 12:39:58 +0100 Subject: [PATCH 1/2] org-mobile.el (org-mobile-push): Use the correct agenda buffer names * org-mobile.el (org-mobile-push): Use the correct agenda buffer names. Thanks to Ramon Diaz-Uriarte for reporting this issue. --- lisp/org-mobile.el | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/lisp/org-mobile.el b/lisp/org-mobile.el index 201637036..052ab426f 100644 --- a/lisp/org-mobile.el +++ b/lisp/org-mobile.el @@ -304,12 +304,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 @@ -329,15 +330,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 From 7716b9c890061514541e040f7f5fbd67e0dccd00 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Thu, 3 Jan 2013 13:22:05 +0100 Subject: [PATCH 2/2] org-mobile.el (org-mobile-create-index-file): Possibly normalize `org-todo-keywords' * org-mobile.el (org-mobile-create-index-file): Possibly normalize `org-todo-keywords'. Thanks to Ben Finney (and others) for reporting this. --- lisp/org-mobile.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lisp/org-mobile.el b/lisp/org-mobile.el index 052ab426f..f5c8d1c60 100644 --- a/lisp/org-mobile.el +++ b/lisp/org-mobile.el @@ -420,7 +420,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