Wrap org stuff in emacs-22-or-later

git-svn-id: file:///svn/tfheen/trunk/dotfiles@1234 8da78d58-1cd3-0310-bee5-d77bd1b3e8bf

diff --git a/emacs b/emacs
index f3c248476ccd3841f9d4316af703919ffe3974fe..49867ccd4e532ae0fd1a4791022d8460c39df176 100644 (file)
--- a/emacs
+++ b/emacs
@@ -319,30 +319,31 @@
 (setq auto-mode-alist (append '(("\\.js$" . javascript-mode))
                               auto-mode-alist))
 
-(setq org-remember-templates
-      '((?t "* TODO %?\n  %i\n  %a" "~/svn/plans/todo.org")
-       (?a "* Appointment: %?\n%^T\n%i\n  %a" "~/svn/plans/todo.org")))
-(setq remember-annotation-functions '(org-remember-annotation))
-(setq remember-handler-functions '(org-remember-handler))
-(eval-after-load 'remember
-  '(add-hook 'remember-mode-hook 'org-remember-apply-template))
-(global-set-key (kbd "C-c r") 'remember)
-
-(setq org-return-follows-link t)
-(setq org-todo-keywords '("TODO" "STARTED" "WAITING" "DONE"))
-(setq org-agenda-include-diary t)
-(setq org-agenda-include-all-todo t)
-(require 'org)
-(add-to-list 'auto-mode-alist '("\\.org$" . org-mode))
-(global-set-key (kbd "C-c a") 'org-agenda)
-(setq org-agenda-custom-commands
-      '(("w" todo
-  #("WAITING" 0 7
-    (face org-warning)))
-       ("h" tags-todo "hjemme")
-       ("j" tags-todo "jobb")))
-(setq org-tags-column (* -1 (- (frame-width) 10))
-      org-agenda-align-tags-to-column (- (frame-width) 10))
+(cw/for-emacs-22-and-later
+ (setq org-remember-templates
+       '((?t "* TODO %?\n  %i\n  %a" "~/svn/plans/todo.org")
+        (?a "* Appointment: %?\n%^T\n%i\n  %a" "~/svn/plans/todo.org")))
+ (setq remember-annotation-functions '(org-remember-annotation))
+ (setq remember-handler-functions '(org-remember-handler))
+ (eval-after-load 'remember
+   '(add-hook 'remember-mode-hook 'org-remember-apply-template))
+ (global-set-key (kbd "C-c r") 'remember)
+
+ (setq org-return-follows-link t)
+ (setq org-todo-keywords '("TODO" "STARTED" "WAITING" "DONE"))
+ (setq org-agenda-include-diary t)
+ (setq org-agenda-include-all-todo t)
+ (require 'org)
+ (add-to-list 'auto-mode-alist '("\\.org$" . org-mode))
+ (global-set-key (kbd "C-c a") 'org-agenda)
+ (setq org-agenda-custom-commands
+       '(("w" todo
+         #("WAITING" 0 7
+           (face org-warning)))
+        ("h" tags-todo "hjemme")
+        ("j" tags-todo "jobb")))
+ (setq org-tags-column (* -1 (- (frame-width) 10))
+       org-agenda-align-tags-to-column (- (frame-width) 10)))
 
 (add-to-list 'window-size-change-functions
             (lambda (frame) (setq org-tags-column (* -1 (- (frame-width) 10))