Release 5.06brelease_5.06b

4 files changed, 386 insertions, 369 deletions

diff --git a/Makefile b/Makefile
index bd9a4689a..49046f073 100644
--- a/Makefile
+++ b/Makefile
@@ -103,8 +103,8 @@ org-install.elc:	org-install.el
 
 xemacs/noutline.elc: xemacs/noutline.el
 
-org:	org.texi
-	$(MAKEINFO) --no-split org.texi -o org
+#org:	org.texi
+#	$(MAKEINFO) --no-split org.texi -o org
 
 org.pdf: org.texi
 	$(TEXI2PDF) org.texi
@@ -133,8 +133,8 @@ orgcard_letter.ps: orgcard_letter.dvi
 
 # Below here are special targets for maintenance only
 
-info:	
-	$(MAKEINFO) --no-split org.texi -o org
+#info:	
+#	$(MAKEINFO) --no-split org.texi -o org
 
 pdf:	org.pdf
 
@@ -149,7 +149,7 @@ ecompile:
 distfile:
 	@if [ "X$(TAG)" = "X" ]; then echo "*** No tag ***"; exit 1; fi
 #	touch org.texi orgcard.tex
-	make info
+#	make info
 	make doc
 	rm -rf org-$(TAG) org-$(TAG).zip
 	$(MKDIR) org-$(TAG)
diff --git a/org b/org
index 726611e8b..84b45a562 100644
--- a/org
+++ b/org
@@ -1,11 +1,11 @@
-This is org, produced by makeinfo version 4.8 from org.texi.
+This is org, produced by makeinfo version 4.7 from org.texi.
 
 INFO-DIR-SECTION Emacs
 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.06).
+   This manual is for Org-mode (version 5.07).
 
    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.06).
+This manual is for Org-mode (version 5.07).
 
    Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation
 
@@ -440,8 +440,8 @@ define _global_ keys for the commands `org-store-link' and `org-agenda'
 
      ;; The following lines are always needed.  Choose your own keys.
      (add-to-list 'auto-mode-alist '("\\.org\\'" . org-mode))
-     (define-key global-map "\C-cl" 'org-store-link)
-     (define-key global-map "\C-ca" 'org-agenda)
+     (global-set-key "\C-cl" 'org-store-link)
+     (global-set-key "\C-ca" 'org-agenda)
 
    Furthermore, you must activate `font-lock-mode' in org-mode buffers,
 because significant functionality depends on font-locking being active.
@@ -873,8 +873,8 @@ basic one is `org-occur':
      the full hierarchy of headlines above the match is shown, as well
      as the headline following the match.  Each match is also
      highlighted; the highlights disappear when the buffer is changed
-     an editing command, or by pressing `C-c C-c'.  When called with a
-     `C-u' prefix argument, previous highlights are kept, so several
+     by an editing command, or by pressing `C-c C-c'.  When called with
+     a `C-u' prefix argument, previous highlights are kept, so several
      calls to this command can be stacked.
    For frequently used sparse trees of specific search strings, you can
 use the variable `org-agenda-custom-commands' to define fast keyboard
@@ -7281,12 +7281,12 @@ Index
                                                               (line   6)
 * action, for publishing:                Publishing action.   (line   6)
 * activation:                            Activation.          (line   6)
-* active region <1>:                     HTML Export commands.
+* active region <1>:                     Structure editing.   (line  64)
+* active region <2>:                     HTML Export commands.
                                                               (line   6)
-* active region <2>:                     ASCII export.        (line   9)
 * active region <3>:                     Built-in table editor.
                                                               (line 141)
-* active region:                         Structure editing.   (line  64)
+* active region:                         ASCII export.        (line   9)
 * agenda:                                Weekly/Daily agenda. (line   6)
 * agenda dispatcher:                     Agenda dispatcher.   (line   6)
 * agenda files:                          Agenda files.        (line   6)
@@ -7294,7 +7294,7 @@ Index
 * agenda views:                          Agenda views.        (line   6)
 * agenda views, custom:                  Custom agenda views. (line   6)
 * agenda views, exporting <1>:           Exporting Agenda Views.
-                                                              (line   6)
+                                                              (line  12)
 * agenda views, exporting:               Agenda commands.     (line 228)
 * agenda views, user-defined:            Special agenda views.
                                                               (line   6)
@@ -7325,9 +7325,9 @@ Index
                                                               (line   6)
 * calc package:                          The spreadsheet.     (line   6)
 * calc.el:                               Cooperation.         (line   6)
-* calculations, in tables <1>:           The spreadsheet.     (line   6)
-* calculations, in tables:               Built-in table editor.
+* calculations, in tables <1>:           Built-in table editor.
                                                               (line 141)
+* calculations, in tables:               The spreadsheet.     (line   6)
 * calendar commands, from agenda:        Agenda commands.     (line 191)
 * calendar integration:                  Weekly/Daily agenda. (line  24)
 * calendar, for selecting date:          The date/time prompt.
@@ -7347,12 +7347,12 @@ Index
 * completion, of file names:             Handling links.      (line  43)
 * completion, of link abbreviations:     Completion.          (line   6)
 * completion, of links:                  Handling links.      (line  25)
-* completion, of option keywords <1>:    Completion.          (line   6)
-* completion, of option keywords <2>:    Export options.      (line   6)
+* completion, of option keywords <1>:    Export options.      (line   6)
+* completion, of option keywords <2>:    Completion.          (line   6)
 * completion, of option keywords:        Per file keywords.   (line  23)
 * completion, of property keys:          Completion.          (line   6)
-* completion, of tags <1>:               Completion.          (line   6)
-* completion, of tags:                   Setting tags.        (line  11)
+* completion, of tags <1>:               Setting tags.        (line  11)
+* completion, of tags:                   Completion.          (line   6)
 * completion, of TeX symbols:            Completion.          (line   6)
 * completion, of TODO keywords <1>:      Completion.          (line   6)
 * completion, of TODO keywords:          Workflow states.     (line  15)
@@ -7431,9 +7431,9 @@ Index
 * folded, subtree visibility state:      Visibility cycling.  (line  10)
 * folding, sparse trees:                 Sparse trees.        (line   6)
 * following links:                       Handling links.      (line  58)
-* footnote.el <1>:                       Conflicts.           (line  35)
+* footnote.el <1>:                       Footnotes.           (line   6)
 * footnote.el <2>:                       Cooperation.         (line  56)
-* footnote.el:                           Footnotes.           (line   6)
+* footnote.el:                           Conflicts.           (line  35)
 * footnotes <1>:                         Export options.      (line  25)
 * footnotes:                             Footnotes.           (line   6)
 * format specifier:                      Formula syntax for Calc.
@@ -7613,10 +7613,10 @@ Index
 * references, to ranges:                 References.          (line  60)
 * region, active <1>:                    HTML Export commands.
                                                               (line   6)
-* region, active <2>:                    ASCII export.        (line   9)
+* region, active <2>:                    Structure editing.   (line  64)
 * region, active <3>:                    Built-in table editor.
                                                               (line 141)
-* region, active:                        Structure editing.   (line  64)
+* region, active:                        ASCII export.        (line   9)
 * regular expressions, with tags search: Tag searches.        (line  63)
 * remember.el <1>:                       Cooperation.         (line  33)
 * remember.el:                           Remember.            (line   6)
@@ -7671,9 +7671,9 @@ Index
                                                               (line   6)
 * table editor, table.el:                Cooperation.         (line  37)
 * table of contents:                     Export options.      (line  25)
-* table.el:                              Cooperation.         (line  34)
-* tables <1>:                            Export options.      (line  25)
-* tables:                                Tables.              (line   6)
+* table.el:                              Cooperation.         (line  37)
+* tables <1>:                            Tables.              (line   6)
+* tables:                                Export options.      (line  25)
 * tables, export:                        Enhancing text.      (line  24)
 * tables, in other modes:                Tables in arbitrary syntax.
                                                               (line   6)
@@ -7688,8 +7688,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  25)
-* TeX macros:                            Math symbols.        (line   6)
+* TeX macros <1>:                        Math symbols.        (line   6)
+* TeX macros:                            Export options.      (line  25)
 * TeX macros, export:                    Enhancing text.      (line  21)
 * TeX symbol completion:                 Completion.          (line   6)
 * TeX-like syntax for sub- and superscripts: Export options.  (line  25)
@@ -7721,12 +7721,12 @@ Index
 * TODO list, global:                     Global TODO list.    (line   6)
 * TODO types:                            TODO types.          (line   6)
 * TODO workflow:                         Workflow states.     (line   6)
-* transient-mark-mode <1>:               HTML Export commands.
+* transient-mark-mode <1>:               Structure editing.   (line  64)
+* transient-mark-mode <2>:               HTML Export commands.
                                                               (line   6)
-* transient-mark-mode <2>:               ASCII export.        (line   9)
 * transient-mark-mode <3>:               Built-in table editor.
                                                               (line 141)
-* transient-mark-mode:                   Structure editing.   (line  64)
+* transient-mark-mode:                   ASCII export.        (line   9)
 * translator function:                   Translator functions.
                                                               (line   6)
 * trees, sparse:                         Sparse trees.        (line   6)
@@ -7773,27 +7773,27 @@ Key Index
 * <:                                     Using column view.   (line  54)
 * <left>:                                Agenda commands.     (line  95)
 * <RET> <1>:                             Agenda commands.     (line  39)
-* <RET> <2>:                             The date/time prompt.
+* <RET> <2>:                             Setting tags.        (line  76)
+* <RET> <3>:                             The date/time prompt.
                                                               (line  57)
-* <RET> <3>:                             Setting tags.        (line  76)
 * <RET>:                                 Built-in table editor.
                                                               (line  62)
 * <right>:                               Agenda commands.     (line  90)
-* <SPC> <1>:                             Agenda commands.     (line  28)
-* <SPC>:                                 Setting tags.        (line  73)
-* <TAB> <1>:                             CDLaTeX mode.        (line  23)
+* <SPC> <1>:                             Setting tags.        (line  73)
+* <SPC>:                                 Agenda commands.     (line  28)
+* <TAB> <1>:                             Setting tags.        (line  68)
 * <TAB> <2>:                             Agenda commands.     (line  33)
-* <TAB> <3>:                             Setting tags.        (line  68)
-* <TAB> <4>:                             Editing and debugging formulas.
-                                                              (line  57)
-* <TAB> <5>:                             Built-in table editor.
+* <TAB> <3>:                             Visibility cycling.  (line  10)
+* <TAB> <4>:                             Built-in table editor.
                                                               (line  55)
-* <TAB> <6>:                             Plain lists.         (line  41)
-* <TAB>:                                 Visibility cycling.  (line  10)
-* > <1>:                                 Agenda commands.     (line 171)
+* <TAB> <5>:                             Editing and debugging formulas.
+                                                              (line  57)
+* <TAB> <6>:                             CDLaTeX mode.        (line  23)
+* <TAB>:                                 Plain lists.         (line  41)
+* > <1>:                                 Using column view.   (line  54)
 * > <2>:                                 The date/time prompt.
                                                               (line  33)
-* >:                                     Using column view.   (line  54)
+* >:                                     Agenda commands.     (line 171)
 * ^:                                     CDLaTeX mode.        (line  33)
 * _:                                     CDLaTeX mode.        (line  33)
 * `:                                     CDLaTeX mode.        (line  39)
@@ -7817,9 +7817,9 @@ Key Index
 * C-c +:                                 Built-in table editor.
                                                               (line 141)
 * C-c ,:                                 Priorities.          (line  18)
-* C-c - <1>:                             Built-in table editor.
+* C-c - <1>:                             Plain lists.         (line  88)
+* C-c -:                                 Built-in table editor.
                                                               (line  90)
-* C-c -:                                 Plain lists.         (line  88)
 * C-c .:                                 Creating timestamps. (line  10)
 * C-c /:                                 Sparse trees.        (line  15)
 * C-c ::                                 Enhancing text.      (line  32)
@@ -7827,18 +7827,18 @@ Key Index
 * C-c <:                                 Creating timestamps. (line  23)
 * C-c <TAB>:                             Built-in table editor.
                                                               (line 161)
-* 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>:                             Built-in table editor.
+* C-c ^ <1>:                             Structure editing.   (line  52)
+* C-c ^:                                 Built-in table editor.
                                                               (line  94)
-* C-c ^:                                 Structure editing.   (line  52)
 * C-c `:                                 Built-in table editor.
                                                               (line 157)
 * C-c a !:                               Stuck projects.      (line  14)
@@ -7850,46 +7850,49 @@ Key Index
 * C-c a L:                               Timeline.            (line  10)
 * C-c a M:                               Matching tags and properties.
                                                               (line  15)
+* C-c a m:                               Tag searches.        (line  12)
+* C-c a M:                               Tag searches.        (line  16)
 * C-c a m:                               Matching tags and properties.
                                                               (line  10)
-* C-c a M:                               Tag searches.        (line  16)
-* C-c a m:                               Tag searches.        (line  12)
 * 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  36)
 * C-c C-a:                               Visibility cycling.  (line  33)
 * C-c C-b:                               Motion.              (line  15)
-* C-c C-c <1>:                           Cooperation.         (line  37)
-* C-c C-c <2>:                           The very busy C-c C-c key.
+* C-c C-c <1>:                           The very busy C-c C-c key.
                                                               (line   6)
-* C-c C-c <3>:                           Processing LaTeX fragments.
+* C-c C-c <2>:                           Setting tags.        (line  10)
+* C-c C-c <3>:                           Checkboxes.          (line  37)
+* C-c C-c <4>:                           Processing LaTeX fragments.
                                                               (line  15)
-* C-c C-c <4>:                           Property syntax.     (line  54)
-* C-c C-c <5>:                           Setting tags.        (line  10)
-* C-c C-c <6>:                           Checkboxes.          (line  37)
-* C-c C-c <7>:                           Editing and debugging formulas.
-                                                              (line  46)
-* C-c C-c <8>:                           Built-in table editor.
+* C-c C-c <5>:                           Editing and debugging formulas.
+                                                              (line  90)
+* C-c C-c <6>:                           Built-in table editor.
                                                               (line  54)
-* C-c C-c:                               Plain lists.         (line  81)
-* C-c C-d <1>:                           Agenda commands.     (line 156)
-* C-c C-d:                               Inserting deadline/schedule.
+* C-c C-c <7>:                           Plain lists.         (line  81)
+* C-c C-c <8>:                           Cooperation.         (line  37)
+* C-c C-c <9>:                           Editing and debugging formulas.
+                                                              (line  46)
+* C-c C-c <10>:                          Cooperation.         (line  46)
+* C-c C-c:                               Property syntax.     (line  54)
+* C-c C-d <1>:                           Inserting deadline/schedule.
                                                               (line   9)
+* C-c C-d:                               Agenda commands.     (line 156)
 * 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 I:                             iCalendar export.    (line  16)
+* C-c C-e H:                             HTML Export commands.
+                                                              (line  16)
 * C-c C-e i:                             iCalendar export.    (line  14)
-* C-c C-e L:                             LaTeX export commands.
-                                                              (line   7)
+* C-c C-e I:                             iCalendar export.    (line  16)
 * C-c C-e l:                             LaTeX export commands.
                                                               (line   6)
+* C-c C-e L:                             LaTeX export commands.
+                                                              (line   7)
 * C-c C-e R:                             HTML Export commands.
                                                               (line  19)
 * C-c C-e t:                             Export options.      (line  13)
@@ -7898,10 +7901,10 @@ Key Index
 * C-c C-e v a:                           ASCII export.        (line  16)
 * C-c C-e v b:                           HTML Export commands.
                                                               (line  24)
-* C-c C-e v H:                           HTML Export commands.
-                                                              (line  24)
 * C-c C-e v h:                           HTML Export commands.
                                                               (line  24)
+* C-c C-e v H:                           HTML Export commands.
+                                                              (line  24)
 * C-c C-e v L:                           LaTeX export commands.
                                                               (line  10)
 * C-c C-e v l:                           LaTeX export commands.
@@ -7916,16 +7919,16 @@ Key Index
 * C-c C-o <1>:                           Creating timestamps. (line  31)
 * C-c C-o:                               Handling links.      (line  58)
 * C-c C-p:                               Motion.              (line   9)
-* C-c C-q <1>:                           Editing and debugging formulas.
-                                                              (line  50)
-* C-c C-q:                               Built-in table editor.
+* C-c C-q <1>:                           Built-in table editor.
                                                               (line 125)
+* C-c C-q:                               Editing and debugging formulas.
+                                                              (line  50)
 * C-c C-r <1>:                           Editing and debugging formulas.
                                                               (line  53)
 * C-c C-r:                               Visibility cycling.  (line  34)
-* C-c C-s <1>:                           Agenda commands.     (line 153)
-* C-c C-s:                               Inserting deadline/schedule.
+* C-c C-s <1>:                           Inserting deadline/schedule.
                                                               (line  18)
+* C-c C-s:                               Agenda commands.     (line 153)
 * C-c C-t <1>:                           Clocking work time.  (line  27)
 * C-c C-t:                               TODO basics.         (line  13)
 * C-c C-u:                               Motion.              (line  18)
@@ -7935,8 +7938,8 @@ Key Index
 * 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)
-* C-c C-x C-c <1>:                       Agenda commands.     (line 218)
-* C-c C-x C-c:                           Using column view.   (line   9)
+* C-c C-x C-c <1>:                       Using column view.   (line   9)
+* C-c C-x C-c:                           Agenda commands.     (line 218)
 * C-c C-x C-d:                           Clocking work time.  (line  35)
 * C-c C-x C-i:                           Clocking work time.  (line  12)
 * C-c C-x C-k:                           Structure editing.   (line  39)
@@ -7956,15 +7959,15 @@ Key Index
 * C-c C-x C-y <1>:                       Built-in table editor.
                                                               (line 118)
 * C-c C-x C-y:                           Structure editing.   (line  46)
-* C-c C-x M-w <1>:                       Built-in table editor.
+* C-c C-x M-w <1>:                       Structure editing.   (line  43)
+* C-c C-x M-w:                           Built-in table editor.
                                                               (line 111)
-* C-c C-x M-w:                           Structure editing.   (line  43)
-* C-c C-y <1>:                           Clocking work time.  (line  22)
-* C-c C-y:                               Creating timestamps. (line  48)
+* C-c C-y <1>:                           Creating timestamps. (line  48)
+* C-c C-y:                               Clocking work time.  (line  22)
 * 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.
@@ -7985,8 +7988,8 @@ Key Index
 * C-u C-c C-l:                           Handling links.      (line  43)
 * C-u C-c C-x C-a:                       ARCHIVE tag.         (line  31)
 * C-u C-c C-x C-s:                       Moving subtrees.     (line  12)
-* C-u C-c C-x C-u <1>:                   Dynamic blocks.      (line  22)
-* C-u C-c C-x C-u:                       Clocking work time.  (line  70)
+* C-u C-c C-x C-u <1>:                   Clocking work time.  (line  70)
+* C-u C-c C-x C-u:                       Dynamic blocks.      (line  22)
 * C-u C-u C-c *:                         Updating the table.  (line  22)
 * C-u C-u C-c =:                         Editing and debugging formulas.
                                                               (line  18)
@@ -8001,8 +8004,8 @@ Key Index
 * f:                                     Agenda commands.     (line  42)
 * g:                                     Agenda commands.     (line  76)
 * H:                                     Agenda commands.     (line 215)
-* i:                                     Agenda commands.     (line 196)
 * I:                                     Agenda commands.     (line 176)
+* i:                                     Agenda commands.     (line 196)
 * l:                                     Agenda commands.     (line  55)
 * L:                                     Agenda commands.     (line  30)
 * M:                                     Agenda commands.     (line 202)
@@ -8016,115 +8019,115 @@ Key Index
 * M-<left>:                              Structure editing.   (line  21)
 * M-<RET> <1>:                           Plain lists.         (line  49)
 * M-<RET>:                               Structure editing.   (line   6)
-* M-<right> <1>:                         Built-in table editor.
+* M-<right> <1>:                         Structure editing.   (line  24)
+* M-<right>:                             Built-in table editor.
                                                               (line  72)
-* M-<right>:                             Structure editing.   (line  24)
-* M-<TAB> <1>:                           Completion.          (line  10)
+* M-<TAB> <1>:                           Per file keywords.   (line  23)
 * M-<TAB> <2>:                           Property syntax.     (line  46)
-* M-<TAB> <3>:                           Setting tags.        (line   6)
-* M-<TAB> <4>:                           Per file keywords.   (line  23)
-* M-<TAB>:                               Editing and debugging formulas.
+* M-<TAB> <3>:                           Editing and debugging formulas.
                                                               (line  64)
+* M-<TAB> <4>:                           Setting tags.        (line   6)
+* M-<TAB>:                               Completion.          (line  10)
 * M-<up> <1>:                            Editing and debugging formulas.
                                                               (line  76)
 * M-<up>:                                Built-in table editor.
                                                               (line  80)
-* M-S-<down> <1>:                        Editing and debugging formulas.
+* M-S-<down> <1>:                        Structure editing.   (line  36)
+* M-S-<down> <2>:                        Editing and debugging formulas.
                                                               (line  72)
-* M-S-<down> <2>:                        Built-in table editor.
+* M-S-<down> <3>:                        Built-in table editor.
                                                               (line  87)
-* M-S-<down> <3>:                        Plain lists.         (line  66)
-* M-S-<down>:                            Structure editing.   (line  36)
-* M-S-<left> <1>:                        The date/time prompt.
-                                                              (line  54)
+* M-S-<down>:                            Plain lists.         (line  66)
+* M-S-<left> <1>:                        Structure editing.   (line  27)
 * M-S-<left> <2>:                        Built-in table editor.
                                                               (line  74)
 * M-S-<left> <3>:                        Plain lists.         (line  72)
-* M-S-<left>:                            Structure editing.   (line  27)
+* M-S-<left>:                            The date/time prompt.
+                                                              (line  54)
 * M-S-<RET> <1>:                         Checkboxes.          (line  54)
-* M-S-<RET> <2>:                         Plain lists.         (line  59)
-* M-S-<RET>:                             Structure editing.   (line  18)
+* M-S-<RET> <2>:                         Structure editing.   (line  18)
+* M-S-<RET>:                             Plain lists.         (line  59)
 * M-S-<right> <1>:                       The date/time prompt.
                                                               (line  51)
-* M-S-<right> <2>:                       Built-in table editor.
+* M-S-<right> <2>:                       Plain lists.         (line  72)
+* M-S-<right> <3>:                       Built-in table editor.
                                                               (line  77)
-* M-S-<right> <3>:                       Plain lists.         (line  72)
 * M-S-<right>:                           Structure editing.   (line  30)
 * M-S-<up> <1>:                          Editing and debugging formulas.
                                                               (line  72)
-* M-S-<up> <2>:                          Built-in table editor.
+* M-S-<up> <2>:                          Plain lists.         (line  66)
+* M-S-<up> <3>:                          Structure editing.   (line  33)
+* M-S-<up>:                              Built-in table editor.
                                                               (line  84)
-* M-S-<up> <3>:                          Plain lists.         (line  66)
-* M-S-<up>:                              Structure editing.   (line  33)
-* mouse-1 <1>:                           Agenda commands.     (line  33)
+* mouse-1 <1>:                           Handling links.      (line  72)
 * mouse-1 <2>:                           The date/time prompt.
                                                               (line  36)
-* mouse-1:                               Handling links.      (line  72)
+* mouse-1:                               Agenda commands.     (line  33)
 * mouse-2 <1>:                           Agenda commands.     (line  33)
 * mouse-2:                               Handling links.      (line  72)
-* mouse-3 <1>:                           Agenda commands.     (line  28)
-* mouse-3:                               Handling links.      (line  77)
-* n <1>:                                 Agenda commands.     (line  19)
-* n:                                     Using column view.   (line  30)
+* mouse-3 <1>:                           Handling links.      (line  77)
+* mouse-3:                               Agenda commands.     (line  28)
+* n <1>:                                 Using column view.   (line  30)
+* n:                                     Agenda commands.     (line  19)
 * O:                                     Agenda commands.     (line 180)
 * o:                                     Agenda commands.     (line  65)
-* P:                                     Agenda commands.     (line 140)
 * p <1>:                                 Agenda commands.     (line  20)
 * p:                                     Using column view.   (line  30)
-* q <1>:                                 Agenda commands.     (line 238)
-* q:                                     Using column view.   (line  17)
-* r <1>:                                 Agenda commands.     (line  80)
-* r:                                     Global TODO list.    (line  22)
+* P:                                     Agenda commands.     (line 140)
+* q <1>:                                 Using column view.   (line  17)
+* q:                                     Agenda commands.     (line 238)
+* r <1>:                                 Global TODO list.    (line  22)
+* r:                                     Agenda commands.     (line  80)
 * S:                                     Agenda commands.     (line 206)
 * s:                                     Agenda commands.     (line  87)
-* S-<down> <1>:                          Agenda commands.     (line 149)
+* S-<down> <1>:                          Priorities.          (line  23)
 * S-<down> <2>:                          The date/time prompt.
                                                               (line  45)
 * S-<down> <3>:                          Creating timestamps. (line  40)
-* S-<down> <4>:                          Priorities.          (line  23)
+* S-<down> <4>:                          Plain lists.         (line  62)
 * S-<down> <5>:                          Editing and debugging formulas.
                                                               (line  67)
-* S-<down>:                              Plain lists.         (line  62)
-* S-<left> <1>:                          Agenda commands.     (line 167)
-* S-<left> <2>:                          The date/time prompt.
-                                                              (line  42)
-* S-<left> <3>:                          Creating timestamps. (line  35)
-* S-<left> <4>:                          Using column view.   (line  26)
-* S-<left> <5>:                          Property syntax.     (line  62)
+* S-<down>:                              Agenda commands.     (line 149)
+* S-<left> <1>:                          Editing and debugging formulas.
+                                                              (line  67)
+* S-<left> <2>:                          Using column view.   (line  26)
+* S-<left> <3>:                          Property syntax.     (line  62)
+* S-<left> <4>:                          Creating timestamps. (line  35)
+* S-<left> <5>:                          Agenda commands.     (line 167)
 * S-<left> <6>:                          Multiple sets in one file.
                                                               (line  29)
 * S-<left> <7>:                          TODO basics.         (line  20)
-* S-<left>:                              Editing and debugging formulas.
-                                                              (line  67)
+* S-<left>:                              The date/time prompt.
+                                                              (line  42)
 * S-<RET>:                               Built-in table editor.
                                                               (line 144)
-* S-<right> <1>:                         Agenda commands.     (line 159)
-* S-<right> <2>:                         The date/time prompt.
+* S-<right> <1>:                         Property syntax.     (line  62)
+* S-<right> <2>:                         Editing and debugging formulas.
+                                                              (line  67)
+* S-<right> <3>:                         The date/time prompt.
                                                               (line  39)
-* S-<right> <3>:                         Creating timestamps. (line  35)
-* S-<right> <4>:                         Using column view.   (line  26)
-* S-<right> <5>:                         Property syntax.     (line  62)
+* S-<right> <4>:                         Creating timestamps. (line  35)
+* S-<right> <5>:                         TODO basics.         (line  20)
 * S-<right> <6>:                         Multiple sets in one file.
                                                               (line  29)
-* S-<right> <7>:                         TODO basics.         (line  20)
-* S-<right>:                             Editing and debugging formulas.
-                                                              (line  67)
-* S-<TAB> <1>:                           Built-in table editor.
+* S-<right> <7>:                         Agenda commands.     (line 159)
+* S-<right>:                             Using column view.   (line  26)
+* S-<TAB> <1>:                           Visibility cycling.  (line  22)
+* S-<TAB>:                               Built-in table editor.
                                                               (line  59)
-* S-<TAB>:                               Visibility cycling.  (line  22)
-* S-<up> <1>:                            Agenda commands.     (line 143)
-* S-<up> <2>:                            The date/time prompt.
-                                                              (line  48)
-* S-<up> <3>:                            Creating timestamps. (line  40)
-* S-<up> <4>:                            Priorities.          (line  23)
-* S-<up> <5>:                            Editing and debugging formulas.
+* S-<up> <1>:                            Plain lists.         (line  62)
+* S-<up> <2>:                            Editing and debugging formulas.
                                                               (line  67)
-* S-<up>:                                Plain lists.         (line  62)
+* S-<up> <3>:                            Agenda commands.     (line 143)
+* S-<up> <4>:                            Priorities.          (line  23)
+* S-<up> <5>:                            The date/time prompt.
+                                                              (line  48)
+* S-<up>:                                Creating timestamps. (line  40)
 * S-M-<left>:                            Using column view.   (line  58)
 * S-M-<RET>:                             TODO basics.         (line  44)
 * S-M-<right>:                           Using column view.   (line  55)
-* T:                                     Agenda commands.     (line 124)
 * t:                                     Agenda commands.     (line 111)
+* T:                                     Agenda commands.     (line 124)
 * v:                                     Using column view.   (line  39)
 * w:                                     Agenda commands.     (line  66)
 * x:                                     Agenda commands.     (line 239)
@@ -8139,209 +8142,209 @@ Node: Introduction12966
 Node: Summary13381
 Node: Installation16533
 Node: Activation17911
-Node: Feedback19162
-Node: Document structure21238
-Node: Outlines22130
-Node: Headlines22795
-Ref: Headlines-Footnote-123799
-Node: Visibility cycling23910
-Ref: Visibility cycling-Footnote-126120
-Ref: Visibility cycling-Footnote-226178
-Ref: Visibility cycling-Footnote-326228
-Node: Motion26498
-Node: Structure editing27452
-Node: Archiving30278
-Node: ARCHIVE tag30836
-Node: Moving subtrees32629
-Node: Sparse trees33940
-Ref: Sparse trees-Footnote-136072
-Ref: Sparse trees-Footnote-236254
-Node: Plain lists36369
-Ref: Plain lists-Footnote-140566
-Ref: Plain lists-Footnote-240924
-Node: Drawers41105
-Node: orgstruct-mode41943
-Node: Tables42843
-Node: Built-in table editor43424
-Node: Narrow columns50669
-Ref: Narrow columns-Footnote-152604
-Node: Column groups52650
-Node: orgtbl-mode54183
-Node: The spreadsheet54986
-Node: References56073
-Ref: References-Footnote-160537
-Node: Formula syntax for Calc60826
-Node: Formula syntax for Lisp63283
-Node: Field formulas65001
-Node: Column formulas66309
-Node: Editing and debugging formulas67908
-Node: Updating the table72061
-Node: Advanced features73096
-Node: Hyperlinks77621
-Node: Link format78459
-Node: Internal links79752
-Ref: Internal links-Footnote-181677
-Node: Radio targets81812
-Node: External links82512
-Node: Handling links84916
-Ref: Handling links-Footnote-190213
-Ref: Handling links-Footnote-290450
-Node: Using links outside Org-mode90524
-Node: Link abbreviations91034
-Node: Search options92727
-Ref: Search options-Footnote-194507
-Node: Custom searches94588
-Node: Remember95636
-Node: Setting up remember96623
-Node: Remember templates97205
-Ref: Remember templates-Footnote-1100651
-Node: Storing notes100749
-Node: TODO items102636
-Node: TODO basics103613
-Node: TODO extensions105377
-Node: Workflow states106196
-Ref: Workflow states-Footnote-1107371
-Node: TODO types107464
-Ref: TODO types-Footnote-1109047
-Node: Multiple sets in one file109129
-Node: Per file keywords110740
-Ref: Per file keywords-Footnote-1112029
-Node: Priorities112230
-Node: Breaking down tasks113840
-Ref: Breaking down tasks-Footnote-1114360
-Node: Checkboxes114456
-Node: Tags117305
-Node: Tag inheritance118077
-Node: Setting tags119014
-Ref: Setting tags-Footnote-1123537
-Ref: Setting tags-Footnote-2123649
-Node: Tag searches123732
-Node: Properties and columns126449
-Node: Property syntax127554
-Node: Special properties129975
-Node: Property searches130891
-Node: Column view131546
-Node: Defining columns132713
-Node: Scope of column definitions133111
-Node: Column attributes134033
-Node: Using column view136281
-Node: Property API138268
-Node: Timestamps138622
-Node: Time stamps139083
-Ref: Time stamps-Footnote-1141511
-Node: Creating timestamps141627
-Node: The date/time prompt143701
-Ref: The date/time prompt-Footnote-1145689
-Node: Custom time format145795
-Node: Deadlines and scheduling147487
-Ref: Deadlines and scheduling-Footnote-1149107
-Node: Inserting deadline/schedule149262
-Node: Repeated tasks150200
-Node: Progress logging151839
-Node: Closing items152494
-Ref: Closing items-Footnote-1153428
-Ref: Closing items-Footnote-2153497
-Node: Tracking TODO state changes153570
-Node: Clocking work time154426
-Ref: Clocking work time-Footnote-1158072
-Ref: Clocking work time-Footnote-2158150
-Node: Agenda views158276
-Node: Agenda files160227
-Ref: Agenda files-Footnote-1161193
-Ref: Agenda files-Footnote-2161342
-Node: Agenda dispatcher161535
-Node: Built-in agenda views163232
-Node: Weekly/Daily agenda163812
-Node: Global TODO list166754
-Node: Matching tags and properties169032
-Node: Timeline170121
-Node: Stuck projects170793
-Node: Presentation and sorting172644
-Node: Categories173435
-Node: Time-of-day specifications174099
-Node: Sorting of agenda items176070
-Node: Agenda commands177352
-Node: Custom agenda views184633
-Node: Storing searches185352
-Node: Block agenda187264
-Node: Setting Options188494
-Node: Exporting Agenda Views191233
-Ref: Exporting Agenda Views-Footnote-1195517
-Ref: Exporting Agenda Views-Footnote-2195574
-Node: Extracting Agenda Information for other programs195760
-Node: Embedded LaTeX199886
-Ref: Embedded LaTeX-Footnote-1200980
-Node: Math symbols201170
-Node: Subscripts and Superscripts201937
-Node: LaTeX fragments202783
-Ref: LaTeX fragments-Footnote-1205016
-Ref: LaTeX fragments-Footnote-2205277
-Node: Processing LaTeX fragments205411
-Node: CDLaTeX mode206359
-Ref: CDLaTeX mode-Footnote-1208845
-Node: Exporting208993
-Node: ASCII export210460
-Node: HTML export211961
-Node: HTML Export commands212587
-Node: Quoting HTML tags214374
-Node: Links215009
-Node: Images215706
-Ref: Images-Footnote-1216577
-Node: CSS support216638
-Ref: CSS support-Footnote-1217957
-Node: LaTeX export218070
-Node: LaTeX export commands218394
-Node: Quoting LaTeX code219556
-Node: XOXO export220061
-Node: iCalendar export220501
-Node: Text interpretation221720
-Node: Comment lines222311
-Node: Initial text222706
-Node: Footnotes224375
-Node: Enhancing text225190
-Ref: Enhancing text-Footnote-1227059
-Node: Export options227149
-Node: Publishing229425
-Ref: Publishing-Footnote-1230386
-Ref: Publishing-Footnote-2230530
-Node: Configuration230681
-Node: Project alist231399
-Node: Sources and destinations232465
-Node: Selecting files233195
-Node: Publishing action233943
-Node: Publishing options235277
-Node: Publishing links237652
-Node: Project page index239165
-Node: Sample configuration239943
-Node: Simple example240435
-Node: Complex example241108
-Node: Triggering publication243184
-Node: Miscellaneous243869
-Node: Completion244503
-Node: Customization246173
-Node: In-buffer settings246756
-Node: The very busy C-c C-c key252283
-Node: Clean view254044
-Node: TTY keys256621
-Node: Interaction258231
-Node: Cooperation258628
-Node: Conflicts261504
-Node: Bugs263507
-Node: Extensions and Hacking265003
-Node: Extensions265728
-Node: Adding hyperlink types267671
-Node: Tables in arbitrary syntax271333
-Node: Radio tables272422
-Node: A LaTeX example274925
-Ref: A LaTeX example-Footnote-1278571
-Ref: A LaTeX example-Footnote-2278719
-Node: Translator functions279154
-Ref: Translator functions-Footnote-1282263
-Node: Dynamic blocks282351
-Node: Special agenda views284323
-Node: Using the property API287501
-Node: History and Acknowledgments288982
-Node: Index295558
-Node: Key Index330050
+Node: Feedback19148
+Node: Document structure21224
+Node: Outlines22116
+Node: Headlines22781
+Ref: Headlines-Footnote-123785
+Node: Visibility cycling23896
+Ref: Visibility cycling-Footnote-126106
+Ref: Visibility cycling-Footnote-226164
+Ref: Visibility cycling-Footnote-326214
+Node: Motion26484
+Node: Structure editing27438
+Node: Archiving30264
+Node: ARCHIVE tag30822
+Node: Moving subtrees32615
+Node: Sparse trees33926
+Ref: Sparse trees-Footnote-136061
+Ref: Sparse trees-Footnote-236243
+Node: Plain lists36358
+Ref: Plain lists-Footnote-140555
+Ref: Plain lists-Footnote-240913
+Node: Drawers41094
+Node: orgstruct-mode41932
+Node: Tables42832
+Node: Built-in table editor43413
+Node: Narrow columns50658
+Ref: Narrow columns-Footnote-152593
+Node: Column groups52639
+Node: orgtbl-mode54172
+Node: The spreadsheet54975
+Node: References56062
+Ref: References-Footnote-160526
+Node: Formula syntax for Calc60815
+Node: Formula syntax for Lisp63272
+Node: Field formulas64990
+Node: Column formulas66298
+Node: Editing and debugging formulas67897
+Node: Updating the table72050
+Node: Advanced features73085
+Node: Hyperlinks77610
+Node: Link format78448
+Node: Internal links79741
+Ref: Internal links-Footnote-181666
+Node: Radio targets81801
+Node: External links82501
+Node: Handling links84905
+Ref: Handling links-Footnote-190202
+Ref: Handling links-Footnote-290439
+Node: Using links outside Org-mode90513
+Node: Link abbreviations91023
+Node: Search options92716
+Ref: Search options-Footnote-194496
+Node: Custom searches94577
+Node: Remember95625
+Node: Setting up remember96612
+Node: Remember templates97194
+Ref: Remember templates-Footnote-1100640
+Node: Storing notes100738
+Node: TODO items102625
+Node: TODO basics103602
+Node: TODO extensions105366
+Node: Workflow states106185
+Ref: Workflow states-Footnote-1107360
+Node: TODO types107453
+Ref: TODO types-Footnote-1109036
+Node: Multiple sets in one file109118
+Node: Per file keywords110729
+Ref: Per file keywords-Footnote-1112018
+Node: Priorities112219
+Node: Breaking down tasks113829
+Ref: Breaking down tasks-Footnote-1114349
+Node: Checkboxes114445
+Node: Tags117294
+Node: Tag inheritance118066
+Node: Setting tags119003
+Ref: Setting tags-Footnote-1123526
+Ref: Setting tags-Footnote-2123638
+Node: Tag searches123721
+Node: Properties and columns126438
+Node: Property syntax127543
+Node: Special properties129964
+Node: Property searches130880
+Node: Column view131535
+Node: Defining columns132702
+Node: Scope of column definitions133100
+Node: Column attributes134022
+Node: Using column view136270
+Node: Property API138257
+Node: Timestamps138611
+Node: Time stamps139072
+Ref: Time stamps-Footnote-1141500
+Node: Creating timestamps141616
+Node: The date/time prompt143690
+Ref: The date/time prompt-Footnote-1145678
+Node: Custom time format145784
+Node: Deadlines and scheduling147476
+Ref: Deadlines and scheduling-Footnote-1149096
+Node: Inserting deadline/schedule149251
+Node: Repeated tasks150189
+Node: Progress logging151828
+Node: Closing items152483
+Ref: Closing items-Footnote-1153417
+Ref: Closing items-Footnote-2153486
+Node: Tracking TODO state changes153559
+Node: Clocking work time154415
+Ref: Clocking work time-Footnote-1158061
+Ref: Clocking work time-Footnote-2158139
+Node: Agenda views158265
+Node: Agenda files160216
+Ref: Agenda files-Footnote-1161182
+Ref: Agenda files-Footnote-2161331
+Node: Agenda dispatcher161524
+Node: Built-in agenda views163221
+Node: Weekly/Daily agenda163801
+Node: Global TODO list166743
+Node: Matching tags and properties169021
+Node: Timeline170110
+Node: Stuck projects170782
+Node: Presentation and sorting172633
+Node: Categories173424
+Node: Time-of-day specifications174088
+Node: Sorting of agenda items176059
+Node: Agenda commands177341
+Node: Custom agenda views184622
+Node: Storing searches185341
+Node: Block agenda187253
+Node: Setting Options188483
+Node: Exporting Agenda Views191222
+Ref: Exporting Agenda Views-Footnote-1195506
+Ref: Exporting Agenda Views-Footnote-2195563
+Node: Extracting Agenda Information for other programs195749
+Node: Embedded LaTeX199875
+Ref: Embedded LaTeX-Footnote-1200969
+Node: Math symbols201159
+Node: Subscripts and Superscripts201926
+Node: LaTeX fragments202772
+Ref: LaTeX fragments-Footnote-1205005
+Ref: LaTeX fragments-Footnote-2205266
+Node: Processing LaTeX fragments205400
+Node: CDLaTeX mode206348
+Ref: CDLaTeX mode-Footnote-1208834
+Node: Exporting208982
+Node: ASCII export210449
+Node: HTML export211950
+Node: HTML Export commands212576
+Node: Quoting HTML tags214363
+Node: Links214998
+Node: Images215695
+Ref: Images-Footnote-1216566
+Node: CSS support216627
+Ref: CSS support-Footnote-1217946
+Node: LaTeX export218059
+Node: LaTeX export commands218383
+Node: Quoting LaTeX code219545
+Node: XOXO export220050
+Node: iCalendar export220490
+Node: Text interpretation221709
+Node: Comment lines222300
+Node: Initial text222695
+Node: Footnotes224364
+Node: Enhancing text225179
+Ref: Enhancing text-Footnote-1227048
+Node: Export options227138
+Node: Publishing229414
+Ref: Publishing-Footnote-1230375
+Ref: Publishing-Footnote-2230519
+Node: Configuration230670
+Node: Project alist231388
+Node: Sources and destinations232454
+Node: Selecting files233184
+Node: Publishing action233932
+Node: Publishing options235266
+Node: Publishing links237641
+Node: Project page index239154
+Node: Sample configuration239932
+Node: Simple example240424
+Node: Complex example241097
+Node: Triggering publication243173
+Node: Miscellaneous243858
+Node: Completion244492
+Node: Customization246162
+Node: In-buffer settings246745
+Node: The very busy C-c C-c key252272
+Node: Clean view254033
+Node: TTY keys256610
+Node: Interaction258220
+Node: Cooperation258617
+Node: Conflicts261493
+Node: Bugs263496
+Node: Extensions and Hacking264992
+Node: Extensions265717
+Node: Adding hyperlink types267660
+Node: Tables in arbitrary syntax271322
+Node: Radio tables272411
+Node: A LaTeX example274914
+Ref: A LaTeX example-Footnote-1278560
+Ref: A LaTeX example-Footnote-2278708
+Node: Translator functions279143
+Ref: Translator functions-Footnote-1282252
+Node: Dynamic blocks282340
+Node: Special agenda views284312
+Node: Using the property API287490
+Node: History and Acknowledgments288971
+Node: Index295547
+Node: Key Index330039
 
 End Tag Table
diff --git a/org.el b/org.el
index 9990ea797..763e7c4ec 100644
--- a/org.el
+++ b/org.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <dominik at science dot uva dot nl>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://www.astro.uva.nl/~dominik/Tools/org/
-;; Version: 5.06
+;; Version: 5.06b
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -83,7 +83,7 @@
 
 ;;; Version
 
-(defconst org-version "5.06"
+(defconst org-version "5.06b"
   "The version number of the file org.el.")
 (defun org-version ()
   (interactive)
@@ -489,17 +489,19 @@ the values `folded', `children', or `subtree'."
   :tag "Org Edit Structure"
   :group 'org-structure)
 
-; FIXME
 (defcustom org-special-ctrl-a/e nil
   "Non-nil means `C-a' and `C-e' behave specially in headlines and items.
-When set, `C-a' will bring back the cursor to the beginning of the
+When t, `C-a' will bring back the cursor to the beginning of the
 headline text, i.e. after the stars and after a possible TODO keyword.
 In an item, this will be the position after the bullet.
 When the cursor is already at that position, another `C-a' will bring
 it to the beginning of the line.
 `C-e' will jump to the end of the headline, ignoring the presence of tags
 in the headline.  A second `C-e' will then jump to the true end of the
-line, after any tags."
+line, after any tags.
+When set to the symbol `reversed', the first `C-a' or `C-e' works normally,
+and only a directly following, identical keypress will bring the cursor
+to the special positions."
   :group 'org-edit-structure
   :type '(choice
 	  (const :tag "off" nil)
@@ -3164,7 +3166,7 @@ Use customize to modify this, or restart Emacs after changing it."
   '(("*" bold "<b>" "</b>")
     ("/" italic "<i>" "</i>")
     ("_" underline "<u>" "</u>")
-    ("=" shadow "<code>" "</code>")
+    ("=" org-code "<code>" "</code>")
     ("+" (:strike-through t) "<del>" "</del>")
     )
 "Special syntax for emphasized text.
@@ -3446,6 +3448,20 @@ to the part of the headline after the DONE keyword."
   "Face for formulas."
   :group 'org-faces)
 
+(defface org-code
+  (org-compatible-face
+   '((((class color grayscale) (min-colors 88) (background light))
+      :foreground "grey50")
+     (((class color grayscale) (min-colors 88) (background dark))
+      :foreground "grey70")
+     (((class color) (min-colors 8) (background light))
+      :foreground "green")
+     (((class color) (min-colors 8) (background dark))
+      :foreground "yellow")))
+   "Face for fixed-with text like code snippets."
+   :group 'org-faces
+   :version "22.1")
+
 (defface org-agenda-structure ;; font-lock-function-name-face
   (org-compatible-face
    '((((class color) (min-colors 88) (background light)) (:foreground "Blue1"))
@@ -4620,15 +4636,13 @@ between words."
 			   (mapconcat 'regexp-quote org-done-keywords "\\|")
 			   "\\)\\>")
 		   '(1 'org-done t)))
-	   ;; Table stuff
-	   '("^[ \t]*\\(:.*\\)" (1 'org-table t))
+	   ;; Code
+	   '("^[ \t]*\\(:.*\\)" (1 'org-code t))
+	   ;; Table
 	   '("| *\\(:?=[^|\n]*\\)" (1 'org-formula t))
-;	   '("^[ \t]*| *\\([#!$*_^/]\\) *|" (1 'org-formula t))
 	   '("^[ \t]*| *\\([#*]\\) *|" (1 'org-formula t))
 	   '("^[ \t]*|\\( *\\([$!_^/]\\) *|.*\\)|" (1 'org-formula t))
 	   ;; Drawers
-;	   (list org-drawer-regexp '(0 'org-drawer t))
-;	   (list "^[ \t]*:END:" '(0 'org-drawer t))
 	   (list org-drawer-regexp '(0 'org-special-keyword t))
 	   (list "^[ \t]*:END:" '(0 'org-special-keyword t))
 	   ;; Properties
@@ -17737,10 +17751,10 @@ that can be put into `org-agenda-skip-function' for the duration of a command."
 	   (not (re-search-forward org-deadline-time-regexp end t)))
       (and (setq m (memq 'regexp conditions))
 	   (stringp (setq r (nth 1 m)))
-	   (re-search-forward m end t))
+	   (re-search-forward (nth 1 m) end t))
       (and (setq m (memq 'notregexp conditions))
 	   (stringp (setq r (nth 1 m)))
-	   (not (re-search-forward m end t))))
+	   (not (re-search-forward (nth 1 m) end t))))
      end)))
 
 (defun org-agenda-list-stuck-projects (&rest ignore)
@@ -18380,7 +18394,8 @@ FRACTION is what fraction of the head-warning time has passed."
 				(progn (skip-chars-forward "^\r\n") (point))))
 		    (setq donep (string-match org-looking-at-done-regexp head))
 		    (if (string-match " \\([012]?[0-9]:[0-9][0-9]\\)" s)
-			(setq timestr (concat (match-string 1 s) " ")))
+			(setq timestr (concat (match-string 1 s) " "))
+		      (setq timestr nil))
 		    (if (and donep
 			     (or org-agenda-skip-scheduled-if-done
 				 (not (= diff 0))))
@@ -21465,7 +21480,6 @@ the body tags themselves."
          (level 0) (line "") (origline "") txt todo
          (umax nil)
          (umax-toc nil)
-	 (dummy (debug))
          (filename (if to-buffer nil
 		     (concat (file-name-as-directory
 			      (org-export-directory :html opt-plist))
diff --git a/org.pdf b/org.pdf
index b158eb40c..26758f8da 100644
--- a/org.pdf
+++ b/org.pdf