mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-08-25 01:32:52 +00:00
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
This commit is contained in:
commit
d585521b55
|
@ -130,6 +130,7 @@ def usage():
|
|||
by name
|
||||
search [str] : Same as 'list'
|
||||
view <ID> : View a patch
|
||||
show <ID> : Same as view
|
||||
update [-s state] [-c commit-ref] <ID>
|
||||
: Update patch\n""")
|
||||
sys.stderr.write("""\nFilter options for 'list' and 'search':
|
||||
|
@ -586,7 +587,7 @@ def main():
|
|||
|
||||
merge_with(patch_id, rpc, config.get('auth', 'username'))
|
||||
|
||||
elif action == 'view':
|
||||
elif action == 'view' or action == 'show':
|
||||
try:
|
||||
patch_id = patch_id or int(args[0])
|
||||
except:
|
||||
|
|
30
doc/org.texi
30
doc/org.texi
|
@ -434,7 +434,7 @@ Using header arguments
|
|||
Specific header arguments
|
||||
|
||||
* var:: Pass arguments to code blocks
|
||||
* results:: Specify the type of results and how they will be collectd and handled
|
||||
* results:: Specify the type of results and how they will be collected and handled
|
||||
* file:: Specify a path for file output
|
||||
* dir and remote execution:: Specify the default directory for code block execution
|
||||
* exports:: Export code and/or results
|
||||
|
@ -451,7 +451,7 @@ Specific header arguments
|
|||
Miscellaneous
|
||||
|
||||
* Completion:: M-TAB knows what you need
|
||||
* Speed keys:: Electic commands at the beginning of a headline
|
||||
* Speed keys:: Electric commands at the beginning of a headline
|
||||
* Code evaluation security:: Org mode files evaluate inline code
|
||||
* Customization:: Adapting Org to your taste
|
||||
* In-buffer settings:: Overview of the #+KEYWORDS
|
||||
|
@ -1521,7 +1521,7 @@ LaTeX}). Here are the valid references:
|
|||
@table @code
|
||||
@item [1]
|
||||
A plain numeric footnote marker. Compatible with @file{footnote.el}, but not
|
||||
recommended because somthing like @samp{[1]} could easily be part of a code
|
||||
recommended because something like @samp{[1]} could easily be part of a code
|
||||
snippet.
|
||||
@item [fn:name]
|
||||
A named footnote reference, where @code{name} is a unique label word, or, for
|
||||
|
@ -2643,7 +2643,7 @@ functions.
|
|||
@node Org-Plot, , The spreadsheet, Tables
|
||||
@section Org-Plot
|
||||
@cindex graph, in tables
|
||||
@cindex plot tables using gnuplot
|
||||
@cindex plot tables using Gnuplot
|
||||
@cindex #+PLOT
|
||||
|
||||
Org-Plot can produce 2D and 3D graphs of information stored in org tables
|
||||
|
@ -3868,7 +3868,7 @@ If the task was going to be overdue the next day.
|
|||
If the task was overdue on that day.
|
||||
@end table
|
||||
|
||||
In addition to coloring each day, the day is also marked with an asterix if
|
||||
In addition to coloring each day, the day is also marked with an asterisk if
|
||||
the task was actually done that day, and an exclamation mark to show where
|
||||
the current day falls in the graph.
|
||||
|
||||
|
@ -5745,8 +5745,8 @@ use the shift key and press @kbd{S}. Remember that using shift will always
|
|||
leave you clocked out, no matter which option you choose.
|
||||
@item C
|
||||
To cancel the clock altogether, use @kbd{C}. Note that if instead of
|
||||
cancelling you subtract the away time, and the resulting clock amount is less
|
||||
than a minute, the clock will still be cancelled rather than clutter up the
|
||||
canceling you subtract the away time, and the resulting clock amount is less
|
||||
than a minute, the clock will still be canceled rather than clutter up the
|
||||
log with an empty entry.
|
||||
@end table
|
||||
|
||||
|
@ -6026,7 +6026,7 @@ place where you started the capture process.
|
|||
@node Template elements, Template expansion, Capture templates, Capture templates
|
||||
@subsubsection Template elements
|
||||
|
||||
Now lets look at the elements of a template defintion. Each entry in
|
||||
Now lets look at the elements of a template definition. Each entry in
|
||||
@code{org-capture-templates} is a list with the following items:
|
||||
|
||||
@table @var
|
||||
|
@ -9455,7 +9455,7 @@ and @code{style} attributes for a link:
|
|||
Org-mode tables are exported to HTML using the table tag defined in
|
||||
@code{org-export-html-table-tag}. The default setting makes tables without
|
||||
cell borders and frame. If you would like to change this for individual
|
||||
tables, place somthing like the following before the table:
|
||||
tables, place something like the following before the table:
|
||||
|
||||
@cindex #+CAPTION
|
||||
@cindex #+ATTR_HTML
|
||||
|
@ -9486,7 +9486,7 @@ will link to a high resolution version of the image, you could use:
|
|||
[[file:highres.jpg][file:thumb.jpg]]
|
||||
@end example
|
||||
|
||||
If you need to add attributes to an inlines image, use a @code{#+ATTR_HTML}.
|
||||
If you need to add attributes to an inlined image, use a @code{#+ATTR_HTML}.
|
||||
In the example below we specify the @code{alt} and @code{title} attributes to
|
||||
support text viewers and accessibility, and align it to the right.
|
||||
|
||||
|
@ -10329,7 +10329,7 @@ For more information and examples see the Org-taskjuggler tutorial at
|
|||
@cindex Freemind export
|
||||
@cindex mind map
|
||||
|
||||
The freemind exporter was written by Lennart Borgman.
|
||||
The Freemind exporter was written by Lennart Borgman.
|
||||
|
||||
@table @kbd
|
||||
@kindex C-c C-e m
|
||||
|
@ -11005,7 +11005,7 @@ formulas (see @ref{The spreadsheet}).
|
|||
@item <language>
|
||||
The language of the code in the block.
|
||||
@item <switches>
|
||||
Switches controling exportation of the code block (see switches discussion in
|
||||
Switches controlling exportation of the code block (see switches discussion in
|
||||
@ref{Literal examples})
|
||||
@item <header arguments>
|
||||
Optional header arguments control many aspects of evaluation, export and
|
||||
|
@ -11413,7 +11413,7 @@ The following header arguments are defined:
|
|||
@menu
|
||||
* var:: Pass arguments to code blocks
|
||||
* results:: Specify the type of results and how they will
|
||||
be collectd and handled
|
||||
be collected and handled
|
||||
* file:: Specify a path for file output
|
||||
* dir and remote execution:: Specify the default directory for code block
|
||||
execution
|
||||
|
@ -12244,7 +12244,7 @@ emacsclient \
|
|||
|
||||
@menu
|
||||
* Completion:: M-TAB knows what you need
|
||||
* Speed keys:: Electic commands at the beginning of a headline
|
||||
* Speed keys:: Electric commands at the beginning of a headline
|
||||
* Code evaluation security:: Org mode files evaluate inline code
|
||||
* Customization:: Adapting Org to your taste
|
||||
* In-buffer settings:: Overview of the #+KEYWORDS
|
||||
|
@ -14153,7 +14153,7 @@ the view, only the current agenda files will be searched.
|
|||
|
||||
@node History and Acknowledgments, Main Index, MobileOrg, Top
|
||||
@appendix History and acknowledgments
|
||||
@cindex acknowledgements
|
||||
@cindex acknowledgments
|
||||
@cindex history
|
||||
@cindex thanks
|
||||
|
||||
|
|
|
@ -97,14 +97,16 @@ keys The keys that will select the template, as a string, characters
|
|||
description A short string describing the template, will be shown during
|
||||
selection.
|
||||
|
||||
type The type of entry. Valid are:
|
||||
type The type of entry. Valid types are:
|
||||
entry an Org-mode node, with a headline. Will be
|
||||
filed as the child of the target entry or as
|
||||
a top-level entry.
|
||||
item a plain list item, placed in the first plain
|
||||
list a the target location.
|
||||
checkitem a checkbox item. This only differs from the
|
||||
plain lis item by the default template.
|
||||
item a plain list item, will be placed in the
|
||||
first plain list at the target
|
||||
location.
|
||||
checkitem a checkbox item. This differs from the
|
||||
plain list item only is so far as it uses a
|
||||
different default template.
|
||||
table-line a new line in the first table at target location.
|
||||
plain text to be inserted as it is.
|
||||
|
||||
|
@ -119,7 +121,7 @@ target Specification of where the captured item should be placed.
|
|||
Text will be placed at the beginning or end of that file
|
||||
|
||||
(id \"id of existing org entry\")
|
||||
Filing as child of this entry, or in the body of the entry
|
||||
File as child of this entry, or in the body of the entry
|
||||
|
||||
(file+headline \"path/to/file\" \"node headline\")
|
||||
Fast configuration if the target heading is unique in the file
|
||||
|
@ -128,20 +130,20 @@ target Specification of where the captured item should be placed.
|
|||
For non-unique headings, the full path is safer
|
||||
|
||||
(file+regexp \"path/to/file\" \"regexp to find location\")
|
||||
File to the entry matching regexp
|
||||
|
||||
(file+datetree \"path/to/file\")
|
||||
Will create a heading in a date tree.
|
||||
Will create a heading in a date tree
|
||||
|
||||
(file+function \"path/to/file\" function-finding-location)
|
||||
A function to find the right location in the file.
|
||||
A function to find the right location in the file
|
||||
|
||||
(clock)
|
||||
File to the entry that is currently being clocked.
|
||||
File to the entry that is currently being clocked
|
||||
|
||||
(function function-finding-location)
|
||||
Most general way, write your own function to find both
|
||||
file and location.
|
||||
|
||||
file and location
|
||||
|
||||
template The template for creating the capture item. If you leave this
|
||||
empty, an appropriate default template will be used. See below
|
||||
|
@ -156,7 +158,7 @@ template The template for creating the capture item. If you leave this
|
|||
The rest of the entry is a property list of additional options. Recognized
|
||||
properties are:
|
||||
|
||||
:prepend Normally new captured information will be appended at
|
||||
:prepend Normally newly captured information will be appended at
|
||||
the target location (last child, last table line,
|
||||
last list item...). Setting this property will
|
||||
change that.
|
||||
|
@ -183,12 +185,12 @@ properties are:
|
|||
which means that the new line should become the third
|
||||
line before the second horizontal separaor line.
|
||||
|
||||
The template defined the text to be inserted. Often then this is an org-mode
|
||||
The template defines the text to be inserted. Often this is an org-mode
|
||||
entry (so the first line should start with a star) that will be filed as a
|
||||
child of the target headline. It can also be freely formatted text.
|
||||
Furthermore, the following %-escapes will be replaced with content:
|
||||
|
||||
%^{prompt} Prompt the user for a string and replace this sequence with it.
|
||||
%^{prompt} prompt the user for a string and replace this sequence with it.
|
||||
A default value and a completion table ca be specified like this:
|
||||
%^{prompt|default|completion2|completion3|...}
|
||||
%t time stamp, date only
|
||||
|
@ -202,13 +204,13 @@ Furthermore, the following %-escapes will be replaced with content:
|
|||
indented, the entire inserted text will be indented as well.
|
||||
%c current kill ring head
|
||||
%x content of the X clipboard
|
||||
%^C Interactive selection of which kill or clip to use
|
||||
%^L Like %^C, but insert as link
|
||||
%^C interactive selection of which kill or clip to use
|
||||
%^L like %^C, but insert as link
|
||||
%k title of currently clocked task
|
||||
%K link to currently clocked task
|
||||
%^g prompt for tags, with completion on tags in target file
|
||||
%^G prompt for tags, with completion all tags in all agenda files
|
||||
%^{prop}p Prompt the user for a value for property `prop'
|
||||
%^G prompt for tags, with completion on all tags in all agenda files
|
||||
%^{prop}p prompt the user for a value for property `prop'
|
||||
%:keyword specific information for certain link types, see below
|
||||
%[pathname] insert the contents of the file given by `pathname'
|
||||
%(sexp) evaluate elisp `(sexp)' and replace with the result
|
||||
|
|
Loading…
Reference in a new issue