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

Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2012-12-23 00:34:42 +01:00
parent 830e231ef1 6b9d77eb8c
commit b6eede54b2
3 changed files with 36 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
doc/org.texi
View File

@ -263,7 +263,7 @@
@copying
This manual is for Org version @value{VERSION}.
Copyright @copyright{} 2004-2012 Free Software Foundation, Inc.
Copyright @copyright{} 2004--2012 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
@ -986,7 +986,7 @@ default. If you are using an earlier version of Emacs, add this line to your
(add-to-list 'auto-mode-alist '("\\.org\\'" . org-mode))
@end lisp
Org mode buffers need font-lock to be turned on - this is the default in
Org mode buffers need font-lock to be turned on: this is the default in
Emacs@footnote{If you don't use font-lock globally, turn it on in Org buffer
with @code{(add-hook 'org-mode-hook 'turn-on-font-lock)}}.
@ -2691,7 +2691,7 @@ computations in Lisp:
'(concat (substring $1 1 2) (substring $1 0 1) (substring $1 2))
@r{Add columns 1 and 2, equivalent to Calc's @code{$1+$2}}
'(+ $1 $2);N
@r{Compute the sum of columns 1-4, like Calc's @code{vsum($1..$4)}}
@r{Compute the sum of columns 1--4, like Calc's @code{vsum($1..$4)}}
'(apply '+ '($1..$4));N
@end example
@ -3427,7 +3427,7 @@ buffer:
For Org files, if there is a @samp{<<target>>} at the cursor, the link points
to the target. Otherwise it points to the current headline, which will also
be the description@footnote{If the headline contains a timestamp, it will be
removed from the link and result in a wrong link -- you should avoid putting
removed from the link and result in a wrong link---you should avoid putting
timestamp in the headline.}.
@vindex org-link-to-org-use-id
@ -5289,8 +5289,8 @@ same summary information.
The @code{est+} summary type requires further explanation. It is used for
combining estimates, expressed as low-high ranges. For example, instead
of estimating a particular task will take 5 days, you might estimate it as
5-6 days if you're fairly confident you know how much work is required, or
1-10 days if you don't really know what needs to be done. Both ranges
5--6 days if you're fairly confident you know how much work is required, or
1--10 days if you don't really know what needs to be done. Both ranges
average at 5.5 days, but the first represents a more predictable delivery.
When combining a set of such estimates, simply adding the lows and highs
@ -5300,7 +5300,7 @@ from the sum. For example, suppose you had ten tasks, each of which was
estimated at 0.5 to 2 days of work. Straight addition produces an estimate
of 5 to 20 days, representing what to expect if everything goes either
extremely well or extremely poorly. In contrast, @code{est+} estimates the
full job more realistically, at 10-15 days.
full job more realistically, at 10--15 days.
Here is an example for a complete columns definition, along with allowed
values.
@ -6600,7 +6600,7 @@ suggestion.} for capturing new material.
@table @kbd
@orgcmd{C-c c,org-capture}
Call the command @code{org-capture}. Note that this keybinding is global and
not active by default - you need to install it. If you have templates
not active by default: you need to install it. If you have templates
@cindex date tree
defined @pxref{Capture templates}, it will offer these templates for
selection or use a new Org outline node as the default template. It will
@ -8185,7 +8185,7 @@ February 1st, @kbd{9 w} to ISO week number 9. When setting day, week, or
month view, a year may be encoded in the prefix argument as well. For
example, @kbd{200712 w} will jump to week 12 in 2007. If such a year
specification has only one or two digits, it will be mapped to the interval
1938-2037. @kbd{v @key{SPC}} will reset to what is set in
1938--2037. @kbd{v @key{SPC}} will reset to what is set in
@code{org-agenda-span}.
@c
@orgcmd{f,org-agenda-later}
@ -8344,7 +8344,7 @@ You can then filter for an effort by first typing an operator, one of
@kbd{<}, @kbd{>}, and @kbd{=}, and then the one-digit index of an effort
estimate in your array of allowed values, where @kbd{0} means the 10th value.
The filter will then restrict to entries with effort smaller-or-equal, equal,
or larger-or-equal than the selected value. If the digits 0-9 are not used
or larger-or-equal than the selected value. If the digits 0--9 are not used
as fast access keys to tags, you can also simply press the index digit
directly without an operator. In this case, @kbd{<} will be assumed. For
application of the operator, entries without a defined effort will be treated
@ -8402,7 +8402,7 @@ selected.
@tsubheading{Remote editing}
@cindex remote editing, from agenda
@item 0-9
@item 0--9
Digit argument.
@c
@cindex undoing remote-editing events
@ -11216,7 +11216,7 @@ files directly, or generate the required styles using an application like
LibreOffice. The latter method is suitable for expert and non-expert
users alike, and is described here.
@subsubsection Applying custom styles - the easy way
@subsubsection Applying custom styles: the easy way
@enumerate
@item
@ -11229,8 +11229,8 @@ to ODT format.
@item
Open the above @file{example.odt} using LibreOffice. Use the @file{Stylist}
to locate the target styles - these typically have the @samp{Org} prefix -
and modify those to your taste. Save the modified file either as an
to locate the target styles---these typically have the @samp{Org} prefix---and
modify those to your taste. Save the modified file either as an
OpenDocument Text (@file{.odt}) or OpenDocument Template (@file{.ott}) file.
@item
@ -11283,8 +11283,8 @@ with a cross-reference and sequence number of the labeled entity.
@cindex tables, in DocBook export
Export of native Org mode tables (@pxref{Tables}) and simple @file{table.el}
tables is supported. However, export of complex @file{table.el} tables -
tables that have column or row spans - is not supported. Such tables are
tables is supported. However, export of complex @file{table.el} tables---tables
that have column or row spans---is not supported. Such tables are
stripped from the exported document.
By default, a table is exported with top and bottom frames and with rules
@ -11416,7 +11416,7 @@ height:width ratio, do the following
@cindex #+ATTR_ODT
You can control the manner in which an image is anchored by setting the
@code{:anchor} property of it's @code{#+ATTR_ODT} line. You can specify one
of the the following three values for the @code{:anchor} property -
of the the following three values for the @code{:anchor} property:
@samp{"as-char"}, @samp{"paragraph"} and @samp{"page"}.
To create an image that is anchored to a page, do the following:
@ -11522,8 +11522,8 @@ or
@node Labels and captions in ODT export, Literal examples in ODT export, Math formatting in ODT export, OpenDocument Text export
@subsection Labels and captions in ODT export
You can label and caption various category of objects - an inline image, a
table, a @LaTeX{} fragment or a Math formula - using @code{#+LABEL} and
You can label and caption various category of objects---an inline image, a
table, a @LaTeX{} fragment or a Math formula---using @code{#+LABEL} and
@code{#+CAPTION} lines. @xref{Images and tables}. ODT exporter enumerates
each labeled or captioned object of a given category separately. As a
result, each such object is assigned a sequence number based on order of it's
@ -11687,8 +11687,8 @@ the exporter.
@item
It contains @samp{<text:sequence-decl>}@dots{}@samp{</text:sequence-decl>}
elements that control how various entities - tables, images, equations etc -
are numbered.
elements that control how various entities---tables, images, equations,
etc.---are numbered.
@end enumerate
@end itemize
@ -11822,7 +11822,7 @@ OpenDocument-v1.2 Specification}}
@subsubheading Custom table styles - an illustration
@subsubheading Custom table styles: an illustration
To have a quick preview of this feature, install the below setting and export
the table that follows.
@ -11854,7 +11854,7 @@ Template} in @file{OrgOdtContentTemplate.xml}
(@pxref{x-orgodtcontenttemplate-xml,,Factory styles}). If you need
additional templates you have to define these styles yourselves.
@subsubheading Custom table styles - the nitty-gritty
@subsubheading Custom table styles: the nitty-gritty
To use this feature proceed as follows:
@enumerate
@ -14882,7 +14882,7 @@ These lines (several are allowed) specify link abbreviations.
@vindex org-lowest-priority
@vindex org-default-priority
This line sets the limits and the default for the priorities. All three
must be either letters A-Z or numbers 0-9. The highest priority must
must be either letters A--Z or numbers 0--9. The highest priority must
have a lower ASCII number than the lowest priority.
@item #+PROPERTY: Property_Name Value
This line sets a default inheritance value for entries in the current
@ -15186,7 +15186,7 @@ indentation shifts by two@footnote{See the variable
stars but the last one are made invisible using the @code{org-hide}
face@footnote{Turning on @code{org-indent-mode} sets
@code{org-hide-leading-stars} to @code{t} and @code{org-adapt-indentation} to
@code{nil}.} - see below under @samp{2.} for more information on how this
@code{nil}.}; see below under @samp{2.} for more information on how this
works. You can turn on @code{org-indent-mode} for all files by customizing
the variable @code{org-startup-indented}, or you can turn it on for
individual files using
@ -16795,7 +16795,7 @@ a great help, and the list would not be so active without him.
@end table
I received support from so many users that it is clearly impossible to be
fair when shortlisting a few of them -- but Org's history would not be
fair when shortlisting a few of them, but Org's history would not be
complete if the ones above were not mentioned in this manual.
@section List of contributions

6
doc/orgguide.texi
View File

@ -39,7 +39,7 @@
@end macro
@copying
Copyright @copyright{} 2010-2012 Free Software Foundation
Copyright @copyright{} 2010--2012 Free Software Foundation
@quotation
Permission is granted to copy, distribute and/or modify this document
@ -927,7 +927,7 @@ like this:
The keywords should all be different, this helps Org mode to keep track of
which subsequence should be used for a given entry. The example also shows
how to define keys for fast access of a particular state, by adding a letter
in parenthesis after each keyword - you will be prompted for the key after
in parenthesis after each keyword---you will be prompted for the key after
@kbd{C-c C-t}.
To define TODO keywords that are valid only in a single file, use the
@ -1946,7 +1946,7 @@ Narrow the current agenda filter by an additional condition.
@tsubheading{Remote editing (see the manual for many more commands)}
@item 0-9
@item 0--9
Digit argument.
@c
@item t

12
lisp/org.el
View File

@ -7812,7 +7812,6 @@ useful if the caller implements cut-and-paste as copy-then-paste-then-cut."
(if (org-called-interactively-p 'any)
(org-back-to-heading nil) ; take what looks like a subtree
(org-back-to-heading t)) ; take what is really there
(org-back-over-empty-lines)
(setq beg (point))
(skip-chars-forward " \t\r\n")
(save-match-data
@ -7822,7 +7821,6 @@ useful if the caller implements cut-and-paste as copy-then-paste-then-cut."
(org-forward-heading-same-level (1- n) t)
(error nil))
(org-end-of-subtree t t))
(org-back-over-empty-lines)
(setq end (point))
(goto-char beg0)
(when (> end beg)
@ -7913,7 +7911,6 @@ the inserted text when done."
(delete-region (point-at-bol) (point)))
;; Paste
(beginning-of-line (if (bolp) 1 2))
(unless for-yank (org-back-over-empty-lines))
(setq beg (point))
(and (fboundp 'org-id-paste-tracker) (org-id-paste-tracker txt))
(insert-before-markers txt)
@ -11631,7 +11628,8 @@ For calling through lisp, arg is also interpreted in the following way:
cl (if (outline-invisible-p) (org-end-of-subtree nil t))))
(if (equal arg '(16)) (setq arg 'nextset))
(let ((org-blocker-hook org-blocker-hook)
(case-fold-search nil))
commentp
case-fold-search)
(when (equal arg '(64))
(setq arg nil org-blocker-hook nil))
(when (and org-blocker-hook
@ -11641,6 +11639,9 @@ For calling through lisp, arg is also interpreted in the following way:
(save-excursion
(catch 'exit
(org-back-to-heading t)
(when (looking-at (concat "^\\*+ " org-comment-string))
(org-toggle-comment)
(setq commentp t))
(if (looking-at org-outline-regexp) (goto-char (1- (match-end 0))))
(or (looking-at (concat " +" org-todo-regexp "\\( +\\|[ \t]*$\\)"))
(looking-at "\\(?: *\\|[ \t]*$\\)"))
@ -11818,7 +11819,8 @@ For calling through lisp, arg is also interpreted in the following way:
(and (looking-at " ") (just-one-space))))
(when org-trigger-hook
(save-excursion
(run-hook-with-args 'org-trigger-hook change-plist)))))))))
(run-hook-with-args 'org-trigger-hook change-plist)))
(when commentp (org-toggle-comment))))))))
(defun org-block-todo-from-children-or-siblings-or-parent (change-plist)
"Block turning an entry into a TODO, using the hierarchy.