diff options
| author | Carsten Dominik <dominik@nb-dominik2.science.uva.nl> | 2008-01-31 11:36:42 +0100 |
|---|---|---|
| committer | Carsten Dominik <dominik@nb-dominik2.science.uva.nl> | 2008-01-31 11:36:42 +0100 |
| commit | 2856cf1927b1b724ef1347f97342465f9fb70279 (patch) | |
| tree | 2d30ae097e81bb262e9e37225d7f3bb81e19df43 | |
| parent | 01d0656bcf46a8b1c3d3ad7c793af99cb27646c3 (diff) | |
| download | org-mode-2856cf1927b1b724ef1347f97342465f9fb70279.tar.gz | |
Release 5.12release_5.12
| -rw-r--r-- | ChangeLog | 35 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | org | 935 | ||||
| -rw-r--r-- | org-export-latex.el | 30 | ||||
| -rw-r--r-- | org.el | 524 | ||||
| -rw-r--r-- | org.pdf | bin | 808752 -> 811662 bytes | |||
| -rw-r--r-- | org.texi | 121 | ||||
| -rw-r--r-- | orgcard.pdf | bin | 59063 -> 59070 bytes | |||
| -rw-r--r-- | orgcard.tex | 3 | ||||
| -rw-r--r-- | orgcard_letter.pdf | bin | 58743 -> 58784 bytes |
10 files changed, 1019 insertions, 631 deletions
@@ -1,3 +1,38 @@ +2007-10-12 Carsten Dominik <dominik@science.uva.nl> + + * org.texi: Small fixes. + +2007-10-11 Carsten Dominik <dominik@science.uva.nl> + + * org.el (org-get-date-from-calendar): New function. + (org-at-timestamp-p, org-timestamp-change) + (org-remember-templates): First element of each entry is now a + name for the template. + (org-store-log-note): Check for `org-note-abort'. + (org-kill-note-or-show-branches): New command. + (org-fontify-priorities): New option. + (org-fontify-priorities): New function. + (org-cut-subtree, org-copy-subtree): New argument N to + act on N sequential subtrees. + (org-paste-subtree): Fix the level at which a tree is pasted. + (org-fit-agenda-window): Limitations on window size removed. + (org-agenda-find-same-or-today-or-agenda): Renamed from + `org-agenda-find-today-or-agenda'. + (org-scheduled-past-days): New option. + (org-agenda-scheduled-leaders) + (org-agenda-deadline-leaders): New options. + (org-agenda-get-deadlines): Use `org-agenda-deadline-leaders'. + (org-agenda-get-scheduled): Use `org-agenda-scheduled-leaders'. + (org-export-with-tags, org-export-plist-vars) + (org-infile-export-plist): New "tags" option. + (org-use-property-inheritance): New option. + (org-cached-entry-get): Use `org-use-property-inheritance'. + (org-remember-apply-template): Fixed typo. + +---------------------------------------------------------------------- +Installed as 5.11 + + 2007-10-05 Carsten Dominik <dominik@science.uva.nl> * org.el (org-additional-option-like-keywords): New constant. @@ -67,7 +67,7 @@ HTMLDIR = /home/dominik/public_html/Tools/org .SUFFIXES: .el .elc .texi SHELL = /bin/sh -DISTFILES= README ${LISPFILES} ${DOCFILES} ${CARDFILES} Makefile dir ChangeLog +DISTFILES= README ${LISPFILES} ${DOCFILES} ${CARDFILES} Makefile dir ChangeLog request-assign.future DISTFILES_xemacs= xemacs/noutline.el xemacs/ps-print-invisible.el xemacs/README all: $(ELCFILES) @@ -5,7 +5,7 @@ START-INFO-DIR-ENTRY * Org Mode: (org). Outline-based notes management and organizer END-INFO-DIR-ENTRY - This manual is for Org-mode (version 5.11b). + This manual is for Org-mode (version 5.12). Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation @@ -27,7 +27,7 @@ File: org, Node: Top, Next: Introduction, Prev: (dir), Up: (dir) Org Mode Manual *************** -This manual is for Org-mode (version 5.11b). +This manual is for Org-mode (version 5.12). Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation @@ -734,10 +734,12 @@ File: org, Node: Structure editing, Next: Archiving, Prev: Motion, Up: Docum `C-c C-x C-w' `C-c C-x C-k' - Kill subtree, i.e. remove it from buffer but save in kill ring. + Kill subtree, i.e. remove it from buffer but save in kill ring. + With prefix arg, kill N sequential subtrees. `C-c C-x M-w' - Copy subtree to kill ring. + Copy subtree to kill ring. With prefix arg, copy N sequential + subtrees. `C-c C-x C-y' Yank subtree from kill ring. This does modify the level of the @@ -879,10 +881,14 @@ means that the entire document is folded as much as possible, but the selected information is made visible along with the headline structure above it(1). Just try it out and you will see immediately how it works. - Org-mode contains several commands creating such trees. The most -basic one is `org-occur': + Org-mode contains several commands creating such trees, all these +commands can be accessed through a dispatcher: `C-c /' + This prompts for an extra key to select a sparse-tree creating + command. + +`C-c / r' Occur. Prompts for a regexp and shows a sparse tree with all matches. If the match is in a headline, the headline is made visible. If the match is in the body of an entry, headline and @@ -905,8 +911,9 @@ For example: will define the key `C-c a f' as a shortcut for creating a sparse tree matching the string `FIXME'. - Other commands use sparse trees as well. For example `C-c C-v' -creates a sparse TODO tree (*note TODO basics::). + The other sparse tree commands select headings based on TODO +keywords, tags, or properties and will be discussed later in this +manual. To print a sparse tree, you can use the Emacs command `ps-print-buffer-with-faces' which does not print invisible parts of @@ -2367,6 +2374,7 @@ The most important commands to work with TODO entries are: information. `C-c C-v' +`C-c / t' View TODO items in a _sparse tree_ (*note Sparse trees::). Folds the entire buffer, but shows all TODO items and the headings hierarchy above them. With prefix arg, search for a specific @@ -2977,6 +2985,7 @@ Once a tags system has been set up, it can be used to collect related information into special lists. `C-c \' +`C-c / T' Create a sparse tree with all headlines matching a tags search. With a `C-u' prefix argument, ignore headlines that are not a TODO line. @@ -3114,7 +3123,11 @@ The following commands help to work with properties: `M-<TAB>' After an initial colon in a line, complete property keys. All keys used in the current file will be offered as possible - completions. + completions. + +`C-c C-x p' + Set a property. This prompts for a property name and a value. If + necessary, the property drawer is created as well. `M-x org-insert-property-drawer' Insert a property drawer into the current entry. The drawer will @@ -3179,6 +3192,20 @@ priority value `A', a `:coffee:' property with the value `unlimited', and a `:with:' property that is matched by the regular expression `Sarah\|Denny'. + During a search, properties will be inherited from parent entries +only if you configure the variable `org-use-property-inheritance'. + + There is also a special command for creating sparse trees based on a +single property: + +`C-c / p' + Create a sparse tree based on the value of a property. This first + prompts for the name of a property, and then for a value. A + sparse tree is created with all entries that define this property + with the given value. If you enclose the value into curly braces, + it is interpreted as a regular expression and matched against the + property values. + File: org, Node: Column view, Next: Property API, Prev: Property searches, Up: Properties and columns @@ -3511,16 +3538,29 @@ ISO date. But it will in fact accept any string containing some date and/or time information. You can, for example, use `C-y' to paste a (possibly multi-line) string copied from an email message. Org-mode will find whatever information is in there and will replace anything not -specified with the current date and time. For example: - - 3-2-5 --> 2003-02-05 - feb 15 --> currentyear-02-15 - sep 12 9 --> 2009-09-12 - 12:45 --> today 12:45 - 22 sept 0:34 --> currentyear-09-22 0:34 - 12 --> currentyear-currentmonth-12 - Fri --> nearest Friday (today or later) - +4 --> 4 days from now (if +N is the only thing given) +specified with the _default date and time_. The default is usually the +current date and time, but when modifying an existing time stamp, or +when entering the second stamp of a range, it is taken from the stamp in +the buffer. For example: + + 3-2-5 --> 2003-02-05 + feb 15 --> defaultyear-02-15 + sep 12 9 --> 2009-09-12 + 12:45 --> default-date 12:45 + 22 sept 0:34 --> defaultyear-09-22 0:34 + 12 --> defaultyear-defaultmonth-12 + Fri --> nearest Friday (defaultdate or later) + + Furthermore you can specify a relative date by giving, as the +_first_ thing in the input: a plus/minus sign, a number and a letter +[dwmy] to indicate change in days weeks, months, years. With a single +plus or minus, the date is always relative to today. With a double +plus or minus, it is relative to the default date. E.g. + + +4d --> four days from today + +4 --> same as above + +2w --> two weeks from today + ++5 --> five days from default date The function understands English month and weekday abbreviations. If you want to use unabbreviated names and/or other languages, configure @@ -3854,7 +3894,7 @@ little interruption of your work flow. See `http://www.emacswiki.org/cgi-bin/wiki/RememberMode' for more information. It is an excellent way to add new notes and TODO items to Org-mode files. Org-mode significantly expands the possibilities of -remember: You may define templates for different note types, and to +remember: You may define templates for different note types, and associate target files and headlines with specific templates. It also allows you to select the location where a note should be stored interactively, on the fly. @@ -3893,15 +3933,16 @@ journal entries, and a third one for collecting random ideas, you could use: (setq org-remember-templates - '((?t "* TODO %?\n %i\n %a" "~/org/TODO.org" "Tasks") - (?j "* %U %?\n\n %i\n %a" "~/org/JOURNAL.org") - (?i "* %^{Title}\n %i\n %a" "~/org/JOURNAL.org" "New Ideas"))) - -In these entries, the character specifies how to select the template. -The first string specifies the template. Two more (optional) strings -give the file in which, and the headline under which the new note -should be stored. The file defaults (if not present or `nil') to -`org-default-notes-file', the heading to + '(("Todo" ?t "* TODO %?\n %i\n %a" "~/org/TODO.org" "Tasks") + ("Journal" ?j "* %U %?\n\n %i\n %a" "~/org/JOURNAL.org") + ("Idea" ?i "* %^{Title}\n %i\n %a" "~/org/JOURNAL.org" "New Ideas"))) + +In these entries, the first string is just a name, and the character +specifies how to select the template. It is useful if the character is +also the first letter of the name. The next string specifies the +template. Two more (optional) strings give the file in which, and the +headline under which the new note should be stored. The file defaults +(if not present or `nil') to `org-default-notes-file', the heading to `org-remember-default-headline'. Both defaults help to get to the storing location quickly, but you can change the location interactively while storing the note. @@ -3912,12 +3953,6 @@ more than one template) and then prepare the buffer like * TODO [[file:link to where you called remember]] -or - - * [2006-03-21 Tue 15:37] - - [[file:link to where you called remember]] - During expansion of the template, special `%'-escapes allow dynamic insertion of content: %^{prompt} prompt the user for a string and replace this sequence with it. @@ -4093,11 +4128,7 @@ way to maintain it is through the following commands `C-,' `C-'' - Cycle through agenda file list, visiting one file after the other. - -`C-c C-x /' - Search for a regular rexpression in all agenda files and display - the results in an `occur' buffer. + Cycle through agenda file list, visiting one file after the other. The Org menu contains the current list of files and can be used to visit any of them. @@ -4140,6 +4171,13 @@ command. The dispatcher offers the following default commands: `# / !' Create a list of stuck projects (*note Stuck projects::). +`/' + Search for a regular expression in all agenda files and + additionally in the files listed in + `org-agenda-multi-occur-extra-files'. This uses the Emacs command + `multi-occur'. A prefix argument can be used to specify the + number of context lines for each match, default is 1. + `1' Restrict an agenda command to the current buffer. After pressing `1', you still need to press the character selecting the command. @@ -5858,6 +5896,7 @@ you can: skip: turn on/off skipping the text before the first heading author: turn on/off inclusion of author name/email into exported file timestamp: turn on/off inclusion creation time into exported file + p: turn on/off inclusion of tags These options take effect in both the HTML and LaTeX export, except for `TeX' and `LaTeX', which are respectively `t' and `nil' for the @@ -7485,21 +7524,21 @@ Index (line 6) * action, for publishing: Publishing action. (line 6) * activation: Activation. (line 6) -* active region <1>: Structure editing. (line 68) -* active region <2>: ASCII export. (line 9) -* active region <3>: HTML Export commands. - (line 6) -* active region: Built-in table editor. +* active region <1>: ASCII export. (line 9) +* active region <2>: Structure editing. (line 70) +* active region <3>: Built-in table editor. (line 143) +* active region: HTML Export commands. + (line 6) * agenda: Weekly/Daily agenda. (line 6) * agenda dispatcher: Agenda dispatcher. (line 6) * agenda files: Agenda files. (line 6) * agenda files, removing buffers: Agenda commands. (line 244) * agenda views: Agenda views. (line 6) * agenda views, custom: Custom agenda views. (line 6) -* agenda views, exporting <1>: Exporting Agenda Views. +* agenda views, exporting <1>: Agenda commands. (line 233) +* agenda views, exporting: Exporting Agenda Views. (line 12) -* agenda views, exporting: Agenda commands. (line 233) * agenda views, user-defined: Special agenda views. (line 6) * agenda, pipe: Extracting Agenda Information for other programs. @@ -7508,9 +7547,9 @@ Index * align, STARTUP keyword: In-buffer settings. (line 68) * allout.el: Conflicts. (line 6) * angular brackets, around links: External links. (line 43) -* API, for properties <1>: Using the property API. +* API, for properties <1>: Property API. (line 6) +* API, for properties: Using the property API. (line 6) -* API, for properties: Property API. (line 6) * appointment reminders: Weekly/Daily agenda. (line 66) * appt.el: Weekly/Daily agenda. (line 66) * archive locations: Moving subtrees. (line 23) @@ -7524,20 +7563,20 @@ Index * block agenda: Block agenda. (line 6) * blorg.el: Extensions. (line 32) * bold text: Enhancing text. (line 15) -* Boolean logic, for tag searches: Tag searches. (line 23) +* Boolean logic, for tag searches: Tag searches. (line 24) * bug reports: Feedback. (line 6) * bugs: Bugs. (line 6) * C-c C-c, overview: The very busy C-c C-c key. (line 6) * calc package: The spreadsheet. (line 6) * calc.el: Cooperation. (line 6) -* calculations, in tables <1>: Built-in table editor. +* calculations, in tables <1>: The spreadsheet. (line 6) +* calculations, in tables: Built-in table editor. (line 143) -* calculations, in tables: The spreadsheet. (line 6) * calendar commands, from agenda: Agenda commands. (line 196) * calendar integration: Weekly/Daily agenda. (line 24) * calendar, for selecting date: The date/time prompt. - (line 26) + (line 39) * category: Categories. (line 6) * CDLaTeX: CDLaTeX mode. (line 6) * cdlatex.el: Cooperation. (line 29) @@ -7554,14 +7593,14 @@ Index * completion, of link abbreviations: Completion. (line 6) * completion, of links: Handling links. (line 25) * completion, of option keywords <1>: Per file keywords. (line 23) -* completion, of option keywords <2>: Export options. (line 6) -* completion, of option keywords: Completion. (line 6) +* completion, of option keywords <2>: Completion. (line 6) +* completion, of option keywords: Export options. (line 6) * completion, of property keys: Completion. (line 6) -* completion, of tags <1>: Setting tags. (line 11) -* completion, of tags: Completion. (line 6) +* completion, of tags <1>: Completion. (line 6) +* completion, of tags: Setting tags. (line 11) * completion, of TeX symbols: Completion. (line 6) -* completion, of TODO keywords <1>: Workflow states. (line 15) -* completion, of TODO keywords: Completion. (line 6) +* completion, of TODO keywords <1>: Completion. (line 6) +* completion, of TODO keywords: Workflow states. (line 15) * constants, in calculations: References. (line 82) * constants.el: Cooperation. (line 14) * constcgs, STARTUP keyword: In-buffer settings. (line 94) @@ -7642,8 +7681,8 @@ Index * footnote.el <1>: Cooperation. (line 56) * footnote.el <2>: Footnotes. (line 6) * footnote.el: Conflicts. (line 35) -* footnotes <1>: Footnotes. (line 6) -* footnotes: Export options. (line 26) +* footnotes <1>: Export options. (line 26) +* footnotes: Footnotes. (line 6) * format specifier: Formula syntax for Calc. (line 14) * format, of links: Link format. (line 6) @@ -7665,11 +7704,11 @@ Index * grouping columns in tables: Column groups. (line 6) * hand-formatted lists: Enhancing text. (line 11) * headline levels: Export options. (line 26) -* headline levels, for exporting <1>: LaTeX export commands. +* headline levels, for exporting <1>: ASCII export. (line 21) +* headline levels, for exporting <2>: LaTeX export commands. (line 26) -* headline levels, for exporting <2>: HTML Export commands. +* headline levels, for exporting: HTML Export commands. (line 44) -* headline levels, for exporting: ASCII export. (line 21) * headline navigation: Motion. (line 6) * headline tagging: Tags. (line 6) * headline, promotion and demotion: Structure editing. (line 6) @@ -7692,6 +7731,7 @@ Index * inactive timestamp: Time stamps. (line 49) * index, of published pages: Project page index. (line 6) * Info links: External links. (line 6) +* inheritance, of properties: Property searches. (line 6) * inheritance, of tags: Tag inheritance. (line 6) * inlining images in HTML: Images. (line 6) * inserting links: Handling links. (line 25) @@ -7705,14 +7745,14 @@ Index * keybindings, global: Activation. (line 6) * keyword options: Per file keywords. (line 6) * LaTeX export: LaTeX export. (line 6) -* LaTeX fragments <1>: Export options. (line 26) -* LaTeX fragments: LaTeX fragments. (line 6) +* LaTeX fragments <1>: LaTeX fragments. (line 6) +* LaTeX fragments: Export options. (line 26) * LaTeX fragments, export: Enhancing text. (line 21) * LaTeX fragments, preview: Processing LaTeX fragments. (line 6) * LaTeX interpretation: Embedded LaTeX. (line 6) * LaTeX, and orgtbl-mode: A LaTeX example. (line 6) -* level, require for tags match: Tag searches. (line 68) +* level, require for tags match: Tag searches. (line 69) * linebreak preservation: Export options. (line 26) * linebreak, forced: Enhancing text. (line 35) * link abbreviations: Link abbreviations. (line 6) @@ -7777,9 +7817,9 @@ Index * org-publish.el: Extensions. (line 8) * org2rem.el: Extensions. (line 36) * orgstruct-mode: orgstruct-mode. (line 6) -* orgtbl-mode <1>: Tables in arbitrary syntax. +* orgtbl-mode <1>: orgtbl-mode. (line 6) +* orgtbl-mode: Tables in arbitrary syntax. (line 6) -* orgtbl-mode: orgtbl-mode. (line 6) * outline tree: Headlines. (line 6) * outline-mode: Outlines. (line 6) * outlines: Outlines. (line 6) @@ -7792,7 +7832,7 @@ Index * plain text external links: External links. (line 43) * presentation, of agenda items: Presentation and sorting. (line 6) -* printing sparse trees: Sparse trees. (line 41) +* printing sparse trees: Sparse trees. (line 46) * priorities: Priorities. (line 6) * priorities, of agenda items: Sorting of agenda items. (line 6) @@ -7805,6 +7845,7 @@ Index (line 6) * properties, API: Property API. (line 6) * properties, column view: Defining columns. (line 6) +* properties, inheritance: Property searches. (line 6) * properties, searching: Property searches. (line 6) * properties, special: Special properties. (line 6) * property syntax: Property syntax. (line 6) @@ -7819,15 +7860,15 @@ Index * references, named: References. (line 82) * references, to fields: References. (line 15) * references, to ranges: References. (line 60) -* region, active <1>: Built-in table editor. - (line 143) -* region, active <2>: ASCII export. (line 9) -* region, active <3>: Structure editing. (line 68) -* region, active: HTML Export commands. +* region, active <1>: ASCII export. (line 9) +* region, active <2>: Structure editing. (line 70) +* region, active <3>: HTML Export commands. (line 6) -* regular expressions, with tags search: Tag searches. (line 63) -* remember.el <1>: Cooperation. (line 33) -* remember.el: Remember. (line 6) +* region, active: Built-in table editor. + (line 143) +* regular expressions, with tags search: Tag searches. (line 64) +* remember.el <1>: Remember. (line 6) +* remember.el: Cooperation. (line 33) * remote editing, from agenda: Agenda commands. (line 107) * remote editing, undo: Agenda commands. (line 108) * richer text: Enhancing text. (line 6) @@ -7840,6 +7881,7 @@ Index * search option in file links: Search options. (line 6) * search strings, custom: Custom searches. (line 6) * searching for tags: Tag searches. (line 6) +* searching, of properties: Property searches. (line 6) * section-numbers: Export options. (line 26) * setting tags: Setting tags. (line 6) * SHELL links: External links. (line 6) @@ -7879,13 +7921,14 @@ Index (line 6) * table editor, table.el: Cooperation. (line 37) * table of contents: Export options. (line 26) -* table.el: Cooperation. (line 37) +* table.el: Cooperation. (line 34) * tables <1>: Tables. (line 6) * tables: Export options. (line 26) * tables, export: Enhancing text. (line 24) * tables, in other modes: Tables in arbitrary syntax. (line 6) * tag completion: Completion. (line 6) +* tag inheritance: Tag inheritance. (line 6) * tag searches: Tag searches. (line 6) * tags: Tags. (line 6) * tags view: Matching tags and properties. @@ -7896,8 +7939,8 @@ Index * tasks, breaking down: Breaking down tasks. (line 6) * templates, for remember: Remember templates. (line 6) * TeX interpretation: Embedded LaTeX. (line 6) -* TeX macros <1>: Export options. (line 26) -* TeX macros: Math symbols. (line 6) +* TeX macros <1>: Math symbols. (line 6) +* TeX macros: Export options. (line 26) * TeX macros, export: Enhancing text. (line 21) * TeX symbol completion: Completion. (line 6) * TeX-like syntax for sub- and superscripts: Export options. (line 26) @@ -7907,8 +7950,8 @@ Index * time grid: Time-of-day specifications. (line 26) * time info, in export: Export options. (line 26) -* time stamps <1>: Time stamps. (line 6) -* time stamps: Timestamps. (line 6) +* time stamps <1>: Timestamps. (line 6) +* time stamps: Time stamps. (line 6) * time, reading in minibuffer: The date/time prompt. (line 6) * time-of-day specification: Time-of-day specifications. @@ -7922,17 +7965,17 @@ Index * timestamps, creating: Creating timestamps. (line 6) * TODO items: TODO items. (line 6) * TODO keyword matching: Global TODO list. (line 17) -* TODO keyword matching, with tags search: Tag searches. (line 40) +* TODO keyword matching, with tags search: Tag searches. (line 41) * todo keyword sets: Multiple sets in one file. (line 6) * TODO keywords completion: Completion. (line 6) * TODO list, global: Global TODO list. (line 6) * TODO types: TODO types. (line 6) * TODO workflow: Workflow states. (line 6) -* transient-mark-mode <1>: Structure editing. (line 68) -* transient-mark-mode <2>: ASCII export. (line 9) -* transient-mark-mode <3>: Built-in table editor. +* transient-mark-mode <1>: Built-in table editor. (line 143) +* transient-mark-mode <2>: Structure editing. (line 70) +* transient-mark-mode <3>: ASCII export. (line 9) * transient-mark-mode: HTML Export commands. (line 6) * translator function: Translator functions. @@ -7951,7 +7994,7 @@ Index (line 11) * visibility cycling: Visibility cycling. (line 6) * visibility cycling, drawers: Drawers. (line 6) -* visible text, printing: Sparse trees. (line 41) +* visible text, printing: Sparse trees. (line 46) * VM links: External links. (line 6) * WANDERLUST links: External links. (line 6) * weekly agenda: Weekly/Daily agenda. (line 6) @@ -7978,38 +8021,38 @@ Key Index * :: Agenda commands. (line 130) * < <1>: Using column view. (line 54) * <: The date/time prompt. - (line 32) + (line 45) * <left>: Agenda commands. (line 96) -* <RET> <1>: Built-in table editor. +* <RET> <1>: Agenda commands. (line 39) +* <RET> <2>: Setting tags. (line 76) +* <RET> <3>: Built-in table editor. (line 64) -* <RET> <2>: Agenda commands. (line 39) -* <RET> <3>: The date/time prompt. - (line 57) -* <RET>: Setting tags. (line 76) +* <RET>: The date/time prompt. + (line 70) * <right>: Agenda commands. (line 91) -* <SPC> <1>: Setting tags. (line 73) -* <SPC>: Agenda commands. (line 28) -* <TAB> <1>: Editing and debugging formulas. - (line 57) -* <TAB> <2>: Agenda commands. (line 33) -* <TAB> <3>: Visibility cycling. (line 10) +* <SPC> <1>: Agenda commands. (line 28) +* <SPC>: Setting tags. (line 73) +* <TAB> <1>: Setting tags. (line 68) +* <TAB> <2>: Visibility cycling. (line 10) +* <TAB> <3>: CDLaTeX mode. (line 23) * <TAB> <4>: Plain lists. (line 41) * <TAB> <5>: Built-in table editor. (line 57) -* <TAB> <6>: Setting tags. (line 68) -* <TAB>: CDLaTeX mode. (line 23) +* <TAB> <6>: Editing and debugging formulas. + (line 57) +* <TAB>: Agenda commands. (line 33) * > <1>: Using column view. (line 54) * > <2>: Agenda commands. (line 173) * >: The date/time prompt. - (line 33) + (line 46) * ^: CDLaTeX mode. (line 33) * _: CDLaTeX mode. (line 33) * `: CDLaTeX mode. (line 39) * a <1>: Using column view. (line 43) * a: Agenda commands. (line 134) * b: Agenda commands. (line 49) -* C: Agenda commands. (line 216) * c: Agenda commands. (line 196) +* C: Agenda commands. (line 216) * C-#: Advanced features. (line 9) * C-': Agenda files. (line 18) * C-,: Agenda files. (line 18) @@ -8026,28 +8069,32 @@ Key Index * C-c +: Built-in table editor. (line 143) * C-c ,: Priorities. (line 18) -* C-c - <1>: Plain lists. (line 88) -* C-c -: Built-in table editor. +* C-c - <1>: Built-in table editor. (line 92) +* C-c -: Plain lists. (line 88) * C-c .: Creating timestamps. (line 10) * C-c /: Sparse trees. (line 15) +* C-c / p: Property searches. (line 23) +* C-c / r: Sparse trees. (line 17) +* C-c / T: Tag searches. (line 9) +* C-c / t: TODO basics. (line 38) * C-c :: Enhancing text. (line 32) * C-c ;: Comment lines. (line 10) * C-c <: Creating timestamps. (line 23) * C-c <TAB>: Built-in table editor. (line 163) -* C-c = <1>: Editing and debugging formulas. +* C-c = <1>: Column formulas. (line 26) +* C-c =: Editing and debugging formulas. (line 14) -* C-c =: Column formulas. (line 26) * C-c >: Creating timestamps. (line 27) * C-c ?: Editing and debugging formulas. (line 24) * C-c [: Agenda files. (line 12) * C-c \: Tag searches. (line 9) * C-c ]: Agenda files. (line 15) -* C-c ^ <1>: Structure editing. (line 56) -* C-c ^: Built-in table editor. +* C-c ^ <1>: Built-in table editor. (line 96) +* C-c ^: Structure editing. (line 58) * C-c `: Built-in table editor. (line 159) * C-c a !: Stuck projects. (line 14) @@ -8057,44 +8104,46 @@ Key Index * C-c a e: Exporting Agenda Views. (line 57) * C-c a L: Timeline. (line 10) -* C-c a M: Tag searches. (line 16) -* C-c a m <1>: Tag searches. (line 12) -* C-c a m: Matching tags and properties. - (line 10) * C-c a M: Matching tags and properties. (line 15) +* C-c a m <1>: Matching tags and properties. + (line 10) +* C-c a m: Tag searches. (line 13) +* C-c a M: Tag searches. (line 17) * C-c a T: Global TODO list. (line 14) -* C-c a t <1>: Global TODO list. (line 9) -* C-c a t: TODO basics. (line 48) +* C-c a t <1>: TODO basics. (line 49) +* C-c a t: Global TODO list. (line 9) * C-c C-a: Visibility cycling. (line 33) * C-c C-b: Motion. (line 15) -* C-c C-c <1>: Processing LaTeX fragments. - (line 15) -* C-c C-c <2>: Cooperation. (line 37) -* C-c C-c <3>: The very busy C-c C-c key. +* C-c C-c <1>: Clocking work time. (line 89) +* C-c C-c <2>: Built-in table editor. + (line 56) +* C-c C-c <3>: TODO basics. (line 30) +* C-c C-c <4>: The very busy C-c C-c key. (line 6) -* C-c C-c <4>: Clocking work time. (line 89) -* C-c C-c <5>: Property syntax. (line 54) -* C-c C-c <6>: Setting tags. (line 10) -* C-c C-c <7>: Checkboxes. (line 37) -* C-c C-c <8>: TODO basics. (line 30) -* C-c C-c <9>: Editing and debugging formulas. +* C-c C-c <5>: Editing and debugging formulas. + (line 90) +* C-c C-c <6>: Plain lists. (line 81) +* C-c C-c <7>: Cooperation. (line 46) +* C-c C-c <8>: Property syntax. (line 58) +* C-c C-c <9>: Processing LaTeX fragments. + (line 15) +* C-c C-c <10>: Checkboxes. (line 37) +* C-c C-c <11>: Editing and debugging formulas. (line 46) -* C-c C-c <10>: Built-in table editor. - (line 56) -* C-c C-c: Plain lists. (line 81) -* C-c C-d <1>: Agenda commands. (line 158) -* C-c C-d: Inserting deadline/schedule. +* C-c C-c: Setting tags. (line 10) +* C-c C-d <1>: Inserting deadline/schedule. (line 9) +* C-c C-d: Agenda commands. (line 158) * C-c C-e: Exporting. (line 20) * C-c C-e a: ASCII export. (line 9) * C-c C-e b: HTML Export commands. (line 13) * C-c C-e c: iCalendar export. (line 21) -* C-c C-e H: HTML Export commands. - (line 16) * C-c C-e h: HTML Export commands. (line 6) +* C-c C-e H: HTML Export commands. + (line 16) * C-c C-e I: iCalendar export. (line 16) * C-c C-e i: iCalendar export. (line 14) * C-c C-e l: LaTeX export commands. @@ -8104,8 +8153,8 @@ Key Index * C-c C-e R: HTML Export commands. (line 19) * C-c C-e t: Export options. (line 13) -* C-c C-e v <1>: XOXO export. (line 11) -* C-c C-e v: Sparse trees. (line 41) +* C-c C-e v <1>: Sparse trees. (line 46) +* C-c C-e v: XOXO export. (line 11) * C-c C-e v a: ASCII export. (line 16) * C-c C-e v b: HTML Export commands. (line 24) @@ -8124,8 +8173,8 @@ Key Index * C-c C-j: Motion. (line 21) * C-c C-l: Handling links. (line 25) * C-c C-n: Motion. (line 8) -* C-c C-o <1>: Handling links. (line 59) -* C-c C-o: Creating timestamps. (line 31) +* C-c C-o <1>: Creating timestamps. (line 31) +* C-c C-o: Handling links. (line 59) * C-c C-p: Motion. (line 9) * C-c C-q <1>: Built-in table editor. (line 127) @@ -8134,16 +8183,15 @@ Key Index * C-c C-r <1>: Editing and debugging formulas. (line 53) * C-c C-r: Visibility cycling. (line 34) -* C-c C-s <1>: Inserting deadline/schedule. +* C-c C-s <1>: Agenda commands. (line 155) +* C-c C-s: Inserting deadline/schedule. (line 20) -* C-c C-s: Agenda commands. (line 155) -* C-c C-t <1>: TODO basics. (line 13) -* C-c C-t: Clocking work time. (line 30) +* C-c C-t <1>: Clocking work time. (line 30) +* C-c C-t: TODO basics. (line 13) * C-c C-u: Motion. (line 18) * C-c C-v: TODO basics. (line 38) * C-c C-w: Inserting deadline/schedule. (line 13) -* C-c C-x /: Agenda files. (line 22) * C-c C-x b: Visibility cycling. (line 41) * C-c C-x C-a: ARCHIVE tag. (line 28) * C-c C-x C-b: Checkboxes. (line 39) @@ -8161,24 +8209,25 @@ Key Index * C-c C-x C-r: Clocking work time. (line 50) * C-c C-x C-s: Moving subtrees. (line 10) * C-c C-x C-t: Custom time format. (line 12) -* C-c C-x C-u <1>: Dynamic blocks. (line 21) -* C-c C-x C-u: Clocking work time. (line 91) -* C-c C-x C-w <1>: Structure editing. (line 43) -* C-c C-x C-w: Built-in table editor. +* C-c C-x C-u <1>: Clocking work time. (line 91) +* C-c C-x C-u: Dynamic blocks. (line 21) +* C-c C-x C-w <1>: Built-in table editor. (line 116) +* C-c C-x C-w: Structure editing. (line 43) * C-c C-x C-x: Clocking work time. (line 34) -* C-c C-x C-y <1>: Built-in table editor. +* C-c C-x C-y <1>: Structure editing. (line 52) +* C-c C-x C-y: Built-in table editor. (line 120) -* C-c C-x C-y: Structure editing. (line 50) -* C-c C-x M-w <1>: Structure editing. (line 47) +* C-c C-x M-w <1>: Structure editing. (line 48) * C-c C-x M-w: Built-in table editor. (line 113) -* C-c C-y <1>: Clocking work time. (line 25) -* C-c C-y: Creating timestamps. (line 48) +* C-c C-x p: Property syntax. (line 49) +* C-c C-y <1>: Creating timestamps. (line 48) +* C-c C-y: Clocking work time. (line 25) * C-c l: Handling links. (line 9) -* C-c { <1>: CDLaTeX mode. (line 21) -* C-c {: Editing and debugging formulas. +* C-c { <1>: Editing and debugging formulas. (line 33) +* C-c {: CDLaTeX mode. (line 21) * C-c |: Built-in table editor. (line 40) * C-c }: Editing and debugging formulas. @@ -8192,9 +8241,9 @@ Key Index * C-TAB: ARCHIVE tag. (line 38) * C-u C-c *: Updating the table. (line 16) * C-u C-c .: Creating timestamps. (line 14) -* C-u C-c = <1>: Field formulas. (line 24) -* C-u C-c =: Editing and debugging formulas. +* C-u C-c = <1>: Editing and debugging formulas. (line 14) +* C-u C-c =: Field formulas. (line 24) * C-u C-c C-c: Updating the table. (line 19) * C-u C-c C-l: Handling links. (line 44) * C-u C-c C-t: TODO basics. (line 22) @@ -8212,19 +8261,19 @@ Key Index * C-x C-w <1>: Exporting Agenda Views. (line 11) * C-x C-w: Agenda commands. (line 232) -* d: Agenda commands. (line 66) * D: Agenda commands. (line 72) +* d: Agenda commands. (line 66) * e: Using column view. (line 33) * f: Agenda commands. (line 42) * g: Agenda commands. (line 76) * H: Agenda commands. (line 220) -* I: Agenda commands. (line 178) * i: Agenda commands. (line 201) +* I: Agenda commands. (line 178) * J: Agenda commands. (line 190) -* L: Agenda commands. (line 30) * l: Agenda commands. (line 55) -* m: Agenda commands. (line 66) +* L: Agenda commands. (line 30) * M: Agenda commands. (line 207) +* m: Agenda commands. (line 66) * M-<down> <1>: Editing and debugging formulas. (line 76) * M-<down>: Built-in table editor. @@ -8232,117 +8281,117 @@ Key Index * M-<left> <1>: Structure editing. (line 25) * M-<left>: Built-in table editor. (line 74) -* M-<RET> <1>: Plain lists. (line 49) -* M-<RET>: Structure editing. (line 6) +* M-<RET> <1>: Structure editing. (line 6) +* M-<RET>: Plain lists. (line 49) * M-<right> <1>: Built-in table editor. (line 74) * M-<right>: Structure editing. (line 28) -* M-<TAB> <1>: Setting tags. (line 6) -* M-<TAB> <2>: Completion. (line 10) -* M-<TAB> <3>: Property syntax. (line 46) -* M-<TAB> <4>: Per file keywords. (line 23) +* M-<TAB> <1>: Per file keywords. (line 23) +* M-<TAB> <2>: Property syntax. (line 46) +* M-<TAB> <3>: Completion. (line 10) +* M-<TAB> <4>: Setting tags. (line 6) * M-<TAB>: Editing and debugging formulas. (line 64) * M-<up> <1>: Built-in table editor. (line 82) * M-<up>: Editing and debugging formulas. (line 76) -* M-S-<down> <1>: Built-in table editor. - (line 89) -* M-S-<down> <2>: Plain lists. (line 66) -* M-S-<down> <3>: Editing and debugging formulas. +* M-S-<down> <1>: Structure editing. (line 40) +* M-S-<down> <2>: Editing and debugging formulas. (line 72) -* M-S-<down>: Structure editing. (line 40) -* M-S-<left> <1>: Plain lists. (line 72) -* M-S-<left> <2>: Structure editing. (line 31) -* M-S-<left> <3>: Built-in table editor. +* M-S-<down> <3>: Built-in table editor. + (line 89) +* M-S-<down>: Plain lists. (line 66) +* M-S-<left> <1>: Built-in table editor. (line 76) -* M-S-<left>: The date/time prompt. - (line 54) -* M-S-<RET> <1>: Structure editing. (line 22) -* M-S-<RET> <2>: Plain lists. (line 59) -* M-S-<RET>: Checkboxes. (line 54) -* M-S-<right> <1>: Built-in table editor. +* M-S-<left> <2>: The date/time prompt. + (line 67) +* M-S-<left> <3>: Plain lists. (line 72) +* M-S-<left>: Structure editing. (line 31) +* M-S-<RET> <1>: Checkboxes. (line 54) +* M-S-<RET> <2>: Structure editing. (line 22) +* M-S-<RET>: Plain lists. (line 59) +* M-S-<right> <1>: The date/time prompt. + (line 64) +* M-S-<right> <2>: Built-in table editor. (line 79) -* M-S-<right> <2>: Structure editing. (line 34) -* M-S-<right> <3>: Plain lists. (line 72) -* M-S-<right>: The date/time prompt. - (line 51) -* M-S-<up> <1>: Plain lists. (line 66) -* M-S-<up> <2>: Built-in table editor. +* M-S-<right> <3>: Structure editing. (line 34) +* M-S-<right>: Plain lists. (line 72) +* M-S-<up> <1>: Built-in table editor. (line 86) -* M-S-<up> <3>: Structure editing. (line 37) -* M-S-<up>: Editing and debugging formulas. +* M-S-<up> <2>: Editing and debugging formulas. (line 72) +* M-S-<up> <3>: Structure editing. (line 37) +* M-S-<up>: Plain lists. (line 66) * mouse-1 <1>: Handling links. (line 73) * mouse-1 <2>: Agenda commands. (line 33) * mouse-1: The date/time prompt. - (line 36) -* mouse-2 <1>: Handling links. (line 73) -* mouse-2: Agenda commands. (line 33) + (line 49) +* mouse-2 <1>: Agenda commands. (line 33) +* mouse-2: Handling links. (line 73) * mouse-3 <1>: Agenda commands. (line 28) * mouse-3: Handling links. (line 78) * n <1>: Agenda commands. (line 19) * n: Using column view. (line 30) * o: Agenda commands. (line 65) * O: Agenda commands. (line 182) -* p <1>: Using column view. (line 30) -* p: Agenda commands. (line 20) +* p <1>: Agenda commands. (line 20) +* p: Using column view. (line 30) * P: Agenda commands. (line 142) * q <1>: Using column view. (line 17) * q: Agenda commands. (line 243) * r <1>: Agenda commands. (line 80) * r: Global TODO list. (line 22) -* s: Agenda commands. (line 87) * S: Agenda commands. (line 211) +* s: Agenda commands. (line 87) * S-<down> <1>: Editing and debugging formulas. (line 67) -* S-<down> <2>: Priorities. (line 23) -* S-<down> <3>: Plain lists. (line 62) -* S-<down> <4>: Creating timestamps. (line 40) -* S-<down> <5>: The date/time prompt. - (line 45) -* S-<down>: Agenda commands. (line 151) -* S-<left> <1>: Property syntax. (line 62) +* S-<down> <2>: Creating timestamps. (line 40) +* S-<down> <3>: The date/time prompt. + (line 58) +* S-<down> <4>: Agenda commands. (line 151) +* S-<down> <5>: Priorities. (line 23) +* S-<down>: Plain lists. (line 62) +* S-<left> <1>: Creating timestamps. (line 35) * S-<left> <2>: The date/time prompt. - (line 42) + (line 55) * S-<left> <3>: Editing and debugging formulas. (line 67) -* S-<left> <4>: Creating timestamps. (line 35) -* S-<left> <5>: TODO basics. (line 26) -* S-<left> <6>: Agenda commands. (line 169) -* S-<left> <7>: Using column view. (line 26) -* S-<left>: Multiple sets in one file. +* S-<left> <4>: Multiple sets in one file. (line 29) +* S-<left> <5>: Using column view. (line 26) +* S-<left> <6>: Property syntax. (line 66) +* S-<left> <7>: Agenda commands. (line 169) +* S-<left>: TODO basics. (line 26) * S-<RET>: Built-in table editor. (line 146) -* S-<right> <1>: The date/time prompt. - (line 39) -* S-<right> <2>: Multiple sets in one file. +* S-<right> <1>: Using column view. (line 26) +* S-<right> <2>: Agenda commands. (line 161) +* S-<right> <3>: Multiple sets in one file. (line 29) -* S-<right> <3>: Editing and debugging formulas. +* S-<right> <4>: TODO basics. (line 26) +* S-<right> <5>: The date/time prompt. + (line 52) +* S-<right> <6>: Creating timestamps. (line 35) +* S-<right> <7>: Property syntax. (line 66) +* S-<right>: Editing and debugging formulas. (line 67) -* S-<right> <4>: Agenda commands. (line 161) -* S-<right> <5>: Creating timestamps. (line 35) -* S-<right> <6>: TODO basics. (line 26) -* S-<right> <7>: Using column view. (line 26) -* S-<right>: Property syntax. (line 62) -* S-<TAB> <1>: Visibility cycling. (line 22) -* S-<TAB>: Built-in table editor. +* S-<TAB> <1>: Built-in table editor. (line 61) -* S-<up> <1>: Plain lists. (line 62) -* S-<up> <2>: Creating timestamps. (line 40) -* S-<up> <3>: The date/time prompt. - (line 48) -* S-<up> <4>: Editing and debugging formulas. +* S-<TAB>: Visibility cycling. (line 22) +* S-<up> <1>: The date/time prompt. + (line 61) +* S-<up> <2>: Priorities. (line 23) +* S-<up> <3>: Editing and debugging formulas. (line 67) +* S-<up> <4>: Plain lists. (line 62) * S-<up> <5>: Agenda commands. (line 145) -* S-<up>: Priorities. (line 23) +* S-<up>: Creating timestamps. (line 40) * S-M-<left>: Using column view. (line 58) -* S-M-<RET>: TODO basics. (line 56) +* S-M-<RET>: TODO basics. (line 57) * S-M-<right>: Using column view. (line 55) -* t: Agenda commands. (line 112) * T: Agenda commands. (line 125) +* t: Agenda commands. (line 112) * v: Using column view. (line 39) * w: Agenda commands. (line 66) * X: Agenda commands. (line 185) @@ -8352,223 +8401,223 @@ Key Index Tag Table: -Node: Top971 -Node: Introduction13083 -Node: Summary13498 -Node: Installation16625 -Node: Activation18003 -Node: Feedback19240 -Node: Document structure21309 -Node: Outlines22201 -Node: Headlines22866 -Ref: Headlines-Footnote-123870 -Node: Visibility cycling23981 -Ref: Visibility cycling-Footnote-126191 -Ref: Visibility cycling-Footnote-226249 -Ref: Visibility cycling-Footnote-326299 -Node: Motion26569 -Node: Structure editing27523 -Node: Archiving30517 -Node: ARCHIVE tag31075 -Node: Moving subtrees32868 -Ref: Moving subtrees-Footnote-134415 -Node: Sparse trees34702 -Ref: Sparse trees-Footnote-136837 -Ref: Sparse trees-Footnote-237019 -Node: Plain lists37134 -Ref: Plain lists-Footnote-141331 -Ref: Plain lists-Footnote-241689 -Node: Drawers41870 -Node: orgstruct-mode42708 -Node: Tables43608 -Node: Built-in table editor44189 -Node: Narrow columns51595 -Ref: Narrow columns-Footnote-153530 -Node: Column groups53576 -Node: orgtbl-mode55109 -Node: The spreadsheet55912 -Node: References56999 -Ref: References-Footnote-161463 -Node: Formula syntax for Calc61752 -Node: Formula syntax for Lisp64209 -Node: Field formulas65927 -Node: Column formulas67235 -Node: Editing and debugging formulas68834 -Node: Updating the table72987 -Node: Advanced features74040 -Node: Hyperlinks78565 -Node: Link format79343 -Node: Internal links80636 -Ref: Internal links-Footnote-182561 -Node: Radio targets82696 -Node: External links83396 -Node: Handling links85800 -Ref: Handling links-Footnote-191116 -Ref: Handling links-Footnote-291353 -Node: Using links outside Org-mode91427 -Node: Link abbreviations91937 -Node: Search options93630 -Ref: Search options-Footnote-195410 -Node: Custom searches95491 -Node: TODO items96522 -Node: TODO basics97560 -Node: TODO extensions99765 -Node: Workflow states100709 -Ref: Workflow states-Footnote-1101884 -Node: TODO types101977 -Ref: TODO types-Footnote-1103560 -Node: Multiple sets in one file103642 -Node: Fast access to TODO states105262 -Node: Per file keywords106405 -Ref: Per file keywords-Footnote-1107707 -Node: Faces for TODO keywords107908 -Node: Progress logging108614 -Node: Closing items109045 -Ref: Closing items-Footnote-1109979 -Ref: Closing items-Footnote-2110184 -Node: Tracking TODO state changes110257 -Ref: Tracking TODO state changes-Footnote-1111442 -Node: Priorities111517 -Ref: Priorities-Footnote-1113167 -Node: Breaking down tasks113237 -Ref: Breaking down tasks-Footnote-1113757 -Node: Checkboxes113853 -Node: Tags116702 -Node: Tag inheritance117474 -Node: Setting tags118411 -Ref: Setting tags-Footnote-1122934 -Ref: Setting tags-Footnote-2123046 -Node: Tag searches123129 -Node: Properties and columns125846 -Node: Property syntax126951 -Node: Special properties129498 -Node: Property searches130414 -Node: Column view131069 -Node: Defining columns132236 -Node: Scope of column definitions132634 -Node: Column attributes133556 -Node: Using column view135804 -Node: Property API137791 -Node: Timestamps138145 -Node: Time stamps138556 -Ref: Time stamps-Footnote-1140910 -Node: Creating timestamps141026 -Node: The date/time prompt143100 -Ref: The date/time prompt-Footnote-1145088 -Node: Custom time format145194 -Node: Deadlines and scheduling146886 -Ref: Deadlines and scheduling-Footnote-1148959 -Node: Inserting deadline/schedule149114 -Node: Repeated tasks150232 -Ref: Repeated tasks-Footnote-1151910 -Node: Clocking work time152031 -Ref: Clocking work time-Footnote-1156878 -Ref: Clocking work time-Footnote-2156956 -Node: Remember157082 -Node: Setting up remember157964 -Node: Remember templates158567 -Ref: Remember templates-Footnote-1162084 -Ref: Remember templates-Footnote-2162267 -Node: Storing notes162365 -Ref: Storing notes-Footnote-1164844 -Node: Agenda views164946 -Node: Agenda files166897 -Ref: Agenda files-Footnote-1167989 -Ref: Agenda files-Footnote-2168138 -Node: Agenda dispatcher168331 -Node: Built-in agenda views170030 -Node: Weekly/Daily agenda170612 -Node: Global TODO list173949 -Node: Matching tags and properties176229 -Node: Timeline177320 -Node: Stuck projects177994 -Node: Presentation and sorting179847 -Node: Categories180640 -Ref: Categories-Footnote-1181351 -Node: Time-of-day specifications181671 -Node: Sorting of agenda items183644 -Node: Agenda commands184928 -Node: Custom agenda views192391 -Node: Storing searches193112 -Node: Block agenda195026 -Node: Setting Options196258 -Node: Exporting Agenda Views198999 -Ref: Exporting Agenda Views-Footnote-1203285 -Ref: Exporting Agenda Views-Footnote-2203342 -Node: Extracting Agenda Information for other programs203528 -Node: Embedded LaTeX207656 -Ref: Embedded LaTeX-Footnote-1208750 -Node: Math symbols208940 -Node: Subscripts and Superscripts209707 -Node: LaTeX fragments210553 -Ref: LaTeX fragments-Footnote-1212786 -Ref: LaTeX fragments-Footnote-2213047 -Node: Processing LaTeX fragments213181 -Node: CDLaTeX mode214129 -Ref: CDLaTeX mode-Footnote-1216615 -Node: Exporting216763 -Node: ASCII export218230 -Node: HTML export219731 -Node: HTML Export commands220357 -Node: Quoting HTML tags222144 -Node: Links222779 -Node: Images223476 -Ref: Images-Footnote-1224347 -Node: CSS support224408 -Ref: CSS support-Footnote-1225727 -Node: LaTeX export225840 -Node: LaTeX export commands226164 -Node: Quoting LaTeX code227326 -Node: XOXO export227831 -Node: iCalendar export228271 -Node: Text interpretation229740 -Node: Comment lines230331 -Node: Initial text230726 -Node: Footnotes232395 -Node: Enhancing text233186 -Ref: Enhancing text-Footnote-1235055 -Node: Export options235145 -Node: Publishing237498 -Ref: Publishing-Footnote-1238459 -Ref: Publishing-Footnote-2238603 -Node: Configuration238754 -Node: Project alist239472 -Node: Sources and destinations240538 -Node: Selecting files241268 -Node: Publishing action242016 -Node: Publishing options243350 -Node: Publishing links245725 -Node: Project page index247238 -Node: Sample configuration248016 -Node: Simple example248508 -Node: Complex example249181 -Node: Triggering publication251257 -Node: Miscellaneous251942 -Node: Completion252576 -Node: Customization254246 -Node: In-buffer settings254829 -Node: The very busy C-c C-c key260391 -Node: Clean view262246 -Node: TTY keys264823 -Node: Interaction266433 -Node: Cooperation266830 -Node: Conflicts269706 -Node: Bugs271709 -Node: Extensions and Hacking273205 -Node: Extensions273930 -Node: Adding hyperlink types276192 -Node: Tables in arbitrary syntax279854 -Node: Radio tables280943 -Node: A LaTeX example283446 -Ref: A LaTeX example-Footnote-1287092 -Ref: A LaTeX example-Footnote-2287240 -Node: Translator functions287675 -Ref: Translator functions-Footnote-1290784 -Node: Dynamic blocks290872 -Node: Special agenda views292844 -Node: Using the property API296089 -Node: History and Acknowledgments297570 -Node: Index304132 -Node: Key Index338909 +Node: Top970 +Node: Introduction13081 +Node: Summary13496 +Node: Installation16623 +Node: Activation18001 +Node: Feedback19238 +Node: Document structure21307 +Node: Outlines22199 +Node: Headlines22864 +Ref: Headlines-Footnote-123868 +Node: Visibility cycling23979 +Ref: Visibility cycling-Footnote-126189 +Ref: Visibility cycling-Footnote-226247 +Ref: Visibility cycling-Footnote-326297 +Node: Motion26567 +Node: Structure editing27521 +Node: Archiving30616 +Node: ARCHIVE tag31174 +Node: Moving subtrees32967 +Ref: Moving subtrees-Footnote-134514 +Node: Sparse trees34801 +Ref: Sparse trees-Footnote-137073 +Ref: Sparse trees-Footnote-237255 +Node: Plain lists37370 +Ref: Plain lists-Footnote-141567 +Ref: Plain lists-Footnote-241925 +Node: Drawers42106 +Node: orgstruct-mode42944 +Node: Tables43844 +Node: Built-in table editor44425 +Node: Narrow columns51831 +Ref: Narrow columns-Footnote-153766 +Node: Column groups53812 +Node: orgtbl-mode55345 +Node: The spreadsheet56148 +Node: References57235 +Ref: References-Footnote-161699 +Node: Formula syntax for Calc61988 +Node: Formula syntax for Lisp64445 +Node: Field formulas66163 +Node: Column formulas67471 +Node: Editing and debugging formulas69070 +Node: Updating the table73223 +Node: Advanced features74276 +Node: Hyperlinks78801 +Node: Link format79579 +Node: Internal links80872 +Ref: Internal links-Footnote-182797 +Node: Radio targets82932 +Node: External links83632 +Node: Handling links86036 +Ref: Handling links-Footnote-191352 +Ref: Handling links-Footnote-291589 +Node: Using links outside Org-mode91663 +Node: Link abbreviations92173 +Node: Search options93866 +Ref: Search options-Footnote-195646 +Node: Custom searches95727 +Node: TODO items96758 +Node: TODO basics97796 +Node: TODO extensions100011 +Node: Workflow states100955 +Ref: Workflow states-Footnote-1102130 +Node: TODO types102223 +Ref: TODO types-Footnote-1103806 +Node: Multiple sets in one file103888 +Node: Fast access to TODO states105508 +Node: Per file keywords106651 +Ref: Per file keywords-Footnote-1107953 +Node: Faces for TODO keywords108154 +Node: Progress logging108860 +Node: Closing items109291 +Ref: Closing items-Footnote-1110225 +Ref: Closing items-Footnote-2110430 +Node: Tracking TODO state changes110503 +Ref: Tracking TODO state changes-Footnote-1111688 +Node: Priorities111763 +Ref: Priorities-Footnote-1113413 +Node: Breaking down tasks113483 +Ref: Breaking down tasks-Footnote-1114003 +Node: Checkboxes114099 +Node: Tags116948 +Node: Tag inheritance117720 +Node: Setting tags118657 +Ref: Setting tags-Footnote-1123180 +Ref: Setting tags-Footnote-2123292 +Node: Tag searches123375 +Node: Properties and columns126102 +Node: Property syntax127207 +Node: Special properties129897 +Node: Property searches130813 +Node: Column view132080 +Node: Defining columns133247 +Node: Scope of column definitions133645 +Node: Column attributes134567 +Node: Using column view136815 +Node: Property API138802 +Node: Timestamps139156 +Node: Time stamps139567 +Ref: Time stamps-Footnote-1141921 +Node: Creating timestamps142037 +Node: The date/time prompt144111 +Ref: The date/time prompt-Footnote-1146717 +Node: Custom time format146823 +Node: Deadlines and scheduling148515 +Ref: Deadlines and scheduling-Footnote-1150588 +Node: Inserting deadline/schedule150743 +Node: Repeated tasks151861 +Ref: Repeated tasks-Footnote-1153539 +Node: Clocking work time153660 +Ref: Clocking work time-Footnote-1158507 +Ref: Clocking work time-Footnote-2158585 +Node: Remember158711 +Node: Setting up remember159590 +Node: Remember templates160193 +Ref: Remember templates-Footnote-1163754 +Ref: Remember templates-Footnote-2163937 +Node: Storing notes164035 +Ref: Storing notes-Footnote-1166514 +Node: Agenda views166616 +Node: Agenda files168567 +Ref: Agenda files-Footnote-1169535 +Ref: Agenda files-Footnote-2169684 +Node: Agenda dispatcher169877 +Node: Built-in agenda views171880 +Node: Weekly/Daily agenda172462 +Node: Global TODO list175799 +Node: Matching tags and properties178079 +Node: Timeline179170 +Node: Stuck projects179844 +Node: Presentation and sorting181697 +Node: Categories182490 +Ref: Categories-Footnote-1183201 +Node: Time-of-day specifications183521 +Node: Sorting of agenda items185494 +Node: Agenda commands186778 +Node: Custom agenda views194241 +Node: Storing searches194962 +Node: Block agenda196876 +Node: Setting Options198108 +Node: Exporting Agenda Views200849 +Ref: Exporting Agenda Views-Footnote-1205135 +Ref: Exporting Agenda Views-Footnote-2205192 +Node: Extracting Agenda Information for other programs205378 +Node: Embedded LaTeX209506 +Ref: Embedded LaTeX-Footnote-1210600 +Node: Math symbols210790 +Node: Subscripts and Superscripts211557 +Node: LaTeX fragments212403 +Ref: LaTeX fragments-Footnote-1214636 +Ref: LaTeX fragments-Footnote-2214897 +Node: Processing LaTeX fragments215031 +Node: CDLaTeX mode215979 +Ref: CDLaTeX mode-Footnote-1218465 +Node: Exporting218613 +Node: ASCII export220080 +Node: HTML export221581 +Node: HTML Export commands222207 +Node: Quoting HTML tags223994 +Node: Links224629 +Node: Images225326 +Ref: Images-Footnote-1226197 +Node: CSS support226258 +Ref: CSS support-Footnote-1227577 +Node: LaTeX export227690 +Node: LaTeX export commands228014 +Node: Quoting LaTeX code229176 +Node: XOXO export229681 +Node: iCalendar export230121 +Node: Text interpretation231590 +Node: Comment lines232181 +Node: Initial text232576 +Node: Footnotes234245 +Node: Enhancing text235036 +Ref: Enhancing text-Footnote-1236905 +Node: Export options236995 +Node: Publishing239394 +Ref: Publishing-Footnote-1240355 +Ref: Publishing-Footnote-2240499 +Node: Configuration240650 +Node: Project alist241368 +Node: Sources and destinations242434 +Node: Selecting files243164 +Node: Publishing action243912 +Node: Publishing options245246 +Node: Publishing links247621 +Node: Project page index249134 +Node: Sample configuration249912 +Node: Simple example250404 +Node: Complex example251077 +Node: Triggering publication253153 +Node: Miscellaneous253838 +Node: Completion254472 +Node: Customization256142 +Node: In-buffer settings256725 +Node: The very busy C-c C-c key262287 +Node: Clean view264142 +Node: TTY keys266719 +Node: Interaction268329 +Node: Cooperation268726 +Node: Conflicts271602 +Node: Bugs273605 +Node: Extensions and Hacking275101 +Node: Extensions275826 +Node: Adding hyperlink types278088 +Node: Tables in arbitrary syntax281750 +Node: Radio tables282839 +Node: A LaTeX example285342 +Ref: A LaTeX example-Footnote-1288988 +Ref: A LaTeX example-Footnote-2289136 +Node: Translator functions289571 +Ref: Translator functions-Footnote-1292680 +Node: Dynamic blocks292768 +Node: Special agenda views294740 +Node: Using the property API297985 +Node: History and Acknowledgments299466 +Node: Index306028 +Node: Key Index341097 End Tag Table diff --git a/org-export-latex.el b/org-export-latex.el index 95b03e5..e6c68f2 100644 --- a/org-export-latex.el +++ b/org-export-latex.el @@ -4,7 +4,7 @@ ;; ;; Emacs Lisp Archive Entry ;; Filename: org-export-latex.el -;; Version: 5.11 +;; Version: 5.12 ;; Author: Bastien Guerry <bzg AT altern DOT org> ;; Maintainer: Bastien Guerry <bzg AT altern DOT org> ;; Keywords: org, wp, tex @@ -58,7 +58,7 @@ (defvar org-latex-add-level 0) (defvar org-latex-sectioning-depth 0) (defvar org-export-latex-list-beginning-re - "^\\([ \t]*\\)\\([-+]\\|[0-9]+\\(?:\\.\\|)\\)\\) *?") + "^\\([ \t]*\\)\\([-+*]\\|[0-9]+[.)]\\) +?") (defvar org-latex-special-string-regexps '(org-ts-regexp @@ -579,14 +579,16 @@ Argument OPT-PLIST is the options plist for current buffer." ;; insert the title (format "\\title{%s}\n" - (or (plist-get opt-plist :title) - (and (not - (plist-get opt-plist :skip-before-1st-heading)) - (org-export-grab-title-from-buffer)) - (and buffer-file-name - (file-name-sans-extension - (file-name-nondirectory buffer-file-name))) - "UNTITLED")) + ;; convert the title + (org-export-latex-content + (or (plist-get opt-plist :title) + (and (not + (plist-get opt-plist :skip-before-1st-heading)) + (org-export-grab-title-from-buffer)) + (and buffer-file-name + (file-name-sans-extension + (file-name-nondirectory buffer-file-name))) + "UNTITLED"))) ;; insert author info (if (plist-get opt-plist :author-info) @@ -626,7 +628,9 @@ COMMENTS is either nil to replace them with the empty string or a formatting string like %%%%s if we want to comment them out." (save-excursion (goto-char (point-min)) - (let* ((end (if (re-search-forward "^\\*" nil t) + (let* ((pt (point)) + (end (if (and (re-search-forward "^\\*" nil t) + (not (eq pt (match-beginning 0)))) (goto-char (match-beginning 0)) (goto-char (point-max))))) (org-export-latex-content @@ -954,7 +958,7 @@ Valid parameters are (let* ((beg (org-table-begin)) (end (org-table-end)) (raw-table (buffer-substring-no-properties beg end)) - fnum line lines olines gr colgropen line-fmt alignment) + fnum fields line lines olines gr colgropen line-fmt align) (if org-export-latex-tables-verbatim (let* ((tbl (concat "\\begin{verbatim}\n" raw-table "\\end{verbatim}\n"))) @@ -1133,7 +1137,7 @@ Valid parameters are (when (and (re-search-forward (regexp-quote foot-prefix) nil t)) (replace-match "") (let ((end (save-excursion - (if (re-search-forward "^$\\|\\[[0-9]+\\]" nil t) + (if (re-search-forward "^$\\|^#.*$\\|\\[[0-9]+\\]" nil t) (match-beginning 0) (point-max))))) (setq footnote (concat @@ -5,7 +5,7 @@ ;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 5.11b +;; Version: 5.12 ;; ;; This file is part of GNU Emacs. ;; @@ -83,7 +83,7 @@ ;;; Version -(defconst org-version "5.11" +(defconst org-version "5.12" "The version number of the file org.el.") (defun org-version () (interactive) @@ -251,7 +251,7 @@ Or return the original if not disputed." "Define a key, possibly translated, as returned by `org-key'." (define-key keymap (org-key key) def)) -(defcustom org-ellipsis nil +(defcustom org-ellipsis 'org-link "The ellipsis to use in the Org-mode outline. When nil, just use the standard three dots. When a string, use that instead, When a face, use the standart 3 dots, but with the specified face. @@ -1250,15 +1250,15 @@ if one was given like in <mailto:arthur@galaxy.org::this subject>." (defcustom org-confirm-shell-link-function 'yes-or-no-p "Non-nil means, ask for confirmation before executing shell links. -Shell links can be dangerous, just thing about a link +Shell links can be dangerous: just think about a link [[shell:rm -rf ~/*][Google Search]] -This link would show up in your Org-mode document as \"Google Search\" +This link would show up in your Org-mode document as \"Google Search\", but really it would remove your entire home directory. -Therefore I *definitely* advise against setting this variable to nil. -Just change it to `y-or-n-p' of you want to confirm with a single key press -rather than having to type \"yes\"." +Therefore we advise against setting this variable to nil. +Just change it to `y-or-n-p' of you want to confirm with a +single keystroke rather than having to type \"yes\"." :group 'org-link-follow :type '(choice (const :tag "with yes-or-no (safer)" yes-or-no-p) @@ -1266,16 +1266,16 @@ rather than having to type \"yes\"." (const :tag "no confirmation (dangerous)" nil))) (defcustom org-confirm-elisp-link-function 'yes-or-no-p - "Non-nil means, ask for confirmation before executing elisp links. -Elisp links can be dangerous, just think about a link + "Non-nil means, ask for confirmation before executing Emacs Lisp links. +Elisp links can be dangerous: just think about a link [[elisp:(shell-command \"rm -rf ~/*\")][Google Search]] -This link would show up in your Org-mode document as \"Google Search\" +This link would show up in your Org-mode document as \"Google Search\", but really it would remove your entire home directory. -Therefore I *definitely* advise against setting this variable to nil. -Just change it to `y-or-n-p' of you want to confirm with a single key press -rather than having to type \"yes\"." +Therefore we advise against setting this variable to nil. +Just change it to `y-or-n-p' of you want to confirm with a +single keystroke rather than having to type \"yes\"." :group 'org-link-follow :type '(choice (const :tag "with yes-or-no (safer)" yes-or-no-p) @@ -1411,11 +1411,12 @@ You can set this on a per-template basis with the variable (defcustom org-remember-templates nil "Templates for the creation of remember buffers. When nil, just let remember make the buffer. -When not nil, this is a list of 4-element lists. In each entry, the first -element is a character, a unique key to select this template. -The second element is the template. The third element is optional and can +When not nil, this is a list of 5-element lists. In each entry, the first +element is a the name of the template, It should be a single short word. +The second element is a character, a unique key to select this template. +The third element is the template. The forth element is optional and can specify a destination file for remember items created with this template. -The default file is given by `org-default-notes-file'. An optional forth +The default file is given by `org-default-notes-file'. An optional fifth element can specify the headline in that file that should be offered first when the user is asked to file the entry. The default headline is given in the variable `org-remember-default-headline'. @@ -1456,15 +1457,17 @@ w3, w3m | %:type %:url info | %:type %:file %:node calendar | %:type %:date" :group 'org-remember - :get (lambda (var) ; Make sure all entries have 4 elements + :get (lambda (var) ; Make sure all entries have 5 elements (mapcar (lambda (x) - (cond ((= (length x) 3) (append x '(""))) - ((= (length x) 2) (append x '("" ""))) + (if (not (stringp (car x))) (setq x (cons "" x))) + (cond ((= (length x) 4) (append x '(""))) + ((= (length x) 3) (append x '("" ""))) (t x))) (default-value var))) :type '(repeat :tag "enabled" - (list :value (?a "\n" nil nil) + (list :value ("" ?a "\n" nil nil) + (string :tag "Name") (character :tag "Selection Key") (string :tag "Template") (file :tag "Destination file (optional)") @@ -1784,14 +1787,6 @@ end of the second format." (concat "[" (substring f 1 -1) "]") f))) -(defcustom org-deadline-warning-days 14 - "No. of days before expiration during which a deadline becomes active. -This variable governs the display in sparse trees and in the agenda. -When negative, it means use this number (the absolute value of it) -even if a deadline has a different individual lead time specified." - :group 'org-time - :type 'number) - (defcustom org-popup-calendar-for-date-prompt t "Non-nil means, pop up a calendar when prompting for a date. In the calendar, the date can be selected with mouse-1. However, the @@ -1924,6 +1919,19 @@ lined-up with respect to each other." :group 'org-properties :type 'string) +(defcustom org-use-property-inheritance nil + "Non-nil means, properties apply also for sublevels. +This can cause significant overhead when doing a search, so this is turned +off by default. +When nil, only the properties directly given in the current entry count. + +However, note that some special properties use inheritance under special +circumstances (not in searches). Examples are CATEGORY, ARCHIVE, COLUMNS, +and the properties ending in \"_ALL\" when they are used as descriptor +for valid values of a property." + :group 'org-properties + :type 'boolean) + (defcustom org-columns-default-format "%25ITEM %TODO %3PRIORITY %TAGS" "The default column format, if no other format has been defined. This variable can be set on the per-file basis by inserting a line @@ -1985,6 +1993,12 @@ Nil means to remove them, after a query, from the list." :group 'org-agenda :type 'boolean) +(defcustom org-agenda-multi-occur-extra-files nil + "List of extra files to be searched by `org-occur-in-agenda-files'. +The files in `org-agenda-files' are always searched." + :group 'org-agenda + :type '(repeat file)) + (defcustom org-agenda-confirm-kill 1 "When set, remote killing from the agenda buffer needs confirmation. When t, a confirmation is always needed. When a number N, confirmation is @@ -2402,6 +2416,23 @@ nearest into the future." :group 'org-agenda-daily/weekly :type 'boolean) +(defcustom org-deadline-warning-days 14 + "No. of days before expiration during which a deadline becomes active. +This variable governs the display in sparse trees and in the agenda. +When negative, it means use this number (the absolute value of it) +even if a deadline has a different individual lead time specified." + :group 'org-time + :group 'org-agenda-daily/weekly + :type 'number) + +(defcustom org-scheduled-past-days 10000 + "No. of days to continue listing scheduled items that are not marked DONE. +When an item is scheduled on a date, it shows up in the agenda on this +day and will be listed until it is marked done for the number of days +given here." + :group 'org-agenda-daily/weekly + :type 'number) + (defgroup org-agenda-time-grid nil "Options concerning the time grid in the Org-mode Agenda." :tag "Org Agenda Time Grid" @@ -2585,6 +2616,28 @@ See also the variables `org-agenda-remove-times-when-in-prefix' and "The compiled version of the most recently used prefix format. See the variable `org-agenda-prefix-format'.") +(defcustom org-agenda-scheduled-leaders '("Scheduled: " "Sched.%2dx: ") + "Text preceeding scheduled items in the agenda view. +THis is a list with two strings. The first applies when the item is +scheduled on the current day. The second applies when it has been scheduled +previously, it may contain a %d to capture how many days ago the item was +scheduled." + :group 'org-agenda-line-format + :type '(list + (string :tag "Scheduled today ") + (string :tag "Scheduled previously"))) + +(defcustom org-agenda-deadline-leaders '("Deadline: " "In %3d d.: ") + "Text preceeding deadline items in the agenda view. +This is a list with two strings. The first applies when the item has its +deadline on the current day. The second applies when it is in the past or +in the future, it may contain %d to capture how many days away the deadline +is (was)." + :group 'org-agenda-line-format + :type '(list + (string :tag "Deadline today ") + (string :tag "Deadline relative"))) + (defcustom org-agenda-remove-times-when-in-prefix t "Non-nil means, remove duplicate time specifications in agenda items. When the format `org-agenda-prefix-format' contains a `%t' specifier, a @@ -2638,6 +2691,12 @@ it means that the tags should be flushright to that column. For example, (if (fboundp 'defvaralias) (defvaralias 'org-agenda-align-tags-to-column 'org-agenda-tags-column)) +(defcustom org-agenda-fontify-priorities t + "Non-nil means, highlight low and high priorities in agenda. +The highest priority entries are bold, lowest priority italic." + :group 'org-agenda-line-format + :type 'boolean) + (defgroup org-latex nil "Options for embedding LaTeX code into Org-mode" :tag "Org LaTeX" @@ -2836,7 +2895,9 @@ e.g. \"timestamp:nil\"." (defcustom org-export-with-tags 'not-in-toc "If nil, do not export tags, just remove them from headlines. If this is the symbol `not-in-toc', tags will be removed from table of -contents entries, but still be shown in the headlines of the document." +contents entries, but still be shown in the headlines of the document. + +This option can also be set with the +OPTIONS line, e.g. \"tags:nil\"." :group 'org-export-general :type '(choice (const :tag "Off" nil) @@ -4636,6 +4697,7 @@ will be prompted for." (defconst org-nonsticky-props '(mouse-face highlight keymap invisible intangible help-echo org-linked-text)) + (defun org-activate-plain-links (limit) "Run through the buffer and add overlays to links." (catch 'exit @@ -4652,6 +4714,13 @@ will be prompted for." )) (throw 'exit t)))))) +(defun org-activate-code (limit) + (if (re-search-forward "^[ \t]*\\(:.*\\)" limit t) + (unless (get-text-property (match-beginning 1) 'face) + (remove-text-properties (match-beginning 0) (match-end 0) + '(display t invisible t intangible t)) + t))) + (defun org-activate-angle-links (limit) "Run through the buffer and add overlays to links." (if (re-search-forward org-angle-link-re limit t) @@ -4823,7 +4892,20 @@ between words." (2 (org-get-level-face 2)) (3 (org-get-level-face 3))) ;; Table lines '("^[ \t]*\\(\\(|\\|\\+-[-+]\\).*\\S-\\)" - (1 'org-table)) + (1 'org-table t)) + ;; Table internals + '("| *\\(:?=[^|\n]*\\)" (1 'org-formula t)) + '("^[ \t]*| *\\([#*]\\) *|" (1 'org-formula t)) + '("^[ \t]*|\\( *\\([$!_^/]\\) *|.*\\)|" (1 'org-formula t)) + ;; Drawers + (list org-drawer-regexp '(0 'org-special-keyword t)) + (list "^[ \t]*:END:" '(0 'org-special-keyword t)) + ;; Properties + (list org-property-re + '(1 'org-special-keyword t) + '(3 'org-property-value t)) + (if org-format-transports-properties-p + '("| *\\(<[0-9]+>\\) *" (1 'org-formula t))) ;; Links (if (memq 'tag lk) '(org-activate-tags (1 'org-tag prepend))) (if (memq 'angle lk) '(org-activate-angle-links (0 'org-link t))) @@ -4855,7 +4937,7 @@ between words." (if (featurep 'xemacs) '(org-do-emphasis-faces (0 nil append)) '(org-do-emphasis-faces))) - ;; Checkboxes, similar to Frank Ruell's org-checklet.el + ;; Checkboxes '("^[ \t]*\\([-+*]\\|[0-9]+[.)]\\) +\\(\\[[- X]\\]\\)" 2 'bold prepend) (if org-provide-checkbox-statistics @@ -4866,22 +4948,12 @@ between words." "\\|" org-quote-string "\\)\\>") '(1 'org-special-keyword t)) '("^#.*" (0 'font-lock-comment-face t)) - ;; Code - '("^[ \t]*\\(:.*\\)" (1 'org-code t)) - ;; Table internals - '("| *\\(:?=[^|\n]*\\)" (1 'org-formula t)) - '("^[ \t]*| *\\([#*]\\) *|" (1 'org-formula t)) - '("^[ \t]*|\\( *\\([$!_^/]\\) *|.*\\)|" (1 'org-formula t)) - ;; Drawers - (list org-drawer-regexp '(0 'org-special-keyword t)) - (list "^[ \t]*:END:" '(0 'org-special-keyword t)) - ;; Properties - (list org-property-re - '(1 'org-special-keyword t) - '(3 'org-property-value t)) - (if org-format-transports-properties-p - '("| *\\(<[0-9]+>\\) *" (1 'org-formula t))) '("^\\*+ \\(.*:ARCHIVE:.*\\)" (1 'org-archived prepend)) + ;; Code + '(org-activate-code (1 'org-code t)) + ;; Priorities + '("^\\*+ .*?\\[#A\\].*" (0 'bold prepend)) + '("^\\*+ .*?\\[#C\\].*" (0 'italic prepend)) ))) (setq org-font-lock-extra-keywords (delq nil org-font-lock-extra-keywords)) ;; Now set the full font-lock-keywords @@ -5783,17 +5855,19 @@ ring. We need it to check if the kill was created by `org-copy-subtree'.") "Was the last copied subtree folded? This is used to fold the tree back after pasting.") -(defun org-cut-subtree () +(defun org-cut-subtree (&optional n) "Cut the current subtree into the clipboard. +With prefix arg N, cut this many sequential subtrees. This is a short-hand for marking the subtree and then cutting it." - (interactive) - (org-copy-subtree 'cut)) + (interactive "p") + (org-copy-subtree n 'cut)) -(defun org-copy-subtree (&optional cut) +(defun org-copy-subtree (&optional n cut) "Cut the current subtree into the clipboard. +With prefix arg N, cut this many sequential subtrees. This is a short-hand for marking the subtree and then copying it. If CUT is non-nil, actually cut the subtree." - (interactive) + (interactive "p") (let (beg end folded) (if (interactive-p) (org-back-to-heading nil) ; take what looks like a subtree @@ -5802,15 +5876,17 @@ If CUT is non-nil, actually cut the subtree." (save-match-data (save-excursion (outline-end-of-heading) (setq folded (org-invisible-p))) - (outline-end-of-subtree)) - (if (equal (char-after) ?\n) (forward-char 1)) + (condition-case nil + (outline-forward-same-level (1- n)) + (error nil)) + (org-end-of-subtree t t)) (setq end (point)) (goto-char beg) (when (> end beg) (setq org-subtree-clip-folded folded) (if cut (kill-region beg end) (copy-region-as-kill beg end)) (setq org-subtree-clip (current-kill 0)) - (message "%s: Subtree with %d characters" + (message "%s: Subtree(s) with %d characters" (if cut "Cut" "Copied") (length org-subtree-clip))))) @@ -5839,7 +5915,7 @@ If optional TREE is given, use this text instead of the kill ring." (let* ((txt (or tree (and kill-ring (current-kill 0)))) (^re (concat "^\\(" outline-regexp "\\)")) (re (concat "\\(" outline-regexp "\\)")) - (^re_ (concat "\\(" outline-regexp "\\)[ \t]*")) + (^re_ (concat "\\(\\*+\\)[ \t]*")) (old-level (if (string-match ^re txt) (- (match-end 0) (match-beginning 0) 1) @@ -5847,22 +5923,23 @@ If optional TREE is given, use this text instead of the kill ring." (force-level (cond (level (prefix-numeric-value level)) ((string-match ^re_ (buffer-substring (point-at-bol) (point))) - (- (match-end 0) (match-beginning 0))) + (- (match-end 1) (match-beginning 1))) (t nil))) (previous-level (save-excursion (condition-case nil (progn (outline-previous-visible-heading 1) (if (looking-at re) - (- (match-end 0) (match-beginning 0)) + (- (match-end 0) (match-beginning 0) 1) 1)) (error 1)))) (next-level (save-excursion (condition-case nil (progn - (outline-next-visible-heading 1) + (or (looking-at outline-regexp) + (outline-next-visible-heading 1)) (if (looking-at re) - (- (match-end 0) (match-beginning 0)) + (- (match-end 0) (match-beginning 0) 1) 1)) (error 1)))) (new-level (or force-level (max previous-level next-level))) @@ -11010,7 +11087,7 @@ For file links, arg negates `org-context-in-file-links'." (elmo-msgdb-overview-get-entity msgnum (wl-summary-buffer-msgdb)))) (from (wl-summary-line-from)) - (to (car (elmo-message-entity-field wl-message-entity 'to))) + (to (elmo-message-entity-field wl-message-entity 'to)) (subject (let (wl-thr-indent-string wl-parent-message-entity) (wl-summary-line-subject)))) (org-store-link-props :type "wl" :from from :to to @@ -12432,23 +12509,34 @@ RET at beg-of-buf -> Append to file as level 2 headline This function should be placed into `remember-mode-hook' and in fact requires to be run from that hook to fucntion properly." (if org-remember-templates - - (let* ((char (or use-char + (let* ((templates (mapcar (lambda (x) + (if (stringp (car x)) + (append (list (nth 1 x) (car x)) (cddr x)) + (append (list (car x) "") (cdr x)))) + org-remember-templates)) + (char (or use-char (cond - ((= (length org-remember-templates) 1) - (caar org-remember-templates)) + ((= (length templates) 1) + (caar templates)) ((and (boundp 'org-force-remember-template-char) org-force-remember-template-char) - (if (string-p org-force-remember-template-char) + (if (stringp org-force-remember-template-char) (string-to-char org-force-remember-template-char) org-force-remember-template-char)) (t (message "Select template: %s" (mapconcat - (lambda (x) (char-to-string (car x))) - org-remember-templates " ")) + (lambda (x) + (cond + ((not (string-match "\\S-" (nth 1 x))) + (format "[%c]" (car x))) + ((equal (downcase (car x)) + (downcase (aref (nth 1 x) 0))) + (format "[%c]%s" (car x) (substring (nth 1 x) 1))) + (t (format "[%c]%s" (car x) (nth 1 x))))) + templates " ")) (read-char-exclusive))))) - (entry (cdr (assoc char org-remember-templates))) + (entry (cddr (assoc char templates))) (tpl (car entry)) (plist-p (if org-store-link-plist t nil)) (file (if (and (nth 1 entry) (stringp (nth 1 entry)) @@ -12460,8 +12548,11 @@ to be run from that hook to fucntion properly." (v-T (format-time-string (cdr org-time-stamp-formats) (org-current-time))) (v-u (concat "[" (substring v-t 1 -1) "]")) (v-U (concat "[" (substring v-T 1 -1) "]")) - (v-i initial) ; defined in `remember-mode' - (v-a (if (equal annotation "[[]]") "" annotation)) ; likewise + ;; `initial' and `annotation' are bound in `remember' + (v-i (if (boundp 'initial) initial)) + (v-a (if (and (boundp 'annotation) annotation) + (if (equal annotation "[[]]") "" annotation) + "")) (v-A (if (and v-a (string-match "\\[\\(\\[.*?\\]\\)\\(\\[.*?\\]\\)?\\]" v-a)) (replace-match "[\\1[%^{Link description}]]" nil nil v-a) @@ -12480,7 +12571,7 @@ to be run from that hook to fucntion properly." ## %s to select file and header location interactively. ## %s \"%s\" -> \"* %s\" ## C-u C-u C-c C-c \"%s\" -> \"* %s\" -## To switch templates, use `\\[org-remember]'.\n\n" +## To switch templates, use `\\[org-remember]'. To abort use `C-c C-k'.\n\n" (if org-remember-store-without-prompt " C-u C-c C-c" " C-c C-c") (if org-remember-store-without-prompt " C-c C-c" " C-u C-c C-c") (abbreviate-file-name (or file org-default-notes-file)) @@ -12574,6 +12665,8 @@ of the remember buffer." (remember (buffer-substring (point) (mark))) (call-interactively 'remember)))) +(defvar org-note-abort nil) ; dynamically scoped + ;;;###autoload (defun org-remember-handler () "Store stuff from remember.el into an org file. @@ -12616,6 +12709,7 @@ See also the variable `org-reverse-note-order'." (goto-char (point-max)) (unless (equal (char-before) ?\n) (insert "\n")) (catch 'quit + (if org-note-abort (throw 'quit nil)) (let* ((txt (buffer-substring (point-min) (point-max))) (fastp (org-xor (equal current-prefix-arg '(4)) org-remember-store-without-prompt)) @@ -12999,7 +13093,7 @@ At all other locations, this simply calls the value of (save-excursion (org-back-to-heading) (if (looking-at (concat outline-regexp - "\\( *\\<" org-comment-string "\\>\\)")) + "\\( *\\<" org-comment-string "\\>[ \t]*\\)")) (replace-match "" t t nil 1) (if (looking-at outline-regexp) (progn @@ -13469,11 +13563,13 @@ The auto-repeater uses this.") (org-switch-to-buffer-other-window "*Org Note*") (erase-buffer) (let ((org-inhibit-startup t)) (org-mode)) - (insert (format "# Insert note for %s, finish with C-c C-c, or cancel with C-u C-c C-c.\n\n" + (insert (format "# Insert note for %s. +# Finish with C-c C-c, or cancel with C-c C-k.\n\n" (cond ((eq org-log-note-purpose 'clock-out) "stopped clock") ((eq org-log-note-purpose 'done) "closed todo item") - ((eq org-log-note-purpose 'state) "state change") + ((eq org-log-note-purpose 'state) + (format "state change to \"%s\"" org-log-note-state)) (t (error "This should not happen"))))) (org-set-local 'org-finish-function 'org-store-log-note)) @@ -13483,8 +13579,8 @@ The auto-repeater uses this.") (note (cdr (assq org-log-note-purpose org-log-note-headings))) lines ind) (kill-buffer (current-buffer)) - (if (string-match "^#.*\n[ \t\n]*" txt) - (setq txt (replace-match "" t t txt))) + (while (string-match "\\`#.*\n[ \t\n]*" txt) + (setq txt (replace-match "" t t txt))) (if (string-match "\\s-+\\'" txt) (setq txt (replace-match "" t t txt))) (setq lines (org-split-string txt "\n")) @@ -13502,7 +13598,7 @@ The auto-repeater uses this.") ""))))) (if lines (setq note (concat note " \\\\"))) (push note lines)) - (when current-prefix-arg (setq lines nil)) + (when (or current-prefix-arg org-note-abort (setq lines nil))) (when lines (save-excursion (set-buffer (marker-buffer org-log-note-marker)) @@ -13510,7 +13606,8 @@ The auto-repeater uses this.") (goto-char org-log-note-marker) (move-marker org-log-note-marker nil) (end-of-line 1) - (if (not (bolp)) (insert "\n")) (indent-relative nil) + (if (not (bolp)) (let ((inhibit-read-only t)) (insert "\n"))) + (indent-relative nil) (insert " - " (pop lines)) (org-indent-line-function) (beginning-of-line 1) @@ -13739,7 +13836,9 @@ are included in the output." todo marker entry priority) (save-excursion (goto-char (point-min)) - (when (eq action 'sparse-tree) (org-overview)) + (when (eq action 'sparse-tree) + (org-overview) + (org-remove-occur-highlights)) (while (re-search-forward re nil t) (catch :skip (setq todo (if (match-end 1) (match-string 2)) @@ -13769,8 +13868,13 @@ are included in the output." (not (member org-archive-tag tags-list)))) (and (eq action 'agenda) (org-agenda-skip)) ;; list this headline + (if (eq action 'sparse-tree) (progn + (and org-highlight-sparse-tree-matches + (org-get-heading) (match-end 0) + (org-highlight-new-match + (match-beginning 0) (match-beginning 1))) (org-show-context 'tags-tree)) (setq txt (org-format-agenda-item "" @@ -13806,9 +13910,13 @@ also TODO lines." (defvar org-cached-props nil) (defun org-cached-entry-get (pom property) - (cdr (assoc property (or org-cached-props - (setq org-cached-props - (org-entry-properties pom)))))) + (if org-use-property-inheritance + ;; Caching is not possible, check it directly + (org-entry-get pom property 'inherit) + ;; Get all properties, so that we can do complicated checks easily + (cdr (assoc property (or org-cached-props + (setq org-cached-props + (org-entry-properties pom))))))) (defun org-global-tags-completion-table (&optional files) "Return the list of all tags in all agenda buffer/files." @@ -13837,7 +13945,7 @@ also TODO lines." ;; Parse the string and create a lisp form (let ((match0 match) - (re (org-re "^&?\\([-+:]\\)?\\({[^}]+}\\|LEVEL=\\([0-9]+\\)\\|\\([[:alnum:]]+\\)=\\({[^}]+}\\|\"[^\"]+\"\\)\\|[[:alnum:]_@]+\\)")) + (re (org-re "^&?\\([-+:]\\)?\\({[^}]+}\\|LEVEL=\\([0-9]+\\)\\|\\([[:alnum:]_]+\\)=\\({[^}]+}\\|\"[^\"]+\"\\)\\|[[:alnum:]_@]+\\)")) minus tag mm tagsmatch todomatch tagsmatcher todomatcher kwd matcher orterms term orlist re-p level-p prop-p pn pv) @@ -13877,7 +13985,7 @@ also TODO lines." re-p (equal (string-to-char pv) ?{) pv (substring pv 1 -1)) (if re-p - `(string-match ,pv (org-cached-entry-get nil ,pn)) + `(string-match ,pv (or (org-cached-entry-get nil ,pn) "")) `(equal ,pv (org-cached-entry-get nil ,pn)))) (t `(member ,(downcase tag) tags-list))) mm (if minus (list 'not mm) mm) @@ -14601,15 +14709,29 @@ internally: ARCHIVE, CATEGORY, SUMMARY, DESCRIPTION, LOCATION, and LOGGING." (when include-specials (setq rtn (append org-special-properties rtn))) (when include-defaults - (add-to-list rtn "CATEGORY") - (add-to-list rtn "ARCHIVE")) + (add-to-list 'rtn "CATEGORY") + (add-to-list 'rtn "ARCHIVE")) (sort rtn (lambda (a b) (string< (upcase a) (upcase b)))))) +(defun org-property-values (key) + "Return a list of all values of property KEY." + (save-excursion + (save-restriction + (widen) + (goto-char (point-min)) + (let ((re (concat "^[ \t]*:" key ":[ \t]*\\(\\S-.*\\)")) + values) + (while (re-search-forward re nil t) + (add-to-list 'values (org-trim (match-string 1)))) + (delete "" values))))) + (defun org-insert-property-drawer () "Insert a property drawer into the current entry." (interactive) (org-back-to-heading t) - (let ((beg (point)) + (looking-at outline-regexp) + (let ((indent (- (match-end 0)(match-beginning 0))) + (beg (point)) (re (concat "^[ \t]*" org-keyword-time-regexp)) end hiddenp) (outline-next-heading) @@ -14620,12 +14742,12 @@ internally: ARCHIVE, CATEGORY, SUMMARY, DESCRIPTION, LOCATION, and LOGGING." (end-of-line 1) (and (= (char-after) ?\n) (forward-char 1)) (org-skip-over-state-notes) - (end-of-line 0) + (skip-chars-backward " \t\n\r") (insert "\n:PROPERTIES:\n:END:") (beginning-of-line 0) - (org-indent-line-function) + (indent-to-column indent) (beginning-of-line 2) - (org-indent-line-function) + (indent-to-column indent) (beginning-of-line 0) (if hiddenp (save-excursion @@ -15603,8 +15725,18 @@ existing stamp. For example, 22 sept 0:34 --> currentyear-09-22 0:34 12 --> currentyear-currentmonth-12 Fri --> nearest Friday (today or later) - +4 --> four days from today (only if +N is the only thing given) etc. + +Furthermore you can specify a relative date by giving, as the *first* thing +in the input: a plus/minus sign, a number and a letter [dwmy] to indicate +change in days weeks, months, years. +With a single plus or minus, the date is relative to today. With a double +plus or minus, it is relative to the date in DEFAULT-TIME. E.g. + +4d --> four days from today + +4 --> same as above + +2w --> two weeks from today + ++5 --> five days from default date + The function understands only English month and weekday abbreviations, but this can be configured with the variables `parse-time-months' and `parse-time-weekdays'. @@ -15638,7 +15770,7 @@ user." (if with-time "%Y-%m-%d %H:%M" "%Y-%m-%d") def)) (prompt (concat (if prompt (concat prompt " ") "") (format "Date and/or time (default [%s]): " timestr))) - ans (org-ans0 "") org-ans1 org-ans2 (deltadays 0) + ans (org-ans0 "") org-ans1 org-ans2 deltan deltaw deltarel second minute hour day month year tl wday wday1 pm h2 m2) (cond @@ -15696,8 +15828,12 @@ user." (setq ans (read-string prompt "" nil timestr)))) (org-detach-overlay org-date-ovl) - (if (string-match "^[ \t]*[-+][0-9]+[ \t]*$" org-ans0) - (setq deltadays (string-to-number ans) ans "")) + (when (string-match + "\\`[ \t]*\\([-+]\\)?\\([-+][0-9]+\\)\\([dwmy]?\\)\\([ \t\n]\\|$\\)" + org-ans0) + (setq deltan (string-to-number (match-string 2 ans)) + deltaw (match-string 3 ans) + deltarel (match-end 1))) ;; Help matching ISO dates with single digit month ot day, like 2006-8-11. (when (string-match @@ -15752,7 +15888,14 @@ user." minute (or (nth 1 tl) (string-to-number (format-time-string "%M" def))) second (or (nth 0 tl) 0) wday (nth 6 tl)) - (setq day (+ day deltadays)) + (when deltan + (unless deltarel + (let ((now (decode-time (current-time)))) + (setq day (nth 3 now) month (nth 4 now) year (nth 5 now)))) + (cond ((member deltaw '("d" "")) (setq day (+ day deltan))) + ((equal deltaw "w") (setq day (+ day (* 7 deltan)))) + ((equal deltaw "m") (setq month (+ month deltan))) + ((equal deltaw "y") (setq year (+ year deltan))))) (when (and wday (not (nth 3 tl))) ;; Weekday was given, but no day, so pick that day in the week ;; on or after the derived date. @@ -16254,7 +16397,8 @@ With prefix ARG, change that many days." (if (> (point) (point-min)) (backward-char 1)) (and (looking-at tsr) (> (- (match-end 0) pos) -1)))))) - (and (boundp 'org-ts-what) + (and ans + (boundp 'org-ts-what) (setq org-ts-what (cond ((org-pos-in-match-range pos 2) 'year) @@ -16310,11 +16454,7 @@ in the timestamp determines what will be changed." (when (integerp org-ts-what) (setq extra (org-modify-ts-extra extra org-ts-what n))) (if (eq what 'calendar) - (let ((cal-date - (save-excursion - (save-match-data - (set-buffer "*Calendar*") - (calendar-cursor-to-date))))) + (let ((cal-date (org-get-date-from-calendar))) (setcar (nthcdr 4 time0) (nth 0 cal-date)) ; month (setcar (nthcdr 3 time0) (nth 1 cal-date)) ; day (setcar (nthcdr 5 time0) (nth 2 cal-date)) ; year @@ -16394,11 +16534,21 @@ A prefix ARG can be used to force the current date." (calendar-goto-today) (if (and diff (not arg)) (calendar-forward-day diff)))) +(defun org-get-date-from-calendar () + "Return a list (month day year) of date at point in calendar." + (with-current-buffer "*Calendar*" + (save-match-data + (calendar-cursor-to-date)))) + (defun org-date-from-calendar () "Insert time stamp corresponding to cursor date in *Calendar* buffer. If there is already a time stamp at the cursor position, update it." (interactive) - (org-timestamp-change 0 'calendar)) + (if (org-at-timestamp-p t) + (org-timestamp-change 0 'calendar) + (let ((cal-date (org-get-date-from-calendar))) + (org-insert-time-stamp + (encode-time 0 0 0 (nth 1 cal-date) (car cal-date) (nth 2 cal-date)))))) ;; Make appt aware of appointments from the agenda (defun org-agenda-to-appt (&optional filter) @@ -17407,6 +17557,7 @@ a Agenda for current week or day e Export agenda views t List of all TODO entries T Entries with special TODO kwd m Match a TAGS query M Like m, but only TODO entries L Timeline for current buffer # List stuck projects (!=configure) +/ Multi-occur ") (start 0)) (while (string-match "\\(^\\| \\|(\\)\\(\\S-\\)\\( \\|=\\)" header start) @@ -17519,6 +17670,7 @@ L Timeline for current buffer # List stuck projects (!=configure) (error "This is not an Org-mode file")) (org-call-with-arg 'org-timeline arg)) ((equal c ?#) (call-interactively 'org-agenda-list-stuck-projects)) + ((equal c ?/) (call-interactively 'org-occur-in-agenda-files)) ((equal c ?!) (customize-variable 'org-stuck-projects)) (t (error "Invalid key")))))) @@ -17782,8 +17934,7 @@ higher priority settings." "Fit the window to the buffer size." (and (memq org-agenda-window-setup '(reorganize-frame)) (fboundp 'fit-window-to-buffer) - (fit-window-to-buffer nil (/ (* (frame-height) 3) 4) - (/ (frame-height) 2)))) + (fit-window-to-buffer))) ;;; Agenda file list @@ -17990,8 +18141,33 @@ Optional argument FILE means, use this file instead of the current." (if (and (boundp 'org-agenda-view-columns-initially) org-agenda-view-columns-initially) (org-agenda-columns)) + (when org-agenda-fontify-priorities + (org-fontify-priorities)) (run-hooks 'org-finalize-agenda-hook)))) +(defun org-fontify-priorities () + "Make highest priority lines bold, and lowest italic." + (interactive) + (mapc (lambda (o) (if (eq (org-overlay-get o 'org-type) 'org-priority) + (org-delete-overlay o))) + (overlays-in (point-min) (point-max))) + (save-excursion + (let ((ovs (org-overlays-in (point-min) (point-max))) + (inhibit-read-only t) + b e p ov h l) + (goto-char (point-min)) + (while (re-search-forward "\\[#\\(.\\)\\]" nil t) + (setq h (or (get-char-property (point) 'org-highest-priority) + org-highest-priority) + l (or (get-char-property (point) 'org-lowest-priority) + org-lowest-priority) + p (string-to-char (match-string 1)) + b (match-beginning 0) e (line-end-position) + ov (org-make-overlay b e)) + (org-overlay-put ov 'face (cond ((equal p l) 'italic) + ((equal p h) 'bold))) + (org-overlay-put ov 'org-type 'org-priority))))) + (defun org-prepare-agenda-buffers (files) "Create buffers for all agenda files, protect archived trees and comments." (interactive) @@ -18117,6 +18293,8 @@ When a buffer is unmodified, it is just killed. When modified, it is saved ;;; Agenda timeline +(defvar org-agenda-only-exact-dates nil) ; dynamically scoped + (defun org-timeline (&optional include-all) "Show a time-sorted view of the entries in the current org file. Only entries with a time stamp of today or later will be listed. With @@ -18138,6 +18316,8 @@ dates." (day-numbers (org-get-all-dates beg end 'no-ranges t doclosed ; always include today org-timeline-show-empty-dates)) + (org-deadline-warning-days 0) + (org-agenda-only-exact-dates t) (today (time-to-days (current-time))) (past t) args @@ -18155,6 +18335,8 @@ dates." (file-name-nondirectory buffer-file-name))) (if doclosed (push :closed args)) (push :timestamp args) + (push :deadline args) + (push :scheduled args) (push :sexp args) (if dotodo (push :todo args)) (while (setq d (pop day-numbers)) @@ -18290,6 +18472,7 @@ NDAYS defaults to `org-agenda-ndays'." (d (- nt n1))) (- sd (+ (if (< d 0) 7 0) d))))) (day-numbers (list start)) + (day-cnt 0) (inhibit-redisplay (not debug-on-error)) s e rtn rtnall file date d start-pos end-pos todayp nd) (setq org-agenda-redo-command @@ -18356,6 +18539,7 @@ NDAYS defaults to `org-agenda-ndays'." (setq rtnall (append rtnall rtn)))) (if (or rtnall org-agenda-show-all-dates) (progn + (setq day-cnt (1+ day-cnt)) (insert (if (stringp org-agenda-format-date) (format-time-string org-agenda-format-date @@ -18364,13 +18548,15 @@ NDAYS defaults to `org-agenda-ndays'." "\n") (put-text-property s (1- (point)) 'face 'org-agenda-structure) (put-text-property s (1- (point)) 'org-date-line t) + (put-text-property s (1- (point)) 'org-day-cnt day-cnt) (if todayp (put-text-property s (1- (point)) 'org-today t)) (if rtnall (insert (org-finalize-agenda-entries (org-agenda-add-time-grid-maybe rtnall nd todayp)) "\n")) - (put-text-property s (1- (point)) 'day d)))) + (put-text-property s (1- (point)) 'day d) + (put-text-property s (1- (point)) 'org-day-cnt day-cnt)))) (goto-char (point-min)) (org-fit-agenda-window) (unless (and (pos-visible-in-window-p (point-min)) @@ -19152,7 +19338,8 @@ the documentation of `org-diary'." ;; When to show a deadline in the calendar: ;; If the expiration is within wdays warning time. ;; Past-due deadlines are only shown on the current date - (if (or (and (<= diff wdays) todayp) + (if (or (and (<= diff wdays) + (and todayp (not org-agenda-only-exact-dates))) (= diff 0)) (save-excursion (setq category (org-get-category)) @@ -19176,8 +19363,9 @@ the documentation of `org-diary'." (setq txt nil) (setq txt (org-format-agenda-item (if (= diff 0) - "Deadline: " - (format "In %3d d.: " diff)) + (car org-agenda-deadline-leaders) + (format (nth 1 org-agenda-deadline-leaders) + diff)) head category tags timestr)))) (setq txt org-agenda-no-heading-message)) (when txt @@ -19229,7 +19417,8 @@ FRACTION is what fraction of the head-warning time has passed." (setq pastschedp (and todayp (< diff 0))) ;; When to show a scheduled item in the calendar: ;; If it is on or past the date. - (if (or (and (< diff 0) todayp) + (if (or (and (< diff 0) + (and todayp (not org-agenda-only-exact-dates))) (= diff 0)) (save-excursion (setq category (org-get-category)) @@ -19252,8 +19441,9 @@ FRACTION is what fraction of the head-warning time has passed." (setq txt nil) (setq txt (org-format-agenda-item (if (= diff 0) - "Scheduled: " - (format "Sched.%2dx: " (- 1 diff))) + (car org-agenda-scheduled-leaders) + (format (nth 1 org-agenda-scheduled-leaders) + (- 1 diff))) head category tags timestr)))) (setq txt org-agenda-no-heading-message)) (when txt @@ -19461,6 +19651,8 @@ Any match of REMOVE-RE will be removed from TXT." ;; And finally add the text properties (org-add-props rtn nil 'org-category (downcase category) 'tags tags + 'org-highest-priority org-highest-priority + 'org-lowest-priority org-lowest-priority 'prefix-length (- (length rtn) (length txt)) 'time-of-day time-of-day 'txt txt @@ -19554,11 +19746,9 @@ The optional STRING argument forces conversion into a 5 character wide string HH:MM." (save-match-data (when - (or - (string-match - "\\<\\([012]?[0-9]\\)\\(:\\([0-5][0-9]\\)\\)\\([AaPp][Mm]\\)?\\> *" s) - (string-match - "\\<\\([012]?[0-9]\\)\\(:\\([0-5][0-9]\\)\\)?\\([AaPp][Mm]\\)\\> *" s)) + (and (or (string-match "\\<\\([012]?[0-9]\\)\\(:\\([0-5][0-9]\\)\\)\\([AaPp][Mm]\\)?\\> *" s) + (string-match "\\<\\([012]?[0-9]\\)\\(:\\([0-5][0-9]\\)\\)?\\([AaPp][Mm]\\)\\> *" s)) + (not (equal (string-to-char (substring s (match-end 0))) ?\]))) (let* ((h (string-to-number (match-string 1 s))) (m (if (match-end 3) (string-to-number (match-string 3 s)) 0)) (ampm (if (match-end 4) (downcase (match-string 4 s)))) @@ -19729,12 +19919,13 @@ When this is the global TODO list, a prefix argument will be interpreted." (setf (nth 1 org-agenda-overriding-arguments) (car comp)) (setf (nth 2 org-agenda-overriding-arguments) (cdr comp)) (org-agenda-redo) - (org-agenda-find-today-or-agenda))) + (org-agenda-find-same-or-today-or-agenda))) (t (error "Cannot find today"))))) -(defun org-agenda-find-today-or-agenda () +(defun org-agenda-find-same-or-today-or-agenda (&optional cnt) (goto-char - (or (text-property-any (point-min) (point-max) 'org-today t) + (or (and cnt (text-property-any (point-min) (point-max) 'org-day-cnt cnt)) + (text-property-any (point-min) (point-max) 'org-today t) (text-property-any (point-min) (point-max) 'org-agenda-type 'agenda) (point-min)))) @@ -19746,6 +19937,7 @@ With prefix ARG, go forward that many times the current span." (let* ((span org-agenda-span) (sd org-starting-day) (greg (calendar-gregorian-from-absolute sd)) + (cnt (get-text-property (point) 'org-day-cnt)) greg2 nd) (cond ((eq span 'day) @@ -19764,8 +19956,8 @@ With prefix ARG, go forward that many times the current span." (setq nd (- (calendar-absolute-from-gregorian greg2) sd)))) (let ((org-agenda-overriding-arguments (list (car org-agenda-last-arguments) sd nd t))) - (org-agenda-redo) - (org-agenda-find-today-or-agenda)))) + (org-agenda-redo) + (org-agenda-find-same-or-today-or-agenda cnt)))) (defun org-agenda-earlier (arg) "Go backward in time by the current span. @@ -19807,7 +19999,7 @@ SPAN may be `day', `week', `month', `year'." (list (car org-agenda-last-arguments) (car computed) (cdr computed) t))) (org-agenda-redo) - (org-agenda-find-today-or-agenda)) + (org-agenda-find-same-or-today-or-agenda)) (org-agenda-set-mode-name) (message "Switched to %s view" span)) @@ -20982,6 +21174,7 @@ The images can be removed again with \\[org-ctrl-c-ctrl-c]." (:sub-superscript . org-export-with-sub-superscripts) (:footnotes . org-export-with-footnotes) (:property-drawer . org-export-with-property-drawer) + (:tags . org-export-with-tags) (:TeX-macros . org-export-with-TeX-macros) (:LaTeX-fragments . org-export-with-LaTeX-fragments) (:skip-before-1st-heading . org-export-skip-text-before-1st-heading) @@ -21044,6 +21237,7 @@ The images can be removed again with \\[org-ctrl-c-ctrl-c]." ("^" . :sub-superscript) ("f" . :footnotes) ("p" . :property-drawer) + ("tags" . :tags) ("*" . :emphasize) ("TeX" . :TeX-macros) ("LaTeX" . :LaTeX-fragments) @@ -21905,6 +22099,12 @@ underlined headlines. The default is 3." line lines level)))) (setq txt (org-html-expand-for-ascii txt)) + (while (string-match org-bracket-link-regexp txt) + (setq txt + (replace-match + (match-string (if (match-end 2) 3 1) txt) + t t txt))) + (if (and (memq org-export-with-tags '(not-in-toc nil)) (string-match (org-re "[ \t]+:[[:alnum:]_@:]+:[ \t]*$") @@ -22154,7 +22354,7 @@ Does include HTML export options as well as TODO and CATEGORY stuff." #+EMAIL: %s #+LANGUAGE: %s #+TEXT: Some descriptive text to be emitted. Several lines OK. -#+OPTIONS: H:%d num:%s toc:%s \\n:%s @:%s ::%s |:%s ^:%s f:%s *:%s TeX:%s LaTeX:%s skip:%s p:%s +#+OPTIONS: H:%d num:%s toc:%s \\n:%s @:%s ::%s |:%s ^:%s f:%s *:%s TeX:%s LaTeX:%s skip:%s p:%s tags:%s #+CATEGORY: %s #+SEQ_TODO: %s #+TYP_TODO: %s @@ -22179,6 +22379,7 @@ Does include HTML export options as well as TODO and CATEGORY stuff." org-export-with-LaTeX-fragments org-export-skip-text-before-1st-heading org-export-with-property-drawer + org-export-with-tags (file-name-nondirectory buffer-file-name) "TODO FEEDBACK VERIFY DONE" "Me Jason Marie DONE" @@ -22250,7 +22451,7 @@ this line is also exported in fixed-width font." (save-excursion (org-back-to-heading) (if (looking-at (concat outline-regexp - "\\( *\\<" org-quote-string "\\>\\)")) + "\\( *\\<" org-quote-string "\\>[ \t]*\\)")) (replace-match "" t t nil 1) (if (looking-at outline-regexp) (progn @@ -23910,8 +24111,7 @@ The XOXO buffer is named *xoxo-<source buffer name>*" (org-defkey org-mode-map "\C-c;" 'org-toggle-comment) (org-defkey org-mode-map "\C-c\C-v" 'org-show-todo-tree) (org-defkey org-mode-map "\C-c\C-w" 'org-check-deadlines) -(org-defkey org-mode-map "\C-c/" 'org-occur) ; Minor-mode reserved -(org-defkey org-mode-map "\C-c\C-x/" 'org-occur-in-agenda-files) +(org-defkey org-mode-map "\C-c/" 'org-sparse-tree) ; Minor-mode reserved (org-defkey org-mode-map "\C-c\\" 'org-tags-sparse-tree) ; Minor-mode res. (org-defkey org-mode-map "\C-c\C-m" 'org-ctrl-c-ret) (org-defkey org-mode-map "\M-\C-m" 'org-insert-heading) @@ -23936,6 +24136,7 @@ The XOXO buffer is named *xoxo-<source buffer name>*" (org-defkey org-mode-map "\C-c-" 'org-ctrl-c-minus) (org-defkey org-mode-map "\C-c^" 'org-sort) (org-defkey org-mode-map "\C-c\C-c" 'org-ctrl-c-ctrl-c) +(org-defkey org-mode-map "\C-c\C-k" 'org-kill-note-or-show-branches) (org-defkey org-mode-map "\C-c#" 'org-update-checkbox-count) (org-defkey org-mode-map "\C-m" 'org-return) (org-defkey org-mode-map "\C-c?" 'org-table-field-info) @@ -23970,6 +24171,7 @@ The XOXO buffer is named *xoxo-<source buffer name>*" (org-defkey org-mode-map "\C-c\C-x\C-u" 'org-dblock-update) (org-defkey org-mode-map "\C-c\C-x\C-l" 'org-preview-latex-fragment) (org-defkey org-mode-map "\C-c\C-x\C-b" 'org-toggle-checkbox) +(org-defkey org-mode-map "\C-c\C-xp" 'org-set-property) (define-key org-mode-map "\C-c\C-x\C-c" 'org-columns) @@ -24395,6 +24597,14 @@ Also updates the keyword regular expressions." (let ((org-inhibit-startup t)) (org-mode)) (message "Org-mode restarted to refresh keyword and special line setup")) +(defun org-kill-note-or-show-branches () + "If this is a Note buffer, abort storing the note. Else call `show-branches'." + (interactive) + (if (not org-finish-function) + (call-interactively 'show-branches) + (let ((org-note-abort t)) + (funcall org-finish-function)))) + (defun org-return () "Goto next table row or insert a newline. Calls `org-table-next-row' or `newline', depending on context. @@ -24567,6 +24777,8 @@ See the individual commands for more information." ("TAGS and Properties" ["Set Tags" 'org-ctrl-c-ctrl-c (org-at-heading-p)] ["Change tag in region" 'org-change-tag-in-region (org-region-active-p)] + "--" + ["Set property" 'org-set-property t] ["Column view of properties" org-columns t]) ("Dates and Scheduling" ["Timestamp" org-time-stamp t] @@ -24832,14 +25044,20 @@ really on, so that the block visually is on the match." (throw 'exit t))) nil)))) -(defun org-occur-in-agenda-files (regexp) +(defun org-occur-in-agenda-files (regexp &optional nlines) "Call `multi-occur' with buffers for all agenda files." - (interactive "sList all lines matching: ") - (multi-occur - (mapcar - (lambda (x) (or (get-file-buffer x) (find-file-noselect x))) - (org-agenda-files)) - regexp)) + (interactive "sOrg-files matching: \np") + (let* ((files (org-agenda-files)) + (tnames (mapcar 'file-truename files)) + (extra org-agenda-multi-occur-extra-files) + f) + (while (setq f (pop extra)) + (unless (member (file-truename f) tnames) + (add-to-list 'files f 'append) + (add-to-list 'tnames (file-truename f) 'append))) + (multi-occur + (mapcar (lambda (x) (or (get-file-buffer x) (find-file-noselect x))) files) + regexp))) (defun org-uniquify (list) "Remove duplicate elements from LIST." @@ -25435,6 +25653,42 @@ Respect keys that are already there." (push (nth 2 e) rtn))) rtn))))) +;; FIXME: what else would be useful? +;; - priority +;; - date + +(defun org-sparse-tree (&optional arg) + "Create a sparse tree, prompt for the details. +This command can create sparse trees. You first need to select the type +of match used to create the tree: + +t Show entries with a specific TODO keyword. +T Show entries selected by a tags match. +p Enter a property name and its value (both with completion on existing + names/values) and show entries with that property. +r Show entries matching a regular expression" + (interactive "P") + (let (ans kwd value) + (message "Sparse tree: [r]egexp [t]odo-kwd [T]ag [p]roperty") + (setq ans (read-char-exclusive)) + (cond + ((equal ans ?t) + (org-show-todo-tree '(4))) + ((equal ans ?T) + (call-interactively 'org-tags-sparse-tree)) + ((member ans '(?p ?P)) + (setq kwd (completing-read "Property: " + (mapcar 'list (org-buffer-property-keys)))) + (setq value (completing-read "Value: " + (mapcar 'list (org-property-values kwd)))) + (unless (string-match "\\`{.*}\\'" value) + (setq value (concat "\"" value "\""))) + (org-tags-sparse-tree arg (concat kwd "=" value))) + ((member ans '(?r ?R)) + (call-interactively 'org-occur)) + (t (error "No such sparse tree command \"%c\"" ans))))) + + ;;;; Finish up (provide 'org) Binary files differ@@ -3,7 +3,7 @@ @setfilename ../info/org @settitle Org Mode Manual -@set VERSION 5.11b +@set VERSION 5.12 @set DATE October 2007 @dircategory Emacs @@ -839,9 +839,10 @@ Move subtree down (swap with next subtree of same level). @item C-c C-x C-w @itemx C-c C-x C-k Kill subtree, i.e. remove it from buffer but save in kill ring. +With prefix arg, kill N sequential subtrees. @kindex C-c C-x M-w @item C-c C-x M-w -Copy subtree to kill ring. +Copy subtree to kill ring. With prefix arg, copy N sequential subtrees. @kindex C-c C-x C-y @item C-c C-x C-y Yank subtree from kill ring. This does modify the level of the subtree to @@ -994,12 +995,15 @@ headline structure above it@footnote{See also the variables shown around each match.}. Just try it out and you will see immediately how it works. -Org-mode contains several commands creating such trees. The most -basic one is @command{org-occur}: +Org-mode contains several commands creating such trees, all these +commands can be accessed through a dispatcher: @table @kbd @kindex C-c / @item C-c / +This prompts for an extra key to select a sparse-tree creating command. +@kindex C-c / r +@item C-c / r Occur. Prompts for a regexp and shows a sparse tree with all matches. If the match is in a headline, the headline is made visible. If the match is in the body of an entry, headline and body are made visible. @@ -1025,8 +1029,8 @@ For example: @noindent will define the key @kbd{C-c a f} as a shortcut for creating a sparse tree matching the string @samp{FIXME}. -Other commands use sparse trees as well. For example @kbd{C-c -C-v} creates a sparse TODO tree (@pxref{TODO basics}). +The other sparse tree commands select headings based on TODO keywords, +tags, or properties and will be discussed later in this manual. @kindex C-c C-e v @cindex printing sparse trees @@ -2624,8 +2628,10 @@ TODO state. For this you need to assign keys to TODO state, like this: @noindent See @ref{Per file keywords} and @ref{Setting tags} for more information. @kindex C-c C-v +@kindex C-c / t @cindex sparse tree, for TODO @item C-c C-v +@itemx C-c / t View TODO items in a @emph{sparse tree} (@pxref{Sparse trees}). Folds the entire buffer, but shows all TODO items and the headings hierarchy above them. With prefix arg, search for a specific TODO. You will be @@ -3095,6 +3101,7 @@ Tags are normal words containing letters, numbers, @samp{_}, and @node Tag inheritance, Setting tags, Tags, Tags @section Tag inheritance +@cindex tag inheritance @cindex inheritance, of tags @cindex sublevels, inclusion into tags match @@ -3258,7 +3265,9 @@ information into special lists. @table @kbd @kindex C-c \ +@kindex C-c / T @item C-c \ +@itemx C-c / T Create a sparse tree with all headlines matching a tags search. With a @kbd{C-u} prefix argument, ignore headlines that are not a TODO line. @kindex C-c a m @@ -3408,6 +3417,10 @@ The following commands help to work with properties: @item M-@key{TAB} After an initial colon in a line, complete property keys. All keys used in the current file will be offered as possible completions. +@kindex C-c C-x p +@item C-c C-x p +Set a property. This prompts for a property name and a value. If +necessary, the property drawer is created as well. @item M-x org-insert-property-drawer Insert a property drawer into the current entry. The drawer will be inserted early in the entry, but after the lines with planning @@ -3454,6 +3467,9 @@ SCHEDULED @r{The scheduling time stamp, without the angular brackets.} @node Property searches, Column view, Special properties, Properties and columns @section Property searches @cindex properties, searching +@cindex properties, inheritance +@cindex searching, of properties +@cindex inheritance, of properties To create sparse trees and special lists with selection based on properties, the same commands are used as for tag searches (@pxref{Tag @@ -3469,6 +3485,23 @@ also have a priority value @samp{A}, a @samp{:coffee:} property with the value @samp{unlimited}, and a @samp{:with:} property that is matched by the regular expression @samp{Sarah\|Denny}. +During a search, properties will be inherited from parent entries only +if you configure the variable @code{org-use-property-inheritance}. + +There is also a special command for creating sparse trees based on a +single property: + +@table @kbd +@kindex C-c / p +@item C-c / p +Create a sparse tree based on the value of a property. This first +prompts for the name of a property, and then for a value. A sparse tree +is created with all entries that define this property with the given +value. If you enclose the value into curly braces, it is interpreted as +a regular expression and matched against the property values. +@end table + + @node Column view, Property API, Property searches, Properties and columns @section Column View @@ -3823,17 +3856,32 @@ ISO date. But it will in fact accept any string containing some date and/or time information. You can, for example, use @kbd{C-y} to paste a (possibly multi-line) string copied from an email message. Org-mode will find whatever information is in there and will replace anything not -specified with the current date and time. For example: +specified with the @emph{default date and time}. The default is usually +the current date and time, but when modifying an existing time stamp, or +when entering the second stamp of a range, it is taken from the stamp in +the buffer. For example: + +@example +3-2-5 --> 2003-02-05 +feb 15 --> defaultyear-02-15 +sep 12 9 --> 2009-09-12 +12:45 --> default-date 12:45 +22 sept 0:34 --> defaultyear-09-22 0:34 +12 --> defaultyear-defaultmonth-12 +Fri --> nearest Friday (defaultdate or later) +@end example + +Furthermore you can specify a relative date by giving, as the +@emph{first} thing in the input: a plus/minus sign, a number and a +letter [dwmy] to indicate change in days weeks, months, years. With a +single plus or minus, the date is always relative to today. With a +double plus or minus, it is relative to the default date. E.g. @example - 3-2-5 --> 2003-02-05 - feb 15 --> currentyear-02-15 - sep 12 9 --> 2009-09-12 - 12:45 --> today 12:45 - 22 sept 0:34 --> currentyear-09-22 0:34 - 12 --> currentyear-currentmonth-12 - Fri --> nearest Friday (today or later) - +4 --> 4 days from now (if +N is the only thing given) ++4d --> four days from today ++4 --> same as above ++2w --> two weeks from today +++5 --> five days from default date @end example The function understands English month and weekday abbreviations. If @@ -4182,7 +4230,7 @@ little interruption of your work flow. See @uref{http://www.emacswiki.org/cgi-bin/wiki/RememberMode} for more information. It is an excellent way to add new notes and TODO items to Org-mode files. Org-mode significantly expands the possibilities of -@i{remember}: You may define templates for different note types, and to +@i{remember}: You may define templates for different note types, and associate target files and headlines with specific templates. It also allows you to select the location where a note should be stored interactively, on the fly. @@ -4220,16 +4268,18 @@ use: @example (setq org-remember-templates - '((?t "* TODO %?\n %i\n %a" "~/org/TODO.org" "Tasks") - (?j "* %U %?\n\n %i\n %a" "~/org/JOURNAL.org") - (?i "* %^@{Title@}\n %i\n %a" "~/org/JOURNAL.org" "New Ideas"))) -@end example - -@noindent In these entries, the character specifies how to select the -template. The first string specifies the template. Two more (optional) -strings give the file in which, and the headline under which the new -note should be stored. The file defaults (if not present or @code{nil}) -to @code{org-default-notes-file}, the heading to + '(("Todo" ?t "* TODO %?\n %i\n %a" "~/org/TODO.org" "Tasks") + ("Journal" ?j "* %U %?\n\n %i\n %a" "~/org/JOURNAL.org") + ("Idea" ?i "* %^@{Title@}\n %i\n %a" "~/org/JOURNAL.org" "New Ideas"))) +@end example + +@noindent In these entries, the first string is just a name, and the +character specifies how to select the template. It is useful if the +character is also the first letter of the name. The next string +specifies the template. Two more (optional) strings give the file in +which, and the headline under which the new note should be stored. The +file defaults (if not present or @code{nil}) to +@code{org-default-notes-file}, the heading to @code{org-remember-default-headline}. Both defaults help to get to the storing location quickly, but you can change the location interactively while storing the note. @@ -4242,14 +4292,6 @@ more than one template) and then prepare the buffer like [[file:link to where you called remember]] @end example -@noindent or - -@example -* [2006-03-21 Tue 15:37] - - [[file:link to where you called remember]] -@end example - @noindent During expansion of the template, special @kbd{%}-escapes allow dynamic insertion of content: @@ -4440,10 +4482,6 @@ Remove current file from the list of agenda files. @item C-, @itemx C-' Cycle through agenda file list, visiting one file after the other. -@kindex C-c C-x / -@item C-c C-x / -Search for a regular rexpression in all agenda files and display the -results in an @code{occur} buffer. @end table @noindent @@ -4472,6 +4510,12 @@ tags and properties}). Create the timeline view for the current buffer (@pxref{Timeline}). @item # @r{/} ! Create a list of stuck projects (@pxref{Stuck projects}). +@item / +Search for a regular expression in all agenda files and additionally in +the files listed in @code{org-agenda-multi-occur-extra-files}. This +uses the Emacs command @code{multi-occur}. A prefix argument can be +used to specify the number of context lines for each match, default is +1. @item 1 Restrict an agenda command to the current buffer. After pressing @kbd{1}, you still need to press the character selecting the command. @@ -6379,6 +6423,7 @@ LaTeX: @r{turn on/off La@TeX{} fragments} skip: @r{turn on/off skipping the text before the first heading} author: @r{turn on/off inclusion of author name/email into exported file} timestamp: @r{turn on/off inclusion creation time into exported file} +p: @r{turn on/off inclusion of tags} @end example These options take effect in both the HTML and La@TeX{} export, except diff --git a/orgcard.pdf b/orgcard.pdf Binary files differindex ed5eedb..4813b56 100644 --- a/orgcard.pdf +++ b/orgcard.pdf diff --git a/orgcard.tex b/orgcard.tex index c17e696..9d72b9b 100644 --- a/orgcard.tex +++ b/orgcard.tex @@ -1,5 +1,5 @@ % Reference Card for Org Mode -\def\orgversionnumber{5.11} +\def\orgversionnumber{5.12} \def\versionyear{2007} % latest update \def\year{2007} % latest copyright year @@ -547,6 +547,7 @@ after ``{\tt :}'', and dictionary words elsewhere. \section{Properties and Column View} +\key{set property}{C-c C-x p} \key{special commands in property lines}{C-c C-c} \key{next/previous allowed value}{S-left/right} \key{turn on column view}{C-c C-x C-c} diff --git a/orgcard_letter.pdf b/orgcard_letter.pdf Binary files differindex 9055cce..6248e34 100644 --- a/orgcard_letter.pdf +++ b/orgcard_letter.pdf |