diff options
| author | Juanma Barranquero | 2006-01-30 02:04:47 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2006-01-30 02:04:47 +0000 |
| commit | b0a10108c3d5365c6f163f082c3bd14e9ce98473 (patch) | |
| tree | dee148a00cfa51eaf6de81d3f48c7c058cdd4a2b /lisp | |
| parent | a55f450f43bc0d37f660f08ce75734f5c43d9995 (diff) | |
| download | emacs-b0a10108c3d5365c6f163f082c3bd14e9ce98473.tar.gz emacs-b0a10108c3d5365c6f163f082c3bd14e9ce98473.zip | |
(org-allow-space-in-links, org-closed-string, org-quote-string,
org-calendar-to-agenda-key, org-agenda-sorting-strategy,
org-agenda-use-time-grid, org-show-following-heading,
org-tags-column, org-use-tag-inheritance, org,
org-allow-space-in-links, org-usenet-links-prefer-google,
org-file-apps-defaults-gnu, org-enable-table-editor,
org-calc-default-modes, org-export-html-style,
org-table-allow-automatic-line-recalculation,
org-export-with-fixed-width, org-export-with-sub-superscripts,
org-special-keyword, org-formula, org-time-grid,
org-table-may-need-update, org-mode, org-goto-ret, org-goto-left,
org-goto-right, org-goto-quit, org-get-indentation,
org-end-of-item, org-move-item-down, org-move-item-up,
org-renumber-ordered-list, org-todo, org-log-done, org-occur,
org-remove-occur-highlights, org-read-date, org-goto-calendar,
org-agenda, org-agenda-day-view, org-agenda-previous-date-line,
org-agenda-log-mode, org-agenda-toggle-diary,
org-agenda-toggle-time-grid, org-agenda-cleanup-fancy-diary,
org-agenda-file-to-end, org-agenda-no-heading-message,
org-agenda-get-closed, org-format-agenda-item, org-cmp-priority,
org-cmp-category, org-cmp-time, org-agenda-change-all-lines,
org-agenda-diary-entry, org-scan-tags,
org-after-todo-state-change-hook, org-tags-view, org-link-search,
org-camel-to-words, org-open-file, org-remember-handler,
org-table-convert-region, org-table-move-row-down,
org-table-move-row-up, org-table-copy-region,
org-table-wrap-region, org-table-toggle-vline-visibility,
org-table-get-vertical-vector, org-table-modify-formulas,
org-table-get-specials, org-recalc-commands,
org-table-rotate-recalc-marks, org-table-eval-formula,
orgtbl-make-binding, org-in-invisibility-spec-p, org-cycle,
org-level-color-stars-only, org-insert-heading):
Fix typos in docstrings.
(last-arg): Add defvar.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 37 | ||||
| -rw-r--r-- | lisp/textmodes/org.el | 290 |
2 files changed, 182 insertions, 145 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a13e45e20bc..b47ded0407f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,42 @@ | |||
| 1 | 2006-01-30 Juanma Barranquero <lekktu@gmail.com> | 1 | 2006-01-30 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 2 | ||
| 3 | * textmodes/org.el (org-allow-space-in-links, org-closed-string) | ||
| 4 | (org-quote-string, org-calendar-to-agenda-key) | ||
| 5 | (org-agenda-sorting-strategy, org-agenda-use-time-grid) | ||
| 6 | (org-show-following-heading, org-tags-column) | ||
| 7 | (org-use-tag-inheritance, org, org-allow-space-in-links) | ||
| 8 | (org-usenet-links-prefer-google, org-file-apps-defaults-gnu) | ||
| 9 | (org-enable-table-editor, org-calc-default-modes) | ||
| 10 | (org-table-allow-automatic-line-recalculation) | ||
| 11 | (org-export-html-style, org-export-with-fixed-width) | ||
| 12 | (org-export-with-sub-superscripts, org-special-keyword) | ||
| 13 | (org-formula, org-time-grid, org-table-may-need-update) | ||
| 14 | (org-mode, org-goto-ret, org-goto-left, org-goto-right) | ||
| 15 | (org-goto-quit, org-get-indentation, org-end-of-item) | ||
| 16 | (org-move-item-down, org-move-item-up) | ||
| 17 | (org-renumber-ordered-list, org-todo, org-log-done, org-occur) | ||
| 18 | (org-remove-occur-highlights, org-read-date, org-goto-calendar) | ||
| 19 | (org-agenda, org-agenda-day-view, org-agenda-previous-date-line) | ||
| 20 | (org-agenda-log-mode, org-agenda-toggle-diary) | ||
| 21 | (org-agenda-toggle-time-grid, org-agenda-cleanup-fancy-diary) | ||
| 22 | (org-agenda-file-to-end, org-agenda-no-heading-message) | ||
| 23 | (org-agenda-get-closed, org-format-agenda-item) | ||
| 24 | (org-cmp-priority, org-cmp-category, org-cmp-time) | ||
| 25 | (org-agenda-change-all-lines, org-agenda-diary-entry) | ||
| 26 | (org-scan-tags, org-after-todo-state-change-hook, org-tags-view) | ||
| 27 | (org-link-search, org-camel-to-words, org-open-file) | ||
| 28 | (org-remember-handler, org-table-convert-region) | ||
| 29 | (org-table-move-row-down, org-table-move-row-up) | ||
| 30 | (org-table-copy-region, org-table-wrap-region) | ||
| 31 | (org-table-toggle-vline-visibility) | ||
| 32 | (org-table-get-vertical-vector, org-table-modify-formulas) | ||
| 33 | (org-table-get-specials, org-recalc-commands) | ||
| 34 | (org-table-rotate-recalc-marks, org-table-eval-formula) | ||
| 35 | (orgtbl-make-binding, org-in-invisibility-spec-p, org-cycle) | ||
| 36 | (org-level-color-stars-only, org-insert-heading): | ||
| 37 | Fix typos in docstrings. | ||
| 38 | (last-arg): Add defvar. | ||
| 39 | |||
| 3 | * makefile.w32-in (WINS): Add erc. | 40 | * makefile.w32-in (WINS): Add erc. |
| 4 | (MH_E_SRC): Update (copied from lisp/Makefile.in). | 41 | (MH_E_SRC): Update (copied from lisp/Makefile.in). |
| 5 | 42 | ||
diff --git a/lisp/textmodes/org.el b/lisp/textmodes/org.el index 926cc56bfe9..486b38a143a 100644 --- a/lisp/textmodes/org.el +++ b/lisp/textmodes/org.el | |||
| @@ -130,7 +130,7 @@ | |||
| 130 | "Are we using the new outline mode?") | 130 | "Are we using the new outline mode?") |
| 131 | 131 | ||
| 132 | (defgroup org nil | 132 | (defgroup org nil |
| 133 | "Outline-based notes management and organizer " | 133 | "Outline-based notes management and organizer." |
| 134 | :tag "Org" | 134 | :tag "Org" |
| 135 | :group 'outlines | 135 | :group 'outlines |
| 136 | :group 'hypermedia | 136 | :group 'hypermedia |
| @@ -307,7 +307,7 @@ Changes become only effective after restarting Emacs." | |||
| 307 | :type 'string) | 307 | :type 'string) |
| 308 | 308 | ||
| 309 | (defcustom org-closed-string "CLOSED:" | 309 | (defcustom org-closed-string "CLOSED:" |
| 310 | "String ued as the prefix for timestamps logging closing a TODO entry." | 310 | "String used as the prefix for timestamps logging closing a TODO entry." |
| 311 | :group 'org-keywords | 311 | :group 'org-keywords |
| 312 | :type 'string) | 312 | :type 'string) |
| 313 | 313 | ||
| @@ -324,13 +324,13 @@ Changes become only effective after restarting Emacs." | |||
| 324 | Quoting applies only to the text in the entry following the headline, and does | 324 | Quoting applies only to the text in the entry following the headline, and does |
| 325 | not extend beyond the next headline, even if that is lower level. | 325 | not extend beyond the next headline, even if that is lower level. |
| 326 | An entry can be toggled between QUOTE and normal with | 326 | An entry can be toggled between QUOTE and normal with |
| 327 | \\[org-toggle-fixed-width-section]" | 327 | \\[org-toggle-fixed-width-section]." |
| 328 | :group 'org-keywords | 328 | :group 'org-keywords |
| 329 | :type 'string) | 329 | :type 'string) |
| 330 | 330 | ||
| 331 | (defcustom org-after-todo-state-change-hook nil | 331 | (defcustom org-after-todo-state-change-hook nil |
| 332 | "Hook which is run after the state of a TODO item was changed. | 332 | "Hook which is run after the state of a TODO item was changed. |
| 333 | The new state (a string with a todo keyword, or nil) is available in the | 333 | The new state (a string with a TODO keyword, or nil) is available in the |
| 334 | Lisp variable `state'." | 334 | Lisp variable `state'." |
| 335 | :group 'org-keywords | 335 | :group 'org-keywords |
| 336 | :type 'hook) | 336 | :type 'hook) |
| @@ -526,8 +526,8 @@ the entries for specific days." | |||
| 526 | (defcustom org-calendar-to-agenda-key [?c] | 526 | (defcustom org-calendar-to-agenda-key [?c] |
| 527 | "The key to be installed in `calendar-mode-map' for switching to the agenda. | 527 | "The key to be installed in `calendar-mode-map' for switching to the agenda. |
| 528 | The command `org-calendar-goto-agenda' will be bound to this key. The | 528 | The command `org-calendar-goto-agenda' will be bound to this key. The |
| 529 | default is the character `c' because then`c' can be used to switch back and | 529 | default is the character `c' because then `c' can be used to switch back and |
| 530 | force between agenda and calendar." | 530 | forth between agenda and calendar." |
| 531 | :group 'org-agenda | 531 | :group 'org-agenda |
| 532 | :type 'sexp) | 532 | :type 'sexp) |
| 533 | 533 | ||
| @@ -535,7 +535,7 @@ force between agenda and calendar." | |||
| 535 | "Sorting structure for the agenda items of a single day. | 535 | "Sorting structure for the agenda items of a single day. |
| 536 | This is a list of symbols which will be used in sequence to determine | 536 | This is a list of symbols which will be used in sequence to determine |
| 537 | if an entry should be listed before another entry. The following | 537 | if an entry should be listed before another entry. The following |
| 538 | symbols are recognized. | 538 | symbols are recognized: |
| 539 | 539 | ||
| 540 | time-up Put entries with time-of-day indications first, early first | 540 | time-up Put entries with time-of-day indications first, early first |
| 541 | time-down Put entries with time-of-day indications first, late first | 541 | time-down Put entries with time-of-day indications first, late first |
| @@ -630,7 +630,7 @@ of `org-agenda-prefix-format' or `org-timeline-prefix-format'.") | |||
| 630 | (defcustom org-agenda-use-time-grid t | 630 | (defcustom org-agenda-use-time-grid t |
| 631 | "Non-nil means, show a time grid in the agenda schedule. | 631 | "Non-nil means, show a time grid in the agenda schedule. |
| 632 | A time grid is a set of lines for specific times (like every two hours between | 632 | A time grid is a set of lines for specific times (like every two hours between |
| 633 | 8:00 and 20:00. The items scheduled for a day at specific times are | 633 | 8:00 and 20:00). The items scheduled for a day at specific times are |
| 634 | sorted in between these lines. | 634 | sorted in between these lines. |
| 635 | For deails about when the grid will be shown, and what it will look like, see | 635 | For deails about when the grid will be shown, and what it will look like, see |
| 636 | the variable `org-agenda-time-grid'." | 636 | the variable `org-agenda-time-grid'." |
| @@ -760,7 +760,7 @@ Turning this off makes sparse trees more compact, but also less clear." | |||
| 760 | When doing an `org-occur' it is useful to show the headline which | 760 | When doing an `org-occur' it is useful to show the headline which |
| 761 | follows the match, even if they do not match the regexp. This makes it | 761 | follows the match, even if they do not match the regexp. This makes it |
| 762 | easier to edit directly inside the sparse tree. However, if you use | 762 | easier to edit directly inside the sparse tree. However, if you use |
| 763 | org-occur mainly as an overview, the following headlines are | 763 | `org-occur' mainly as an overview, the following headlines are |
| 764 | unnecessary clutter." | 764 | unnecessary clutter." |
| 765 | :group 'org-structure | 765 | :group 'org-structure |
| 766 | :type 'boolean) | 766 | :type 'boolean) |
| @@ -775,7 +775,7 @@ as possible." | |||
| 775 | (defcustom org-level-color-stars-only nil | 775 | (defcustom org-level-color-stars-only nil |
| 776 | "Non-nil means fontify only the stars in each headline. | 776 | "Non-nil means fontify only the stars in each headline. |
| 777 | When nil, the entire headline is fontified. | 777 | When nil, the entire headline is fontified. |
| 778 | After changin this, requires restart of Emacs to become effective." | 778 | Changing it requires a restart of Emacs to become effective." |
| 779 | :group 'org-structure | 779 | :group 'org-structure |
| 780 | :type 'boolean) | 780 | :type 'boolean) |
| 781 | 781 | ||
| @@ -871,7 +871,7 @@ first line, so it is probably best to use this in combinations with | |||
| 871 | 871 | ||
| 872 | (defcustom org-tags-column 48 | 872 | (defcustom org-tags-column 48 |
| 873 | "The column to which tags should be indented in a headline. | 873 | "The column to which tags should be indented in a headline. |
| 874 | If this number is positive, it specified the column. If it is negative, | 874 | If this number is positive, it specifies the column. If it is negative, |
| 875 | it means that the tags should be flushright to that column. For example, | 875 | it means that the tags should be flushright to that column. For example, |
| 876 | -79 works well for a normal 80 character screen." | 876 | -79 works well for a normal 80 character screen." |
| 877 | :group 'org-tags | 877 | :group 'org-tags |
| @@ -887,7 +887,7 @@ the tags are again aligned to `org-tags-column'." | |||
| 887 | 887 | ||
| 888 | (defcustom org-use-tag-inheritance t | 888 | (defcustom org-use-tag-inheritance t |
| 889 | "Non-nil means, tags in levels apply also for sublevels. | 889 | "Non-nil means, tags in levels apply also for sublevels. |
| 890 | When nil, only the tags directly give in a specific line apply there. | 890 | When nil, only the tags directly given in a specific line apply there. |
| 891 | If you turn off this option, you very likely want to turn on the | 891 | If you turn off this option, you very likely want to turn on the |
| 892 | companion option `org-tags-match-list-sublevels'." | 892 | companion option `org-tags-match-list-sublevels'." |
| 893 | :group 'org-tags | 893 | :group 'org-tags |
| @@ -948,7 +948,7 @@ recommend an additional URL: prefix, so the format would be \"<URL:%s>\"." | |||
| 948 | When nil, it becomes possible to put several links into a line. | 948 | When nil, it becomes possible to put several links into a line. |
| 949 | Note that in tables, a link never extends accross fields, so in a table | 949 | Note that in tables, a link never extends accross fields, so in a table |
| 950 | it is always possible to put several links into a line. | 950 | it is always possible to put several links into a line. |
| 951 | Changing this varable requires a re-launch of Emacs of become effective." | 951 | Changing this variable requires a restart of Emacs to become effective." |
| 952 | :group 'org-link | 952 | :group 'org-link |
| 953 | :type 'boolean) | 953 | :type 'boolean) |
| 954 | 954 | ||
| @@ -1014,7 +1014,7 @@ another window." | |||
| 1014 | (const find-file-other-frame))))) | 1014 | (const find-file-other-frame))))) |
| 1015 | 1015 | ||
| 1016 | (defcustom org-usenet-links-prefer-google nil | 1016 | (defcustom org-usenet-links-prefer-google nil |
| 1017 | "Non-nil means, `org-store-link' will create web links to google groups. | 1017 | "Non-nil means, `org-store-link' will create web links to Google groups. |
| 1018 | When nil, Gnus will be used for such links. | 1018 | When nil, Gnus will be used for such links. |
| 1019 | Using a prefix arg to the command \\[org-store-link] (`org-store-link') | 1019 | Using a prefix arg to the command \\[org-store-link] (`org-store-link') |
| 1020 | negates this setting for the duration of the command." | 1020 | negates this setting for the duration of the command." |
| @@ -1035,7 +1035,7 @@ The default is true, to keep new users from shooting into their own foot." | |||
| 1035 | 1035 | ||
| 1036 | (defconst org-file-apps-defaults-gnu | 1036 | (defconst org-file-apps-defaults-gnu |
| 1037 | '((t . mailcap)) | 1037 | '((t . mailcap)) |
| 1038 | "Default file applications on a UNIX/LINUX system. | 1038 | "Default file applications on a UNIX or GNU/Linux system. |
| 1039 | See `org-file-apps'.") | 1039 | See `org-file-apps'.") |
| 1040 | 1040 | ||
| 1041 | (defconst org-file-apps-defaults-macosx | 1041 | (defconst org-file-apps-defaults-macosx |
| @@ -1131,7 +1131,7 @@ When nil, new notes will be filed to the end of a file or entry." | |||
| 1131 | When nil, such lines will be treated like ordinary lines. | 1131 | When nil, such lines will be treated like ordinary lines. |
| 1132 | 1132 | ||
| 1133 | When equal to the symbol `optimized', the table editor will be optimized to | 1133 | When equal to the symbol `optimized', the table editor will be optimized to |
| 1134 | do the following | 1134 | do the following: |
| 1135 | - Use automatic overwrite mode in front of whitespace in table fields. | 1135 | - Use automatic overwrite mode in front of whitespace in table fields. |
| 1136 | This make the structure of the table stay in tact as long as the edited | 1136 | This make the structure of the table stay in tact as long as the edited |
| 1137 | field does not exceed the column width. | 1137 | field does not exceed the column width. |
| @@ -1271,7 +1271,7 @@ calls `table-recognize-table'." | |||
| 1271 | calc-display-working-message t | 1271 | calc-display-working-message t |
| 1272 | ) | 1272 | ) |
| 1273 | "List with Calc mode settings for use in calc-eval for table formulas. | 1273 | "List with Calc mode settings for use in calc-eval for table formulas. |
| 1274 | The list must contain alternating symbols (calc modes variables and values. | 1274 | The list must contain alternating symbols (Calc modes variables and values). |
| 1275 | Don't remove any of the default settings, just change the values. Org-mode | 1275 | Don't remove any of the default settings, just change the values. Org-mode |
| 1276 | relies on the variables to be present in the list." | 1276 | relies on the variables to be present in the list." |
| 1277 | :group 'org-table-calculation | 1277 | :group 'org-table-calculation |
| @@ -1320,7 +1320,7 @@ in table calculations, including symbolics etc." | |||
| 1320 | :type 'boolean) | 1320 | :type 'boolean) |
| 1321 | 1321 | ||
| 1322 | (defcustom org-table-allow-automatic-line-recalculation t | 1322 | (defcustom org-table-allow-automatic-line-recalculation t |
| 1323 | "Non-nil means, lines makred with |#| or |*| will be recomputed automatically. | 1323 | "Non-nil means, lines marked with |#| or |*| will be recomputed automatically. |
| 1324 | Automatically means, when TAB or RET or C-c C-c are pressed in the line." | 1324 | Automatically means, when TAB or RET or C-c C-c are pressed in the line." |
| 1325 | :group 'org-table-calculation | 1325 | :group 'org-table-calculation |
| 1326 | :type 'boolean) | 1326 | :type 'boolean) |
| @@ -1357,7 +1357,7 @@ This should have an association in `org-export-language-setup'." | |||
| 1357 | :group 'org-export | 1357 | :group 'org-export |
| 1358 | :type 'string) | 1358 | :type 'string) |
| 1359 | 1359 | ||
| 1360 | (defcustom org-export-html-style | 1360 | (defcustom org-export-html-style |
| 1361 | "<style type=\"text/css\"> | 1361 | "<style type=\"text/css\"> |
| 1362 | html { | 1362 | html { |
| 1363 | font-family: Times, serif; | 1363 | font-family: Times, serif; |
| @@ -1381,13 +1381,13 @@ This should have an association in `org-export-language-setup'." | |||
| 1381 | "The default style specification for exported HTML files. | 1381 | "The default style specification for exported HTML files. |
| 1382 | Since there are different ways of setting style information, this variable | 1382 | Since there are different ways of setting style information, this variable |
| 1383 | needs to contain the full HTML structure to provide a style, including the | 1383 | needs to contain the full HTML structure to provide a style, including the |
| 1384 | surrounding HTML tags. The style specifications should include definiitons | 1384 | surrounding HTML tags. The style specifications should include definitions |
| 1385 | for new classes todo, done, title, and deadline. For example, legal values | 1385 | for new classes todo, done, title, and deadline. For example, legal values |
| 1386 | would be. | 1386 | would be: |
| 1387 | 1387 | ||
| 1388 | <style type=\"text/css\"> | 1388 | <style type=\"text/css\"> |
| 1389 | p {font-weight: normal; color: gray; } | 1389 | p { font-weight: normal; color: gray; } |
| 1390 | h1 {color: black; } | 1390 | h1 { color: black; } |
| 1391 | .title { text-align: center; } | 1391 | .title { text-align: center; } |
| 1392 | .todo, .deadline { color: red; } | 1392 | .todo, .deadline { color: red; } |
| 1393 | .done { color: green; } | 1393 | .done { color: green; } |
| @@ -1483,7 +1483,7 @@ This option can also be set with the +OPTIONS line, e.g. \"@:nil\"." | |||
| 1483 | (defcustom org-export-with-fixed-width t | 1483 | (defcustom org-export-with-fixed-width t |
| 1484 | "Non-nil means, lines starting with \":\" will be in fixed width font. | 1484 | "Non-nil means, lines starting with \":\" will be in fixed width font. |
| 1485 | This can be used to have pre-formatted text, fragments of code etc. For | 1485 | This can be used to have pre-formatted text, fragments of code etc. For |
| 1486 | example | 1486 | example: |
| 1487 | : ;; Some Lisp examples | 1487 | : ;; Some Lisp examples |
| 1488 | : (while (defc cnt) | 1488 | : (while (defc cnt) |
| 1489 | : (ding)) | 1489 | : (ding)) |
| @@ -1553,7 +1553,7 @@ considered as a single item - so grouping with {} is normally not | |||
| 1553 | needed. For example, the following things will be parsed as single | 1553 | needed. For example, the following things will be parsed as single |
| 1554 | sub- or superscripts. | 1554 | sub- or superscripts. |
| 1555 | 1555 | ||
| 1556 | 10^24 or 10^tau several digits will be considered 1 item | 1556 | 10^24 or 10^tau several digits will be considered 1 item. |
| 1557 | 10^-12 or 10^-tau a leading sign with digits or a word | 1557 | 10^-12 or 10^-tau a leading sign with digits or a word |
| 1558 | x^2-y^3 will be read as x^2 - y^3, because items are | 1558 | x^2-y^3 will be read as x^2 - y^3, because items are |
| 1559 | terminated by almost any nonword/nondigit char. | 1559 | terminated by almost any nonword/nondigit char. |
| @@ -1695,7 +1695,7 @@ This file is created with the command \\[org-export-icalendar-all-agenda-files]. | |||
| 1695 | (((class color) (background light)) (:foreground "RosyBrown")) | 1695 | (((class color) (background light)) (:foreground "RosyBrown")) |
| 1696 | (((class color) (background dark)) (:foreground "LightSalmon")) | 1696 | (((class color) (background dark)) (:foreground "LightSalmon")) |
| 1697 | (t (:italic t))) | 1697 | (t (:italic t))) |
| 1698 | "Face used for level 8 headlines." | 1698 | "Face used for special keywords." |
| 1699 | :group 'org-faces) | 1699 | :group 'org-faces) |
| 1700 | 1700 | ||
| 1701 | (defface org-warning ;; font-lock-warning-face | 1701 | (defface org-warning ;; font-lock-warning-face |
| @@ -1757,7 +1757,7 @@ When this is non-nil, the headline after the keyword is set to the | |||
| 1757 | (((class color) (background light)) (:foreground "Firebrick")) | 1757 | (((class color) (background light)) (:foreground "Firebrick")) |
| 1758 | (((class color) (background dark)) (:foreground "chocolate1")) | 1758 | (((class color) (background dark)) (:foreground "chocolate1")) |
| 1759 | (t (:bold t :italic t))) | 1759 | (t (:bold t :italic t))) |
| 1760 | "Face for items scheduled previously, and not yet done." | 1760 | "Face for formulas." |
| 1761 | :group 'org-faces) | 1761 | :group 'org-faces) |
| 1762 | 1762 | ||
| 1763 | (defface org-link | 1763 | (defface org-link |
| @@ -1789,7 +1789,7 @@ When this is non-nil, the headline after the keyword is set to the | |||
| 1789 | (((class color) (background light)) (:foreground "DarkGoldenrod")) | 1789 | (((class color) (background light)) (:foreground "DarkGoldenrod")) |
| 1790 | (((class color) (background dark)) (:foreground "LightGoldenrod")) | 1790 | (((class color) (background dark)) (:foreground "LightGoldenrod")) |
| 1791 | (t (:bold t :italic t))) | 1791 | (t (:bold t :italic t))) |
| 1792 | "Face used for level 2 headlines." | 1792 | "Face used for time grids." |
| 1793 | :group 'org-faces) | 1793 | :group 'org-faces) |
| 1794 | 1794 | ||
| 1795 | (defvar org-level-faces | 1795 | (defvar org-level-faces |
| @@ -1926,7 +1926,8 @@ When this is non-nil, the headline after the keyword is set to the | |||
| 1926 | (defvar org-selected-point) | 1926 | (defvar org-selected-point) |
| 1927 | (defvar calendar-mode-map) | 1927 | (defvar calendar-mode-map) |
| 1928 | (defvar remember-save-after-remembering) | 1928 | (defvar remember-save-after-remembering) |
| 1929 | (defvar remember-data-file)) | 1929 | (defvar remember-data-file) |
| 1930 | (defvar last-arg)) | ||
| 1930 | 1931 | ||
| 1931 | 1932 | ||
| 1932 | ;;; Define the mode | 1933 | ;;; Define the mode |
| @@ -1941,7 +1942,7 @@ When this is non-nil, the headline after the keyword is set to the | |||
| 1941 | ;; We use a before-change function to check if a table might need | 1942 | ;; We use a before-change function to check if a table might need |
| 1942 | ;; an update. | 1943 | ;; an update. |
| 1943 | (defvar org-table-may-need-update t | 1944 | (defvar org-table-may-need-update t |
| 1944 | "Indicates of a table might need an update. | 1945 | "Indicates that a table might need an update. |
| 1945 | This variable is set by `org-before-change-function'. `org-table-align' | 1946 | This variable is set by `org-before-change-function'. `org-table-align' |
| 1946 | sets it back to nil.") | 1947 | sets it back to nil.") |
| 1947 | (defvar org-mode-hook nil) | 1948 | (defvar org-mode-hook nil) |
| @@ -1952,7 +1953,7 @@ sets it back to nil.") | |||
| 1952 | ;;;###autoload | 1953 | ;;;###autoload |
| 1953 | (define-derived-mode org-mode outline-mode "Org" | 1954 | (define-derived-mode org-mode outline-mode "Org" |
| 1954 | "Outline-based notes management and organizer, alias | 1955 | "Outline-based notes management and organizer, alias |
| 1955 | \"Carstens outline-mode for keeping track of everything.\" | 1956 | \"Carsten's outline-mode for keeping track of everything.\" |
| 1956 | 1957 | ||
| 1957 | Org-mode develops organizational tasks around a NOTES file which | 1958 | Org-mode develops organizational tasks around a NOTES file which |
| 1958 | contains information about projects as plain text. Org-mode is | 1959 | contains information about projects as plain text. Org-mode is |
| @@ -2216,9 +2217,9 @@ The following commands are available: | |||
| 2216 | - When point is at the beginning of a headline, rotate the subtree started | 2217 | - When point is at the beginning of a headline, rotate the subtree started |
| 2217 | by this line through 3 different states (local cycling) | 2218 | by this line through 3 different states (local cycling) |
| 2218 | 1. FOLDED: Only the main headline is shown. | 2219 | 1. FOLDED: Only the main headline is shown. |
| 2219 | 2. CHILDREN: The main headline and the direct children are shown. From | 2220 | 2. CHILDREN: The main headline and the direct children are shown. |
| 2220 | this state, you can move to one of the children and | 2221 | From this state, you can move to one of the children |
| 2221 | zoom in further. | 2222 | and zoom in further. |
| 2222 | 3. SUBTREE: Show the entire subtree, including body text. | 2223 | 3. SUBTREE: Show the entire subtree, including body text. |
| 2223 | 2224 | ||
| 2224 | - When there is a numeric prefix, go up to a heading with level ARG, do | 2225 | - When there is a numeric prefix, go up to a heading with level ARG, do |
| @@ -2475,14 +2476,14 @@ or nil." | |||
| 2475 | 2476 | ||
| 2476 | ;; FIXME: It may not be a good idea to temper with the prefix argument... | 2477 | ;; FIXME: It may not be a good idea to temper with the prefix argument... |
| 2477 | (defun org-goto-ret (&optional arg) | 2478 | (defun org-goto-ret (&optional arg) |
| 2478 | "Finish org-goto by going to the new location." | 2479 | "Finish `org-goto' by going to the new location." |
| 2479 | (interactive "P") | 2480 | (interactive "P") |
| 2480 | (setq org-selected-point (point) | 2481 | (setq org-selected-point (point) |
| 2481 | current-prefix-arg arg) | 2482 | current-prefix-arg arg) |
| 2482 | (throw 'exit nil)) | 2483 | (throw 'exit nil)) |
| 2483 | 2484 | ||
| 2484 | (defun org-goto-left () | 2485 | (defun org-goto-left () |
| 2485 | "Finish org-goto by going to the new location." | 2486 | "Finish `org-goto' by going to the new location." |
| 2486 | (interactive) | 2487 | (interactive) |
| 2487 | (if (org-on-heading-p) | 2488 | (if (org-on-heading-p) |
| 2488 | (progn | 2489 | (progn |
| @@ -2493,7 +2494,7 @@ or nil." | |||
| 2493 | (error "Not on a heading"))) | 2494 | (error "Not on a heading"))) |
| 2494 | 2495 | ||
| 2495 | (defun org-goto-right () | 2496 | (defun org-goto-right () |
| 2496 | "Finish org-goto by going to the new location." | 2497 | "Finish `org-goto' by going to the new location." |
| 2497 | (interactive) | 2498 | (interactive) |
| 2498 | (if (org-on-heading-p) | 2499 | (if (org-on-heading-p) |
| 2499 | (progn | 2500 | (progn |
| @@ -2505,7 +2506,7 @@ or nil." | |||
| 2505 | (error "Not on a heading"))) | 2506 | (error "Not on a heading"))) |
| 2506 | 2507 | ||
| 2507 | (defun org-goto-quit () | 2508 | (defun org-goto-quit () |
| 2508 | "Finish org-goto without cursor motion." | 2509 | "Finish `org-goto' without cursor motion." |
| 2509 | (interactive) | 2510 | (interactive) |
| 2510 | (setq org-selected-point nil) | 2511 | (setq org-selected-point nil) |
| 2511 | (throw 'exit nil)) | 2512 | (throw 'exit nil)) |
| @@ -2516,8 +2517,7 @@ or nil." | |||
| 2516 | "To temporarily disable the active region.") | 2517 | "To temporarily disable the active region.") |
| 2517 | 2518 | ||
| 2518 | (defun org-insert-heading (&optional force-heading) | 2519 | (defun org-insert-heading (&optional force-heading) |
| 2519 | "Insert a new heading or item with same depth at point. | 2520 | "Insert a new heading or item with same depth at point." |
| 2520 | If ARG is non-nil" | ||
| 2521 | (interactive "P") | 2521 | (interactive "P") |
| 2522 | (when (or force-heading (not (org-insert-item))) | 2522 | (when (or force-heading (not (org-insert-item))) |
| 2523 | (let* ((head (save-excursion | 2523 | (let* ((head (save-excursion |
| @@ -2877,7 +2877,7 @@ If optional TXT is given, check this string instead of the current kill." | |||
| 2877 | (let ((llt org-plain-list-ordered-item-terminator)) | 2877 | (let ((llt org-plain-list-ordered-item-terminator)) |
| 2878 | (save-excursion | 2878 | (save-excursion |
| 2879 | (goto-char (point-at-bol)) | 2879 | (goto-char (point-at-bol)) |
| 2880 | (looking-at | 2880 | (looking-at |
| 2881 | (cond | 2881 | (cond |
| 2882 | ((eq llt t) "\\([ \t]*\\([-+]\\|\\([0-9]+[.)]\\)\\)\\|[ \t]+\\*\\)\\( \\|$\\)") | 2882 | ((eq llt t) "\\([ \t]*\\([-+]\\|\\([0-9]+[.)]\\)\\)\\|[ \t]+\\*\\)\\( \\|$\\)") |
| 2883 | ((= llt ?.) "\\([ \t]*\\([-+]\\|\\([0-9]+\\.\\)\\)\\|[ \t]+\\*\\)\\( \\|$\\)") | 2883 | ((= llt ?.) "\\([ \t]*\\([-+]\\|\\([0-9]+\\.\\)\\)\\|[ \t]+\\*\\)\\( \\|$\\)") |
| @@ -2885,7 +2885,7 @@ If optional TXT is given, check this string instead of the current kill." | |||
| 2885 | (t (error "Invalid value of `org-plain-list-ordered-item-terminator'"))))))) | 2885 | (t (error "Invalid value of `org-plain-list-ordered-item-terminator'"))))))) |
| 2886 | 2886 | ||
| 2887 | (defun org-get-indentation () | 2887 | (defun org-get-indentation () |
| 2888 | "Get the indentation of the current line, ionterpreting tabs." | 2888 | "Get the indentation of the current line, interpreting tabs." |
| 2889 | (save-excursion | 2889 | (save-excursion |
| 2890 | (beginning-of-line 1) | 2890 | (beginning-of-line 1) |
| 2891 | (skip-chars-forward " \t") | 2891 | (skip-chars-forward " \t") |
| @@ -2895,7 +2895,7 @@ If optional TXT is given, check this string instead of the current kill." | |||
| 2895 | "Go to the beginning of the current hand-formatted item. | 2895 | "Go to the beginning of the current hand-formatted item. |
| 2896 | If the cursor is not in an item, throw an error." | 2896 | If the cursor is not in an item, throw an error." |
| 2897 | (let ((pos (point)) | 2897 | (let ((pos (point)) |
| 2898 | (limit (save-excursion (org-back-to-heading) | 2898 | (limit (save-excursion (org-back-to-heading) |
| 2899 | (beginning-of-line 2) (point))) | 2899 | (beginning-of-line 2) (point))) |
| 2900 | ind ind1) | 2900 | ind ind1) |
| 2901 | (if (org-at-item-p) | 2901 | (if (org-at-item-p) |
| @@ -2917,7 +2917,7 @@ If the cursor is not in an item, throw an error." | |||
| 2917 | (error "Not in an item"))))) | 2917 | (error "Not in an item"))))) |
| 2918 | 2918 | ||
| 2919 | (defun org-end-of-item () | 2919 | (defun org-end-of-item () |
| 2920 | "Go to the beginning of the current hand-formatted item. | 2920 | "Go to the end of the current hand-formatted item. |
| 2921 | If the cursor is not in an item, throw an error." | 2921 | If the cursor is not in an item, throw an error." |
| 2922 | (let ((pos (point)) | 2922 | (let ((pos (point)) |
| 2923 | (limit (save-excursion (outline-next-heading) (point))) | 2923 | (limit (save-excursion (outline-next-heading) (point))) |
| @@ -2937,10 +2937,10 @@ If the cursor is not in an item, throw an error." | |||
| 2937 | (beginning-of-line 1) | 2937 | (beginning-of-line 1) |
| 2938 | (goto-char pos) | 2938 | (goto-char pos) |
| 2939 | (error "Not in an item")))) | 2939 | (error "Not in an item")))) |
| 2940 | 2940 | ||
| 2941 | (defun org-move-item-down (arg) | 2941 | (defun org-move-item-down (arg) |
| 2942 | "Move the plain list item at point down, i.e. swap with following item. | 2942 | "Move the plain list item at point down, i.e. swap with following item. |
| 2943 | Subitems (items with larger indentation are considered part of the item, | 2943 | Subitems (items with larger indentation) are considered part of the item, |
| 2944 | so this really moves item trees." | 2944 | so this really moves item trees." |
| 2945 | (interactive "p") | 2945 | (interactive "p") |
| 2946 | (let (beg end ind ind1 (pos (point)) txt) | 2946 | (let (beg end ind ind1 (pos (point)) txt) |
| @@ -2962,10 +2962,10 @@ so this really moves item trees." | |||
| 2962 | (org-maybe-renumber-ordered-list)) | 2962 | (org-maybe-renumber-ordered-list)) |
| 2963 | (goto-char pos) | 2963 | (goto-char pos) |
| 2964 | (error "Cannot move this item further down")))) | 2964 | (error "Cannot move this item further down")))) |
| 2965 | 2965 | ||
| 2966 | (defun org-move-item-up (arg) | 2966 | (defun org-move-item-up (arg) |
| 2967 | "Move the plain list item at point up, i.e. swap with previous item. | 2967 | "Move the plain list item at point up, i.e. swap with previous item. |
| 2968 | Subitems (items with larger indentation are considered part of the item, | 2968 | Subitems (items with larger indentation) are considered part of the item, |
| 2969 | so this really moves item trees." | 2969 | so this really moves item trees." |
| 2970 | (interactive "p") | 2970 | (interactive "p") |
| 2971 | (let (beg end ind ind1 (pos (point)) txt) | 2971 | (let (beg end ind ind1 (pos (point)) txt) |
| @@ -2998,7 +2998,7 @@ so this really moves item trees." | |||
| 2998 | (org-maybe-renumber-ordered-list)) | 2998 | (org-maybe-renumber-ordered-list)) |
| 2999 | (goto-char pos) | 2999 | (goto-char pos) |
| 3000 | (error "Cannot move this item further up")))) | 3000 | (error "Cannot move this item further up")))) |
| 3001 | 3001 | ||
| 3002 | (defun org-maybe-renumber-ordered-list () | 3002 | (defun org-maybe-renumber-ordered-list () |
| 3003 | "Renumber the ordered list at point if setup allows it. | 3003 | "Renumber the ordered list at point if setup allows it. |
| 3004 | This tests the user option `org-auto-renumber-ordered-lists' before | 3004 | This tests the user option `org-auto-renumber-ordered-lists' before |
| @@ -3021,7 +3021,7 @@ doing the renumbering." | |||
| 3021 | 3021 | ||
| 3022 | (defun org-renumber-ordered-list (arg) | 3022 | (defun org-renumber-ordered-list (arg) |
| 3023 | "Renumber an ordered plain list. | 3023 | "Renumber an ordered plain list. |
| 3024 | Cursor neext to be in the first line of an item, the line that starts | 3024 | Cursor next to be in the first line of an item, the line that starts |
| 3025 | with something like \"1.\" or \"2)\"." | 3025 | with something like \"1.\" or \"2)\"." |
| 3026 | (interactive "p") | 3026 | (interactive "p") |
| 3027 | (unless (and (org-at-item-p) | 3027 | (unless (and (org-at-item-p) |
| @@ -3309,13 +3309,13 @@ like | |||
| 3309 | *** TODO Write paper | 3309 | *** TODO Write paper |
| 3310 | *** DONE Call mom | 3310 | *** DONE Call mom |
| 3311 | 3311 | ||
| 3312 | The different keywords are specified in the variable `org-todo-keywords'. By | 3312 | The different keywords are specified in the variable `org-todo-keywords'. |
| 3313 | default the available states are \"TODO\" and \"DONE\". | 3313 | By default the available states are \"TODO\" and \"DONE\". |
| 3314 | So for this example: when the item starts with TODO, it is changed to DONE. | 3314 | So for this example: when the item starts with TODO, it is changed to DONE. |
| 3315 | When it starts with DONE, the DONE is removed. And when neither TODO nor | 3315 | When it starts with DONE, the DONE is removed. And when neither TODO nor |
| 3316 | DONE are present, add TODO at the beginning of the heading. | 3316 | DONE are present, add TODO at the beginning of the heading. |
| 3317 | 3317 | ||
| 3318 | With prefix arg, use completion to determined the new state. With numeric | 3318 | With prefix arg, use completion to determine the new state. With numeric |
| 3319 | prefix arg, switch to that state." | 3319 | prefix arg, switch to that state." |
| 3320 | (interactive "P") | 3320 | (interactive "P") |
| 3321 | (save-excursion | 3321 | (save-excursion |
| @@ -3381,7 +3381,7 @@ prefix arg, switch to that state." | |||
| 3381 | 3381 | ||
| 3382 | (defun org-log-done (&optional undone) | 3382 | (defun org-log-done (&optional undone) |
| 3383 | "Add a time stamp logging that a TODO entry has been closed. | 3383 | "Add a time stamp logging that a TODO entry has been closed. |
| 3384 | When UNDONE is non-nil, remove such a time stamg again." | 3384 | When UNDONE is non-nil, remove such a time stamp again." |
| 3385 | (interactive) | 3385 | (interactive) |
| 3386 | (let (beg end col) | 3386 | (let (beg end col) |
| 3387 | (save-excursion | 3387 | (save-excursion |
| @@ -3394,7 +3394,7 @@ When UNDONE is non-nil, remove such a time stamg again." | |||
| 3394 | (setq end (point)) | 3394 | (setq end (point)) |
| 3395 | (goto-char beg) | 3395 | (goto-char beg) |
| 3396 | (when (re-search-forward (concat | 3396 | (when (re-search-forward (concat |
| 3397 | "[\r\n]\\([ \t]*" | 3397 | "[\r\n]\\([ \t]*" |
| 3398 | (regexp-quote org-closed-string) | 3398 | (regexp-quote org-closed-string) |
| 3399 | " *\\[.*?\\][^\n\r]*[\n\r]?\\)") end t) | 3399 | " *\\[.*?\\][^\n\r]*[\n\r]?\\)") end t) |
| 3400 | (delete-region (match-beginning 1) (match-end 1))) | 3400 | (delete-region (match-beginning 1) (match-end 1))) |
| @@ -3405,12 +3405,12 @@ When UNDONE is non-nil, remove such a time stamg again." | |||
| 3405 | (when (not (member (char-before) '(?\r ?\n))) | 3405 | (when (not (member (char-before) '(?\r ?\n))) |
| 3406 | (insert "\n")) | 3406 | (insert "\n")) |
| 3407 | (indent-to col) | 3407 | (indent-to col) |
| 3408 | (insert org-closed-string " " | 3408 | (insert org-closed-string " " |
| 3409 | (format-time-string | 3409 | (format-time-string |
| 3410 | (concat "[" (substring (cdr org-time-stamp-formats) 1 -1) "]") | 3410 | (concat "[" (substring (cdr org-time-stamp-formats) 1 -1) "]") |
| 3411 | (current-time)) | 3411 | (current-time)) |
| 3412 | "\n"))))) | 3412 | "\n"))))) |
| 3413 | 3413 | ||
| 3414 | (defun org-show-todo-tree (arg) | 3414 | (defun org-show-todo-tree (arg) |
| 3415 | "Make a compact tree which shows all headlines marked with TODO. | 3415 | "Make a compact tree which shows all headlines marked with TODO. |
| 3416 | The tree will show the lines where the regexp matches, and all higher | 3416 | The tree will show the lines where the regexp matches, and all higher |
| @@ -3460,7 +3460,7 @@ to modify it to the correct date." | |||
| 3460 | The tree will show the lines where the regexp matches, and all higher | 3460 | The tree will show the lines where the regexp matches, and all higher |
| 3461 | headlines above the match. It will also show the heading after the match, | 3461 | headlines above the match. It will also show the heading after the match, |
| 3462 | to make sure editing the matching entry is easy. | 3462 | to make sure editing the matching entry is easy. |
| 3463 | if CALLBACK is non-nil, it is a function which is called to confirm | 3463 | If CALLBACK is non-nil, it is a function which is called to confirm |
| 3464 | that the match should indeed be shown." | 3464 | that the match should indeed be shown." |
| 3465 | (interactive "sRegexp: ") | 3465 | (interactive "sRegexp: ") |
| 3466 | (org-remove-occur-highlights nil nil t) | 3466 | (org-remove-occur-highlights nil nil t) |
| @@ -3506,7 +3506,7 @@ that the match should indeed be shown." | |||
| 3506 | (if org-xemacs-p (make-extent beg end buffer) (make-overlay beg end buffer))) | 3506 | (if org-xemacs-p (make-extent beg end buffer) (make-overlay beg end buffer))) |
| 3507 | (defun org-delete-overlay (ovl) | 3507 | (defun org-delete-overlay (ovl) |
| 3508 | (if org-xemacs-p (delete-extent ovl) (delete-overlay ovl))) | 3508 | (if org-xemacs-p (delete-extent ovl) (delete-overlay ovl))) |
| 3509 | (defun org-detatch-overlay (ovl) | 3509 | (defun org-detatch-overlay (ovl) |
| 3510 | (if org-xemacs-p (detach-extent ovl) (delete-overlay ovl))) | 3510 | (if org-xemacs-p (detach-extent ovl) (delete-overlay ovl))) |
| 3511 | (defun org-move-overlay (ovl beg end &optional buffer) | 3511 | (defun org-move-overlay (ovl beg end &optional buffer) |
| 3512 | (if org-xemacs-p | 3512 | (if org-xemacs-p |
| @@ -3527,14 +3527,14 @@ that the match should indeed be shown." | |||
| 3527 | (defun org-remove-occur-highlights (&optional beg end noremove) | 3527 | (defun org-remove-occur-highlights (&optional beg end noremove) |
| 3528 | "Remove the occur highlights from the buffer. | 3528 | "Remove the occur highlights from the buffer. |
| 3529 | BEG and END are ignored. If NOREMOVE is nil, remove this function | 3529 | BEG and END are ignored. If NOREMOVE is nil, remove this function |
| 3530 | from the before-change-functions in the current buffer." | 3530 | from the `before-change-functions' in the current buffer." |
| 3531 | (interactive) | 3531 | (interactive) |
| 3532 | (mapc 'org-delete-overlay org-occur-highlights) | 3532 | (mapc 'org-delete-overlay org-occur-highlights) |
| 3533 | (setq org-occur-highlights nil) | 3533 | (setq org-occur-highlights nil) |
| 3534 | (unless noremove | 3534 | (unless noremove |
| 3535 | (remove-hook 'before-change-functions | 3535 | (remove-hook 'before-change-functions |
| 3536 | 'org-remove-occur-highlights 'local))) | 3536 | 'org-remove-occur-highlights 'local))) |
| 3537 | 3537 | ||
| 3538 | ;;; Priorities | 3538 | ;;; Priorities |
| 3539 | 3539 | ||
| 3540 | (defvar org-priority-regexp ".*?\\(\\[#\\([A-Z]\\)\\] ?\\)" | 3540 | (defvar org-priority-regexp ".*?\\(\\[#\\([A-Z]\\)\\] ?\\)" |
| @@ -3673,7 +3673,7 @@ So these are more for recording a certain time/date." | |||
| 3673 | "Read a date and make things smooth for the user. | 3673 | "Read a date and make things smooth for the user. |
| 3674 | The prompt will suggest to enter an ISO date, but you can also enter anything | 3674 | The prompt will suggest to enter an ISO date, but you can also enter anything |
| 3675 | which will at least partially be understood by `parse-time-string'. | 3675 | which will at least partially be understood by `parse-time-string'. |
| 3676 | Unrecognized parts of the date will default to the current day, month ,year, | 3676 | Unrecognized parts of the date will default to the current day, month, year, |
| 3677 | hour and minute. For example, | 3677 | hour and minute. For example, |
| 3678 | 3-2-5 --> 2003-02-05 | 3678 | 3-2-5 --> 2003-02-05 |
| 3679 | feb 15 --> currentyear-02-15 | 3679 | feb 15 --> currentyear-02-15 |
| @@ -3688,9 +3688,9 @@ but this can be configured with the variables `parse-time-months' and | |||
| 3688 | 3688 | ||
| 3689 | While prompting, a calendar is popped up - you can also select the | 3689 | While prompting, a calendar is popped up - you can also select the |
| 3690 | date with the mouse (button 1). The calendar shows a period of three | 3690 | date with the mouse (button 1). The calendar shows a period of three |
| 3691 | month. To scroll it to other months, use the keys `>' and `<'. | 3691 | months. To scroll it to other months, use the keys `>' and `<'. |
| 3692 | If you don't like the calendar, turn it off with | 3692 | If you don't like the calendar, turn it off with |
| 3693 | \(setq org-popup-calendar-for-date-prompt nil). | 3693 | \(setq org-popup-calendar-for-date-prompt nil) |
| 3694 | 3694 | ||
| 3695 | With optional argument TO-TIME, the date will immediately be converted | 3695 | With optional argument TO-TIME, the date will immediately be converted |
| 3696 | to an internal time. | 3696 | to an internal time. |
| @@ -4080,7 +4080,7 @@ in the timestamp determines what will be changed." | |||
| 4080 | (defun org-goto-calendar (&optional arg) | 4080 | (defun org-goto-calendar (&optional arg) |
| 4081 | "Go to the Emacs calendar at the current date. | 4081 | "Go to the Emacs calendar at the current date. |
| 4082 | If there is a time stamp in the current line, go to that date. | 4082 | If there is a time stamp in the current line, go to that date. |
| 4083 | A prefix ARG can be used force the current date." | 4083 | A prefix ARG can be used to force the current date." |
| 4084 | (interactive "P") | 4084 | (interactive "P") |
| 4085 | (let ((tsr org-ts-regexp) diff | 4085 | (let ((tsr org-ts-regexp) diff |
| 4086 | (calendar-move-hook nil) | 4086 | (calendar-move-hook nil) |
| @@ -4288,10 +4288,10 @@ on to the selected command. The default selections are: | |||
| 4288 | a Call `org-agenda' to display the agenda for the current day or week. | 4288 | a Call `org-agenda' to display the agenda for the current day or week. |
| 4289 | t Call `org-todo-list' to display the global todo list. | 4289 | t Call `org-todo-list' to display the global todo list. |
| 4290 | T Call `org-todo-list' to display the global todo list, select only | 4290 | T Call `org-todo-list' to display the global todo list, select only |
| 4291 | entries with a specific TODO keyword (the user get a prompt). | 4291 | entries with a specific TODO keyword (the user gets a prompt). |
| 4292 | m Call `org-tags-view' to display headlines with tags matching | 4292 | m Call `org-tags-view' to display headlines with tags matching |
| 4293 | a condition (the user is prompted for the condition). | 4293 | a condition (the user is prompted for the condition). |
| 4294 | M like `m', but select only TODO entries, no ordinary headlines. | 4294 | M Like `m', but select only TODO entries, no ordinary headlines. |
| 4295 | 4295 | ||
| 4296 | More commands can be added by configuring the variable | 4296 | More commands can be added by configuring the variable |
| 4297 | `org-agenda-custom-commands'. In particular, specific tags and TODO keyword | 4297 | `org-agenda-custom-commands'. In particular, specific tags and TODO keyword |
| @@ -4315,7 +4315,7 @@ next use of \\[org-agenda]) restricted to the current file." | |||
| 4315 | -------------------------------- | 4315 | -------------------------------- |
| 4316 | a Agenda for current week or day | 4316 | a Agenda for current week or day |
| 4317 | t List of all TODO entries T Entries with special TODO kwd | 4317 | t List of all TODO entries T Entries with special TODO kwd |
| 4318 | m Match a TAGS query M Like m, but only TODO entries. | 4318 | m Match a TAGS query M Like m, but only TODO entries |
| 4319 | C Configure your own agenda commands") | 4319 | C Configure your own agenda commands") |
| 4320 | (while (setq entry (pop custom)) | 4320 | (while (setq entry (pop custom)) |
| 4321 | (setq key (car entry) type (nth 1 entry) string (nth 2 entry)) | 4321 | (setq key (car entry) type (nth 1 entry) string (nth 2 entry)) |
| @@ -4611,10 +4611,10 @@ NDAYS defaults to `org-agenda-ndays'." | |||
| 4611 | (catch 'nextfile | 4611 | (catch 'nextfile |
| 4612 | (org-check-agenda-file file) | 4612 | (org-check-agenda-file file) |
| 4613 | (if org-agenda-show-log | 4613 | (if org-agenda-show-log |
| 4614 | (setq rtn (org-agenda-get-day-entries | 4614 | (setq rtn (org-agenda-get-day-entries |
| 4615 | file date | 4615 | file date |
| 4616 | :deadline :scheduled :timestamp :closed)) | 4616 | :deadline :scheduled :timestamp :closed)) |
| 4617 | (setq rtn (org-agenda-get-day-entries | 4617 | (setq rtn (org-agenda-get-day-entries |
| 4618 | file date | 4618 | file date |
| 4619 | :deadline :scheduled :timestamp))) | 4619 | :deadline :scheduled :timestamp))) |
| 4620 | (setq rtnall (append rtnall rtn)))) | 4620 | (setq rtnall (append rtnall rtn)))) |
| @@ -4813,7 +4813,7 @@ With prefix ARG, go back that many times `org-agenda-ndays'." | |||
| 4813 | (message "Switched to week view")) | 4813 | (message "Switched to week view")) |
| 4814 | 4814 | ||
| 4815 | (defun org-agenda-day-view () | 4815 | (defun org-agenda-day-view () |
| 4816 | "Switch to weekly view for agenda." | 4816 | "Switch to daily view for agenda." |
| 4817 | (interactive) | 4817 | (interactive) |
| 4818 | (org-agenda-check-type t 'agenda) | 4818 | (org-agenda-check-type t 'agenda) |
| 4819 | (setq org-agenda-ndays 1) | 4819 | (setq org-agenda-ndays 1) |
| @@ -4837,7 +4837,7 @@ With prefix ARG, go back that many times `org-agenda-ndays'." | |||
| 4837 | (goto-char (match-beginning 0))) | 4837 | (goto-char (match-beginning 0))) |
| 4838 | 4838 | ||
| 4839 | (defun org-agenda-previous-date-line (&optional arg) | 4839 | (defun org-agenda-previous-date-line (&optional arg) |
| 4840 | "Jump to the next line indicating a date in agenda buffer." | 4840 | "Jump to the previous line indicating a date in agenda buffer." |
| 4841 | (interactive "p") | 4841 | (interactive "p") |
| 4842 | (org-agenda-check-type t 'agenda 'timeline) | 4842 | (org-agenda-check-type t 'agenda 'timeline) |
| 4843 | (beginning-of-line 1) | 4843 | (beginning-of-line 1) |
| @@ -4867,7 +4867,7 @@ With prefix ARG, go back that many times `org-agenda-ndays'." | |||
| 4867 | (if org-agenda-follow-mode "on" "off"))) | 4867 | (if org-agenda-follow-mode "on" "off"))) |
| 4868 | 4868 | ||
| 4869 | (defun org-agenda-log-mode () | 4869 | (defun org-agenda-log-mode () |
| 4870 | "Toggle follow mode in an agenda buffer." | 4870 | "Toggle log mode in an agenda buffer." |
| 4871 | (interactive) | 4871 | (interactive) |
| 4872 | (org-agenda-check-type t 'agenda 'timeline) | 4872 | (org-agenda-check-type t 'agenda 'timeline) |
| 4873 | (setq org-agenda-show-log (not org-agenda-show-log)) | 4873 | (setq org-agenda-show-log (not org-agenda-show-log)) |
| @@ -4877,7 +4877,7 @@ With prefix ARG, go back that many times `org-agenda-ndays'." | |||
| 4877 | (if org-agenda-show-log "on" "off"))) | 4877 | (if org-agenda-show-log "on" "off"))) |
| 4878 | 4878 | ||
| 4879 | (defun org-agenda-toggle-diary () | 4879 | (defun org-agenda-toggle-diary () |
| 4880 | "Toggle follow mode in an agenda buffer." | 4880 | "Toggle diary inclusion in an agenda buffer." |
| 4881 | (interactive) | 4881 | (interactive) |
| 4882 | (org-agenda-check-type t 'agenda) | 4882 | (org-agenda-check-type t 'agenda) |
| 4883 | (setq org-agenda-include-diary (not org-agenda-include-diary)) | 4883 | (setq org-agenda-include-diary (not org-agenda-include-diary)) |
| @@ -4887,7 +4887,7 @@ With prefix ARG, go back that many times `org-agenda-ndays'." | |||
| 4887 | (if org-agenda-include-diary "on" "off"))) | 4887 | (if org-agenda-include-diary "on" "off"))) |
| 4888 | 4888 | ||
| 4889 | (defun org-agenda-toggle-time-grid () | 4889 | (defun org-agenda-toggle-time-grid () |
| 4890 | "Toggle follow mode in an agenda buffer." | 4890 | "Toggle time grid in an agenda buffer." |
| 4891 | (interactive) | 4891 | (interactive) |
| 4892 | (org-agenda-check-type t 'agenda) | 4892 | (org-agenda-check-type t 'agenda) |
| 4893 | (setq org-agenda-use-time-grid (not org-agenda-use-time-grid)) | 4893 | (setq org-agenda-use-time-grid (not org-agenda-use-time-grid)) |
| @@ -4959,10 +4959,10 @@ With prefix ARG, go back that many times `org-agenda-ndays'." | |||
| 4959 | entries))))) | 4959 | entries))))) |
| 4960 | 4960 | ||
| 4961 | (defun org-agenda-cleanup-fancy-diary () | 4961 | (defun org-agenda-cleanup-fancy-diary () |
| 4962 | "Remove unwanted stuff in buffer created by fancy-diary-display. | 4962 | "Remove unwanted stuff in buffer created by `fancy-diary-display'. |
| 4963 | This gets rid of the date, the underline under the date, and | 4963 | This gets rid of the date, the underline under the date, and |
| 4964 | the dummy entry installed by `org-mode' to ensure non-empty diary for each | 4964 | the dummy entry installed by `org-mode' to ensure non-empty diary for each |
| 4965 | date. Itt also removes lines that contain only whitespace." | 4965 | date. It also removes lines that contain only whitespace." |
| 4966 | (goto-char (point-min)) | 4966 | (goto-char (point-min)) |
| 4967 | (if (looking-at ".*?:[ \t]*") | 4967 | (if (looking-at ".*?:[ \t]*") |
| 4968 | (progn | 4968 | (progn |
| @@ -5035,8 +5035,8 @@ If the current buffer does not, find the first agenda file." | |||
| 5035 | (find-file (car org-agenda-files))))) | 5035 | (find-file (car org-agenda-files))))) |
| 5036 | 5036 | ||
| 5037 | (defun org-agenda-file-to-end (&optional file) | 5037 | (defun org-agenda-file-to-end (&optional file) |
| 5038 | "Move/add the current file to the end of the agenda fiole list. | 5038 | "Move/add the current file to the end of the agenda file list. |
| 5039 | I the file is not present in the list, it is appended ot the list. If it is | 5039 | If the file is not present in the list, it is appended to the list. If it is |
| 5040 | present, it is moved there." | 5040 | present, it is moved there." |
| 5041 | (interactive) | 5041 | (interactive) |
| 5042 | (org-agenda-file-to-front 'to-end file)) | 5042 | (org-agenda-file-to-front 'to-end file)) |
| @@ -5315,7 +5315,7 @@ the tags of the current headline come last." | |||
| 5315 | 'help-echo | 5315 | 'help-echo |
| 5316 | (format "mouse-2 or RET jump to org file %s" | 5316 | (format "mouse-2 or RET jump to org file %s" |
| 5317 | (abbreviate-file-name (buffer-file-name))))) | 5317 | (abbreviate-file-name (buffer-file-name))))) |
| 5318 | (regexp (concat "[\n\r]\\*+ *\\(" | 5318 | (regexp (concat "[\n\r]\\*+ *\\(" |
| 5319 | (if org-select-this-todo-keyword | 5319 | (if org-select-this-todo-keyword |
| 5320 | (concat "\\<\\(" org-select-this-todo-keyword | 5320 | (concat "\\<\\(" org-select-this-todo-keyword |
| 5321 | "\\)\\>") | 5321 | "\\)\\>") |
| @@ -5347,7 +5347,7 @@ the tags of the current headline come last." | |||
| 5347 | (nreverse ee))) | 5347 | (nreverse ee))) |
| 5348 | 5348 | ||
| 5349 | (defconst org-agenda-no-heading-message | 5349 | (defconst org-agenda-no-heading-message |
| 5350 | "No heading for this item in buffer or region") | 5350 | "No heading for this item in buffer or region.") |
| 5351 | 5351 | ||
| 5352 | (defun org-agenda-get-timestamps () | 5352 | (defun org-agenda-get-timestamps () |
| 5353 | "Return the date stamp information for agenda display." | 5353 | "Return the date stamp information for agenda display." |
| @@ -5428,7 +5428,7 @@ the tags of the current headline come last." | |||
| 5428 | (nreverse ee))) | 5428 | (nreverse ee))) |
| 5429 | 5429 | ||
| 5430 | (defun org-agenda-get-closed () | 5430 | (defun org-agenda-get-closed () |
| 5431 | "Return the loggedd TODO entries for agenda display." | 5431 | "Return the logged TODO entries for agenda display." |
| 5432 | (let* ((props (list 'mouse-face 'highlight | 5432 | (let* ((props (list 'mouse-face 'highlight |
| 5433 | 'keymap org-agenda-keymap | 5433 | 'keymap org-agenda-keymap |
| 5434 | 'help-echo | 5434 | 'help-echo |
| @@ -5579,7 +5579,7 @@ the tags of the current headline come last." | |||
| 5579 | (if (string-match org-looking-at-done-regexp head) | 5579 | (if (string-match org-looking-at-done-regexp head) |
| 5580 | (setq txt nil) | 5580 | (setq txt nil) |
| 5581 | (setq txt (org-format-agenda-item | 5581 | (setq txt (org-format-agenda-item |
| 5582 | (format "Sched.%2dx: " (- 1 diff)) head | 5582 | (format "Sched.%2dx: " (- 1 diff)) head |
| 5583 | category tags)))) | 5583 | category tags)))) |
| 5584 | (setq txt org-agenda-no-heading-message)) | 5584 | (setq txt org-agenda-no-heading-message)) |
| 5585 | (when txt | 5585 | (when txt |
| @@ -5680,14 +5680,14 @@ The flag is set if the currently compiled format contains a `%T'.") | |||
| 5680 | "Format TXT to be inserted into the agenda buffer. | 5680 | "Format TXT to be inserted into the agenda buffer. |
| 5681 | In particular, it adds the prefix and corresponding text properties. EXTRA | 5681 | In particular, it adds the prefix and corresponding text properties. EXTRA |
| 5682 | must be a string and replaces the `%s' specifier in the prefix format. | 5682 | must be a string and replaces the `%s' specifier in the prefix format. |
| 5683 | CATEGORY (string, symbol or nil) may be used to overule the default | 5683 | CATEGORY (string, symbol or nil) may be used to overrule the default |
| 5684 | category taken from local variable or file name. It will replace the `%c' | 5684 | category taken from local variable or file name. It will replace the `%c' |
| 5685 | specifier in the format. DOTIME, when non-nil, indicates that a | 5685 | specifier in the format. DOTIME, when non-nil, indicates that a |
| 5686 | time-of-day should be extracted from TXT for sorting of this entry, and for | 5686 | time-of-day should be extracted from TXT for sorting of this entry, and for |
| 5687 | the `%t' specifier in the format. When DOTIME is a string, this string is | 5687 | the `%t' specifier in the format. When DOTIME is a string, this string is |
| 5688 | searched for a time before TXT is. NOPREFIX is a flag and indicates that | 5688 | searched for a time before TXT is. NOPREFIX is a flag and indicates that |
| 5689 | only the correctly processes TXT should be returned - this is used by | 5689 | only the correctly processes TXT should be returned - this is used by |
| 5690 | `org-agenda-change-all-lines'. TAG can be the tag of the headline." | 5690 | `org-agenda-change-all-lines'. TAG can be the tag of the headline." |
| 5691 | (save-match-data | 5691 | (save-match-data |
| 5692 | ;; Diary entries sometimes have extra whitespace at the beginning | 5692 | ;; Diary entries sometimes have extra whitespace at the beginning |
| 5693 | (if (string-match "^ +" txt) (setq txt (replace-match "" nil nil txt))) | 5693 | (if (string-match "^ +" txt) (setq txt (replace-match "" nil nil txt))) |
| @@ -5841,7 +5841,7 @@ HH:MM." | |||
| 5841 | (mapconcat 'identity (sort list 'org-entries-lessp) "\n")) | 5841 | (mapconcat 'identity (sort list 'org-entries-lessp) "\n")) |
| 5842 | 5842 | ||
| 5843 | (defsubst org-cmp-priority (a b) | 5843 | (defsubst org-cmp-priority (a b) |
| 5844 | "Compare the priorities of string a and b." | 5844 | "Compare the priorities of string A and B." |
| 5845 | (let ((pa (or (get-text-property 1 'priority a) 0)) | 5845 | (let ((pa (or (get-text-property 1 'priority a) 0)) |
| 5846 | (pb (or (get-text-property 1 'priority b) 0))) | 5846 | (pb (or (get-text-property 1 'priority b) 0))) |
| 5847 | (cond ((> pa pb) +1) | 5847 | (cond ((> pa pb) +1) |
| @@ -5849,7 +5849,7 @@ HH:MM." | |||
| 5849 | (t nil)))) | 5849 | (t nil)))) |
| 5850 | 5850 | ||
| 5851 | (defsubst org-cmp-category (a b) | 5851 | (defsubst org-cmp-category (a b) |
| 5852 | "Compare the string values of categories of strings a and b." | 5852 | "Compare the string values of categories of strings A and B." |
| 5853 | (let ((ca (or (get-text-property 1 'category a) "")) | 5853 | (let ((ca (or (get-text-property 1 'category a) "")) |
| 5854 | (cb (or (get-text-property 1 'category b) ""))) | 5854 | (cb (or (get-text-property 1 'category b) ""))) |
| 5855 | (cond ((string-lessp ca cb) -1) | 5855 | (cond ((string-lessp ca cb) -1) |
| @@ -5857,7 +5857,7 @@ HH:MM." | |||
| 5857 | (t nil)))) | 5857 | (t nil)))) |
| 5858 | 5858 | ||
| 5859 | (defsubst org-cmp-time (a b) | 5859 | (defsubst org-cmp-time (a b) |
| 5860 | "Compare the time-of-day values of strings a and b." | 5860 | "Compare the time-of-day values of strings A and B." |
| 5861 | (let* ((def (if org-sort-agenda-notime-is-late 2401 -1)) | 5861 | (let* ((def (if org-sort-agenda-notime-is-late 2401 -1)) |
| 5862 | (ta (or (get-text-property 1 'time-of-day a) def)) | 5862 | (ta (or (get-text-property 1 'time-of-day a) def)) |
| 5863 | (tb (or (get-text-property 1 'time-of-day b) def))) | 5863 | (tb (or (get-text-property 1 'time-of-day b) def))) |
| @@ -6001,7 +6001,7 @@ the same tree node, and the headline of the tree node in the Org-mode file." | |||
| 6001 | (move-to-column col))) | 6001 | (move-to-column col))) |
| 6002 | 6002 | ||
| 6003 | (defun org-agenda-change-all-lines (newhead hdmarker &optional fixface) | 6003 | (defun org-agenda-change-all-lines (newhead hdmarker &optional fixface) |
| 6004 | "Change all lines in the agenda buffer which match hdmarker. | 6004 | "Change all lines in the agenda buffer which match HDMARKER. |
| 6005 | The new content of the line will be NEWHEAD (as modified by | 6005 | The new content of the line will be NEWHEAD (as modified by |
| 6006 | `org-format-agenda-item'). HDMARKER is checked with | 6006 | `org-format-agenda-item'). HDMARKER is checked with |
| 6007 | `equal' against all `org-hd-marker' text properties in the file. | 6007 | `equal' against all `org-hd-marker' text properties in the file. |
| @@ -6153,7 +6153,7 @@ be used to request time specification in the time stamp." | |||
| 6153 | 6153 | ||
| 6154 | (defun org-agenda-diary-entry () | 6154 | (defun org-agenda-diary-entry () |
| 6155 | "Make a diary entry, like the `i' command from the calendar. | 6155 | "Make a diary entry, like the `i' command from the calendar. |
| 6156 | All the standard commands work: block, weekly etc" | 6156 | All the standard commands work: block, weekly etc." |
| 6157 | (interactive) | 6157 | (interactive) |
| 6158 | (org-agenda-check-type t 'agenda 'timeline) | 6158 | (org-agenda-check-type t 'agenda 'timeline) |
| 6159 | (require 'diary-lib) | 6159 | (require 'diary-lib) |
| @@ -6292,8 +6292,8 @@ This is a command that has to be installed in `calendar-mode-map'." | |||
| 6292 | "Scan headline tags with inheritance and produce output ACTION. | 6292 | "Scan headline tags with inheritance and produce output ACTION. |
| 6293 | ACTION can be `sparse-tree' or `agenda'. MATCHER is a Lisp form to be | 6293 | ACTION can be `sparse-tree' or `agenda'. MATCHER is a Lisp form to be |
| 6294 | evaluated, testing if a given set of tags qualifies a headline for | 6294 | evaluated, testing if a given set of tags qualifies a headline for |
| 6295 | inclusion. When TODO-ONLY is non-nil, only lines with a TDOD keyword | 6295 | inclusion. When TODO-ONLY is non-nil, only lines with a TODO keyword |
| 6296 | d are included in the output." | 6296 | are included in the output." |
| 6297 | (let* ((re (concat "[\n\r]" outline-regexp " *\\(\\<\\(" | 6297 | (let* ((re (concat "[\n\r]" outline-regexp " *\\(\\<\\(" |
| 6298 | (mapconcat 'regexp-quote | 6298 | (mapconcat 'regexp-quote |
| 6299 | (nreverse (cdr (reverse org-todo-keywords))) | 6299 | (nreverse (cdr (reverse org-todo-keywords))) |
| @@ -6329,7 +6329,7 @@ d are included in the output." | |||
| 6329 | ;; add the nex tags | 6329 | ;; add the nex tags |
| 6330 | (when tags | 6330 | (when tags |
| 6331 | (setq tags (mapcar 'downcase (org-split-string tags ":")) | 6331 | (setq tags (mapcar 'downcase (org-split-string tags ":")) |
| 6332 | tags-alist | 6332 | tags-alist |
| 6333 | (cons (cons level tags) tags-alist))) | 6333 | (cons (cons level tags) tags-alist))) |
| 6334 | ;; compile tags for current headline | 6334 | ;; compile tags for current headline |
| 6335 | (setq tags-list | 6335 | (setq tags-list |
| @@ -6342,7 +6342,7 @@ d are included in the output." | |||
| 6342 | (if (eq action 'sparse-tree) | 6342 | (if (eq action 'sparse-tree) |
| 6343 | (progn | 6343 | (progn |
| 6344 | (org-show-hierarchy-above)) | 6344 | (org-show-hierarchy-above)) |
| 6345 | (setq txt (org-format-agenda-item | 6345 | (setq txt (org-format-agenda-item |
| 6346 | "" | 6346 | "" |
| 6347 | (concat | 6347 | (concat |
| 6348 | (if org-tags-match-list-sublevels | 6348 | (if org-tags-match-list-sublevels |
| @@ -6352,7 +6352,7 @@ d are included in the output." | |||
| 6352 | (goto-char lspos) | 6352 | (goto-char lspos) |
| 6353 | (setq marker (org-agenda-new-marker)) | 6353 | (setq marker (org-agenda-new-marker)) |
| 6354 | (add-text-properties | 6354 | (add-text-properties |
| 6355 | 0 (length txt) | 6355 | 0 (length txt) |
| 6356 | (append (list 'org-marker marker 'org-hd-marker marker | 6356 | (append (list 'org-marker marker 'org-hd-marker marker |
| 6357 | 'category category) | 6357 | 'category category) |
| 6358 | props) | 6358 | props) |
| @@ -6403,7 +6403,7 @@ MATCH can contain positive and negative selection of tags, like | |||
| 6403 | 6403 | ||
| 6404 | ;;;###autoload | 6404 | ;;;###autoload |
| 6405 | (defun org-tags-view (&optional todo-only match keep-modes) | 6405 | (defun org-tags-view (&optional todo-only match keep-modes) |
| 6406 | "Show all headlines for all `org-agenda-files' matching a TAGS criterions. | 6406 | "Show all headlines for all `org-agenda-files' matching a TAGS criterion. |
| 6407 | The prefix arg TODO-ONLY limits the search to TODO entries." | 6407 | The prefix arg TODO-ONLY limits the search to TODO entries." |
| 6408 | (interactive "P") | 6408 | (interactive "P") |
| 6409 | (org-agenda-maybe-reset-markers 'force) | 6409 | (org-agenda-maybe-reset-markers 'force) |
| @@ -6427,7 +6427,7 @@ The prefix arg TODO-ONLY limits the search to TODO entries." | |||
| 6427 | (org-agenda-mode) (setq buffer-read-only nil) | 6427 | (org-agenda-mode) (setq buffer-read-only nil) |
| 6428 | (set (make-local-variable 'org-agenda-type) 'tags) | 6428 | (set (make-local-variable 'org-agenda-type) 'tags) |
| 6429 | (set (make-local-variable 'org-agenda-redo-command) | 6429 | (set (make-local-variable 'org-agenda-redo-command) |
| 6430 | (list 'org-tags-view (list 'quote todo-only) | 6430 | (list 'org-tags-view (list 'quote todo-only) |
| 6431 | (list 'if 'current-prefix-arg nil match) t)) | 6431 | (list 'if 'current-prefix-arg nil match) t)) |
| 6432 | (setq files (org-agenda-files) | 6432 | (setq files (org-agenda-files) |
| 6433 | rtnall nil) | 6433 | rtnall nil) |
| @@ -6525,12 +6525,12 @@ With prefix ARG, realign all tags in headings in the current buffer." | |||
| 6525 | (if (string-match "^\\(.*[-+:&|]\\)\\([^-+:&|]*\\)$" string) | 6525 | (if (string-match "^\\(.*[-+:&|]\\)\\([^-+:&|]*\\)$" string) |
| 6526 | (setq s1 (match-string 1 string) | 6526 | (setq s1 (match-string 1 string) |
| 6527 | s2 (match-string 2 string)) | 6527 | s2 (match-string 2 string)) |
| 6528 | (setq s1 "" s2 string)) | 6528 | (setq s1 "" s2 string)) |
| 6529 | (cond | 6529 | (cond |
| 6530 | ((eq flag nil) | 6530 | ((eq flag nil) |
| 6531 | ;; try completion | 6531 | ;; try completion |
| 6532 | (setq rtn (try-completion s2 ctable)) | 6532 | (setq rtn (try-completion s2 ctable)) |
| 6533 | (if (stringp rtn) | 6533 | (if (stringp rtn) |
| 6534 | (concat s1 s2 (substring rtn (length s2)) | 6534 | (concat s1 s2 (substring rtn (length s2)) |
| 6535 | (if (and org-add-colon-after-tag-completion | 6535 | (if (and org-add-colon-after-tag-completion |
| 6536 | (assoc rtn ctable)) | 6536 | (assoc rtn ctable)) |
| @@ -6620,7 +6620,7 @@ optional argument IN-EMACS is non-nil, Emacs will visit the file." | |||
| 6620 | (setq path (concat "*" path)))) | 6620 | (setq path (concat "*" path)))) |
| 6621 | (throw 'match t)) | 6621 | (throw 'match t)) |
| 6622 | (save-excursion | 6622 | (save-excursion |
| 6623 | (when (re-search-forward | 6623 | (when (re-search-forward |
| 6624 | org-link-regexp | 6624 | org-link-regexp |
| 6625 | (save-excursion | 6625 | (save-excursion |
| 6626 | (condition-case nil | 6626 | (condition-case nil |
| @@ -6634,9 +6634,9 @@ optional argument IN-EMACS is non-nil, Emacs will visit the file." | |||
| 6634 | ;; Remove any trailing spaces in path | 6634 | ;; Remove any trailing spaces in path |
| 6635 | (if (string-match " +\\'" path) | 6635 | (if (string-match " +\\'" path) |
| 6636 | (setq path (replace-match "" t t path))) | 6636 | (setq path (replace-match "" t t path))) |
| 6637 | 6637 | ||
| 6638 | (cond | 6638 | (cond |
| 6639 | 6639 | ||
| 6640 | ((string= type "tags") | 6640 | ((string= type "tags") |
| 6641 | (org-tags-view in-emacs path)) | 6641 | (org-tags-view in-emacs path)) |
| 6642 | ((string= type "camel") | 6642 | ((string= type "camel") |
| @@ -6645,7 +6645,7 @@ optional argument IN-EMACS is non-nil, Emacs will visit the file." | |||
| 6645 | (cond ((equal in-emacs '(4)) 'occur) | 6645 | (cond ((equal in-emacs '(4)) 'occur) |
| 6646 | ((equal in-emacs '(16)) 'org-occur) | 6646 | ((equal in-emacs '(16)) 'org-occur) |
| 6647 | (t nil)))) | 6647 | (t nil)))) |
| 6648 | 6648 | ||
| 6649 | ((string= type "file") | 6649 | ((string= type "file") |
| 6650 | (if (string-match "::?\\([0-9]+\\)\\'" path) ;; second : optional | 6650 | (if (string-match "::?\\([0-9]+\\)\\'" path) ;; second : optional |
| 6651 | (setq line (string-to-number (match-string 1 path)) | 6651 | (setq line (string-to-number (match-string 1 path)) |
| @@ -6654,13 +6654,13 @@ optional argument IN-EMACS is non-nil, Emacs will visit the file." | |||
| 6654 | (setq search (match-string 1 path) | 6654 | (setq search (match-string 1 path) |
| 6655 | path (substring path 0 (match-beginning 0))))) | 6655 | path (substring path 0 (match-beginning 0))))) |
| 6656 | (org-open-file path in-emacs line search)) | 6656 | (org-open-file path in-emacs line search)) |
| 6657 | 6657 | ||
| 6658 | ((string= type "news") | 6658 | ((string= type "news") |
| 6659 | (org-follow-gnus-link path)) | 6659 | (org-follow-gnus-link path)) |
| 6660 | 6660 | ||
| 6661 | ((string= type "bbdb") | 6661 | ((string= type "bbdb") |
| 6662 | (org-follow-bbdb-link path)) | 6662 | (org-follow-bbdb-link path)) |
| 6663 | 6663 | ||
| 6664 | ((string= type "gnus") | 6664 | ((string= type "gnus") |
| 6665 | (let (group article) | 6665 | (let (group article) |
| 6666 | (if (not (string-match "\\`\\([^#]+\\)\\(#\\(.*\\)\\)?" path)) | 6666 | (if (not (string-match "\\`\\([^#]+\\)\\(#\\(.*\\)\\)?" path)) |
| @@ -6668,7 +6668,7 @@ optional argument IN-EMACS is non-nil, Emacs will visit the file." | |||
| 6668 | (setq group (match-string 1 path) | 6668 | (setq group (match-string 1 path) |
| 6669 | article (match-string 3 path)) | 6669 | article (match-string 3 path)) |
| 6670 | (org-follow-gnus-link group article))) | 6670 | (org-follow-gnus-link group article))) |
| 6671 | 6671 | ||
| 6672 | ((string= type "vm") | 6672 | ((string= type "vm") |
| 6673 | (let (folder article) | 6673 | (let (folder article) |
| 6674 | (if (not (string-match "\\`\\([^#]+\\)\\(#\\(.*\\)\\)?" path)) | 6674 | (if (not (string-match "\\`\\([^#]+\\)\\(#\\(.*\\)\\)?" path)) |
| @@ -6677,7 +6677,7 @@ optional argument IN-EMACS is non-nil, Emacs will visit the file." | |||
| 6677 | article (match-string 3 path)) | 6677 | article (match-string 3 path)) |
| 6678 | ;; in-emacs is the prefix arg, will be interpreted as read-only | 6678 | ;; in-emacs is the prefix arg, will be interpreted as read-only |
| 6679 | (org-follow-vm-link folder article in-emacs))) | 6679 | (org-follow-vm-link folder article in-emacs))) |
| 6680 | 6680 | ||
| 6681 | ((string= type "wl") | 6681 | ((string= type "wl") |
| 6682 | (let (folder article) | 6682 | (let (folder article) |
| 6683 | (if (not (string-match "\\`\\([^#]+\\)\\(#\\(.*\\)\\)?" path)) | 6683 | (if (not (string-match "\\`\\([^#]+\\)\\(#\\(.*\\)\\)?" path)) |
| @@ -6685,7 +6685,7 @@ optional argument IN-EMACS is non-nil, Emacs will visit the file." | |||
| 6685 | (setq folder (match-string 1 path) | 6685 | (setq folder (match-string 1 path) |
| 6686 | article (match-string 3 path)) | 6686 | article (match-string 3 path)) |
| 6687 | (org-follow-wl-link folder article))) | 6687 | (org-follow-wl-link folder article))) |
| 6688 | 6688 | ||
| 6689 | ((string= type "rmail") | 6689 | ((string= type "rmail") |
| 6690 | (let (folder article) | 6690 | (let (folder article) |
| 6691 | (if (not (string-match "\\`\\([^#]+\\)\\(#\\(.*\\)\\)?" path)) | 6691 | (if (not (string-match "\\`\\([^#]+\\)\\(#\\(.*\\)\\)?" path)) |
| @@ -6693,7 +6693,7 @@ optional argument IN-EMACS is non-nil, Emacs will visit the file." | |||
| 6693 | (setq folder (match-string 1 path) | 6693 | (setq folder (match-string 1 path) |
| 6694 | article (match-string 3 path)) | 6694 | article (match-string 3 path)) |
| 6695 | (org-follow-rmail-link folder article))) | 6695 | (org-follow-rmail-link folder article))) |
| 6696 | 6696 | ||
| 6697 | ((string= type "shell") | 6697 | ((string= type "shell") |
| 6698 | (let ((cmd path)) | 6698 | (let ((cmd path)) |
| 6699 | (while (string-match "@{" cmd) | 6699 | (while (string-match "@{" cmd) |
| @@ -6704,7 +6704,7 @@ optional argument IN-EMACS is non-nil, Emacs will visit the file." | |||
| 6704 | (yes-or-no-p (format "Execute \"%s\" in the shell? " cmd))) | 6704 | (yes-or-no-p (format "Execute \"%s\" in the shell? " cmd))) |
| 6705 | (shell-command cmd) | 6705 | (shell-command cmd) |
| 6706 | (error "Abort")))) | 6706 | (error "Abort")))) |
| 6707 | 6707 | ||
| 6708 | (t | 6708 | (t |
| 6709 | (browse-url-at-point)))))) | 6709 | (browse-url-at-point)))))) |
| 6710 | 6710 | ||
| @@ -6713,7 +6713,7 @@ optional argument IN-EMACS is non-nil, Emacs will visit the file." | |||
| 6713 | When S is a CamelCaseWord, search for a target, or for a sentence containing | 6713 | When S is a CamelCaseWord, search for a target, or for a sentence containing |
| 6714 | the words. If S is surrounded by forward slashes, it is interpreted as a | 6714 | the words. If S is surrounded by forward slashes, it is interpreted as a |
| 6715 | regular expression. In org-mode files, this will create an `org-occur' | 6715 | regular expression. In org-mode files, this will create an `org-occur' |
| 6716 | sparse tree. In ordinary files, `occur' will be used to list matched. | 6716 | sparse tree. In ordinary files, `occur' will be used to list matches. |
| 6717 | If the current buffer is in `dired-mode', grep will be used to search | 6717 | If the current buffer is in `dired-mode', grep will be used to search |
| 6718 | in all files." | 6718 | in all files." |
| 6719 | (let ((case-fold-search t) | 6719 | (let ((case-fold-search t) |
| @@ -6735,7 +6735,7 @@ in all files." | |||
| 6735 | (setq pre "^\\*+[ \t]*\\(\\sw+\\)?[ \t]*" | 6735 | (setq pre "^\\*+[ \t]*\\(\\sw+\\)?[ \t]*" |
| 6736 | post "[ \t]*$" | 6736 | post "[ \t]*$" |
| 6737 | s (substring s 1))) | 6737 | s (substring s 1))) |
| 6738 | (remove-text-properties | 6738 | (remove-text-properties |
| 6739 | 0 (length s) | 6739 | 0 (length s) |
| 6740 | '(face nil mouse-face nil keymap nil fontified nil) s) | 6740 | '(face nil mouse-face nil keymap nil fontified nil) s) |
| 6741 | ;; Make a series of regular expressions to find a match | 6741 | ;; Make a series of regular expressions to find a match |
| @@ -6792,7 +6792,7 @@ to read." | |||
| 6792 | (select-window cwin)))) | 6792 | (select-window cwin)))) |
| 6793 | 6793 | ||
| 6794 | (defun org-camel-to-words (s) | 6794 | (defun org-camel-to-words (s) |
| 6795 | "Split \"CamelCaseWords\" to (\"Camel \" \"Case\" \"Words\")." | 6795 | "Split \"CamelCaseWords\" to (\"Camel\" \"Case\" \"Words\")." |
| 6796 | (let ((case-fold-search nil) | 6796 | (let ((case-fold-search nil) |
| 6797 | words) | 6797 | words) |
| 6798 | (while (string-match "[a-z][A-Z]" s) | 6798 | (while (string-match "[a-z][A-Z]" s) |
| @@ -6907,10 +6907,10 @@ If no application is found, Emacs simply visits the file. | |||
| 6907 | With optional argument IN-EMACS, Emacs will visit the file. | 6907 | With optional argument IN-EMACS, Emacs will visit the file. |
| 6908 | Optional LINE specifies a line to go to, optional SEARCH a string to | 6908 | Optional LINE specifies a line to go to, optional SEARCH a string to |
| 6909 | search for. If LINE or SEARCH is given, the file will always be | 6909 | search for. If LINE or SEARCH is given, the file will always be |
| 6910 | openen in emacs. | 6910 | opened in Emacs. |
| 6911 | If the file does not exist, an error is thrown." | 6911 | If the file does not exist, an error is thrown." |
| 6912 | (setq in-emacs (or in-emacs line search)) | 6912 | (setq in-emacs (or in-emacs line search)) |
| 6913 | (let* ((file (if (equal path "") | 6913 | (let* ((file (if (equal path "") |
| 6914 | (buffer-file-name) | 6914 | (buffer-file-name) |
| 6915 | (convert-standard-filename (org-expand-file-name path)))) | 6915 | (convert-standard-filename (org-expand-file-name path)))) |
| 6916 | (dfile (downcase file)) | 6916 | (dfile (downcase file)) |
| @@ -7102,7 +7102,7 @@ For file links, arg negates `org-context-in-file-links'." | |||
| 7102 | (org-make-org-heading-camel | 7102 | (org-make-org-heading-camel |
| 7103 | (cond | 7103 | (cond |
| 7104 | ((org-on-heading-p) nil) | 7104 | ((org-on-heading-p) nil) |
| 7105 | ((org-region-active-p) | 7105 | ((org-region-active-p) |
| 7106 | (buffer-substring (region-beginning) (region-end))) | 7106 | (buffer-substring (region-beginning) (region-end))) |
| 7107 | (t (buffer-substring (point-at-bol) (point-at-eol)))) | 7107 | (t (buffer-substring (point-at-bol) (point-at-eol)))) |
| 7108 | ))))) | 7108 | ))))) |
| @@ -7115,9 +7115,9 @@ For file links, arg negates `org-context-in-file-links'." | |||
| 7115 | ;; Add a context string | 7115 | ;; Add a context string |
| 7116 | (when (org-xor org-context-in-file-links arg) | 7116 | (when (org-xor org-context-in-file-links arg) |
| 7117 | (setq cpltxt | 7117 | (setq cpltxt |
| 7118 | (concat cpltxt "::" | 7118 | (concat cpltxt "::" |
| 7119 | (org-make-org-heading-camel | 7119 | (org-make-org-heading-camel |
| 7120 | (if (org-region-active-p) | 7120 | (if (org-region-active-p) |
| 7121 | (buffer-substring (region-beginning) (region-end)) | 7121 | (buffer-substring (region-beginning) (region-end)) |
| 7122 | (buffer-substring (point-at-bol) (point-at-eol))))))) | 7122 | (buffer-substring (point-at-bol) (point-at-eol))))))) |
| 7123 | (setq link (org-make-link cpltxt))) | 7123 | (setq link (org-make-link cpltxt))) |
| @@ -7295,7 +7295,7 @@ of `org-default-notes-file' is used. | |||
| 7295 | Then the command offers the headings tree of the selected file in order to | 7295 | Then the command offers the headings tree of the selected file in order to |
| 7296 | file the text at a specific location. | 7296 | file the text at a specific location. |
| 7297 | You can either immediately press RET to get the note appended to the | 7297 | You can either immediately press RET to get the note appended to the |
| 7298 | file. Or you can use vertical cursor motion and visibility cycling (TAB) to | 7298 | file, or you can use vertical cursor motion and visibility cycling (TAB) to |
| 7299 | find a better place. Then press RET or <left> or <right> in insert the note. | 7299 | find a better place. Then press RET or <left> or <right> in insert the note. |
| 7300 | 7300 | ||
| 7301 | Key Cursor position Note gets inserted | 7301 | Key Cursor position Note gets inserted |
| @@ -7497,7 +7497,7 @@ SIZE is a string Columns x Rows like for example \"3x2\"." | |||
| 7497 | The region goes from BEG0 to END0, but these borders will be moved | 7497 | The region goes from BEG0 to END0, but these borders will be moved |
| 7498 | slightly, to make sure a beginning of line in the first line is included. | 7498 | slightly, to make sure a beginning of line in the first line is included. |
| 7499 | When NSPACE is non-nil, it indicates the minimum number of spaces that | 7499 | When NSPACE is non-nil, it indicates the minimum number of spaces that |
| 7500 | separate columns (default: just one space)" | 7500 | separate columns (default: just one space)." |
| 7501 | (let* ((beg (min beg0 end0)) | 7501 | (let* ((beg (min beg0 end0)) |
| 7502 | (end (max beg0 end0)) | 7502 | (end (max beg0 end0)) |
| 7503 | (tabsep t) | 7503 | (tabsep t) |
| @@ -8130,11 +8130,11 @@ If TABLE-TYPE is non-nil, also check for table.el-type tables." | |||
| 8130 | (org-table-modify-formulas 'swap col (if left (1- col) (1+ col))))) | 8130 | (org-table-modify-formulas 'swap col (if left (1- col) (1+ col))))) |
| 8131 | 8131 | ||
| 8132 | (defun org-table-move-row-down () | 8132 | (defun org-table-move-row-down () |
| 8133 | "move table row down." | 8133 | "Move table row down." |
| 8134 | (interactive) | 8134 | (interactive) |
| 8135 | (org-table-move-row nil)) | 8135 | (org-table-move-row nil)) |
| 8136 | (defun org-table-move-row-up () | 8136 | (defun org-table-move-row-up () |
| 8137 | "move table row up." | 8137 | "Move table row up." |
| 8138 | (interactive) | 8138 | (interactive) |
| 8139 | (org-table-move-row 'up)) | 8139 | (org-table-move-row 'up)) |
| 8140 | 8140 | ||
| @@ -8287,7 +8287,7 @@ numerical, a for alphanumeric)." | |||
| 8287 | (defun org-table-copy-region (beg end &optional cut) | 8287 | (defun org-table-copy-region (beg end &optional cut) |
| 8288 | "Copy rectangular region in table to clipboard. | 8288 | "Copy rectangular region in table to clipboard. |
| 8289 | A special clipboard is used which can only be accessed | 8289 | A special clipboard is used which can only be accessed |
| 8290 | with `org-table-paste-rectangle'" | 8290 | with `org-table-paste-rectangle'." |
| 8291 | (interactive "rP") | 8291 | (interactive "rP") |
| 8292 | (let* (l01 c01 l02 c02 l1 c1 l2 c2 ic1 ic2 | 8292 | (let* (l01 c01 l02 c02 l1 c1 l2 c2 ic1 ic2 |
| 8293 | region cols | 8293 | region cols |
| @@ -8402,7 +8402,7 @@ If there is an active region, and both point and mark are in the same column, | |||
| 8402 | the text in the column is wrapped to minimum width for the given number of | 8402 | the text in the column is wrapped to minimum width for the given number of |
| 8403 | lines. Generally, this makes the table more compact. A prefix ARG may be | 8403 | lines. Generally, this makes the table more compact. A prefix ARG may be |
| 8404 | used to change the number of desired lines. For example, `C-2 \\[org-table-wrap]' | 8404 | used to change the number of desired lines. For example, `C-2 \\[org-table-wrap]' |
| 8405 | formats the selected text to two lines. If the region was longer than 2 | 8405 | formats the selected text to two lines. If the region was longer than two |
| 8406 | lines, the remaining lines remain empty. A negative prefix argument reduces | 8406 | lines, the remaining lines remain empty. A negative prefix argument reduces |
| 8407 | the current number of lines by that amount. The wrapped text is pasted back | 8407 | the current number of lines by that amount. The wrapped text is pasted back |
| 8408 | into the table. If you formatted it to more lines than it was before, fields | 8408 | into the table. If you formatted it to more lines than it was before, fields |
| @@ -8549,7 +8549,7 @@ and end of string." | |||
| 8549 | "Toggle the visibility of table vertical lines. | 8549 | "Toggle the visibility of table vertical lines. |
| 8550 | The effect is immediate and on all tables in the file. | 8550 | The effect is immediate and on all tables in the file. |
| 8551 | With prefix ARG, make lines invisible when ARG is positive, make lines | 8551 | With prefix ARG, make lines invisible when ARG is positive, make lines |
| 8552 | visible when ARG is not positive" | 8552 | visible when ARG is not positive." |
| 8553 | (interactive "P") | 8553 | (interactive "P") |
| 8554 | (let ((action (cond | 8554 | (let ((action (cond |
| 8555 | ((and arg (> (prefix-numeric-value arg) 0)) 'on) | 8555 | ((and arg (> (prefix-numeric-value arg) 0)) 'on) |
| @@ -8663,7 +8663,7 @@ If NLAST is a number, only the NLAST fields will actually be summed." | |||
| 8663 | (t n)))) | 8663 | (t n)))) |
| 8664 | 8664 | ||
| 8665 | (defun org-table-get-vertical-vector (desc &optional tbeg col) | 8665 | (defun org-table-get-vertical-vector (desc &optional tbeg col) |
| 8666 | "Get a calc vector from a column, accorting to desctiptor DESC. | 8666 | "Get a calc vector from a column, accorting to descriptor DESC. |
| 8667 | Optional arguments TBEG and COL can give the beginning of the table and | 8667 | Optional arguments TBEG and COL can give the beginning of the table and |
| 8668 | the current column, to avoid unnecessary parsing." | 8668 | the current column, to avoid unnecessary parsing." |
| 8669 | (save-excursion | 8669 | (save-excursion |
| @@ -8807,7 +8807,7 @@ the current column, to avoid unnecessary parsing." | |||
| 8807 | (defun org-table-modify-formulas (action &rest columns) | 8807 | (defun org-table-modify-formulas (action &rest columns) |
| 8808 | "Modify the formulas stored below the current table. | 8808 | "Modify the formulas stored below the current table. |
| 8809 | ACTION can be `remove', `insert', `swap'. For `swap', two column numbers are | 8809 | ACTION can be `remove', `insert', `swap'. For `swap', two column numbers are |
| 8810 | expected, for the other action only a single column number is needed." | 8810 | expected, for the other actions only a single column number is needed." |
| 8811 | (let ((list (org-table-get-stored-formulas)) | 8811 | (let ((list (org-table-get-stored-formulas)) |
| 8812 | (nmax (length (org-split-string | 8812 | (nmax (length (org-split-string |
| 8813 | (buffer-substring (point-at-bol) (point-at-eol)) | 8813 | (buffer-substring (point-at-bol) (point-at-eol)) |
| @@ -8857,7 +8857,7 @@ expected, for the other action only a single column number is needed." | |||
| 8857 | (setcdr elt s)))) | 8857 | (setcdr elt s)))) |
| 8858 | 8858 | ||
| 8859 | (defun org-table-get-specials () | 8859 | (defun org-table-get-specials () |
| 8860 | "Get the column nmaes and local parameters for this table." | 8860 | "Get the column names and local parameters for this table." |
| 8861 | (save-excursion | 8861 | (save-excursion |
| 8862 | (let ((beg (org-table-begin)) (end (org-table-end)) | 8862 | (let ((beg (org-table-begin)) (end (org-table-end)) |
| 8863 | names name fields fields1 field cnt c v line col) | 8863 | names name fields fields1 field cnt c v line col) |
| @@ -8920,7 +8920,7 @@ If yes, store the formula and apply it." | |||
| 8920 | (org-table-eval-formula (if named '(4) nil) eq)))))) | 8920 | (org-table-eval-formula (if named '(4) nil) eq)))))) |
| 8921 | 8921 | ||
| 8922 | (defvar org-recalc-commands nil | 8922 | (defvar org-recalc-commands nil |
| 8923 | "List of commands triggering the reccalculation of a line. | 8923 | "List of commands triggering the recalculation of a line. |
| 8924 | Will be filled automatically during use.") | 8924 | Will be filled automatically during use.") |
| 8925 | 8925 | ||
| 8926 | (defvar org-recalc-marks | 8926 | (defvar org-recalc-marks |
| @@ -8935,10 +8935,10 @@ Will be filled automatically during use.") | |||
| 8935 | (defun org-table-rotate-recalc-marks (&optional newchar) | 8935 | (defun org-table-rotate-recalc-marks (&optional newchar) |
| 8936 | "Rotate the recalculation mark in the first column. | 8936 | "Rotate the recalculation mark in the first column. |
| 8937 | If in any row, the first field is not consistent with a mark, | 8937 | If in any row, the first field is not consistent with a mark, |
| 8938 | insert a new column for the makers. | 8938 | insert a new column for the markers. |
| 8939 | When there is an active region, change all the lines in the region, | 8939 | When there is an active region, change all the lines in the region, |
| 8940 | after prompting for the marking character. | 8940 | after prompting for the marking character. |
| 8941 | After each change, a message will be displayed indication the meaning | 8941 | After each change, a message will be displayed indicating the meaning |
| 8942 | of the new mark." | 8942 | of the new mark." |
| 8943 | (interactive) | 8943 | (interactive) |
| 8944 | (unless (org-at-table-p) (error "Not at a table")) | 8944 | (unless (org-at-table-p) (error "Not at a table")) |
| @@ -9025,12 +9025,12 @@ When nil, simply write \"#ERROR\" in corrupted fields.") | |||
| 9025 | suppress-store) | 9025 | suppress-store) |
| 9026 | "Replace the table field value at the cursor by the result of a calculation. | 9026 | "Replace the table field value at the cursor by the result of a calculation. |
| 9027 | 9027 | ||
| 9028 | This function makes use of Dave Gillespie's calc package, in my view the | 9028 | This function makes use of Dave Gillespie's Calc package, in my view the |
| 9029 | most exciting program ever written for GNU Emacs. So you need to have calc | 9029 | most exciting program ever written for GNU Emacs. So you need to have Calc |
| 9030 | installed in order to use this function. | 9030 | installed in order to use this function. |
| 9031 | 9031 | ||
| 9032 | In a table, this command replaces the value in the current field with the | 9032 | In a table, this command replaces the value in the current field with the |
| 9033 | result of a formula. It also installes the formula as the \"current\" column | 9033 | result of a formula. It also installs the formula as the \"current\" column |
| 9034 | formula, by storing it in a special line below the table. When called | 9034 | formula, by storing it in a special line below the table. When called |
| 9035 | with a `C-u' prefix, the current field must ba a named field, and the | 9035 | with a `C-u' prefix, the current field must ba a named field, and the |
| 9036 | formula is installed as valid in only this specific field. | 9036 | formula is installed as valid in only this specific field. |
| @@ -9041,15 +9041,15 @@ history list, and the last used formula is offered as a default. | |||
| 9041 | These stored formulas are adapted correctly when moving, inserting, or | 9041 | These stored formulas are adapted correctly when moving, inserting, or |
| 9042 | deleting columns with the corresponding commands. | 9042 | deleting columns with the corresponding commands. |
| 9043 | 9043 | ||
| 9044 | The formula can be any algebraic expression understood by the calc package. | 9044 | The formula can be any algebraic expression understood by the Calc package. |
| 9045 | For details, see the Org-mode manual. | 9045 | For details, see the Org-mode manual. |
| 9046 | 9046 | ||
| 9047 | This function can also be called from Lisp programs and offers | 9047 | This function can also be called from Lisp programs and offers |
| 9048 | additional Arguments: EQUATION can be the formula to apply. If this | 9048 | additional arguments: EQUATION can be the formula to apply. If this |
| 9049 | argument is given, the user will not be prompted. SUPPRESS-ALIGN is | 9049 | argument is given, the user will not be prompted. SUPPRESS-ALIGN is |
| 9050 | used to speed-up recursive calls by by-passing unnecessary aligns. | 9050 | used to speed-up recursive calls by by-passing unnecessary aligns. |
| 9051 | SUPPRESS-CONST suppresses the interpretation of constants in the | 9051 | SUPPRESS-CONST suppresses the interpretation of constants in the |
| 9052 | formula, assuming that this has been done already outside the fuction. | 9052 | formula, assuming that this has been done already outside the function. |
| 9053 | SUPPRESS-STORE means the formula should not be stored, either because | 9053 | SUPPRESS-STORE means the formula should not be stored, either because |
| 9054 | it is already stored, or because it is a modified equation that should | 9054 | it is already stored, or because it is a modified equation that should |
| 9055 | not overwrite the stored one." | 9055 | not overwrite the stored one." |
| @@ -9490,8 +9490,8 @@ table editor in arbitrary modes.") | |||
| 9490 | 9490 | ||
| 9491 | (defun orgtbl-make-binding (fun n &rest keys) | 9491 | (defun orgtbl-make-binding (fun n &rest keys) |
| 9492 | "Create a function for binding in the table minor mode. | 9492 | "Create a function for binding in the table minor mode. |
| 9493 | FUN is the command to call inside a table. N is used to create a unique | 9493 | FUN is the command to call inside a table. N is used to create a unique |
| 9494 | command name. KEYS are keys that should be checked in for a command | 9494 | command name. KEYS are keys that should be checked in for a command |
| 9495 | to execute outside of tables." | 9495 | to execute outside of tables." |
| 9496 | (eval | 9496 | (eval |
| 9497 | (list 'defun | 9497 | (list 'defun |
| @@ -10660,7 +10660,7 @@ headlines. The default is 3. Lower levels will become bulleted lists." | |||
| 10660 | start-is-num (match-beginning 4) | 10660 | start-is-num (match-beginning 4) |
| 10661 | starter (if (match-beginning 2) (match-string 2 line)) | 10661 | starter (if (match-beginning 2) (match-string 2 line)) |
| 10662 | line (substring line (match-beginning 5))) | 10662 | line (substring line (match-beginning 5))) |
| 10663 | (unless (string-match "[^ \t]" line) | 10663 | (unless (string-match "[^ \t]" line) |
| 10664 | ;; empty line. Pretend indentation is large. | 10664 | ;; empty line. Pretend indentation is large. |
| 10665 | (setq ind (1+ (or (car local-list-indent) 1)))) | 10665 | (setq ind (1+ (or (car local-list-indent) 1)))) |
| 10666 | (while (and in-local-list | 10666 | (while (and in-local-list |
| @@ -11966,7 +11966,7 @@ that can be added." | |||
| 11966 | (delete arg buffer-invisibility-spec))))) | 11966 | (delete arg buffer-invisibility-spec))))) |
| 11967 | 11967 | ||
| 11968 | (defun org-in-invisibility-spec-p (arg) | 11968 | (defun org-in-invisibility-spec-p (arg) |
| 11969 | "Is ARG a member of `buffer-invisibility-spec'?." | 11969 | "Is ARG a member of `buffer-invisibility-spec'?" |
| 11970 | (if (consp buffer-invisibility-spec) | 11970 | (if (consp buffer-invisibility-spec) |
| 11971 | (member arg buffer-invisibility-spec) | 11971 | (member arg buffer-invisibility-spec) |
| 11972 | nil)) | 11972 | nil)) |
| @@ -12195,4 +12195,4 @@ Show the heading too, if it is currently invisible." | |||
| 12195 | ;; arch-tag: e77da1a7-acc7-4336-b19e-efa25af3f9fd | 12195 | ;; arch-tag: e77da1a7-acc7-4336-b19e-efa25af3f9fd |
| 12196 | ;;; org.el ends here | 12196 | ;;; org.el ends here |
| 12197 | 12197 | ||
| 12198 | 12198 | ||