# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1102311576 0
# Node ID 265139cbc47c2da6d8a32cb852bb7775ef95b454
# Parent  f52a9a1c88ce29dfd47ee01c653b9e7feffc7f9a
New file.

diff -r f52a9a1c88ce -r 265139cbc47c lisp/textmodes/org.el
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/lisp/textmodes/org.el	Mon Dec 06 05:39:36 2004 +0000
@@ -0,0 +1,7590 @@
+;; org.el --- Outline-based notes management and organizer 
+
+;; Copyright (c) 2004 Free Software Foundation
+
+;; Author: Carsten Dominik <dominik at science dot uva dot nl>
+;; Keywords: outlines, hypermedia, calendar
+;; Homepage: http://www.astro.uva.nl/~dominik/Tools/org/
+;; Version: 3.03  (internal CVS version is $Revision: 1.104 $)
+
+;; This file is part of GNU Emacs
+
+;; This program is free software you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the Free
+;; Software Foundation; either version 2 of the License, or (at your option)
+;; any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+;; or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+;; for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Carsten's outline-mode for keeping track of everything.
+;;
+;;; Commentary:
+;;
+;; Org-mode is a mode for keeping notes, maintaining ToDo lists, and doing
+;; project planning with a fast and effective plain-text system.
+;;
+;; Org-mode develops organizational tasks around a NOTES file that contains
+;; information about projects as plain text.  Org-mode is implemented on
+;; top of outline-mode - ideal to keep the content of large files well
+;; structured.  It supports ToDo items, deadlines and time stamps, which
+;; magically appear in the diary listing of the Emacs calendar.  Tables are
+;; easily created with a built-in table editor.  Plain text URL-like links
+;; connect to websites, emails (VM,RMAIL,WANDERLUST), Usenet messages (Gnus),
+;; BBDB entries, and any files related to the projects.  For printing and
+;; sharing of notes, an Org-mode file (or a part of it) can be exported as
+;; a structured ASCII file, or as HTML.
+;;
+;; Installation
+;; ------------
+;; The instruction below assume that you have downloaded Org-mode from the
+;; web.  If Org-mode is part of the Emacs distribution or an XEmacs package,
+;; you only need to add to .emacs the last three lines of Lisp code listed
+;; below, i.e. the `auto-mode-alist' modification and the global key bindings.
+;;
+;; Byte-compile org.el and put it on your load path.  Then copy the
+;; following lines into .emacs.  The last two lines define *global*
+;; keys for the commands `org-store-link' and `org-agenda' - please
+;; choose suitable keys yourself.
+;;
+;;    (autoload 'org-mode "org" "Org mode" t)
+;;    (autoload 'org-diary "org" "Diary entries from Org mode")
+;;    (autoload 'org-agenda "org" "Multi-file agenda from Org mode" t)
+;;    (autoload 'org-store-link "org" "Store a link to the current location" t)
+;;    (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)
+;;
+;; This will put all files with extension ".org" into Org-mode.  As an
+;; alternative, make the first line of a file look like this:
+;;
+;;     MY PROJECTS    -*- mode: org; -*-
+;;
+;; which will select Org-mode for this buffer no matter what the file's
+;; name is.
+;;
+;; Documentation
+;; -------------
+;; The documentation of Org-mode can be found in the TeXInfo file.
+;; This distribution also contains a PDF version of it.  At the homepage
+;; of Org-mode, you can find and read online the same text as HTML.
+;;
+;; Changes:
+;; -------
+;; Version 3.03
+;;    - Copyright transfer to the FSF.
+;;    - Effect of C-u and C-u C-u in org-timeline interchanged.
+;;    - Timeline now always contains today, and `.' jumps to it.
+;;    - Table editor:
+;;      - cut and paste of regtangular regions in tables
+;;      - command to convert org-mode table to table.el table and back
+;;      - command to treat several cells like a paragraph and fill it
+;;      - command to convert a buffer region to a table
+;;      - import/export tables as tab-separated files (exchange with Excel)
+;;    - Agenda:
+;;      - Sorting mechanism for agenda items rewritten from scratch.
+;;      - Sorting fully configurable.
+;;      - Entries specifying a time are sorted together.
+;;    - Completion also covers option keywords after `#-'.
+;;    - Bug fixes.
+;;
+;; Version 3.01
+;;    - New reference card, thanks to Philip Rooke for creating it.
+;;    - Single file agenda renamed to "Timeline".  It no longer shows
+;;      warnings about upcoming deadlines/overdue scheduled items.
+;;      That functionality is now limited to the (multifile) agenda.
+;;    - When reading a date, the calendar can be manipulated with keys.
+;;    - Link support for RMAIL and Wanderlust (from planner.el, untested)
+;;    - Minor bug fixes and documentation improvements.
+;;
+;; Version 3.00
+;;    - Multifile Agenda shows current entries from many different files.
+;;    - TeXInfo documentation (thanks to Christian Egli for the conversion).
+;;    - Additional applications for TODO keywords, see documentation.
+;;      Different files may have different TODO keywords etc.
+;;    - Priorities for TODO items.
+;;    - The browser mode used by `org-remember-handler' is improved.
+;;    - Images get inlined in HTML export (thanks to Carsten Wimmer).
+;;    - File links can contain line numbers, like file:/usr/etc/config:255
+;;    - Minor bug fixes.
+;;
+;; Version 2.10
+;;    - TODO entries can have additional states besides TODO and DONE.
+;;      See new variable `org-todo-keywords'.
+;;    - TODO keywords can be interpreted as categories.  See variable
+;;      `org-todo-interpretation'.
+;;    - M-TAB completion on TODO keywords, TeX symbols, and normal words.
+;;    - All keywords (like TODO, DEADLINE etc) are configurable.
+;;    - Cursor positioning optimized after pro/demotion and TODO cycling.
+;;    - Emphasizing in HTML works now for *bold*, /italic/ and _underline_.
+;;    - New commands to kill, copy and yank entire subtrees.  Yanking
+;;      modifies the level of the tree before insertion.
+;;    - New command `org-goto' (C-c C-j) to quickly move to other locations
+;;      in the buffer without affecting outline visibility.
+;;    - Hooks for John Wiegley's remember.el.
+;;    - `org-read-date' pops up calendar for date selection with the mouse.
+;;      See variable `org-popup-calendar-for-date-prompt'.  
+;;
+;; Version 2.6
+;;    - TODO items can be SCHEDULED to a certain date.
+;;    - Expired DEADLINEs are ignored if in an entry marked DONE.
+;;    - From the diary or time-sorted view (C-c C-r), C-c C-t can be used to
+;;      change the TODO state of an item remotely.
+;;    - Horizontal computations in table editor. See `org-table-eval-formula'.
+;;    - Fixed bug with summing tables (command `org-table-sum', `C-c +').
+;;    - Calendar window follows the timestamp when a timestamp is changed.
+;;      New variable `org-calendar-follow-timestamp-change'.
+;;    - Time-sorted view (`org-diary-view', C-c C-r) now uses the prefix
+;;      argument to force inclusion of unscheduled TODO items.
+;;    - New variable `org-confirm-shell-links' to turn of safety query.
+;;    - New variable `org-open-non-existing-files'.
+;;
+;; Version 2.4
+;;    - A time-sorted view on all time stamps can be created with C-c C-r.
+;;    - Timestamps and Deadlines can be shown in the Emacs diary.
+;;    - Date ranges introduced.
+;;    - Time-string formats are no longer configurable.
+;;    - Vertical lines in tables can be made invisible with `C-c |'.
+;;    - New "link" type to execute shell commands, like "shell:ls *.org"
+;;    - Upon export, "myfile.org" becomes "myfile.html" or "myfile.txt",
+;;      instead of "myfile.org.html" or "myfile.org.txt".
+;;    - When the cursor is in the white space at the beginning of a line,
+;;      TAB removes the whitespace before indenting again.
+;;
+;; Version 2.0
+;;    - Windows (NT/2000) support.
+;;    - Works with both Emacs and XEmacs.
+;;    - Fully automatic table editor.
+;;    - New link types into Gnus, VM and BBDB.
+;;    - Other link system changes
+;;      - Time stamps are treated as links to the calendar.
+;;      - Easy creation of links with global command `org-store-link'.
+;;      - Insertion of links with `C-c C-l' works differently now.
+;;      - Space characters allowed as part of a link.
+;;      - Options in `org-file-apps' extended.  The command may now be
+;;        symbol 'emacs', or a lisp form.
+;;    Please re-read the manual section about links.
+;;    - Timestamp changes
+;;      - `org-deadline' now prompts for a date.
+;;      - A line can now contain several timestamps.  Updating of a
+;;        timestamp only happens if the cursor is at the timestamp.
+;;      - Changed the time-stamp-format to ISO, to make sure it will
+;;        always work (non-English month names had caused problems
+;;        with `parse-time-string'.).  Changing the time stamp format
+;;        is not recommended.
+;;    - Picture mode enhancements have been removed from org.el
+;;
+;; Version 1.4
+;;    - Some option name changes, not backward compatible.
+;;    - ASCII exporter upgrade: Table of contents.
+;;    - HTML exporter upgrade: fixed-width regions, better
+;;      sub/superscripts, many TeX symbols supported.
+;;    - Calendar support.
+;;
+;; Version 1.3
+;;    - HTML exporter upgrade, in particular table of contents
+;;
+;; Version 1.0
+;;    - Initial release
+
+;;; Code:
+
+(eval-when-compile (require 'cl))
+(require 'outline)
+(require 'time-date)
+(require 'easymenu)
+
+;;; Customization variables
+
+(defvar org-version "3.03"
+  "The version number of the file org.el.")
+(defun org-version (arg)
+  (interactive "P")
+  (message "Org-mode version %s" org-version))
+
+;; The following two constants are for compatibility with different 
+;; Emacs versions (Emacs versus XEmacs) and with different versions of
+;; outline.el.  All the compatibility code in org.el is based on these two
+;; constants.
+(defconst org-xemacs-p (featurep 'xemacs)
+  "Are we running xemacs?")
+(defconst org-noutline-p (featurep 'noutline)
+  "Are we using the new outline mode?")
+
+(defgroup org nil
+  "Outline-based notes management and organizer "
+  :tag "Org"
+  :group 'outlines
+  :group 'hypermedia
+  :group 'calendar)
+
+(defgroup org-startup nil
+  "Options concerning startup of Org-mode."
+  :tag "Org Startup"
+  :group 'org)
+
+(defcustom org-startup-folded t
+  "Non-nil means, entering Org-mode will switch to OVERVIEW."
+  :group 'org-startup
+  :type 'boolean)
+
+(defcustom org-startup-truncated t
+  "Non-nil means, entering Org-mode will set `truncate-lines'.
+This is useful since some lines containing links can be very long and
+uninteresting.  Also tables look terrible when wrapped."
+  :group 'org-startup
+  :type 'boolean)
+
+(defcustom org-startup-with-deadline-check nil
+  "Non-nil means, entering Org-mode will run the deadline check.
+This means, if you start editing an org file, you will get an
+immediate reminder of any due deadlines."
+  :group 'org-startup
+  :type 'boolean)
+
+(defcustom org-insert-mode-line-in-empty-file t
+  "Non-nil means insert the first line setting Org-mode in empty files.
+When the function `org-mode' is called interactively in an empty, this
+normally means that the file name does not automatically trigger Org-mode.
+To ensure that the file will always be in Org-mode in the future, a
+line enforcing Org-mode can be inserted into the buffer."
+  :group 'org-startup
+  :type 'boolean)
+
+(defgroup org-keywords nil
+  "Options concerning TODO items in Org-mode."
+  :tag "Org Keywords"
+  :group 'org)
+
+(defcustom org-todo-keywords '("TODO" "DONE")
+  "List of TODO entry keywords.\\<org-mode-map>
+By default, this is '(\"TODO\" \"DONE\").  The last entry in the list is
+considered to mean that the entry is \"done\".  All the other mean that
+action is required, and will make the entry show up in todo lists, diaries
+etc.
+The command \\[org-todo] cycles an entry through these states, and an
+additional state where no keyword is present.  For details about this
+cycling, see also the variable `org-todo-interpretation'
+Changes become only effective after restarting Emacs."
+  :group 'org-keywords
+  :type '(repeat (string :tag "Keyword")))
+
+(defcustom org-todo-interpretation 'sequence
+  "Controls how TODO keywords are interpreted.\\<org-mode-map>
+Possible values are `sequence' and `type'.
+This variable is only relevant if `org-todo-keywords' contains more than two
+states.  There are two ways how these keywords can be used:
+
+- As a sequence in the process of working on a TODO item, for example
+  (setq org-todo-keywords '(\"TODO\" \"STARTED\" \"VERIFY\" \"DONE\")
+        org-todo-interpretation 'sequence)
+
+- As different types of TODO items, for example
+  (setq org-todo-keywords '(\"URGENT\" \"RELAXED\" \"REMIND\" \"FOR_TOM\" \"DONE\")
+        org-todo-interpretation 'type)
+
+When the states are interpreted as a sequence, \\[org-todo] always cycles
+to the next state, in order to walk through all different states.  So with
+\\[org-todo], you turn an empty entry into the state TODO.  When you started
+working on the item, you use \\[org-todo] again to switch it to \"STARTED\",
+later to VERIFY and finally to DONE.
+
+When the states are interpreted as types, \\[org-todo] still cycles through
+when it is called several times in direct succession, in order to initially
+select the type.  However, if not called immediately after a previous
+\\[org-todo], it switches from each type directly to DONE.  So with the
+above example, you could use `\\[org-todo] \\[org-todo]' to label an entry
+RELAXED.  If you later return to this entry and press \\[org-todo] again,
+RELAXED will not be changed REMIND, but directly to DONE.
+
+You can create a large number of types.  To initially select a
+type, it is then best to use C-u \\[org-todo] in order to specify the
+type with completion.  Of course, you can also type the keyword
+directly into the buffer.  M-TAB completes TODO keywords at the
+beginning of a headline."
+  :group 'org-keywords
+  :type '(choice (const sequence)
+                 (const type)))
+
+(defcustom org-default-priority ?B
+  "The default priority of TODO items.
+This is the priority an item get if no explicit priority is given."
+  :group 'org-keywords
+  :type 'character)
+
+(defcustom org-lowest-priority ?C
+  "The lowest priority of TODO items.  A character like ?A, ?B etc."
+  :group 'org-keywords
+  :type 'character)
+
+(defcustom org-deadline-string "DEADLINE:"
+  "String to mark deadline entries.
+A deadline is this string, followed by a time stamp.  Should be a word,
+terminated by a colon.  You can insert a schedule keyword and
+a timestamp with \\[org-deadline].
+Changes become only effective after restarting Emacs."
+  :group 'org-keywords
+  :type 'string)
+
+(defcustom org-scheduled-string "SCHEDULED:"
+  "String to mark scheduled TODO entries.
+A schedule is this string, followed by a time stamp.  Should be a word,
+terminated by a colon.  You can insert a schedule keyword and
+a timestamp with \\[org-schedule].
+Changes become only effective after restarting Emacs."
+  :group 'org-keywords
+  :type 'string)
+
+(defcustom org-comment-string "COMMENT"
+  "Entries starting with this keyword will never be exported.
+An entry can be toggled between COMMENT and normal with
+\\[org-toggle-comment].
+Changes become only effective after restarting Emacs."
+  :group 'org-keywords
+  :type 'string)
+
+(defcustom org-after-todo-state-change-hook nil
+  "Hook which is run after the state of a TODO item was changed.
+The new state (a string with a todo keyword, or nil) is available in the
+lisp variable `state'."
+  :group 'org-keywords
+  :type 'hook)
+
+;; Variables for pre-computed regular expressions, all buffer local
+(defvar org-todo-kwd-priority-p nil
+  "Do TODO items have priorities?")
+(make-variable-buffer-local 'org-todo-kwd-priority-p)
+(defvar org-todo-kwd-max-priority nil
+  "Maximum priority of TODO items")
+(make-variable-buffer-local 'org-todo-kwd-max-priority)
+(defvar org-ds-keyword-length 12
+  "Maximum length of the Deadline and SCHEDULED keywords.")
+(make-variable-buffer-local 'org-ds-keyword-length)
+(defvar org-done-string nil
+  "The last string in `org-todo-keywords', indicating an item is DONE.")
+(make-variable-buffer-local 'org-done-string)
+(defvar org-todo-regexp nil
+  "Matches any of the TODO state keywords.")
+(make-variable-buffer-local 'org-todo-regexp)
+(defvar org-not-done-regexp nil
+  "Matches any of the TODO state keywords except the last one.")
+(make-variable-buffer-local 'org-not-done-regexp)
+(defvar org-todo-line-regexp nil
+  "Matches a headline and puts TODO state into group 2 if present.")
+(make-variable-buffer-local 'org-todo-line-regexp)
+(defvar orb-nl-done-regexp nil
+  "Matches newline followed by a headline with the DONE keyword.")
+(make-variable-buffer-local 'orb-nl-done-regexp)
+(defvar org-looking-at-done-regexp nil
+  "Matches the DONE keyword a point.")
+(make-variable-buffer-local 'org-looking-at-done-regexp)
+(defvar org-deadline-regexp nil
+  "Matches the DEADLINE keyword.")
+(make-variable-buffer-local 'org-deadline-regexp)
+(defvar org-deadline-time-regexp nil
+  "Matches the DEADLINE keyword together with a time stamp.")
+(make-variable-buffer-local 'org-deadline-time-regexp)
+(defvar org-deadline-line-regexp nil
+  "Matches the DEADLINE keyword and the rest of the line.")
+(make-variable-buffer-local 'org-deadline-line-regexp)
+(defvar org-scheduled-regexp nil
+  "Matches the SCHEDULED keyword.")
+(make-variable-buffer-local 'org-scheduled-regexp)
+(defvar org-scheduled-time-regexp nil
+  "Matches the SCHEDULED keyword together with a time stamp.")
+(make-variable-buffer-local 'org-scheduled-time-regexp)
+
+(defun org-set-regexps ()
+  "Precompute regular expressions for current buffer."
+  (when (eq major-mode 'org-mode)
+    (let ((re (org-make-options-regexp
+               '("CATEGORY" "SEQ_TODO" "PRI_TODO" "TYP_TODO")))
+          (splitre "[ \t]+")
+          kwds int key value cat)
+      (save-restriction
+        (save-excursion
+          (widen)
+          (goto-char (point-min))
+          (while (re-search-forward re nil t)
+            (setq key (match-string 1) value (match-string 2))
+            (cond 
+             ((equal key "CATEGORY")
+              (setq cat (intern (car (org-split-string value splitre)))))
+             ((equal key "SEQ_TODO")
+              (setq int 'sequence
+                    kwds (append kwds (org-split-string value splitre))))
+             ((equal key "PRI_TODO")
+              (setq int 'priority
+                    kwds (append kwds (org-split-string value splitre))))
+             ((equal key "TYP_TODO")
+              (setq int 'type
+                    kwds (append kwds (org-split-string value splitre)))))
+            )))
+      (and cat (set (make-local-variable 'org-category) cat))
+      (and kwds (set (make-local-variable 'org-todo-keywords) kwds))
+      (and int (set (make-local-variable 'org-todo-interpretation) int)))
+    ;; Compute the regular expressions and other local variables
+    (setq org-todo-kwd-priority-p (equal org-todo-interpretation 'priority)
+          org-todo-kwd-max-priority (1- (length org-todo-keywords))
+          org-ds-keyword-length (+ 2 (max (length org-deadline-string)
+                                          (length org-scheduled-string)))
+          org-done-string 
+          (nth (1- (length org-todo-keywords)) org-todo-keywords)
+          org-todo-regexp
+          (concat "\\<\\(" (mapconcat 'regexp-quote org-todo-keywords
+                                      "\\|") "\\)\\>")
+          org-not-done-regexp
+          (concat "\\<\\("
+                  (mapconcat 'regexp-quote
+                             (nreverse (cdr (reverse org-todo-keywords)))
+                             "\\|")
+                  "\\)\\>")
+          org-todo-line-regexp
+          (concat "^\\(\\*+\\)[ \t]*\\("
+                  (mapconcat 'regexp-quote org-todo-keywords "\\|")
+                  "\\)? *\\(.*\\)")
+          orb-nl-done-regexp
+          (concat "[\r\n]\\*+[ \t]+" org-done-string "\\>")
+          org-looking-at-done-regexp (concat "^" org-done-string "\\>")
+          org-deadline-regexp (concat "\\<" org-deadline-string)
+          org-deadline-time-regexp
+          (concat "\\<" org-deadline-string " *<\\([^>]+\\)>")
+          org-deadline-line-regexp
+          (concat "\\<\\(" org-deadline-string "\\).*")
+          org-scheduled-regexp
+          (concat "\\<" org-scheduled-string)
+          org-scheduled-time-regexp
+          (concat "\\<" org-scheduled-string " *<\\([^>]+\\)>"))
+    (org-set-font-lock-defaults)))
+
+;(add-hook 'hack-local-variables-hook 'org-set-regexps)
+
+(defgroup org-time nil
+  "Options concerning time stamps and deadlines in Org-mode."
+  :tag "Org Time"
+  :group 'org)
+
+(defcustom org-deadline-warning-days 30
+  "No. of days before expiration during which a deadline becomes active.
+This variable governs the display in the org file."
+  :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
+minibuffer will also be active, and you can simply enter the date as well.
+When nil, only the minibuffer will be available."
+  :group 'org-time
+  :type 'number)
+
+(defcustom org-calendar-follow-timestamp-change t
+  "Non-nil means, make the calendar window follow timestamp changes.
+When a timestamp is modified and the calendar window is visible, it will be
+moved to the new date."
+  :group 'org-time
+  :type 'boolean)
+
+(defgroup org-agenda nil
+  "Options concerning agenda display Org-mode."
+  :tag "Org Agenda"
+  :group 'org)
+
+(defcustom org-agenda-files nil
+  "A list of org files for agenda/diary display.
+Entries are added to this list with \\[org-add-file] and removed with
+\\[org-remove-file].  You can also use customize to edit the list."
+  :group 'org-agenda
+  :type '(repeat file))
+
+(defcustom org-select-timeline-window t
+  "Non-nil means, after creating a timeline, move cursor into Timeline window.
+When nil, cursor will remain in the current window."
+  :group 'org-agenda
+  :type 'boolean)
+
+(defcustom org-select-agenda-window t
+  "Non-nil means, after creating an agenda, move cursor into Agenda window.
+When nil, cursor will remain in the current window." 
+  :group 'org-agenda
+  :type 'boolean)
+
+(defcustom org-agenda-show-all-dates t
+  "Non-nil means, `org-agenda' shows every day in the selected range.
+When nil, only the days which actually have entries are shown."
+  :group 'org-agenda
+  :type 'boolean)
+
+;; FIXME: First day of month works only for current month because it would
+;; require a variable ndays treatment.
+(defcustom org-agenda-start-on-weekday 1
+  "Non-nil means, start the overview always on the specified weekday.
+0 Denotes Sunday, 1 denotes Monday etc.
+When nil, always start on the current day."
+  :group 'org-agenda
+  :type '(choice (const :tag "Today" nil)
+                 (const :tag "First day of month" t)
+                 (number :tag "Weekday No.")))
+
+(defcustom org-agenda-ndays 7
+  "Number of days to include in overview display."
+  :group 'org-agenda
+  :type 'number)
+
+(defcustom org-agenda-include-all-todo t
+  "Non-nil means, the multifile agenda will always contain alm TODO entries.
+When nil, date-less entries will only be shown if `org-agenda' is called
+with a prefix argument.
+When non-nil, the TODO entries will be listed at the top of the agenda, before
+the entries for specific days." 
+  :group 'org-agenda
+  :type 'boolean)
+
+(defcustom org-agenda-include-diary nil
+  "Non-nil means, when preparing the agenda, also get the
+entries from the emacs calendars diary."
+  :group 'org-agenda
+  :type 'boolean)
+
+
+(defcustom org-agenda-sorting-strategy '(time-up category-keep priority-down)
+  "Sorting structure for the agenda items of a single day.
+This is a list of symbols which will be used in sequence to determine
+if an entry should be listed before another entry.  The following
+symbols are recognized.
+
+time-up         Put entries with time-of-day indications first, early first
+time-down       Put entries with time-of-day indications first, late first
+category-keep   Keep the default order of categories, corresponding to the
+                sequence in `org-agenda-files'.
+category-up     Sort alphabetically by category, A-Z.
+category-down   Sort alphabetically by category, Z-A.
+priority-up     Sort numerically by priority, high priority last.
+priority-down   Sort numerically by priority, high priority first.
+
+The different possibilities will be tried in sequence, and testing stops
+if one comparison returns a \"not-equal\".  For example, the default
+    '(time-up category-keep priority-down)
+means: Pull out all entries having a specified time of day and sort them,
+in order to make a time schedule for the current day the first thing in the
+agenda listing for the day.  Of the entries without a time indication, keep
+the grouped in categories, don't sort the categories, but keep them in
+the sequence given in `org-agenda-files'.  Within each category sort by
+priority.
+
+Leaving out the `category-keep' would mean that items will be sorted across
+categories by priority."
+  :group 'org-agenda
+  :type '(repeat 
+          (choice
+           (const time-up)
+           (const time-down)
+           (const category-keep)
+           (const category-up)
+           (const category-down)
+           (const priority-up)
+           (const priority-down))))
+
+(defcustom org-sort-agenda-notime-is-late t
+  "Non-nil means, items without time are considered late.
+This is only relevant for sorting.  When t, items which have no explicit
+time like 15:30 will be considered as 24:01, i.e. later than any items which
+do have a time.  When nil, the default time is before 0:00."
+  :group 'org-agenda
+  :type 'boolean)
+
+(defvar org-category nil
+  "Variable used by org files to set a category for agenda display.
+Such files should use a file variable to set it, for example
+
+   -*- mode: org; org-category: \"ELisp\"
+
+If the file does not specify a category, the file's base name
+is used instead.")
+
+(defgroup org-structure nil
+  "Options concerning structure editing in Org-mode."
+  :tag "Org Structure"
+  :group 'org)
+
+(defcustom org-adapt-indentation t
+  "Non-nil means, adapt indentation when promoting and demoting.
+When this is set and the *entire* text in an entry is indented, the
+indentation is increased by one space in a demotion command, and
+decreased by one in a promotion command.  If any line in the entry
+body starts at column 0, indentation is not changed at all."
+  :group 'org-structure
+  :type 'boolean)
+
+(defcustom org-cycle-emulate-tab t
+  "Where should `org-cycle' emulate TAB.
+nil    Never
+white  Only in completely white lines
+t      Everywhere except in headlines"
+  :group 'org-structure
+  :type '(choice (const :tag "Never" nil)
+		 (const :tag "Only in completely white lines" white)
+		 (const :tag "Everywhere except in headlines" t)
+		 ))
+
+(defconst org-time-stamp-formats '("<%Y-%m-%d %a>" . "<%Y-%m-%d %a %H:%M>")
+  "Formats for `format-time-string' which are used for time stamps.
+It is not recommended to change this constant.")
+
+(defgroup org-link nil
+  "Options concerning links in Org-mode."
+  :tag "Org Link"
+  :group 'org)
+
+(defcustom org-allow-space-in-links t
+  "Non-nil means, file names in links may contain space characters.
+When nil, it becomes possible to put several links into a line."
+  :group 'org-link
+  :type 'boolean)
+
+(defcustom org-line-numbers-in-file-links t
+  "Non-nil means, file links from `org-store-link' contain line numbers.
+The line number will be added to the file name with :NNN and interpreted
+by the command `org-open-at-point'.
+Using a prefix arg to the command \\[org-store-link] (`org-store-link')
+negates this setting for the duration of the command."
+  :group 'org-link
+  :type 'boolean)
+
+(defcustom org-keep-stored-link-after-insertion nil
+  "Non-nil means, keep link in list for entire session.
+
+The command `org-store-link' adds a link pointing to the current
+location to an internal list. These links accumulate during a session.
+The command `org-insert-link' can be used to insert links into any
+Org-mode file (offering completion for all stored links).  When this
+option is nil, every link which has been inserted once using `C-c C-l'
+will be removed from the list, to make completing the unused links
+more efficient."
+  :group 'org-link
+  :type 'boolean)
+
+(defcustom org-link-frame-setup
+  '((vm . vm-visit-folder-other-frame)
+    (gnus . gnus-other-frame)
+    (file . find-file-other-window))
+  "Setup the frame configuration for following links.
+When following a link with Emacs, it may often be useful to display
+this link in another window or frame.  This variable can be used to
+set this up for the different types of links.
+For VM, use any of
+    vm-visit-folder
+    vm-visit-folder-other-frame
+For Gnus, use any of
+    gnus
+    gnus-other-frame
+For FILE, use any of
+    find-file
+    find-file-other-window
+    find-file-other-frame
+For the calendar, use the variable `calendar-setup'.
+For BBDB, it is currently only possible to display the matches in
+another window."
+  :group 'org-link
+  :type '(list
+          (cons (const vm)
+                (choice
+                 (const vm-visit-folder)
+                 (const vm-visit-folder-other-window)
+                 (const vm-visit-folder-other-frame)))
+          (cons (const gnus)
+                (choice
+                 (const gnus)
+                 (const gnus-other-frame)))
+          (cons (const file)
+                (choice
+                 (const find-file)
+                 (const find-file-other-window)
+                 (const find-file-other-frame)))))
+
+(defcustom org-usenet-links-prefer-google nil
+  "Non-nil means, `org-store-link' will create web links to google groups.
+When nil, Gnus will be used for such links.
+Using a prefix arg to the command \\[org-store-link] (`org-store-link')
+negates this setting for the duration of the command."
+  :group 'org-link
+  :type 'boolean)
+
+(defcustom org-open-non-existing-files nil
+  "Non-nil means, `org-open-file' will open non-existing file.
+When nil, an error will be generated."
+  :group 'org-link
+  :type 'boolean)
+
+(defcustom org-confirm-shell-links t
+  "Non-nil means, ask for confirmation before executing shell links.
+The default is true, to keep new users from shooting into their own foot."
+  :group 'org-link
+  :type 'boolean)
+
+(defconst org-file-apps-defaults-linux
+  '((t        . emacs)
+    ("jpg"    . "xv %s")
+    ("gif"    . "xv %s")
+    ("ppm"    . "xv %s")
+    ("pgm"    . "xv %s")
+    ("pbm"    . "xv %s")
+    ("tif"    . "xv %s")
+    ("png"    . "xv %s")
+    ("ps"     . "gv %s")
+    ("ps.gz"  . "gv %s")
+    ("eps"    . "gv %s")
+    ("eps.gz" . "gv %s")
+    ("dvi"    . "xdvi %s")
+    ("mpeg"   . "plaympeg %s")
+    ("mp3"    . "plaympeg %s")
+    ("fig"    . "xfig %s")
+    ("pdf"    . "acroread %s")
+    ("doc"    . "soffice %s")
+    ("ppt"    . "soffice %s")
+    ("pps"    . "soffice %s")
+    ("html"   . "netscape -remote openURL(%s,new-window)")
+    ("htm"    . "netscape -remote openURL(%s,new-window)")
+    ("xs"     . "soffice %s"))
+  "Default file applications on a UNIX/LINUX system.
+See `org-file-apps'.")
+
+(defconst org-file-apps-defaults-macosx
+  '((t        . "open %s")
+    ("ps"     . "gv %s")
+    ("ps.gz"  . "gv %s")
+    ("eps"    . "gv %s")
+    ("eps.gz" . "gv %s")
+    ("dvi"    . "xdvi %s")
+    ("fig"    . "xfig %s"))
+  "Default file applications on a MacOS X system.
+The system \"open\" is known as a default, but we use X11 applications
+for some files for which the OS does not have a good default.
+See `org-file-apps'.")
+
+(defconst org-file-apps-defaults-windowsnt
+  '((t        . (w32-shell-execute "open" file)))
+  "Default file applications on a Windows NT system.
+The system \"open\" is used for most files.
+See `org-file-apps'.")
+
+(defcustom org-file-apps
+  '(
+    ("txt" . emacs)
+    ("tex" . emacs)
+    ("ltx" . emacs)
+    ("org" . emacs)
+    ("el"  . emacs)
+    )
+  "External applications for opening `file:path' items in a document.
+Org-mode uses system defaults for different file types, but
+you can use this variable to set the application for a given file
+extension.  The entries in this list are cons cells with a file extension
+and the corresponding command.  Possible values for the command are:
+ `emacs'     The file will be visited by the current Emacs process.
+ `default'   Use the default application for this file type.
+ string      A command to be executed by a shell. %s will be replaced
+             by the path to the file.
+ sexp        A lisp form which will be evaluated.  The file path will
+             be available in the lisp variable `file'.
+For more examples, see the system specific constants
+`org-file-apps-defaults-macosx'
+`org-file-apps-defaults-windowsnt'
+`org-file-apps-defaults-linux'."
+  :group 'org-link
+  :type '(repeat
+          (cons (string :tag "Extension")
+                (choice :value ""
+                 (const :tag "Visit with Emacs" 'emacs)
+                 (const :tag "Use system default" 'default)
+                 (string :tag "Command")
+                 (sexp :tag "Lisp form")))))
+
+
+(defgroup org-remember nil
+  "Options concerning interaction with remember.el."
+  :tag "Org Remember"
+  :group 'org)
+
+(defcustom org-directory "~/org"
+  "Directory with org files.
+This directory will be used as default to prompt for org files.
+Used by the hooks for remember.el."
+  :group 'org-remember
+  :type 'directory)
+
+(defcustom org-default-notes-file "~/.notes"
+  "Default target for storing notes.
+Used by the hooks for remember.el.  This can be a string, or nil to mean
+the value of `remember-data-file'."
+  :group 'org-remember
+  :type '(choice
+          (const :tag "Default from remember-data-file" nil)
+          file))
+
+(defcustom org-reverse-note-order nil
+  "Non-nil means, store new notes at the beginning of a file or entry.
+When nil, new notes will be filed to the end of a file or entry."
+  :group 'org-remember
+  :type '(choice
+          (const :tag "Reverse always" t)
+          (const :tag "Reverse never" nil)
+          (repeat :tag "By file name regexp"
+                  (cons regexp boolean))))
+
+(defgroup org-table nil
+  "Options concerning tables in Org-mode."
+  :tag "Org Table"
+  :group 'org)
+
+(defcustom org-enable-table-editor t
+  "Non-nil means, lines starting with \"|\" are handled by the table editor.
+When nil, such lines will be treated like ordinary lines."
+  :group 'org-table
+  :type 'boolean)
+
+(defcustom org-table-default-size "5x2"
+  "The default size for newly created tables, Columns x Rows."
+  :group 'org-table
+  :type 'string)
+
+(defcustom org-table-automatic-realign t
+  "Non-nil means, automatically re-align table when pressing TAB or RETURN.
+When nil, aligning is only done with \\[org-table-align], or after column
+removal/insertion."
+  :group 'org-table
+  :type 'boolean)
+
+(defcustom org-table-spaces-around-separators '(1 . 1)
+  "The number of spaces to be placed before and after separators."
+  :group 'org-table
+  :type '(cons (number :tag "Before \"|\"") (number :tag " After \"|\"")))
+
+(defcustom org-table-spaces-around-invisible-separators '(1 . 2)
+  "The number of spaces to be placed before and after separators.
+This option applies when the column separators have been made invisible."
+  :group 'org-table
+  :type '(cons (number :tag "Before \"|\"") (number :tag " After \"|\"")))
+
+(defcustom org-table-number-regexp "^[<>]?[-+^.0-9]*[0-9][-+^.0-9eEdDx()%]*$"
+  "Regular expression for recognizing numbers in table columns.
+If a table column contains mostly numbers, it will be aligned to the
+right.  If not, it will be aligned to the left.
+
+The default value of this option is a regular expression which allows
+anything which looks remotely like a number as used in scientific
+context.  For example, all of the following will be considered a
+number:
+    12    12.2    2.4e-08    2x10^12    4.034+-0.02    2.7(10)  >3.5
+
+Other options offered by the customize interface are more restrictive."
+  :group 'org-table
+  :type '(choice
+          (const :tag "Positive Integers"
+                 "^[0-9]+$")
+          (const :tag "Integers"
+                 "^[-+]?[0-9]+$")
+          (const :tag "Floating Point Numbers"
+                 "^[-+]?\\([0-9]*\\.[0-9]+\\|[0-9]+\\.[0-9]*\\)$")
+          (const :tag "Floating Point Number or Integer"
+                 "^[-+]?\\([0-9]*\\.[0-9]+\\|[0-9]+\\.?[0-9]*\\)$")
+          (const :tag "Exponential, Floating point, Integer"
+                 "^[-+]?[0-9.]+\\([eEdD][-+0-9]+\\)?$")
+          (const :tag "Very General Number-Like"
+                 "^[<>]?[-+^.0-9]*[0-9][-+^.0-9eEdDx()%]*$")
+          (string :tag "Regexp:")))
+
+(defcustom org-table-number-fraction 0.5
+  "Fraction of numbers in a column required to make the column align right.
+In a column all non-white fields are considered.  If at least this
+fraction of fields is matched by `org-table-number-fraction',
+alignment to the right border applies."
+  :group 'org-table
+  :type 'number)
+
+(defcustom org-export-highlight-first-table-line t
+  "Non-nil means, highlight the first table line.
+In HTML export, this means use <th> instead of <td>.
+In tables created with table.el, this applies to the first table line.
+In Org-mode tables, all lines before the first horizontal separator
+line will be formatted with <th> tags."
+  :group 'org-table
+  :type 'boolean)
+
+(defcustom org-table-tab-recognizes-table.el t
+  "Non-nil means, TAB will automatically notice a table.el table.
+When it sees such a table, it moves point into it and - if necessary -
+calls `table-recognize-table'."
+  :group 'org-table
+  :type 'boolean)
+
+(defcustom org-export-prefer-native-exporter-for-tables nil
+  "Non-nil means, always export tables created with table.el natively.
+Natively means, use the HTML code generator in table.el.
+When nil, Org-mode's own HTML generator is used when possible (i.e. if
+the table does not use row- or column-spanning).  This has the
+advantage, that the automatic HTML conversions for math symbols and
+sub/superscripts can be applied.  Org-mode's HTML generator is also
+much faster."
+  :group 'org-table
+  :type 'boolean)
+
+(defcustom org-enable-fixed-width-editor t
+  "Non-nil means, lines starting with \":\" are treated as fixed-width.
+This currently only means, they are never auto-wrapped.
+When nil, such lines will be treated like ordinary lines."
+  :group 'org-table
+  :type 'boolean)
+
+(defgroup org-export nil
+  "Options for exporting org-listings."
+  :tag "Org Export"
+  :group 'org)
+
+(defcustom org-export-language-setup
+  '(("en"  "Author"          "Date"  "Table of Contents")
+    ("da"  "Ophavsmand"      "Dato"  "Indhold")
+    ("de"  "Autor"           "Datum" "Inhaltsverzeichnis")
+    ("es"  "Autor"           "Fecha" "\xccndice")
+    ("fr"  "Auteur"          "Date"  "Table des Mati\xe8res")
+    ("it"  "Autore"          "Data"  "Indice")
+    ("nl"  "Auteur"          "Datum" "Inhoudsopgave")
+    ("nn"  "Forfattar"       "Dato"  "Innhold")  ;; nn = Norsk (nynorsk)
+    ("sv"  "F\xf6rfattarens" "Datum" "Inneh\xe5ll"))
+  "Terms used in export text, translated to different languages.
+Use the variable `org-export-default-language' to set the language,
+or use the +OPTION lines for a per-file setting."
+  :group 'org-export
+  :type '(repeat
+          (list
+           (string :tag "HTML language tag")
+           (string :tag "Author")
+           (string :tag "Date")
+           (string :tag "Table of Contents"))))
+
+(defcustom org-export-default-language "en"
+  "The default language of HTML export, as a string.
+This should have an association in `org-export-language-setup'"
+  :group 'org-export
+  :type 'string)
+
+(defcustom org-export-headline-levels 3
+  "The last level which is still exported as a headline.
+Inferior levels will produce itemize lists when exported.
+Note that a numeric prefix argument to an exporter function overrides
+this setting.
+
+This option can also be set with the +OPTIONS line, e.g. \"H:2\"."
+  :group 'org-export
+  :type 'number)
+
+(defcustom org-export-with-section-numbers t
+  "Non-nil means, add section numbers to headlines when exporting.
+
+This option can also be set with the +OPTIONS line, e.g. \"num:t\"."
+  :group 'org-export
+  :type 'boolean)
+
+(defcustom org-export-with-toc t
+  "Non-nil means, create a table of contents in exported files.
+The TOC contains headlines with levels up to`org-export-headline-levels'.
+
+Headlines which contain any TODO items will be marked with \"(*)\" in
+ASCII export, and with red color in HTML output.
+
+In HTML output, the TOC will be clickable.
+
+This option can also be set with the +OPTIONS line, e.g. \"toc:nil\"."
+  :group 'org-export
+  :type 'boolean)
+
+(defcustom org-export-preserve-breaks nil
+  "Non-nil means, preserve all line breaks when exporting.
+Normally, in HTML output paragraphs will be reformatted.  In ASCII
+export, line breaks will always be preserved, regardless of this variable.
+
+This option can also be set with the +OPTIONS line, e.g. \"\\n:t\"."
+  :group 'org-export
+  :type 'boolean)
+
+(defcustom org-export-html-inline-images t
+  "Non-nil means, inline images into exported HTML pages.
+The link will still be to the original location of the image file.
+So if you are moving the page, lets say to your public HTML site,
+you will have to move the image and maybe change the link."
+  :group 'org-export
+  :type 'boolean)
+
+(defcustom org-export-html-expand t
+  "Non-nil means, for HTML export, treat @<...> as HTML tag.
+When nil, these tags will be exported as plain text and therefore
+not be interpreted by a browser.
+
+This option can also be set with the +OPTIONS line, e.g. \"@:nil\"."
+  :group 'org-export
+  :type 'boolean)
+
+(defcustom org-export-with-fixed-width t
+  "Non-nil means, lines starting with \":\" will be in fixed width font.
+This can be used to have preformatted text, fragments of code etc.  For
+example
+  : ;; Some Lisp examples
+  : (while (defc cnt)
+  :   (ding))
+will be looking just like this in also HTML.  In ASCII export, this option
+has no effect.
+
+This option can also be set with the +OPTIONS line, e.g. \"::nil\"."
+  :group 'org-export
+  :type 'boolean)
+
+(defcustom org-export-with-tables t
+  "Non-nil means, lines starting with \"|\" define a table
+For example:
+
+  | Name        | Address  | Birthday  |
+  |-------------+----------+-----------|
+  | Arthur Dent | England  | 29.2.2100 |
+
+In ASCII export, this option has no effect.
+
+This option can also be set with the +OPTIONS line, e.g. \"|:nil\"."
+  :group 'org-export
+  :type 'boolean)
+
+(defcustom org-export-html-table-tag
+  "<table border=1 cellspacing=0 cellpadding=6>"
+  "The HTML tag used to start a table.
+This must be a <table> tag, but you may change the options like
+borders and spacing."
+  :group 'org-export
+  :type 'string)
+
+(defcustom org-export-with-emphasize t
+  "Non-nil means, interprete *word*, /word/, and _word_ as emphasized text.
+If the export target supports emphasizing text, the word will be
+typeset in bold, italic, or underlined, respectively.  Works only for
+single words, but you can say: I *really* *mean* *this*.
+In ASCII export, this option has no effect.
+
+This option can also be set with the +OPTIONS line, e.g. \"*:nil\"."
+  :group 'org-export
+  :type 'boolean)
+
+(defcustom org-match-sexp-depth 3
+  "Number of stacked braces for sub/superscript matching.
+This has to be set before loading org.el to be effective."
+  :group 'org-export
+  :type 'integer)
+
+;; FIXME: Should () parens be removed as well in sub/superscripts?
+(defcustom org-export-with-sub-superscripts t
+  "Non-nil means, interprete \"_\" and \"^\" for export.
+When this option is turned on, you can use TeX-like syntax for sub- and
+superscripts.  Several characters after \"_\" or \"^\" will be
+considered as a single item - so grouping with {} is normally not
+needed.  For example, the following things will be parsed as single
+sub- or superscripts.
+
+ 10^24   or   10^tau     several digits will be considered 1 item
+ 10^-12  or   10^-tau    a leading sign with digits or a word
+ x^2-y^3                 will be read as x^2 - y^3, because items are
+                         terminated by almost any nonword/nondigit char.
+ x_{i^2} or   x^(2-i)    braces or parenthesis do grouping.
+
+Still, ambiguity is possible - so when in doubt use {} to enclose the
+sub/superscript.
+In ASCII export, this option has no effect.
+
+This option can also be set with the +OPTIONS line, e.g. \"^:nil\"."
+  :group 'org-export
+  :type 'boolean)
+
+(defcustom org-export-with-TeX-macros t
+  "Non-nil means, interprete simple TeX-like macros when exporting.
+For example, HTML export converts \\alpha to &alpha; and \\AA to &Aring;.
+No only real TeX macros will work here, but the standard HTML entities
+for math can be used as macro names as well.  For a list of supported
+names in HTML export, see the constant `org-html-entities'.
+In ASCII export, this option has no effect.
+
+This option can also be set with the +OPTIONS line, e.g. \"TeX:nil\"."
+  :group 'org-export
+  :type 'boolean)
+
+(defcustom org-export-html-with-timestamp nil
+  "Non-nil means,  write `org-export-html-html-helper-timestamp'
+into the exported html text.  Otherwise, the buffer will just be saved
+to a file."
+  :group 'org-export
+  :type 'boolean)
+
+(defcustom org-export-html-html-helper-timestamp
+  "<br><br><hr><p><!-- hhmts start --> <!-- hhmts end -->\n"
+  "The HTML tag used as timestamp delimiter for HTML-helper-mode."
+  :group 'org-export
+  :type 'string)
+
+(defcustom org-export-ascii-show-new-buffer t
+  "Non-nil means, popup buffer containing the exported ASCII text.
+Otherwise the buffer will just be saved to a file and stay hidden."
+  :group 'org-export
+  :type 'boolean)
+
+(defcustom org-export-html-show-new-buffer nil
+  "Non-nil means,  popup buffer containing the exported html text.
+Otherwise, the buffer will just be saved to a file and stay hidden."
+  :group 'org-export
+  :type 'boolean)
+
+
+(defgroup org-faces nil
+  "Faces for highlighting in Org-mode."
+  :tag "Org Faces"
+  :group 'org)
+
+(defface org-level-1-face ;; font-lock-function-name-face
+  '((((type tty) (class color)) (:foreground "blue" :weight bold))
+    (((class color) (background light)) (:foreground "Blue"))
+    (((class color) (background dark)) (:foreground "LightSkyBlue"))
+    (t (:inverse-video t :bold t)))
+  "Face used for level 1 headlines."
+  :group 'org-faces)
+
+(defface org-level-2-face ;; font-lock-variable-name-face
+  '((((type tty) (class color)) (:foreground "yellow" :weight light))
+    (((class color) (background light)) (:foreground "DarkGoldenrod"))
+    (((class color) (background dark)) (:foreground "LightGoldenrod"))
+    (t (:bold t :italic t)))
+  "Face used for level 2 headlines."
+  :group 'org-faces)
+
+(defface org-level-3-face ;; font-lock-keyword-face
+  '((((type tty) (class color)) (:foreground "cyan" :weight bold))
+    (((class color) (background light)) (:foreground "Purple"))
+    (((class color) (background dark)) (:foreground "Cyan"))
+    (t (:bold t)))
+  "Face used for level 3 headlines."
+  :group 'org-faces)
+
+(defface org-level-4-face   ;; font-lock-comment-face
+  '((((type tty pc) (class color) (background light)) (:foreground "red"))
+    (((type tty pc) (class color) (background dark)) (:foreground "red1"))
+    (((class color) (background light)) (:foreground "Firebrick"))
+    (((class color) (background dark)) (:foreground "chocolate1"))
+    (t (:bold t :italic t)))
+  "Face used for level 4 headlines."
+  :group 'org-faces)
+
+(defface org-level-5-face ;; font-lock-type-face
+  '((((type tty) (class color)) (:foreground "green"))
+    (((class color) (background light)) (:foreground "ForestGreen"))
+    (((class color) (background dark)) (:foreground "PaleGreen"))
+    (t (:bold t :underline t)))
+  "Face used for level 5 headlines."
+  :group 'org-faces)
+
+(defface org-level-6-face ;; font-lock-constant-face
+  '((((type tty) (class color)) (:foreground "magenta"))
+    (((class color) (background light)) (:foreground "CadetBlue"))
+    (((class color) (background dark)) (:foreground "Aquamarine"))
+    (t (:bold t :underline t)))
+  "Face used for level 6 headlines."
+  :group 'org-faces)
+
+(defface org-level-7-face ;; font-lock-builtin-face
+  '((((type tty) (class color)) (:foreground "blue" :weight light))
+    (((class color) (background light)) (:foreground "Orchid"))
+    (((class color) (background dark)) (:foreground "LightSteelBlue"))
+    (t (:bold t)))
+  "Face used for level 7 headlines."
+  :group 'org-faces)
+
+(defface org-level-8-face ;;font-lock-string-face
+  '((((type tty) (class color)) (:foreground "green"))
+    (((class color) (background light)) (:foreground "RosyBrown"))
+    (((class color) (background dark)) (:foreground "LightSalmon"))
+    (t (:italic t)))
+  "Face used for level 8 headlines."
+  :group 'org-faces)
+
+(defface org-warning-face ;; font-lock-warning-face
+  '((((type tty) (class color)) (:foreground "red"))
+    (((class color) (background light)) (:foreground "Red" :bold t))
+    (((class color) (background dark)) (:foreground "Pink" :bold t))
+    (t (:inverse-video t :bold t)))
+  "Face for deadlines and TODO keyords."
+  :group 'org-faces)
+
+;; Inheritance does not work for xemacs, unfortunately.
+;; We just copy the definitions and waste some space....
+
+(defface org-deadline-announce-face
+  '((((type tty) (class color)) (:foreground "blue" :weight bold))
+    (((class color) (background light)) (:foreground "Blue"))
+    (((class color) (background dark)) (:foreground "LightSkyBlue"))
+    (t (:inverse-video t :bold t)))
+  "Face for upcoming deadlines."
+  :group 'org-faces)
+
+(defface org-scheduled-today-face
+  '((((type tty) (class color)) (:foreground "green"))
+    (((class color) (background light)) (:foreground "DarkGreen"))
+    (((class color) (background dark)) (:foreground "PaleGreen"))
+    (t (:bold t :underline t)))
+  "Face for items scheduled for a certain day."
+  :group 'org-faces)
+
+(defface org-scheduled-previously-face
+  '((((type tty pc) (class color) (background light)) (:foreground "red"))
+    (((type tty pc) (class color) (background dark)) (:foreground "red1"))
+    (((class color) (background light)) (:foreground "Firebrick"))
+    (((class color) (background dark)) (:foreground "chocolate1"))
+    (t (:bold t :italic t)))
+  "Face for items scheduled previously, and not yet done."
+  :group 'org-faces)
+
+(defface org-link-face 
+  '((((type tty) (class color)) (:foreground "cyan" :weight bold))
+    (((class color) (background light)) (:foreground "Purple"))
+    (((class color) (background dark)) (:foreground "Cyan"))
+    (t (:bold t)))
+  "Face for links."
+  :group 'org-faces)
+
+(defface org-done-face ;; font-lock-type-face
+  '((((type tty) (class color)) (:foreground "green"))
+    (((class color) (background light)) (:foreground "ForestGreen" :bold t))
+    (((class color) (background dark)) (:foreground "PaleGreen" :bold t))
+    (t (:bold t :underline t)))
+  "Face used for DONE."
+  :group 'org-faces)
+
+(defface org-table-face ;; font-lock-function-name-face
+  '((((type tty) (class color)) (:foreground "blue" :weight bold))
+    (((class color) (background light)) (:foreground "Blue"))
+    (((class color) (background dark)) (:foreground "LightSkyBlue"))
+    (t (:inverse-video t :bold t)))
+  "Face used for tables."
+  :group 'org-faces)
+
+(defvar org-level-faces
+  '(
+    org-level-1-face
+    org-level-2-face
+    org-level-3-face
+    org-level-4-face
+    org-level-5-face
+    org-level-6-face
+    org-level-7-face
+    org-level-8-face
+    ))
+(defvar org-n-levels (length org-level-faces))
+
+
+;; Tell the compiler about dynamically scoped variables,
+;; and variables from other packages
+(eval-when-compile
+  (defvar zmacs-regions)
+  (defvar org-transient-mark-mode)
+  (defvar org-html-entities)
+  (defvar org-goto-start-pos)
+  (defvar org-cursor-color)
+  (defvar org-time-was-given)
+  (defvar org-ts-what)
+  (defvar timecnt)
+  (defvar levels-open)
+  (defvar title)
+  (defvar author)
+  (defvar email)
+  (defvar text)
+  (defvar entry)
+  (defvar date)
+  (defvar language)
+  (defvar options)
+  (defvar ans1)
+  (defvar ans2)
+  (defvar starting-day)
+  (defvar include-all-loc)
+  (defvar vm-message-pointer)
+  (defvar vm-folder-directory)
+  (defvar wl-summary-buffer-elmo-folder)
+  (defvar wl-summary-buffer-folder-name)
+  (defvar gnus-group-name)
+  (defvar gnus-article-current)
+  (defvar w3m-current-url)
+  (defvar org-selected-point)
+  (defvar calendar-mode-map)
+  (defvar remember-save-after-remembering)
+  (defvar remember-data-file))
+
+
+;;; Define the mode
+
+(defvar org-mode-map (copy-keymap outline-mode-map)
+  "Keymap for Org-mode.")
+
+(defvar org-struct-menu)
+(defvar org-org-menu)
+
+;;;###autoload
+(defun org-mode (&optional arg)
+  "Outline-based notes management and organizer, alias 
+\"Carstens outline-mode for keeping track of everything.\"
+
+Org-mode develops organizational tasks around a NOTES file which
+contains information about projects as plain text.  Org-mode is
+implemented on top of outline-mode, which is ideal to keep the content
+of large files well structured.  It supports ToDo items, deadlines and
+time stamps, which magically appear in the diary listing of the Emacs
+calendar.  Tables are easily created with a built-in table editor.
+Plain text URL-like links connect to websites, emails (VM), Usenet
+messages (Gnus), BBDB entries, and any files related to the project.
+For printing and sharing of notes, an Org-mode file (or a part of it)
+can be exported as a well-structured ASCII or HTML file.
+
++  The following commands are available:
+
+\\{org-mode-map}"
+  (interactive "P")
+  (outline-mode)
+  (setq major-mode 'org-mode)
+  (setq mode-name "Org")
+  (use-local-map org-mode-map)
+  (easy-menu-add org-org-menu)
+  (org-install-agenda-files-menu)
+  (setq outline-regexp "\\*+")
+  (if org-startup-truncated (setq truncate-lines t))
+  (org-set-regexps)
+  (set (make-local-variable 'font-lock-unfontify-region-function)
+       'org-unfontify-region)
+  ;; Activate before-change-function
+  (add-hook 'before-change-functions 'org-before-change-function nil
+            'local)
+  ;; Inhibit auto-fill for headers, tables and fixed-width lines.
+  (set (make-local-variable 'auto-fill-inhibit-regexp)
+       (concat "\\*"
+               (if (or org-enable-table-editor org-enable-fixed-width-editor)
+                   (concat
+                    "\\|[ \t]*["
+                    (if org-enable-table-editor "|" "")
+                   (if org-enable-fixed-width-editor ":"  "")
+                   "]"))))
+  ;; Hook, and startup actions
+  (if (or arg
+          (and org-insert-mode-line-in-empty-file
+               (= (point-min) (point-max))))
+      (save-excursion
+        (goto-char (point-min))
+        (insert "    -*- mode: org -*-\n\n")))
+  (run-hooks 'org-mode-hook)
+  (if org-startup-with-deadline-check
+      (call-interactively 'org-check-deadlines)
+    (if org-startup-folded (org-cycle t))))
+
+;;; Font-Lock stuff
+
+(defvar org-mouse-map (make-sparse-keymap))
+(define-key org-mouse-map 
+  (if org-xemacs-p [button2] [mouse-2]) 'org-open-at-mouse)
+(define-key org-mouse-map
+  (if org-xemacs-p [button3] [mouse-3]) 'org-find-file-at-mouse)
+
+(require 'font-lock)
+
+(defconst org-link-regexp
+  (if org-allow-space-in-links
+      "\\(https?\\|ftp\\|mailto\\|file\\|news\\|bbdb\\|vm\\|wl\\|rmail\\|gnus\\|shell\\):\\([^\t\n\r]+[^ \t\n\r]\\)"
+    "\\(https?\\|ftp\\|mailto\\|file\\|news\\|bbdb\\|vm\\|wl\\|rmail\\|gnus\\|shell\\):\\([^ \t\n\r]+\\)"
+    )
+  "Regular expression for matching links.")
+(defconst org-ts-lengths
+  (cons (length (format-time-string (car org-time-stamp-formats)))
+        (length (format-time-string (cdr org-time-stamp-formats))))
+  "This holds the lengths of the two different time formats.")
+(defconst org-ts-regexp "<\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}[^\r\n>]*\\)>"
+  "Regular expression for fast time stamp matching.")
+(defconst org-ts-regexp1 "\\(\\([0-9]\\{4\\}\\)-\\([0-9]\\{2\\}\\)-\\([0-9]\\{2\\}\\)\\([^0-9>\r\n]*\\)\\(\\([0-9]\\{2\\}\\):\\([0-9]\\{2\\}\\)\\)?\\)"
+  "Regular expression matching time strings for analysis.")
+(defconst org-ts-regexp2 (concat "<" org-ts-regexp1 ">")
+  "Regular expression matching time stamps, with groups.")
+(defconst org-tr-regexp (concat org-ts-regexp "--?-?" org-ts-regexp)
+  "Regular expression matching a time stamp range.")
+(defconst org-tsr-regexp (concat org-ts-regexp "\\(--?-?"
+                                 org-ts-regexp "\\)?")
+  "Regular expression matching a time stamp or time stamp range.")
+
+(defun org-activate-links (limit)
+  "Run through the buffer and add overlays to links."
+  (if (re-search-forward org-link-regexp limit t)
+      (progn
+        (add-text-properties (match-beginning 0) (match-end 0)
+                             (list 'mouse-face 'highlight
+                                   'keymap org-mouse-map))
+        t)))
+
+(defun org-activate-dates (limit)
+  "Run through the buffer and add overlays to links."
+  (if (re-search-forward org-tsr-regexp limit t)
+      (progn
+        (add-text-properties (match-beginning 0) (match-end 0)
+                             (list 'mouse-face 'highlight
+                                   'keymap org-mouse-map))
+        t)))
+
+
+(defun org-font-lock-level ()
+  (save-excursion
+    (org-back-to-heading t)
+    (- (match-end 0) (match-beginning 0))))
+
+(defun org-set-font-lock-defaults ()
+  (let ((org-font-lock-extra-keywords
+         (list
+          '(org-activate-links (0 'org-link-face))
+          '(org-activate-dates (0 'org-link-face))
+          (list (concat "^\\*+[ \t]*" org-not-done-regexp) '(1 'org-warning-face t))
+          (list (concat "\\[#[A-Z]\\]") '(0 'org-warning-face t))
+          (list (concat "\\<" org-deadline-string) '(0 'org-warning-face t))
+          (list (concat "\\<" org-scheduled-string) '(0 'org-warning-face t))
+          ;; '("\\(\\s-\\|^\\)\\(\\*\\([a-zA-Z]+\\)\\*\\)\\([^a-zA-Z*]\\|$\\)"
+          ;; (3 'bold))
+          ;; '("\\(\\s-\\|^\\)\\(/\\([a-zA-Z]+\\)/\\)\\([^a-zA-Z*]\\|$\\)" 
+          ;; (3 'italic))
+          ;; '("\\(\\s-\\|^\\)\\(_\\([a-zA-Z]+\\)_\\)\\([^a-zA-Z*]\\|$\\)" 
+          ;; (3 'underline))
+          '("\\<FIXME\\>" (0 'org-warning-face t))
+          (list (concat "^\\*+[ \t]*\\<\\(" org-comment-string "\\)\\>")
+                '(1 'org-warning-face t))
+          '("^#.*" (0 'font-lock-comment-face t))
+          (list (concat "^[*]+ +\\<\\(" org-done-string "\\)\\>")
+                '(1 'org-done-face t))
+          '("^[ \t]*\\(\\(|\\|\\+-[-+]\\).*\\S-\\)"
+            (1 'org-table-face t))
+          '("^[ \t]*\\(:.*\\)" (1 'org-table-face t)))))
+    (set (make-local-variable 'org-font-lock-keywords)
+         (append
+          (if org-noutline-p     ; FIXME:  I am not sure if eval will work
+                                 ; on XEmacs if noutline is ever ported
+              '((eval . (list "^\\(\\*+\\).*"
+                              0 '(nth 
+                                  (% (- (match-end 1) (match-beginning 1) 1)
+                                     org-n-levels)
+                                  org-level-faces)
+                              nil t)))
+            '(("^\\(\\(\\*+\\)[^\r\n]*\\)[\n\r]"
+               (1 (nth (% (- (match-end 2) (match-beginning 2) 1)
+                          org-n-levels)
+                       org-level-faces)
+                  nil t))))
+          org-font-lock-extra-keywords))
+    (set (make-local-variable 'font-lock-defaults)
+         '(org-font-lock-keywords t nil nil backward-paragraph))
+    (kill-local-variable 'font-lock-keywords) nil))
+    
+(defvar org-font-lock-keywords nil)
+
+(defun org-unfontify-region (beg end &optional maybe_loudly)
+  "Remove fontification and activation overlays from links."
+  (font-lock-default-unfontify-region beg end)
+  (let* ((modified (buffer-modified-p)) ;; FIXME: Why did I add this???
+         (buffer-undo-list t)
+         (inhibit-read-only t) (inhibit-point-motion-hooks t)
+         (inhibit-modification-hooks t)
+         deactivate-mark buffer-file-name buffer-file-truename)
+    (remove-text-properties beg end '(mouse-face nil keymap nil))))
+
+;;; Visibility cycling
+
+(defvar org-cycle-global-status nil)
+(defvar org-cycle-subtree-status nil)
+(defun org-cycle (&optional arg)
+  "Visibility cycling for outline(-minor)-mode.
+
+- When this function is called with a prefix argument, rotate the entire
+  buffer through 3 states (global cycling)
+  1. OVERVIEW: Show only top-level headlines.
+  2. CONTENTS: Show all headlines of all levels, but no body text.
+  3. SHOW ALL: Show everything.
+
+- When point is at the beginning of a headline, rotate the subtree started
+  by this line through 3 different states (local cycling)
+  1. FOLDED:   Only the main headline is shown.
+  2. CHILDREN: The main headline and the direct children are shown.  From
+               this state, you can move to one of the children and
+               zoom in further.
+  3. SUBTREE:  Show the entire subtree, including body text.
+
+- When point is not at the beginning of a headline, execute
+  `indent-relative', like TAB normally does.  See the option
+  `org-cycle-emulate-tab' for details.
+
+- Special case: if point is the the beginning of the buffer and there is
+  no headline in line 1, this function will act as if called with prefix arg."
+  (interactive "P")
+
+  (if (and (bobp) (not (looking-at outline-regexp)))
+      ; special case:  use global cycling
+      (setq arg t))
+
+  (cond
+
+   ((org-at-table-p 'any)
+    ;; Enter the table or move to the next field in the table
+    (or (org-table-recognize-table.el)
+        (org-table-next-field)))
+
+   (arg ;; Global cycling
+
+    (cond
+     ((and (eq last-command this-command)
+	   (eq org-cycle-global-status 'overview))
+      ;; We just created the overview - now do table of contents
+      ;; This can be slow in very large buffers, so indicate action
+      (message "CONTENTS...")
+      (save-excursion
+	;; Visit all headings and show their offspring
+	(goto-char (point-max))
+	(catch 'exit
+	  (while (and (progn (condition-case nil
+				 (outline-previous-visible-heading 1)
+			       (error (goto-char (point-min))))
+			     t)
+		      (looking-at outline-regexp))
+	    (show-branches)
+	    (if (bobp) (throw 'exit nil))))
+	(message "CONTENTS...done"))
+      (setq org-cycle-global-status 'contents))
+     ((and (eq last-command this-command)
+	   (eq org-cycle-global-status 'contents))
+      ;; We just showed the table of contents - now show everything
+      (show-all)
+      (message "SHOW ALL")
+      (setq org-cycle-global-status 'all))
+     (t
+      ;; Default action: go to overview
+      (hide-sublevels 1)
+      (message "OVERVIEW")
+      (setq org-cycle-global-status 'overview))))
+
+   ((save-excursion (beginning-of-line 1) (looking-at outline-regexp))
+    ;; At a heading: rotate between three different views
+    (org-back-to-heading)
+    (let ((goal-column 0) beg eoh eol eos nxh)
+      ;; First, some boundaries
+      (save-excursion
+	(org-back-to-heading)  (setq beg (point))
+	(save-excursion
+	  (beginning-of-line 2)
+	  (while (and (not (eobp))   ;; this is like `next-line'
+		      (get-char-property (1- (point)) 'invisible))
+	    (beginning-of-line 2)) (setq eol (point)))
+	(outline-end-of-heading)   (setq eoh (point))
+	(outline-end-of-subtree)   (setq eos (point))
+        (outline-next-heading)     (setq nxh (point)))
+      ;; Find out what to do next and set `this-command'
+      (cond
+       ((= eos eoh)
+	;; Nothing is hidden behind this heading
+        (message "EMPTY ENTRY")
+        (setq org-cycle-subtree-status nil))
+       ((>= eol eos)
+	;; Entire subtree is hidden in one line: open it
+	(show-entry)
+	(show-children)
+	(message "CHILDREN")
+	(setq org-cycle-subtree-status 'children))
+       ((and (eq last-command this-command)
+	     (eq org-cycle-subtree-status 'children))
+	;; We just showed the children, now show everything.
+	(show-subtree)
+	(message "SUBTREE")
+	(setq org-cycle-subtree-status 'subtree))
+       (t
+	;; Default action: hide the subtree.
+	(hide-subtree)
+	(message "FOLDED")
+	(setq org-cycle-subtree-status 'folded)))))
+
+   ;; TAB emulation
+   (buffer-read-only (org-back-to-heading))
+   ((if (and (eq org-cycle-emulate-tab 'white)
+	     (save-excursion (beginning-of-line 1) (looking-at "[ \t]+$")))
+	t
+      (eq org-cycle-emulate-tab t))
+    (if (and (looking-at "[ \n\r\t]")
+             (string-match "^[ \t]*$" (buffer-substring
+                                       (point-at-bol) (point))))
+        (progn
+          (beginning-of-line 1)
+          (and (looking-at "[ \t]+") (replace-match ""))))
+    (indent-relative))
+
+   (t (save-excursion
+        (org-back-to-heading)
+        (org-cycle)))))
+
+(defvar org-goto-window-configuration nil)
+(defvar org-goto-marker nil)
+(defvar org-goto-map (make-sparse-keymap))
+(let ((cmds '(isearch-forward isearch-backward)) cmd)
+  (while (setq cmd (pop cmds))
+    (substitute-key-definition cmd cmd org-goto-map global-map)))
+(define-key org-goto-map [(return)] 'org-goto-ret)
+(define-key org-goto-map [(left)]   'org-goto-left)
+(define-key org-goto-map [(right)]  'org-goto-right)
+(define-key org-goto-map [(?q)]     'org-goto-quit)
+(define-key org-goto-map [(control ?g)] 'org-goto-quit)
+(define-key org-goto-map [(tab)] 'org-cycle)
+(define-key org-goto-map [(down)] 'outline-next-visible-heading)
+(define-key org-goto-map [(up)] 'outline-previous-visible-heading)
+(define-key org-goto-map "n" 'outline-next-visible-heading)
+(define-key org-goto-map "p" 'outline-previous-visible-heading)
+(define-key org-goto-map "f" 'outline-forward-same-level)
+(define-key org-goto-map "b" 'outline-backward-same-level)
+(define-key org-goto-map "u" 'outline-up-heading)
+(define-key org-goto-map "\C-c\C-n" 'outline-next-visible-heading)
+(define-key org-goto-map "\C-c\C-p" 'outline-previous-visible-heading)
+(define-key org-goto-map "\C-c\C-f" 'outline-forward-same-level)
+(define-key org-goto-map "\C-c\C-b" 'outline-backward-same-level)
+(define-key org-goto-map "\C-c\C-u" 'outline-up-heading)
+(let ((l '(1 2 3 4 5 6 7 8 9 0)))
+  (while l (define-key org-goto-map (int-to-string (pop l)) 'digit-argument)))
+
+(defconst org-goto-help
+"Select a location to jump to, press RET
+\[Up]/[Down]=next/prev headline   TAB=cycle visibility   RET=select   [Q]uit")
+
+(defun org-goto ()
+  "Go to a different location of the document, keeping current visibility.
+
+When you want to go to a different location in a document, the fastest way
+is often to fold the entire buffer and then dive into the tree.  This
+method has the disadvantage, than the previous location will be folded, and
+that can be unwanted.
+
+This command works around this by showing a copy of the current buffer in
+overview mode.  You can dive into the tree in that copy, to find the
+location you want to reach.  When pressing RET, the command returns to the
+original buffer in which the visibility is still unchanged.  It then jumps
+to the new location, making it and the headline hierarchy above it visible."
+  (interactive)
+  (let* ((org-goto-start-pos (point))
+         (selected-point
+          (org-get-location (current-buffer) org-goto-help)))
+    (if selected-point
+        (progn
+          (goto-char selected-point)
+          (if (org-invisible-p) (org-show-hierarchy-above)))
+      (error "Quit"))))
+
+(defun org-get-location (buf help)
+  "Let the user select a location in the Org-mode buffer BUF.
+This function uses a recursive edit.  It returns the selected position
+or nil."
+  (let (org-selected-point)
+    (save-excursion
+      (save-window-excursion
+        (delete-other-windows)
+        (switch-to-buffer (get-buffer-create "*org-goto*"))
+        (with-output-to-temp-buffer "*Help*"
+          (princ help))
+        (shrink-window-if-larger-than-buffer (get-buffer-window "*Help*"))
+        (setq buffer-read-only nil)
+        (erase-buffer)
+        (insert-buffer buf)
+        (let ((org-startup-truncated t)
+              (org-startup-folded t)
+              (org-startup-with-deadline-check nil))
+          (org-mode))
+        (setq buffer-read-only t)
+        (if (boundp 'org-goto-start-pos)
+            (goto-char org-goto-start-pos)
+          (goto-char (point-min)))
+        (org-beginning-of-line)
+        (message "Select location and press RET")
+        ;; now we make sure that during selection, ony very few keys work
+        ;; and that it is impossible to switch to another window.
+        (let ((gm (current-global-map))
+              (overriding-local-map org-goto-map))
+          (unwind-protect
+              (progn
+                (use-global-map org-goto-map)
+                (recursive-edit))
+            (use-global-map gm)))))
+    (kill-buffer "*org-goto*")
+    org-selected-point))
+
+;;  FIXME:  It may not be a good idea to temper with the prefix argument...
+(defun org-goto-ret (&optional arg)
+  "Finish org-goto by going to the new location."
+  (interactive "P")
+  (setq org-selected-point (point)
+        current-prefix-arg arg)
+  (throw 'exit nil))
+
+(defun org-goto-left (&optional arg)
+  "Finish org-goto by going to the new location."
+  (interactive "P")
+  (if (org-on-heading-p)
+      (progn
+        (beginning-of-line 1)
+        (setq org-selected-point (point)
+              current-prefix-arg (- (match-end 0) (match-beginning 0)))
+        (throw 'exit nil))
+    (error "Not on a heading")))
+
+(defun org-goto-right (&optional arg)
+  "Finish org-goto by going to the new location."
+  (interactive "P")
+  (if (org-on-heading-p)
+      (progn
+        (outline-end-of-subtree)
+        (or (eobp) (forward-char 1))
+        (setq org-selected-point (point)
+              current-prefix-arg (- (match-end 0) (match-beginning 0)))
+        (throw 'exit nil))
+    (error "Not on a heading")))
+
+(defun org-goto-quit ()
+  "Finish org-goto without cursor motion."
+  (interactive)
+  (setq org-selected-point nil)
+  (throw 'exit nil))
+
+;;; Promotion, Demotion, Inserting new headlines
+
+(defvar org-ignore-region nil
+  "To temporary disable the active region.")
+
+(defun org-insert-heading ()
+  "Insert a new heading with same depth at point."
+  (interactive)
+  (let* ((head (save-excursion
+		 (condition-case nil
+		     (org-back-to-heading)
+		   (error (outline-next-heading)))
+		 (prog1 (match-string 0)
+		   (funcall outline-level)))))
+    (unless (bolp) (newline))
+    (insert head)
+    (unless (eolp)
+      (save-excursion (newline-and-indent)))
+    (unless (equal (char-before) ?\ )
+      (insert " "))
+    (run-hooks 'org-insert-heading-hook)))
+
+(defun org-promote-subtree (&optional arg)
+  "Promote the entire subtree.
+See also `org-promote'."
+  (interactive "P")
+  (org-map-tree 'org-promote))
+
+(defun org-demote-subtree (&optional arg)
+  "Demote the entire subtree.  See `org-demote'.
+See also `org-promote'."
+  (interactive "P")
+  (org-map-tree 'org-demote))
+
+(defun org-do-promote (&optional arg)
+  "Promote the current heading higher up the tree.
+If the region is active in transient-mark-mode, promote all headings
+in the region."
+  (interactive "P")
+  (save-excursion
+    (if (org-region-active-p)
+        (org-map-region 'org-promote (region-beginning) (region-end))
+      (org-promote)))
+  (org-fix-position-after-promote))
+
+(defun org-do-demote (&optional arg)
+  "Demote the current heading lower down the tree.
+If the region is active in transient-mark-mode, demote all headings
+in the region."
+  (interactive "P")
+  (save-excursion
+    (if (org-region-active-p)
+        (org-map-region 'org-demote (region-beginning) (region-end))
+      (org-demote)))
+  (org-fix-position-after-promote))
+
+(defun org-fix-position-after-promote ()
+  "Make sure that after pro/demotion cursor position is right."
+  (and (equal (char-after) ?\ )
+       (equal (char-before) ?*)
+       (forward-char 1)))
+
+(defun org-promote ()
+  "Promote the current heading higher up the tree.
+If the region is active in transient-mark-mode, promote all headings
+in the region."
+  (org-back-to-heading t)
+  (let* ((level (save-match-data (funcall outline-level)))
+         (up-head (make-string (1- level) ?*)))
+    (if (= level 1) (error "Cannot promote to level 0. UNDO to recover."))
+    (replace-match up-head nil t)
+    (if org-adapt-indentation
+        (org-fixup-indentation "^ " "" "^ ?\\S-"))))
+
+(defun org-demote ()
+  "Demote the current heading lower down the tree.
+If the region is active in transient-mark-mode, demote all headings
+in the region."
+  (org-back-to-heading t)
+  (let* ((level (save-match-data (funcall outline-level)))
+         (down-head (make-string (1+ level) ?*)))
+    (replace-match down-head nil t)
+    (if org-adapt-indentation
+        (org-fixup-indentation "^ " "  " "^\\S-"))))
+
+(defun org-map-tree (fun)
+  "Call FUN for every heading underneath the current one."
+  (org-back-to-heading)
+  (let ((level (outline-level)))
+    (save-excursion
+      (funcall fun)
+      (while (and (progn
+                    (outline-next-heading)
+                    (> (funcall outline-level) level))
+                  (not (eobp)))
+        (funcall fun)))))
+
+(defun org-map-region (fun beg end)
+  "Call FUN for every heading between BEG and END."
+  (let ((org-ignore-region t))
+    (save-excursion
+      (setq end (copy-marker end))
+      (goto-char beg)
+      ;;      (if (fboundp 'deactivate-mark) (deactivate-mark))
+      ;;    (if (fboundp 'zmacs-deactivate-region) (zmacs-deactivate-region))
+      (if (and (re-search-forward (concat "^" outline-regexp) nil t)
+               (< (point) end))
+          (funcall fun))
+      (while (and (progn
+                    (outline-next-heading)
+                    (< (point) end))
+                  (not (eobp)))
+        (funcall fun)))))
+
+(defun org-fixup-indentation (from to prohibit)
+  "Change the indentation in the current entry by re-replacing FROM with TO.
+However, if the regexp PROHIBIT matches at all, don't do anything.
+This is being used to change indentation along with the length of the
+heading marker.  But if there are any lines which are not indented, nothing
+is changed at all."
+  (save-excursion
+    (let ((end (save-excursion (outline-next-heading)
+                               (point-marker))))
+      (unless (save-excursion (re-search-forward prohibit end t))
+        (while (re-search-forward from end t)
+          (replace-match to)
+          (beginning-of-line 2)))
+      (move-marker end nil))))
+
+;;; Vertical tree motion, cutting and pasting of subtrees
+
+(defun org-move-subtree-up (&optional arg)
+  "Move the current subtree up past ARG headlines of the same level."
+  (interactive "p")
+  (org-move-subtree-down (- (prefix-numeric-value arg))))
+
+(defun org-move-subtree-down (&optional arg)
+  "Move the current subtree down past ARG headlines of the same level."
+  (interactive "p")
+  (setq arg (prefix-numeric-value arg))
+  (let ((movfunc (if (> arg 0) 'outline-get-next-sibling
+		   'outline-get-last-sibling))
+	(ins-point (make-marker))
+	(cnt (abs arg))
+	beg end txt folded)
+    ;; Select the tree
+    (org-back-to-heading)
+    (setq beg (point))
+    (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))
+    (setq end (point))
+    ;; Find insertion point, with error handling
+    (goto-char beg)
+    (while (> cnt 0)
+      (or (and (funcall movfunc) (looking-at outline-regexp))
+	  (progn (goto-char beg)
+		 (error "Cannot move past superior level or buffer limit")))
+      (setq cnt (1- cnt)))
+    (if (> arg 0)
+	;; Moving forward - still need to move over subtree
+	(progn (outline-end-of-subtree)
+	       (if (equal (char-after) ?\n) (forward-char 1))))
+    (move-marker ins-point (point))
+    (setq txt (buffer-substring beg end))
+    (delete-region beg end)
+    (insert txt)
+    (goto-char ins-point)
+    (if folded (hide-subtree))
+    (move-marker ins-point nil)))
+
+(defvar org-subtree-clip ""
+  "Clipboard for cut and paste of subtrees.
+This is actually only a cpoy of the kill, because we use the normal kill
+ring.  We need it to check if the kill was created by `org-copy-subtree'.")
+
+(defvar org-subtree-clip-folded nil
+  "Was the last copied suptree folded?
+This is used to fold the tree back after pasting.")
+
+(defun org-cut-subtree (&optional arg)
+  "Cut the current subtree into the clipboard.
+This is a short-hand for marking the subtree and then cutting it."
+  (interactive "p")
+  (org-copy-subtree arg 'cut))
+
+(defun org-copy-subtree (&optional arg cut)
+  "Cut the current subtree into the clipboard.
+This is a short-hand for marking the subtree and then copying it.
+If CUT is non nil, actually cur the subtree."
+  (interactive "p")
+  (let (beg end folded)
+    (org-back-to-heading)
+    (setq beg (point))
+    (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))
+    (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"
+               (if cut "Cut" "Copied")
+               (length org-subtree-clip)))))
+
+(defun org-paste-subtree (&optional level tree)
+  "Paste the clipboard as a subtree, with modification of headline level.
+The entire subtree is promoted or demoted in order to match a new headline
+level.  By default, the new level is derived from the visible headings
+before and after the insertion point, and taken to be the inferior headline
+level of the two.  So if the previous visible heading is level 3 and the
+next is level 4 (or vice versa), level 4 will be used for insertion.
+This makes sure that the subtree remains an independent subtree and does
+not swallow low level entries.
+
+You can also force a different level, either by using a numeric prefix
+argument, or by inserting the heading marker by hand.  For example, if the
+cursor is after \"*****\", then the tree will be shifted to level 5.
+
+If you want to insert the tree as is, just use \\[yank].
+
+If optional TREE is given, use this text instead of the kill ring."
+  (interactive "P")
+  (unless (org-kill-is-subtree-p tree)
+    (error
+     (substitute-command-keys
+      "The kill is not a (set of) tree(s) - please use \\[yank] to yank anyway")))
+  (let* ((txt (or tree (current-kill 0)))
+         (^re (concat "^\\(" outline-regexp "\\)"))
+         (re  (concat "\\(" outline-regexp "\\)"))
+         (^re_ (concat "\\(" outline-regexp "\\)[  \t]*"))
+
+         (old-level (if (string-match ^re txt)
+                        (- (match-end 0) (match-beginning 0))
+                      -1))
+         (force-level (cond (level (prefix-numeric-value level))
+                            ((string-match
+                              ^re_ (buffer-substring (point-at-bol) (point)))
+                             (- (match-end 0) (match-beginning 0)))
+                            (t nil)))
+         (prevous-level (save-excursion
+                          (outline-previous-visible-heading 1)
+                          (if (looking-at re)
+                              (- (match-end 0) (match-beginning 0))
+                            1)))
+         (next-level (save-excursion
+                       (outline-next-visible-heading 1)
+                       (if (looking-at re)
+                           (- (match-end 0) (match-beginning 0))
+                         1)))
+         (new-level (or force-level (max prevous-level next-level)))
+         (shift (if (or (= old-level -1)
+                        (= new-level -1)
+                        (= old-level new-level))
+                    0
+                  (- new-level old-level)))
+         (shift1 shift)
+         (delta (if (> shift 0) -1 1))
+         (func (if (> shift 0) 'org-demote 'org-promote))
+         beg end)
+    ;; Remove the forces level indicator
+    (if force-level
+        (delete-region (point-at-bol) (point)))
+    ;; Make sure we start at the beginning of an empty line
+    (if (not (bolp)) (insert "\n"))
+    (if (not (looking-at "[ \t]*$"))
+        (progn (insert "\n") (backward-char 1)))
+    ;; Paste
+    (setq beg (point))
+    (insert txt)
+    (setq end (point))
+    (goto-char beg)
+    ;; Shift if necessary
+    (if (= shift 0)
+        (message "Pasted at level %d, without shift" new-level)
+      (save-restriction
+        (narrow-to-region beg end)
+        (while (not (= shift 0))
+          (org-map-region func (point-min) (point-max))
+          (setq shift (+ delta shift)))
+        (goto-char (point-min))
+        (message "Pasted at level %d, with shift by %d levels"
+                 new-level shift1)))
+    (if (and (eq org-subtree-clip (current-kill 0))
+             org-subtree-clip-folded)
+        ;; The tree was folded before it was killed/copied
+        (hide-subtree))))
+
+(defun org-kill-is-subtree-p (&optional txt)
+  "Check if the current kill is an outline subtree, or a set of trees.
+Returns nil if kill does not start with a headline, or if the first
+headline level is not the largest headline level in the tree.
+So this will actually acceept several entries of equal levels as well,
+which is OK for `org-paste-subtree'.
+If optional TXT is given, check this string instead of the current kill."
+  (let* ((kill (or txt (current-kill 0) ""))
+         (start-level (and (string-match (concat "\\`" outline-regexp) kill)
+                           (- (match-end 0) (match-beginning 0))))
+         (re (concat "^" outline-regexp))
+         (start 1))
+    (if (not start-level)
+        nil  ;; does not even start with a heading
+      (catch 'exit
+        (while (setq start (string-match re kill (1+ start)))
+          (if (< (- (match-end 0) (match-beginning 0)) start-level)
+              (throw 'exit nil)))
+        t))))
+
+;;; Completion
+
+(defun org-complete (&optional arg)
+  "Perform completion on word at point.
+At the beginning of a headline, this completes TODO keywords as given in
+`org-todo-keywords'.
+If the current word is preceeded by a backslash, completes the TeX symbols
+that are supported for HTML support.
+If the current word is preceeded by \"#+\", completes special words for
+setting file options.
+At all other locations, this simply calls `ispell-complete-word'."
+  (interactive "P")
+  (catch 'exit
+    (let* ((end (point))
+           (beg (save-excursion
+                  (if (equal (char-before (point)) ?\ ) (backward-char 1))
+                  (skip-chars-backward "a-zA-Z0-9_:")
+                  (point)))
+           (texp (equal (char-before beg) ?\\))
+           (opt (equal (buffer-substring (max (point-at-bol) (- beg 2))
+                                         beg)
+                       "#+"))
+           (pattern (buffer-substring-no-properties beg end))
+           (completion-ignore-case opt)
+           (type nil)
+           (table (cond
+                   (opt
+                    (setq type :opt)
+                    (mapcar (lambda (x) 
+                              (string-match "^#\\+\\(\\([A-Z_]+:?\\).*\\)" x)
+                              (cons (match-string 2 x) (match-string 1 x)))
+                            (org-split-string (org-get-current-options) "\n")))
+                   (texp 
+                    (setq type :tex)
+                    org-html-entities)
+                   ((string-match "\\`\\*+[ \t]*\\'"
+                                  (buffer-substring (point-at-bol) beg))
+                    (setq type :todo)
+                    (mapcar 'list org-todo-keywords))
+                   (t (progn (ispell-complete-word arg) (throw 'exit nil)))))
+           (completion (try-completion pattern table)))
+      (cond ((eq completion t)
+             (if (equal type :opt) 
+                 (insert (substring (cdr (assoc (upcase pattern) table))
+                                    (length pattern)))))
+            ((null completion)
+             (message "Can't find completion for \"%s\"" pattern)
+             (ding))
+            ((not (string= pattern completion))
+             (delete-region beg end)
+             (if (string-match " +$" completion) 
+                 (setq completion (replace-match "" t t completion)))
+             (insert completion)
+             (if (get-buffer-window "*Completions*")
+                 (delete-window (get-buffer-window "*Completions*")))
+             (if (and (eq type :todo)
+                      (assoc completion table))
+                 (insert " "))
+             (if (and (equal type :opt) (assoc completion table))
+                 (message (substitute-command-keys
+                           "Press \\[org-complete] again to insert example settings"))))
+            (t
+             (message "Making completion list...")
+             (let ((list (sort (all-completions pattern table) 'string<)))
+               (with-output-to-temp-buffer "*Completions*"
+                 (display-completion-list list)))
+             (message "Making completion list...%s" "done"))))))
+
+;;; Comments, TODO and DEADLINE
+
+(defun org-toggle-comment ()
+  "Change the COMMENT state of an entry."
+  (interactive)
+  (save-excursion
+    (org-back-to-heading)
+    (if (looking-at (concat outline-regexp
+                            "\\( +\\<" org-comment-string "\\>\\)"))
+        (replace-match "" t t nil 1)
+      (if (looking-at outline-regexp)
+          (progn
+            (goto-char (match-end 0))
+            (insert " " org-comment-string))))))
+
+(defun org-todo (&optional arg)
+  "Change the TODO state of an item.
+The state of an item is given by a keyword at the start of the heading,
+like
+     *** TODO Write paper
+     *** DONE Call mom
+
+The different keywords are specified in the variable `org-todo-keywords'.  By
+default the available states are \"TODO\" and \"DONE\".
+So for this example: when the item starts with TODO, it is changed to DONE.
+When it starts with DONE, the DONE is removed.  And when neither TODO nor
+DONE are present, add TODO at the beginning of the heading.
+
+With prefix arg, use completion to determined the new state.  With numeric
+prefix arg, switch to that state."
+  (interactive "P")
+  (save-excursion
+    (org-back-to-heading)
+    (if (looking-at outline-regexp) (goto-char (match-end 0)))
+    (or (looking-at (concat " +" org-todo-regexp " *"))
+        (looking-at " *"))
+    (let* ((this (match-string 1))
+           (completion-ignore-case t)
+           (member (member this org-todo-keywords))
+           (tail (cdr member))
+           (state (cond
+                  ((equal arg '(4))
+                   ;; Read a state with completion
+                   (completing-read "State: " (mapcar (lambda(x) (list x))
+                                                      org-todo-keywords)
+                                    nil t))
+                  (arg
+                   ;; user requests a specific state
+                   (nth (1- (prefix-numeric-value arg))
+                        org-todo-keywords))
+                  ((null member) (car org-todo-keywords))
+                  ((null tail) nil) ;; -> first entry
+                  ((eq org-todo-interpretation 'sequence)
+                   (car tail))
+                  ((memq org-todo-interpretation '(type priority))
+                   (if (eq this-command last-command)
+                       (car tail)
+                     (if (> (length tail) 0) org-done-string nil)))
+                  (t nil)))
+           (next (if state (concat " " state " ") " ")))
+      (replace-match next t t)
+      (run-hooks 'org-after-todo-state-change-hook)))
+  ;; Fixup cursor location if close to the keyword
+  (if (and (outline-on-heading-p)
+           (not (bolp))
+           (save-excursion (goto-char (point-at-bol))
+                           (looking-at org-todo-line-regexp))
+           (< (point) (+ 2 (or (match-end 2) (match-end 1)))))
+      (progn
+        (goto-char (or (match-end 2) (match-end 1)))
+        (just-one-space))))
+
+(defun org-show-todo-tree (arg)
+  "Make a compact tree which shows all headlines marked with TODO.
+The tree will show the lines where the regexp matches, and all higher
+headlines above the match."
+  (interactive "P")
+  (let ((case-fold-search nil)
+        (kwd-re (if arg org-todo-regexp org-not-done-regexp)))
+    (message "%d TODO entries found"
+             (org-occur (concat "^" outline-regexp " +" kwd-re )))))
+
+(defun org-deadline ()
+  "Insert the DEADLINE: string to make a deadline.
+A timestamp is also inserted - use \\[org-timestamp-up] and \\[org-timestamp-down]
+to modify it to the correct date."
+  (interactive)
+  (insert
+   org-deadline-string " "
+   (format-time-string (car org-time-stamp-formats)
+                       (org-read-date nil 'to-time)))
+  (message (substitute-command-keys
+            "Use \\[org-timestamp-up-day] and \\[org-timestamp-down-day] to change the date.")))
+
+(defun org-schedule ()
+  "Insert the SCHEDULED: string to schedule a TODO item.
+A timestamp is also inserted - use \\[org-timestamp-up] and \\[org-timestamp-down]
+to modify it to the correct date."
+  (interactive)
+  (insert
+   org-scheduled-string " "
+   (format-time-string (car org-time-stamp-formats)
+                       (org-read-date nil 'to-time)))
+  (message (substitute-command-keys
+            "Use \\[org-timestamp-up-day] and \\[org-timestamp-down-day] to change the date.")))
+
+
+(defun org-occur (regexp &optional callback)
+  "Make a compact tree which shows all matches of REGEXP.
+The tree will show the lines where the regexp matches, and all higher
+headlines above the match.  It will also show the heading after the match,
+to make sure editing the matching entry is easy.
+if CALLBACK is non-nil, it is a function which is called to confirm
+that the match should indeed be shown."
+  (interactive "sRegexp: ")
+  (setq regexp (org-check-occur-regexp regexp))
+  (let ((cnt 0))
+    (save-excursion
+      (goto-char (point-min))
+      (hide-sublevels 1)
+      (while (re-search-forward regexp nil t)
+        (when (or (not callback)
+                  (funcall callback))
+          (setq cnt (1+ cnt))
+          (org-show-hierarchy-above))))
+    (if (interactive-p)
+        (message "%d match(es) for regexp %s" cnt regexp))
+    cnt))
+
+
+(defun org-show-hierarchy-above ()
+  "Make sure point and the headings hierarchy above is visible."
+  (if (org-on-heading-p t)
+      (org-flag-heading nil)    ; only show the heading
+    (org-show-hidden-entry))    ; show entire entry
+  (save-excursion
+    (and (outline-next-heading)
+         (org-flag-heading nil)))  ; show the next heading
+  (save-excursion                  ; show all higher headings
+    (while (condition-case nil
+               (progn (org-up-heading-all 1) t)
+             (error nil))
+      (org-flag-heading nil))))
+
+;;; Priorities
+
+(defvar org-priority-regexp ".*?\\(\\[#\\([A-Z]\\)\\] ?\\)"
+  "Regular expression matching the priority indicator.")
+
+(defun org-priority-up ()
+  "Increase the priority of the current item."
+  (interactive)
+  (org-priority 'up))
+
+(defun org-priority-down ()
+  "Decrease the priority of the current item."
+  (interactive)
+  (org-priority 'down))
+
+(defun org-priority (&optional action)
+  "Change the priority of an item by ARG.
+ACTION can be set, up, or down."
+  (interactive)
+  (setq action (or action 'set))
+  (let (current new news have remove)
+    (save-excursion
+      (org-back-to-heading)
+      (if (looking-at org-priority-regexp)
+          (setq current (string-to-char (match-string 2))
+                have t)
+        (setq current org-default-priority))
+      (cond
+       ((eq action 'set)
+        (message (format "Priority A-%c, SPC to remove: " org-lowest-priority))
+        (setq new (read-char-exclusive))
+        (if (equal new ?\ ) (setq remove t)))
+       ((eq action 'up)
+        (setq new (1- current)))
+       ((eq action 'down)
+        (setq new (1+ current)))
+       (t (error "Illegal ection")))
+      (setq new (min (max ?A (upcase new)) org-lowest-priority))
+      (setq news (format "%c" new))
+      (if have
+          (if remove
+              (replace-match "" t t nil 1)
+            (replace-match news t t nil 2))
+        (looking-at org-todo-line-regexp)
+        (if (match-end 2)
+            (progn
+              (goto-char (match-end 2))
+              (insert " [#" news "]"))
+          (goto-char (match-beginning 3))
+          (insert "[#" news "] "))))
+    (if remove
+        (message "Priority removed")
+      (message "Priority of current item set to %s" news))))
+
+
+(defun org-get-priority (s)
+  "Find priority cookie and return priority."
+  (save-match-data
+    (if (not (string-match org-priority-regexp s))
+        (* 1000 (- org-lowest-priority org-default-priority))
+      (* 1000 (- org-lowest-priority 
+                 (string-to-char (match-string 2 s)))))))
+      
+;;; Timestamps
+
+(defvar org-last-changed-timestamp nil)
+
+(defun org-time-stamp (arg)
+  "Prompt for a date/time and insert a time stamp.
+If the user specifies a time like HH:MM, or if this command is called
+with a prefix argument, the time stamp will contain date and time.
+Otherwise, only the date will be included.  All parts of a date not
+specified by the user will be filled in from the current date/time.
+So if you press just return without typing anything, the time stamp
+will represent the current date/time.  If there is already a timestamp
+at the cursoe, it will be modified."
+  (interactive "P")
+  (let ((fmt (if arg (cdr org-time-stamp-formats)
+               (car org-time-stamp-formats)))
+        (org-time-was-given nil)
+        time)
+    (cond
+     ((and (org-at-timestamp-p)
+           (eq last-command 'org-time-stamp)
+           (eq this-command 'org-time-stamp))
+      (insert "--")
+      (setq time (let ((this-command this-command))
+                  (org-read-date arg 'totime)))
+      (if org-time-was-given (setq fmt (cdr org-time-stamp-formats)))
+      (insert (format-time-string fmt time)))
+     ((org-at-timestamp-p)
+      (setq time (let ((this-command this-command))
+                   (org-read-date arg 'totime)))
+      (and (org-at-timestamp-p) (replace-match
+                                 (setq org-last-changed-timestamp 
+                                       (format-time-string fmt time))
+                                 t t))
+      (message "Timestamp updated"))
+     (t
+      (setq time (let ((this-command this-command))
+                  (org-read-date arg 'totime)))
+      (if org-time-was-given (setq fmt (cdr org-time-stamp-formats)))
+      (insert (format-time-string fmt time))))))
+
+;;; FIXME: Make the function take "Fri" as "next friday"
+(defun org-read-date (&optional with-time to-time)
+  "Read a date and make things smooth for the user.
+The prompt will suggest to enter an ISO date, but you can also enter anything
+which will at least partially be understood by `parse-time-string'.
+Unrecognized parts of the date will default to the current day, month ,year,
+hour and minute.  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
+  etc.
+The function understands only English month and weekday abbreviations,
+but this can be configured with the variables `parse-time-months' and
+`parse-time-weekdays'.
+
+While prompting, a calendar is popped up - you can also select the
+date with the mouse (button 1).  The calendar shows a period of three
+month. To scroll it to other months, use the keys `>' and `<'.  
+If you don't like the calendar, turn it off with 
+       \(setq org-popup-calendar-for-date-prompt nil).
+
+With optional argument TO-TIME, the date will immediately be converted
+to an internal time.
+With an optional argument WITH-TIME, the prompt will suggest to also
+insert a time.  Note that when WITH-TIME is not set, you can still
+enter a time, and this function will inform the calling routine about
+this change.  The calling routine may then choose to change the format
+used to insert the time stamp into the buffer to include the time."
+  (let* ((default-time
+           ;; Default time is either today, or, when entering a range,
+           ;; the range start.
+           (if (save-excursion
+                 (re-search-backward 
+                  (concat org-ts-regexp "--\\=")
+                  (- (point) 20) t))
+               (apply
+                'encode-time
+                (mapcar (lambda(x) (or x 0))  ;; FIXME: Problem with timezone?
+                        (parse-time-string (match-string 1))))
+             (current-time)))
+         (timestr (format-time-string
+                   (if with-time "%Y-%m-%d %H:%M" "%Y-%m-%d") default-time))
+         (prompt (format "YYYY-MM-DD [%s]: " timestr))
+         ans ans1 ans2
+         second minute hour day month year tl)
+
+    (if org-popup-calendar-for-date-prompt
+        ;; Also show a calendar for date selection
+        ;; Copied (with modifications) from planner.el by John Wiegley
+        (save-excursion
+          (save-window-excursion
+            (calendar)
+            (calendar-forward-day (- (time-to-days default-time)
+                                     (calendar-absolute-from-gregorian
+                                      (calendar-current-date))))
+            (let* ((old-map (current-local-map))
+                   (map (copy-keymap calendar-mode-map))
+                   (minibuffer-local-map (copy-keymap minibuffer-local-map)))
+              (define-key map (kbd "RET") 'org-calendar-select)
+              (define-key map (if org-xemacs-p [button1] [mouse-1])
+                'org-calendar-select)
+              (define-key minibuffer-local-map [(meta shift left)]
+                (lambda () (interactive)
+                  (org-eval-in-calendar '(calendar-backward-month 1))))
+              (define-key minibuffer-local-map [(meta shift right)]
+                (lambda () (interactive)
+                  (org-eval-in-calendar '(calendar-forward-month 1))))
+              (define-key minibuffer-local-map [(shift up)]
+                (lambda () (interactive)
+                  (org-eval-in-calendar '(calendar-backward-week 1))))
+              (define-key minibuffer-local-map [(shift down)]
+                (lambda () (interactive)
+                  (org-eval-in-calendar '(calendar-forward-week 1))))
+              (define-key minibuffer-local-map [(shift left)]
+                (lambda () (interactive)
+                  (org-eval-in-calendar '(calendar-backward-day 1))))
+              (define-key minibuffer-local-map [(shift right)]
+                (lambda () (interactive)
+                  (org-eval-in-calendar '(calendar-forward-day 1))))
+              (define-key minibuffer-local-map ">"
+                (lambda () (interactive)
+                  (org-eval-in-calendar '(scroll-calendar-left 1))))
+              (define-key minibuffer-local-map "<"
+                (lambda () (interactive)
+                  (org-eval-in-calendar '(scroll-calendar-right 1))))
+              (unwind-protect
+                  (progn
+                    (use-local-map map)
+                    (setq ans (read-string prompt "" nil nil))
+                    (setq ans (or ans1 ans2 ans)))
+                (use-local-map old-map)))))
+      ;; Naked prompt only
+      (setq ans (read-string prompt "" nil timestr)))
+
+    (if (string-match
+         "^ *\\(\\([0-9]+\\)-\\)?\\([0-1]?[0-9]\\)-\\([0-3]?[0-9]\\)\\([^-0-9]\\|$\\)" ans)
+        (progn
+          (setq year (if (match-end 2)
+                         (string-to-number (match-string 2 ans))
+                       (string-to-number (format-time-string "%Y")))
+                month (string-to-number (match-string 3 ans))
+                day (string-to-number (match-string 4 ans)))
+          (if (< year 100) (setq year (+ 2000 year)))
+          (setq ans (replace-match (format "%04d-%02d-%02d" year month day)
+                                   t t ans))))
+    (setq tl (parse-time-string ans)
+          year (or (nth 5 tl) (string-to-number (format-time-string "%Y")))
+          month (or (nth 4 tl) (string-to-number (format-time-string "%m")))
+          day (or (nth 3 tl) (string-to-number (format-time-string "%d")))
+          hour (or (nth 2 tl) (string-to-number (format-time-string "%H")))
+          minute (or (nth 1 tl) (string-to-number (format-time-string "%M")))
+          second (or (nth 0 tl) 0))
+    (if (and (boundp 'org-time-was-given)
+             (nth 2 tl))
+        (setq org-time-was-given t))
+    (if (< year 100) (setq year (+ 2000 year)))
+    (if to-time
+        (encode-time second minute hour day month year)
+      (if (or (nth 1 tl) (nth 2 tl))
+          (format "%04d-%02d-%02d %02d:%02d" year month day hour minute)
+        (format "%04d-%02d-%02d" year month day)))))
+
+(defun org-eval-in-calendar (form)
+  "Eval FORM in the calendar window and return to current window.
+Also, store the cursor date in variable ans2."
+  (let ((sw (selected-window)))
+    (select-window (get-buffer-window "*Calendar*"))
+    (eval form)
+    (when (calendar-cursor-to-date)
+      (let* ((date (calendar-cursor-to-date))
+             (time (encode-time 0 0 0 (nth 1 date) (nth 0 date) (nth 2 date))))
+        (setq ans2 (format-time-string "%Y-%m-%d" time))))
+    (select-window sw)))
+
+(defun org-calendar-select ()
+  "Return to `org-read-date' with the date currently selected.
+This is used by `org-read-date' in a temporary keymap for the calendar buffer."
+  (interactive)
+  (when (calendar-cursor-to-date)
+    (let* ((date (calendar-cursor-to-date))
+           (time (encode-time 0 0 0 (nth 1 date) (nth 0 date) (nth 2 date))))
+      (setq ans1 (format-time-string "%Y-%m-%d" time)))
+    (if (active-minibuffer-window) (exit-minibuffer))))
+          
+(defun org-check-deadlines (ndays)
+  "Check if there are any deadlines due or past due.
+A deadline is considered due if it happens within `org-deadline-warning-days'
+days from todays date.  If the deadline appears in an entry marked DONE,
+it is not shown.  The prefix arg NDAYS can be used to test that many
+days.  If the prefix are is a raw C-u prefix, all deadlines are shown."
+  (interactive "P")
+  (let* ((org-warn-days
+          (cond
+           ((equal ndays '(4)) 100000)
+           (ndays (prefix-numeric-value ndays))
+           (t org-deadline-warning-days)))
+         (case-fold-search nil)
+         (regexp (concat "\\<" org-deadline-string " *<\\([^>]+\\)>"))
+         (callback
+          (lambda ()
+            (and (let ((d1 (time-to-days (current-time)))
+                       (d2 (time-to-days
+                            (org-time-string-to-time (match-string 1)))))
+                   (< (- d2 d1) org-warn-days))
+                 (not (org-entry-is-done-p))))))
+    (message "%d deadlines past-due or due within %d days"
+             (org-occur regexp callback)
+             org-warn-days)))
+
+(defun org-evaluate-time-range (&optional to-buffer)
+  "Evaluate a time range by computing the difference between start and end.
+Normally the result is just printed in the echo area, but with prefix arg
+TO-BUFFER, the result is inserted just after the date stamp into the buffer.
+If the time range is actually in a table, the result is inserted into the
+next column.
+For time difference computation, a year is assumed to be exactly 365
+days in order to avoid rounding problems."
+  (interactive "P")
+  (save-excursion
+    (unless (org-at-date-range-p)
+      (goto-char (point-at-bol))
+      (re-search-forward org-tr-regexp (point-at-eol) t))
+    (if (not (org-at-date-range-p))
+        (error "Not at a time-stamp range, and none found in current line.")))
+  (let* ((ts1 (match-string 1))
+         (ts2 (match-string 2))
+         (match-end (match-end 0))
+         (time1 (org-time-string-to-time ts1))
+         (time2 (org-time-string-to-time ts2))
+         (t1 (time-to-seconds time1))
+         (t2 (time-to-seconds time2))
+         (diff (abs (- t2 t1)))
+         (negative (< (- t2 t1) 0))
+         (ys (floor (* 365 24 60 60)))
+         (ds (* 24 60 60))
+         (hs (* 60 60))
+         (fy "%dy %dd %02d:%02d")
+         (fd "%dd %02d:%02d")
+         (fh "%02d:%02d")
+         y d h m align)
+    (setq y (floor (/ diff ys))  diff (mod diff ys)
+          d (floor (/ diff ds))  diff (mod diff ds)
+          h (floor (/ diff hs))  diff (mod diff hs)
+          m (floor (/ diff 60)))
+    (if to-buffer
+        (progn
+          (goto-char match-end)
+          (when (and (org-at-table-p) (looking-at " *|"))
+            (setq align t)
+            (goto-char (match-end 0)))
+          (if (looking-at
+               "\\( *-? *[0-9]+y\\)?\\( *[0-9]+d\\)? *[0-9][0-9]:[0-9][0-9]")
+              (replace-match ""))
+          (if negative (insert " -"))
+          (if (> y 0) (insert " " (format fy y d h m))
+            (if (> d 0) (insert " " (format fd d h m))
+              (insert " " (format fh h m))))
+          (if align (org-table-align))
+          (message "Time difference inserted"))
+      (message (org-make-tdiff-string y d h m)))))
+
+(defun org-make-tdiff-string (y d h m)
+  (let ((fmt "")
+        (l nil))
+    (if (> y 0) (setq fmt (concat fmt "%d year" (if (> y 1) "s" "") " ")
+                      l (push y l)))
+    (if (> d 0) (setq fmt (concat fmt "%d day"  (if (> d 1) "s" "") " ")
+                      l (push d l)))
+    (if (> h 0) (setq fmt (concat fmt "%d hour" (if (> h 1) "s" "") " ")
+                      l (push h l)))
+    (if (> m 0) (setq fmt (concat fmt "%d minute" (if (> m 1) "s" "") " ")
+                      l (push m l)))
+    (apply 'format fmt (nreverse l))))
+
+(defun org-time-string-to-time (s)
+  (apply 'encode-time (org-parse-time-string s)))
+
+(defun org-parse-time-string (s)
+  "Parse the standard Org-mode time string.
+This should be a lot faster than the normal parse-time-string."
+  (if (string-match org-ts-regexp1 s)
+      (list 0
+            (string-to-number (or (match-string 8 s) "0"))
+            (string-to-number (or (match-string 7 s) "0"))
+            (string-to-number (match-string 4 s))
+            (string-to-number (match-string 3 s))
+            (string-to-number (match-string 2 s))
+            nil nil nil)
+    (make-list 9 0)))
+
+(defun org-timestamp-up (&optional arg)
+  "Increase the date item at the cursor by one.
+If the cursor is on the year, change the year.  If it is on the month or
+the day, change that.
+With prefix ARG, change by that many units."
+  (interactive "p")
+  (org-timestamp-change (prefix-numeric-value arg)))
+
+(defun org-timestamp-down (&optional arg)
+  "Decrease the date item at the cursor by one.
+If the cursor is on the year, change the year.  If it is on the month or
+the day, change that.
+With prefix ARG, change by that many units."
+  (interactive "p")
+  (org-timestamp-change (- (prefix-numeric-value arg))))
+
+(defun org-timestamp-up-day (&optional arg)
+  "Increase the date in the time stamp by one day.
+With prefix ARG, change that many days."
+  (interactive "p")
+  (org-timestamp-change (prefix-numeric-value arg) 'day))
+
+(defun org-timestamp-down-day (&optional arg)
+  "Increase the date in the time stamp by one day.
+With prefix ARG, change that many days."
+  (interactive "p")
+  (org-timestamp-change (- (prefix-numeric-value arg)) 'day))
+
+(defsubst org-pos-in-match-range (pos n)
+  (and (match-beginning n)
+       (<= (match-beginning n) pos)
+       (>= (match-end n) pos)))
+
+(defun org-at-timestamp-p ()
+  "Determine if the the cursor is in or at a timestamp."
+  (interactive)
+  (let* ((tsr org-ts-regexp2)
+         (pos (point))
+         (ans (or (looking-at tsr)
+                  (save-excursion
+                    (skip-chars-backward "^<\n\r\t")
+                    (if (> (point) 1) (backward-char 1))
+                    (and (looking-at tsr)
+                         (> (- (match-end 0) pos) -1))))))
+    (and (boundp 'org-ts-what)
+         (setq org-ts-what
+              (cond
+               ((org-pos-in-match-range pos 2)      'year)
+               ((org-pos-in-match-range pos 3)      'month)
+               ((org-pos-in-match-range pos 7)      'hour)
+               ((org-pos-in-match-range pos 8)      'minute)
+               ((or (org-pos-in-match-range pos 4)
+                    (org-pos-in-match-range pos 5)) 'day)
+               (t 'day))))
+    ans))
+
+(defun org-timestamp-change (n &optional what)
+  "Change the date in the time stamp at point.
+The date will be changed by N times WHAT.  WHAT can be `day', `month',
+`year', `minute', `second'.  If WHAT is not given, the cursor position
+in the timestamp determines what will be changed."
+  (let ((fmt (car org-time-stamp-formats))
+        org-ts-what
+        (pos (point))
+        ts time time0)
+    (if (not (org-at-timestamp-p))
+        (error "Not at a timestamp"))
+    (setq org-ts-what (or what org-ts-what))
+    (setq fmt (if (<= (abs (- (cdr org-ts-lengths)
+                              (- (match-end 0) (match-beginning 0))))
+                      1)
+                  (cdr org-time-stamp-formats)
+                (car org-time-stamp-formats)))
+    (setq ts (match-string 0))
+    (replace-match "")
+    (setq time0 (org-parse-time-string ts))
+    (setq time
+          (apply 'encode-time
+                 (append
+                  (list (or (car time0) 0))
+                  (list (+ (if (eq org-ts-what 'minute) n 0) (nth 1 time0)))
+                  (list (+ (if (eq org-ts-what 'hour) n 0)   (nth 2 time0)))
+                  (list (+ (if (eq org-ts-what 'day) n 0)    (nth 3 time0)))
+                  (list (+ (if (eq org-ts-what 'month) n 0)  (nth 4 time0)))
+                  (list (+ (if (eq org-ts-what 'year) n 0)   (nth 5 time0)))
+                  (nthcdr 6 time0))))
+    (if (eq what 'calendar)
+        (let ((cal-date
+               (save-excursion
+                 (save-match-data
+                   (set-buffer "*Calendar*")
+                   (calendar-cursor-to-date)))))
+          (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
+          (setcar time0 (or (car time0) 0))
+          (setcar (nthcdr 1 time0) (or (nth 1 time0) 0))
+          (setcar (nthcdr 2 time0) (or (nth 1 time0) 0))
+          (setq time (apply 'encode-time time0))))
+    (insert (setq org-last-changed-timestamp (format-time-string fmt time)))
+    (goto-char pos)
+    ;; Try to recenter the calendar window, if any
+    (if (and org-calendar-follow-timestamp-change
+             (get-buffer-window "*Calendar*" t)
+             (memq org-ts-what '(day month year)))
+        (org-recenter-calendar (time-to-days time)))))
+
+(defun org-recenter-calendar (date)
+  "If the calendar is visible, recenter it to DATE."
+  (let* ((win (selected-window))
+         (cwin (get-buffer-window "*Calendar*" t)))
+    (when cwin
+      (select-window cwin)
+      (calendar-goto-date (if (listp date) date
+                            (calendar-gregorian-from-absolute date)))
+      (select-window win))))
+
+(defun org-goto-calendar (&optional arg)
+  "Go to the Emacs calendar at the current date.
+If there is a time stamp in the current line, go to that date.
+A prefix ARG can be used force the current date."
+  (interactive "P")
+  (let ((tsr org-ts-regexp) diff)
+    (if (or (org-at-timestamp-p)
+            (save-excursion
+              (beginning-of-line 1)
+              (looking-at (concat ".*" tsr))))
+        (let ((d1 (time-to-days (current-time)))
+              (d2 (time-to-days
+                   (org-time-string-to-time (match-string 1)))))
+          (setq diff (- d2 d1))))
+    (calendar)
+    (calendar-goto-today)
+    (if (and diff (not arg)) (calendar-forward-day diff))))
+
+(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))
+
+;;; Agenda, and Diary Integration
+
+;;; Define the mode
+
+(defvar org-agenda-mode-map (make-sparse-keymap)
+  "Keymap for org-agenda-mode.")
+
+(defvar org-agenda-menu)
+(defvar org-agenda-follow-mode nil)
+(defvar org-agenda-buffer-name "*Org Agenda*")
+(defvar org-agenda-redo-command nil)
+
+;;;###autoload
+(defun org-agenda-mode ()
+  "Mode for time-sorted view on action items in Org-mode files."
+  (interactive)
+  (kill-all-local-variables)
+  (setq major-mode 'org-agenda-mode)
+  (setq mode-name "Org-Agenda")
+  (use-local-map org-agenda-mode-map)
+  (easy-menu-add org-agenda-menu)
+  (if org-startup-truncated (setq truncate-lines t))
+  (add-hook 'post-command-hook 'org-agenda-post-command-hook nil 'local)
+  (setq org-agenda-follow-mode nil)
+  (easy-menu-change 
+   '("Agenda") "Agenda Files"
+   (append
+    (list 
+     ["Edit file list" (customize-variable 'org-agenda-files) t]
+     "--")
+   (mapcar 'org-file-menu-entry org-agenda-files)))
+  (org-agenda-set-mode-name)
+  (run-hooks 'org-agenda-mode-hook))
+
+(define-key org-agenda-mode-map [(tab)] 'org-agenda-goto)
+(define-key org-agenda-mode-map [(return)] 'org-agenda-switch-to)
+(define-key org-agenda-mode-map " " 'org-agenda-show)
+(define-key org-agenda-mode-map "\C-c\C-t" 'org-agenda-todo)
+(define-key org-agenda-mode-map "o" 'delete-other-windows)
+(define-key org-agenda-mode-map "l" 'org-agenda-recenter)
+(define-key org-agenda-mode-map "t" 'org-agenda-todo)
+(define-key org-agenda-mode-map "." 'org-agenda-goto-today)
+(define-key org-agenda-mode-map "w" 'org-agenda-week-view)
+(define-key org-agenda-mode-map [(shift right)] 'org-agenda-date-later)
+(define-key org-agenda-mode-map [(shift left)] 'org-agenda-date-earlier)
+
+(define-key org-agenda-mode-map ">" 'org-agenda-date-today)
+(let ((l '(1 2 3 4 5 6 7 8 9 0)))
+  (while l (define-key org-agenda-mode-map
+             (int-to-string (pop l)) 'digit-argument)))
+
+(define-key org-agenda-mode-map "f" 'org-agenda-follow-mode)
+(define-key org-agenda-mode-map "d" 'org-agenda-toggle-diary)
+(define-key org-agenda-mode-map "r" 'org-agenda-redo)
+(define-key org-agenda-mode-map "q" 'org-agenda-quit)
+(define-key org-agenda-mode-map "x" 'org-agenda-exit)
+(define-key org-agenda-mode-map "P" 'org-agenda-show-priority)
+(define-key org-agenda-mode-map "p" 'org-agenda-priority)
+(define-key org-agenda-mode-map "," 'org-agenda-priority)
+(define-key org-agenda-mode-map "i" 'org-agenda-diary-entry)
+(define-key org-agenda-mode-map "+" 'org-agenda-priority-up)
+(define-key org-agenda-mode-map "-" 'org-agenda-priority-down)
+(define-key org-agenda-mode-map [(right)] 'org-agenda-later)
+(define-key org-agenda-mode-map [(left)] 'org-agenda-earlier)
+
+(defvar org-agenda-keymap (copy-keymap org-agenda-mode-map)
+  "Local keymap for agenda entries from Org-mode.")
+
+(define-key org-agenda-keymap 
+  (if org-xemacs-p [(button2)] [(mouse-2)]) 'org-agenda-goto-mouse)
+(define-key org-agenda-keymap
+  (if org-xemacs-p [(button3)] [(mouse-3)]) 'org-agenda-show-mouse)
+
+(easy-menu-define org-agenda-menu org-agenda-mode-map "Agenda menu"
+  '("Agenda"
+    ("Agenda Files")
+    "--"
+    ["Show" org-agenda-show t]
+    ["Go To (other window)" org-agenda-goto t]
+    ["Go To (one window)" org-agenda-switch-to t]
+    ["Follow Mode" org-agenda-follow-mode 
+     :style toggle :selected org-agenda-follow-mode :active t]
+    "--"
+    ["Cycle TODO" org-agenda-todo t]
+    ("Reschedule"
+     ["Reschedule +1 day" org-agenda-date-later t]
+     ["Reschedule -1 day" org-agenda-date-earlier t]
+     "--"
+     ["Reschedule to today" org-agenda-date-today t])
+    ("Priority"
+     ["Set Priority" org-agenda-priority t]
+     ["Increase Priority" org-agenda-priority-up t]
+     ["Decrease Priority" org-agenda-priority-down t]
+     ["Show Priority" org-agenda-show-priority t])
+    "--"
+    ["Rebuild" org-agenda-redo t]
+    ["Goto Today" org-agenda-goto-today t]
+    ["Next Dates" org-agenda-later (local-variable-p 'starting-day)]
+    ["Previous Dates" org-agenda-earlier (local-variable-p 'starting-day)]
+    "--"
+    ["Week/Day View" org-agenda-week-view (local-variable-p 'starting-day)]
+    ["Include Diary" org-agenda-toggle-diary
+     :style toggle :selected org-agenda-include-diary :active t]
+    "--"
+    ["New Diary Entry" org-agenda-diary-entry t]
+    "--"
+    ["Quit" org-agenda-quit t]
+    ["Exit and Release Buffers" org-agenda-exit t]
+    ))
+
+(defvar org-agenda-markers nil
+  "List of all currently active markers created by org-agenda")
+(defvar org-agenda-last-marker-time (time-to-seconds (current-time))
+  "Creation time of the last agenda marker.")
+
+(defun org-agenda-new-marker (pos)
+  "Return a new agenda marker.
+Org-mode keeps a list of these markers and resets them when they are
+no longer in use."
+  (let ((m (copy-marker pos)))
+    (setq org-agenda-last-marker-time (time-to-seconds (current-time)))
+    (push m org-agenda-markers)
+    m))
+
+(defun org-agenda-maybe-reset-markers (&optional force)
+  "Reset markers created by org-agenda.  But only if they are old enough."
+  (if (or force
+          (> (- (time-to-seconds (current-time))
+                org-agenda-last-marker-time)
+             5))
+      (while org-agenda-markers
+        (move-marker (pop org-agenda-markers) nil))))
+
+(defvar org-agenda-new-buffers nil
+  "Buffers created to visit agenda files.")
+
+(defun org-get-agenda-file-buffer (file)
+  "Get a buffer visiting FILE.  If the buffer needs to be created, add
+it to the list of buffers which might be released later."
+  (let ((buf (find-buffer-visiting file)))
+    (if buf
+        buf  ; just return it
+      ;; Make a new buffer and remember it
+      (setq buf (find-file-noselect file))
+      (if buf (push buf org-agenda-new-buffers))
+      buf)))
+
+(defun org-release-buffers (blist)
+  "Release all buffers in list, asking the user for confirmation when needed.
+When a buffer is unmodified, it is just killed.  When modified, it is saved
+\(if the user agrees) and then killed."
+  (let (buf file)
+    (while (setq buf (pop blist))
+      (setq file (buffer-file-name buf))
+      (when (and (buffer-modified-p buf)
+                 file
+                 (y-or-n-p (format "Save file %s? " file)))
+        (save-excursion
+          (set-buffer buf) (save-buffer)))
+      (kill-buffer buf))))
+
+(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
+one C-u prefix argument, also past entries will be listed.
+With two C-u prefixes, all unfinished TODO items will also be shown,
+under the current date.
+If the buffer contains an active region, only check the region for
+dates."
+  (interactive "P")
+  (require 'calendar)
+  (org-agenda-maybe-reset-markers 'force)
+  (let* ((dopast include-all)
+         (dotodo (equal include-all '(16)))
+         (entry (buffer-file-name))
+         (org-agenda-files (list (buffer-file-name)))
+         (date (calendar-current-date))
+         (win (selected-window))
+         (pos1 (point))
+         (beg (if (org-region-active-p) (region-beginning) (point-min)))
+         (end (if (org-region-active-p) (region-end) (point-max)))
+         (day-numbers (org-get-all-dates beg end 'no-ranges
+                                         t)) ; always include today
+         (today (time-to-days (current-time)))
+         (org-respect-restriction t)
+         (past t)
+         s e rtn d pos)
+    (setq org-agenda-redo-command 
+          (list 'progn
+                (list 'switch-to-buffer-other-window (current-buffer))
+                (list 'org-timeline include-all)))
+    (if (not dopast)
+        ;; Remove past dates from the list of dates.
+        (setq day-numbers (delq nil (mapcar (lambda(x)
+                                              (if (>= x today) x nil))
+                                            day-numbers))))
+    (switch-to-buffer-other-window 
+     (get-buffer-create org-agenda-buffer-name))
+    (setq buffer-read-only nil)
+    (erase-buffer)
+    (org-agenda-mode) (setq buffer-read-only nil)
+    (while (setq d (pop day-numbers))
+      (if (and (>= d today)
+               dopast
+               past)
+          (progn
+            (setq past nil)
+            (insert (make-string 79 ?-) "\n")))
+      (setq date (calendar-gregorian-from-absolute d))
+      (setq s (point))
+      (if dotodo
+          (setq rtn (org-agenda-get-day-entries 
+                     entry date :todo :timestamp))
+        (setq rtn (org-agenda-get-day-entries entry date :timestamp)))
+      (if (or rtn (equal d today))
+          (progn
+            (insert (calendar-day-name date) " "
+                    (number-to-string (extract-calendar-day date)) " "
+                    (calendar-month-name (extract-calendar-month date)) " "
+                    (number-to-string (extract-calendar-year date)) "\n")
+            (put-text-property s (1- (point)) 'face
+                               'org-link-face)
+            (if (equal d today)
+                (put-text-property s (1- (point)) 'org-today t))
+            (insert (org-finalize-agenda-entries rtn) "\n")
+            (put-text-property s (1- (point)) 'day d))))
+    (goto-char (point-min))
+    (setq buffer-read-only t)
+    (goto-char (or (text-property-any (point-min) (point-max) 'org-today t)
+                   (point-min)))
+    (when (not org-select-timeline-window)
+      (select-window win)
+      (goto-char pos1))))
+
+;;;###autoload
+(defun org-agenda (&optional include-all start-day ndays)
+  "Produce a weekly view from all files in variable `org-agenda-files'.
+The view will be for the current week, but from the overview buffer you
+will be able to go to other weeks.
+With one C-u prefix argument INCLUDE-ALL, all unfinished TODO items will
+also be shown, under the current date.
+START-DAY defaults to TODAY, or to the most recent match for the weekday
+given in `org-agenda-start-on-weekday'.
+NDAYS defaults to `org-agenda-ndays'."
+  (interactive "P")
+  (org-agenda-maybe-reset-markers 'force)
+  (require 'calendar)
+  (let* ((org-agenda-start-on-weekday
+          (if (or (equal ndays 1)
+                  (and (null ndays) (equal 1 org-agenda-ndays)))
+              nil org-agenda-start-on-weekday))
+         (files (copy-sequence org-agenda-files))
+         (win (selected-window))
+         (today (time-to-days (current-time)))
+         (sd (or start-day today))
+         (start (if (or (null org-agenda-start-on-weekday)
+                        (< org-agenda-ndays 7))
+                    sd
+                  (let* ((nt (calendar-day-of-week
+                              (calendar-gregorian-from-absolute sd)))
+                         (n1 org-agenda-start-on-weekday)
+                         (d (- nt n1)))
+                    (- sd (+ (if (< d 0) 7 0) d)))))
+         (day-numbers (list start))
+         s e rtn rtnall file date d start-pos)
+    (setq org-agenda-redo-command 
+          (list 'org-agenda include-all start-day ndays))
+    ;; Make the list of days
+    (setq ndays (or ndays org-agenda-ndays))
+    (while (> ndays 1)
+      (push (1+ (car day-numbers)) day-numbers)
+      (setq ndays (1- ndays)))
+    (setq day-numbers (nreverse day-numbers))
+    (if (not (equal (current-buffer) (get-buffer org-agenda-buffer-name)))
+        (progn
+          (delete-other-windows)
+          (switch-to-buffer-other-window 
+           (get-buffer-create org-agenda-buffer-name))))
+    (setq buffer-read-only nil)
+    (erase-buffer)
+    (org-agenda-mode) (setq buffer-read-only nil)
+    (set (make-local-variable 'starting-day) (car day-numbers))
+    (set (make-local-variable 'include-all-loc) include-all)
+    (when (and (or include-all org-agenda-include-all-todo)
+               (member today day-numbers))
+      (setq files org-agenda-files
+            rtnall nil)
+      (while (setq file (pop files))
+        (catch 'nextfile
+          (org-check-agenda-file file)
+          (setq date (calendar-gregorian-from-absolute today)
+                rtn (org-agenda-get-day-entries
+                     file date :todo))
+          (setq rtnall (append rtnall rtn))))
+      (if rtnall (insert (org-finalize-agenda-entries rtnall) "\n")))
+    (while (setq d (pop day-numbers))
+      (setq date (calendar-gregorian-from-absolute d)
+            s (point))
+      (if (or (= d today)
+              (and (not start-pos) (= d sd)))
+          (setq start-pos (point)))
+      (setq files org-agenda-files
+            rtnall nil)
+      (while (setq file (pop files))
+        (catch 'nextfile
+          (org-check-agenda-file file)
+          (setq rtn (org-agenda-get-day-entries file date))
+          (setq rtnall (append rtnall rtn))))
+      (if org-agenda-include-diary
+          (progn
+            (require 'calendar)
+            (require 'diary-lib)
+            (setq rtn (org-get-entries-from-diary date))
+            (setq rtnall (append rtnall rtn))))
+      (if (or rtnall org-agenda-show-all-dates)
+          (progn
+            (insert (format "%-9s %2d %-9s %4d\n"
+                            (calendar-day-name date)
+                            (extract-calendar-day date)
+                            (calendar-month-name (extract-calendar-month date))
+                            (extract-calendar-year date)))
+            (put-text-property s (1- (point)) 'face
+                               'org-link-face)
+            (if rtnall (insert (org-finalize-agenda-entries rtnall) "\n"))
+            (put-text-property s (1- (point)) 'day d))))            
+    (goto-char (point-min))
+    (setq buffer-read-only t)
+    (goto-char (or start-pos 1))
+    (if (not org-select-agenda-window) (select-window win))
+    (message "")))
+
+(defun org-check-agenda-file (file)
+  "Make sure FILE exists.  If not, ask user what to do."
+  ;; FIXME:  this does not correctly change the menus
+  ;; Could be fixed by explicitly going to the buffer, maybe.
+  (when (not (file-exists-p file))
+    (message "non-existent file %s.  [R]emove from agenda-files or [A]bort?"
+             file)
+    (let ((r (downcase (read-char-exclusive))))
+      (cond
+       ((equal r ?r)
+        (org-remove-file file)
+        (throw 'nextfile t))
+       (t (error "Abort"))))))
+
+(defun org-agenda-quit (arg)
+  "Exit agenda by removing the window or the buffer."
+  (interactive "P")
+  (let ((buf (current-buffer)))
+    (if (not (one-window-p)) (delete-window))
+    (kill-buffer buf)
+    (org-agenda-maybe-reset-markers 'force)))
+
+(defun org-agenda-exit (arg)
+  "Exit agenda by removing the window or the buffer.
+Also kill all Org-mode buffers which have be loaded by `org-agenda'.
+Org-mode buffers visitied directly by the user will no be touched."
+  (interactive "P")
+  (org-release-buffers org-agenda-new-buffers)
+  (setq org-agenda-new-buffers nil)
+  (org-agenda-quit arg))
+
+(defun org-agenda-redo (&optional arg)
+  "Rebuild Agenda"
+  (interactive "P")
+  (eval org-agenda-redo-command))
+
+(defun org-agenda-goto-today (arg)
+  "Go to today."
+  (interactive "P")
+  (if (boundp 'starting-day)
+      (let ((cmd (car org-agenda-redo-command))
+            (iall (nth 1 org-agenda-redo-command))
+            (nday (nth 3 org-agenda-redo-command)))
+        (eval (list cmd iall nil nday)))
+    (goto-char (or (text-property-any (point-min) (point-max) 'org-today t)
+                   (point-min)))))
+
+(defun org-agenda-later (arg)
+  "Go forward in time by `org-agenda-ndays' days.
+With prefix ARG, go forward that many times `org-agenda-ndays'."
+  (interactive "p")
+  (unless (boundp 'starting-day)
+    (error "Not allowed"))
+  (org-agenda (if (boundp 'include-all-loc) include-all-loc nil)
+              (+ starting-day (* arg org-agenda-ndays))))
+
+(defun org-agenda-earlier (arg)
+  "Go back in time by `org-agenda-ndays' days.
+With prefix ARG, go back that many times `org-agenda-ndays'."
+  (interactive "p")
+  (unless (boundp 'starting-day)
+    (error "Not allowed"))
+  (org-agenda (if (boundp 'include-all-loc) include-all-loc nil)
+              (- starting-day (* arg org-agenda-ndays))))
+
+(defun org-agenda-day-view (arg)
+  "Switch agenda to single day view."
+  (interactive "P")
+  (unless (boundp 'starting-day)
+    (error "Not allowed"))
+  (setq org-agenda-ndays 1)
+  (org-agenda include-all-loc starting-day 1))
+
+(defun org-agenda-week-view (arg)
+  "Switch agenda to week view."
+  (interactive "P")
+  (unless (boundp 'starting-day)
+    (error "Not allowed"))
+  (setq org-agenda-ndays
+        (if (equal org-agenda-ndays 1) 7 1))
+  (org-agenda include-all-loc 
+              (or (get-text-property (point) 'day)
+                  starting-day))
+  (org-agenda-set-mode-name)
+  (message "Switched to %s view"
+           (if (equal org-agenda-ndays 1) "day" "week")))
+
+(defun org-agenda-follow-mode ()
+  "Toggle follow mode in an agenda buffer."
+  (interactive)
+  (setq org-agenda-follow-mode (not org-agenda-follow-mode))
+  (org-agenda-set-mode-name)
+  (message "Follow mode is %s"
+           (if org-agenda-follow-mode "on" "off")))
+
+(defun org-agenda-toggle-diary ()
+  "Toggle follow mode in an agenda buffer."
+  (interactive)
+  (setq org-agenda-include-diary (not org-agenda-include-diary))
+  (org-agenda-redo)
+  (org-agenda-set-mode-name)
+  (message "Diary inclusion turned %s"
+           (if org-agenda-include-diary "on" "off")))
+
+(defun org-agenda-set-mode-name ()
+  "Set the mode name to indicate all the small mode seetings."
+  (setq mode-name
+        (concat "Org-Agenda"
+                (if (equal org-agenda-ndays 1) " Day" "")
+                (if (equal org-agenda-ndays 7) " Week" "")
+                (if org-agenda-follow-mode " Follow" "")
+                (if org-agenda-include-diary " Diary" "")))
+  (force-mode-line-update))
+
+(defun org-agenda-post-command-hook ()
+  (if (and org-agenda-follow-mode
+           (get-text-property (point) 'org-marker))
+      (org-agenda-show)))
+
+(defun org-get-entries-from-diary (date)
+  "Get the (emacs calendar) diary entries for DATE."
+  (let* ((fancy-diary-buffer "*temporary-fancy-diary-buffer*")
+         (diary-display-hook '(sort-diary-entries fancy-diary-display))
+         entries
+         (disable-org-agenda t))
+    (save-excursion
+      (save-window-excursion
+        (list-diary-entries date 1)))
+    (if (not (get-buffer fancy-diary-buffer))
+        (setq entries nil)
+      (save-excursion
+        (set-buffer fancy-diary-buffer)
+        (setq buffer-read-only nil)
+        (if (= (point-max) 1)
+            ;; No entries
+            (setq entries nil)
+          ;; Omit the date
+          (beginning-of-line 3)
+          (delete-region (point-min) (point))
+          (while (and (re-search-forward "^" nil t) (not (eobp)))
+            (replace-match "  Diary:     "))
+          (setq entries (buffer-substring (point-min) (- (point-max) 1))))
+        (set-buffer-modified-p nil)
+        (kill-buffer fancy-diary-buffer)))
+    (when entries
+      (setq entries (org-split-string entries "\n"))
+      (setq entries 
+            (mapcar 
+             (lambda (x)
+               (if (string-match "\\<\\([012][0-9]\\):\\([0-6][0-9]\\)" x)
+                   (add-text-properties
+                    1 (length x)
+                    (list 'time-of-day
+                          (+ (* 100 (string-to-number
+                                     (match-string 1 x)))
+                             (string-to-number (match-string 2 x))))
+                    x))
+               x)
+             entries)))))
+
+(defun org-add-file (&optional file)
+  "Add current file to the list of files in variable `org-agenda-files'.
+These are the files which are being checked for agenda entries.
+Optional argument FILE means, use this file instead of the current.
+It is possible (but not recommended) to add this function to the
+`org-mode-hook'." 
+  (interactive)
+  (catch 'exit
+    (let* ((file (or file (buffer-file-name)
+                     (if (interactive-p)
+                         (error "Buffer is not visiting a file")
+                       (throw 'exit nil))))
+           (true-file (file-truename file))
+           (afile (abbreviate-file-name file))
+           (present (delq nil (mapcar
+                               (lambda (x)
+                                 (equal true-file (file-truename x)))
+                               org-agenda-files))))
+      (if (not present)
+          (progn
+            (setq org-agenda-files 
+                  (cons afile org-agenda-files))
+            ;; Make sure custom.el does not end up with Org-mode
+            (let ((org-mode-hook nil) (default-major-mode 'fundamental-mode))
+              (customize-save-variable 'org-agenda-files org-agenda-files))
+            (org-install-agenda-files-menu)
+            (message "Added file: %s" afile))
+        (message "File was already in list: %s" afile)))))
+
+(defun org-remove-file (&optional file)
+  "Remove current file from the list of files in variable `org-agenda-files'.
+These are the files which are being checked for agenda entries.
+Optional argument FILE means, use this file instead of the current."
+  (interactive)
+  (let* ((file (or file (buffer-file-name)))
+         (true-file (file-truename file))
+         (afile (abbreviate-file-name file))
+         (files (delq nil (mapcar 
+                           (lambda (x)
+                             (if (equal true-file
+                                        (file-truename x))
+                                 nil x))
+                           org-agenda-files))))
+    (if (not (= (length files) (length org-agenda-files)))
+        (progn
+          (setq org-agenda-files files)
+          (customize-save-variable 'org-agenda-files org-agenda-files)
+          (org-install-agenda-files-menu)
+          (message "Removed file: %s" afile))
+      (message "File was not in list: %s" afile))))
+
+(defun org-file-menu-entry (file)
+  (vector file (list 'find-file file) t))
+
+(defun org-get-all-dates (beg end &optional no-ranges force-today)
+  "Return a list of all relevant day numbers from BEG to END buffer positions.
+If NO-RANGES is non-nil, include only the start and end dates of a range,
+not every single day in the range.  If FORCE-TODAY is non-nil, make
+sure that TODAY is included in the list."
+  (let (dates date day day1 day2 ts1 ts2)
+    (if force-today
+        (setq dates (list (time-to-days (current-time)))))
+    (save-excursion
+      (goto-char beg)
+      (while (re-search-forward org-ts-regexp end t)
+        (setq day (time-to-days (org-time-string-to-time
+                                 (substring (match-string 1) 0 10))))
+        (or (memq day dates) (push day dates)))
+      (unless no-ranges
+        (goto-char beg)
+        (while (re-search-forward org-tr-regexp end t)
+          (setq ts1 (substring (match-string 1) 0 10)
+                ts2 (substring (match-string 2) 0 10)
+                day1 (time-to-days (org-time-string-to-time ts1))
+                day2 (time-to-days (org-time-string-to-time ts2)))
+          (while (< (setq day1 (1+ day1)) day2)
+            (or (memq day1 dates) (push day1 dates)))))
+      (sort dates '<))))
+
+;;;###autoload
+(defun org-diary (&rest args)
+  "Returns diary information from org-files.
+This function can be used in an \"sexp\" diary entry in the Emacs calendar.
+It accesses org files and extracts information from those files to be
+listed in the diary.  The function accepts arguments specifying what
+items should be listed.  The following arguments are allowed:
+
+   :timestamp    List the headlines of items containing a date stamp or
+                 date range matching the selected date.  Deadlines will
+                 also be listed, on the expiration day.
+
+   :deadline     List any deadlines past due, or due within
+                 `org-deadline-warning-days'.  The listing occurs only
+                 in the diary for *today*, not at any other date.  If
+                 an entry is marked DONE, it is no longer listed.
+
+   :scheduled    List all items which are scheduled for the given date.
+                 The diary for *today* also contains items which were
+                 scheduled earlier and are not yet marked DONE.
+
+   :todo         List all TODO items from the org-file.  This may be a
+                 long list - so this is not turned on by default.
+                 Like deadlines, these entires only show up in the
+                 diary for *today*, not at any other date.
+
+The call in the diary file should look like this:
+
+   &%%(org-diary) ~/path/to/some/orgfile.org
+
+Use a separate line for each org file to check.  Or, if you omit the file name,
+all files listed in `org-agenda-files' will be checked automatically:
+
+   &%%(org-diary)
+
+If you don't give any arguments (as in the example above), the default
+arguments (:deadline :scheduled :timestamp) are used.  So the example above may
+also be written as
+
+   &%%(org-diary :deadline :timestamp :scheduled)
+
+The function expects the lisp variables `entry' and `date' to be provided
+by the caller, because this is how the calendar works.  Don't use this
+function from a program - use `org-agenda-get-day-entries' instead." 
+  (org-agenda-maybe-reset-markers)
+  (setq args (or args '(:deadline :scheduled :timestamp)))
+  (let* ((files (if (and entry (stringp entry) (string-match "\\S-" entry))
+                    (list entry)
+                  org-agenda-files))
+         file rtn results)
+    ;; If this is called during org-agenda, don't return any entries to
+    ;; the calendar.  Org Agenda will list these entries itself.
+    (if (boundp 'disable-org-agenda) (setq files nil))
+    (while (setq file (pop files))
+      (setq rtn (apply 'org-agenda-get-day-entries file date args))
+      (setq results (append results rtn)))
+    (concat (org-finalize-agenda-entries results) "\n")))
+
+(defun org-agenda-get-day-entries (file date &rest args)
+  "Does the work for `org-diary' and `org-agenda'
+FILE is the path to a file to be checked for entries.  DATE is date like
+the one returned by `calendar-current-date'.  ARGS are symbols indicating
+which kind of entries should be extracted.  For details about these, see
+the documentation of `org-diary'."
+  (setq args (or args '(:deadline :scheduled :timestamp)))
+  (let* ((org-startup-with-deadline-check nil)
+         (org-startup-folded nil)
+         (buffer (if (file-exists-p file)
+;                     (find-file-noselect file)
+                     (org-get-agenda-file-buffer file)
+                   (error "No such file %s" file)))
+         (respect-narrow-p (boundp 'org-respect-restriction))
+         arg results rtn)
+    (if (not buffer)
+        ;; If file does not exist, make sure an error message ends up in diary
+        (format "ORG-AGENDA-ERROR: No such org-file %s" file)
+      (save-excursion
+        (set-buffer buffer)
+        (let ((case-fold-search nil))
+          (save-excursion
+            (save-restriction
+              (if respect-narrow-p
+                  (if (org-region-active-p)
+                      ;; Respect a region to restrict search
+                      (narrow-to-region (region-beginning) (region-end)))
+                ;; If we work for the calendar or many files, 
+                ;; get rid of any restriction
+                (widen))
+              (while (setq arg (pop args))
+                (cond
+                 ((and (eq arg :todo)
+                       (equal date (calendar-current-date)))
+                  (setq rtn (org-agenda-get-todos))
+                  (setq results (append results rtn)))
+                 ((eq arg :timestamp)
+                  (setq rtn (org-agenda-get-blocks))
+                  (setq results (append results rtn))
+                  (setq rtn (org-agenda-get-timestamps))
+                  (setq results (append results rtn)))
+                 ((eq arg :scheduled)
+                  (setq rtn (org-agenda-get-scheduled))
+                  (setq results (append results rtn)))
+                 ((and (eq arg :deadline)
+                       (equal date (calendar-current-date)))
+                  (setq rtn (org-agenda-get-deadlines))
+                  (setq results (append results rtn))))))))))
+    results))
+
+(defun org-entry-is-done-p ()
+  "Is the current entry marked DONE?"
+  (save-excursion
+    (and (re-search-backward "[\r\n]\\*" nil t)
+         (looking-at orb-nl-done-regexp))))
+
+(defun org-at-date-range-p ()
+  "It the cursor inside a date range?"
+  (interactive)
+  (save-excursion
+    (catch 'exit
+      (let ((pos (point)))
+        (skip-chars-backward "^<\r\n")
+        (skip-chars-backward "<")
+        (and (looking-at org-tr-regexp)
+             (>= (match-end 0) pos)
+             (throw 'exit t))
+        (skip-chars-backward "^<\r\n")
+        (skip-chars-backward "<")
+        (and (looking-at org-tr-regexp)
+             (>= (match-end 0) pos)
+             (throw 'exit t)))
+      nil)))
+
+(defun org-agenda-get-todos ()
+  "Return the TODO information for agenda display."
+  (let* ((props (list 'face nil
+                      'mouse-face 'highlight
+                      'keymap org-agenda-keymap
+                      'help-echo
+                      (format "mouse-2 or RET jump to org file %s"
+                              (abbreviate-file-name (buffer-file-name)))))
+         (regexp (concat "[\n\r]\\*+ *\\(" org-not-done-regexp
+                         "[^\n\r]*\\)"))
+         marker priority
+         ee txt pl)
+    (goto-char (point-min))
+    (while (re-search-forward regexp nil t)
+      (goto-char (match-beginning 1))
+      (setq marker (org-agenda-new-marker (point))
+            txt (org-format-agenda-item "" (match-string 1))
+            priority 
+            (+ (org-get-priority txt)
+               (if org-todo-kwd-priority-p
+                         (- org-todo-kwd-max-priority -2
+                            (length
+                             (member (match-string 2) org-todo-keywords)))
+                       1)))
+      (add-text-properties
+       0 (length txt) (append (list 'org-marker marker 'priority priority)
+                              props)
+       txt)
+      (push txt ee)
+      (goto-char (match-end 1)))
+    (nreverse ee)))
+
+(defconst org-agenda-no-heading-message
+  "No heading for this item in buffer or region")
+
+(defun org-agenda-get-timestamps ()
+  "Return the date stamp information for agenda display."
+  (let* ((props (list 'face nil
+                      'mouse-face 'highlight
+                      'keymap org-agenda-keymap
+                      'help-echo
+                      (format "mouse-2 or RET jump to org file %s"
+                              (abbreviate-file-name (buffer-file-name)))))
+         (regexp (regexp-quote
+                  (substring
+                   (format-time-string
+                    (car org-time-stamp-formats)
+                    (apply 'encode-time  ; DATE bound by calendar
+                           (list 0 0 0 (nth 1 date) (car date) (nth 2 date))))
+                   0 11)))
+         marker deadlinep scheduledp tmp priority
+         ee txt)
+    (goto-char (point-min))
+    (while (re-search-forward regexp nil t)
+      (if (not (save-match-data (org-at-date-range-p)))
+          (progn
+            (setq marker (org-agenda-new-marker (point))
+                  tmp (buffer-substring (max (point-min)
+                                             (- (match-beginning 0)
+                                                org-ds-keyword-length))
+                                        (match-beginning 0))
+                  deadlinep (string-match org-deadline-regexp tmp)
+                  scheduledp (string-match org-scheduled-regexp tmp))
+            (save-excursion
+              (if (re-search-backward "\\(^\\|\r\\)\\*+" nil t)
+                  (progn
+                    (goto-char (match-end 1))
+                    (looking-at "\\*+[ \t]*\\([^\r\n]+\\)")
+                    (setq txt (org-format-agenda-item
+                               (format "%s%s"
+                                       (if deadlinep  "Deadline:  " "")
+                                       (if scheduledp "Scheduled: " ""))
+                               (match-string 1))))
+                (setq txt org-agenda-no-heading-message))
+              (setq priority (org-get-priority txt))
+              (add-text-properties
+               0 (length txt) (append (list 'org-marker marker) props)
+               txt)
+              (if deadlinep
+                  (add-text-properties
+                   0 (length txt)
+                   (list 'face 'org-warning-face
+                         'priority (+ 100 priority))
+                   txt)
+                (if scheduledp
+                    (add-text-properties
+                     0 (length txt)
+                     (list 'face 'org-scheduled-today-face
+                           priority (+ 99 priority))
+                     txt)
+                  (add-text-properties
+                   0 (length txt)
+                   (list 'priority priority) txt)))
+              (push txt ee))
+            (outline-next-heading))))
+    (nreverse ee)))
+
+(defun org-agenda-get-deadlines ()
+  "Return the deadline information for agenda display."
+  (let* ((wdays org-deadline-warning-days)
+         (props (list 'face nil
+                      'mouse-face 'highlight
+                      'keymap org-agenda-keymap
+                      'help-echo
+                      (format "mouse-2 or RET jump to org file %s"
+                              (abbreviate-file-name (buffer-file-name)))))
+         (regexp org-deadline-time-regexp)
+         (todayp (equal date (calendar-current-date))) ; DATE bound by calendar
+         (d1 (calendar-absolute-from-gregorian date))  ; DATE bound by calendar
+         d2 diff pos
+         ee txt head)
+    (goto-char (point-min))
+    (while (re-search-forward regexp nil t)
+      (setq d2 (time-to-days
+                (org-time-string-to-time (match-string 1)))
+            pos (point)
+            diff (- d2 d1))
+      ;; 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 (and (< diff wdays) todayp (not (= diff 0)))
+          (save-excursion
+            (if (re-search-backward "\\(^\\|\r\\)\\*+[ \t]*" nil t)
+                (progn
+                  (goto-char (match-end 0))
+                  (setq head (buffer-substring-no-properties
+                              (point)
+                              (progn (skip-chars-forward "^\r\n")
+                                     (point))))
+                  (if (string-match org-looking-at-done-regexp head)
+                      (setq txt nil)
+                    (setq txt (org-format-agenda-item
+                               (format "In %3d d.: " diff) head))))
+              (setq txt org-agenda-no-heading-message))
+            (when txt
+              (add-text-properties
+               0 (length txt) 
+               (append 
+                (list 'org-marker (org-agenda-new-marker pos)
+                      'priority (+ (- 10 diff) (org-get-priority txt))
+                      'face (cond ((<= diff 0) 'org-warning-face)
+                                  ((<= diff 5) 'font-lock-function-name-face)
+                                  (t nil)))
+                props)
+               txt)
+              (push txt ee)))))
+    ee))
+
+(defun org-agenda-get-scheduled ()
+  "Return the scheduled information for agenda display."
+  (let* ((props (list 'face 'org-scheduled-previously-face
+                      'mouse-face 'highlight
+                      'keymap org-agenda-keymap
+                      'help-echo
+                      (format "mouse-2 or RET jump to org file %s"
+                              (abbreviate-file-name (buffer-file-name)))))
+         (regexp org-scheduled-time-regexp)
+         (todayp (equal date (calendar-current-date))) ; DATE bound by calendar
+         (d1 (calendar-absolute-from-gregorian date))  ; DATE bound by calendar
+         d2 diff marker pos
+         ee txt head)
+    (goto-char (point-min))
+    (while (re-search-forward regexp nil t)
+      (setq d2 (time-to-days
+                (org-time-string-to-time (match-string 1)))
+            pos (point)
+            diff (- d2 d1))
+      ;; When to show a scheduled item in the calendar:
+      ;; If it is on or past the date.
+      (if (and (< diff 0) todayp)
+          (save-excursion
+            (if (re-search-backward "\\(^\\|\r\\)\\*+[ \t]*" nil t)
+                (progn
+                  (goto-char (match-end 0))
+                  (setq head (buffer-substring-no-properties
+                              (point)
+                              (progn (skip-chars-forward "^\r\n") (point))))
+                  (if (string-match org-looking-at-done-regexp head)
+                      (setq txt nil)
+                    (setq txt (org-format-agenda-item
+                               (format "Sched.%2dx: " (- 1 diff)) head))))
+              (setq txt org-agenda-no-heading-message))
+            (when txt
+              (setq marker (org-agenda-new-marker pos))
+              (add-text-properties
+               0 (length txt)
+               (append (list 'org-marker marker
+                             'priority (+ (- 5 diff) (org-get-priority txt)))
+                       props) txt)
+              (push txt ee)))))
+    ee))
+
+(defun org-agenda-get-blocks ()
+  "Return the date-range information for agenda display."
+  (let* ((props (list 'face nil
+                      'mouse-face 'highlight
+                      'keymap org-agenda-keymap
+                      'help-echo
+                      (format "mouse-2 or RET jump to org file %s"
+                              (abbreviate-file-name (buffer-file-name)))))
+         (regexp org-tr-regexp)
+         (d0 (calendar-absolute-from-gregorian date))
+         marker ee txt d1 d2 s1 s2)
+    (goto-char (point-min))
+    (while (re-search-forward regexp nil t)
+      (setq s1 (match-string 1)
+            s2 (match-string 2)
+            d1 (time-to-days (org-time-string-to-time s1))
+            d2 (time-to-days (org-time-string-to-time s2)))
+      (if (and (> (- d0 d1) -1) (> (- d2 d0) -1))
+          ;; Only allow days between the limits, because the normal
+          ;; date stamps will catch the limits.
+          (save-excursion
+            (setq marker (org-agenda-new-marker (point)))
+            (if (re-search-backward "\\(^\\|\r\\)\\*+" nil t)
+                (progn
+                  (goto-char (match-end 1))
+                  (looking-at "\\*+[ \t]*\\([^\r\n]+\\)")
+                  (setq txt (org-format-agenda-item 
+                             (format "(%d/%d): "
+                                     (1+ (- d0 d1)) (1+ (- d2 d1)))
+                             (match-string 1))))
+              (setq txt org-agenda-no-heading-message))
+            (add-text-properties
+             0 (length txt) (append (list 'org-marker marker
+                                          'priority (org-get-priority txt))
+                                    props)
+             txt)
+            (push txt ee)))
+      (outline-next-heading))
+    ;; Sort the entries by expiration date.
+    (nreverse ee)))
+
+
+(defun org-format-agenda-item (prefix txt)
+  "Format TXT to be inserted into the agenda buffer.
+In particular, this indents the lins and adds a category."
+  (let ((cat (or org-category
+                 (file-name-sans-extension
+                  (file-name-nondirectory (buffer-file-name)))))
+        time rtn)
+    (if (symbolp cat) (setq cat (symbol-name cat)))
+    (setq rtn (format "  %-10s %s%s" (concat cat ":") prefix txt))
+    (add-text-properties 
+     0 2 (list 'category (downcase cat)
+               'prefix-length (- (length rtn) (length txt))
+               'time-of-day (org-get-time-of-day rtn))
+     rtn)
+    rtn))
+  
+;; FIXME:  Should this be restricted to beginning of string?
+(defun org-get-time-of-day (s)
+  "Check string S for a time of day."
+  (save-match-data
+  (when (and 
+         (string-match
+          "\\<\\([012][0-9]\\)\\(:\\([0-6][0-9]\\)\\)?\\([AaPp][Mm]\\)?\\>" s)
+         (or (match-beginning 2) (match-beginning 4)))
+    (+ (* 100 (+ (string-to-number (match-string 1 s))
+                 (if (and (match-beginning 4)
+                          (equal (downcase (match-string 4 s)) "pm"))
+                     12 0)))
+       (if (match-beginning 3)
+           (string-to-number (match-string 3 s))
+         0)))))
+
+(defun org-finalize-agenda-entries (list)
+  "Sort and concatenate the agenda items."
+  (mapconcat 'identity (sort list 'org-entries-lessp) "\n"))
+
+(defsubst org-cmp-priority (a b)
+  "Compare the priorities of string a and b."
+  (let ((pa (or (get-text-property 1 'priority a) 0))
+        (pb (or (get-text-property 1 'priority b) 0)))
+    (cond ((> pa pb) +1)
+          ((< pa pb) -1)
+          (t nil))))
+
+(defsubst org-cmp-category (a b)
+  "Compare the string values of categories of strings a and b."
+  (let ((ca (or (get-text-property 1 'category a) ""))
+        (cb (or (get-text-property 1 'category b) "")))
+    (cond ((string-lessp ca cb) -1)
+          ((string-lessp cb ca) +1)
+          (t nil))))
+
+(defsubst org-cmp-time (a b)
+  "Compare the time-of-day values of strings a and b."
+  (let* ((def (if org-sort-agenda-notime-is-late 2401 -1))
+         (ta (or (get-text-property 1 'time-of-day a) def))
+         (tb (or (get-text-property 1 'time-of-day b) def)))
+    (cond ((< ta tb) -1)
+          ((< tb ta) +1)
+          (t nil))))
+
+(defun org-entries-lessp (a b)
+  "Predicate for sorting agenda entries."
+  (let* ((time-up (org-cmp-time a b))
+         (time-down (if time-up (- time-up) nil))
+         (priority-up (org-cmp-priority a b))
+         (priority-down (if priority-up (- priority-up) nil))
+         (category-up (org-cmp-category a b))
+         (category-down (if category-up (- category-up) nil))
+         (category-keep (if category-up +1 nil)))  ; FIXME +1 or -1?
+    (cdr (assoc 
+          (eval (cons 'or org-agenda-sorting-strategy))
+          '((-1 . t) (1 . nil) (nil . nil))))))
+
+(defun org-agenda-show-priority ()
+  "Show the priority of the current item.
+This priority is composed of the main priority given with the [#A] cookies,
+and by additional input from the age of a schedules or deadline entry."
+  (interactive)
+  (let* ((pri (get-text-property (point-at-bol) 'priority)))
+    (message "Priority is %d" (if pri pri -1000))))
+
+
+(defun org-agenda-goto ()
+  "Go to the Org-mode file which contains the item at point."
+  (interactive)
+  (let* ((marker (or (get-text-property (point) 'org-marker) 
+                     (org-agenda-error)))
+         (buffer (marker-buffer marker))
+         (pos (marker-position marker)))
+    (switch-to-buffer-other-window buffer)
+    (widen)
+    (goto-char pos)
+    (org-show-hidden-entry)
+    (save-excursion
+      (and (outline-next-heading)
+           (org-flag-heading nil)))))  ; show the next heading
+
+(defun org-agenda-switch-to ()
+  "Go to the Org-mode file which contains the item at point."
+  (interactive)
+  (let* ((marker (or (get-text-property (point) 'org-marker) 
+                     (org-agenda-error)))
+         (buffer (marker-buffer marker))
+         (pos (marker-position marker)))
+    (switch-to-buffer buffer)
+    (delete-other-windows)
+    (widen)
+    (goto-char pos)
+    (org-show-hidden-entry)
+    (save-excursion
+      (and (outline-next-heading)
+           (org-flag-heading nil)))))  ; show the next heading
+
+(defun org-agenda-goto-mouse (ev)
+  "Go to the Org-mode file which contains the deadline at the mouse click."
+  (interactive "e")
+  (mouse-set-point ev)
+  (org-agenda-goto))
+
+(defun org-agenda-show ()
+  "Display the Org-mode file which contains the item at point."
+  (interactive)
+  (let ((win (selected-window)))
+    (org-agenda-goto)
+    (select-window win)))
+
+(defun org-agenda-recenter (arg)
+  "Display the Org-mode file which contains the item at point and recenter."
+  (interactive "P")
+  (let ((win (selected-window)))
+    (org-agenda-goto)
+    (recenter arg)
+    (select-window win)))
+
+(defun org-agenda-show-mouse (ev)
+  "Display the Org-mode file which contains the deadline at the mouse click."
+  (interactive "e")
+  (mouse-set-point ev)
+  (org-agenda-show))
+
+(defun org-agenda-error ()
+  (error "Command not allowed in this line."))
+
+(defun org-agenda-todo ()
+  "Cycle TODO state of line at point, also in Org-mode file."
+  (interactive)
+  (let* ((props (text-properties-at (point)))
+         (col (current-column))
+         (marker (or (get-text-property (point) 'org-marker)
+                     (org-agenda-error)))
+         (pl (get-text-property (point-at-bol) 'prefix-length))
+         (buffer (marker-buffer marker))
+         (pos (marker-position marker))
+         (buffer-read-only nil)
+         newhead)
+    (save-excursion
+      (set-buffer buffer)
+      (widen)
+      (goto-char pos)
+      (org-show-hidden-entry)
+      (save-excursion
+        (and (outline-next-heading)
+             (org-flag-heading nil)))   ; show the next heading
+      (org-todo)
+      (setq newhead (org-get-heading)))
+    (beginning-of-line 1)
+    (move-to-column pl)
+    (if (looking-at ".*")
+        (progn
+          (replace-match newhead t t)
+          (move-to-column col)
+          (add-text-properties (point-at-bol) (point-at-eol) props)
+          (beginning-of-line 1))
+      (error "Line update did not work"))))
+
+(defun org-agenda-priority-up ()
+  "Increase the priority of line at point, also in Org-mode file."
+  (interactive)
+  (org-agenda-priority 'up))
+
+(defun org-agenda-priority-down ()
+  "Decrease the priority of line at point, also in Org-mode file."
+  (interactive)
+  (org-agenda-priority 'down))
+
+(defun org-agenda-priority (&optional force-direction)
+  "Set the priority of line at point, also in Org-mode file."
+  (interactive)
+  (let* ((props (text-properties-at (point)))
+         (col (current-column))
+         (marker (or (get-text-property (point) 'org-marker)
+                     (org-agenda-error)))
+         (pl (get-text-property (point-at-bol) 'prefix-length))
+         (buffer (marker-buffer marker))
+         (pos (marker-position marker))
+         (buffer-read-only nil)
+         newhead)
+    (save-excursion
+      (set-buffer buffer)
+      (widen)
+      (goto-char pos)
+      (org-show-hidden-entry)
+      (save-excursion
+        (and (outline-next-heading)
+             (org-flag-heading nil)))   ; show the next heading
+      (funcall 'org-priority force-direction)
+      (setq newhead (org-get-heading)))
+    (beginning-of-line 1)
+    (move-to-column pl)
+    (if (looking-at ".*")
+        (progn
+          (replace-match (concat newhead) t t)
+          (move-to-column col)
+          (add-text-properties (point-at-bol) (point-at-eol) props)
+          (beginning-of-line 1))
+      (error "Line update did not work"))))
+
+(defun org-agenda-date-later (arg &optional what)
+  "Change the date of this item to one day later."
+  (interactive "p")
+  (let* ((marker (or (get-text-property (point) 'org-marker)
+                     (org-agenda-error)))
+         (buffer (marker-buffer marker))
+         (pos (marker-position marker)))
+    (save-excursion
+      (set-buffer buffer)
+      (widen)
+      (goto-char pos)
+      (if (not (org-at-timestamp-p))
+          (error "Cannot find time stamp"))
+      (org-timestamp-change arg (or what 'day))
+      (message "Time stamp changed to %s" org-last-changed-timestamp))))
+
+(defun org-agenda-date-earlier (arg &optional what)
+  "Change the date of this item to one day earlier."
+  (interactive "p")
+  (org-agenda-date-later (- arg) what))
+
+(defun org-agenda-date-today (arg)
+  "Change the date of this item to one day later."
+  (interactive "p")
+  (let* ((marker (or (get-text-property (point) 'org-marker)
+                     (org-agenda-error)))
+         (buffer (marker-buffer marker))
+         (pos (marker-position marker)))
+    (save-excursion
+      (set-buffer buffer)
+      (widen)
+      (goto-char pos)
+      (if (not (org-at-timestamp-p))
+          (error "Cannot find time stamp"))
+      (org-time-stamp nil)
+      (message "Time stamp changed to %s" org-last-changed-timestamp))))
+
+(defun org-get-heading ()
+  "Return the heading of the current entry, without the stars."
+  (save-excursion
+    (if (and (re-search-backward "[\r\n]\\*" nil t)
+             (looking-at "[\r\n]\\*+[ \t]+\\(.*\\)"))
+        (match-string 1)
+      "")))
+
+(defun org-agenda-diary-entry (arg)
+  "Make a diary entry, like the `i' command from the calendar.
+All the standard commands work: block, weekly etc"
+  (interactive "P")
+  (require 'diary-lib)
+  (let* ((char (progn 
+                 (message "Diary entry: [d]ay [w]eekly [m]onthly [y]early [a]nniversary [b]lock [c]yclic")
+                 (read-char-exclusive)))
+         (cmd (cdr (assoc char
+                          '((?d . insert-diary-entry)
+                            (?w . insert-weekly-diary-entry)
+                            (?m . insert-monthly-diary-entry)
+                            (?y . insert-yearly-diary-entry)
+                            (?a . insert-anniversary-diary-entry)
+                            (?b . insert-block-diary-entry)
+                            (?c . insert-cyclic-diary-entry)))))
+         (oldf (symbol-function 'calendar-cursor-to-date))
+         (point (point))
+         (mark (or (mark t) (point))))
+    (unless cmd
+      (error "No command associated with <%c>" char))
+    (unless (and (get-text-property point 'day)
+                 (or (not (equal ?b char))
+                     (get-text-property mark 'day)))
+      (error "Don't know which date to use for diary entry"))
+    ;; We implememnt this by hacking the `calendar-cursor-to-date' function
+    ;; and the `calendar-mark-ring' variable.  Saves a lot of code.
+    (let ((calendar-mark-ring
+           (list (calendar-gregorian-from-absolute
+                  (or (get-text-property mark 'day)
+                      (get-text-property point 'day))))))
+      (unwind-protect
+          (progn
+            (fset 'calendar-cursor-to-date
+                  (lambda (&optional error)
+                    (calendar-gregorian-from-absolute 
+                     (get-text-property point 'day))))
+            (call-interactively cmd))
+        (fset 'calendar-cursor-to-date oldf)))))
+  
+;;; Link Stuff
+
+(defun org-find-file-at-mouse (ev)
+  "Open file link or URL at mouse."
+  (interactive "e")
+  (mouse-set-point ev)
+  (org-open-at-point 'in-emacs))
+
+(defun org-open-at-mouse (ev)
+  "Open file link or URL at mouse."
+  (interactive "e")
+  (mouse-set-point ev)
+  (org-open-at-point))
+
+(defun org-open-at-point (&optional in-emacs)
+  "Open link at or after point.
+If there is no link at point, this function will search forward up to
+the end of the current subtree.
+Normally, files will be opened by an appropriate application.  If the
+optional argument IN-EMACS is non-nil, Emacs will visit the file."
+  (interactive "P")
+  (if (org-at-timestamp-p)
+      (org-agenda nil (time-to-days (org-time-string-to-time
+                                     (substring (match-string 1) 0 10)))
+                  1)
+    (let (type path line (pos (point)))
+      (save-excursion
+        (skip-chars-backward
+         (if org-allow-space-in-links "^\t\n\r" "^ \t\n\r"))
+        (if (re-search-forward
+             org-link-regexp
+             (save-excursion
+               (condition-case nil
+                   (progn (outline-end-of-subtree) (max pos (point)))
+                 (error (end-of-line 1) (point))))
+             t)
+            (setq type (match-string 1)
+                  path (match-string 2)))
+        (unless path
+          (error "No link found."))
+        ;; Remove any trailing spaces in path
+        (if (string-match " +\\'" path)
+            (setq path (replace-match "" t t path)))
+
+        (cond
+
+         ((string= type "file")
+          (if (string-match ":\\([0-9]+\\)\\'" path)
+              (setq line (string-to-number (match-string 1 path))
+                    path (substring path 0 (match-beginning 0))))
+          (org-open-file path in-emacs line))
+
+         ((string= type "news")
+          (org-follow-gnus-link path))
+
+         ((string= type "bbdb")
+          (org-follow-bbdb-link path))
+
+         ((string= type "gnus")
+          (let (group article)
+            (if (not (string-match "\\`\\([^#]+\\)\\(#\\(.*\\)\\)?" path))
+                (error "Error in Gnus link"))
+            (setq group (match-string 1 path)
+                  article (match-string 3 path))
+            (org-follow-gnus-link group article)))
+
+         ((string= type "vm")
+          (let (folder article)
+            (if (not (string-match "\\`\\([^#]+\\)\\(#\\(.*\\)\\)?" path))
+                (error "Error in VM link"))
+            (setq folder (match-string 1 path)
+                  article (match-string 3 path))
+            ;; in-emacs is the prefix arg, will be interpreted as read-only
+            (org-follow-vm-link folder article in-emacs)))
+
+         ((string= type "wl")
+          (let (folder article)
+            (if (not (string-match "\\`\\([^#]+\\)\\(#\\(.*\\)\\)?" path))
+                (error "Error in Wanderlust link"))
+            (setq folder (match-string 1 path)
+                  article (match-string 3 path))
+            (org-follow-wl-link folder article)))
+
+         ((string= type "rmail")
+          (let (folder article)
+            (if (not (string-match "\\`\\([^#]+\\)\\(#\\(.*\\)\\)?" path))
+                (error "Error in RMAIL link"))
+            (setq folder (match-string 1 path)
+                  article (match-string 3 path))
+            (org-follow-rmail-link folder article)))
+
+         ((string= type "shell")
+          (let ((cmd path))
+            (if (or (not org-confirm-shell-links)
+                    (yes-or-no-p (format "Execute \"%s\" in the shell? " cmd)))
+                (shell-command cmd)
+              (error "Abort"))))
+
+         (t
+          (browse-url-at-point)))))))
+
+(defun org-follow-bbdb-link (name)
+  "Follow a BBDB link to NAME."
+  (require 'bbdb)
+  ;; First try an exact match
+  (bbdb-name (concat "\\`" name "\\'") nil)
+  (if (= 0 (buffer-size (get-buffer "*BBDB*")))
+      ;; No exact match - try partial match
+      (bbdb-name name nil)))
+
+(defun org-follow-gnus-link (&optional group article)
+  "Follow a Gnus link to GROUP and ARTICLE."
+  (require 'gnus)
+  (funcall (cdr (assq 'gnus org-link-frame-setup)))
+  (if group (gnus-fetch-group group))
+  (if article
+      (or (gnus-summary-goto-article article nil 'force)
+          (if (fboundp 'gnus-summary-insert-cached-articles)
+              (progn
+                (gnus-summary-insert-cached-articles)
+                (gnus-summary-goto-article article nil 'force))
+            (message "Message could not be found.")))))
+;;  (if article (gnus-summary-goto-article article nil 'force)))
+
+(defun org-follow-vm-link (&optional folder article readonly)
+  "Follow a VM link to FOLDER and ARTICLE."
+  (require 'vm)
+  (if (string-match "^//\\([a-zA-Z]+@\\)?\\([^:]+\\):\\(.*\\)" folder)
+      ;; ange-ftp or efs or tramp access
+      (let ((user (or (match-string 1 folder) (user-login-name)))
+            (host (match-string 2 folder))
+            (file (match-string 3 folder)))
+        (cond
+         ((featurep 'tramp)
+          ;; use tramp to access the file
+          (if org-xemacs-p
+              (setq folder (format "[%s@%s]%s" user host file))
+            (setq folder (format "/%s@%s:%s" user host file))))
+         (t
+          ;; use ange-ftp or efs
+          (require (if org-xemacs-p 'efs 'ange-ftp))
+          (setq folder (format "/%s@%s:%s" user host file))))))
+  (when folder
+    (funcall (cdr (assq 'vm org-link-frame-setup)) folder readonly)
+    (sit-for 0.1)
+    (when article
+      (vm-select-folder-buffer)
+      (widen)
+      (let ((case-fold-search t))
+        (goto-char (point-min))
+        (if (not (re-search-forward
+                  (concat "^" "message-id: *" (regexp-quote article))))
+            (error "Could not find the specified message in this folder"))
+        (vm-isearch-update)
+        (vm-isearch-narrow)
+        (vm-beginning-of-message)
+        (vm-summarize)))))
+
+(defun org-follow-wl-link (folder article)
+  "Follow a Wanderlust link to FOLDER and ARTICLE."
+  (wl-summary-goto-folder-subr folder 'no-sync t nil t)
+  (if article (wl-summary-jump-to-msg-by-message-id article))
+  (wl-summary-redisplay))
+
+(defun org-follow-rmail-link (folder article)
+  "Follow an RMAIL link to FOLDER and ARTICLE."
+  (let (message-number)
+    (save-excursion
+      (save-window-excursion
+        (rmail (if (string= folder "RMAIL") rmail-file-name folder))
+        (setq message-number
+              (save-restriction
+                (widen)
+                (goto-char (point-max))
+                (if (re-search-backward
+                     (concat "^Message-ID:\\s-+" (regexp-quote 
+                                                  (or article "")))
+                     nil t)
+                    (rmail-what-message))))))
+    (if message-number
+        (progn
+          (rmail (if (string= folder "RMAIL") rmail-file-name folder))
+          (rmail-show-message message-number)
+          message-number)
+      (error "Message not found"))))
+
+(defun org-open-file (path &optional in-emacs line)
+  "Open the file at PATH.
+First, this expands any special file name abbreviations.  Then the
+configuration variable `org-file-apps' is checked if it contains an
+entry for this file type, and if yes, the corresponding command is launched.
+If no application is found, Emacs simply visits the file.
+With optional argument IN-EMACS, Emacs will visit the file.
+If the file does not exist, an error is thrown."
+  (let* ((file (convert-standard-filename (org-expand-file-name path)))
+         (dfile (downcase file))
+         ext cmd apps)
+    (if (and (not (file-exists-p file))
+             (not org-open-non-existing-files))
+        (error "No such file: %s" file))
+    (if (string-match "^.*\\.\\([a-zA-Z0-9]+\\.gz\\)$" dfile)
+        (setq ext (match-string 1 dfile))
+      (if (string-match "^.*\\.\\([a-zA-Z0-9]+\\)$" dfile)
+          (setq ext (match-string 1 dfile))))
+    (setq apps (append org-file-apps (org-default-apps)))
+    (if in-emacs
+        (setq cmd 'emacs)
+      (setq cmd (or (cdr (assoc ext apps))
+                    (cdr (assoc t apps)))))
+    (cond
+     ((and (stringp cmd) (not (string-match "^\\s-*$" cmd)))
+      (setq cmd (format cmd file))
+      (save-window-excursion
+        (shell-command (concat cmd " & &"))))
+     ((or (stringp cmd)
+          (eq cmd 'emacs))
+      (funcall (cdr (assq 'file org-link-frame-setup)) file)
+      (if line (goto-line line)))
+     ((consp cmd)
+      (eval cmd))
+     (t (funcall (cdr (assq 'file org-link-frame-setup)) file)))))
+
+(defun org-default-apps ()
+  "Return the default applications for this operating system."
+  (cond
+   ((eq system-type 'darwin)
+    org-file-apps-defaults-macosx)
+   ((eq system-type 'windows-nt)
+    org-file-apps-defaults-windowsnt)
+   ((eq system-type 'linux)
+    org-file-apps-defaults-linux)
+   (t org-file-apps-defaults-linux)))
+
+(defun org-expand-file-name (path)
+  "Replace special path abbreviations and expand the file name."
+  (expand-file-name path))
+
+
+(defvar org-insert-link-history nil
+  "Minibuffer history for links inserted with `org-insert-link'.")
+
+(defvar org-stored-links nil
+  "Contains the links stored with `org-store-link'.")
+
+;;;###autoload
+(defun org-store-link (arg)
+  "\\<org-mode-map>Store an org-link to the current location.
+This link can later be inserted into an org-buffer with
+\\[org-insert-link].
+For some link types, a prefix arg is interpreted:
+For links to usenet articles, arg negates `org-usenet-links-prefer-google'.
+For file links, arg negates `org-line-numbers-in-file-links'."
+  (interactive "P")
+  (let (link cpltxt)
+    (cond
+
+     ((eq major-mode 'bbdb-mode)
+      (setq link (concat "bbdb:"
+                         (bbdb-record-name (bbdb-current-record)))))
+
+     ((eq major-mode 'calendar-mode)
+      (let ((cd (calendar-cursor-to-date)))
+        (setq link
+              (format-time-string
+               (car org-time-stamp-formats)
+               (apply 'encode-time
+                      (list 0 0 0 (nth 1 cd) (nth 0 cd) (nth 2 cd)
+                            nil nil nil))))))
+
+     ((or (eq major-mode 'vm-summary-mode)
+          (eq major-mode 'vm-presentation-mode))
+      (and (eq major-mode 'vm-presentation-mode) (vm-summarize))
+      (vm-follow-summary-cursor)
+      (save-excursion
+       (vm-select-folder-buffer)
+       (let* ((message (car vm-message-pointer))
+              (folder (buffer-file-name))
+              (subject (vm-su-subject message))
+              (author (vm-su-full-name message))
+              (address (vm-su-from message))
+              (message-id (vm-su-message-id message)))
+         (setq folder (abbreviate-file-name folder))
+         (if (string-match (concat "^" (regexp-quote vm-folder-directory))
+                           folder)
+             (setq folder (replace-match "" t t folder)))
+         (setq cpltxt (concat author " on: " subject))
+         (setq link (concat cpltxt "\n  " "vm:" folder
+                            "#" message-id)))))
+
+     ((eq major-mode 'wl-summary-mode)
+      (let* ((msgnum (wl-summary-message-number))
+             (message-id (elmo-message-field wl-summary-buffer-elmo-folder
+                                             msgnum 'message-id))
+             (wl-message-entity (elmo-msgdb-overview-get-entity
+                                 msgnum (wl-summary-buffer-msgdb)))
+             (author (wl-summary-line-from)) ; FIXME: how to get author name?
+             (subject "???"))   ; FIXME: How to get subject of email?
+        (setq cpltxt (concat author  " on: " subject))
+        (setq link (concat cpltxt "\n  " "wl:" wl-summary-buffer-folder-name
+                           "#" message-id))))
+
+     ((eq major-mode 'rmail-mode)
+      (save-excursion
+        (save-restriction
+          (rmail-narrow-to-non-pruned-header)
+          (let ((folder (buffer-file-name))
+                (message-id (mail-fetch-field "message-id"))
+                (author (mail-fetch-field "from"))
+                (subject (mail-fetch-field "subject")))
+            (setq cpltxt (concat author  " on: " subject))
+            (setq link (concat cpltxt "\n  " "rmail:" folder
+                               "#" message-id))))))
+
+     ((eq major-mode 'gnus-group-mode)
+      (let ((group (cond ((fboundp 'gnus-group-group-name) ; depending on Gnus
+                          (gnus-group-group-name))         ; version
+                         ((fboundp 'gnus-group-name)
+                          (gnus-group-name))
+                         (t "???"))))
+        (if (org-xor arg org-usenet-links-prefer-google)
+            (setq link (format "http://groups.google.com/groups?group=%s"
+                               group))
+          (setq link (concat "gnus:" group)))))
+
+     ((or (eq major-mode 'gnus-summary-mode)
+          (eq major-mode 'gnus-article-mode))
+      (gnus-article-show-summary)
+      (gnus-summary-beginning-of-article)
+      (let* ((group (car gnus-article-current))
+             (article (cdr gnus-article-current))
+             (header (gnus-summary-article-header article))
+             (author (mail-header-from header))
+             (message-id (mail-header-id header))
+             (date (mail-header-date header))
+             (subject (gnus-summary-subject-string)))
+        (setq cpltxt (concat author " on: " subject))
+        (if (org-xor arg org-usenet-links-prefer-google)
+            (setq link
+                  (concat
+                   cpltxt "\n  "
+                   (format "http://groups.google.com/groups?as_umsgid=%s"
+                           (org-fixup-message-id-for-http message-id))))
+          (setq link (concat cpltxt "\n" "gnus:" group
+                             "#" (number-to-string article))))))
+
+     ((eq major-mode 'w3-mode)
+      (setq link (url-view-url t)))
+     ((eq major-mode 'w3m-mode)
+      (setq link w3m-current-url))
+
+     ((buffer-file-name)
+      ;; Just link to this file here.
+      (setq link (concat "file:"
+                         (abbreviate-file-name (buffer-file-name))))
+      ;; Add the line number?
+      (if (org-xor org-line-numbers-in-file-links arg)
+          (setq link 
+                (concat link
+                        ":" (int-to-string 
+                             (+ (if (bolp) 1 0) (count-lines
+                                                 (point-min) (point))))))))
+     ((interactive-p)
+      (error "Cannot link to a buffer which is not visiting a file"))
+     (t (setq link nil)))
+
+    (if (and (interactive-p) link)
+        (progn
+          (setq org-stored-links
+                (cons (cons (or cpltxt link) link) org-stored-links))
+          (message "Stored: %s" (or cpltxt link)))
+      link)))
+
+(defun org-xor (a b)
+  "Exclusive or."
+  (or (and a (not b))
+      (and b (not a))))
+
+(defun org-get-header (header)
+  "Find a header field in the current buffer."
+  (save-excursion
+    (goto-char (point-min))
+    (let ((case-fold-search t) s)
+      (cond
+       ((eq header 'from)
+        (if (re-search-forward "^From:\\s-+\\(.*\\)" nil t)
+            (setq s (match-string 1)))
+	(while (string-match "\"" s)
+	  (setq s (replace-match "" t t s)))
+	(if (string-match "[<(].*" s)
+	    (setq s (replace-match "" t t s))))
+       ((eq header 'message-id)
+        (if (re-search-forward "^message-id:\\s-+\\(.*\\)" nil t)
+            (setq s (match-string 1))))
+       ((eq header 'subject)
+        (if (re-search-forward "^subject:\\s-+\\(.*\\)" nil t)
+            (setq s (match-string 1)))))
+      (if (string-match "\\`[ \t\]+" s) (setq s (replace-match "" t t s)))
+      (if (string-match "[ \t\]+\\'" s) (setq s (replace-match "" t t s)))
+      s)))
+
+
+(defun org-fixup-message-id-for-http (s)
+  "Replace special characters in a message id, so that it can be used
+in an http query."
+  (while (string-match "<" s)
+    (setq s (replace-match "%3C" t t s)))
+  (while (string-match ">" s)
+    (setq s (replace-match "%3E" t t s)))
+  (while (string-match "@" s)
+    (setq s (replace-match "%40" t t s)))
+  s)
+
+(defun org-insert-link (&optional complete-file)
+  "Insert a link. At the prompt, enter the link.
+
+Completion can be used to select a link previously stored with
+`org-store-link'.  When the empty string is entered (i.e. if you just
+press RET at the prompt), the link defaults to the most recently
+stored link.
+
+With a C-u prefix, prompts for a file to link to.  The file name can be
+selected using completion.  The path to the file will be relative to
+the current directory if the file is in the current directory or a
+subdirectory.  Otherwise, the link will be the absolute path as
+completed in the minibuffer (i.e. normally ~/path/to/file).
+
+With two C-u prefixes, enforce an absolute path even if the file
+is in the current directory or below."
+  (interactive "P")
+  (let ((link (if complete-file
+                  (read-file-name "File: ")
+                (completing-read
+                 "Link: " org-stored-links nil nil nil
+                 org-insert-link-history
+                 (or (car (car org-stored-links))))))
+	linktxt matched)
+    (if (or (not link) (equal link ""))
+      (error "No links available"))
+    (if complete-file
+        (let ((pwd (file-name-as-directory (expand-file-name "."))))
+          (cond
+           ((equal complete-file '(16))
+            (insert "file:" (abbreviate-file-name (expand-file-name link))))
+           ((string-match (concat "^" (regexp-quote pwd) "\\(.+\\)")
+                          (expand-file-name link))
+            (insert "file:" (match-string 1 (expand-file-name link))))
+           (t (insert "file:" link))))
+      (setq linktxt (cdr (assoc link org-stored-links)))
+      (if (not org-keep-stored-link-after-insertion)
+          (setq org-stored-links (delq (assoc link org-stored-links)
+                                       org-stored-links)))
+      (let ((lines (org-split-string (or linktxt link) "\n")))
+        (insert (car lines))
+        (setq matched (string-match org-link-regexp (car lines)))
+        (setq lines (cdr lines))
+        (while lines
+          (insert "\n")
+	  (if (save-excursion
+		(beginning-of-line 0)
+		(looking-at "[ \t]+\\S-"))
+	      (indent-relative))
+          (setq matched (or matched
+                            (string-match org-link-regexp (car lines))))
+          (insert (car lines))
+          (setq lines (cdr lines))))
+      (unless matched
+        (error "Add link type: http(s),ftp,mailto,file,news,bbdb,vm,wl,rmail,gnus, or shell")))))
+
+;;; Hooks for remember.el
+;;;###autoload
+(defun org-remember-annotation ()
+  "Return a link to the current location as an annotation for remember.el.
+If you are using Org-mode files as target for data storage with
+remember.el, then the annotations should include a link compatible with the
+conventions in Org-mode.  This function returns such a link."
+  (org-store-link nil))
+
+(defconst org-remember-help
+"Select a destination location for the note.
+UP/DOWN=headline   TAB=cycle visibility  [Q]uit   RET/<left>/<right>=Store
+RET at beg-of-buf -> Append to file as level 2 headline
+RET on headline   -> Store as sublevel entry to current headline
+<left>/<right>    -> before/after current headline, same headings level")
+
+;; FIXME: Document C-u C-c C-c
+;;;###autoload
+(defun org-remember-handler ()
+  "Store stuff from remember.el into an org file.
+First prompts for an org file.  If the user just presses return, the value
+of `org-default-notes-file' is used.
+Then the command offers the headings tree of the selected file in order to
+file the text at a specific location.
+You can either immediately press RET to get the note appended to the
+file.  Or you can use vertical cursor motion and visibility cycling (TAB) to
+find a better place.  Then press RET or <left> or <right> in insert the note.
+
+Key      Cursor position   Note gets inserted
+-----------------------------------------------------------------------------
+RET      buffer-start      as level 2 heading at end of file
+RET      on headline       as sublevel of the heading at cursor
+RET      no heading        at cursor position, level taken from context.
+                           Or use prefix arg to specify level manually.
+<left>   on headline       as same level, before current heading
+<right>  on headline       as same level, after current heading
+
+So the fastest way to store the note is to press RET RET to append it to
+the default file.  This way your current train of thought is not
+interrupted, in accordance with the principles of remember.el.  But with
+little extra effort, you can push it directly to the correct location.
+
+Before being stored away, the function ensures that the text has a
+headline, i.e. a first line that starts with a \"*\".  If not, a headline
+is constructed from the current date and some additional data.
+
+If the variable `org-adapt-indentation' is non-nil, the entire text is
+also indented so that it starts in the same column as the headline
+\(i.e. after the stars).
+
+See also the variable `org-reverse-note-order'."  
+  (catch 'quit
+    (let* ((txt (buffer-substring (point-min) (point-max)))
+           (fastp current-prefix-arg)
+           (file (if fastp org-default-notes-file (org-get-org-file)))
+           (visiting (find-buffer-visiting file))
+           (org-startup-with-deadline-check nil)
+           (org-startup-folded nil)
+           spos level indent reversed)
+      ;; Modify text so that it becomes a nice subtree which can be inserted
+      ;; into an org tree.
+      (let* ((lines (split-string txt "\n"))
+             (first (car lines))
+             (lines (cdr lines)))
+        (if (string-match "^\\*+" first)
+            ;; Is already a headline
+            (setq indent (make-string (- (match-end 0) (match-beginning 0)
+                                         -1) ?\ ))
+          ;; We need to add a headline:  Use time and first buffer line
+          (setq lines (cons first lines)
+                first (concat "* " (current-time-string)
+                              " (" (remember-buffer-desc) ")")
+                indent "  "))
+        (if org-adapt-indentation
+            (setq lines (mapcar (lambda (x) (concat indent x)) lines)))
+        (setq txt (concat first "\n"
+                          (mapconcat 'identity lines "\n"))))
+      ;; Find the file
+      (if (not visiting)
+          (find-file-noselect file))
+      (save-excursion
+        (set-buffer (get-file-buffer file))
+        (setq reversed (org-notes-order-reversed-p))
+        (save-restriction
+          (save-excursion
+            (widen)
+            ;; Ask the User for a location
+            (setq spos (if fastp 1 (org-get-location
+                                    (current-buffer)
+                                    org-remember-help)))
+            (if (not spos) (throw 'quit nil)) ; return nil to show we did
+                                              ; not handle this note
+            (goto-char spos)
+            (cond ((bobp)
+                   ;; Put it at the start or end, as level 2
+                   (save-restriction
+                     (widen)
+                     (goto-char (if reversed (point-min) (point-max)))
+                     (if (not (bolp)) (newline))
+                     (org-paste-subtree (or current-prefix-arg 2) txt)))
+                  ((and (org-on-heading-p nil) (not current-prefix-arg))
+                   ;; Put it below this entry, at the beg/end of the subtree
+                   (org-back-to-heading)
+                   (setq level (outline-level))
+                   (if reversed
+                       (outline-end-of-heading)
+                     (outline-end-of-subtree))
+                   (if (not (bolp)) (newline))
+                   (beginning-of-line 1)
+                   (org-paste-subtree (1+ level) txt))
+                  (t
+                   ;; Put it right there, with automatic level determined by
+                   ;; org-paste-subtree or from prefix arg
+                   (org-paste-subtree current-prefix-arg txt)))
+            (when remember-save-after-remembering
+              (save-buffer)
+              (if (not visiting) (kill-buffer (current-buffer)))))))))
+  t)    ;; return t to indicate that we took care of this note.
+
+(defun org-get-org-file ()
+  "Read a filename, with default directory `org-directory'."
+  (let ((default (or org-default-notes-file remember-data-file)))
+    (read-file-name (format "File name [%s]: " default)
+                    (file-name-as-directory org-directory)
+                    default)))
+
+(defun org-notes-order-reversed-p ()
+  "Check if the current file should receive notes in reversed order."
+  (cond
+   ((not org-reverse-note-order) nil)
+   ((eq t org-reverse-note-order) t)
+   ((not (listp org-reverse-note-order)) nil)
+   (t (catch 'exit
+        (let  ((all org-reverse-note-order)
+               entry)
+          (while (setq entry (pop all))
+            (if (string-match (car entry) (buffer-file-name))
+                (throw 'exit (cdr entry))))
+          nil)))))
+
+;;; Tables
+
+;; Watch out:  Here we are talking about two different kind of tables.
+;; Most of the code is for the tables created with the Org-mode table editor.
+;; Sometimes, we talk about tables created and edited with the table.el
+;; Emacs package.  We call the former org-type tables, and the latter
+;; table.el-type tables.
+
+;; We use a before-change function to check if a table might need
+;; an update.
+(defvar org-table-may-need-update t
+  "Indicates of a table might need an update.
+This variable is set by `org-before-change-function'. `org-table-align'
+sets it back to nil.")
+
+(defun org-before-change-function (beg end)
+  "Every change indicates that a table might need an update."
+  (setq org-table-may-need-update t))
+
+(defconst org-table-line-regexp "^[ \t]*|"
+  "Detects an org-type table line.")
+(defconst org-table-dataline-regexp "^[ \t]*|[^-]"
+  "Detects an org-type table line.")
+(defconst org-table-hline-regexp "^[ \t]*|-"
+  "Detects an org-type table hline.")
+(defconst org-table1-hline-regexp "^[ \t]*\\+-[-+]"
+  "Detects a table-type table hline.")
+(defconst org-table-any-line-regexp "^[ \t]*\\(|\\|\\+-[-+]\\)"
+  "Detects an org-type or table-type table")
+(defconst org-table-border-regexp "^[ \t]*[^| \t]"
+  "Searching from within a table (any type) this finds the first line
+outside the table.")
+(defconst org-table-any-border-regexp "^[ \t]*[^|+ \t]"
+  "Searching from within a table (any type) this finds the first line
+outside the table.")
+
+(defun org-table-create-with-table.el ()
+  "Use the table.el package to insert a new table.
+If there is already a table at point, convert between Org-mode tables
+and table.el tables."
+  (interactive)
+  (require 'table)
+  (cond
+   ((org-at-table.el-p)
+    (if (y-or-n-p "Convert table to Org-mode table? ")
+        (org-table-convert)))
+   ((org-at-table-p)
+    (if (y-or-n-p "Convert table to table.el table? ")
+        (org-table-convert)))
+   (t (call-interactively 'table-insert))))
+
+(defun org-table-create (&optional size)
+  "Query for a size and insert a table skeleton.
+SIZE is a string Columns x Rows like for example \"3x2\"."
+  (interactive "P")
+  (unless size
+    (setq size (read-string
+                (concat "Table size Columns x Rows [e.g. "
+                        org-table-default-size "]: ")
+                "" nil org-table-default-size)))
+
+  (let* ((pos (point))
+         (indent (make-string (current-column) ?\ ))
+         (split (org-split-string size " *x *"))
+         (rows (string-to-number (nth 1 split)))
+         (columns (string-to-number (car split)))
+         (line (concat (apply 'concat indent "|" (make-list columns "  |"))
+                       "\n")))
+    (if (string-match "^[ \t]*$" (buffer-substring-no-properties
+                                  (point-at-bol) (point)))
+        (beginning-of-line 1)
+      (newline))
+    (mapcar (lambda (x) (insert line)) (make-list rows t))
+    (goto-char pos)
+    (if (> rows 1)
+        ;; Insert a hline after the first row.
+        (progn
+          (end-of-line 1)
+          (insert "\n|-")
+          (goto-char pos)))
+    (org-table-align)))
+
+(defun org-table-convert-region (beg0 end0 nspace)
+  "Convert region to a table.
+The region goes from BEG0 to END0, but these borders will be moved
+slightly, to make sure a beginning of line in the first line is included.
+When NSPACE is non-nil, it indicates the minimum number of spaces that
+separate columns (default: just one space)"
+  (let* ((beg (min beg0 end0))
+         (end (max beg0 end0))
+         (tabsep t)
+         re)
+    (goto-char beg)
+    (beginning-of-line 1)
+    (setq beg (move-marker (make-marker) (point)))
+    (goto-char end)
+    (if (bolp) (backward-char 1) (end-of-line 1))
+    (setq end (move-marker (make-marker) (point)))
+    ;; Lets see if this is tab-separated material.  If every nonempty line
+    ;; contains a tab, we will assume that it is tab-separated material
+    (if nspace
+        (setq tabsep nil)
+      (goto-char beg)
+      (and (re-search-forward "^[^\n\t]+$" end t) (setq tabsep nil)))
+    (if nspace (setq tabsep nil))
+    (if tabsep
+        (setq re "^\\|\t")
+      (setq re (format "^ *\\| *\t *\\| \\{%d,\\}"
+                       (max 1 (prefix-numeric-value nspace)))))
+    (goto-char beg)
+    (while (re-search-forward re end t)
+      (replace-match "|" t t))
+    (goto-char beg)
+    (insert " ")
+    (org-table-align)))
+
+(defun org-table-import (file arg)
+  "Import FILE as a table.
+The file is assumed to be tab-separated.  Such files can be produced by most
+spreadsheet and database applications.  If no tabs (at least one per line)
+are found, lines will be split on whitespace into fields."
+  (interactive "f\nP")
+  (or (bolp) (newline))
+  (let ((beg (point))
+        (pm (point-max)))
+    (insert-file-contents file)
+    (org-table-convert-region beg (+ (point) (- (point-max) pm)) arg)))
+
+(defun org-table-export ()
+  "Export table as a tab-separated file.
+Such a file can be imported into a spreadsheet program like Excel."
+  (interactive)
+  (let* ((beg (org-table-begin))
+         (end (org-table-end))
+         (table (buffer-substring beg end))
+         (file (read-file-name "Export table to: "))
+         buf)
+    (unless (or (not (file-exists-p file))
+                (y-or-n-p (format "Overwrite file %s? " file)))
+      (error "Abort"))
+    (save-excursion
+      (find-file file)
+      (setq buf (current-buffer))
+      (erase-buffer)
+      (fundamental-mode)
+      (insert table)
+      (goto-char (point-min))
+      (while (re-search-forward "^[ \t]*|[ \t]*" nil t)
+        (replace-match "" t t)
+        (end-of-line 1))
+      (goto-char (point-min))
+      (while (re-search-forward "[ \t]*|[ \t]*$" nil t)
+        (replace-match "" t t)
+        (goto-char (min (1+ (point)) (point-max))))
+      (goto-char (point-min))
+      (while (re-search-forward "^-[-+]*$" nil t)
+        (replace-match "")
+        (if (looking-at "\n")
+            (delete-char 1)))
+      (goto-char (point-min))
+      (while (re-search-forward "[ \t]*|[ \t]*" nil t)
+        (replace-match "\t" t t))
+      (save-buffer))
+    (kill-buffer buf)))
+
+(defun org-table-align (&optional arg)
+  "Align the table at point by aligning all vertical bars."
+  (interactive "P")
+  (let* (
+         ;; Limits of table
+         (beg (org-table-begin))
+         (end (org-table-end))
+         ;; Current cursor position
+         (linepos (+ (if (bolp) 1 0) (count-lines (point-min) (point))))
+         (colpos (org-table-current-column))
+         (winstart (window-start))
+         text lines (new "") lengths l typenums ty fields maxfields i
+         column
+         (indent "") cnt frac
+         rfmt hfmt
+         (spaces (if (org-in-invisibility-spec-p '(org-table))
+                     org-table-spaces-around-invisible-separators
+                   org-table-spaces-around-separators))
+         (sp1 (car spaces))
+         (sp2 (cdr spaces))
+         (rfmt1 (concat
+                 (make-string sp2 ?\ ) "%%%s%ds" (make-string sp1 ?\ ) "|"))
+         (hfmt1 (concat
+                 (make-string sp2 ?-) "%s" (make-string sp1 ?-) "+"))
+         emptystrings)
+    (untabify beg end)
+    ;; (message "Aligning table...")
+    ;; Get the rows
+    (setq lines (org-split-string
+                 (buffer-substring-no-properties beg end) "\n"))
+    ;; Store the indentation of the first line
+    (if (string-match "^ *" (car lines))
+        (setq indent (make-string (- (match-end 0) (match-beginning 0)) ?\ )))
+    ;; Mark the hlines
+    (setq lines (mapcar (lambda (l) (if (string-match "^ *|-" l) nil l))
+                        lines))
+    ;; Get the data fields
+    (setq fields (mapcar
+                  (lambda (l)
+                      (org-split-string l " *| *"))
+                  (delq nil (copy-sequence lines))))
+    ;; How many fields in the longest line?
+    (condition-case nil
+        (setq maxfields (apply 'max (mapcar 'length fields)))
+      (error
+       (kill-region beg end)
+       (org-table-create org-table-default-size)
+       (error "Empty table - created default table")))
+    ;; A list of empty string to fill any short rows on output
+    (setq emptystrings (make-list maxfields ""))
+    ;; Get the maximum length of a field and the most common datatype
+    ;; for each column
+    (setq i -1)
+    (while (< (setq i (1+ i)) maxfields)   ;; Loop over all columns
+      (setq column (mapcar (lambda (x) (or (nth i x) "")) fields))
+      ;; maximum length
+      (push (apply 'max 1 (mapcar 'length column)) lengths)
+      ;; compute the fraction stepwise, ignoring empty fields
+      (setq cnt 0 frac 0.0)
+      (mapcar
+       (lambda (x)
+         (if (equal x "")
+             nil
+           (setq frac ( / (+ (* frac cnt)
+                             (if (string-match org-table-number-regexp x) 1 0))
+                          (setq cnt (1+ cnt))))))
+       column)
+      (push (>= frac org-table-number-fraction) typenums))
+    (setq lengths (nreverse lengths)
+          typenums (nreverse typenums))
+    ;; Compute the formats needed for output of the table
+    (setq rfmt (concat indent "|") hfmt (concat indent "|"))
+    (while (setq l (pop lengths))
+      (setq ty (if (pop typenums) "" "-")) ; number types flushright
+      (setq rfmt (concat rfmt (format rfmt1 ty l))
+            hfmt (concat hfmt (format hfmt1 (make-string l ?-)))))
+    (setq rfmt (concat rfmt "\n")
+          hfmt (concat (substring hfmt 0 -1) "|\n"))
+    ;; Produce the new table
+    (while lines
+      (setq l (pop lines))
+      (if l
+          (setq new (concat new (apply 'format rfmt
+                                       (append (pop fields) emptystrings))))
+        (setq new (concat new hfmt))))
+    ;; Replace the old one
+    (delete-region beg end)
+    (move-marker end nil)
+    (insert new)
+    ;; Try to move to the old location (approximately)
+    (goto-line linepos)
+    (set-window-start (selected-window) winstart 'noforce)
+    (org-table-goto-column colpos)
+    (setq org-table-may-need-update nil)
+    ;; (message "Aligning table...done")
+    (if (org-in-invisibility-spec-p '(org-table))
+        (org-table-add-invisible-to-vertical-lines))
+    ))
+
+(defun org-table-begin (&optional table-type)
+  "Find the beginning of the table and return its position.
+With argument TABLE-TYPE, go to the beginning of a table.el-type table."
+  (save-excursion
+    (if (not (re-search-backward
+              (if table-type org-table-any-border-regexp
+                org-table-border-regexp)
+              nil t))
+        (error "Can't find beginning of table")
+      (goto-char (match-beginning 0))
+      (beginning-of-line 2)
+      (point))))
+
+(defun org-table-end (&optional table-type)
+  "Find the end of the table and return its position.
+With argument TABLE-TYPE, go to the end of a table.el-type table."
+  (save-excursion
+    (if (not (re-search-forward
+              (if table-type org-table-any-border-regexp
+                org-table-border-regexp)
+              nil t))
+        (goto-char (point-max))
+      (goto-char (match-beginning 0)))
+    (point-marker)))
+
+(defun org-table-next-field (&optional arg)
+  "Go to the next field in the current table.
+Before doing so, re-align the table if necessary."
+  (interactive "P")
+  (if (and org-table-automatic-realign
+           org-table-may-need-update)
+      (org-table-align))
+  (if (org-at-table-hline-p)
+      (end-of-line 1))
+  (condition-case nil
+      (progn
+        (re-search-forward "|" (org-table-end))
+        (if (looking-at "[ \t]*$")
+            (re-search-forward "|" (org-table-end)))
+        (if (looking-at "-")
+            (progn
+              (beginning-of-line 0)
+              (org-table-insert-row 'below))
+          (if (looking-at " ") (forward-char 1))))
+    (error
+     (org-table-insert-row 'below))))
+
+(defun org-table-previous-field (&optional arg)
+  "Go to the previous field in the table.
+Before doing so, re-align the table if necessary."
+  (interactive "P")
+  (if (and org-table-automatic-realign
+           org-table-may-need-update)
+      (org-table-align))
+  (if (org-at-table-hline-p)
+      (end-of-line 1))
+  (re-search-backward "|" (org-table-begin))
+  (re-search-backward "|" (org-table-begin))
+  (while (looking-at "|\\(-\\|[ \t]*$\\)")
+    (re-search-backward "|" (org-table-begin)))
+  (if (looking-at "| ?")
+      (goto-char (match-end 0))))
+
+(defun org-table-next-row (&optional arg)
+  "Go to the next row (same column) in the current table.
+Before doing so, re-align the table if necessary."
+  (interactive "P")
+  (if (or (looking-at "[ \t]*$")
+          (save-excursion (skip-chars-backward " \t") (bolp)))
+      (newline)
+    (if (and org-table-automatic-realign
+             org-table-may-need-update)
+        (org-table-align))
+    (let ((col (org-table-current-column)))
+      (beginning-of-line 2)
+      (if (or (not (org-at-table-p))
+              (org-at-table-hline-p))
+          (progn
+            (beginning-of-line 0)
+            (org-table-insert-row 'below)))
+      (org-table-goto-column col)
+      (skip-chars-backward "^|\n\r")
+      (if (looking-at " ") (forward-char 1)))))
+
+(defun org-table-copy-from-above (n)
+  "Copy into the current column the nearest non-empty field from above.
+With prefix argument N, take the Nth non-empty field."
+  (interactive "p")
+  (let ((colpos (org-table-current-column))
+        (beg (org-table-begin))
+        txt)
+    (org-table-check-inside-data-field)
+    (if (save-excursion
+          (setq txt
+                (catch 'exit
+                  (while (progn (beginning-of-line 1)
+                                (re-search-backward org-table-dataline-regexp
+                                                    beg t))
+                    (org-table-goto-column colpos t)
+                    (if (and (looking-at
+                              "|[ \t]*\\([^| \t][^|]*[^| \t]\\)[ \t]*|")
+                             (= (setq n (1- n)) 0))
+                        (throw 'exit (match-string 1)))))))
+        (progn
+          (insert txt)
+          (org-table-align))
+      (error "No non-empty field found"))))
+
+(defun org-table-check-inside-data-field ()
+  "Is point inside a table data field?
+I.e. not on a hline or before the first or after the last column?"
+  (if (or (not (org-at-table-p))
+          (= (org-table-current-column) 0)
+          (org-at-table-hline-p)
+          (looking-at "[ \t]*$"))
+      (error "Not in table data field")))
+
+(defun org-table-blank-field ()
+  "Blank the current table field."
+  (interactive)
+  (org-table-check-inside-data-field)
+  (skip-chars-backward "^|")
+  (backward-char 1)
+  (if (looking-at "|[^|]+")
+      (let* ((pos (match-beginning 0))
+             (match (match-string 0))
+             (len (length match)))
+        (replace-match (concat "|" (make-string (1- len) ?\ )))
+        (goto-char (+ 2 pos))
+        (substring match 1))))
+
+(defun org-table-get-field (&optional n replace)
+  "Return the value of the field in column N of current row.
+N defaults to current field.
+If REPLACE is a string, replace field with this value.  The return value
+is always the old value."
+  (and n (org-table-goto-column n))
+  (skip-chars-backward "^|")
+  (backward-char 1)
+  (if (looking-at "|[^|\r\n]*")
+      (let* ((pos (match-beginning 0))
+             (len (length (match-string 0)))
+             (val (buffer-substring (1+ pos) (match-end 0))))
+        (if replace
+            (replace-match (concat "|" replace)))
+        (goto-char (+ 2 pos))
+        val)))
+
+(defun org-table-current-column ()
+  "Find out which column we are in.
+When called interactively, column is also displayed in echo area."
+  (interactive)
+  (if (interactive-p) (org-table-check-inside-data-field))
+  (save-excursion
+    (let ((cnt 0) (pos (point)))
+      (beginning-of-line 1)
+      (while (search-forward "|" pos t)
+        (setq cnt (1+ cnt)))
+      (if (interactive-p) (message "This is table column %d" cnt))
+      cnt)))
+
+(defun org-table-goto-column (n &optional on-delim force)
+  "Move the cursor to the Nth column in the current table line.
+With optional argument ON-DELIM, stop with point before the left delimiter
+of the field. 
+If there are less than N fields, just go to after the last delimiter.
+However, when FORCE is non-nil, create new columns if necessary."
+  (let ((pos (point-at-eol)))
+    (beginning-of-line 1)
+    (when (> n 0)
+      (while (and (> (setq n (1- n)) -1)
+                  (or (search-forward "|" pos t)
+                      (and force
+                           (progn (end-of-line 1)
+                                  (skip-chars-backward "^|")
+                                  (insert " |")
+                                  (bachward-char 2) t)))))
+      (when (and force (not (looking-at ".*|")))
+        (save-excursion (end-of-line 1) (insert "|")))
+      (if on-delim
+          (backward-char 1)
+        (if (looking-at " ") (forward-char 1))))))
+
+(defun org-at-table-p (&optional table-type)
+  "Return t if the cursor is inside an org-type table."
+  (if org-enable-table-editor
+      (save-excursion
+        (beginning-of-line 1)
+        (looking-at (if table-type org-table-any-line-regexp
+                      org-table-line-regexp)))
+    nil))
+
+(defun org-table-recognize-table.el ()
+  "If there is a table.el table nearby, recognize it and move into it."
+  (if org-table-tab-recognizes-table.el
+      (if (org-at-table.el-p)
+          (progn
+            (beginning-of-line 1)
+            (if (looking-at org-table-dataline-regexp)
+                nil
+              (if (looking-at org-table1-hline-regexp)
+                  (progn
+                    (beginning-of-line 2)
+                    (if (looking-at org-table-any-border-regexp)
+                        (beginning-of-line -1)))))
+            (if (re-search-forward "|" (org-table-end t) t)
+                (progn
+                  (require 'table)
+                  (if (table--at-cell-p (point))
+                      t
+                    (message "recognizing table.el table...")
+                    (table-recognize-table)
+                    (message "recognizing table.el table...done")))
+              (error "This should not happen..."))
+            t)
+        nil)
+    nil))
+
+(defun org-at-table.el-p ()
+  "Return t if the cursor is inside a table.el-type table."
+  (save-excursion
+    (if (org-at-table-p 'any)
+        (progn
+          (goto-char (org-table-begin 'any))
+          (looking-at org-table1-hline-regexp))
+      nil)))
+
+(defun org-at-table-hline-p ()
+  "Return t if the cursor is inside a hline in a table."
+  (if org-enable-table-editor
+      (save-excursion
+        (beginning-of-line 1)
+        (looking-at org-table-hline-regexp))
+    nil))
+
+(defun org-table-insert-column (&optional arg)
+  "Insert a new column into the table."
+  (interactive "P")
+  (if (not (org-at-table-p))
+      (error "Not at a table"))
+  (org-table-find-dataline)
+  (let* ((col (max 1 (org-table-current-column)))
+         (beg (org-table-begin))
+         (end (org-table-end))
+         ;; Current cursor position
+         (linepos (+ (if (bolp) 1 0) (count-lines (point-min) (point))))
+         (colpos col))
+    (goto-char beg)
+    (while (< (point) end)
+      (if (org-at-table-hline-p)
+          nil
+        (org-table-goto-column col t)
+        (insert "|   "))
+      (beginning-of-line 2))
+    (move-marker end nil)
+    (goto-line linepos)
+    (org-table-goto-column colpos))
+  (org-table-align))
+
+(defun org-table-find-dataline ()
+  "Find a dataline in the current table, which is needed for column commands."
+  (if (and (org-at-table-p)
+           (not (org-at-table-hline-p)))
+      t
+    (let ((col (current-column))
+          (end (org-table-end)))
+      (move-to-column col)
+      (while (and (< (point) end)
+                  (or (not (= (current-column) col))
+                      (org-at-table-hline-p)))
+        (beginning-of-line 2)
+        (move-to-column col))
+      (if (and (org-at-table-p)
+               (not (org-at-table-hline-p)))
+          t
+        (error
+         "Please position cursor in a data line for column operations")))))
+
+(defun org-table-delete-column (&optional arg)
+  "Insert a new column into the table."
+  (interactive "P")
+  (if (not (org-at-table-p))
+      (error "Not at a table"))
+  (org-table-find-dataline)
+  (org-table-check-inside-data-field)
+  (let* ((col (org-table-current-column))
+         (beg (org-table-begin))
+         (end (org-table-end))
+         ;; Current cursor position
+         (linepos (+ (if (bolp) 1 0) (count-lines (point-min) (point))))
+         (colpos col))
+    (goto-char beg)
+    (while (< (point) end)
+      (if (org-at-table-hline-p)
+          nil
+        (org-table-goto-column col t)
+        (and (looking-at "|[^|\n]+|")
+             (replace-match "|")))
+      (beginning-of-line 2))
+    (move-marker end nil)
+    (goto-line linepos)
+    (org-table-goto-column colpos))
+  (org-table-align))
+
+(defun org-table-move-column (&optional left)
+  "Move the current column to the right.  With arg LEFT, move to the left."
+  (interactive "P")
+  (if (not (org-at-table-p))
+      (error "Not at a table"))
+  (org-table-find-dataline)
+  (org-table-check-inside-data-field)
+  (let* ((col (org-table-current-column))
+         (col1 (if left (1- col) col))
+         (beg (org-table-begin))
+         (end (org-table-end))
+         ;; Current cursor position
+         (linepos (+ (if (bolp) 1 0) (count-lines (point-min) (point))))
+         (colpos (if left (1- col) (1+ col))))
+    (if (and left (= col 1))
+        (error "Cannot move column further left"))
+    (if (and (not left) (looking-at "[^|\n]*|[^|\n]*$"))
+        (error "Cannot move column further right"))
+    (goto-char beg)
+    (while (< (point) end)
+      (if (org-at-table-hline-p)
+          nil
+        (org-table-goto-column col1 t)
+        (and (looking-at "|\\([^|\n]+\\)|\\([^|\n]+\\)|")
+             (replace-match "|\\2|\\1|")))
+      (beginning-of-line 2))
+    (move-marker end nil)
+    (goto-line linepos)
+    (org-table-goto-column colpos))
+  (org-table-align))
+
+(defun org-table-move-row (&optional up)
+  "Move the current table line down. With arg UP, move it up."
+  (interactive "P")
+  (let ((col (current-column))
+        (pos (point))
+        (tonew (if up 0 2))
+        txt)
+    (beginning-of-line tonew)
+    (if (not (org-at-table-p))
+        (progn
+          (goto-char pos)
+          (error "Cannot move row further.")))
+    (goto-char pos)
+    (beginning-of-line 1)
+    (setq pos (point))
+    (setq txt (buffer-substring (point) (1+ (point-at-eol))))
+    (delete-region (point) (1+ (point-at-eol)))
+    (beginning-of-line tonew)
+    (insert txt)
+    (beginning-of-line 0)
+    (move-to-column col)))
+
+(defun org-table-insert-row (&optional arg)
+  "Insert a new row above the current line into the table.
+With prefix ARG, insert below the current line."
+  (interactive "P")
+  (if (not (org-at-table-p))
+      (error "Not at a table"))
+  (let ((line (buffer-substring-no-properties (point-at-bol) (point-at-eol))))
+    (if (string-match "^[ \t]*|-" line)
+        (setq line (mapcar (lambda (x) (if (member x '(?| ?+)) ?| ?\ )) line))
+      (setq line (mapcar (lambda (x) (if (equal x ?|) ?| ?\ )) line)))
+    (beginning-of-line (if arg 2 1))
+    (apply 'insert line)
+    (insert "\n")
+    (beginning-of-line 0)
+    (re-search-forward "| ?" (point-at-eol) t)
+    (org-table-align)))
+
+(defun org-table-insert-hline (&optional arg)
+  "Insert a horizontal-line below the current line into the table.
+With prefix ARG, insert above the current line."
+  (interactive "P")
+  (if (not (org-at-table-p))
+      (error "Not at a table"))
+  (let ((line (buffer-substring-no-properties (point-at-bol) (point-at-eol)))
+        (col (current-column))
+        start)
+    (if (string-match "^[ \t]*|-" line)
+        (setq line
+              (mapcar (lambda (x) (if (member x '(?| ?+))
+                                      (prog1 (if start ?+ ?|) (setq start t))
+                                    (if start ?- ?\ )))
+                      line))
+      (setq line
+            (mapcar (lambda (x) (if (equal x ?|)
+                                    (prog1 (if start ?+ ?|) (setq start t))
+                                    (if start ?- ?\ )))
+                    line)))
+    (beginning-of-line (if arg 1 2))
+    (apply 'insert line)
+    (if (equal (char-before (point)) ?+)
+        (progn (backward-delete-char 1) (insert "|")))
+    (insert "\n")
+    (beginning-of-line 0)
+    (move-to-column col)))
+
+(defun org-table-kill-row (&optional arg)
+  "Delete the current row or horizontal line from the table."
+  (interactive "P")
+  (if (not (org-at-table-p))
+      (error "Not at a table"))
+  (let ((col (current-column)))
+    (kill-region (point-at-bol) (min (1+ (point-at-eol)) (point-max)))
+    (if (not (org-at-table-p)) (beginning-of-line 0))
+    (move-to-column col)))
+
+
+(defun org-table-cut-region (&optional arg)
+  "Copy region in table to the clipboard and blank all relevant fields."
+  (interactive "P")
+  (org-table-copy-region 'cut))
+
+(defvar org-table-clip nil
+  "Clipboard for table regions")
+
+(defun org-table-copy-region (&optional cut)
+  "Copy rectangular region in table to clipboard.
+A special clibbooard is used which can only be accessed
+with `org-table-paste-rectangle'"
+  (interactive "P")
+  (unless (org-region-active-p) (error "No active region"))
+  (let* ((beg (region-beginning))
+         (end (region-end))
+         l01 c01 l02 c02 l1 c1 l2 c2 ic1 ic2
+         region cols
+         (rpl (if cut "  " nil)))
+    (goto-char beg)
+    (org-table-check-inside-data-field)
+    (setq l01 (count-lines (point-min) (point))
+          c01 (org-table-current-column)) 
+    (goto-char end)
+    (org-table-check-inside-data-field)
+    (setq l02 (count-lines (point-min) (point))
+          c02 (org-table-current-column))
+    (setq l1 (min l01 l02) l2 (max l01 l02)
+          c1 (min c01 c02) c2 (max c01 c02))
+    (catch 'exit
+      (while t
+        (catch 'nextline
+          (if (> l1 l2) (throw 'exit t))
+          (goto-line l1)
+          (if (org-at-table-hline-p) (throw 'nextline (setq l1 (1+ l1))))
+          (setq cols nil ic1 c1 ic2 c2)
+          (while (< ic1 (1+ ic2))
+            (push (org-table-get-field ic1 rpl) cols)
+            (setq ic1 (1+ ic1)))
+          (push (nreverse cols) region)
+          (setq l1 (1+ l1)))))
+    (setq org-table-clip (nreverse region))
+    (if cut (org-table-align))))
+  
+(defun org-table-paste-rectangle (&optional arg)
+  "Paste a rectangluar region into a table.
+The upper right corner ends up in the current field.  All involved fields
+will be overwritten.  If the rectangle does not fit into the present table,
+the table is enlarged as needed.  The process ignores horizontal separator
+lines."
+  (interactive "P")
+  (unless (and org-table-clip (listp org-table-clip))
+    (error "First cut/copy a region to paste!"))
+  (org-table-check-inside-data-field)
+  (let* ((clip org-table-clip)
+         (line (count-lines (point-min) (point)))
+         (col (org-table-current-column))
+         (l line)
+         (org-enable-table-editor t)
+         (org-table-automatic-realign nil)
+         c cols field)
+    (while (setq cols (pop clip))
+      (while (org-at-table-hline-p) (beginning-of-line 2))
+      (if (not (org-at-table-p))
+          (progn (end-of-line 0) (org-table-next-field)))
+      (setq c col)
+      (while (setq field (pop cols))
+        (org-table-goto-column c nil 'force)
+        (org-table-get-field nil field)
+        (setq c (1+ c)))
+      (beginning-of-line 2))
+    (goto-line line)
+    (org-table-goto-column col)
+    (org-table-align)))
+
+(defun org-table-convert ()
+  "Convert from org-mode table to table.el and back.
+Obviously, this only works within limits.  When an Org-mode table is
+converted to table.el, all horizontal separator lines get lost, because
+table.el uses these as cell boundaries and has no notion of horizontal lines.
+A table.el table can be converted to an Org-mode table only if it does not
+do row or column spanning.  Multiline cells will become multiple cells.
+Beware, Org-mode does not test if the table can be successfully converted - it
+blindly applies a recipe that works for simple tables."
+  (interactive)
+  (require 'table)
+  (if (org-at-table.el-p)
+      ;; convert to Org-mode table
+      (let ((beg (move-marker (make-marker) (org-table-begin t)))
+            (end (move-marker (make-marker) (org-table-end t))))
+        (table-unrecognize-region beg end)
+        (goto-char beg)
+        (while (re-search-forward "^\\([ \t]*\\)\\+-.*\n" end t)
+          (replace-match ""))
+        (goto-char beg))
+    (if (org-at-table-p)
+        ;; convert to table.el table
+        (let ((beg (move-marker (make-marker) (org-table-begin)))
+              (end (move-marker (make-marker) (org-table-end))))
+          ;; first, get rid of all horizontal lines
+          (goto-char beg)
+          (while (re-search-forward "^\\([ \t]*\\)|-.*\n" end t)
+            (replace-match ""))
+          ;; insert a hline before first
+          (goto-char beg)
+          (org-table-insert-hline 'above)
+          ;; insert a hline after each line
+          (while (progn (beginning-of-line 2) (< (point) end))
+            (org-table-insert-hline))
+          (goto-char beg)
+          (setq end (move-marker end (org-table-end)))
+          ;; replace "+" at beginning and ending of hlines
+          (while (re-search-forward "^\\([ \t]*\\)|-" end t)
+            (replace-match "\\1+-"))
+          (goto-char beg)
+          (while (re-search-forward "-|[ \t]*$" end t)
+            (replace-match "-+"))
+          (goto-char beg)))))
+
+(defun org-table-wrap-region (arg)
+  "Wrap several fields in a column like a paragraph.
+This is useful if you'd like to spread the contents of a field over several
+lines, in order to keep the table compact.
+
+If there is an active region, and both point and mark are in the same column,
+the text in the column is wrapped to minimum width for the given number of
+lines.  Generally, this makes the table more compact.  A prefix ARG may be
+used to change the number of desired lines.  For example, `C-2 C-c C-q'
+formats the selected text to two lines.  If the region was longer than 2
+lines, the remaining lines remain empty.  A negative prefix argument reduces
+the current number of lines by that amount.  The wrapped text is pasted back
+into the table.  If you formatted it to more lines than it was before, fields
+further down in the table get overwritten - so you might need to make space in
+the table first.
+
+If there is no region, the current field is split at the cursor position and
+the text fragment to the right of the cursor is prepended to the field one
+line down.
+
+If there is no region, but you specify a prefix ARG, the current field gets
+blank, and the content is appended to the field above."
+  (interactive "P")
+  (org-table-check-inside-data-field)
+  (if (org-region-active-p)
+      ;; There is a region:  fill as a paragraph
+      (let ((beg (region-beginning))
+            nlines)
+        (org-table-cut-region)
+        (if (> (length (car org-table-clip)) 1)
+            (error "Region must be limited to single columm"))
+        (setq nlines (if arg
+                         (if (< arg 1)
+                             (+ (length org-table-clip) arg)
+                           arg)
+                       (length org-table-clip)))
+        (setq org-table-clip 
+              (mapcar 'list (org-wrap (mapconcat 'car org-table-clip " ")
+                                      nil nlines)))
+        (goto-char beg)
+        (org-table-paste-rectangle))
+    ;; No region, split the current field at point
+    (if arg
+        ;; combine with field above
+        (let ((s (org-table-blank-field))
+              (col (org-table-current-column)))
+          (beginning-of-line 0)
+          (while (org-at-table-hline-p) (beginning-of-line 0))
+          (org-table-goto-column col)
+          (skip-chars-forward "^|")
+          (skip-chars-backward " ")
+          (insert " " (org-trim s))
+          (org-table-align))
+      ;;  split field
+      (when (looking-at "\\([^|]+\\)+|")
+        (let ((s (match-string 1)))
+          (replace-match " |")
+          (goto-char (match-beginning 0))
+          (org-table-next-row)
+          (insert (org-trim s) " ")
+          (org-table-align))))))
+
+(defun org-trim (s)
+  "Remove whitespace at beginning and end of string."
+  (if (string-match "^[ \t]+" s) (setq s (replace-match "" t t s)))
+  (if (string-match "[ \t]+$" s) (setq s (replace-match "" t t s))))
+
+(defun org-wrap (string &optional width lines)
+  "Wrap string to either a number of lines, or a with in characters.
+If WIDTH is non-nil, the string is wrapped to that width, however many lines
+that costs.  If there is a work longer than WIDTH, the text is actually
+wrapped to the length of that word.
+IF WIDTH is nil and LINES is non-nil, the string is forced into at mot that
+many lines, whatever width that takes.
+The return value is a list of lines, without newlines at the end."
+  (let* ((words (org-split-string string "[ \t\n]+"))
+         (maxword (apply 'max (mapcar 'length words)))
+         (black (apply '+ (mapcar 'length words)))
+         (total (+ black (length words)))
+         w ll)
+    (cond (width
+           (org-do-wrap words (max maxword width)))
+          (lines
+           (setq w maxword)
+           (setq ll (org-do-wrap words maxword))
+           (if (<= (length ll) lines)
+               ll
+             (setq ll words)
+             (while (> (length ll) lines)
+               (setq w (1+ w))
+               (setq ll (org-do-wrap words w)))
+             ll))
+          (t (error "Cannot wrap this")))))
+           
+
+(defun org-do-wrap (words width)
+  "Creates lines of maximum width WIDTH (in characters) from word list WORDS."
+  (let (lines line)
+    (while words
+      (setq line (pop words))
+      (while (and words (< (+ (length line) (length (car words))) width))
+        (setq line (concat line " " (pop words))))
+      (setq lines (push line lines)))
+    (nreverse lines)))
+
+;; FIXME: I think I can make this more efficient
+(defun org-split-string (string &optional separators)
+  "Splits STRING into substrings at SEPARATORS.
+No empty strings are returned if there are matches at the beginning
+and end of string."
+  (let ((rexp (or separators "[ \f\t\n\r\v]+"))
+	(start 0)
+	notfirst
+	(list nil))
+    (while (and (string-match rexp string
+			      (if (and notfirst
+				       (= start (match-beginning 0))
+				       (< start (length string)))
+				  (1+ start) start))
+		(< (match-beginning 0) (length string)))
+      (setq notfirst t)
+      (or (eq (match-beginning 0) 0)
+	  (and (eq (match-beginning 0) (match-end 0))
+	       (eq (match-beginning 0) start))
+	  (setq list
+		(cons (substring string start (match-beginning 0))
+		      list)))
+      (setq start (match-end 0)))
+    (or (eq start (length string))
+	(setq list
+	      (cons (substring string start)
+		    list)))
+    (nreverse list)))
+
+(defun org-table-add-invisible-to-vertical-lines ()
+  "Add an `invisible' property to vertical lines of current table."
+  (interactive)
+  (let* ((beg (org-table-begin))
+         (end (org-table-end))
+         (end1))
+    (save-excursion
+      (goto-char beg)
+      (while (< (point) end)
+        (setq end1 (point-at-eol))
+        (if (looking-at org-table-dataline-regexp)
+            (while (re-search-forward "|" end1 t)
+              (add-text-properties (1- (point)) (point)
+                                   '(invisible org-table)))
+          (while (re-search-forward "[+|]" end1 t)
+            (add-text-properties (1- (point)) (point)
+                                 '(invisible org-table))))
+        (beginning-of-line 2)))))
+
+(defun org-table-toggle-vline-visibility (&optional arg)
+  "Toggle the visibility of table vertical lines.
+The effect is immediate and on all tables in the file.
+With prefix ARG, make lines invisible when ARG if positive, make lines
+visible when ARG is not positive"
+  (interactive "P")
+  (let ((action (cond
+                 ((and arg (> (prefix-numeric-value arg) 0)) 'on)
+                 ((and arg (< (prefix-numeric-value arg) 1)) 'off)
+                 (t (if (org-in-invisibility-spec-p '(org-table))
+                        'off
+                      'on)))))
+    (if (eq action 'off)
+        (progn
+          (org-remove-from-invisibility-spec '(org-table))
+          (org-table-map-tables 'org-table-align)
+          (message "Vertical table lines visible")
+          (if (org-at-table-p)
+              (org-table-align)))
+      (org-add-to-invisibility-spec '(org-table))
+      (org-table-map-tables 'org-table-align)
+      (message "Vertical table lines invisible"))
+    (redraw-frame (selected-frame))))
+
+(defun org-table-map-tables (function)
+  "Apply FUNCTION to the start of all tables in the  buffer."
+  (save-excursion
+    (save-restriction
+      (widen)
+      (goto-char (point-min))
+      (while (re-search-forward org-table-any-line-regexp nil t)
+        (message "Mapping tables: %d%%" (/ (* 100.0 (point)) (buffer-size)))
+        (beginning-of-line 1)
+        (if (looking-at org-table-line-regexp)
+            (save-excursion (funcall function)))
+        (re-search-forward org-table-any-border-regexp nil 1)))))
+
+(defun org-table-sum ()
+  "Sum numbers in region of current table column.
+The result will be displayed in the echo area, and will be available
+as kill to be inserted with \\[yank].
+
+If there is an active region, it is interpreted as a rectangle and all
+numbers in that rectangle will be summed.  If there is no active
+region and point is located in a table column, sum all numbers in that
+column.
+
+If at least on number looks like a time HH:MM or HH:MM:SS, all other
+numbers are assumed to be times as well (in decimal hours) and the
+numbers are added as such."
+  (interactive)
+  (save-excursion
+    (let (beg end col (timecnt 0) diff h m s)
+      (if (org-region-active-p)
+          (setq beg (region-beginning) end (region-end))
+        (setq col (org-table-current-column))
+        (goto-char (org-table-begin))
+        (unless (re-search-forward "^[ \t]*|[^-]" nil t)
+          (error "No table data"))
+        (org-table-goto-column col)
+        (skip-chars-backward "^|")
+        (setq beg (point))
+        (goto-char (org-table-end))
+        (unless (re-search-backward "^[ \t]*|[^-]" nil t)
+          (error "No table data"))
+        (org-table-goto-column col)
+        (skip-chars-forward "^|")
+        (setq end (point)))
+      (let* ((l1 (progn (goto-char beg)
+                        (+ (if (bolp) 1 0) (count-lines (point-min) (point)))))
+             (l2 (progn (goto-char end)
+                        (+ (if (bolp) 1 0) (count-lines (point-min) (point)))))
+             (items (if (= l1 l2)
+                        (split-string (buffer-substring beg end))
+                      (split-string
+                       (mapconcat 'identity (extract-rectangle beg end) " "))))
+             (numbers (delq nil (mapcar 'org-table-get-number-for-summing
+                                        items)))
+             (res (apply '+ numbers))
+             (sres (if (= timecnt 0)
+                       (format "%g" res)
+                     (setq diff (* 3600 res)
+                           h (floor (/ diff 3600)) diff (mod diff 3600)
+                           m (floor (/ diff 60)) diff (mod diff 60)
+                           s diff)
+                     (format "%d:%02d:%02d" h m s))))
+        (kill-new sres)
+        (message (substitute-command-keys
+                  (format "Sum of %d items: %-20s     (\\[yank] will insert result into buffer)"
+                          (length numbers) sres)))))))
+
+(defun org-table-get-number-for-summing (s)
+  (let (n)
+    (if (string-match "^ *|? *" s)
+        (setq s (replace-match "" nil nil s)))
+    (if (string-match " *|? *$" s)
+        (setq s (replace-match "" nil nil s)))
+    (setq n (string-to-number s))
+    (cond
+     ((and (string-match "0" s)
+           (string-match "\\`[-+ \t0.edED]+\\'" s)) 0)
+     ((string-match "\\`[ \t]+\\'" s)         nil)
+     ((string-match "\\`\\([0-9]+\\):\\([0-9]+\\)\\(:\\([0-9]+\\)\\)?\\'" s)
+      (let ((h (string-to-number (or (match-string 1 s) "0")))
+            (m (string-to-number (or (match-string 2 s) "0")))
+            (s (string-to-number (or (match-string 4 s) "0"))))
+        (if (boundp 'timecnt) (setq timecnt (1+ timecnt)))
+        (* 1.0 (+ h (/ m 60.0) (/ s 3600.0)))))
+     ((equal n 0)                             nil)
+     (t n))))
+
+(defvar org-table-current-formula nil)
+(defvar org-table-formula-history nil)
+(defun org-table-get-formula (current)
+  (if (and current (not (equal "" org-table-current-formula)))
+      org-table-current-formula
+    (setq org-table-current-formula
+          (read-string
+           "Formula [last]: " "" 'org-table-formula-history
+           org-table-current-formula))))
+
+(defun org-this-word ()
+  ;; Get the current word
+  (save-excursion
+    (let ((beg (progn (skip-chars-backward "^ \t\n") (point)))
+          (end (progn (skip-chars-forward "^ \t\n") (point))))
+      (buffer-substring-no-properties beg end))))
+
+(defun org-table-eval-formula (&optional ndown)
+  "Replace the table field value at the cursor by the result of a calculation.
+
+This function makes use of Dave Gillespie's calc package, arguably the most
+exciting program ever written for GNU Emacs.  So you need to have calc
+installed in order to use this function.
+
+In a table, this command replaces the value in the current field with the
+result of a formula.  While nowhere near the computation options of a
+spreadsheet program, this is still very useful.  Note that there is no
+automatic updating of a calculated field, nor will the field remember the
+formula.  The command needs to be applied again after changing input
+fields.
+
+When called, the command first prompts for a formula, which is read in the
+minibuffer.  Previously entered formulae are available through the history
+list, and the last used formula is the default, reachable by simply
+pressing RET.
+
+The formula can be any algebraic expression understood by the calc package.
+Before evaluation, variable substitution takes place: \"$\" is replaced by
+the field the cursor is currently in, and $1..$n reference the fields in
+the current row.  Values from a *different* row can *not* be referenced
+here, so the command supports only horizontal computing.  The formula can
+contain an optional printf format specifier after a semicolon, to reformat
+the result.
+
+A few examples for formulae:
+  $1+$2               Sum of first and second field
+  $1+$2;%f.2          Same, and format result to two digits after dec.point
+  exp($2)+exp($1)     Math functions can be used
+  $;%f.1              Reformat current cell to 1 digit after dec.point
+  ($3-32)*5/9         degrees F -> C conversion
+
+When called with a raw C-u prefix, the formula is applied to the current
+field, and to the same same column in all following rows, until reaching a
+horizontal line or the end of the table.  When the command is called with a
+numeric prefix argument (like M-3 or C-7 or C-u 24), the formula is applied
+to the current row, and to the following n-1 rows (but not beyond a
+separator line)."
+  (interactive "P")
+  (setq ndown (if (equal ndown '(4)) 10000 (prefix-numeric-value ndown)))
+  (require 'calc)
+  (org-table-check-inside-data-field)
+  (let* (fields
+         (org-table-automatic-realign nil)
+         (down (> ndown 1))
+         (formula (org-table-get-formula nil))
+         (n0 (org-table-current-column))
+         n form fmt x ev)
+    (if (string-match ";" formula)
+        (let ((tmp (org-split-string formula ";")))
+          (setq formula (car tmp) fmt (nth 1 tmp))))
+    (while (> ndown 0)
+      (setq fields (org-split-string
+                    (concat " " (buffer-substring
+                                 (point-at-bol) (point-at-eol))) "|"))
+      (setq ndown (1- ndown))
+      (setq form (copy-sequence formula))
+      (while (string-match "\\$\\([0-9]+\\)?" form)
+        (setq n (if (match-beginning 1)
+                    (string-to-int (match-string 1 form))
+                  n0)
+              x (nth n fields))
+        (unless x (error "Illegal field specifier \"%s\""
+                         (match-string 0 form)))
+        (if (equal (string-to-number x) 0) (setq x "0"))
+        (setq form (replace-match x t t form)))
+      (setq ev (calc-eval (list form) 'num))
+      (if (listp ev)
+          (error "Illegal expression: %s (%s at %d)" form (nth 1 ev) (car ev)))
+      (org-table-blank-field)
+      (if fmt
+          (insert (format fmt (string-to-number ev)))
+        (insert ev))
+      (if (and down (> ndown 0) (looking-at ".*\n[ \t]*|[^-]"))
+          (call-interactively 'org-return)
+        (setq ndown 0)))
+    (org-table-align)))
+
+;;; Exporting
+
+(defconst org-level-max 20)
+
+(defun org-export-find-first-heading-line (list)
+  "Remove all lines from LIST which are before  the first headline."
+  (let ((orig-list list)
+        (re (concat "^" outline-regexp)))
+    (while (and list
+                (not (string-match re (car list))))
+      (pop list))
+    (or list orig-list)))
+
+(defun org-skip-comments (lines)
+  "Skip lines starting with \"#\" and subtrees starting with COMMENT."
+  (let ((re1 (concat "^\\(\\*+\\)[ \t]+" org-comment-string))
+        (re2 "^\\(\\*+\\)[ \t\n\r]")
+        rtn line level)
+    (while (setq line (pop lines))
+      (cond
+       ((and (string-match re1 line)
+             (setq level (- (match-end 1) (match-beginning 1))))
+        ;; Beginning of a COMMENT subtree.  Skip it.
+        (while (and (setq line (pop lines))
+                    (or (not (string-match re2 line))
+                        (> (- (match-end 1) (match-beginning 1)) level))))
+        (setq lines (cons line lines)))
+       ((string-match "^#" line)
+        ;; an ordinary comment line
+        )
+       (t (setq rtn (cons line rtn)))))
+    (nreverse rtn)))
+
+;; ASCII
+
+(defconst org-ascii-underline '(?\$ ?\# ?^ ?\~ ?\= ?\-)
+  "Characters for underlining headings in ASCII export.")
+
+(defconst org-html-entities
+  '(("nbsp")
+    ("iexcl")
+    ("cent")
+    ("pound")
+    ("curren")
+    ("yen")
+    ("brvbar")
+    ("sect")
+    ("uml")
+    ("copy")
+    ("ordf")
+    ("laquo")
+    ("not")
+    ("shy")
+    ("reg")
+    ("macr")
+    ("deg")
+    ("plusmn")
+    ("sup2")
+    ("sup3")
+    ("acute")
+    ("micro")
+    ("para")
+    ("middot")
+    ("odot"."o")
+    ("star"."*")
+    ("cedil")
+    ("sup1")
+    ("ordm")
+    ("raquo")
+    ("frac14")
+    ("frac12")
+    ("frac34")
+    ("iquest")
+    ("Agrave")
+    ("Aacute")
+    ("Acirc")
+    ("Atilde")
+    ("Auml")
+    ("Aring") ("AA"."&Aring;")
+    ("AElig")
+    ("Ccedil")
+    ("Egrave")
+    ("Eacute")
+    ("Ecirc")
+    ("Euml")
+    ("Igrave")
+    ("Iacute")
+    ("Icirc")
+    ("Iuml")
+    ("ETH")
+    ("Ntilde")
+    ("Ograve")
+    ("Oacute")
+    ("Ocirc")
+    ("Otilde")
+    ("Ouml")
+    ("times")
+    ("Oslash")
+    ("Ugrave")
+    ("Uacute")
+    ("Ucirc")
+    ("Uuml")
+    ("Yacute")
+    ("THORN")
+    ("szlig")
+    ("agrave")
+    ("aacute")
+    ("acirc")
+    ("atilde")
+    ("auml")
+    ("aring")
+    ("aelig")
+    ("ccedil")
+    ("egrave")
+    ("eacute")
+    ("ecirc")
+    ("euml")
+    ("igrave")
+    ("iacute")
+    ("icirc")
+    ("iuml")
+    ("eth")
+    ("ntilde")
+    ("ograve")
+    ("oacute")
+    ("ocirc")
+    ("otilde")
+    ("ouml")
+    ("divide")
+    ("oslash")
+    ("ugrave")
+    ("uacute")
+    ("ucirc")
+    ("uuml")
+    ("yacute")
+    ("thorn")
+    ("yuml")
+    ("fnof")
+    ("Alpha")
+    ("Beta")
+    ("Gamma")
+    ("Delta")
+    ("Epsilon")
+    ("Zeta")
+    ("Eta")
+    ("Theta")
+    ("Iota")
+    ("Kappa")
+    ("Lambda")
+    ("Mu")
+    ("Nu")
+    ("Xi")
+    ("Omicron")
+    ("Pi")
+    ("Rho")
+    ("Sigma")
+    ("Tau")
+    ("Upsilon")
+    ("Phi")
+    ("Chi")
+    ("Psi")
+    ("Omega")
+    ("alpha")
+    ("beta")
+    ("gamma")
+    ("delta")
+    ("epsilon")
+    ("varepsilon"."&epsilon;")
+    ("zeta")
+    ("eta")
+    ("theta")
+    ("iota")
+    ("kappa")
+    ("lambda")
+    ("mu")
+    ("nu")
+    ("xi")
+    ("omicron")
+    ("pi")
+    ("rho")
+    ("sigmaf") ("varsigma"."&sigmaf;")
+    ("sigma")
+    ("tau")
+    ("upsilon")
+    ("phi")
+    ("chi")
+    ("psi")
+    ("omega")
+    ("thetasym") ("vartheta"."&thetasym;")
+    ("upsih")
+    ("piv")
+    ("bull") ("bullet"."&bull;")
+    ("hellip") ("dots"."&hellip;")
+    ("prime")
+    ("Prime")
+    ("oline")
+    ("frasl")
+    ("weierp")
+    ("image")
+    ("real")
+    ("trade")
+    ("alefsym")
+    ("larr") ("leftarrow"."&larr;") ("gets"."&larr;")
+    ("uarr") ("uparrow"."&uarr;")
+    ("rarr") ("to"."&rarr;") ("rightarrow"."&rarr;")
+    ("darr")("downarrow"."&darr;")
+    ("harr") ("leftrightarrow"."&harr;")
+    ("crarr") ("hookleftarrow"."&crarr;") ; has round hook, not quite CR
+    ("lArr") ("Leftarrow"."&lArr;")
+    ("uArr") ("Uparrow"."&uArr;")
+    ("rArr") ("Rightarrow"."&rArr;")
+    ("dArr") ("Downarrow"."&dArr;")
+    ("hArr") ("Leftrightarrow"."&hArr;")
+    ("forall")
+    ("part") ("partial"."&part;")
+    ("exist") ("exists"."&exist;")
+    ("empty") ("emptyset"."&empty;")
+    ("nabla")
+    ("isin") ("in"."&isin;")
+    ("notin")
+    ("ni")
+    ("prod")
+    ("sum")
+    ("minus")
+    ("lowast") ("ast"."&lowast;")
+    ("radic")
+    ("prop") ("proptp"."&prop;")
+    ("infin") ("infty"."&infin;")
+    ("ang") ("angle"."&ang;")
+    ("and") ("vee"."&and;")
+    ("or") ("wedge"."&or;")
+    ("cap")
+    ("cup")
+    ("int")
+    ("there4")
+    ("sim")
+    ("cong") ("simeq"."&cong;")
+    ("asymp")("approx"."&asymp;")
+    ("ne") ("neq"."&ne;")
+    ("equiv")
+    ("le")
+    ("ge")
+    ("sub") ("subset"."&sub;")
+    ("sup") ("supset"."&sup;")
+    ("nsub")
+    ("sube")
+    ("supe")
+    ("oplus")
+    ("otimes")
+    ("perp")
+    ("sdot") ("cdot"."&sdot;")
+    ("lceil")
+    ("rceil")
+    ("lfloor")
+    ("rfloor")
+    ("lang")
+    ("rang")
+    ("loz") ("Diamond"."&loz;")
+    ("spades") ("spadesuit"."&spades;")
+    ("clubs") ("clubsuit"."&clubs;")
+    ("hearts") ("diamondsuit"."&hearts;")
+    ("diams") ("diamondsuit"."&diams;")
+    ("quot")
+    ("amp")
+    ("lt")
+    ("gt")
+    ("OElig")
+    ("oelig")
+    ("Scaron")
+    ("scaron")
+    ("Yuml")
+    ("circ")
+    ("tilde")
+    ("ensp")
+    ("emsp")
+    ("thinsp")
+    ("zwnj")
+    ("zwj")
+    ("lrm")
+    ("rlm")
+    ("ndash")
+    ("mdash")
+    ("lsquo")
+    ("rsquo")
+    ("sbquo")
+    ("ldquo")
+    ("rdquo")
+    ("bdquo")
+    ("dagger")
+    ("Dagger")
+    ("permil")
+    ("lsaquo")
+    ("rsaquo")
+    ("euro")
+
+    ("arccos"."arccos")
+    ("arcsin"."arcsin")
+    ("arctan"."arctan")
+    ("arg"."arg")
+    ("cos"."cos")
+    ("cosh"."cosh")
+    ("cot"."cot")
+    ("coth"."coth")
+    ("csc"."csc")
+    ("deg"."deg")
+    ("det"."det")
+    ("dim"."dim")
+    ("exp"."exp")
+    ("gcd"."gcd")
+    ("hom"."hom")
+    ("inf"."inf")
+    ("ker"."ker")
+    ("lg"."lg")
+    ("lim"."lim")
+    ("liminf"."liminf")
+    ("limsup"."limsup")
+    ("ln"."ln")
+    ("log"."log")
+    ("max"."max")
+    ("min"."min")
+    ("Pr"."Pr")
+    ("sec"."sec")
+    ("sin"."sin")
+    ("sinh"."sinh")
+    ("sup"."sup")
+    ("tan"."tan")
+    ("tanh"."tanh")
+    )
+  "Entities for TeX->HTML translation.
+Entries can be like (\"ent\"), in which case \"\\ent\" will be translated to
+\"&ent;\".  An entry can also be a dotted pair like (\"ent\".\"&other;\").
+In that case, \"\\ent\" will be translated to \"&other;\".
+The list contains HTML entities for Latin-1, Greek and other symbols.
+It is supplemented by a number of commonly used TeX macros with appropriate
+translations.")
+
+(defun org-export-as-ascii (arg)
+  "Export the outline as a pretty ASCII file.
+If there is an active region, export only the region.
+The prefix ARG specifies how many levels of the outline should become
+underlined headlines.  The default is 3."
+  (interactive "P")
+  (setq-default org-todo-line-regexp org-todo-line-regexp)
+  (let* ((region
+          (buffer-substring
+           (if (org-region-active-p) (region-beginning) (point-min))
+           (if (org-region-active-p) (region-end) (point-max))))
+         (lines (org-export-find-first-heading-line
+                 (org-skip-comments (org-split-string region "[\r\n]"))))
+         (org-startup-with-deadline-check nil)
+         (level 0) line txt
+         (umax nil)
+         (case-fold-search nil)
+         (filename (concat (file-name-sans-extension (buffer-file-name))
+                           ".txt"))
+         (buffer (find-file-noselect filename))
+         (levels-open (make-vector org-level-max nil))
+	 (date  (format-time-string "%Y/%m/%d" (current-time)))
+	 (time  (format-time-string "%X" (current-time)))
+         (author      user-full-name)
+	 (title       (buffer-name))
+         (options     nil)
+	 (email       user-mail-address)
+         (language    org-export-default-language)
+	 (text        nil)
+         (last-level  1)
+         (todo nil)
+         (lang-words nil))
+
+    (org-init-section-numbers)
+
+    (find-file-noselect filename)
+
+    ;; Search for the export key lines
+    (org-parse-key-lines)
+
+    (setq lang-words (or (assoc language org-export-language-setup)
+                         (assoc "en" org-export-language-setup)))
+    (if org-export-ascii-show-new-buffer
+	(switch-to-buffer-other-window buffer)
+      (set-buffer buffer))
+    (erase-buffer)
+    (fundamental-mode)
+    (if options (org-parse-export-options options))
+    (setq umax (if arg (prefix-numeric-value arg)
+                 org-export-headline-levels))
+
+    ;; File header
+    (if title (org-insert-centered title ?=))
+    (insert "\n")
+    (if (or author email)
+        (insert (concat (nth 1 lang-words) ": " (or author "")
+                        (if email (concat " <" email ">") "")
+                        "\n")))
+    (if (and date time)
+        (insert (concat (nth 2 lang-words) ": " date " " time "\n")))
+    (if text (insert (concat (org-html-expand-for-ascii text) "\n\n")))
+
+    (insert "\n\n")
+
+    (if org-export-with-toc
+        (progn
+          (insert (nth 3 lang-words) "\n"
+                  (make-string (length (nth 3 lang-words)) ?=) "\n")
+          (mapcar '(lambda (line)
+		     (if (string-match org-todo-line-regexp
+                                       line)
+			 ;; This is a headline
+			 (progn
+			   (setq level (- (match-end 1) (match-beginning 1))
+				 txt (match-string 3 line)
+                                 todo
+                                 (or (and (match-beginning 2)
+                                          (not (equal (match-string 2 line)
+                                                      org-done-string)))
+                                        ; TODO, not DONE
+                                     (and (= level umax)
+                                          (org-search-todo-below
+                                           line lines level))))
+                           (setq txt (org-html-expand-for-ascii txt))
+
+                           (if org-export-with-section-numbers
+                               (setq txt (concat (org-section-number level)
+                                                 " " txt)))
+			   (if (<= level umax)
+			       (progn
+				 (insert
+                                  (make-string (* (1- level) 4) ?\ )
+				  (format (if todo "%s (*)\n" "%s\n") txt))
+				 (setq last-level level))
+			     ))))
+		  lines)))
+
+    (org-init-section-numbers)
+    (while (setq line (pop lines))
+      ;; Remove the quoted HTML tags.
+      (setq line (org-html-expand-for-ascii line))
+      (cond
+       ((string-match "^\\(\\*+\\)[ \t]*\\(.*\\)" line)
+        ;; a Headline
+        (setq level (- (match-end 1) (match-beginning 1))
+              txt (match-string 2 line))
+        (org-ascii-level-start level txt umax))
+       (t (insert line "\n"))))
+    (normal-mode)
+    (save-buffer)
+    (goto-char (point-min))))
+
+(defun org-search-todo-below (line lines level)
+  "Search the subtree below LINE for any TODO entries."
+  (let ((rest (cdr (memq line lines)))
+        (re org-todo-line-regexp)
+        line lv todo)
+    (catch 'exit
+      (while (setq line (pop rest))
+        (if (string-match re line)
+            (progn
+              (setq lv (- (match-end 1) (match-beginning 1))
+                    todo (and (match-beginning 2)
+                              (not (equal (match-string 2 line)
+                                          org-done-string))))
+                                        ; TODO, not DONE
+              (if (<= lv level) (throw 'exit nil))
+              (if todo (throw 'exit t))))))))
+
+;; FIXME: Try to handle <b> and <i> as faces via text properties.
+;; FIXME: Can I implement *bold*,/italic/ and _underline_ for AXCII export?
+(defun org-html-expand-for-ascii (line)
+  "Handle quoted HTML for ASCII export."
+  (if org-export-html-expand
+      (while (string-match "@<[^<>\n]*>" line)
+        ;; We just remove the tags for now.
+        (setq line (replace-match "" nil nil line))))
+  line)
+
+(defun org-insert-centered (s &optional underline)
+  "Insert the string S centered and underline it with character UNDERLINE."
+  (let ((ind (max (/ (- 80 (length s)) 2) 0)))
+    (insert (make-string ind ?\ ) s "\n")
+    (if underline
+        (insert (make-string ind ?\ )
+                (make-string (length s) underline)
+                "\n"))))
+
+(defun org-ascii-level-start (level title umax)
+  "Insert a new level in ASCII export."
+  (let (char)
+    (if (> level umax)
+        (insert (make-string (* 2 (- level umax 1)) ?\ ) "* " title "\n")
+      (if (or (not (equal (char-before) ?\n))
+              (not (equal (char-before (1- (point))) ?\n)))
+          (insert "\n"))
+      (setq char (nth (- umax level) (reverse org-ascii-underline)))
+      (if org-export-with-section-numbers
+          (setq title (concat (org-section-number level) " " title)))
+      (insert title "\n" (make-string (length title) char) "\n"))))
+
+;; HTML
+
+(defun org-get-current-options ()
+  "Return a string with current options as keyword options.
+Does include HTML export options as well as TODO and CATEGORY stuff."
+  (format
+   "#+TITLE:     %s
+#+AUTHOR:    %s
+#+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 *:%s TeX:%s
+#+CATEGORY:  %s
+#+SEQ_TODO:  %s
+#+TYP_TODO:  %s
+"
+   (buffer-name) (user-full-name) user-mail-address org-export-default-language
+   org-export-headline-levels
+   org-export-with-section-numbers
+   org-export-with-toc
+   org-export-preserve-breaks
+   org-export-html-expand
+   org-export-with-fixed-width
+   org-export-with-tables
+   org-export-with-sub-superscripts
+   org-export-with-emphasize
+   org-export-with-TeX-macros
+   (file-name-nondirectory (buffer-file-name))
+   (if (equal org-todo-interpretation 'sequence)
+       (mapconcat 'identity org-todo-keywords " ")
+     "TODO FEEDBACK VERIFY DONE")
+   (if (equal org-todo-interpretation 'type)
+       (mapconcat 'identity org-todo-keywords " ")
+     "Me Jason Marie DONE")))
+
+(defun org-insert-export-options-template ()
+  "Insert into the buffer a template with information for exporting."
+  (interactive)
+  (if (not (bolp)) (newline))
+  (let ((s (org-get-current-options)))
+    (and (string-match "#\\+CATEGORY" s)
+         (setq s (substring s 0 (match-beginning 0))))
+    (insert s)))
+
+(defun org-toggle-fixed-width-section (arg)
+  "Toggle the fixed-width indicator at the beginning of lines in the region.
+If there is no active region, only acts on the current line.
+If the first non-white  character in the first line of the region is a
+vertical bar \"|\", then the command removes the bar from all lines in
+the region.  If the first character is not a bar, the command adds a
+bar to all lines, in the column given by the beginning of the region.
+
+If there is a numerical prefix ARG, create ARG new lines starting with \"|\"."
+  (interactive "P")
+  (let* ((cc 0)
+         (regionp (org-region-active-p))
+         (beg (if regionp (region-beginning) (point)))
+         (end (if regionp (region-end)))
+         (nlines (or arg (if (and beg end) (count-lines beg end) 1)))
+         (re "[ \t]*\\(:\\)")
+         off)
+    (save-excursion
+      (goto-char beg)
+      (setq cc (current-column))
+      (beginning-of-line 1)
+      (setq off (looking-at re))
+      (while (> nlines 0)
+        (setq nlines (1- nlines))
+        (beginning-of-line 1)
+        (cond
+         (arg
+          (move-to-column cc t)
+          (insert ":\n")
+          (forward-line -1))
+         ((and off (looking-at re))
+          (replace-match "" t t nil 1))
+         ((not off) (move-to-column cc t) (insert ":")))
+        (forward-line 1)))))
+
+(defun org-export-as-html-and-open (arg)
+  "Export the outline as HTML and immediately open it with a browser.
+If there is an active region, export only the region.
+The prefix ARG specifies how many levels of the outline should become
+headlines.  The default is 3.  Lower levels will become bulleted lists."
+  (interactive "P")
+  (org-export-as-html arg 'hidden)
+  (org-open-file (buffer-file-name)))
+
+(defun org-export-as-html-batch ()
+  "Call org-export-as-html, may be used in batch processing as
+emacs 	--batch
+	--load=$HOME/lib/emacs/org.el
+	--eval \"(setq org-export-headline-levels 2)\"
+	--visit=MyFile --funcall org-export-as-html-batch"
+  (org-export-as-html org-export-headline-levels 'hidden))
+
+(defun org-export-as-html (arg &optional hidden)
+  "Export the outline as a pretty HTML file.
+If there is an active region, export only the region.
+The prefix ARG specifies how many levels of the outline should become
+headlines.  The default is 3.  Lower levels will become bulleted lists."
+  (interactive "P")
+  (setq-default org-todo-line-regexp org-todo-line-regexp)
+  (setq-default org-deadline-line-regexp org-deadline-line-regexp)
+  (setq-default org-done-string org-done-string)
+  (let* ((region-p (org-region-active-p))
+         (region
+          (buffer-substring
+           (if region-p (region-beginning) (point-min))
+           (if region-p (region-end) (point-max))))
+         (all_lines
+          (org-skip-comments (org-split-string region "[\r\n]")))
+         (lines (org-export-find-first-heading-line all_lines))
+         (level 0) (line "") (origline "") txt todo
+	 (last-level 1)
+         (umax nil)
+         (filename (concat (file-name-sans-extension (buffer-file-name))
+                           ".html"))
+         (buffer (find-file-noselect filename))
+         (levels-open (make-vector org-level-max nil))
+	 (date  (format-time-string "%Y/%m/%d" (current-time)))
+	 (time  (format-time-string "%X" (current-time)))
+         (author      user-full-name)
+	 (title       (buffer-name))
+         (options     nil)
+	 (email       user-mail-address)
+         (language    org-export-default-language)
+	 (text        nil)
+         (lang-words  nil)
+	 (head-count  0) cnt
+         table-open type
+         table-buffer table-orig-buffer
+	 )
+    (message "Exporting...")
+
+    (org-init-section-numbers)
+
+    ;; Search for the export key lines
+    (org-parse-key-lines)
+    (setq lang-words (or (assoc language org-export-language-setup)
+                         (assoc "en" org-export-language-setup)))
+
+    ;; Switch to the output buffer
+    (if (or hidden (not org-export-html-show-new-buffer))
+        (set-buffer buffer)
+      (switch-to-buffer-other-window buffer))
+    (erase-buffer)
+    (fundamental-mode)
+    (let ((case-fold-search nil))
+      (if options (org-parse-export-options options))
+      (setq umax (if arg (prefix-numeric-value arg)
+                   org-export-headline-levels))
+
+      ;; File header
+      (insert (format
+               "<html lang=\"%s\"><head>
+<title>%s</title>
+<meta http-equiv=\"Content-Type\" content=\"text/html\">
+<meta name=generator content=\"Org-mode\">
+<meta name=generated content=\"%s %s\">
+<meta name=author content=\"%s\">
+</head><body>
+"
+         language (org-html-expand title) date time author))
+      (if title     (insert (concat "<H1 align=\"center\">"
+                                    (org-html-expand title) "</H1>\n")))
+      (if author    (insert (concat (nth 1 lang-words) ": " author "\n")))
+      (if email	  (insert (concat "<a href=\"mailto:" email "\">&lt;"
+                                  email "&gt;</a>\n")))
+      (if (or author email) (insert "<br>\n"))
+      (if (and date time) (insert (concat (nth 2 lang-words) ": "
+                                          date " " time "<br>\n")))
+      (if text      (insert (concat "<p>\n" (org-html-expand text))))
+      (if org-export-with-toc
+          (progn
+            (insert (format "<H2>%s</H2>\n" (nth 3 lang-words)))
+            (insert "<ul>\n")
+            (mapcar '(lambda (line)
+                       (if (string-match org-todo-line-regexp line)
+                           ;; This is a headline
+                           (progn
+                             (setq level (- (match-end 1) (match-beginning 1))
+                                   txt (save-match-data 
+                                         (org-html-expand
+                                          (match-string 3 line)))
+                                   todo
+                                   (or (and (match-beginning 2)
+                                            (not (equal (match-string 2 line)
+                                                        org-done-string)))
+                                        ; TODO, not DONE
+                                       (and (= level umax)
+                                            (org-search-todo-below
+                                             line lines level))))
+                             (if org-export-with-section-numbers
+                                 (setq txt (concat (org-section-number level)
+                                                   " " txt)))
+                             (if (<= level umax)
+                                 (progn
+                                   (setq head-count (+ head-count 1))
+                                   (if (> level last-level)
+                                       (progn
+                                         (setq cnt (- level last-level))
+                                         (while (>= (setq cnt (1- cnt)) 0)
+                                           (insert "<ul>"))
+                                         (insert "\n")))
+                                   (if (< level last-level)
+                                       (progn
+                                         (setq cnt (- last-level level))
+                                         (while (>= (setq cnt (1- cnt)) 0)
+                                           (insert "</ul>"))
+                                         (insert "\n")))
+                                   (insert
+                                    (format
+                                     (if todo
+                                         "<li><a href=\"#sec-%d\"><span style='color:red'>%s</span></a></li>\n"
+                                       "<li><a href=\"#sec-%d\">%s</a></li>\n")
+                                     head-count txt))
+                                   (setq last-level level))
+                               ))))
+                    lines)
+            (while (> last-level 0)
+              (setq last-level (1- last-level))
+              (insert "</ul>\n"))
+            ))
+      (setq head-count 0)
+      (org-init-section-numbers)
+
+      (while (setq line (pop lines) origline line)
+        ;; replace "<" and ">" by "&lt;" and "&gt;"
+        ;; handle @<..> HTML tags (replace "@&gt;..&lt;" by "<..>")
+        (setq line (org-html-expand line))
+
+        ;; Verbatim lines
+        (if (and org-export-with-fixed-width
+                 (string-match "^[ \t]*:\\(.*\\)" line))
+            (progn
+              (let ((l (match-string 1 line)))
+                (while (string-match " " l)
+                  (setq l (replace-match "&nbsp;" t t l)))
+                (insert "\n<span style='font-family:Courier'>"
+                        l "</span>"
+                        (if (and lines
+                                 (not (string-match "^[ \t]+\\(:.*\\)"
+                                                    (car lines))))
+                            "<br>\n" "\n"))))
+
+          (when (string-match org-link-regexp line)
+            (setq type (match-string 1 line))
+            (cond
+             ((member type '("http" "https" "ftp" "mailto" "news"))
+              ;; standard URL
+              (setq line (replace-match
+                          "<a href=\"\\1:\\2\">&lt;\\1:\\2&gt;</a>"
+                          nil nil line)))
+             ((string= type "file")
+              ;; FILE link
+
+	      (let* ((filename (match-string 2 line))
+		     (file-is-image-p
+		      (save-match-data
+			(string-match (org-image-file-name-regexp) filename))))
+		(setq line (replace-match
+			    (if (and org-export-html-inline-images
+                                     file-is-image-p)
+                                "<img src=\"\\2\"/>"
+			      "<a href=\"\\2\">\\1:\\2</a>")
+                            nil nil line))))
+
+             ((member type '("bbdb" "vm" "wl" "rmail" "gnus" "shell"))
+              (setq line (replace-match
+                          "<i>&lt;\\1:\\2&gt;</i>" nil nil line)))))
+
+          ;; TODO items
+          (if (and (string-match org-todo-line-regexp line)
+                   (match-beginning 2))
+              (if (equal (match-string 2 line) org-done-string)
+                  (setq line (replace-match
+                              "<span style='color:green'>\\2</span>"
+                              nil nil line 2))
+                (setq line (replace-match "<span style='color:red'>\\2</span>"
+                                          nil nil line 2))))
+
+          ;; DEADLINES
+          (if (string-match org-deadline-line-regexp line)
+              (progn
+              (if (save-match-data
+                    (string-match "<a href"
+                                  (substring line 0 (match-beginning 0))))
+                  nil  ; Don't do the replacement - it is inside a link
+                (setq line (replace-match "<span style='color:red'>\\&</span>"
+                                          nil nil line 1)))))
+
+          (cond
+           ((string-match "^\\(\\*+\\)[ \t]*\\(.*\\)" line)
+            ;; This is a headline
+            (setq level (- (match-end 1) (match-beginning 1))
+                  txt (match-string 2 line))
+            (if (<= level umax) (setq head-count (+ head-count 1)))
+            (org-html-level-start level txt umax
+                                  (and org-export-with-toc (<= level umax))
+                                  head-count))
+
+           ((and org-export-with-tables
+                 (string-match "^\\([ \t]*\\)\\(|\\|\\+-+\\+\\)" line))
+            (if (not table-open)
+                ;; New table starts
+                (setq table-open t table-buffer nil table-orig-buffer nil))
+            ;; Accumulate lines
+            (setq table-buffer (cons line table-buffer)
+                  table-orig-buffer (cons origline table-orig-buffer))
+            (when (or (not lines)
+                      (not (string-match "^\\([ \t]*\\)\\(|\\|\\+-+\\+\\)"
+                                         (car lines))))
+              (setq table-open nil
+                    table-buffer (nreverse table-buffer)
+                    table-orig-buffer (nreverse table-orig-buffer))
+              (insert (org-format-table-html table-buffer table-orig-buffer))))
+           (t
+            ;; Normal lines
+            ;; Lines starting with "-", and empty lines make new paragraph.
+            (if (string-match "^ *-\\|^[ \t]*$" line) (insert "<p>"))
+            (insert line (if org-export-preserve-breaks "<br>\n" "\n"))))
+          ))
+      (if org-export-html-with-timestamp
+          (insert org-export-html-html-helper-timestamp))
+      (insert "</body>\n</html>\n")
+      (normal-mode)
+      (save-buffer)
+      (goto-char (point-min)))))
+
+(defun org-format-table-html (lines olines)
+  "Find out which HTML converter to use and return the HTML code."
+  (if (string-match "^[ \t]*|" (car lines))
+      ;; A normal org table
+      (org-format-org-table-html lines)
+    ;; Table made by table.el - test for spanning
+    (let* ((hlines (delq nil (mapcar
+                              (lambda (x)
+                                (if (string-match "^[ \t]*\\+-" x) x
+                                  nil))
+                              lines)))
+           (first (car hlines))
+           (ll (and (string-match "\\S-+" first)
+                    (match-string 0 first)))
+           (re (concat "^[ \t]*" (regexp-quote ll)))
+           (spanning (delq nil (mapcar (lambda (x) (not (string-match re x)))
+                                       hlines))))
+      (if (and (not spanning)
+               (not org-export-prefer-native-exporter-for-tables))
+          ;; We can use my own converter with HTML conversions
+          (org-format-table-table-html lines)
+        ;; Need to use the code generator in table.el, with the original text.
+        (org-format-table-table-html-using-table-generate-source olines)))))
+
+(defun org-format-org-table-html (lines)
+  "Format a table into html."
+  (if (string-match "^[ \t]*|-" (car lines)) (setq lines (cdr lines)))
+  (setq lines (nreverse lines))
+  (if (string-match "^[ \t]*|-" (car lines)) (setq lines (cdr lines)))
+  (setq lines (nreverse lines))
+  (let ((head (and org-export-highlight-first-table-line
+                   (delq nil (mapcar
+                              (lambda (x) (string-match "^[ \t]*|-" x))
+                              lines))))
+        lastline line fields html empty)
+    (setq html (concat org-export-html-table-tag "\n"))
+    (while (setq lastline line
+                 line (pop lines))
+      (setq empty "&nbsp")
+      (catch 'next-line
+        (if (string-match "^[ \t]*|-" line)
+            (if lastline
+                ;; A hline: simulate an empty table row instead.
+                (setq line (org-fake-empty-table-line lastline)
+                      head nil
+                      empty "")
+              ;; Ignore this line
+              (throw 'next-line t)))
+        ;; Break the line into fields
+        (setq fields (org-split-string line "[ \t]*|[ \t]*"))
+        (setq html (concat
+                    html
+                    "<tr>"
+                    (mapconcat (lambda (x)
+                                 (if (equal x "") (setq x empty))
+                                 (if head
+                                     (concat "<th>" x "</th>")
+                                   (concat "<td valign=\"top\">" x "</td>")))
+                               fields "")
+                    "</tr>\n"))))
+    (setq html (concat html "</table>\n"))
+    html))
+
+(defun org-fake-empty-table-line (line)
+  "Replace everything except \"|\" with spaces."
+  (let ((i (length line))
+	(newstr (copy-sequence line)))
+    (while (> i 0)
+      (setq i (1- i))
+      (if (not (eq (aref newstr i) ?|))
+	  (aset newstr i ?\ )))
+    newstr))
+
+(defun org-format-table-table-html (lines)
+  "Format a table generated by table.el into html.
+This conversion does *not* use `table-generate-source' from table.el.
+This has the advantage that Org-mode's HTML conversions can be used.
+But it has the disadvantage, that no cell- or row-spanning is allowed."
+  (let (line field-buffer
+             (head org-export-highlight-first-table-line)
+             fields html empty)
+    (setq html (concat org-export-html-table-tag "\n"))
+    (while (setq line (pop lines))
+      (setq empty "&nbsp")
+      (catch 'next-line
+        (if (string-match "^[ \t]*\\+-" line)
+            (progn
+              (if field-buffer
+                  (progn
+                    (setq html (concat
+                                html
+                                "<tr>"
+                                (mapconcat
+                                 (lambda (x)
+                                   (if (equal x "") (setq x empty))
+                                   (if head
+                                       (concat "<th valign=\"top\">" x
+                                               "</th>\n")
+                                     (concat "<td valign=\"top\">" x
+                                             "</td>\n")))
+                                 field-buffer "\n")
+                                "</tr>\n"))
+                    (setq head nil)
+                    (setq field-buffer nil)))
+              ;; Ignore this line
+              (throw 'next-line t)))
+        ;; Break the line into fields and store the fields
+        (setq fields (org-split-string line "[ \t]*|[ \t]*"))
+        (if field-buffer
+            (setq field-buffer (mapcar
+                                (lambda (x)
+                                  (concat x "<br>" (pop fields)))
+                                field-buffer))
+          (setq field-buffer fields))))
+    (setq html (concat html "</table>\n"))
+    html))
+
+(defun org-format-table-table-html-using-table-generate-source (lines)
+  "Format a table into html, using `table-generate-source' from table.el.
+This has the advantage that cell- or row-spanning is allowed.
+But it has the disadvantage, that Org-mode's HTML conversions cannot be used."
+  (require 'table)
+  (save-excursion
+    (set-buffer (get-buffer-create " org-tmp1 "))
+    (erase-buffer)
+    (insert (mapconcat 'identity lines "\n"))
+    (goto-char (point-min))
+    (if (not (re-search-forward "|[^+]" nil t))
+        (error "Error processing table."))
+    (table-recognize-table)
+    (save-excursion
+      (set-buffer (get-buffer-create " org-tmp2 "))
+      (erase-buffer))
+    (table-generate-source 'html " org-tmp2 ")
+    (set-buffer " org-tmp2 ")
+    (buffer-substring (point-min) (point-max))))
+
+(defun org-html-expand (string)
+  "Prepare STRING for HTML export. Applies all active conversions."
+  ;; First check if there is a link in the line - if yes, apply conversions
+  ;; only before the start of the link.
+  (let* ((m (string-match org-link-regexp string))
+         (s (if m (substring string 0 m) string))
+         (r (if m (substring string m) "")))
+    ;; convert < to &lt; and > to &gt;
+    (while (string-match "<" s)
+      (setq s (replace-match "&lt;" nil nil s)))
+    (while (string-match ">" s)
+      (setq s (replace-match "&gt;" nil nil s)))
+    (if org-export-html-expand
+        (while (string-match "@&lt;\\([^&]*\\)&gt;" s)
+          (setq s (replace-match "<\\1>" nil nil s))))
+    (if org-export-with-emphasize
+        (setq s (org-export-html-convert-emphasize s)))
+    (if org-export-with-sub-superscripts
+        (setq s (org-export-html-convert-sub-super s)))
+    (if org-export-with-TeX-macros
+        (let ((start 0) wd ass)
+          (while (setq start (string-match "\\\\\\([a-zA-Z]+\\)" s start))
+            (setq wd (match-string 1 s))
+            (if (setq ass (assoc wd org-html-entities))
+                (setq s (replace-match (or (cdr ass)
+                                           (concat "&" (car ass) ";"))
+                                       t t s))
+              (setq start (+ start (length wd)))))))
+    (concat s r)))
+
+(defun org-create-multibrace-regexp (left right n)
+  "Create a regular expression which will match a balanced sexp.
+Opening delimiter is LEFT, and closing delimiter is RIGHT, both given
+as single character strings.
+The regexp returned will match the entire expression including the
+delimiters.  It will also define a single group which contains the
+match except for the outermost delimiters. The maximum depth of
+stacked delimiters is N. Escaping delimiters is not possible."
+  (let* ((nothing (concat "[^" "\\" left "\\" right "]*?"))
+         (or "\\|")
+         (re nothing)
+         (next (concat "\\(?:" nothing left nothing right "\\)+" nothing)))
+    (while (> n 1)
+      (setq n (1- n)
+            re (concat re or next)
+            next (concat "\\(?:" nothing left next right "\\)+" nothing)))
+    (concat left "\\(" re "\\)" right)))
+
+(defvar org-match-substring-regexp
+  (concat
+   "\\([^\\]\\)\\([_^]\\)\\("
+   "\\(" (org-create-multibrace-regexp "{" "}" org-match-sexp-depth) "\\)"
+   "\\|"
+   "\\(" (org-create-multibrace-regexp "(" ")" org-match-sexp-depth) "\\)"
+   "\\|"
+   "\\(\\(?:\\*\\|[-+]?[^-+*!@#$%^_ \t\r\n,:\"?<>~;./{}=()]+\\)\\)\\)")
+  "The regular expression matching a sub- or superscript.")
+
+(defun org-export-html-convert-sub-super (string)
+  "Convert sub- and superscripts in STRING to HTML."
+  (let (key c)
+    (while (string-match org-match-substring-regexp string)
+      (setq key (if (string= (match-string 2 string) "_") "sub" "sup"))
+      (setq c (or (match-string 8 string)
+                  (match-string 6 string)
+                  (match-string 5 string)))
+      (setq string (replace-match
+                    (concat (match-string 1 string)
+                            "<" key ">" c "</" key ">")
+                    t t string)))
+    (while (string-match "\\\\\\([_^]\\)" string)
+      (setq string (replace-match (match-string 1 string) t t string))))
+  string)
+
+(defun org-export-html-convert-emphasize (string)
+  (while (string-match
+          "\\(\\s-\\|^\\)\\(\\*\\([a-zA-Z]+\\)\\*\\)\\([^a-zA-Z*]\\|$\\)"
+          string)
+    (setq string (replace-match
+                  (concat "<b>" (match-string 3 string) "</b>")
+                  t t string 2)))
+  (while (string-match
+          "\\(\\s-\\|^\\)\\(/\\([a-zA-Z]+\\)/\\)\\([^a-zA-Z*]\\|$\\)"
+          string)
+    (setq string (replace-match
+                  (concat "<i>" (match-string 3 string) "</i>")
+                  t t string 2)))
+  (while (string-match
+          "\\(\\s-\\|^\\)\\(_\\([a-zA-Z]+\\)_\\)\\([^a-zA-Z*]\\|$\\)"
+          string)
+    (setq string (replace-match
+                  (concat "<u>" (match-string 3 string) "</u>")
+                  t t string 2)))
+  string)
+
+(defun org-parse-key-lines ()
+  "Find the special key lines with the information for exporters."
+  (save-excursion
+    (goto-char 0)
+    (let ((re (org-make-options-regexp
+               '("TITLE" "AUTHOR" "EMAIL" "TEXT" "OPTIONS" "LANGUAGE")))
+          key)
+      (while (re-search-forward re nil t)
+        (setq key (match-string 1))
+        (cond ((string-equal key "TITLE")
+               (setq title (match-string 2)))
+              ((string-equal key "AUTHOR")
+               (setq author (match-string 2)))
+              ((string-equal key "EMAIL")
+               (setq email (match-string 2)))
+              ((string-equal key "LANGUAGE")
+               (setq language (match-string 2)))
+              ((string-equal key "TEXT")
+               (setq text (concat text "\n" (match-string 2))))
+              ((string-equal key "OPTIONS")
+               (setq options (match-string 2))))))))
+
+(defun org-parse-export-options (s)
+  "Parse the export options line."
+  (let ((op '(("H"     . org-export-headline-levels)
+              ("num"   . org-export-with-section-numbers)
+              ("toc"   . org-export-with-toc)
+              ("\\n"   . org-export-preserve-breaks)
+              ("@"     . org-export-html-expand)
+              (":"     . org-export-with-fixed-width)
+              ("|"     . org-export-with-tables)
+              ("^"     . org-export-with-sub-superscripts)
+              ("*"     . org-export-with-emphasize)
+              ("TeX"   . org-export-with-TeX-macros)))
+        o)
+    (while (setq o (pop op))
+      (if (string-match (concat (regexp-quote (car o)) ":\\([^ \t\n\r;,.]*\\)")
+                        s)
+          (set (make-local-variable (cdr o))
+               (car (read-from-string (match-string 1 s))))))))
+
+(defun org-html-level-start (level title umax with-toc head-count)
+  "Insert a new level in HTML export."
+  (let ((l (1+ (max level umax))))
+    (while (<= l org-level-max)
+      (if (aref levels-open (1- l))
+          (progn
+            (org-html-level-close l)
+            (aset levels-open (1- l) nil)))
+      (setq l (1+ l)))
+    (if (> level umax)
+        (progn
+          (if (aref levels-open (1- level))
+              (insert "<li>" title "<p>\n")
+            (aset levels-open (1- level) t)
+            (insert "<ul><li>" title "<p>\n")))
+      (if org-export-with-section-numbers
+          (setq title (concat (org-section-number level) " " title)))
+      (setq level (+ level 1))
+      (if with-toc
+	  (insert (format "\n<H%d><a name=\"sec-%d\">%s</a></H%d>\n"
+			  level head-count title level))
+	(insert (format "\n<H%d>%s</H%d>\n" level title level))))))
+
+(defun org-html-level-close (level)
+  "Terminate one level in HTML export."
+  (insert "</ul>"))
+
+
+;; Variable holding the vector with section numbers
+(defvar org-section-numbers (make-vector org-level-max 0))
+
+(defun org-init-section-numbers ()
+  "Initialize the vector for the section numbers."
+  (let* ((level  -1)
+         (numbers (nreverse (org-split-string "" "\\.")))
+         (depth (1- (length org-section-numbers)))
+         (i depth) number-string)
+    (while (>= i 0)
+      (if (> i level)
+          (aset org-section-numbers i 0)
+        (setq number-string (or (car numbers) "0"))
+        (if (string-match "\\`[A-Z]\\'" number-string)
+            (aset org-section-numbers i
+                  (- (string-to-char number-string) ?A -1))
+            (aset org-section-numbers i (string-to-int number-string)))
+        (pop numbers))
+      (setq i (1- i)))))
+
+(defun org-section-number (&optional level)
+  "Return a string with the current section number.
+When LEVEL is non-nil, increase section numbers on that level."
+  (let* ((depth (1- (length org-section-numbers))) idx n (string ""))
+    (when level
+      (when (> level -1)
+        (aset org-section-numbers
+              level (1+ (aref org-section-numbers level))))
+      (setq idx (1+ level))
+      (while (<= idx depth)
+        (if (not (= idx 1))
+            (aset org-section-numbers idx 0))
+        (setq idx (1+ idx))))
+    (setq idx 0)
+    (while (<= idx depth)
+      (setq n (aref org-section-numbers idx))
+      (setq string (concat string (if (not (string= string "")) "." "")
+                           (int-to-string n)))
+      (setq idx (1+ idx)))
+    (save-match-data
+      (if (string-match "\\`\\([@0]\\.\\)+" string)
+          (setq string (replace-match "" nil nil string)))
+      (if (string-match "\\(\\.0\\)+\\'" string)
+          (setq string (replace-match "" nil nil string))))
+    string))
+
+
+;;; Key bindings
+
+;; - Bindings in Org-mode map are currently
+;;   0123456789abcdefghijklmnopqrstuvwxyz!?@#$%^&-+*/=()_{}[]:;"|,.<>~`'\t  the alphabet
+;;             abcd fgh j lmnopqrstuvwxyz ? #    -+ /=     [] ; |,.<>   \t  necessary bindings
+;;                 e                                                        (?) useful from outline-mode
+;;                     i k                 @                                expendable from outline-mode
+;;   0123456789                          !   $%^&   * ()_{}    "     ~`'    free
+
+(define-key org-mode-map [(tab)] 'org-cycle)
+(define-key org-mode-map "\C-i" 'org-cycle)
+(define-key org-mode-map [(meta tab)] 'org-complete)
+(define-key org-mode-map "\M-\C-i" 'org-complete)
+(define-key org-mode-map [(meta shift left)] 'org-shiftmetaleft)
+(define-key org-mode-map [(meta left)] 'org-metaleft)
+(define-key org-mode-map [(meta shift right)] 'org-shiftmetaright)
+(define-key org-mode-map [(meta shift up)] 'org-shiftmetaup)
+(define-key org-mode-map [(meta shift down)] 'org-shiftmetadown)
+(define-key org-mode-map [(meta right)] 'org-metaright)
+(define-key org-mode-map [(meta up)] 'org-metaup)
+(define-key org-mode-map [(meta down)] 'org-metadown)
+;(define-key org-mode-map "\C-c\C-h\C-w" 'org-cut-subtree)
+;(define-key org-mode-map "\C-c\C-h\M-w" 'org-copy-subtree)
+;(define-key org-mode-map "\C-c\C-h\C-y" 'org-paste-subtree)
+(define-key org-mode-map "\C-c\C-h\C-w" 'org-cut-special)
+(define-key org-mode-map "\C-c\C-h\M-w" 'org-copy-special)
+(define-key org-mode-map "\C-c\C-h\C-y" 'org-paste-special)
+(define-key org-mode-map "\C-c\C-j" 'org-goto)
+(define-key org-mode-map "\C-c\C-t" 'org-todo)
+(define-key org-mode-map "\C-c\C-s" 'org-schedule)
+(define-key org-mode-map "\C-c\C-d" 'org-deadline)
+(define-key org-mode-map "\C-c;"    'org-toggle-comment)
+(define-key org-mode-map "\C-c\C-v" 'org-show-todo-tree)
+(define-key org-mode-map "\C-c\C-w" 'org-check-deadlines)
+(define-key org-mode-map "\C-c/"    'org-occur)   ; Minor-mode reserved
+(define-key org-mode-map "\C-c\C-m" 'org-insert-heading)
+(define-key org-mode-map "\M-\C-m"  'org-insert-heading)
+(define-key org-mode-map "\C-c\C-l" 'org-insert-link)
+(define-key org-mode-map "\C-c\C-o" 'org-open-at-point)
+(define-key org-mode-map "\C-c\C-z" 'org-time-stamp)  ; Alternative binding
+(define-key org-mode-map "\C-c."    'org-time-stamp)  ; Minor-mode reserved
+(define-key org-mode-map "\C-c,"    'org-priority)    ; Minor-mode reserved
+(define-key org-mode-map "\C-c\C-y" 'org-evaluate-time-range)
+(define-key org-mode-map "\C-c>"    'org-goto-calendar)
+(define-key org-mode-map "\C-c<"    'org-date-from-calendar)
+(define-key org-mode-map "\C-c["    'org-add-file)
+(define-key org-mode-map "\C-c]"    'org-remove-file)
+(define-key org-mode-map "\C-c\C-r"       'org-timeline)
+;(define-key org-mode-map [(shift up)]     'org-timestamp-up)
+;(define-key org-mode-map [(shift down)]   'org-timestamp-down)
+(define-key org-mode-map [(shift up)]     'org-shiftup)
+(define-key org-mode-map [(shift down)]   'org-shiftdown)
+(define-key org-mode-map [(shift left)]   'org-timestamp-down-day)
+(define-key org-mode-map [(shift right)]  'org-timestamp-up-day)
+(define-key org-mode-map "\C-c-"          'org-table-insert-hline)
+;; The following line is e.g. necessary for German keyboards under Suse Linux
+(unless org-xemacs-p
+  (define-key org-mode-map [S-iso-lefttab]  'org-shifttab))
+(define-key org-mode-map [(shift tab)]    'org-shifttab)
+(define-key org-mode-map "\C-c\C-c"       'org-ctrl-c-ctrl-c)
+(define-key org-mode-map [(return)]       'org-return)
+(define-key org-mode-map [(shift return)] 'org-table-copy-from-above)
+(define-key org-mode-map [(control up)]   'org-move-line-up)
+(define-key org-mode-map [(control down)] 'org-move-line-down)
+(define-key org-mode-map "\C-c?"          'org-table-current-column)
+(define-key org-mode-map "\C-c "          'org-table-blank-field)
+(define-key org-mode-map "\C-c+"          'org-table-sum)
+(define-key org-mode-map "\C-c|"          'org-table-toggle-vline-visibility)
+(define-key org-mode-map "\C-c="          'org-table-eval-formula)
+(define-key org-mode-map "\C-c#"          'org-table-create-with-table.el)
+(define-key org-mode-map "\C-c\C-q"       'org-table-wrap-region)
+(define-key org-mode-map "\C-c\C-xa"      'org-export-as-ascii)
+(define-key org-mode-map "\C-c\C-x\C-a"   'org-export-as-ascii)
+(define-key org-mode-map "\C-c\C-xt"      'org-insert-export-options-template)
+(define-key org-mode-map "\C-c:"          'org-toggle-fixed-width-section)
+(define-key org-mode-map "\C-c\C-xh"      'org-export-as-html)
+(define-key org-mode-map "\C-c\C-x\C-h"   'org-export-as-html-and-open)
+
+(defun org-shiftcursor-error ()
+  "Throw an error because Shift-Cursor command was applied in wrong context."
+  (error "This command is only active in tables and on headlines."))
+
+(defun org-shifttab ()
+  "Call `(org-cycle t)' or `org-table-previous-field'."
+  (interactive)
+  (cond
+   ((org-at-table-p) (org-table-previous-field))
+   (t (org-cycle '(4)))))
+
+(defun org-shiftmetaleft (&optional arg)
+  "Call `org-promote-subtree' or `org-table-delete-column'."
+  (interactive "P")
+  (cond
+   ((org-at-table-p) (org-table-delete-column arg))
+   ((org-on-heading-p) (org-promote-subtree arg))
+   (t (org-shiftcursor-error))))
+(defun org-shiftmetaright (&optional arg)
+  "Call `org-demote-subtree' or `org-table-insert-column'."
+  (interactive "P")
+  (cond
+   ((org-at-table-p) (org-table-insert-column arg))
+   ((org-on-heading-p) (org-demote-subtree arg))
+   (t (org-shiftcursor-error))))
+(defun org-shiftmetaup (&optional arg)
+  "Call `org-move-subtree-up' or `org-table-kill-row'."
+  (interactive "P")
+  (cond
+   ((org-at-table-p) (org-table-kill-row arg))
+   ((org-on-heading-p) (org-move-subtree-up arg))
+   (t (org-shiftcursor-error))))
+(defun org-shiftmetadown (&optional arg)
+  "Call `org-move-subtree-down' or `org-table-insert-row'."
+  (interactive "P")
+  (cond
+   ((org-at-table-p) (org-table-insert-row arg))
+   ((org-on-heading-p) (org-move-subtree-down arg))
+   (t (org-shiftcursor-error))))
+
+(defun org-metaleft (&optional arg)
+  "Call `org-do-promote' or `org-table-move-column' to left."
+  (interactive "P")
+  (cond
+   ((org-at-table-p) (org-table-move-column 'left))
+   ((or (org-on-heading-p) (org-region-active-p)) (org-do-promote arg))
+   (t (backward-word (prefix-numeric-value arg)))))
+(defun org-metaright (&optional arg)
+  "Call `org-do-demote' or `org-table-move-column' to right."
+  (interactive "P")
+  (cond
+   ((org-at-table-p) (org-table-move-column nil))
+   ((or (org-on-heading-p) (org-region-active-p)) (org-do-demote arg))
+   (t (forward-word (prefix-numeric-value arg)))))
+(defun org-metaup (&optional arg)
+  "Call `org-move-subtree-up' or `org-table-move-row' up."
+  (interactive "P")
+  (cond
+   ((org-at-table-p) (org-table-move-row 'up))
+   ((org-on-heading-p) (org-move-subtree-up arg))
+   (t (org-shiftcursor-error))))
+(defun org-metadown (&optional arg)
+  "Call `org-move-subtree-down' or `org-table-move-row' down."
+  (interactive "P")
+  (cond
+   ((org-at-table-p) (org-table-move-row nil))
+   ((org-on-heading-p) (org-move-subtree-down arg))
+   (t (org-shiftcursor-error))))
+
+(defun org-shiftup (&optional arg)
+  "Call `org-timestamp-up' or `org-priority-up'."
+  (interactive "P")
+  (cond
+   ((org-at-timestamp-p) (org-timestamp-up arg))
+   (t (org-priority-up))))
+
+(defun org-shiftdown (&optional arg)
+  "Call `org-timestamp-down' or `org-priority-down'."
+  (interactive "P")
+  (cond
+   ((org-at-timestamp-p) (org-timestamp-down arg))
+   (t (org-priority-down))))
+
+(defun org-copy-special (arg)
+  "Call either `org-table-copy' or `org-copy-subtree'."
+  (interactive "P")
+  (if (org-at-table-p)
+      (org-table-copy-region arg)
+    (org-copy-subtree arg)))
+
+(defun org-cut-special (arg)
+  "Call either `org-table-copy' or `org-copy-subtree'."
+  (interactive "P")
+  (if (org-at-table-p)
+      (org-table-cut-region arg)
+    (org-cut-subtree arg)))
+
+(defun org-paste-special (arg)
+  "Call either `org-table-paste-rectangle' or `org-paste-subtree'."
+  (interactive "P")
+  (if (org-at-table-p)
+      (org-table-paste-rectangle arg)
+    (org-paste-subtree arg)))
+
+(defun org-ctrl-c-ctrl-c (&optional arg)
+  "Call realign table, or recognize a table.el table.
+When the cursor is inside a table created by the table.el package,
+activate that table.  Otherwise, if the cursor is at a normal table
+created with org.el, re-align that table.  This command works even if
+the automatic table editor has been turned off."
+  (interactive "P")
+  (let  ((org-enable-table-editor t))
+    (cond
+     ((org-at-table.el-p)
+      (require 'table)
+      (beginning-of-line 1)
+      (re-search-forward "|" (save-excursion (end-of-line 2) (point)))
+      (table-recognize-table))
+     ((org-at-table-p)
+      (org-table-align))
+     ((org-region-active-p)
+      (org-table-convert-region (region-beginning) (region-end) arg))
+     ((and (region-beginning) (region-end))
+      (if (y-or-n-p "Convert inactive region to table? ")
+          (org-table-convert-region (region-beginning) (region-end) arg)
+        (error "Abort")))
+     (t (error "No table at point, and no region to make one.")))))
+
+(defun org-return (&optional arg)
+  "Call `org-table-next-row' or `newline'."
+  (interactive "P")
+  (cond
+   ((org-at-table-p) (org-table-next-row))
+   (t (newline))))
+
+
+;;; Menu entries
+
+;; First, remove the outline menus.
+(if org-xemacs-p
+    (add-hook 'org-mode-hook
+              (lambda ()
+                (delete-menu-item '("Headings"))
+                (delete-menu-item '("Show"))
+                (delete-menu-item '("Hide"))
+                (set-menubar-dirty-flag)))
+  (setq org-mode-map (delq (assoc 'menu-bar (cdr org-mode-map))
+                             org-mode-map)))
+
+;; Define the Org-mode menus
+(easy-menu-define org-org-menu org-mode-map "Org menu"
+  '("Org"
+    ["Cycle Visibility" org-cycle (or (bobp) (outline-on-heading-p))]
+    ["Sparse Tree" org-occur t]
+    ["Show All" show-all t]
+    "--"
+    ["New Heading" org-insert-heading t]
+    ("Navigate Headings"
+     ["Up" outline-up-heading t]
+     ["Next" outline-next-visible-heading t]
+     ["Previous" outline-previous-visible-heading t]
+     ["Next Same Level" outline-forward-same-level t]
+     ["Previous Same Level" outline-backward-same-level t]
+     "--"
+     ["Jump" org-goto t])
+    ("Edit Structure"
+     ["Move subtree up" org-shiftmetaup (not (org-at-table-p))]
+     ["Move subtree down" org-shiftmetadown (not (org-at-table-p))]
+     "--"
+     ["Copy Subtree"  org-copy-special (not (org-at-table-p))]
+     ["Cut Subtree"  org-cut-special (not (org-at-table-p))]
+     ["Paste Subtree"  org-paste-special (not (org-at-table-p))]
+     "--"
+     ["Promote Heading" org-metaleft (not (org-at-table-p))]
+     ["Promote Subtree" org-shiftmetaleft (not (org-at-table-p))]
+     ["Demote Heading"  org-metaright (not (org-at-table-p))]
+     ["Demote Subtree"  org-shiftmetaright (not (org-at-table-p))])
+    "--"
+    ("TODO lists"
+     ["TODO/DONE/-" org-todo t]
+     ["Show TODO Tree" org-show-todo-tree t]
+     "--"
+     ["Set priority" org-priority t]
+     ["Priority up" org-shiftup t]
+     ["Priority down" org-shiftdown t])
+    ("Dates and Scheduling"
+     ["Timestamp" org-time-stamp t]
+     ("Change Date"
+      ["1 day later" org-timestamp-up-day t]
+      ["1 day earlier" org-timestamp-down-day t]
+      ["1 ... later" org-shiftup t]
+      ["1 ... earlier" org-shiftdown t])
+     ["Compute Time Range" org-evaluate-time-range t]
+     ["Schedule Item" org-schedule t]
+     ["Deadline" org-deadline t]
+     "--"
+     ["Goto Calendar" org-goto-calendar t]
+     ["Date from Calendar" org-date-from-calendar t])
+    "--"
+    ("Timeline/Agenda"
+     ["Show TODO Tree this file"  org-show-todo-tree t]
+     ["Check Deadlines this file" org-check-deadlines t]
+     ["Timeline current file" org-timeline t]
+     "--"
+     ["Adenda (multifile)" org-agenda-overview t])
+    ("File List for Agenda")
+    "--"
+    ("Hyperlinks"
+     ["Store Link (global)" org-store-link t]
+     ["Insert Link" org-insert-link t]
+     ["Follow Link" org-open-at-point t])
+    ;; ["BBDB" org-bbdb-name t]
+    "--"
+    ("Table"
+     ["Align" org-ctrl-c-ctrl-c (org-at-table-p)]
+     ["Next field" org-cycle (org-at-table-p)]
+     ["Previous Field" org-shifttab (org-at-table-p)]
+     ["Next row" org-return (org-at-table-p)]
+     "--"
+     ["Blank field" org-table-blank-field (org-at-table-p)]
+     ["Copy field from above" org-table-copy-from-above (org-at-table-p)]
+     "--"
+     ("Column"
+      ["Move column left" org-metaleft (org-at-table-p)]
+      ["Move column right" org-metaright (org-at-table-p)]
+      ["Delete column" org-shiftmetaleft (org-at-table-p)]
+      ["Insert column" org-shiftmetaright (org-at-table-p)])
+     ("Row"
+      ["Move row up" org-metaup (org-at-table-p)]
+      ["Move row down" org-metadown (org-at-table-p)]
+      ["Delete row" org-shiftmetaup (org-at-table-p)]
+      ["Insert row" org-shiftmetadown (org-at-table-p)]
+      "--"
+      ["Insert hline" org-table-insert-hline (org-at-table-p)])
+     ("Rectangle"
+      ["Copy rectangle" org-copy-special (org-at-table-p)]
+      ["Cut rectangle" org-cut-special (org-at-table-p)]
+      ["Paste rectangle" org-paste-special (org-at-table-p)]
+      ["Fill rectangle" org-table-wrap-region (org-at-table-p)])
+     "--"
+     ["Which column?" org-table-current-column (org-at-table-p)]
+     ["Sum column/rectangle" org-table-sum 
+      (or (org-at-table-p) (org-region-active-p))]
+     ["Eval formula" org-table-eval-formula (org-at-table-p)]
+     "--"
+     ["Invisible Vlines" org-table-toggle-vline-visibility
+      :style toggle :selected (org-in-invisibility-spec-p '(org-table))]
+     "--"
+     ["Create" org-table-create (and (not (org-at-table-p))
+                                     org-enable-table-editor)]
+     ["Convert region" org-ctrl-c-ctrl-c (not (org-at-table-p 'any))]
+     ["Import from file" org-table-import (not (org-at-table-p))]
+     ["Export to file" org-table-export (org-at-table-p)]
+     "--"
+     ["Create/convert from/to table.el" org-table-create-with-table.el t])
+    "--"
+    ("Export"
+     ["ASCII" org-export-as-ascii t]
+     ["HTML"  org-export-as-html t]
+     ["HTML, and open" org-export-as-html-and-open t]
+     "--"
+     ["Option template" org-insert-export-options-template t]
+     ["Toggle fixed width" org-toggle-fixed-width-section t])
+    "--"
+    ("Documentation"
+     ["Show Version" org-version t]
+     ["Info Documentation" org-info t])
+    ("Customize"
+     ["Browse Org Group" org-customize t]
+     "--"
+     ["Build Full Customize Menu" org-create-customize-menu
+      (fboundp 'customize-menu-create)])
+    ))
+
+
+(defun org-info (&optional node)
+  "Read documentation for Org-mode in the info system.
+With optional NODE, go directly to that node."
+  (interactive)
+  (require 'info)
+  (Info-goto-node (format "(org)%s" (or node ""))))
+
+
+(defun org-install-agenda-files-menu ()
+  (easy-menu-change 
+   '("Org") "File List for Agenda"
+   (append
+    (list 
+     ["Edit file list" (customize-variable 'org-agenda-files) t]
+     ["Add current file to list" org-add-file t]
+     ["Remove current file from list" org-remove-file t]
+     "--")
+    (mapcar 'org-file-menu-entry org-agenda-files))))
+
+;;; Documentation
+
+(defun org-customize ()
+  "Call the customize function with org as argument."
+  (interactive)
+  (customize-browse 'org))
+
+(defun org-create-customize-menu ()
+  "Create a full customization menu for Org-mode, insert it into the menu."
+  (interactive)
+  (if (fboundp 'customize-menu-create)
+      (progn
+	(easy-menu-change
+	 '("Org") "Customize"
+	 `(["Browse Org group" org-customize t]
+	   "--"
+	   ,(customize-menu-create 'org)
+	   ["Set" Custom-set t]
+	   ["Save" Custom-save t]
+	   ["Reset to Current" Custom-reset-current t]
+	   ["Reset to Saved" Custom-reset-saved t]
+	   ["Reset to Standard Settings" Custom-reset-standard t]))
+	(message "\"Org\"-menu now contains full customization menu"))
+    (error "Cannot expand menu (outdated version of cus-edit.el)")))
+
+;;; Miscellaneous stuff
+
+(defun org-move-line-down (arg)
+  "Move the current line up."
+  (interactive "p")
+  (let ((col (current-column))
+	beg end pos)
+    (beginning-of-line 1) (setq beg (point))
+    (beginning-of-line 2) (setq end (point))
+    (beginning-of-line (+ 1 arg))
+    (setq pos (move-marker (make-marker) (point)))
+    (insert (delete-and-extract-region beg end))
+    (goto-char pos)
+    (move-to-column col)))
+
+(defun org-move-line-up (arg)
+  "Move the current line up."
+  (interactive "p")
+  (let ((col (current-column))
+	beg end pos)
+    (beginning-of-line 1) (setq beg (point))
+    (beginning-of-line 2) (setq end (point))
+    (beginning-of-line (+ -2 arg))
+    (setq pos (move-marker (make-marker) (point)))
+    (insert (delete-and-extract-region beg end))
+    (goto-char pos)
+    (move-to-column col)))
+
+;; Functions needed for Emacs/XEmacs region compatibility
+
+(defun org-region-active-p ()
+  "Is transient-mark-mode on and the region active?
+Works on both Emacs and XEmacs."
+  (if org-ignore-region
+      nil
+    (if org-xemacs-p
+        (and zmacs-regions (region-active-p))
+      (and transient-mark-mode mark-active))))
+
+(defun org-add-to-invisibility-spec (arg)
+  "Add elements to `buffer-invisibility-spec'.
+See documentation for `buffer-invisibility-spec' for the kind of elements
+that can be added."
+  (cond
+   ((fboundp 'add-to-invisibility-spec)
+    (add-to-invisibility-spec arg))
+   ((or (null buffer-invisibility-spec) (eq buffer-invisibility-spec t))
+	(setq buffer-invisibility-spec (list arg)))
+   (t
+    (setq buffer-invisibility-spec
+	  (cons arg buffer-invisibility-spec)))))
+
+(defun org-remove-from-invisibility-spec (arg)
+  "Remove elements from `buffer-invisibility-spec'."
+  (if (fboundp 'remove-from-invisibility-spec)
+      (remove-from-invisibility-spec arg)
+    (if (consp buffer-invisibility-spec)
+        (setq buffer-invisibility-spec
+              (delete arg buffer-invisibility-spec)))))
+
+(defun org-in-invisibility-spec-p (arg)
+  "Is ARG a member of `buffer-invisibility-spec'?."
+  (if (consp buffer-invisibility-spec)
+      (member arg buffer-invisibility-spec)
+    nil))
+
+(defun org-image-file-name-regexp ()
+  "Return regexp matching the file names of images."
+  (if (fboundp 'image-file-name-regexp)
+      (image-file-name-regexp)
+    (let ((image-file-name-extensions
+           '("png" "jpeg" "jpg" "gif" "tiff" "tif"
+             "xbm" "xpm" "pbm" "pgm" "ppm")))
+      (concat "\\."
+              (regexp-opt (nconc (mapcar 'upcase
+                                         image-file-name-extensions)
+                                 image-file-name-extensions)
+                          t)
+              "\\'"))))
+
+;; Functions needed for compatibility with old outline.el
+
+;; The following functions capture almost the entire compatibility code
+;; between the different versions of outline-mode.  The only other place 
+;; where this is important are the font-lock-keywords.  Search for
+;; `org-noutline-p' to find it.
+
+;; C-a should go to the beginning of a *visible* line, also in the
+;; new outline.el.  I guess this should be patched into Emacs?
+(defun org-beginning-of-line ()
+  "Go to the beginning of the current line.  If that is invisible, continue
+to a visible line beginning.  This makes the function of C-a more intuitive."
+  (interactive)
+  (beginning-of-line 1)
+  (if (bobp)
+      nil
+    (backward-char 1)
+    (if (org-invisible-p)
+        (while (and (not (bobp)) (org-invisible-p))
+          (backward-char 1)
+          (beginning-of-line 1))
+      (forward-char 1))))
+(when org-noutline-p
+  (define-key org-mode-map "\C-a" 'org-beginning-of-line))
+
+(defun org-invisible-p ()
+  "Check if point is at a character currently not visible."
+  (if org-noutline-p
+      ;; Early versions of noutline don't have `outline-invisible-p'.
+      (if (fboundp 'outline-invisible-p)
+          (outline-invisible-p)
+        (get-char-property (point) 'invisible))
+    (save-excursion
+      (skip-chars-backward "^\r\n")
+      (if (bobp)
+          nil
+        (equal (char-before) ?\r)))))
+
+(defun org-back-to-heading (&optional invisible-ok)
+  "Move to previous heading line, or beg of this line if it's a heading.
+Only visible heading lines are considered, unless INVISIBLE-OK is non-nil."
+  (if org-noutline-p
+      (outline-back-to-heading invisible-ok)
+    (if (looking-at outline-regexp)
+        t
+      (if (re-search-backward (concat (if invisible-ok "[\r\n]" "^")
+                                      outline-regexp)
+                              nil t)
+          (if invisible-ok
+              (progn (forward-char 1)
+                     (looking-at outline-regexp)))
+        (error "Before first heading")))))
+
+(defun org-on-heading-p (&optional invisible-ok)
+  "Return t if point is on a (visible) heading line.
+If INVISIBLE-OK is non-nil, an invisible heading line is ok too."
+  (if org-noutline-p
+      (outline-on-heading-p 'invisible-ok)
+    (save-excursion
+      (skip-chars-backward "^\n\r")
+      (and (looking-at outline-regexp)
+           (or invisible-ok
+               (bobp)
+               (equal (char-before) ?\n))))))
+
+(defun org-up-heading-all (arg)
+  "Move to the heading line of which the present line is a subheading.
+This function considers both visible and invisible heading lines.
+With argument, move up ARG levels."
+  (if org-noutline-p
+      (outline-up-heading-all arg)
+    (org-back-to-heading t)
+    (looking-at outline-regexp)
+    (if (<= (- (match-end 0) (match-beginning 0)) arg)
+        (error "Cannot move up %d levels" arg)
+    (re-search-backward
+     (concat "[\n\r]" (regexp-quote
+                       (make-string (- (match-end 0) (match-beginning 0) arg)
+                                    ?*))
+             "[^*]"))
+    (forward-char 1))))
+
+(defun org-show-hidden-entry ()
+  "Show an entry where even the heading is hidden."
+  (save-excursion
+    (if (not org-noutline-p)
+        (progn
+          (org-back-to-heading t)
+          (org-flag-heading nil)))
+    (show-entry)))
+
+(defun org-check-occur-regexp (regexp)
+  "If REGEXP starts with \"^\", modify it to check for \\r as well.
+Of course, only for the old outline mode."
+  (if org-noutline-p
+      regexp
+    (if (string-match "^\\^" regexp)
+        (concat "[\n\r]" (substring regexp 1))
+      regexp)))
+
+(defun org-flag-heading (flag &optional entry)
+  "Flag the current heading. FLAG non-nil means make invisible.
+When ENTRY is non-nil, show the entire entry."
+  (save-excursion
+    (org-back-to-heading t)
+    (if (not org-noutline-p)
+        ;; Make the current headline visible
+        (outline-flag-region (max 1 (1- (point))) (point) (if flag ?\r ?\n)))
+    ;; Check if we should show the entire entry
+    (if entry
+        (progn
+          (show-entry)
+          (save-excursion  ;; FIXME: Is this the fix for points in the   -|
+                           ;;        middle of text?                      |
+            (and (outline-next-heading)   ;;                              |
+                 (org-flag-heading nil))))  ; show the next heading      _|
+      (outline-flag-region (max 1 (1- (point)))
+                           (save-excursion (outline-end-of-heading) (point))
+                           (if org-noutline-p
+                               flag
+                             (if flag ?\r ?\n))))))
+
+(defun org-make-options-regexp (kwds)
+  "Make a regular expression for keyword lines."
+  (concat
+   (if org-noutline-p "^" "[\n\r]")
+   "#?[ \t]*\\+\\("
+   (mapconcat 'regexp-quote kwds "\\|")
+   "\\):[ \t]*"
+   (if org-noutline-p "\\(.+\\)" "\\([^\n\r]+\\)")))
+
+;; Advise the bookmark-jump function to make jump position visible
+;; Wrapped into eval-after-load to avoid loading advice unnecessarily
+(eval-after-load "bookmark"
+  '(defadvice bookmark-jump (after org-make-visible activate)
+     "Make the position visible."
+     (and (eq major-mode 'org-mode)
+          (org-invisible-p)
+          (org-show-hierarchy-above))))
+
+;;; Finish up
+
+(provide 'org)
+
+(run-hooks 'org-load-hook)
+
+;;; org.el ends here
+
diff -r f52a9a1c88ce -r 265139cbc47c man/org.texi
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/man/org.texi	Mon Dec 06 05:39:36 2004 +0000
@@ -0,0 +1,2042 @@
+\input texinfo
+@c %**start of header
+@setfilename ../info/org
+@settitle Org Mode Manual
+
+@set VERSION 3.03
+@set DATE December 2004
+
+@dircategory Emacs
+@direntry
+* Org Mode: (org.info).	Outline-based notes management and organizer 
+@end direntry
+
+@c Version and Contact Info
+@set MAINTAINERSITE @uref{http://www.astro.uva.nl/~dominik/Tools/org/,maintainers webpage}
+@set MAINTAINER Carsten Dominik
+@set MAINTAINEREMAIL @email{dominik@@science.uva.nl}
+@set MAINTAINERCONTACT @uref{mailto:dominik@@science.uva.nl,contact the maintainer}
+@c %**end of header
+@finalout
+
+@c Macro definitions
+
+@c Subheadings inside a table.  Need a difference between info and the rest.
+@macro tsubheading{text}
+@ifinfo
+@subsubheading \text\
+@end ifinfo
+@ifnotinfo
+@item @b{\text\}
+@end ifnotinfo
+@end macro
+
+@copying
+This manual is for Org-mode (version @value{VERSION}).
+
+Copyright @copyright{} 2004 Free Software Foundation
+
+@quotation
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.1 or
+any later version published by the Free Software Foundation; with no
+Invariant Sections, with the Front-Cover texts being ``A GNU Manual,''
+and with the Back-Cover Texts as in (a) below.  A copy of the
+license is included in the section entitled ``GNU Free Documentation
+License.''
+
+(a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
+this GNU Manual, like GNU software.  Copies published by the Free
+Software Foundation raise funds for GNU development.''
+@end quotation
+@end copying
+
+@titlepage
+@title Org Mode Manual
+
+@subtitle Release @value{VERSION}
+@author by Carsten Dominik
+
+@c The following two commands start the copyright page.
+@page
+@vskip 0pt plus 1filll
+@insertcopying
+@end titlepage
+
+@c Output the table of contents at the beginning.
+@contents
+
+@ifnottex
+@node Top, Introduction, (dir), (dir)
+@top Org Mode Manual
+
+@insertcopying
+@end ifnottex
+
+@menu
+* Introduction::                Getting started
+* Document Structure::          A tree works like your brain
+* TODO items::                  Every tree branch can be a TODO item
+* Tables::                      Pure magic for quick formatting
+* Hyperlinks::                  Notes in context
+* Timestamps::                  Assign date and time to items
+* Timeline and Agenda::         Use time-stamped items to produce an agenda
+* Exporting::                   Sharing and publishing of notes
+* Miscellaneous::               All the rest which did not fit elsewhere
+* Index::                       The fast road to specific information
+* Key Index::                   Key bindings and where they are described
+
+@detailmenu
+ --- The Detailed Node Listing ---
+
+Introduction
+
+* Summary::                     Brief summary of what Org-mode does
+* Installation::                How to install Org-mode
+
+Document Structure
+
+* Outlines::                    Org-mode is based on outline-mode
+* Headlines::                   How to typeset org-tree headlines
+* Visibility cycling::          Show ad hide, much simplified
+* Motion::                      Jumping to other headlines
+* Structure editing::           Changing sequence and level of headlines
+* Sparse trees::                Matches embedded in context
+
+TODO items
+
+* TODO basics::                 Marking and displaying TODO entries
+* Priorities::                  Some things are more important than others
+* TODO extensions::             Workflow and assignments
+
+Extended use of TODO keywords
+
+* Workflow states::             From TODO to DONE in steps
+* TODO types::                  I do this, Fred the rest
+* Per file keywords::           Different files, different requirements
+
+Tables
+
+* Built-in table editor::       Simple tables
+* table.el::                    Complex tables
+
+Hyperlinks
+
+* Links::                       URL-like links to the world
+* Remember::                    Org-trees store quick notes
+
+Timestamps
+
+* Time stamps::                 Assigning a time to a tree entry
+* Creating timestamps::         Commands which insert timestamps
+
+Timeline and Agenda
+
+* Timeline (single file)::      Time-sorted view for single file
+* Agenda (multiple files)::     Your weekly planner
+* Agenda commands::             Remote editing of org trees
+* Calendar/Diary integration::  Integrating Anniversaries and more
+
+Calendar/Diary integration
+
+* Diary to agenda::             Agenda incorporates the diary
+* Agenda to diary::             Diary incorporates the agenda
+
+Exporting
+
+* Export commands::             Commands which export and display
+* HTML formatting::             Interpretation of the buffer content
+* Export options::              How to influence exports
+* Comment lines::               Lines which will not be exported
+
+Miscellaneous
+
+* Completion::                  M-TAB knows what you need
+* Customization::               Adapting Org-mode to your taste
+* Tips and Tricks::             An author-imposed FAQ, sort of
+* Interaction::                 Other Emacs packages
+* Acknowledgments::             These people provided feedback and more
+* Bugs::                        Things which do not work perfectly
+
+@end detailmenu
+@end menu
+
+@node Introduction, Document Structure, Top, Top
+@chapter Introduction
+@cindex introduction
+
+@menu
+* Summary::                     Brief summary of what Org-mode does
+* Installation::                How to install Org-mode
+@end menu
+
+@node Summary, Installation, Introduction, Introduction
+@section Summary
+@cindex summary
+
+Org-mode is a mode for keeping notes, maintaining ToDo lists, and doing
+project planning with a fast and effective plain-text system.
+
+Org-mode develops organizational tasks around NOTES files that contain
+information about projects as plain text.  Org-mode is implemented on
+top of outline-mode, which makes it possible to keep the content of
+large files well structured.  Visibility cycling and structure editing
+help to work with the tree.  Tables are easily created with a built-in
+table editor.  Org-mode supports ToDo items, deadlines, time stamps,
+and scheduling.  It dynamically compiles entries into an agenda.
+Plain text URL-like links connect to websites, emails, usenet
+messages, BBDB entries, and any files related to the projects.  For
+printing and sharing of notes, an Org-mode file can be exported as a
+structured ASCII file, or as HTML.
+
+Org-mode keeps simple things simple.  Not every outline branch needs
+to be an action item, not every action item needs to have priority or
+scheduling information associated with it.  Org-mode can be used on
+different levels and in different ways, for example
+
+@example
+@r{@bullet{} as an outline extension with visibility cycling and structure editing}
+@r{@bullet{} as an ASCII system and table editor to take structured notes}
+@r{@bullet{} as a simple hypertext system, with HTML export}
+@r{@bullet{} as a TODO list editor}
+@r{@bullet{} as a full agenda and planner with deadlines and work scheduling}
+@end example
+
+@node Installation,  , Summary, Introduction
+@section Installation
+@cindex installation
+@cindex autoload
+@cindex global keybindings
+@cindex keybindings, global
+
+The instructions below assume that you have downloaded Org-mode from
+the web.  If Org-mode is part of the Emacs distribution or an XEmacs
+package, you only need to add to @file{.emacs} the last three Lisp
+lines below - all the rest will be taken care of automatically.
+
+Byte-compile @file{org.el} and put it on your load path.  If you'd
+like to use the Info documentation, copy the file @file{org} into the
+directory containing info files and run the command @code{install-info
+org}.
+
+Then copy the following lines into @file{.emacs}.  The last two lines
+define @emph{global} keys for the commands @command{org-store-link}
+and @command{org-agenda} - please choose suitable keys yourself.
+
+@c FIXME: autoloads not necessary when part of emacs
+@lisp
+(autoload 'org-mode "org" "Org mode" t)
+(autoload 'org-diary "org" "Diary entries from Org mode")
+(autoload 'org-agenda "org" "Multi-file agenda from Org mode" t)
+(autoload 'org-store-link "org" "Store a link to the current location" t)
+(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)
+@end lisp
+
+@cindex org-mode, turning on
+@noindent
+This will put all files with extension @samp{.org} into Org-mode.  As
+an alternative, make the first line of a file look like this:
+
+@example
+MY PROJECTS    -*- mode: org; -*-
+@end example
+
+@noindent which will select Org-mode for this buffer no matter what
+the file's name is.
+
+@node Document Structure, TODO items, Introduction, Top
+@chapter Document Structure
+@cindex document structure
+@cindex structure of document
+
+Org-mode is based on outline mode and provides flexible commands to
+edit the structure of the document.
+
+@menu
+* Outlines::                    Org-mode is based on outline-mode
+* Headlines::                   How to typeset org-tree headlines
+* Visibility cycling::          Show ad hide, much simplified
+* Motion::                      Jumping to other headlines
+* Structure editing::           Changing sequence and level of headlines
+* Sparse trees::                Matches embedded in context
+@end menu
+
+@node Outlines, Headlines, Document Structure, Document Structure
+@section Outlines
+@cindex outlines
+@cindex outline-mode
+
+Org-mode is implemented on top of outline-mode.  Outlines allow to
+organize a document in a hierarchical structure, which (at least for
+me) is the best representation of notes and thoughts.  Overview over
+this structure is achieved by folding (hiding) large parts of the
+document to show only the general document structure and the parts
+currently being worked on.  Org-mode greatly simplifies the use of
+outlines by compressing the entire show/hide functionality into a
+single command @command{org-cycle}, which is bound to the @key{TAB}
+key.
+
+@node Headlines, Visibility cycling, Outlines, Document Structure
+@section Headlines
+@cindex headlines
+@cindex outline tree
+
+Headlines define the structure of an outline tree.  The Headlines in
+Org-mode start with one or more stars, for example
+
+@example
+* Top level headline
+** Second level
+*** 3rd level
+    some text
+*** 3rd level
+    more text
+* Another top level headline
+@end example
+
+@node Visibility cycling, Motion, Headlines, Document Structure
+@section Visibility cycling
+@cindex visibility cycling
+@cindex trees, visibility
+
+Outlines make it possible to hide parts of the text in the buffer.
+Org-mode uses a single command bound to the @key{TAB} key to change
+the visibility in the buffer.
+
+@cindex subtree visibility states
+@cindex folded, subtree visibility state
+@cindex children, subtree visibility state
+@cindex subtree, subtree visibility state
+@table @kbd
+@kindex @key{TAB}
+@item @key{TAB}
+Rotate current subtree between the states
+@example
+,-> FOLDED -> CHILDREN -> SUBTREE --.
+'-----------------------------------'
+@end example
+At the beginning of the buffer (or when called with @kbd{C-u}), this does
+the same as the command @kbd{S-@key{TAB}} below.
+
+@cindex global visibility states
+@cindex overview, global visibility state
+@cindex contents, global visibility state
+@cindex show all, global visibility state
+@kindex S-@key{TAB}
+@item S-@key{TAB}
+Rotate the entire buffer between the states
+@example
+,-> OVERVIEW -> CONTENTS -> SHOW ALL --.
+'--------------------------------------'
+@end example
+Note that inside tables, @kbd{S-@key{TAB}} jumps to the previous field.
+
+@cindex show all, command
+@kindex C-c C-a
+@item C-c C-a
+Show all.
+@end table
+
+@node Motion, Structure editing, Visibility cycling, Document Structure
+@section Motion
+@cindex motion, between headlines
+@cindex jumping, to headlines
+The following commands jump to other headlines in the buffer.
+
+@table @kbd
+@kindex C-c C-n
+@item C-c C-n
+Next heading.
+@kindex C-c C-p
+@item C-c C-p
+Previous heading.
+@kindex C-c C-f
+@item C-c C-f
+Next heading same level.
+@kindex C-c C-b
+@item C-c C-b
+Previous heading same level.
+@kindex C-c C-u
+@item C-c C-u
+Backward to higher level heading.
+@kindex C-c C-j
+@item C-c C-j
+Jump to a different place without changing the current outline
+visibility.  Shows the document structure in a temporary buffer, where
+you can use visibility cycling (@key{TAB}) to find your destination.
+After pressing @key{RET}, the cursor moves to the selected location in
+the original buffer, and the headings hierarchy above it is made
+visible.
+@end table
+
+@node Structure editing, Sparse trees, Motion, Document Structure
+@section Structure editing
+@cindex structure editing
+@cindex headline, promotion and demotion
+@cindex promotion, of subtrees
+@cindex demotion, of subtrees
+@cindex subtree, cut and paste
+@cindex pasting, subtrees
+@cindex cutting, subtrees
+@cindex copying, subtrees
+
+@table @kbd
+@kindex M-@key{RET}
+@item M-@key{RET}
+Insert new heading with same level as current
+@kindex M-@key{left}
+@item M-@key{left}
+Promote current heading by one level
+@kindex M-@key{right}
+@item M-@key{right}
+Demote current heading by one level
+@kindex M-S-@key{left}
+@item M-S-@key{left}
+Promote the current subtree by one level
+@kindex M-S-@key{right}
+@item M-S-@key{right}
+Demote the current subtree by one level
+@kindex M-S-@key{up}
+@item M-S-@key{up}
+Move subtree up (swap with previous subtree of same level)
+@kindex M-S-@key{down}
+@item M-S-@key{down}
+Move subtree down (swap with next subtree of same level)
+@kindex C-c C-h C-w
+@item C-c C-h C-w
+Kill subtree, i.e. remove it from buffer but save in kill ring.
+@kindex C-c C-h M-w
+@item C-c C-h M-w
+Copy subtree to kill ring.
+@kindex C-c C-h C-y
+@item C-c C-h C-y
+Yank subtree from kill ring.  This does modify the level of subtree to
+make sure the tree fits in nicely at the yank position.  The yank
+level can also be specified with a prefix arg, or by yanking after a
+headline marker like @samp{****}.
+@end table
+
+@cindex region, active
+@cindex active region
+@cindex transient-mark-mode
+When there is an active region (transient-mark-mode), promotion and
+demotion work on all headlines in the region.  To select a region of
+headlines, it is best to place both point and mark at the beginning of a
+line, mark at the beginning of the first headline, and point at the line
+just after the last headline to change.  Note that when the cursor is
+inside a table (@pxref{Tables}), the Meta-Cursor keys have different
+functionality.
+
+@node Sparse trees,  , Structure editing, Document Structure
+@section Sparse trees
+@cindex sparse trees
+@cindex trees, sparse
+@cindex folding, sparse trees
+@cindex occur, command
+
+An important feature of Org-mode is the ability to construct
+@emph{sparse trees} for selected information in an outline tree.  A
+sparse tree 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.  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}:
+
+@table @kbd
+@kindex C-c /
+@item C-c /
+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.
+In order to provide minimal context, also the full hierarchy of
+headlines above the match is shown, as well as the headline following
+the match.
+@end table
+
+Other commands are using this feature as well.  For example @kbd{C-c
+C-v} creates a sparse TODO tree (@pxref{TODO basics}).
+
+@node TODO items, Tables, Document Structure, Top
+@chapter TODO items
+@cindex TODO items
+
+Org-mode does not maintain TODO lists as a separate document.  TODO
+items are an integral part of the notes file, because TODO items
+usually come up while taking notes!  With Org-mode, you simply mark
+any entry in a tree as being a TODO item.  In this way, the
+information is not duplicated, and the entire context from which the
+item emerged is always present when you check.
+
+Of course, this technique causes TODO items to be scattered throughout
+your file.  Org-mode provides methods to give you an overview over all
+things you have to do.
+
+@menu
+* TODO basics::                 Marking and displaying TODO entries
+* Priorities::                  Some things are more important than others
+* TODO extensions::             Workflow and assignments
+@end menu
+
+@node TODO basics, Priorities, TODO items, TODO items
+@section Basic TODO functionality
+
+Any headline can become a TODO item by starting it with the word TODO,
+for example
+
+@example
+*** TODO Write letter to Sam Fortune
+@end example
+
+@noindent
+The most important commands to work with TODO entries are:
+
+@table @kbd
+@kindex C-c C-t
+@item C-c C-t
+Rotate the TODO state of the current item between
+@example
+,-> (unmarked) -> TODO -> DONE --.
+'--------------------------------'
+@end example
+@kindex C-c C-v
+@cindex sparse tree, for TODO
+@item C-c C-v
+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, show also the DONE entries.
+@end table
+
+@node Priorities, TODO extensions, TODO basics, TODO items
+@section Priorities
+@cindex priorities
+
+If you use Org-mode extensively to organize your work, you may end up
+with a number of TODO entries so large that you'd like to prioritize
+them.  You can do this by placing a @emph{priority cookie} into the
+headline, like this
+
+@example
+*** TODO [#A] Write letter to Sam Fortune
+@end example
+
+@noindent
+With its standard setup, Org-mode supports priorities @samp{A},
+@samp{B}, and @samp{C}.  @samp{A} is the highest priority.  An entry
+without a cookie is treated as priority @samp{B}.  Priorities make a
+difference only in the multi-file agenda (@pxref{Agenda (multiple files)}).
+
+@table @kbd
+@kindex @kbd{C-c ,}
+@item @kbd{C-c ,}
+Set the priority of the current item.  The command prompts for a
+priority character @samp{A}, @samp{B} or @samp{C}.  When you press
+@key{SPC} instead, the priority cookie is removed from the headline.
+@kindex S-@key{up}
+@kindex S-@key{down}
+@item S-@key{up}
+@itemx S-@key{down}
+Increase/decrease priority of current item.  Note that these keys are
+also used to modify time stamps (@pxref{Creating timestamps}).
+@end table
+
+
+@node TODO extensions,  , Priorities, TODO items
+@section Extended use of TODO keywords
+@cindex extended TODO keywords
+
+The default implementation of TODO entries is just two states:  TODO
+and DONE.  You can, however, use the TODO feature for more
+complicated things by configuring the variables
+@code{org-todo-keywords} and @code{org-todo-interpretation}.  Using
+special setup, you can even use TODO keywords in different ways in
+different org files.
+
+@menu
+* Workflow states::             From TODO to DONE in steps
+* TODO types::                  I do this, Fred the rest
+* Per file keywords::           Different files, different requirements
+@end menu
+
+@node Workflow states, TODO types, TODO extensions, TODO extensions
+@subsection TODO keywords as workflow states
+@cindex TODO workflow
+@cindex workflow states as TODO keywords
+
+You can use TODO keywords to indicate different states in the process
+of working on an item, for example
+
+@lisp
+(setq org-todo-keywords '("TODO" "FEEDBACK" "VERIFY" "DONE")
+      org-todo-interpretation 'sequence)
+@end lisp
+
+With this setup, the command @kbd{C-c C-t} will cycle an entry from
+TODO to FEEDBACK, then to VERIFY, and finally too DONE.  You may also
+use a prefix argument to quickly select a specific state.  For example
+@kbd{C-3 C-c C-t} will change the state immediately to VERIFY.
+If you define many keywords, you can use in-buffer completion (see
+@ref{Completion}) to insert these words into the buffer.
+
+@node TODO types, Per file keywords, Workflow states, TODO extensions
+@subsection TODO keywords as types
+@cindex TODO types
+@cindex names as TODO keywords
+@cindex types as TODO keywords
+
+The second possibility is to use TODO keywords to indicate different
+types of action items.  For example, when you work with several people
+on a single project, you might want to assign action items to
+persons. 
+
+@lisp
+(setq org-todo-keywords '("Fred" "Sara" "Lucy" "Mike" "DONE")
+      org-todo-interpretation 'type)
+@end lisp
+
+In this case, different keywords do not indicate a sequence, but
+rather different levels.  This changes the behavior of the command
+@kbd{C-c C-t} slightly.  When used several times in succession, it
+will still cycle through all names.  But when when you return to the
+item after some time and execute @kbd{C-c C-t} again, it will switch
+from each name directly to DONE.  Use prefix arguments or completion
+to quickly select a specific name.
+
+@node Per file keywords,  , TODO types, TODO extensions
+@subsection Setting up TODO keywords for individual files
+@cindex keyword options
+@cindex per file keywords
+
+It can be very useful to use different aspects of the TODO mechanism
+in different files.  For this you need to add special lines to the
+file which set the keywords and interpretation for that file only.
+For example, to set one of the two examples discussed above, you
+need one of the following lines, starting in column zero anywhere in
+the file:
+
+@example
+#+SEQ_TODO: TODO FEEDBACK VERIFY DONE
+#+TYP_TODO: Fred Sara Lucy Mike DONE
+@end example
+
+@cindex Completing option keywords
+@kindex M-@key{TAB}
+@noindent To make sure you are using the correct keyword, type
+@samp{#+} into the buffer and then use @kbd{M-@key{TAB}} completion.
+
+@cindex DONE, final TODO keyword
+Remember that the last keyword must always mean that the
+item is DONE (you may use a different word, though).  After changing
+these lines, use @kbd{M-x normal-mode} to make the changes known to
+Org-mode.  Also note that in each file, only one of the two aspects
+of TODO keywords can be used.
+
+If you want to use very many keywords, for example when working with a
+large group of people, you may split the names over several lines:
+
+@example
+#+TYP_TODO: Fred Sara Lucy Mike
+#+TYP_TODO: Luis George Jules Jessica
+#+TYP_TODO: Kim Arnold Peter
+#+TYP_TODO: DONE
+@end example
+
+@node Tables, Hyperlinks, TODO items, Top
+@chapter Tables
+@cindex tables
+
+For taking notes, tables are an essential tool because they allow
+immediate and clear structuring of data.  Org-mode has a very fast and
+intuitive table editor built-in.  More complex tables can be created
+with the Emacs table.el package.
+
+@menu
+* Built-in table editor::       Simple tables
+* table.el::                    Complex tables
+@end menu
+
+@node Built-in table editor, table.el, Tables, Tables
+@section The built-in table editor
+@cindex table editor, builtin
+
+Org-mode makes it easy to format tables in plain ASCII.  Any line with
+@samp{|} as the first non-white character is considered part of a
+table.  @samp{|} is also the column separator.  A table might look
+like this:
+
+@example
+| Name  | Phone | Age |
+|-------+-------+-----|
+| Peter |  1234 |  17 |
+| Anna  |  4321 |  25 |
+@end example
+
+A table is re-aligned automatically each time you press @key{TAB} or
+@key{RET} inside the table.  @key{TAB} also moves to the next field
+(@key{RET} to the next row) and creates new table rows at the end of the
+table or before horizontal lines.  The indentation of the table is set
+by the first line.  Any line starting with @samp{|-} is considered as a
+horizontal separator line and will be expanded on the next re-align to
+span the whole table width.  So, to create the above table, you would
+only type
+
+@example
+|Name|Phone|Age
+|-
+@end example
+
+@noindent and then press @key{TAB} to align the table and start filling in
+fields.
+
+@table @kbd
+@tsubheading{Creation and conversion}
+@kindex C-c C-c
+@item C-c C-c
+Recognize @file{table.el} table.  Works when the cursor is in a
+table.el table
+
+@kindex C-c C-c
+@item C-c C-c
+Convert region to table.  Works when the cursor is not in an existing
+table, and when there is a region defined.  If every line contains at
+least one TAB character, the function assumes that the material is tab
+separated.  If not, lines are split at whitespace into fields.  You
+can use a prefix argument to indicate how many consecutive spaces are
+at least required to indicate a field separator (default: just one).
+
+@item M-x org-table-create
+Creates an empty Org-mode table.  However, it is much easier to just
+start typing, like @kbd{|Name|Phone|Age @key{RET} |- @key{TAB}}
+
+@tsubheading{Re-aligning and field motion}
+@kindex C-c C-c
+@item C-c C-c
+Re-align the table without moving the cursor.
+
+@kindex @key{TAB}
+@item @key{TAB}
+Re-align the table, move to the next field.  Creates a new row if
+necessary.
+
+@kindex S-@key{TAB}
+@item S-@key{TAB}
+Move to previous field.
+
+@kindex @key{RET}
+@item @key{RET}
+Re-align the table and move down to next row.  Creates a new row if
+necessary.  At the beginning or end of a line, @key{RET} still does
+NEWLINE, so it can be used to split a table.
+
+@kindex S-@key{RET}         
+@item S-@key{RET}         
+Copy from first non-empty
+ field above current field.
+
+@tsubheading{Column and row editing}
+@kindex M-@key{left}
+@kindex M-@key{right}
+@item M-@key{left}
+@itemx M-@key{right}
+Move the current column left/right
+
+@kindex M-S-@key{left}
+@item M-S-@key{left}
+Kill the current column.
+
+@kindex M-S-@key{right}
+@item M-S-@key{right}
+Insert a new column to the left of the cursor position.
+
+@kindex M-@key{up}
+@kindex M-@key{down}
+@item M-@key{up}
+@itemx M-@key{down}
+Move the current row up/down
+
+@kindex M-S-@key{up}
+@item M-S-@key{up}
+Kill the current row or horizontal line.
+
+@kindex M-S-@key{down}
+@item M-S-@key{down}
+Insert a new row above (with arg: below) the current row.
+
+@kindex C-c -
+@item C-c -
+Insert a horizontal line below current row. With prefix arg, line is
+created above the current line.
+
+@tsubheading{Regions}
+@kindex C-c C-h M-w
+@item C-c C-h M-w
+Copy an rectangular region from a table to a special clipboard.  Point
+and mark determine edge fields of the rectangle.  The process ignores
+horizontal separator lines.
+@kindex C-c C-h C-w
+@item C-c C-h C-w
+Copy an rectangular region from a table to a special clipboard, and
+blank all fields in the rectangle.
+@kindex C-c C-h C-y
+@item C-c C-h C-y
+Paste a rectangluar region into a table.
+The upper right corner ends up in the current field.  All involved fields
+will be overwritten.  If the rectangle does not fit into the present table,
+the table is enlarged as needed.  The process ignores horizontal separator
+lines.
+@kindex C-c C-q
+@item C-c C-q
+Wrap several fields in a column like a paragraph.  If there is an active
+region, and both point and mark are in the same column, the text in the
+column is wrapped to minimum width for the given number of lines.  A
+prefix ARG may be used to change the number of desired lines.  If there
+is no region, the current field is split at the cursor position and the
+text fragment to the right of the cursor is prepended to the field one
+line down. If there is no region, but you specify a prefix ARG, the
+current field gets blank, and the content is appended to the field
+above.
+
+@tsubheading{Calculations}
+@kindex C-c ?
+@item C-c ?
+Which table column is the cursor in?  Displays number >0 in echo
+area. 
+
+@cindex region, active
+@cindex active region
+@cindex transient-mark-mode
+@kindex C-c +
+@item C-c +
+Sum the numbers in the current column, or in the rectangle defined by
+the active region.  The result is displayed in the echo area and can
+be inserted with @kbd{C-y}.
+
+@cindex formula, in tables
+@cindex calculations, in tables
+@kindex C-c =
+@item C-c =
+Replace current field with the result of a formula.  Requires the
+Emacs calc package.  The formula can access the current field with
+@samp{$}, and the other fields in the current row
+with @samp{$1}, @samp{$2},...  For details see the documentation of the
+command @command{org-table-eval-formula}.
+
+@tsubheading{Miscellaneous}
+@kindex C-c |
+@item C-c |
+Toggle the visibility of vertical lines in tables.  The lines are
+still there, only made invisible with a text property.  Any @samp{|}
+added by hand will become invisible on the next align.
+Typographically it is good style to have no vertical lines in tables.
+
+@item M-x org-table-import
+Import a file as a table.  The table should be TAB- or whitespace
+separated.  Useful for example to import an Excel table or data from a
+database, because these programs generally can write TAB-separated text
+files.  This command works by inserting the file into the buffer and
+then converting the region to a table.  Any prefix argument is passed on
+to the converter, which uses it to determine the separator.
+
+@item M-x org-table-export
+Export the table as a TAB-separated file.  Useful for data exchange with
+for example Excel or database programs.
+
+@end table
+
+If you don't like the automatic table editor because it gets into your
+way in lines which you would like to start with @samp{|}, you can turn
+it off with
+@lisp
+(setq org-enable-table-editor nil)
+@end lisp
+@noindent The only table command which then still works is
+@kbd{C-c C-c} to do a manual re-align.
+
+@node table.el,  , Built-in table editor, Tables
+@section The @file{table.el} package
+@kindex C-c C-c
+@cindex table editor, table.el
+@cindex @file{table.el}
+
+More complex ASCII tables (with automatic line wrapping, column- and
+row-spanning, and alignment) can be created using the Emacs table
+package by Takaaki Ota (@uref{http://sourceforge.net/projects/table}).
+When @key{TAB} or @kbd{C-c C-c} is pressed in such a table, Org-mode
+will call @command{table-recognize-table} and move the cursor into the
+table.  Inside a table, the keymap of Org-mode is inactive.  In order
+to execute org-related commands, leave the table.
+
+@table @kbd
+@kindex C-c #
+@item C-c #
+Insert a table.el table.  If there is already a table at point, this
+command converts it between the table.el format and the Org-mode
+format.  See the documentation string of the command
+@code{org-convert-table} for the restrictions under which this is
+possible.
+@end table
+
+@node Hyperlinks, Timestamps, Tables, Top
+@chapter Hyperlinks
+@cindex hyperlinks
+
+Just like HMTL, Org-mode provides links to other files, usenet
+articles, emails and much more.
+
+@menu
+* Links::                       URL-like links to the world
+* Remember::                    Org-trees store quick notes
+@end menu
+
+@node Links, Remember, Hyperlinks, Hyperlinks
+@section Links
+@cindex links
+@cindex GNUS links
+@cindex BBDB links
+@cindex VM links
+@cindex RMAIL links
+@cindex WANDERLUST links
+@cindex USENET links
+@cindex SHELL links
+
+Org-mode supports links to files, websites, usenet and email messages;
+and BBDB database entries.  Links are just plain-text URL-like locators.
+The following list shows examples for each link type.
+
+@example
+http://www.astro.uva.nl/~dominik         @r{on the web}
+file:/home/dominik/images/jupiter.jpg    @r{file, absolute path}
+file:papers/last.pdf                     @r{file, relative path}
+file:~/code/main.c:255                   @r{file, with line number}
+news:comp.emacs                          @r{Usenet link}
+mailto:adent@@galaxy.net                  @r{Mail link}
+vm:folder                                @r{VM folder link}
+vm:folder#id                             @r{VM message link}
+vm://myself@@some.where.org/folder#id     @r{VM on remote machine}
+wl:folder                                @r{WANDERLUST folder link}
+wl:folder#id                             @r{WANDERLUST message link}
+rmail:folder                             @r{RMAIL folder link}
+rmail:folder#id                          @r{RMAIL message link}
+gnus:group                               @r{GNUS group link}
+gnus:group#id                            @r{GNUS article link}
+bbdb:Richard Stallman                    @r{BBDB link}
+shell:ls *.org                           @r{A shell command}
+@end example
+
+A link may contain space characters and is terminated by the end of
+the line.  Therefore, there can be only one link per line (but see the
+variable @code{org-allow-space-in-links}).
+
+@cindex storing links
+@table @kbd
+@kindex C-c l
+@item C-c l
+Store a link to the current location.  This is a @emph{global} command
+which can be used in any buffer to create a link.  The link will be
+stored for later insertion into an Org-mode buffer (see below).  For VM,
+RMAIL, WANDERLUST, GNUS and BBDB buffers, the link will point to the
+current article/entry.  For W3 and W3M buffer, the link goes to the
+current URL.  For any other files, the link will just point to the file.
+The key binding @kbd{C-c l} is only a suggestion - see
+@ref{Installation}.
+
+@kindex C-c C-l
+@item C-c C-l
+Insert a link.  This prompts for a link to be inserted into the
+buffer.  You can just type a link, using one of the link type prefixes
+mentioned in the examples above.  Through completion, all links stored
+during the current session can be accessed.  When called with prefix
+arg, you can use file name completion to enter a file link.  Note that
+you don't have to use this command to insert a link.  Links in
+Org-mode are plain text, and you can type or paste them straight into
+the buffer.
+
+@cindex inserting links
+@kindex C-c C-o
+@item C-c C-o
+Open link at point.  This will launch a web browser for URLs (using
+@command{browse-url-at-point}), run vm/gnus/bbdb for the corresponding
+links, execute the command in a shell link, visit text files with
+Emacs and select a suitable application for non-text files.
+Classification of files is based on file extension only.  See option
+@code{org-file-apps}.  If there is no link at point, the current
+subtree will be searched for one.  If you want to override the default
+application and visit the file with Emacs, use a @kbd{C-u} prefix.
+If the cursor is on a time stamp, compiles the agenda for that date.
+
+@strong{IMPORTANT}: Be careful not to use any dangerous commands in a
+shell link.
+
+@kindex mouse-2
+@item mouse-2
+On links, @kbd{mouse-2} will open the link just like @kbd{C-c C-o} would.
+
+@kindex mouse-3
+@item mouse-3
+Like @kbd{mouse-2}, but force file links to be opened with Emacs.
+@end table
+
+@node Remember,  , Links, Hyperlinks
+@section Remember
+@cindex @file{remember.el}
+
+Another way to create org entries with links to other files is through
+the @emph{Remember} package by John Wiegley.  @emph{Remember} lets you
+store quick notes with little interruption of your work flow.  See
+@uref{http://www.emacswiki.org/cgi-bin/wiki/RememberMode} for more
+information.  The notes produced by @emph{Remember} can be stored in
+different ways, and Org-mode files are a good target.
+Org-mode allows to file away notes either to a default file, or
+directly to the correct location in your Org-mode outline tree.  The
+following customization will tell @emph{Remember} to use org files as
+target, and to create annotations compatible with Org-mode links.
+
+
+@c FIXME: The autoload will not be necessary when Org-mode is part of Emacs
+@example
+(autoload 'org-remember-annotation "org")
+(autoload 'org-remember-handler "org")
+(setq org-directory "~/path/to/my/orgfiles/")
+(setq org-default-notes-file "~/.notes")
+(setq remember-annotation-functions '(org-remember-annotation))
+(setq remember-handler-functions '(org-remember-handler))
+@end example
+
+When you compose a note with remember, you have to press @kbd{C-c C-c}
+to exit remember-mode and to file away the note.  The handler first
+prompts for a target file - if you press @key{RET}, the value of
+@code{org-default-notes-file} is used.  Then the command offers the
+headings tree of the selected file.  You can either immediately press
+@key{RET} to get the note appended to the file.  Or you can use
+vertical cursor motion (@key{up} and @key{down}) and visibility
+cycling (@key{TAB}) to find a better place.  Pressing @key{RET} or
+@key{left} or @key{right} leads to the following result.
+
+@multitable @columnfractions 0.2 0.1 0.7
+@item @b{Cursor position} @tab @b{Key} @tab @b{Note gets inserted}
+@item buffer-start @tab @key{RET} @tab as level 2 heading at end of file
+@item on headline @tab @key{RET} @tab as sublevel of the heading at cursor
+@item             @tab @key{left}  @tab as same level, before current heading
+@item             @tab @key{right} @tab as same level, after current heading
+@item not on headline @tab @key{RET} 
+      @tab at cursor position, level taken from context.
+           Or use prefix arg to specify level manually.
+@end multitable
+
+So the fastest way to store the note is to press @kbd{C-c C-c @key{RET}
+@key{RET}} to append it to the default file.  But with little extra
+effort, you can push it directly to the correct location.
+
+Before inserting the text into a tree, the function ensures that the
+text has a headline, i.e. a first line that starts with a @samp{*}.
+If not, a headline is constructed from the current date and some
+additional data.  If the variable @code{org-adapt-indentation} is
+non-nil, the entire text is also indented so that it starts in the
+same column as the headline (after the asterixes).
+
+@node Timestamps, Timeline and Agenda, Hyperlinks, Top
+@chapter Timestamps
+
+Items can be labeled with timestamps to make them useful for project
+planning.
+
+@menu
+* Time stamps::                 Assigning a time to a tree entry
+* Creating timestamps::         Commands which insert timestamps
+@end menu
+
+
+@node Time stamps, Creating timestamps, Timestamps, Timestamps
+@section Time stamps, deadlines and scheduling
+@cindex time stamps
+@cindex deadlines
+@cindex scheduling
+
+A time stamp is a specification of a date (possibly with time) in a
+special format, either @samp{<2003-09-16 Tue>} or @samp{<2003-09-16
+Tue 09:39>}.  A time stamp can appear anywhere in the headline or body
+of an org-tree entry.  Its presence allows to show entries on specific
+dates in the agenda (@pxref{Agenda (multiple files)}).  We distinguish:
+
+@table @var
+@cindex timestamp
+@item TIMESTAMP
+A simple time stamp just assigns a date/time to an item.  In the
+timeline and agenda displays, the headline of the entry will be shown
+exactly on that date.
+
+@item TIMERANGE
+@cindex timerange
+Two time stamps connected by @samp{--} denote a time range.  The
+headline will be shown on the first and last day of the range, and on
+any dates that are displayed and fall in the range.  Here is an
+example:
+
+@example
+** Meeting in Amsterdam
+   <2004-08-23 Mon>--<2004-08-26 Thu>
+@end example
+
+@item DEADLINE
+@cindex deadline
+If a time stamp is preceded by the word @samp{DEADLINE:}, the task
+(most likely a TODO item) is supposed to be finished on that date, and
+it will be listed then In addition, the compilation for the
+@emph{current day} will carry a warning about the approaching or
+missed deadline, starting @code{org-deadline-warning-days} before the
+due date, and continuing until the entry is marked DONE.  An example:
+
+@example
+*** TODO write article about the Earth for the Guide
+    The editor in charge is bbdb:Ford Prefect
+    DEADLINE: <2004-02-29 Sun>
+@end example
+
+@item SCHEDULED
+@cindex scheduled
+If a time stamp is preceded by the word @samp{SCHEDULED:}, it means
+you are planning to start working on that task on the given date.  The
+headline will be listed under the given date.  In addition, a reminder
+that the scheduled date has passed will be present in the compilation
+for the @emph{current day}, until the entry is marked DONE.  I.e., the
+task will automatically be forwarded.
+@end table
+
+@node Creating timestamps,  , Time stamps, Timestamps
+@section Creating timestamps
+@cindex creating timestamps
+
+For Org-mode to recognize time stamps, they need to be in the specific
+format.  All commands listed below produce time stamps in the correct
+format.
+
+@table @kbd
+@kindex C-c .
+@item C-c .
+Prompt for a date and insert a corresponding time stamp.  When the
+cursor is at a previously used time stamp, it is updated to NOW.  When
+this command is used twice in succession, a time range is inserted.
+
+@kindex C-u C-c .
+@item C-u C-c .
+Like @kbd{C-c .}, but use the alternative format which contains date
+and time.
+
+@kindex C-c <
+@item C-c <
+Insert a time stamp corresponding to the cursor date in the Calendar.
+
+@kindex C-c >
+@item C-c >
+Access the Emacs calendar for the current date.  If there is a
+timestamp in the current line, goto the corresponding date
+instead.
+
+@kindex C-c C-o
+@item C-c C-o
+Access the agenda for the date given by the time stamp at point
+(@pxref{Agenda (multiple files)}).
+
+@kindex C-c C-d
+@item C-c C-d
+Insert @samp{DEADLINE} keyword along with a stamp.
+@kindex C-c C-w
+@cindex sparse tree, for deadlines
+@item C-c C-w
+Create a sparse tree with all deadlines that are either past-due, or
+which will become due within @code{org-deadline-warning-days}.
+With @kbd{C-u} prefix, show all deadlines in the file.  With a numeric
+prefix, check that many days.  For example, @kbd{C-1 C-c C-w} shows
+all deadlines due tomorrow.
+
+@kindex C-c C-s
+@item C-c C-s
+Insert @samp{SCHEDULED} keyword along with a stamp.
+
+@kindex S-@key{left}
+@kindex S-@key{right}
+@item S-@key{left}
+@itemx S-@key{right}
+Change date at cursor by one day.
+
+@kindex S-@key{up}
+@kindex S-@key{down}
+@item S-@key{up}
+@itemx S-@key{down}
+Change the item under the cursor in a timestamp.  The cursor can be on
+a year, month, day, hour or minute.  Note that if the cursor is not at
+a time stamp, these same keys modify the priority of an item
+(@pxref{Priorities}).
+
+@kindex C-c C-y
+@cindex evaluate time range
+@item C-c C-y
+Evaluate a time range by computing the difference between start and
+end.  With prefix arg, insert result after the time range (in a table:
+into the following column).
+@end table
+
+@cindex date, reading in minibuffer
+@cindex time, reading in minibuffer
+@cindex calendar, for selecting date
+When org prompts for a date/time, the function reading your input will
+replace anything you choose not to specify with the current date and
+time.  For details, see the documentation string of
+@command{org-read-date}.  Also, a calender will pop up to allow
+selecting a date.  The calendar can be fully controlled from the
+minibuffer, and a date can be selected with the following commands:
+
+@table @kbd
+@kindex <
+@item <
+Scroll calendar backwards by one month.
+@kindex >
+@item >
+Scroll calendar forwards by one month.
+@kindex mouse-1
+@item mouse-1
+Select date by clicking on it.
+@kindex S-@key{right}
+@item S-@key{right}
+One day forward.
+@kindex S-@key{left}
+@item S-@key{left}
+One day back.
+@kindex S-@key{down}
+@item S-@key{down}
+One week forward.
+@kindex S-@key{up}
+@item S-@key{up}
+One week back.
+@kindex M-S-@key{right}
+@item M-S-@key{right}
+One month forward.
+@kindex M-S-@key{left}
+@item M-S-@key{left}
+One month back.
+@kindex @key{RET}
+@item @key{RET}
+Choose date in calendar (only if nothing typed into minibuffer).
+@end table
+
+@node Timeline and Agenda, Exporting, Timestamps, Top
+@chapter Timeline and Agenda
+@cindex agenda
+
+We have already described three commands to filter important
+information in an org file into a sparse tree (@pxref{Sparse trees}):
+
+@cindex sparse trees
+@itemize @bullet
+@item
+The TODO tree, (@kbd{C-c C-v}), see @ref{TODO items}.
+@item
+The occur tree @kbd{C-c /}, see @ref{TODO items}.
+@item
+Checking upcoming deadlines with @kbd{C-c C-w}, see @ref{Creating
+timestamps}.
+@end itemize
+@noindent
+
+Instead of using the sparse trees, Org-mode can also collect and
+time-sort the important items into a separate buffer, which we call
+the @emph{timeline} of the org file.  It can also collect information
+from a @emph{list of files} and in this way provide an @emph{agenda}
+which covers all of your current projects, action items and
+appointments.
+
+@menu
+* Timeline (single file)::      Time-sorted view for single file
+* Agenda (multiple files)::     Your weekly planner
+* Agenda commands::             Remote editing of org trees
+* Calendar/Diary integration::  Integrating Anniversaries and more
+@end menu
+
+@node Timeline (single file), Agenda (multiple files), Timeline and Agenda, Timeline and Agenda
+@section Timeline for a single file
+@cindex single file summary
+@cindex agenda, for single file
+@cindex timeline, single file
+@cindex time-sorted view
+
+The timeline shows all time-stamped items in a single Org-mode file,
+in @emph{time-sorted view}.  The main purpose of this command is to
+give an overview over events in a project.
+
+@table @kbd
+@kindex C-c C-r
+@item C-c C-r
+Show a time-sorted view of the org file, with all time-stamped items
+of today or later.  When called with a @kbd{C-u} prefix, past dates
+will be included as well.  When called with two @kbd{C-u C-u}
+prefixes, all unfinished TODO entries (scheduled or not) are also
+listed under the current date.
+@end table
+@noindent
+
+The timeline is shown in a temporary buffer @file{*Org Agenda*}.  The
+commands available in the Agenda buffer are listed in @ref{Agenda
+commands}.
+
+@node Agenda (multiple files), Agenda commands, Timeline (single file), Timeline and Agenda
+@section Agenda from multiple files
+@cindex agenda, from multiple files
+
+An agenda can be compiled from one or more org files.  The main
+purpose of this command is to act like a planner, in order to show you
+what tasks are up for the current week, similar to a paper agenda.
+
+The Org-mode files to be processed in order to generate the agenda are
+listed in the variable @code{org-agenda-files}.  You can customize
+this variable, but the easiest way to maintain it is through the
+following commands
+
+@cindex files, adding to agenda list
+@table @kbd
+@kindex C-c [
+@item C-c [
+Add current file to the list of agenda files
+@kindex C-c ]
+@item C-c ]
+Remove current file from the list of agenda files.
+@end table
+@noindent
+The Org menu contains the list of all files and can be used to quickly
+visit any of them.
+
+The global command @command{org-agenda} compiles the agenda from all
+listed files.
+
+@table @kbd
+@cindex org-agenda, command
+@kindex C-c a
+@item C-c a
+Compile an agenda for the current week from a list of org files.  The
+agenda shows the entries for each day.  With a @kbd{C-u} prefix (or
+when the variable @code{org-agenda-include-all-todo} is @code{t}), all
+unfinished TODO items (also those without a date) are also listed at
+the beginning of the buffer, before the first date.@*
+The key binding @kbd{C-c a} is only a suggestion - see
+@ref{Installation}.
+@end table
+
+The commands available in the Agenda buffer are listed in
+@ref{Agenda commands}.
+
+@subsection Categories
+
+@cindex category
+In the agenda buffer, each entry is preceded by a @emph{category},
+which is derived from the file name.  You can also set the category of
+a file through file variables, for example by making the first line of
+the file look like this:
+
+@cindex file variables
+@example
+Planet Finder -*- mode: org; org-category: Cheops -*-
+@end example
+@noindent
+Or, like with TODO keywords (@pxref{Per file keywords}), you can
+insert a special line anywhere in the file:
+
+@example
+#+CATEGORY: Cheops
+@end example
+@noindent
+The display looks best if the category is no longer than 10 characters.
+
+
+@subsection Sorting of agenda items
+@cindex sorting, of agenda items
+@cindex priorities, of agenda items
+The entries for each day are sorted.  The default order is to first
+collect all items containing an explicit time-of-day specification.
+These entries will be shown at the beginning of the list, as a
+@emph{schedule} for the day.  After that, items remain grouped in
+categories, in the sequence given by @code{org-agenda-files}.  Within
+each category, items are sorted by priority (@pxref{Priorities}).
+
+A time-of-day specification looks like @samp{12:45} or @samp{3pm} and
+must appear in the headline.  For example, a timestamp in a headline
+that contains not only a date but also a time will trigger this
+mechanism.  Specifications of a time in diary entries are recognized
+as well, so the schedule will be mixed from diary entries and Org-mode
+files.
+
+The priority is a numerical quantity composed of the base priority
+(2000 for priority @samp{A}, 1000 for @samp{B}, and 0 for @samp{C}),
+plus additional increments for overdue scheduled or deadline items.
+
+Sorting can be customized using the variable
+@code{org-agenda-sorting-strategy}.
+
+@node Agenda commands, Calendar/Diary integration, Agenda (multiple files), Timeline and Agenda
+@section Commands in the agenda buffer
+
+Entries in the agenda buffer are linked back to the org file.  You are
+not allowed to edit the agenda buffer itself, but commands are provided
+to edit the org-files ``remotely'' from the agenda buffer.  In this
+way, all information is stored only once, and you don't risk that your
+agenda and note files diverge.
+
+Some commands can be executed with mouse clicks on agenda lines.  For
+the other commands, the cursor needs to be in the desired line.  Most
+commands are available for both timelines and the agenda.  The
+exceptions are marked.
+
+@table @kbd
+@tsubheading{View/GoTo org file}
+@kindex mouse-3
+@kindex @key{SPC}
+@item mouse-3
+@itemx @key{SPC} 
+Display the original location of the item in another window.
+
+@kindex l
+@item l
+Display original location and recenter that window.
+
+@kindex mouse-2
+@kindex @key{TAB}
+@item mouse-2
+@itemx @key{TAB}
+Go to the original location of the item in another window.
+
+@kindex @key{RET}
+@itemx @key{RET}
+Go to the original location of the item and delete other windows.
+
+@kindex f
+@item f
+Toggle follow mode.  In follow mode, as you move the cursor through
+the agenda buffer, the other window always shows the corresponding
+location in the org file.
+
+
+@tsubheading{Change display}
+@kindex o
+@item o
+Delete other windows.
+
+@kindex w
+@item w
+Toggle between weekly and daily view.
+
+@kindex d
+@item d
+Toggle the inclusion of diary entries.  See @ref{Calendar/Diary integration}.
+
+@kindex r
+@item r
+Recreate the agenda buffer, for example to reflect the changes
+after modification of the time stamps of items with S-@key{left} and
+S-@key{right}.
+
+@kindex @key{right}
+@item @key{right}
+Display the following @code{org-agenda-ndays} days.  For example, if
+the display covers a week, switch to the following week.  With prefix
+arg, go forward that many times @code{org-agenda-ndays} days.  Not
+available in timlines.
+
+@kindex @key{left}
+@item @key{left}
+Display the previous dates.  Not available in timelines.
+
+@kindex .
+@item .
+Goto today.
+
+@tsubheading{Remote editing}
+
+@item 0-9
+Digit argument.
+
+@kindex t
+@item t
+Change the TODO state of the item, both in the agenda and in the
+original org file.
+
+@kindex p
+@item p
+Set the priority for the current item.  Org-mode prompts for the
+priority character. If you reply with @key{SPC}, the priority cookie
+is removed from the entry.
+
+@kindex P
+@item p
+Display weighted priority of current item.
+
+@kindex +
+@item +
+Increase the priority of the current item.  The priority is changed in
+the original buffer, but the agenda is not resorted.  Use the @kbd{r}
+key for this.
+
+@kindex -
+@item -
+Decrease the priority of the current item.
+
+@kindex S-@key{right}
+@item S-@key{right}
+Change the time stamp associated with the current line by one day into
+the future.  With prefix argument, change it by that many days.  For
+example, @kbd{3 6 5 S-@key{right}} will change it by a year.  The
+stamp is changed in the original org file, but the change is not
+directly reflected in the agenda buffer.  Use the 
+@kbd{r} key to update the buffer.
+
+@kindex S-@key{left}
+@item S-@key{left}
+Change the time stamp associated with the current line by one day
+into the past.
+
+@kindex >
+@item >
+Change the time stamp associated with the current line to today.
+The key @kbd{>} has been chosen, because it is the same as @kbd{S-.}
+on my keyboard.
+
+@cindex diary entries, creating from agenda
+@kindex i
+@item i
+Insert a new entry into the diary.  Prompts for the type of entry
+(day, weekly, monthly, yearly, anniversary, cyclic) and creates a new
+entry in the diary, just like @kbd{i d} etc. would do in the calendar.
+The date is taken from the cursor position.
+
+@tsubheading{Quit and Exit}
+@kindex q
+@item q
+Quit Agenda, remove the agenda buffer.
+
+@kindex x
+@cindex agenda files, removing buffers
+@item x
+Exit agenda, remove the agenda buffer and all buffers loaded by Emacs
+for the compilation of the agenda.  Buffers created by the user to
+visit org files will not be removed.
+
+@end table
+
+@node Calendar/Diary integration,  , Agenda commands, Timeline and Agenda
+@section Calendar/Diary integration
+@cindex calendar integration
+@cindex diary integration
+
+Emacs contains the calendar and diary by Edward M. Reingold.  The
+calendar displays a three-month calendar with holidays from different
+countries and cultures.  The diary allows to keep track of
+anniversaries, lunar phases, sunrise/set, recurrent appointments
+(weekly, monthly) and more.  In this way, it is quite complementary to
+Org-mode.  It can be very useful to combine output from Org-mode with
+the diary.
+
+The interaction between Org-mode and diary works both ways: You can
+list entries from the diary in the Org-mode agenda, or you can display
+entries from the org agenda in the Emacs diary.
+
+@menu
+* Diary to agenda::             Agenda incorporates the diary
+* Agenda to diary::             Diary incorporates the agenda
+@end menu
+
+@node Diary to agenda, Agenda to diary, Calendar/Diary integration, Calendar/Diary integration
+@subsection Including the diary into the agenda
+@cindex diary to agenda
+
+In order to include entries from the Emacs diary into Org-mode's
+agenda, you only need to customize the variable
+
+@lisp
+(setq org-agenda-include-diary t)
+@end lisp
+@noindent
+
+@noindent After that, everything will happen automatically.
+
+@node Agenda to diary,  , Diary to agenda, Calendar/Diary integration
+@subsection Including the agenda into the diary
+
+If you prefer to use the Emacs diary as your main instrument and if
+you wish to include the Org-mode agenda into it, the following steps
+are necessary: Autoload the function @command{org-diary} as shown
+above under @ref{Installation}.  You also need to use @emph{fancy
+diary display} by setting in @file{.emacs}:
+
+@lisp
+(add-hook 'diary-display-hook 'fancy-diary-display)
+@end lisp
+
+Then include the following line into your @file{~/diary} file, in
+order to get the entries from all files listed in the variable
+@code{org-agenda-files}:
+
+@example
+&%%(org-diary)
+@end example
+@noindent
+You may also select specific files with
+
+@example
+&%%(org-diary) ~/path/to/some/org-file.org
+&%%(org-diary) ~/path/to/another/org-file.org
+@end example
+
+If you now launch the calendar and press @kbd{d} to display a diary,
+the headlines of entries containing a timestamp, date range, schedule,
+or deadline referring to the selected date will be listed.  Just like
+in Org-mode's agenda view, the diary for @emph{today} contains
+additional entries for overdue deadlines and scheduled items.  See
+also the documentation of the @command{org-diary} function.
+
+@node Exporting, Miscellaneous, Timeline and Agenda, Top
+@chapter Exporting
+@cindex exporting
+@cindex ASCII file
+@cindex HTML
+
+
+@cindex headline levels, for exporting
+For printing and sharing of notes, an Org-mode document can be
+exported as an ASCII file, or as HTML.  In the exported version, the
+first 3 outline levels will become headlines, defining a general
+document structure.  Additional levels will be exported as itemize
+lists.  If you want that transition to occur at a different level,
+specify it with a prefix argument.  For example,
+
+@example
+@kbd{M-1 M-x org-export-as-html}
+@end example
+@noindent
+creates only top level headlines and does the rest as items.
+
+@menu
+* Export commands::             Commands which export and display
+* HTML formatting::             Interpretation of the buffer content
+* Export options::              How to influence exports
+* Comment lines::               Lines which will not be exported
+@end menu
+
+@node Export commands, HTML formatting, Exporting, Exporting
+@section Export commands
+
+@cindex region, active
+@cindex active region
+@cindex transient-mark-mode
+@table @kbd
+@kindex C-c C-x a    
+@item C-c C-x a
+Export as ASCII file.  If there is an active region, only the region
+will be exported.  For an org file @file{myfile.org}, the ASCII file
+will be @file{myfile.txt}.  The file will be overwritten without
+warning.
+@kindex C-c C-x h    
+@item C-c C-x h
+Export as HTML file @file{myfile.html}.
+@kindex C-c C-x C-h  
+@item C-c C-x C-h
+Export as HTML file and open it with a browser.
+@kindex C-c C-x t
+@item C-c C-x t
+Insert template with export options, see below.
+@kindex C-c :
+@item C-c :
+Toggle fixed-width for line or region, see below.
+@end table
+
+@node HTML formatting, Export options, Export commands, Exporting
+@section HTML formatting
+
+Not all text is transferred literally to the exported HTML file.  The
+exporter implements the following interpretation:
+
+@itemize @bullet
+@cindex underlined text
+@cindex bold text
+@cindex italic text
+@item
+You can make words @b{*bold*}, @i{/italic/}, and _underlined_
+
+@cindex @TeX{} interpretation
+@item
+Simple @TeX{}-like math constructs are interpreted:
+
+@itemize @minus
+@item
+@samp{10^22} and @samp{J_n} are super- and subscripts.  You can quote
+@samp{^} and @samp{_} with a backslash: @samp{\_} and @samp{\^}
+@item
+@samp{\alpha} indicates a Greek letter, @samp{\to} an arrow.  You can
+use completion for these macros, just type @samp{\} and maybe a few
+letters, and press @kbd{M-@key{TAB}} to see possible completions.
+@end itemize
+
+@cindex tables, export to HTML
+@item
+Tables are transformed into HTML tables.
+
+@cindex fixed width
+@item
+Lines starting with @samp{:} are typeset in a fixed-width font, to
+allow quoting of computer code etc. 
+
+@cindex HTML tags
+@item
+If you want to include HTML tags which should be interpreted as such,
+mark them with a @samp{@@} like in @samp{@@<b>bold text@@</b>}.
+Plain @samp{<} and @samp{>} are always transformed to @samp{&lt;} and
+@samp{&gt;} in HTML export.
+@end itemize
+
+If these conversions conflict with your habits of typing ASCII text,
+they can all be turned off with corresponding variables.
+
+@node Export options, Comment lines, HTML formatting, Exporting
+@section Export options
+@cindex options, for export
+
+The exporter recognizes special lines in the buffer which provide
+additional information.  These lines may be put anywhere in the file.
+The whole set of lines can be inserted into the buffer with @kbd{C-c
+C-x t}.  For individual lines, a good way to make sure the keyword is
+correct it to type @samp{#+} and then use @kbd{M-@key{TAB}} completion
+(@pxref{Completion}). 
+
+@example
+#+TITLE:     the title to be shown (default is the buffer name)
+#+AUTHOR:    the author (default taken from @code{user-full-name})
+#+EMAIL:     his/her email address (default from @code{user-mail-address})
+#+LANGUAGE:  language for HTML, e.g. @samp{en} (@code{org-export-default-language})
+#+TEXT:      Some descriptive text to be inserted at the beginning.
+#+TEXT:      Several lines may be given.
+#+OPTIONS:   H:2  num:t  toc:t  \n:nil  @:t  ::t  |:t  ^:t  *:nil  TeX:t
+@end example
+@noindent
+The OPTIONS line is a compact form to specify export settings.  Here
+you can
+@cindex headline levels
+@cindex section-numbers
+@cindex table of contents
+@cindex linebreak-preservation
+@cindex quoted html tags
+@cindex fixed-width sections
+@cindex tables
+@cindex @TeX{}-like syntax for sub- and superscripts
+@cindex emphasized text
+@cindex @TeX{} macros
+@example
+H:      @r{set the number of headline levels for export}
+num:    @r{turn on/off section-numbers}
+toc:    @r{turn on/off table of contents}
+\n:     @r{turn on/off linebreak-preservation}
+@@:      @r{turn on/off quoted html tags}
+::      @r{turn on/off fixed-width sections}
+|:      @r{turn on/off tables}
+^:      @r{turn on/off @TeX{}-like syntax for sub- and superscripts.}
+*:      @r{turn on/off emphasized text (bold, italic, underlined)}
+TeX:    @r{turn on/off @TeX{} macros}
+@end example
+
+@node Comment lines,  , Export options, Exporting
+@section Comment lines
+@cindex comment lines
+@cindex exporting, not
+
+Lines starting with @samp{#} in column zero are treated as comments
+and will never be exported.  Also entire subtrees starting with the
+word @samp{COMMENT} will never be exported.  Finally, any text before
+the first headline will not be exported either.
+
+@table @kbd
+@kindex C-c ;
+@item C-c ;
+Toggle the COMMENT keyword at the beginning of an entry.
+@end table
+
+@node Miscellaneous, Index, Exporting, Top
+@chapter Miscellaneous
+
+@menu
+* Completion::                  M-TAB knows what you need
+* Customization::               Adapting Org-mode to your taste
+* Tips and Tricks::             An author-imposed FAQ, sort of
+* Interaction::                 Other Emacs packages
+* Acknowledgments::             These people provided feedback and more
+* Bugs::                        Things which do not work perfectly
+@end menu
+
+@node Completion, Customization, Miscellaneous, Miscellaneous
+@section Completion
+@cindex complete @TeX{} symbols
+@cindex complete TODO keywords
+@cindex complete dictionary words
+@cindex complete option keywords
+
+Org-mode supports in-buffer completion.  This type of completion does
+not make use of the minibuffer.  You simply type a few letters into
+the buffer and use the key to complete text right there.
+
+@table @kbd
+@kindex M-@key{TAB}
+@item M-@key{TAB}
+Complete word at point
+@itemize @bullet
+@item
+At the beginning of a headline, complete TODO keywords.
+@item
+After @samp{\}, complete @TeX{} symbols supported by the exporter.
+@item
+After @samp{#+}, complete the special keywords like @samp{TYP_TODO} or
+@samp{OPTIONS} which set file-specific options for Org-mode.  When the
+option keyword is already complete, pressing @kbd{M-@key{TAB}} again
+will insert example settings for this keyword.
+@item
+Elsewhere, complete dictionary words using ispell.
+@end itemize
+@end table
+
+@node Customization, Tips and Tricks, Completion, Miscellaneous
+@section Customization
+@cindex customization
+@cindex options, for customization
+@cindex variables, for customization
+
+There is a large number of variables which can be used to customize
+Org-mode.  For the sake of compactness of the manual, we are not
+describing the variables here.  For an overview of customization
+variables, use @kbd{M-x org-customize}.  Or select @code{Browse Org
+Group} from the @code{Org->Customization} menu.
+
+@node Tips and Tricks, Interaction, Customization, Miscellaneous
+@section Tips and Tricks
+
+@itemize @bullet
+@cindex README files
+@item
+I find Org-mode very useful for the many @file{README} files I have
+scattered through my directories.  So I turn on @file{org-mode} for
+all @file{README} files with
+
+@example
+(add-to-list 'auto-mode-alist '("README$" . org-mode))
+@end example
+
+@ignore
+@cindex files, adding automatically
+@item
+If you would like to add all org files you ever create to the list of
+agenda files@footnote{Think twice.  Do you @emph{really} want this?},
+you could do so with
+
+@lisp
+(add-hook 'org-mode-hook 'org-add-file)
+@end lisp
+
+If you would like to add only a selection, for example everything
+except the @file{README} files, this could be achieved in the
+following way:
+
+@lisp
+(add-hook 'org-mode-hook
+          (lambda ()
+             (or (string-match "README\\'" (buffer-file-name))
+                 (org-add-file))))
+@end lisp
+@end ignore
+
+@cindex @code{make-indirect-buffer}
+@cindex indirect buffers
+@item
+It can be useful to have two different windows showing the same
+Org-mode file.  However, a problem here is that changes to the
+visibility in one window immediately affect the other window.  On
+Emacs (not on XEmacs because it uses the old outline-mode) a way out
+is the use of @emph{indirect buffers}, which visit the same file, but
+have separate settings, also for outline visibility.  See the
+documentation on the command @code{make-indirect-buffer}.
+
+@cindex URL, paste into buffer
+@item
+Paste URLs into Org-mode whenever this seems useful.  For example, if
+you are writing notes about a paper which is available on the web, put
+the corresponding URL there and a direct look at the paper is only a
+mouse click away.  If you have a local copy of the paper, use a
+file:path link.
+
+@cindex headline levels, for export
+@item
+If you plan to use ASCII or HTML export, make sure things you want to
+be exported as item lists are level 4 at least, even if that does mean
+there is a level jump.  For example
+
+@example
+* Todays top priorities
+**** TODO write a letter to xyz
+**** TODO Finish the paper
+**** Pick up kids at the school
+@end example
+
+Alternatively, if you need a specific value for the heading/item
+transition in a particular file, use the @samp{+OPTIONS} line to
+configure the @samp{H} switch.
+
+@example
++OPTIONS:   H:2; ...
+@end example
+
+@cindex exporting a subtree
+@item
+If you want to export a subtree, mark the subtree as region and then
+export.  Marking can be done with @kbd{C-c @@ C-x C-x}, for example.
+
+@cindex table, empty template
+@item
+To insert an empty table template, just type @samp{|-} and use
+@key{TAB}.
+
+@item
+In a table, to add a new column at the end, just type some text
+anywhere after the final @samp{|}.  Upon the next re-align, a new
+column will be created.
+
+@item
+In tables, @key{TAB} creates new rows before horizontal separator lines.  If
+the cursor is at @samp{Age} in the following table,
+
+@example
+| Name  | Phone | Age |
+|-------+-------+-----|
+|       |       |     |
+@end example
+
+the next @key{TAB} would create a second header line.  If you want
+instead to go to the first empty field below the horizontal line,
+press @key{down} (to get on the separator line) and then @key{TAB}.
+
+@cindex indentation, of tables
+@item
+To change the indentation of a table, just change the first line and
+realign with @key{TAB}.
+
+@end itemize
+
+
+@node Interaction, Acknowledgments, Tips and Tricks, Miscellaneous
+@section Interaction with other packages
+@cindex packages, interaction with other
+@cindex @file{planner.el}
+@cindex @file{remember.el}
+@cindex @file{table.el}
+@file{Org.el} can cooperate with the following packages:
+
+@table @asis
+@cindex @file{remember.el}
+@item @file{remember.el} by John Wiegley
+Org mode cooperates with remember, see @ref{Remember}.
+@cindex @file{plannner.el}
+@item @file{planner.el} by John Wiegley
+Planner is another tool to plan work and keep track of tasks.  Planner
+uses a multi-file approach with project pages and day pages.  Is based
+on Emacs-Wiki.  It can be useful to display the agenda entries
+resulting from org files in day-pages of the planner.  This can be
+done through the diary of the calendar: Integrate org files into the
+diary as described above, and then turn on the diary support of
+planner.
+@cindex @file{table.el}
+@item @file{table.el} by Takaaki Ota
+Org mode cooperates with table.el, see @ref{table.el}.
+@end table
+
+@c EmacsWiki
+@c organizer-mode
+@c todo-mode
+@c records mode
+
+@page  @c FIXME
+
+@node Acknowledgments, Bugs, Interaction, Miscellaneous
+@section Acknowledgments
+@cindex acknowledgments
+
+Org-mode was written by Carsten Dominik, who still maintains it at the
+Org-mode homepage
+@uref{http://www.astro.uva.nl/~dominik/Tools/org/}.  The following
+people have helped the development along with ideas, suggestions and
+patches. 
+
+@itemize @bullet
+@item
+Matthias Rempe (Oelde) provided ideas and suggestions, a patch
+introducing Windows NT/2000 support, and quality control.
+@item
+Kevin Rogers contributed code to access VM files on remote hosts.
+@item
+Juergen Vollmer contributed code generating the table of contents
+in HTML output, and other export improvements.
+@item
+Christian Egli converted the documentation into TeXInfo format.  He
+also showed me his plans for a multifile summary for Org-mode. Some of
+his ideas have found their way into the agenda.
+@item 
+Philip Rooke created the Org-mode reference card and did some
+beta-testing.
+@item
+Linking to VM/BBDB/GNUS was inspired by Tom Shannon's
+@file{organizer-mode.el}.
+@item
+Scheduling TODO items was inspired by John Wiegley's @file{planner.el}.
+@item
+Sacha Chua, the current maintainer of Planner suggested to take some
+linking code from Planner, which I did (for RMAIL and Wanderlust).
+@item
+Oliver Oppitz sent several useful suggestions.
+@item
+Carsten Wimmer suggested some changes and helped fix a bug in linking
+to GNUS.
+@end itemize
+
+@node Bugs,  , Acknowledgments, Miscellaneous
+@section Bugs
+@cindex bugs
+
+Here is a list of things which should work differently, but which I
+have found too hard to fix.
+
+@itemize @bullet
+@item 
+When the application called by @kbd{C-c C-o} to open a file link fails
+(for example because the application does not exits or refuses to open
+the file), it does so silently.  No error message is displayed.
+@item 
+Under XEmacs, if Org-mode entries are included into the diary, it is
+not possible to jump back from the diary to the org file.  Apparently,
+the text properties are lost when the fancy-diary-display is used.
+However, from Org-mode's agenda (created with @kbd{C-c C-r} or
+@kbd{M-x org-agenda}), things do work correctly.
+@item 
+Linux should also have a default viewer application, using mailcap.
+Maybe we can use GNUS or VM mime code?  Or dired's guessing commands?
+Any hints (or even patches) are appreciated.
+@item 
+When you write @samp{x = a /b/ c}, b will be exported in italics.
+@item 
+The exporters work well, but could be made more efficient.
+@end itemize
+
+@node Index, Key Index, Miscellaneous, Top
+@chapter Index
+
+@printindex cp
+
+@node Key Index,  , Index, Top
+@chapter Key Index
+
+@printindex ky
+
+@bye
+
+