diff options
| author | Paul Eggert | 2016-01-30 11:43:26 -0800 |
|---|---|---|
| committer | Paul Eggert | 2016-01-30 11:43:26 -0800 |
| commit | cb4e054e41cdb7e398351a5ae8224759e721349e (patch) | |
| tree | ae2bec4f10425bd61e2a90563edc178d382bb4b8 /lisp/org | |
| parent | e6d575316a42946aac6d83c9587f09afd1a59d98 (diff) | |
| parent | 60902756b0d794b16b9c1c67c4c40a3ac04d1c1b (diff) | |
| download | emacs-cb4e054e41cdb7e398351a5ae8224759e721349e.tar.gz emacs-cb4e054e41cdb7e398351a5ae8224759e721349e.zip | |
-
Diffstat (limited to 'lisp/org')
| -rw-r--r-- | lisp/org/ChangeLog.1 | 2 | ||||
| -rw-r--r-- | lisp/org/org-crypt.el | 2 | ||||
| -rw-r--r-- | lisp/org/org-element.el | 10 | ||||
| -rw-r--r-- | lisp/org/org-feed.el | 2 | ||||
| -rw-r--r-- | lisp/org/org-mobile.el | 2 | ||||
| -rw-r--r-- | lisp/org/org.el | 2 | ||||
| -rw-r--r-- | lisp/org/ox-ascii.el | 6 | ||||
| -rw-r--r-- | lisp/org/ox-icalendar.el | 2 | ||||
| -rw-r--r-- | lisp/org/ox-publish.el | 2 | ||||
| -rw-r--r-- | lisp/org/ox.el | 18 |
10 files changed, 24 insertions, 24 deletions
diff --git a/lisp/org/ChangeLog.1 b/lisp/org/ChangeLog.1 index 57a427c30d4..ccc849d226a 100644 --- a/lisp/org/ChangeLog.1 +++ b/lisp/org/ChangeLog.1 | |||
| @@ -32528,7 +32528,7 @@ | |||
| 32528 | (org-export-normalize-links) | 32528 | (org-export-normalize-links) |
| 32529 | (org-export-concatenate-multiline-links) | 32529 | (org-export-concatenate-multiline-links) |
| 32530 | (org-export-concatenate-multiline-emphasis): New functions, | 32530 | (org-export-concatenate-multiline-emphasis): New functions, |
| 32531 | obtained from spliting the export preprocessor. | 32531 | obtained from splitting the export preprocessor. |
| 32532 | 32532 | ||
| 32533 | * org-table.el (org-table-recalculate): Improve error message if | 32533 | * org-table.el (org-table-recalculate): Improve error message if |
| 32534 | the row number is invalid. | 32534 | the row number is invalid. |
diff --git a/lisp/org/org-crypt.el b/lisp/org/org-crypt.el index 22b02c84889..8abe32befe0 100644 --- a/lisp/org/org-crypt.el +++ b/lisp/org/org-crypt.el | |||
| @@ -225,7 +225,7 @@ See `org-crypt-disable-auto-save'." | |||
| 225 | ;; outline property starts at the \n of the heading. | 225 | ;; outline property starts at the \n of the heading. |
| 226 | (delete-region (1- (point)) end) | 226 | (delete-region (1- (point)) end) |
| 227 | ;; Store a checksum of the decrypted and the encrypted | 227 | ;; Store a checksum of the decrypted and the encrypted |
| 228 | ;; text value. This allow to reuse the same encrypted text | 228 | ;; text value. This allow reusing the same encrypted text |
| 229 | ;; if the text does not change, and therefore avoid a | 229 | ;; if the text does not change, and therefore avoid a |
| 230 | ;; re-encryption process. | 230 | ;; re-encryption process. |
| 231 | (insert "\n" (propertize decrypted-text | 231 | (insert "\n" (propertize decrypted-text |
diff --git a/lisp/org/org-element.el b/lisp/org/org-element.el index e47d65f1037..a19f52c7923 100644 --- a/lisp/org/org-element.el +++ b/lisp/org/org-element.el | |||
| @@ -367,8 +367,8 @@ still has an entry since one of its properties (`:title') does.") | |||
| 367 | ;; Provide four accessors: `org-element-type', `org-element-property' | 367 | ;; Provide four accessors: `org-element-type', `org-element-property' |
| 368 | ;; `org-element-contents' and `org-element-restriction'. | 368 | ;; `org-element-contents' and `org-element-restriction'. |
| 369 | ;; | 369 | ;; |
| 370 | ;; Setter functions allow to modify elements by side effect. There is | 370 | ;; Setter functions allow modification of elements by side effect. |
| 371 | ;; `org-element-put-property', `org-element-set-contents', | 371 | ;; There is `org-element-put-property', `org-element-set-contents', |
| 372 | ;; `org-element-set-element' and `org-element-adopt-element'. Note | 372 | ;; `org-element-set-element' and `org-element-adopt-element'. Note |
| 373 | ;; that `org-element-set-element' and `org-element-adopt-elements' are | 373 | ;; that `org-element-set-element' and `org-element-adopt-elements' are |
| 374 | ;; higher level functions since also update `:parent' property. | 374 | ;; higher level functions since also update `:parent' property. |
| @@ -487,7 +487,7 @@ Return parent element." | |||
| 487 | ;; cannot contain other greater elements of their own type. | 487 | ;; cannot contain other greater elements of their own type. |
| 488 | ;; | 488 | ;; |
| 489 | ;; Beside implementing a parser and an interpreter, adding a new | 489 | ;; Beside implementing a parser and an interpreter, adding a new |
| 490 | ;; greater element requires to tweak `org-element--current-element'. | 490 | ;; greater element requires tweaking `org-element--current-element'. |
| 491 | ;; Moreover, the newly defined type must be added to both | 491 | ;; Moreover, the newly defined type must be added to both |
| 492 | ;; `org-element-all-elements' and `org-element-greater-elements'. | 492 | ;; `org-element-all-elements' and `org-element-greater-elements'. |
| 493 | 493 | ||
| @@ -4023,8 +4023,8 @@ position of point and CDR is nil." | |||
| 4023 | ;; `org-element-parse-secondary-string', which parses objects within | 4023 | ;; `org-element-parse-secondary-string', which parses objects within |
| 4024 | ;; a given string. | 4024 | ;; a given string. |
| 4025 | ;; | 4025 | ;; |
| 4026 | ;; The (almost) almighty `org-element-map' allows to apply a function | 4026 | ;; The (almost) almighty `org-element-map' allows applying a function |
| 4027 | ;; on elements or objects matching some type, and accumulate the | 4027 | ;; on elements or objects matching some type, and accumulating the |
| 4028 | ;; resulting values. In an export situation, it also skips unneeded | 4028 | ;; resulting values. In an export situation, it also skips unneeded |
| 4029 | ;; parts of the parse tree. | 4029 | ;; parts of the parse tree. |
| 4030 | 4030 | ||
diff --git a/lisp/org/org-feed.el b/lisp/org/org-feed.el index 2d71c8b6fcc..6d6f996954a 100644 --- a/lisp/org/org-feed.el +++ b/lisp/org/org-feed.el | |||
| @@ -24,7 +24,7 @@ | |||
| 24 | ;; | 24 | ;; |
| 25 | ;;; Commentary: | 25 | ;;; Commentary: |
| 26 | ;; | 26 | ;; |
| 27 | ;; This module allows to create and change entries in an Org-mode | 27 | ;; This module allows entries to be created and changed in an Org-mode |
| 28 | ;; file triggered by items in an RSS feed. The basic functionality is | 28 | ;; file triggered by items in an RSS feed. The basic functionality is |
| 29 | ;; geared toward simply adding new items found in a feed as outline nodes | 29 | ;; geared toward simply adding new items found in a feed as outline nodes |
| 30 | ;; to an Org file. Using hooks, arbitrary actions can be triggered for | 30 | ;; to an Org file. Using hooks, arbitrary actions can be triggered for |
diff --git a/lisp/org/org-mobile.el b/lisp/org/org-mobile.el index b11f4448a8d..f535390790f 100644 --- a/lisp/org/org-mobile.el +++ b/lisp/org/org-mobile.el | |||
| @@ -88,7 +88,7 @@ org-agenda-text-search-extra-files | |||
| 88 | Encryption uses AES-256, with a password given in | 88 | Encryption uses AES-256, with a password given in |
| 89 | `org-mobile-encryption-password'. | 89 | `org-mobile-encryption-password'. |
| 90 | When nil, plain files are kept on the server. | 90 | When nil, plain files are kept on the server. |
| 91 | Turning on encryption requires to set the same password in the MobileOrg | 91 | Turning on encryption requires setting the same password in the MobileOrg |
| 92 | application. Before turning this on, check of MobileOrg does already | 92 | application. Before turning this on, check of MobileOrg does already |
| 93 | support it - at the time of this writing it did not yet." | 93 | support it - at the time of this writing it did not yet." |
| 94 | :group 'org-mobile | 94 | :group 'org-mobile |
diff --git a/lisp/org/org.el b/lisp/org/org.el index 960b874bc7e..6e7d54d39c0 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el | |||
| @@ -2254,7 +2254,7 @@ fast, while still showing the whole path to the entry." | |||
| 2254 | :type 'boolean) | 2254 | :type 'boolean) |
| 2255 | 2255 | ||
| 2256 | (defcustom org-refile-allow-creating-parent-nodes nil | 2256 | (defcustom org-refile-allow-creating-parent-nodes nil |
| 2257 | "Non-nil means allow to create new nodes as refile targets. | 2257 | "Non-nil means allow the creation of new nodes as refile targets. |
| 2258 | New nodes are then created by adding \"/new node name\" to the completion | 2258 | New nodes are then created by adding \"/new node name\" to the completion |
| 2259 | of an existing node. When the value of this variable is `confirm', | 2259 | of an existing node. When the value of this variable is `confirm', |
| 2260 | new node creation must be confirmed by the user (recommended). | 2260 | new node creation must be confirmed by the user (recommended). |
diff --git a/lisp/org/ox-ascii.el b/lisp/org/ox-ascii.el index 1907dc0c748..dcca608b306 100644 --- a/lisp/org/ox-ascii.el +++ b/lisp/org/ox-ascii.el | |||
| @@ -35,10 +35,10 @@ | |||
| 35 | 35 | ||
| 36 | ;;; Define Back-End | 36 | ;;; Define Back-End |
| 37 | ;; | 37 | ;; |
| 38 | ;; The following setting won't allow to modify preferred charset | 38 | ;; The following setting won't allow modifying preferred charset |
| 39 | ;; through a buffer keyword or an option item, but, since the property | 39 | ;; through a buffer keyword or an option item, but, since the property |
| 40 | ;; will appear in communication channel nonetheless, it allows to | 40 | ;; will appear in communication channel nonetheless, it allows |
| 41 | ;; override `org-ascii-charset' variable on the fly by the ext-plist | 41 | ;; overriding `org-ascii-charset' variable on the fly by the ext-plist |
| 42 | ;; mechanism. | 42 | ;; mechanism. |
| 43 | ;; | 43 | ;; |
| 44 | ;; We also install a filter for headlines and sections, in order to | 44 | ;; We also install a filter for headlines and sections, in order to |
diff --git a/lisp/org/ox-icalendar.el b/lisp/org/ox-icalendar.el index 44480673db8..0d34ba19f45 100644 --- a/lisp/org/ox-icalendar.el +++ b/lisp/org/ox-icalendar.el | |||
| @@ -76,7 +76,7 @@ for timed events. If non-zero, alarms are created. | |||
| 76 | 76 | ||
| 77 | (defcustom org-icalendar-exclude-tags nil | 77 | (defcustom org-icalendar-exclude-tags nil |
| 78 | "Tags that exclude a tree from export. | 78 | "Tags that exclude a tree from export. |
| 79 | This variable allows to specify different exclude tags from other | 79 | This variable allows specifying different exclude tags from other |
| 80 | back-ends. It can also be set with the ICAL_EXCLUDE_TAGS | 80 | back-ends. It can also be set with the ICAL_EXCLUDE_TAGS |
| 81 | keyword." | 81 | keyword." |
| 82 | :group 'org-export-icalendar | 82 | :group 'org-export-icalendar |
diff --git a/lisp/org/ox-publish.el b/lisp/org/ox-publish.el index ec33bbda52d..38fdce1d0bf 100644 --- a/lisp/org/ox-publish.el +++ b/lisp/org/ox-publish.el | |||
| @@ -1078,7 +1078,7 @@ publishing directory." | |||
| 1078 | "Return numbering for headline matching FUZZY search in FILE. | 1078 | "Return numbering for headline matching FUZZY search in FILE. |
| 1079 | 1079 | ||
| 1080 | Return value is a list of numbers, or nil. This function allows | 1080 | Return value is a list of numbers, or nil. This function allows |
| 1081 | to resolve external fuzzy links like: | 1081 | the resolution of external fuzzy links like: |
| 1082 | 1082 | ||
| 1083 | [[file.org::*fuzzy][description]]" | 1083 | [[file.org::*fuzzy][description]]" |
| 1084 | (when org-publish-cache | 1084 | (when org-publish-cache |
diff --git a/lisp/org/ox.el b/lisp/org/ox.el index cc5a2d2bcf2..89d79738a63 100644 --- a/lisp/org/ox.el +++ b/lisp/org/ox.el | |||
| @@ -775,7 +775,7 @@ is nil. You can also allow them through local buffer variables." | |||
| 775 | (defcustom org-export-snippet-translation-alist nil | 775 | (defcustom org-export-snippet-translation-alist nil |
| 776 | "Alist between export snippets back-ends and exporter back-ends. | 776 | "Alist between export snippets back-ends and exporter back-ends. |
| 777 | 777 | ||
| 778 | This variable allows to provide shortcuts for export snippets. | 778 | This variable allows providing shortcuts for export snippets. |
| 779 | 779 | ||
| 780 | For example, with a value of \((\"h\" . \"html\")), the | 780 | For example, with a value of \((\"h\" . \"html\")), the |
| 781 | HTML back-end will recognize the contents of \"@@h:<b>@@\" as | 781 | HTML back-end will recognize the contents of \"@@h:<b>@@\" as |
| @@ -849,7 +849,7 @@ output is restricted to body only, \"s\" when it is restricted to | |||
| 849 | the current subtree, \"v\" when only visible elements are | 849 | the current subtree, \"v\" when only visible elements are |
| 850 | considered for export, \"f\" when publishing functions should be | 850 | considered for export, \"f\" when publishing functions should be |
| 851 | passed the FORCE argument and \"a\" when the export should be | 851 | passed the FORCE argument and \"a\" when the export should be |
| 852 | asynchronous). Also, [?] allows to switch back to standard | 852 | asynchronous). Also, [?] allows switching back to standard |
| 853 | mode." | 853 | mode." |
| 854 | :group 'org-export-general | 854 | :group 'org-export-general |
| 855 | :version "24.4" | 855 | :version "24.4" |
| @@ -3657,9 +3657,9 @@ INFO is the plist used as a communication channel." | |||
| 3657 | ;; `org-export-get-relative-level' is a shortcut to get headline | 3657 | ;; `org-export-get-relative-level' is a shortcut to get headline |
| 3658 | ;; level, relatively to the lower headline level in the parsed tree. | 3658 | ;; level, relatively to the lower headline level in the parsed tree. |
| 3659 | ;; | 3659 | ;; |
| 3660 | ;; `org-export-get-headline-number' returns the section number of an | 3660 | ;; `org-export-get-headline-number' returns the section number of a |
| 3661 | ;; headline, while `org-export-number-to-roman' allows to convert it | 3661 | ;; headline, while `org-export-number-to-roman' allows it to be |
| 3662 | ;; to roman numbers. | 3662 | ;; converted to roman numbers. |
| 3663 | ;; | 3663 | ;; |
| 3664 | ;; `org-export-low-level-p', `org-export-first-sibling-p' and | 3664 | ;; `org-export-low-level-p', `org-export-first-sibling-p' and |
| 3665 | ;; `org-export-last-sibling-p' are three useful predicates when it | 3665 | ;; `org-export-last-sibling-p' are three useful predicates when it |
| @@ -4093,8 +4093,8 @@ Otherwise, only provided element's type is considered. | |||
| 4093 | Optional argument PREDICATE is a function returning a non-nil | 4093 | Optional argument PREDICATE is a function returning a non-nil |
| 4094 | value if the current element or object should be counted in. It | 4094 | value if the current element or object should be counted in. It |
| 4095 | accepts two arguments: the element or object being considered and | 4095 | accepts two arguments: the element or object being considered and |
| 4096 | the plist used as a communication channel. This allows to count | 4096 | the plist used as a communication channel. This allows counting |
| 4097 | only a certain type of objects (i.e. inline images). | 4097 | only a certain type of object (i.e. inline images). |
| 4098 | 4098 | ||
| 4099 | Return value is a list of numbers if ELEMENT is a headline or an | 4099 | Return value is a list of numbers if ELEMENT is a headline or an |
| 4100 | item. It is nil for keywords. It represents the footnote number | 4100 | item. It is nil for keywords. It represents the footnote number |
| @@ -5458,7 +5458,7 @@ to `:default' encoding. If it fails, return S." | |||
| 5458 | ;; returned results in the current process. | 5458 | ;; returned results in the current process. |
| 5459 | ;; | 5459 | ;; |
| 5460 | ;; At a higher level, `org-export-to-buffer' and `org-export-to-file' | 5460 | ;; At a higher level, `org-export-to-buffer' and `org-export-to-file' |
| 5461 | ;; allow to export to a buffer or a file, asynchronously or not. | 5461 | ;; allow exporting to a buffer or a file, asynchronously or not. |
| 5462 | ;; | 5462 | ;; |
| 5463 | ;; `org-export-output-file-name' is an auxiliary function meant to be | 5463 | ;; `org-export-output-file-name' is an auxiliary function meant to be |
| 5464 | ;; used with `org-export-to-file'. With a given extension, it tries | 5464 | ;; used with `org-export-to-file'. With a given extension, it tries |
| @@ -5985,7 +5985,7 @@ is nil when this menu hasn't been selected yet. | |||
| 5985 | 5985 | ||
| 5986 | EXPERTP, when non-nil, triggers expert UI. In that case, no help | 5986 | EXPERTP, when non-nil, triggers expert UI. In that case, no help |
| 5987 | buffer is provided, but indications about currently active | 5987 | buffer is provided, but indications about currently active |
| 5988 | options are given in the prompt. Moreover, [?] allows to switch | 5988 | options are given in the prompt. Moreover, [?] allows switching |
| 5989 | back to standard interface." | 5989 | back to standard interface." |
| 5990 | (let* ((fontify-key | 5990 | (let* ((fontify-key |
| 5991 | (lambda (key &optional access-key) | 5991 | (lambda (key &optional access-key) |