summaryrefslogtreecommitdiff
path: root/.emacs
diff options
context:
space:
mode:
Diffstat (limited to '.emacs')
-rw-r--r--.emacs111
1 files changed, 69 insertions, 42 deletions
diff --git a/.emacs b/.emacs
index 24c80e7..538e2c4 100644
--- a/.emacs
+++ b/.emacs
@@ -1,5 +1,8 @@
(set-face-attribute 'default nil :height 80)
+(setq custom-file "~/.emacs.d/custom.el")
+(load custom-file 'noerror)
+
(defun load-identica-mode ()
(when (require 'netrc nil t)
(autoload 'identica-mode "identica-mode" nil t)
@@ -11,8 +14,8 @@
)
(setq package-archives '(("ELPA" . "http://tromey.com/elpa/")
- ("marmalade" . "http://marmalade-repo.org/packages/")
- ("gnu" . "http://elpa.gnu.org/packages/")))
+ ("marmalade" . "http://marmalade-repo.org/packages/")
+ ("gnu" . "http://elpa.gnu.org/packages/")))
(add-to-list 'load-path "~/.emacs.d/")
(add-to-list 'load-path "~/.emacs.d/el-get/el-get")
@@ -20,43 +23,64 @@
(add-to-list 'el-get-recipe-path "~/.emacs.d/el-get-recipes")
(setq el-get-sources
'(el-get
- package
+ package
rainbow-delimiters
- (:name color-theme
- :after (lambda ()
- (color-theme-tty-dark)))
- (:name color-theme-solarized
- :after (lambda ()
- (add-hook 'after-make-frame-functions
- (lambda (frame)
- (set-variable 'color-theme-is-global nil)
- (select-frame frame)
- (if window-system
- (color-theme-solarized-dark))))))
- (:name org-mode
- :url "git://orgmode.org/org-mode.git"
- :features org-install
- :after ((require 'org-checklist)))
- (:name identica-mode
- :after (lambda ()
- (load-identica-mode)))
- (:name smarttabs
- :url "git://gist.github.com/896190.git")
- (:name autopair
- :after (lambda ()
- (autopair-global-mode 1)
- (setq autopair-autowrap t)))
- ))
+ php-mode-improved
+ mmm-mode
+ dtrt-indent
+ folding
+ apel flim semi wanderlust
+ (:name color-theme
+ :after (lambda ()
+ (color-theme-tty-dark)))
+ (:name color-theme-solarized
+ :after (lambda ()
+ (add-hook 'after-make-frame-functions
+ (lambda (frame)
+ (set-variable 'color-theme-is-global nil)
+ (select-frame frame)
+ (if window-system
+ (color-theme-solarized-dark)
+ (color-theme-tty-dark))))))
+ (:name org-mode
+ :url "git://orgmode.org/org-mode.git"
+ :features org-install
+ :after (lambda ()
+ (require 'org-checklist)
+ (setq org-hide-leading-stars t)
+ (setq org-log-done 'time)))
+ (:name identica-mode
+ :after (lambda ()
+ (load-identica-mode)))
+ (:name smarttabs
+ :url "git://gist.github.com/896190.git")
+ (:name autopair
+ :after (lambda ()
+ (autopair-global-mode 1)
+ (setq autopair-autowrap t)))
+ ))
(el-get)
+(add-hook 'text-mode-hook 'turn-on-auto-fill)
(add-hook 'after-make-frame-functions
- (lambda (frame)
- (set-variable 'term-default-fg-color
- (face-foreground 'default))
- (set-variable 'term-default-bg-color
- (face-background 'default)))
+ (lambda (frame)
+ (set-variable 'term-default-fg-color
+ (face-foreground 'default))
+ (set-variable 'term-default-bg-color
+ (face-background 'default)))
t)
+(defun mailto-compose-mail (mailto-url)
+ (if (and (stringp mailto-url)
+ (string-match "\\`mailto:" mailto-url))
+ (progn
+ (require 'rfc2368)
+ (let* ((headers (mapcar (lambda (h) (cons (intern (car h)) (cdr h)))
+ (rfc2368-parse-mailto-url mailto-url)))
+ (good-headers (remove-if (lambda (h) (member (car h) '(Body))) headers))
+ (body (cdr (assoc 'Body headers))))
+ (wl-draft good-headers nil nil body)))))
+
(ido-mode t)
(show-paren-mode 1)
@@ -64,11 +88,11 @@
(interactive)
(let ((current-value (frame-parameter nil 'fullscreen)))
(set-frame-parameter nil 'fullscreen
- (if (equal 'fullboth current-value)
- (if (boundp 'old-fullscreen) old-fullscreen nil)
- (progn (setq old-fullscreen current-value)
- 'fullboth)))))
-(global-set-key [f11] 'toggle-fullscreenn)
+ (if (equal 'fullboth current-value)
+ (if (boundp 'old-fullscreen) old-fullscreen nil)
+ (progn (setq old-fullscreen current-value)
+ 'fullboth)))))
+(global-set-key [f11] 'toggle-fullscreen)
(load "whitespace")
(global-set-key "\C-cw" 'global-whitespace-mode)
@@ -83,10 +107,11 @@
empty
))
-
+;; These are my preferred settings; we let dtrt-indent detect when we play with other's files
(setq-default tab-width 8)
(setq-default c-basic-offset 8)
-(setq-default indent-tabs-mode nil)
+(setq-default indent-tabs-mode t)
+
(setq
backup-by-copying t ;; don't clobber symlinks
@@ -106,5 +131,7 @@
(setq browse-url-generic-program (executable-find "v-www-browser")
browse-url-browser-function 'browse-url-generic)
-(setq custom-file "~/.emacs.d/custom.el")
-(load custom-file 'noerror)
+(require 'flymake)
+(add-hook 'php-mode-hook (lambda() (flymake-mode 1)))
+(define-key php-mode-map '[M-S-up] 'flymake-goto-prev-error)
+(define-key php-mode-map '[M-S-down] 'flymake-goto-next-error)