X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=.emacs;h=535c48410a77a4e1784217eedead8e6d2681cb8e;hb=055d581b10f5811f6b519c2baaeb6b8576501116;hp=715bb712d0ded5b8a4569483d1a949bc61afd65a;hpb=51788925ef4a54769ff2b84602b48c6a2b91d3b0;p=emacs.git diff --git a/.emacs b/.emacs index 715bb71..535c484 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) @@ -78,17 +80,24 @@ (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/notes.org" + (quote ("~/projects/debbugs/debbugs.org" "~/projects/notes/notes.org" "~/projects/origins_of_life/ool.org" "~/projects/sysadmin/sndservers/sndservers.org" "~/projects/chaim/chaim.org" "~/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) %17Effort(Estimated Effort){:} %CLOCKSUM") +(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-default-notes-file "~/projects/notes/notes.org") (setq org-capture-templates ;; mail-specific note template, identified by "m" @@ -169,6 +178,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 +207,27 @@ (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)) -(add-to-list 'auto-mode-alist '("muttngrc" . muttrc-mode)) +; use markdown mode for mdwn files +(add-to-list 'auto-mode-alist '("\\.mdwn$" . markdown-mode)) -(add-to-list 'auto-mode-alist '("mutt-[a-z0-9]+-[0-9]+-" . post-mode)) -(add-to-list 'auto-mode-alist '("muttrc" . muttrc-mode)) -(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]+-" . 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)))))) + +(setq mail-yank-prefix "> ") (global-unset-key "\M-g") (global-set-key "\M-g" 'goto-line) @@ -205,10 +242,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 +258,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) @@ -333,8 +370,10 @@ (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" @@ -391,12 +430,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-") @@ -448,6 +490,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\\|<\\? \\|<\\?=" "\\?>")