X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=.emacs;h=2befd3353099bb85051e133de2f447dc647531a2;hb=56d132e026c7713254bd98cdf8c7334989e4d720;hp=e3cc107610e4d116220fdc765ec78eeb8af8fea4;hpb=daefca068baff31e0fb280d6232e7965345e0054;p=emacs.git

diff --git a/.emacs b/.emacs
index e3cc107..2befd33 100644
--- 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"
@@ -223,8 +225,8 @@ Maildir, or by Message-ID."
 ;;   }
 (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
@@ -349,8 +351,10 @@ Maildir, or by Message-ID."
 	  (auto-fill-mode nil)
 	  )
 
-(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" 
@@ -464,6 +468,13 @@ Maildir, or by Message-ID."
 (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\\|<\\? \\|<\\?=" "\\?>")