Merge branch 'master' of github.com:samsonjs/config

This commit is contained in:
Sami Samhuri 2010-01-26 15:27:51 -08:00
commit 64ceadbba4
3 changed files with 2565 additions and 4 deletions

21
emacs
View file

@ -74,7 +74,8 @@
(setq tab-width 8 (setq tab-width 8
;; this will make sure spaces are used instead of tabs ;; this will make sure spaces are used instead of tabs
indent-tabs-mode nil) indent-tabs-mode nil)
(c-toggle-auto-newline 1)) (c-toggle-auto-newline 1)
(c-subword-mode))
;; (setq skeleton-pair t) ;; (setq skeleton-pair t)
;; (setq skeleton-autowrap t) ;; (setq skeleton-autowrap t)
;; (let ((chars '("'" "\"" "(" "[" "{"))) ;; (let ((chars '("'" "\"" "(" "[" "{")))
@ -111,7 +112,8 @@
(add-hook 'ruby-mode-hook (add-hook 'ruby-mode-hook
'(lambda () '(lambda ()
(inf-ruby-keys) (inf-ruby-keys)
(ruby-electric-mode))) (ruby-electric-mode)
(c-subword-mode)))
(autoload 'rubydb "rubydb3x" "Ruby debugger" t) (autoload 'rubydb "rubydb3x" "Ruby debugger" t)
@ -141,7 +143,8 @@
(autoload 'js2-mode "js2-mode" nil t) (autoload 'js2-mode "js2-mode" nil t)
(add-to-list 'auto-mode-alist '("\\.js$" . js2-mode)) (add-to-list 'auto-mode-alist '("\\.js$" . js2-mode))
(add-hook 'js2-mode-hook '(lambda () (add-hook 'js2-mode-hook '(lambda ()
(local-set-key "\C-m" 'newline))) (local-set-key "\C-m" 'newline)
(c-subword-mode)))
(autoload #'espresso-mode "espresso" "Start espresso-mode" t) (autoload #'espresso-mode "espresso" "Start espresso-mode" t)
;;(add-to-list 'auto-mode-alist '("\\.js$" . espresso-mode)) ;;(add-to-list 'auto-mode-alist '("\\.js$" . espresso-mode))
@ -177,6 +180,18 @@
)) ))
;;;;;;;;;;;;
;; python ;;
;;;;;;;;;;;;
;; handy but ugly as fuck
(autoload 'whitespace-mode "whitespace"
"Toggle whitespace visualization." t)
(add-hook 'python-mode-hook '(lambda ()
(c-subword-mode)))
;;;;;;;;;;;; ;;;;;;;;;;;;
;; markup ;; ;; markup ;;
;;;;;;;;;;;; ;;;;;;;;;;;;

2543
emacs.d/whitespace.el Normal file

File diff suppressed because it is too large Load diff

5
zshenv
View file

@ -1,2 +1,5 @@
path=($HOME/bin $HOME/apps/bin /usr/local/bin /usr/local/sbin /opt/local/bin /opt/local/sbin $path) path=($HOME/bin $HOME/apps/bin $HOME/src/tlrobinson-narwhal-b6e4dbb/bin /usr/local/bin /usr/local/sbin /opt/local/bin /opt/local/sbin $path)
ZDOTDIR=~/config/zsh ZDOTDIR=~/config/zsh
fpath=($fpath $ZDOTDIR/func)
typeset -U fpath