--- a/.emacs-my	Sun Jun 29 22:52:31 2008 -0400
+++ b/.emacs-my	Sun Jun 29 23:43:48 2008 -0400
@@ -593,6 +593,55 @@
 ;; )
 
 ;; ======================================================================
+;; Organize, todo mode.
+
+;; ----------------------------------------------------------------------
+;; org-mode
+
+(if (featurep 'org)
+    (progn
+      (add-to-list 'auto-mode-alist '("\\.org$" . org-mode))
+      (setq org-agenda-files "~/todo.org"
+            org-default-notes-file "~/notes.org"
+            org-agenda-ndays 20
+            org-deadline-warning-days 14
+            org-agenda-show-all-dates t
+            org-agenda-skip-deadline-if-done t
+            org-agenda-skip-scheduled-if-done t
+            org-agenda-start-on-weekday nil
+            org-reverse-note-order t
+            org-remember-store-without-prompt t)))
+
+;; ----------------------------------------------------------------------
+;; TODO, XXX, FIXME highlight.
+;; Show blanks and FIXME
+;; http://www.emacswiki.org/cgi-bin/wiki/EightyColumnRule
+
+(defface my-tab-face
+  '((t :background "gray"))
+  "Face for showing TABs."
+  :group 'basic-faces)
+
+(defface my-todo-face
+  '((t :foreground "red" :weight bold))
+  "Font for showing TODO words."
+  :group 'basic-faces)
+
+(defface my-conflict-face
+  '((t :background "pink" :foreground "red" :weight bold))
+  "Font for showing conflicts."
+  :group 'basic-faces)
+
+(add-hook 'font-lock-mode-hook (function (lambda ()
+  (unless (or (eq 'diff-mode major-mode) (eq 'script-mode major-mode))
+    (font-lock-add-keywords nil
+     '(
+       ("\t+" 0 'my-tab-face t)
+       ("\\<\\(FIXME:?\\|XXX:?\\|TODO:?\\)\\>" 1 'my-todo-face t)
+       ("\\(=\\{7,\\}\\|<\\{7,\\}\\|>\\{7,\\}\\)" 1 'my-conflict-face t)
+       ))))))
+
+;; ======================================================================
 ;; VCS, version control, cvs, svn.
 
 (if (equal window-system 'w32)
@@ -630,35 +679,6 @@
 ;;                           (setq show-trailing-whitespace t)))
 
 ;; ----------------------------------------------------------------------
-;; TODO, XXX, FIXME highlight.
-;; Show blanks and FIXME
-;; http://www.emacswiki.org/cgi-bin/wiki/EightyColumnRule
-
-(defface my-tab-face
-  '((t :background "gray"))
-  "Face for showing TABs."
-  :group 'basic-faces)
-
-(defface my-todo-face
-  '((t :foreground "red" :weight bold))
-  "Font for showing TODO words."
-  :group 'basic-faces)
-
-(defface my-conflict-face
-  '((t :background "pink" :foreground "red" :weight bold))
-  "Font for showing conflicts."
-  :group 'basic-faces)
-
-(add-hook 'font-lock-mode-hook (function (lambda ()
-  (unless (or (eq 'diff-mode major-mode) (eq 'script-mode major-mode))
-    (font-lock-add-keywords nil
-     '(
-       ("\t+" 0 'my-tab-face t)
-       ("\\<\\(FIXME:?\\|XXX:?\\|TODO:?\\)\\>" 1 'my-todo-face t)
-       ("\\(=\\{7,\\}\\|<\\{7,\\}\\|>\\{7,\\}\\)" 1 'my-conflict-face t)
-       ))))))
-
-;; ----------------------------------------------------------------------
 ;; Diff, patch
 (setq diff-switches "-u")