From: Don Armstrong Date: Mon, 6 May 2013 17:10:12 +0000 (-0700) Subject: add rainbow mode and switch to message mode; fix indent levels X-Git-Url: https://git.donarmstrong.com/?p=emacs.git;a=commitdiff_plain;h=055d581b10f5811f6b519c2baaeb6b8576501116 add rainbow mode and switch to message mode; fix indent levels --- diff --git a/.emacs b/.emacs index 2befd33..535c484 100644 --- a/.emacs +++ b/.emacs @@ -80,6 +80,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" @@ -200,15 +207,27 @@ Maildir, or by Message-ID." (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) @@ -223,7 +242,7 @@ Maildir, or by Message-ID." ;; which really should be, ;; if (-!-) { ;; } -(setq-default cperl-hairy t +(setq cperl-hairy t cperl-indent-level 4 cperl-auto-newline nil cperl-auto-newline-after-colon nil @@ -239,15 +258,15 @@ Maildir, or by Message-ID." ;(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) @@ -411,12 +430,15 @@ Maildir, or by Message-ID." ;;; 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-")