--- a/.emacs-my	Thu Mar 03 12:02:07 2011 +0200
+++ b/.emacs-my	Thu Mar 03 12:04:46 2011 +0200
@@ -873,19 +873,20 @@
 (if (or (featurep 'org) (featurep 'org-install))
     (progn
       (add-to-list 'auto-mode-alist '("\\.org$" . org-mode))
-      (setq org-directory (expand-file-name "~/.gtd"))
-      (setq org-default-notes-file (expand-file-name "~/.gtd/notes"))
-      (setq org-agenda-ndays 31
-            org-deadline-warning-days 7
-            org-agenda-show-all-dates t
-            org-agenda-format-date "%Y-%m-%d, %A %e %B"
-            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-hide-leading-stars t
-            org-tags-column 64
-            )
+      (setq
+       org-directory "~/.gtd"
+       org-default-notes-file "~/.gtd/notes"
+       org-agenda-ndays 31
+       org-deadline-warning-days 7
+       org-agenda-show-all-dates t
+       org-agenda-format-date "%Y-%m-%d, %A %e %B"
+       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-hide-leading-stars t
+       org-tags-column 64
+       )
       (define-key global-map "\C-ca" 'org-agenda)
 
       (when