ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2019-12-11 21:39:57 +01:00
parent 37a2eff212 a8da497261
commit 8d5803ced9
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
doc/org-manual.org
View File

@ -7426,7 +7426,7 @@ going through the interactive template selection, you can create your
key binding like this: key binding like this:
#+begin_src emacs-lisp #+begin_src emacs-lisp
(define-key global-map "\C-cx" (define-key global-map (kbd "C-c x")
(lambda () (interactive) (org-capture nil "x"))) (lambda () (interactive) (org-capture nil "x")))
#+end_src #+end_src
@ -9150,21 +9150,19 @@ filter elements are accumulated.
described above. At the prompt, specify different filter elements described above. At the prompt, specify different filter elements
in a single string, with full completion support. For example, in a single string, with full completion support. For example,
#+begin_example : +work-John+<0:10-/plot/
+work-John+<0:10-/plot/
#+end_example
selects entries with category `work' and effort estimates below 10 selects entries with category =work= and effort estimates below 10
minutes, and deselects entries with tag `John' or matching the minutes, and deselects entries with tag =John= or matching the
regexp `plot'. `+' can be left out if that does not lead to regexp =plot=. You can leave =+= out if that does not lead to
ambiguities. The sequence of elements is arbitrary. The filter ambiguities. The sequence of elements is arbitrary. The filter
syntax assumes that there is no overlap between categories and tags syntax assumes that there is no overlap between categories and tags.
(tags will take priority). If you reply to the prompt with the Otherwise, tags take priority. If you reply to the prompt with the
empty string, all filtering is removed. If a filter is specified, empty string, all filtering is removed. If a filter is specified,
it replaces all current filters. But if you call the command with a it replaces all current filters. But if you call the command with
double prefix argument, or if you add an additional `+' a double prefix argument, or if you add an additional =+= (e.g.,
(e.g. `++work') to the front of the string, the new filter elements =++work=) to the front of the string, the new filter elements are
are added to the active ones. A single prefix argument applies the added to the active ones. A single prefix argument applies the
entire filter in a negative sense. entire filter in a negative sense.
- {{{kbd(|)}}} (~org-agenda-filter-remove-all~) :: - {{{kbd(|)}}} (~org-agenda-filter-remove-all~) ::
@ -9177,8 +9175,8 @@ filter elements are accumulated.
:END: :END:
#+vindex: org-agenda-auto-exclude-function #+vindex: org-agenda-auto-exclude-function
If the variable ~org-agenda-auto-exclude-function~ is set to a If the variable ~org-agenda-auto-exclude-function~ is set to
user-defined function, that function can select tags that should be a user-defined function, that function can select tags that should be
used as a tag filter when requested. The function will be called with used as a tag filter when requested. The function will be called with
lower-case versions of all tags represented in the current view. The lower-case versions of all tags represented in the current view. The
function should the return ="-tag"= if the filter should remove function should the return ="-tag"= if the filter should remove