X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=.emacs;h=f37d936892081ae7023327f571051168e121091a;hb=5d29561746b27218b3832146ce00cc75077360a9;hp=33d68dc981d2544da6ce05da583851a905562ab6;hpb=586c6758f55a062e763d822371568ed3754736b1;p=emacs.git

diff --git a/.emacs b/.emacs
index 33d68dc..f37d936 100644
--- 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)
@@ -66,6 +69,8 @@
 (add-hook 'tinyprocmail--load-hook 'tinyprocmail-install)
 (require 'tinyprocmail)
 
+(require 'vcl-mode)
+
 (require 'tex-site)
 ;;(require 'psvn)
 (require 'cperl-mode)
@@ -78,6 +83,13 @@
 (require 'org-google-weather)
 (setq-default org-google-weather-format "%i %c, [%l,%h] %s %C")
 
+; http://julien.danjou.info/projects/emacs-packages#rainbow-mode
+; this colorizes color strings
+(require 'rainbow-mode)
+; add ess to the x major mode
+(add-to-list 'rainbow-x-colors-major-mode-list 'ESS[S])
+(add-to-list 'rainbow-x-colors-major-mode-list 'ESS[R])
+
 ; org mode agenda files
 (setq org-agenda-files
       (quote ("~/projects/debbugs/debbugs.org"
@@ -88,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-global-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"
@@ -169,6 +181,22 @@
 (defadvice org-protocol-capture (before set-org-protocol-flag activate)
   (setq my-org-protocol-flag t))
 
+
+; this comes from http://upsilon.cc/~zack/blog/posts/2010/02/integrating_Mutt_with_Org-mode/
+(defun open-mail-in-mutt (message)
+  "Open a mail message in Mutt, using an external terminal.
+
+Message can be specified either by a path pointing inside a
+Maildir, or by Message-ID."
+  (interactive "MPath or Message-ID: ")
+  (shell-command
+   (format "xterm -e \"%s %s\""
+       (substitute-in-file-name "$HOME/bin/mutt_open") message)))
+
+;; add support for "mutt:ID" links
+(org-add-link-type "mutt" 'open-mail-in-mutt)
+
+
 (global-set-key "\C-xp" 'server-edit)
 
 (setq-default auto-mode-alist (cons '("\.wml$" . 
@@ -182,15 +210,56 @@
 (add-to-list 'interpreter-mode-alist '("perl5" . cperl-mode))
 (add-to-list 'interpreter-mode-alist '("miniperl" . cperl-mode))
 
-(add-to-list 'auto-mode-alist '("muttng-[a-z0-9]+-[0-9]+-" . post-mode))
+; use markdown mode for mdwn files
+(add-to-list 'auto-mode-alist '("\\.mdwn$" . markdown-mode))
+
+
+
+
+; mail configuration
+(add-to-list 'auto-mode-alist '("muttng-[a-z0-9]+-[0-9]+-" . message-mode))
 (add-to-list 'auto-mode-alist '("muttngrc" . muttrc-mode))
 
-(add-to-list 'auto-mode-alist '("mutt-[a-z0-9]+-[0-9]+-" . post-mode))
+(add-to-list 'auto-mode-alist '("mutt-[a-z0-9]+-[0-9]+-" . message-mode))
 (add-to-list 'auto-mode-alist '("muttrc" . muttrc-mode))
+(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))))))
 
-(add-to-list 'auto-mode-alist '("\\.mdwn$" . markdown-mode))
 
 
+(setq mail-yank-prefix "> ")
 
 (global-unset-key "\M-g")
 (global-set-key "\M-g" 'goto-line)
@@ -205,10 +274,10 @@
 ;;   which really should be,
 ;;   if (-!-) {
 ;;   }
-(setq-default cperl-hairy t
+(setq cperl-hairy t
       cperl-indent-level 4
-;;      cperl-auto-newline t
-;;      cperl-auto-newline-after-colon t
+      cperl-auto-newline nil
+      cperl-auto-newline-after-colon nil
       cperl-continued-statement-offset 4
       cperl-brace-offset -4
       cperl-label-offset -4
@@ -221,15 +290,15 @@
 
 ;(load-library "php-mode")
 
-(setq-default c-indent-level 8)
+(setq-default c-indent-level 4)
 (setq-default c-brace-imaginary-offset 0)
-(setq-default c-brace-offset -8)
-(setq-default c-argdecl-indent 8)
-(setq-default c-label-offset -8)
-(setq-default c-continued-statement-offset 8)
+(setq-default c-brace-offset -4)
+(setq-default c-argdecl-indent 4)
+(setq-default c-label-offset -4)
+(setq-default c-continued-statement-offset 4)
 ; tabs are annoying
 (setq-default indent-tabs-mode nil)
-(setq-default tab-width 8)
+(setq-default tab-width 4)
 
 
 ;; (autoload 'php-mode "php-mode" "PHP editing mode" t)
@@ -332,9 +401,23 @@
 (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)
+
 
-(fset 'insert-function-documentation
-   [?\C-x ?i home ?\C-k ?/ ?h ?o ?m ?e ?/ ?d ?o ?n ?/ ?l ?i ?b ?/ ?t ?e ?m ?p ?l ?a ?t ?e ?s ?/ ?p ?e ?r ?l ?_ ?f ?u ?n ?c ?t ?i ?o ?n ?_ ?d ?o ?c ?u ?m ?e ?n ?t ?a ?t ?i ?o ?n return])
+(defun insert-function-documentation ()
+  "Insert function documentation"
+  (interactive)
+  (insert-file-contents "/home/don/lib/templates/perl_function_documentation" nil))
 (global-set-key "\M-f" 'insert-function-documentation)
 
 (eval-after-load "lilypond-mode" 
@@ -391,12 +474,15 @@
 
 ;;; outlining support for ess modes
 (add-hook 'ess-mode-hook
-	  '(lambda ()
-	     (outline-minor-mode)
-	     (setq outline-regexp "\\(^#\\{4,5\\} \\)\\|\\(^[a-zA-Z0-9_\.]+ ?<- ?function(.*{\\)")
-	     (defun outline-level
-	       (lambda () (interactive) (cond ((looking-at "^##### ") 1)((looking-at "^#### ") 2)((looking-at "^[a-zA-Z0-9_\.]+ ?<- ?function(.*{") 3) (t 1000)))
-               )))
+      '(lambda ()
+         (outline-minor-mode)
+         (setq outline-regexp "\\(^#\\{4,5\\} \\)\\|\\(^[a-zA-Z0-9_\.]+ ?<- ?function\\)")
+         (defun outline-level ()
+           (cond ((looking-at "^##### ") 1)
+             ((looking-at "^#### ") 2)
+             ((looking-at "^[a-zA-Z0-9_\.]+ ?<- ?function(.*{") 3)
+             (t 1000)))
+         ))
 
  ; Outline-minor-mode key map
  (define-prefix-command 'cm-map nil "Outline-")
@@ -422,19 +508,26 @@
  (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")
@@ -448,6 +541,13 @@
 (define-key global-map (kbd "C-;") 'iedit-mode)
 (global-set-key  (kbd "C-;") 'iedit-mode)
 
+; fix up css mode to not be silly
+; from http://www.stokebloke.com/wordpress/2008/03/21/css-mode-indent-buffer-fix/
+(setq cssm-indent-level 4)
+(setq cssm-newline-before-closing-bracket t)
+(setq cssm-indent-function #'cssm-c-style-indenter)
+(setq cssm-mirror-mode nil)
+
 (require 'multi-web-mode)
 (setq mweb-default-major-mode 'html-mode)
 (setq mweb-tags '((php-mode "<\\?php\\|<\\? \\|<\\?=" "\\?>")