summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2013-01-04 16:23:27 (GMT)
committer Bastien Guerry <bzg@altern.org>2013-01-04 16:23:27 (GMT)
commit576f43b7434301460a648436ed92d4a4c2b01f8b (patch)
tree1bb0914dd7d1277f3618eb5d0c4a982de1ccaf20
parent9c7fa8cca9a442370fa542aa90b41b60f1084a38 (diff)
parentf90bc1856133e972b14b140dfdedfb733d0d4561 (diff)
downloadorg-mode-576f43b7434301460a648436ed92d4a4c2b01f8b.zip
org-mode-576f43b7434301460a648436ed92d4a4c2b01f8b.tar.gz
Merge branch 'maint'
-rw-r--r--contrib/lisp/org-bookmark.el2
-rw-r--r--contrib/lisp/org-git-link.el2
-rw-r--r--doc/org.texi10
-rw-r--r--lisp/org-mobile.el5
4 files changed, 15 insertions, 4 deletions
diff --git a/contrib/lisp/org-bookmark.el b/contrib/lisp/org-bookmark.el
index 78a6f57..5c669b0 100644
--- a/contrib/lisp/org-bookmark.el
+++ b/contrib/lisp/org-bookmark.el
@@ -80,7 +80,7 @@ Otherwise prompt the user for the right bookmark to use."
(car bmks)
(completing-read "Bookmark: " bmks nil t nil nil (car bmks))))))
(if bookmark
- (org-store-link-props :link (contact "bookmark:" bookmark)
+ (org-store-link-props :link (concat "bookmark:" bookmark)
:description bookmark))))
(provide 'org-bookmark)
diff --git a/contrib/lisp/org-git-link.el b/contrib/lisp/org-git-link.el
index e18e2af..2f5990f 100644
--- a/contrib/lisp/org-git-link.el
+++ b/contrib/lisp/org-git-link.el
@@ -171,7 +171,7 @@
(let* ((gitdir (first (org-git-find-gitdir (file-truename file))))
(branchname (org-git-get-current-branch gitdir))
(timestring (format-time-string "%Y-%m-%d" (current-time))))
- (contact "git:" file "::" (org-git-create-searchstring branchname timestring))))
+ (concat "git:" file "::" (org-git-create-searchstring branchname timestring))))
(defun org-git-store-link ()
"Store git link to current file."
diff --git a/doc/org.texi b/doc/org.texi
index 709fe4d..83f5939 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -8698,6 +8698,13 @@ buffer, or a sparse tree (the latter covering of course only the current
buffer).
@kindex C-c a C
@vindex org-agenda-custom-commands
+@cindex agenda views, main example
+@cindex tags, as an agenda view
+@cindex todo, as an agenda view
+@cindex tags-todo
+@cindex todo-tree
+@cindex occur-tree
+@cindex tags-tree
Custom commands are configured in the variable
@code{org-agenda-custom-commands}. You can customize this variable, for
@@ -8758,6 +8765,9 @@ additional key (@kbd{l}, @kbd{p} or @kbd{k}) to select a name (Lisa,
Peter, or Kim) as additional tag to match.
@end table
+Note that the @code{*-tree} agenda views need to be called from an
+Org buffer as they operate on the current buffer only.
+
@node Block agenda, Setting Options, Storing searches, Custom agenda views
@subsection Block agenda
@cindex block agenda
diff --git a/lisp/org-mobile.el b/lisp/org-mobile.el
index 2a083f0..9e95aab 100644
--- a/lisp/org-mobile.el
+++ b/lisp/org-mobile.el
@@ -546,7 +546,7 @@ The table of checksums is written to the file mobile-checksums."
(t (cons (car x) (cons "" (cdr x))))))
org-agenda-custom-commands)))
(default-list '(("a" "Agenda" agenda) ("t" "All TODO" alltodo)))
- thelist new e key desc type match settings cmds gkey gdesc gsettings cnt)
+ thelist atitle new e key desc type match settings cmds gkey gdesc gsettings cnt)
(cond
((eq org-mobile-agendas 'custom)
(setq thelist custom-list))
@@ -598,12 +598,13 @@ The table of checksums is written to the file mobile-checksums."
(setq cnt 0)
(while (setq e (pop cmds))
(setq type (car e) match (nth 1 e) settings (nth 2 e))
+ (setq atitle (if (string= "" gdesc) match gdesc))
(setq settings (append gsettings settings))
(setq settings
(cons (list 'org-agenda-title-append
(concat "<after>KEYS=" gkey "#" (number-to-string
(setq cnt (1+ cnt)))
- " TITLE: " gdesc " " match "</after>"))
+ " TITLE: " atitle "</after>"))
settings))
(push (list type match settings) new)))))
(and new (list "X" "SUMO" (reverse new)