mirror/org-mode
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-11-23 07:18:53 +00:00
Code

Merge branch 'maint'

Browse Source
This commit is contained in:
Kyle Meyer 2016-01-24 16:41:20 -05:00
commit 034c176995
9 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/org.texi
View File

@ -13507,9 +13507,9 @@ These keywords are treated in details in the following sections.
When processing a document, @samp{texinfo} back-end generates a minimal file
header along with a title page, a copyright page, and a menu. You control
the latter through the structure of the document (@pxref{Headings and
sectioning structure}). Various keywords allow to tweak the other parts. It
is also possible to give directions to install the document in the @samp{Top}
node.
sectioning structure}). Various keywords allow you to tweak the other parts.
It is also possible to give directions to install the document in the
@samp{Top} node.
@subsubheading File header

2
lisp/org-crypt.el
View File

@ -225,7 +225,7 @@ See `org-crypt-disable-auto-save'."
;; outline property starts at the \n of the heading.
(delete-region (1- (point)) end)
;; Store a checksum of the decrypted and the encrypted
;; text value. This allow to reuse the same encrypted text
;; text value. This allows reusing the same encrypted text
;; if the text does not change, and therefore avoid a
;; re-encryption process.
(insert "\n" (propertize decrypted-text

10
lisp/org-element.el
View File

@ -409,9 +409,9 @@ Other brackets are treated as spaces.")
;; Provide four accessors: `org-element-type', `org-element-property'
;; `org-element-contents' and `org-element-restriction'.
;;
;; Setter functions allow to modify elements by side effect. There is
;; `org-element-put-property', `org-element-set-contents'. These
;; low-level functions are useful to build a parse tree.
;; Setter functions allow modification of elements by side effect.
;; There is `org-element-put-property', `org-element-set-contents'.
;; These low-level functions are useful to build a parse tree.
;;
;; `org-element-adopt-element', `org-element-set-element',
;; `org-element-extract-element' and `org-element-insert-before' are
@ -3898,8 +3898,8 @@ position of point and CDR is nil."
;; `org-element-parse-secondary-string', which parses objects within
;; a given string.
;;
;; The (almost) almighty `org-element-map' allows to apply a function
;; on elements or objects matching some type, and accumulate the
;; The (almost) almighty `org-element-map' allows applying a function
;; on elements or objects matching some type, and accumulating the
;; resulting values. In an export situation, it also skips unneeded
;; parts of the parse tree.

2
lisp/org-feed.el
View File

@ -24,7 +24,7 @@
;;
;;; Commentary:
;;
;; This module allows to create and change entries in an Org mode
;; This module allows entries to be created and changed in an Org-mode
;; file triggered by items in an RSS feed. The basic functionality
;; is geared toward simply adding new items found in a feed as
;; outline nodes to an Org file. Using hooks, arbitrary actions can

2
lisp/org.el
View File

@ -2466,7 +2466,7 @@ fast, while still showing the whole path to the entry."
:type 'boolean)
(defcustom org-refile-allow-creating-parent-nodes nil
"Non-nil means allow to create new nodes as refile targets.
"Non-nil means allow the creation of new nodes as refile targets.
New nodes are then created by adding \"/new node name\" to the completion
of an existing node. When the value of this variable is `confirm',
new node creation must be confirmed by the user (recommended).

6
lisp/ox-ascii.el
View File

@ -35,10 +35,10 @@
;;; Define Back-End
;;
;; The following setting won't allow to modify preferred charset
;; The following setting won't allow modifying preferred charset
;; through a buffer keyword or an option item, but, since the property
;; will appear in communication channel nonetheless, it allows to
;; override `org-ascii-charset' variable on the fly by the ext-plist
;; will appear in communication channel nonetheless, it allows
;; overriding `org-ascii-charset' variable on the fly by the ext-plist
;; mechanism.
;;
;; We also install a filter for headlines and sections, in order to

2
lisp/ox-icalendar.el
View File

@ -77,7 +77,7 @@ for timed events. If non-zero, alarms are created.
(defcustom org-icalendar-exclude-tags nil
"Tags that exclude a tree from export.
This variable allows to specify different exclude tags from other
This variable allows specifying different exclude tags from other
back-ends. It can also be set with the ICALENDAR_EXCLUDE_TAGS
keyword."
:group 'org-export-icalendar

2
lisp/ox-publish.el
View File

@ -1129,7 +1129,7 @@ This function is meant to be used as a final output filter. See
Return value is an internal reference, as a string.
This function allows to resolve external links like:
This function allows the resolution of external links like:
[[file.org::*fuzzy][description]]
[[file.org::#custom-id][description]]

16
lisp/ox.el
View File

@ -865,7 +865,7 @@ This option can also be set with the OPTIONS keyword, e.g.,
(defcustom org-export-snippet-translation-alist nil
"Alist between export snippets back-ends and exporter back-ends.
This variable allows to provide shortcuts for export snippets.
This variable allows providing shortcuts for export snippets.
For example, with a value of \\='((\"h\" . \"html\")), the
HTML back-end will recognize the contents of \"@@h:<b>@@\" as
@ -953,7 +953,7 @@ output is restricted to body only, \"s\" when it is restricted to
the current subtree, \"v\" when only visible elements are
considered for export, \"f\" when publishing functions should be
passed the FORCE argument and \"a\" when the export should be
asynchronous). Also, [?] allows to switch back to standard
asynchronous). Also, [?] allows switching back to standard
mode."
:group 'org-export-general
:version "24.4"
@ -3858,8 +3858,8 @@ process, leading to a different order when footnotes are nested."
;; level, relatively to the lower headline level in the parsed tree.
;;
;; `org-export-get-headline-number' returns the section number of an
;; headline, while `org-export-number-to-roman' allows to convert it
;; to roman numbers. With an optional argument,
;; headline, while `org-export-number-to-roman' allows it to be
;; converted to roman numbers. With an optional argument,
;; `org-export-get-headline-number' returns a number to unnumbered
;; headlines (used for internal id).
;;
@ -4309,8 +4309,8 @@ Otherwise, only provided element's type is considered.
Optional argument PREDICATE is a function returning a non-nil
value if the current element or object should be counted in. It
accepts two arguments: the element or object being considered and
the plist used as a communication channel. This allows to count
only a certain type of objects (i.e. inline images).
the plist used as a communication channel. This allows counting
only a certain type of object (i.e. inline images).
Return value is a list of numbers if ELEMENT is a headline or an
item. It is nil for keywords. It represents the footnote number
@ -5718,7 +5718,7 @@ to `:default' encoding. If it fails, return S."
;; returned results in the current process.
;;
;; At a higher level, `org-export-to-buffer' and `org-export-to-file'
;; allow to export to a buffer or a file, asynchronously or not.
;; allow exporting to a buffer or a file, asynchronously or not.
;;
;; `org-export-output-file-name' is an auxiliary function meant to be
;; used with `org-export-to-file'. With a given extension, it tries
@ -6239,7 +6239,7 @@ is nil when this menu hasn't been selected yet.
EXPERTP, when non-nil, triggers expert UI. In that case, no help
buffer is provided, but indications about currently active
options are given in the prompt. Moreover, [?] allows to switch
options are given in the prompt. Moreover, [?] allows switching
back to standard interface."
(let* ((fontify-key
(lambda (key &optional access-key)