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

Merge branch 'maint'

Browse source
This commit is contained in:
Bastien Guerry 2013-01-03 13:37:13 +01:00
parent fc65e379b0 7716b9c890
commit 9c7fa8cca9
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
lisp/org-mobile.el
View file

@ -310,12 +310,13 @@ Also exclude files matching `org-mobile-files-exclude-regexp'."
;;;###autoload ;;;###autoload
(defun org-mobile-push () (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 This will create the index file, copy all agenda files there, and also
create all custom agenda views, for upload to the mobile phone." create all custom agenda views, for upload to the mobile phone."
(interactive) (interactive)
(let ((a-buffer (get-buffer org-agenda-buffer-name))) (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-tag-filter org-agenda-tag-filter)
(org-agenda-redo-command org-agenda-redo-command)) (org-agenda-redo-command org-agenda-redo-command))
(save-excursion (save-excursion
@ -335,15 +336,17 @@ create all custom agenda views, for upload to the mobile phone."
(org-mobile-create-index-file) (org-mobile-create-index-file)
(message "Writing checksums...") (message "Writing checksums...")
(org-mobile-write-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) (redraw-display)
(when (and a-buffer (buffer-live-p a-buffer)) (when (buffer-live-p a-buffer)
(if (not (get-buffer-window a-buffer)) (if (not (get-buffer-window a-buffer))
(kill-buffer a-buffer) (kill-buffer a-buffer)
(let ((cw (selected-window))) (let ((cw (selected-window)))
(select-window (get-buffer-window a-buffer)) (select-window (get-buffer-window a-buffer))
(org-agenda-redo) (org-agenda-redo)
(select-window cw))))) (select-window cw)))))
(message "Files for mobile viewer staged")) (message "Files for mobile viewer staged"))
(defvar org-mobile-before-process-capture-hook nil (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 (target-file (expand-file-name org-mobile-index-file
org-mobile-directory)) org-mobile-directory))
file link-name todo-kwds done-kwds tags drawers entry kwds dwds twds) 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)) (org-agenda-prepare-buffers (mapcar 'car files-alist))
(setq done-kwds (org-uniquify org-done-keywords-for-agenda)) (setq done-kwds (org-uniquify org-done-keywords-for-agenda))
(setq todo-kwds (org-delete-all (setq todo-kwds (org-delete-all