fix css mode; add tasks, and fix auto-newline

[emacs.git] / .emacs

diff --git a/.emacs b/.emacs
index 33d68dc981d2544da6ce05da583851a905562ab6..a1b2e7b8ca8c196882cef90e3ad7415ee93a9935 100644 (file)
--- a/.emacs
+++ b/.emacs
@@ -66,6 +66,8 @@
 (add-hook 'tinyprocmail--load-hook 'tinyprocmail-install)
 (require 'tinyprocmail)
 
+(require 'vcl-mode)
+
 (require 'tex-site)
 ;;(require 'psvn)
 (require 'cperl-mode)
@@ -88,7 +90,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 %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 +171,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$" . 
@@ -207,8 +225,8 @@
 ;;   }
 (setq-default 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
@@ -448,6 +466,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\\|<\\? \\|<\\?=" "\\?>")