Release 4.55

org

@@ -5,7 +5,7 @@ START-INFO-DIR-ENTRY
 * Org Mode: (org).      outline-based notes management and organizer
 END-INFO-DIR-ENTRY
 
-   This manual is for Org-mode (version 4.54).
+   This manual is for Org-mode (version 4.55).
 
    Copyright (C) 2004, 2005, 2006 Free Software Foundation
 
@@ -27,7 +27,7 @@ File: org,  Node: Top,  Next: Introduction,  Prev: (dir),  Up: (dir)
 Org Mode Manual
 ***************
 
-This manual is for Org-mode (version 4.54).
+This manual is for Org-mode (version 4.55).
 
    Copyright (C) 2004, 2005, 2006 Free Software Foundation
 
@@ -273,28 +273,28 @@ 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
+contain lists or 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 that utilizes and smoothly integrates much of
-the Emacs calendar and diary.  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, as HTML, or (todo and
-agenda items only) as an iCalendar file.  It can also serve as a
-publishing tool for a set of linked webpages.
+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 that utilizes and smoothly integrates much of the Emacs calendar
+and diary.  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, as HTML, or (todo and agenda items only) as an
+iCalendar file.  It can also serve as a publishing tool for a set of
+linked webpages.
 
-   An important design aspect that distinguishes Org-mode from other
-packages like Planner/Muse is that it encougages to store every piece of
+   An important design aspect that distinguishes Org-mode from for
+example Planner/Muse is that it encougages to store every piece of
 information only once.  In Planner, you have project pages, day pages
 and possibly other files, duplicating some information such as tasks.
 In Org-mode, you only have notes files.  In your notes you mark entries
-as tasks, label them with tags and timestamps.  All necessary lists like
-a schedule for the day, the agenda for a meeting, tasks lists selected
-by tags etc are created dynamically when you need them.
+as tasks, label them with tags and timestamps.  All necessary lists
+like a schedule for the day, the agenda for a meeting, tasks lists
+selected by tags etc are created dynamically when you need them.
 
    Org-mode keeps simple things simple.  When first fired up, it should
 feel like a straightforward, easy to use outliner.  Complexity is not
@@ -434,12 +434,12 @@ error occurred.  Here is how to produce a useful backtrace:
   2. Go to the `Options' menu and select `Enter Debugger on Error'
      (XEmacs has this option in the `Troubleshooting' sub-menu).
 
-  3. Do whatever you have to do to hit the error.  Don't forget to to
+  3. Do whatever you have to do to hit the error.  Don't forget to
      document the steps you take.
 
   4. When you hit the error, a `*Backtrace*' buffer will appear on the
-     screen.  Safe this buffer to a file (for example using `C-x C-w'
-     and attach) it to your bug report.
+     screen.  Save this buffer to a file (for example using `C-x C-w')
+     and attach it to your bug report.
 
 
 File: org,  Node: Document structure,  Next: Tables,  Prev: Introduction,  Up: Top
@@ -4726,7 +4726,7 @@ modifications.
 
 Note that the leading stars are not truly replaced by whitespace, they
 are only fontified with the face `org-hide' that uses the background
-color as font color.  If are are not using either white or black
+color as font color.  If you are not using either white or black
 background, you may have to customize this face to get the wanted
 effect.  Another possibility is to set this font such that the extra
 stars are almost invisible, for example using the color `grey90' on a
@@ -5844,150 +5844,150 @@ Node: Summary10777
 Node: Installation13689
 Node: Activation15067
 Node: Feedback16316
-Node: Document structure18395
-Node: Outlines19169
-Node: Headlines19829
-Node: Visibility cycling20452
-Ref: Visibility cycling-Footnote-122203
-Ref: Visibility cycling-Footnote-222261
-Node: Motion22311
-Node: Structure editing23095
-Node: Archiving25411
-Node: ARCHIVE tag25969
-Node: Moving subtrees27762
-Node: Sparse trees28803
-Ref: Sparse trees-Footnote-130934
-Ref: Sparse trees-Footnote-231026
-Node: Plain lists31141
-Ref: Plain lists-Footnote-134666
-Ref: Plain lists-Footnote-235023
-Node: Tables35205
-Node: Built-in table editor35753
-Node: Narrow columns43361
-Ref: Narrow columns-Footnote-145300
-Node: Table calculations45346
-Node: Formula syntax46666
-Ref: Formula syntax-Footnote-149571
-Node: Lisp formulas49871
-Node: Column formulas50660
-Node: Advanced features52422
-Node: Named-field formulas55676
-Node: Editing/debugging formulas56316
-Node: Appetizer58074
-Node: orgtbl-mode59177
-Node: table.el59668
-Node: Hyperlinks60645
-Node: Link format61418
-Node: Internal links62711
-Ref: Internal links-Footnote-164700
-Node: Radio targets64832
-Node: CamelCase links65547
-Node: External links66141
-Node: Handling links68272
-Ref: Handling links-Footnote-172924
-Ref: Handling links-Footnote-273161
-Node: Link abbreviations73235
-Node: Search options74914
-Ref: Search options-Footnote-176692
-Node: Custom searches76773
-Node: Remember77821
-Node: TODO items81511
-Node: TODO basics82493
-Node: TODO extensions84020
-Node: Workflow states84815
-Node: TODO types85683
-Ref: TODO types-Footnote-187341
-Node: Per file keywords87423
-Ref: Per file keywords-Footnote-188877
-Node: Priorities89078
-Node: Breaking down tasks90322
-Ref: Breaking down tasks-Footnote-190842
-Node: Checkboxes90938
-Node: Timestamps93674
-Node: Time stamps94135
-Ref: Time stamps-Footnote-197624
-Node: Creating timestamps97740
-Node: The date/time prompt100365
-Ref: The date/time prompt-Footnote-1102058
-Node: Custom time format102164
-Node: Progress logging103723
-Node: Closing items104252
-Node: Clocking work time105156
-Ref: Clocking work time-Footnote-1108782
-Node: Tags108908
-Node: Tag inheritance109670
-Node: Setting tags110607
-Ref: Setting tags-Footnote-1114805
-Ref: Setting tags-Footnote-2114917
-Node: Tag searches115000
-Node: Agenda views117000
-Node: Agenda files119093
-Ref: Agenda files-Footnote-1120053
-Ref: Agenda files-Footnote-2120202
-Node: Agenda dispatcher120395
-Node: Weekly/Daily agenda122012
-Node: Calendar/Diary integration122977
-Node: Global TODO list124315
-Node: Matching headline tags126475
-Node: Timeline127533
-Node: Presentation and sorting128196
-Node: Categories128974
-Node: Time-of-day specifications129638
-Node: Sorting of agenda items131616
-Node: Agenda commands132898
-Node: Custom agenda views138786
-Node: Storing searches139461
-Node: Block agenda141373
-Node: Setting Options142603
-Node: Batch processing145315
-Node: Embedded LaTeX146445
-Ref: Embedded LaTeX-Footnote-1147537
-Node: Math symbols147727
-Node: Subscripts and Superscripts148492
-Node: LaTeX fragments149336
-Ref: LaTeX fragments-Footnote-1151444
-Node: Processing LaTeX fragments151706
-Node: CDLaTeX mode152652
-Ref: CDLaTeX mode-Footnote-1155136
-Node: Exporting155284
-Node: ASCII export156598
-Node: HTML export157888
-Node: XOXO export160724
-Node: iCalendar export161163
-Node: Text interpretation162986
-Node: Comment lines163465
-Node: Enhancing text163936
-Node: Export options165628
-Node: Publishing167295
-Ref: Publishing-Footnote-1168091
-Node: Configuration168287
-Node: Project alist169005
-Node: Sources and destinations170071
-Node: Selecting files170801
-Node: Publishing action171549
-Node: Publishing options172782
-Node: Publishing links174934
-Node: Project page index176447
-Node: Sample configuration177225
-Node: Simple example177717
-Node: Complex example178390
-Node: Triggering publication180466
-Node: Miscellaneous181151
-Node: Completion181785
-Node: Customization183256
-Node: In-buffer settings183841
-Node: The very busy C-c C-c key187461
-Node: Clean view189105
-Node: TTY keys191682
-Node: Interaction193291
-Node: Cooperation193688
-Node: Conflicts195555
-Node: Bugs197147
-Node: Extensions and Hacking198770
-Node: Extensions199256
-Node: Dynamic blocks201057
-Node: History and Acknowledgments202984
-Node: Index207992
-Node: Key Index235080
+Node: Document structure18392
+Node: Outlines19166
+Node: Headlines19826
+Node: Visibility cycling20449
+Ref: Visibility cycling-Footnote-122200
+Ref: Visibility cycling-Footnote-222258
+Node: Motion22308
+Node: Structure editing23092
+Node: Archiving25408
+Node: ARCHIVE tag25966
+Node: Moving subtrees27759
+Node: Sparse trees28800
+Ref: Sparse trees-Footnote-130931
+Ref: Sparse trees-Footnote-231023
+Node: Plain lists31138
+Ref: Plain lists-Footnote-134663
+Ref: Plain lists-Footnote-235020
+Node: Tables35202
+Node: Built-in table editor35750
+Node: Narrow columns43358
+Ref: Narrow columns-Footnote-145297
+Node: Table calculations45343
+Node: Formula syntax46663
+Ref: Formula syntax-Footnote-149568
+Node: Lisp formulas49868
+Node: Column formulas50657
+Node: Advanced features52419
+Node: Named-field formulas55673
+Node: Editing/debugging formulas56313
+Node: Appetizer58071
+Node: orgtbl-mode59174
+Node: table.el59665
+Node: Hyperlinks60642
+Node: Link format61415
+Node: Internal links62708
+Ref: Internal links-Footnote-164697
+Node: Radio targets64829
+Node: CamelCase links65544
+Node: External links66138
+Node: Handling links68269
+Ref: Handling links-Footnote-172921
+Ref: Handling links-Footnote-273158
+Node: Link abbreviations73232
+Node: Search options74911
+Ref: Search options-Footnote-176689
+Node: Custom searches76770
+Node: Remember77818
+Node: TODO items81508
+Node: TODO basics82490
+Node: TODO extensions84017
+Node: Workflow states84812
+Node: TODO types85680
+Ref: TODO types-Footnote-187338
+Node: Per file keywords87420
+Ref: Per file keywords-Footnote-188874
+Node: Priorities89075
+Node: Breaking down tasks90319
+Ref: Breaking down tasks-Footnote-190839
+Node: Checkboxes90935
+Node: Timestamps93671
+Node: Time stamps94132
+Ref: Time stamps-Footnote-197621
+Node: Creating timestamps97737
+Node: The date/time prompt100362
+Ref: The date/time prompt-Footnote-1102055
+Node: Custom time format102161
+Node: Progress logging103720
+Node: Closing items104249
+Node: Clocking work time105153
+Ref: Clocking work time-Footnote-1108779
+Node: Tags108905
+Node: Tag inheritance109667
+Node: Setting tags110604
+Ref: Setting tags-Footnote-1114802
+Ref: Setting tags-Footnote-2114914
+Node: Tag searches114997
+Node: Agenda views116997
+Node: Agenda files119090
+Ref: Agenda files-Footnote-1120050
+Ref: Agenda files-Footnote-2120199
+Node: Agenda dispatcher120392
+Node: Weekly/Daily agenda122009
+Node: Calendar/Diary integration122974
+Node: Global TODO list124312
+Node: Matching headline tags126472
+Node: Timeline127530
+Node: Presentation and sorting128193
+Node: Categories128971
+Node: Time-of-day specifications129635
+Node: Sorting of agenda items131613
+Node: Agenda commands132895
+Node: Custom agenda views138783
+Node: Storing searches139458
+Node: Block agenda141370
+Node: Setting Options142600
+Node: Batch processing145312
+Node: Embedded LaTeX146442
+Ref: Embedded LaTeX-Footnote-1147534
+Node: Math symbols147724
+Node: Subscripts and Superscripts148489
+Node: LaTeX fragments149333
+Ref: LaTeX fragments-Footnote-1151441
+Node: Processing LaTeX fragments151703
+Node: CDLaTeX mode152649
+Ref: CDLaTeX mode-Footnote-1155133
+Node: Exporting155281
+Node: ASCII export156595
+Node: HTML export157885
+Node: XOXO export160721
+Node: iCalendar export161160
+Node: Text interpretation162983
+Node: Comment lines163462
+Node: Enhancing text163933
+Node: Export options165625
+Node: Publishing167292
+Ref: Publishing-Footnote-1168088
+Node: Configuration168284
+Node: Project alist169002
+Node: Sources and destinations170068
+Node: Selecting files170798
+Node: Publishing action171546
+Node: Publishing options172779
+Node: Publishing links174931
+Node: Project page index176444
+Node: Sample configuration177222
+Node: Simple example177714
+Node: Complex example178387
+Node: Triggering publication180463
+Node: Miscellaneous181148
+Node: Completion181782
+Node: Customization183253
+Node: In-buffer settings183838
+Node: The very busy C-c C-c key187458
+Node: Clean view189102
+Node: TTY keys191679
+Node: Interaction193288
+Node: Cooperation193685
+Node: Conflicts195552
+Node: Bugs197144
+Node: Extensions and Hacking198767
+Node: Extensions199253
+Node: Dynamic blocks201054
+Node: History and Acknowledgments202981
+Node: Index207989
+Node: Key Index235077
 
 End Tag Table

org.el

@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <dominik at science dot uva dot nl>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://www.astro.uva.nl/~dominik/Tools/org/
-;; Version: 4.54
+;; Version: 4.55
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -61,6 +61,9 @@
 ;;
 ;; Recent changes
 ;; --------------
+;; Version 4.55
+;;    - Bug fixes.
+;;
 ;; Version 4.54
 ;;    - Improvements to fast tag selection
 ;;      + show status also in target line.
@@ -164,7 +167,7 @@
 
 ;;; Customization variables
 
-(defvar org-version "4.54"
+(defvar org-version "4.55"
   "The version number of the file org.el.")
 (defun org-version ()
   (interactive)
@@ -2147,18 +2150,18 @@ headline  Only export the headline, but skip the tree below it."
 	  (const :tag "entirely" t)))
 
 (defcustom org-export-with-timestamps t
-  "Nil means, do not export time stamps and associated keywords."
+  "If nil, do not export time stamps and associated keywords."
   :group 'org-export-general
   :type 'boolean)
 
 (defcustom org-export-remove-timestamps-from-toc t
-  "Nil means, remove timestamps from the table of contents entries."
+  "If nil, remove timestamps from the table of contents entries."
   :group 'org-export-general
   :type 'boolean)
 
 (defcustom org-export-with-tags 'not-in-toc
-  "Nil means, do not export tags, just remove them from headlines.
-If this is the sysmbol `not-in-toc', tags will be removed from table of
+  "If nil, do not export tags, just remove them from headlines.
+If this is the symbol `not-in-toc', tags will be removed from table of
 contents entries, but still be shown in the headlines of the document."
   :group 'org-export-general
   :type '(choice
@@ -3275,7 +3278,9 @@ The following commands are available:
   (let ((current-prefix-arg arg)) (call-interactively command)))
 
 (defsubst org-current-line (&optional pos)
-  (+ (if (bolp) 1 0) (count-lines (point-min) (or pos (point)))))
+  (save-excursion
+    (and pos (goto-char pos))
+    (+ (if (bolp) 1 0) (count-lines (point-min) (point)))))
 
 (defun org-current-time ()
   "Current time, possibly rounded to `org-time-stamp-rounding-minutes'."
@@ -3392,7 +3397,7 @@ that will be added to PLIST.  Returns the string that was modified."
   "Regular expression matching a time stamp or time stamp range.
 The time stamps may be either active or inactive.")
 
-(defvar org-<EFBFBD>§emph-face nil)
+(defvar org-emph-face nil)
 
 (defun org-do-emphasis-faces (limit)
   "Run through the buffer and add overlays to links."
@@ -5960,7 +5965,7 @@ 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
 months.  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)
+       \(setq org-popup-calendar-for-date-prompt nil)
 
 With optional argument TO-TIME, the date will immediately be converted
 to an internal time.
@@ -6412,7 +6417,8 @@ in the timestamp determines what will be changed."
 	  (setcar (nthcdr 1 time0) (or (nth 1 time0) 0))
 	  (setcar (nthcdr 2 time0) (or (nth 1 time0) 0))
 	  (setq time (apply 'encode-time time0))))
-    (org-insert-time-stamp time with-hm inactive)
+    (setq org-last-changed-timestamp
+	  (org-insert-time-stamp time with-hm inactive))
     (org-clock-update-time-maybe)
     (goto-char pos)
     ;; Try to recenter the calendar window, if any
@@ -6774,7 +6780,7 @@ the returned times will be formatted strings."
 		     (apply 'encode-time (org-parse-time-string te)))))
     (move-marker ins (point))
     (setq ipos (point))
-    ;; FIXME: does not yet use org-insert-time-stamp or custom format
+    ;; FIXME: does not yet use org-insert-time-stamp
     (insert-before-markers "Clock summary at ["
 			   (substring
 			    (format-time-string (cdr org-time-stamp-formats))
@@ -7472,7 +7478,7 @@ NDAYS defaults to `org-agenda-ndays'."
 			 (d (- nt n1)))
 		    (- sd (+ (if (< d 0) 7 0) d)))))
 	 (day-numbers (list start))
-;FIXME	 (inhibit-redisplay t)
+	 (inhibit-redisplay t)
 	 s e rtn rtnall file date d start-pos end-pos todayp nd)
     (setq org-agenda-redo-command
 	  (list 'org-agenda-list (list 'quote include-all) start-day ndays))
@@ -7575,6 +7581,7 @@ the list to these.  When using \\[universal-argument], you will be prompted
 for a keyword.  A numeric prefix directly selects the Nth keyword in
 `org-todo-keywords'."
   (interactive "P")
+  (require 'calendar)
   (org-compile-prefix-format 'todo)
   (org-set-sorting-strategy 'todo)
   (let* ((today (time-to-days (current-time)))
@@ -8249,7 +8256,7 @@ the documentation of `org-diary'."
 			 "[^\n\r]*\\)"))
 	 (deadline-re (concat ".*\\(\n[^*].*\\)?" org-deadline-time-regexp))
 	 (sched-re (concat ".*\\(\n[^*].*\\)?" org-scheduled-time-regexp))
-; FIXME why was this wriong?	 (sched-re (concat ".*\n?.*?" org-scheduled-time-regexp))
+; FIXME why was this wrong?	 (sched-re (concat ".*\n?.*?" org-scheduled-time-regexp))
 	 marker priority category tags
 	 ee txt)
     (goto-char (point-min))
@@ -8990,7 +8997,6 @@ The new content of the line will be NEWHEAD (as modified by
 If FIXFACE is non-nil, the face of each item is modified acording to
 the new TODO state."
   (let* (props m pl undone-face done-face finish new dotime cat tags)
-;    (setq newhead (org-format-agenda-item "x" newhead "x" nil 'noprefix))
     (save-excursion
       (goto-char (point-max))
       (beginning-of-line 1)
@@ -9017,9 +9023,8 @@ the new TODO state."
 		   (point-at-bol) (point-at-eol)
 		   (list 'face
 			 (if org-last-todo-state-is-todo
-			     undone-face done-face)))
-		  (org-agenda-highlight-todo 'line))
-		;; (org-agenda-align-tags 'line) ;; done below by finalize
+			     undone-face done-face))))
+		(org-agenda-highlight-todo 'line)
 		(beginning-of-line 1))
 	    (error "Line update did not work")))
 	(beginning-of-line 0)))
@@ -9440,37 +9445,6 @@ MATCH can contain positive and negative selection of tags, like
   (interactive "P")
   (org-scan-tags 'sparse-tree (cdr (org-make-tags-matcher match))))
 
-;; FIXME: remove this function.
-(defun org-make-tags-matcher-old (match)
-  "Create the TAGS matcher form for the tags-selecting string MATCH."
-  (unless match
-    ;; Get a new match request, with completion
-    (setq org-last-tags-completion-table
-	  (or org-tag-alist
-	      org-last-tags-completion-table))
-    (setq match (completing-read
-		 "Tags: " 'org-tags-completion-function nil nil nil
-		 'org-tags-history)))
-  ;; parse the string and create a lisp form
-  (let ((match0 match) minus tag mm matcher orterms term orlist)
-    (setq orterms (org-split-string match "|"))
-    (while (setq term (pop orterms))
-      (while (string-match "^&?\\([-+:]\\)?\\([A-Za-z_@0-9]+\\)" term)
-	(setq minus (and (match-end 1)
-			 (equal (match-string 1 term) "-"))
-	      tag (match-string 2 term)
-	      term (substring term (match-end 0))
-	      mm (list 'member (downcase tag) 'tags-list)
-	      mm (if minus (list 'not mm) mm))
-	(push mm matcher))
-      (push (if (> (length matcher) 1) (cons 'and matcher) (car matcher))
-	    orlist)
-      (setq matcher nil))
-    (setq matcher (if (> (length orlist) 1) (cons 'or orlist) (car orlist)))
-    ;; Return the string and lisp forms of the matcher
-    (cons match0 matcher)))
-
-
 (defun org-make-tags-matcher (match)
   "Create the TAGS//TODO matcher form for the selection string MATCH."
   (unless match
@@ -16599,6 +16573,7 @@ See the individual commands for more information."
    ((org-at-table-p) (org-call-with-arg 'org-table-move-column 'left))
    ((or (org-on-heading-p) (org-region-active-p))
     (call-interactively 'org-do-promote))
+   ((org-at-item-p) (call-interactively 'org-outdent-item))
    (t (call-interactively 'backward-word))))
 
 (defun org-metaright (&optional arg)
@@ -16611,6 +16586,7 @@ See the individual commands for more information."
    ((org-at-table-p) (call-interactively 'org-table-move-column))
    ((or (org-on-heading-p) (org-region-active-p))
     (call-interactively 'org-do-demote))
+   ((org-at-item-p) (call-interactively 'org-indent-item))
    (t (call-interactively 'forward-word))))
 
 (defun org-metaup (&optional arg)

org.texi

@@ -3,7 +3,7 @@
 @setfilename ../info/org
 @settitle Org Mode Manual
 
-@set VERSION 4.54
+@set VERSION 4.55
 @set DATE November 2006
 
 @dircategory Emacs
@@ -303,28 +303,28 @@ 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 that
-utilizes and smoothly integrates much of the Emacs calendar and diary.
-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
+lists or 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 that utilizes and smoothly integrates much of the Emacs calendar
+and diary.  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, as HTML, or (todo and agenda items only) as an
 iCalendar file.  It can also serve as a publishing tool for a set of
 linked webpages.
 
-An important design aspect that distinguishes Org-mode from other
-packages like Planner/Muse is that it encougages to store every piece of
-information only once.  In Planner, you have project pages, day pages
-and possibly other files, duplicating some information such as tasks.
-In Org-mode, you only have notes files.  In your notes you mark entries
-as tasks, label them with tags and timestamps.  All necessary lists like
-a schedule for the day, the agenda for a meeting, tasks lists selected
-by tags etc are created dynamically when you need them.
+An important design aspect that distinguishes Org-mode from for example
+Planner/Muse is that it encougages to store every piece of information
+only once.  In Planner, you have project pages, day pages and possibly
+other files, duplicating some information such as tasks.  In Org-mode,
+you only have notes files.  In your notes you mark entries as tasks,
+label them with tags and timestamps.  All necessary lists like a
+schedule for the day, the agenda for a meeting, tasks lists selected by
+tags etc are created dynamically when you need them.
 
 Org-mode keeps simple things simple.  When first fired up, it should
 feel like a straightforward, easy to use outliner.  Complexity is not
@@ -495,12 +495,12 @@ emacs -l /path/to/org.el
 Go to the @code{Options} menu and select @code{Enter Debugger on Error}
 (XEmacs has this option in the @code{Troubleshooting} sub-menu).
 @item
-Do whatever you have to do to hit the error.  Don't forget to to
+Do whatever you have to do to hit the error.  Don't forget to
 document the steps you take.
 @item
 When you hit the error, a @file{*Backtrace*} buffer will appear on the
-screen.  Safe this buffer to a file (for example using @kbd{C-x C-w} and
-attach) it to your bug report.
+screen.  Save this buffer to a file (for example using @kbd{C-x C-w}) and
+attach it to your bug report.
 @end enumerate
 
 @node Document structure, Tables, Introduction, Top
@@ -5200,7 +5200,7 @@ With stars hidden, the tree becomes:
 @noindent
 Note that the leading stars are not truly replaced by whitespace, they
 are only fontified with the face @code{org-hide} that uses the
-background color as font color.  If are are not using either white or
+background color as font color.  If you are not using either white or
 black background, you may have to customize this face to get the wanted
 effect.  Another possibility is to set this font such that the extra
 stars are @i{almost} invisible, for example using the color
@@ -5550,6 +5550,7 @@ be complete, if I have forgotten someone, please accept my apologies and
 let me know.
 
 @itemize @bullet
+
 @item
 @i{Thomas Baumann} contributed the code for links to the MH-E email
 system.

orgcard.tex

@@ -1,5 +1,5 @@
 % Reference Card for Org Mode
-\def\orgversionnumber{4.54}
+\def\orgversionnumber{4.55}
 \def\year{2006}
 %
 %**start of header