X-Git-Url: https://git.donarmstrong.com/?p=home-base.git;a=blobdiff_plain;f=.emacs;h=e8dd095802fa631ee2c93f2a37ea6375a43faab5;hp=414f60f9d0253dc3eda8c1e535542779b2f0a8d3;hb=d05b7a52f56a137ab358d3d74eace25df90ff698;hpb=3518c58806285a154fb7b28aa1527decf59fdd94

diff --git a/.emacs b/.emacs
index 414f60f..e8dd095 100644
--- a/.emacs
+++ b/.emacs
@@ -22,8 +22,10 @@
  '(global-set-key "\347" t)
  '(iswitchb-mode t)
  '(iswitchb-prompt-newbuffer nil)
+ '(log-edit-keep-buffer t)
  '(mail-user-agent (quote sendmail-user-agent))
  '(mutt-alias-file-list (quote ("~/.mutt/aliases" "~/.mail_aliases")))
+ '(org-agenda-files (quote ("~/projects/notes/notes.org" "~/projects/origins_of_life/paper/figure_list.org" "~/projects/origins_of_life/notes.org" "~/projects/sysadmin/sndservers/notes.org")))
  '(post-email-address "don@donarmstrong.com")
  '(post-kill-quoted-sig nil)
  '(post-mail-message "mutt\\(ng\\|\\)-[a-z0-9]+-[0-9]+-.*")
@@ -35,6 +37,7 @@
  '(ps-print-footer t)
  '(ps-print-footer-frame nil)
  '(ps-print-only-one-header t)
+ '(safe-local-variable-values (quote ((auto-save-default) (make-backup-files))))
  '(sentence-end "[.?!][]\"')]*\\($\\|	\\| \\)[ 	
 ]*")
  '(sentence-end-double-space nil)
@@ -52,15 +55,17 @@
 (require 'tinyprocmail)
 
 (require 'tex-site)
-(require 'psvn)
+;;(require 'psvn)
 (require 'cperl-mode)
 ;;(require 'ecasound)
 ;;(require 'emacs-wiki)
 (require 'bibtex)
 (require 'post)
 ;;(require 'fixme)
+(require 'google-weather)
+(require 'org-google-weather)
 
-(global-set-key "\C-xp" 'gnuserv-edit)
+(global-set-key "\C-xp" 'server-edit)
 
 (setq auto-mode-alist (cons '("\.wml$" . 
 			      (lambda () (html-mode) (auto-fill-mode)))
@@ -189,7 +194,7 @@
 (column-number-mode t)
 (setq reftex-plug-into-AUCTeX t)
 
-(gnuserv-start)
+(server-start)
 
 (require 'mode-compile)
 
@@ -206,13 +211,13 @@
 					; number if you have a faster computer or read slower than me.
 '(font-lock-verbose 1000)
 ;(setq server-temp-file-regexp "mutt\(-\|ng-\)")
-(add-hook 'server-switch-hook 
-	  (function (lambda()
-		      (cond ((string-match "Post" mode-name)
-			     (post-goto-body)))
-		      set-buffer-file-coding-system 'utf-8
-		      )))
-
+; (add-hook 'server-switch-hook 
+; 	  (function (lambda()
+; 		      (cond ((string-match "Post" mode-name)
+; 			     (post-goto-body)))
+; 		      set-buffer-file-coding-system 'utf-8
+; 		      )))
+; 
 
 (add-hook 'post-mode-hook
 	  (auto-fill-mode nil)
@@ -251,3 +256,12 @@
 (put 'upcase-region 'disabled nil)
 
 (put 'downcase-region 'disabled nil)
+
+;; The following lines are always needed. Choose your own keys.
+(add-to-list 'auto-mode-alist '("\\.org\\'" . org-mode))
+(add-hook 'org-mode-hook 'turn-on-font-lock) ; not needed when global-font-lock-mode is on
+(global-set-key "\C-cl" 'org-store-link)
+(global-set-key "\C-ca" 'org-agenda)
+(global-set-key "\C-cb" 'org-iswitchb)
+(setq org-log-done 'time)
+(setq org-log-done 'note)
\ No newline at end of file