update .emacs with org mode columns

[emacs.git] / .emacs

diff --git a/.emacs b/.emacs
index 535c48410a77a4e1784217eedead8e6d2681cb8e..f37d936892081ae7023327f571051168e121091a 100644 (file)
--- a/.emacs
+++ b/.emacs
@@ -48,6 +48,9 @@
  '(vc-delete-logbuf-window nil)
  '(vc-follow-symlinks t))
 
+;; use git before SVN; use CVS earlier, because I have CVS
+;; repositories inside of git directories
+(setq vc-handled-backends (quote (CVS Git RCS SVN SCCS Bzr Hg Mtn Arch)))
 
 ;; switch back to the old primary selection method
 (setq x-select-enable-clipboard nil)
@@ -97,7 +100,7 @@
              "~/projects/fh/fh.org")))
 
 (setq org-global-properties '(("Effort_ALL 0 0:10 0:30 1:00 2:00 3:00 4:00 5:00 6:00 7:00")))
-(setq org-columns-default-format "%40ITEM(Task) %TAGS %PRIORITY %TODO %17Effort(Estimated Effort){:} %CLOCKSUM")
+(setq org-columns-default-format "%40ITEM(Task) %TAGS %PRIORITY %TODO %13SCHEDULED %17Effort(Estimated Effort){:} %CLOCKSUM")
 
 (setq org-default-notes-file "~/projects/notes/notes.org")
 (setq org-capture-templates  ;; mail-specific note template, identified by "m"
@@ -219,13 +222,42 @@ Maildir, or by Message-ID."
 
 (add-to-list 'auto-mode-alist '("mutt-[a-z0-9]+-[0-9]+-" . message-mode))
 (add-to-list 'auto-mode-alist '("muttrc" . muttrc-mode))
-(add-hook 'mail-mode-hook
-     (lambda ()
-      (font-lock-add-keywords nil
-        '(("^[ \t]*>[ \t]*>[ \t]*>.*$"
-           (0 'mail-multiply-quoted-text-face))
-          ("^[ \t]*>[ \t]*>.*$"
-           (0 'mail-double-quoted-text-face))))))
+(defun my-message-mode-settings ()
+  (font-lock-add-keywords nil
+                          '(("^[ \t]*>[ \t]*>[ \t]*>.*$"
+                             (0 'message-multiply-quoted-text-face))
+                            ("^[ \t]*>[ \t]*>.*$"
+                             (0 'message-double-quoted-text-face))))
+  (local-set-key (kbd "C-c C-a") 'my-post-attach-file)
+  )
+(add-hook 'message-mode-hook 'my-message-mode-settings)
+
+(defun my-post-attach-file ()
+  "Prompt for an attachment."
+  (interactive)
+  (let ((file (read-file-name "Attach file: " nil nil t nil))
+        (description (string-read "Description: ")))
+    (my-header-attach-file file description)))
+
+(symbol-function 'my-post-attach-file)
+
+(defun my-header-attach-file (file description)
+  "Attach a FILE to the current message (works with Mutt).
+Argument DESCRIPTION MIME description."
+  (interactive "fAttach file: \nsDescription: ")
+  (when (> (length file) 0)
+    (save-excursion
+      (save-match-data
+        (save-restriction
+          (widen)
+          (goto-char (point-min))
+          (search-forward-regexp "^$")
+          (insert (concat "Attach: " (replace-regexp-in-string "\\([[:space:]\\]\\)" "\\\\\\1" (file-truename file)) " "
+                          description "\n"))
+          (message (concat "Attached '" file "'."))
+          (setq post-has-attachment t))))))
+
+
 
 (setq mail-yank-prefix "> ")
 
@@ -369,6 +401,18 @@ Maildir, or by Message-ID."
 (add-hook 'post-mode-hook
          (auto-fill-mode nil)
          )
+; abbrev mode settings
+; load abbreviations from 
+(setq abbrev-file-name       
+      "~/.emacs_abbrev_def")
+
+; read the abbrev file if it exists
+(if (file-exists-p abbrev-file-name)
+    (quietly-read-abbrev-file))
+
+; for now, use abbrev mode everywhere
+(setq default-abbrev-mode t)
+
 
 (defun insert-function-documentation ()
   "Insert function documentation"
@@ -464,19 +508,26 @@ Maildir, or by Message-ID."
  (global-set-key "\M-o" cm-map)
 
 (defun my-org-mode-setup ()
- (when (and (buffer-file-name)
-            (file-exists-p (buffer-file-name)))
   (load-library "reftex")
   (and (buffer-file-name)
-        (file-exists-p (buffer-file-name))
-        (reftex-parse-all))
-   (reftex-set-cite-format
-     '((?b . "[[bib::%l]]")
-       (?n . "[[note::%l]]"))))
-   (define-key org-mode-map "\C-c\C-g" 'reftex-citation)
-)
+       (file-exists-p (buffer-file-name))
+       (progn
+         (reftex-parse-all)
+         (reftex-set-cite-format
+          '((?b . "[[bib::%l][%l-bib]]")
+            (?n . "[[note::%l][%l-notes]]")
+            (?h . "** %t\n:PROPERTIES:\n:Custom_ID: %l\n:END:\n[[papers:%l][%l-paper]]")))
+         ))
+  (define-key org-mode-map (kbd "C-c )") 'reftex-citation)
+  (define-key org-mode-map (kbd "C-c (") 'org-mode-reftex-search)
+  )
 (add-hook 'org-mode-hook 'my-org-mode-setup)
 
+(defun org-mode-reftex-search ()
+  (interactive)
+  (org-open-link-from-string (format "[[notes:%s]]" (reftex-citation t))))
+
+
 (setq-default org-mobile-directory "/rzlab.ucr.edu:/sites/dav.donarmstrong.com/root/org/")
 (setq-default org-directory "/home/don/org-mode/")
 (setq-default org-mobile-inbox-for-pull "/home/don/org-mode/from-mobile.org")