sjs/config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

resolved merge conflicts

Browse source
This commit is contained in:
Sami Samhuri 2010-01-26 15:29:17 -08:00
parent 64ceadbba4
commit c9ace6b1e2
3 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
emacs
View file

@ -91,7 +91,9 @@
;; chmod u+x files that have a shebang line ;; chmod u+x files that have a shebang line
(add-hook 'after-save-hook 'executable-make-buffer-file-executable-if-script-p) (add-hook 'after-save-hook 'executable-make-buffer-file-executable-if-script-p)
(add-to-list 'auto-mode-alist '("zsh\(rc\|env\)$" . sh-mode)) (add-to-list 'auto-mode-alist '("zshenv$" . sh-mode))
(add-to-list 'auto-mode-alist '("zshrc$" . sh-mode))
;;;;;;;;;; ;;;;;;;;;;
@ -418,7 +420,7 @@
'(js2-mode-escape-quotes nil) '(js2-mode-escape-quotes nil)
'(js2-strict-inconsistent-return-warning nil) '(js2-strict-inconsistent-return-warning nil)
'(mojo-build-directory "~/Projects/brighthouse/webOS/build") '(mojo-build-directory "~/Projects/brighthouse/webOS/build")
'(mojo-debug t) '(mojo-debug nil)
'(mojo-project-directory "~/Projects/brighthouse/webOS") '(mojo-project-directory "~/Projects/brighthouse/webOS")
'(remote-shell-program "/usr/bin/ssh") '(remote-shell-program "/usr/bin/ssh")
'(save-place t nil (saveplace)) '(save-place t nil (saveplace))

5
zsh/zshrc
View file

@ -305,6 +305,11 @@ alias g='git grep'
alias m='git merge' alias m='git merge'
alias s='git status' alias s='git status'
# macports apachectl
if mac; then
alias -g apache2ctl=/opt/local/apache2/bin/apachectl
fi
function svnst() { function svnst() {
tmpfile=/tmp/svn-stat.$$ tmpfile=/tmp/svn-stat.$$
[[ -f $tmpfile ]] && rm -f $tmpfile [[ -f $tmpfile ]] && rm -f $tmpfile

2
zshenv
View file

@ -1,4 +1,4 @@
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) path=($HOME/bin $HOME/apps/bin $HOME/apps/android-sdk-mac_86/tools $HOME/src/tlrobinson-narwhal-b6e4dbb/bin $HOME/Projects/narwhal/bin /usr/local/bin /usr/local/sbin /opt/local/bin /opt/local/sbin $path)
ZDOTDIR=~/config/zsh ZDOTDIR=~/config/zsh
fpath=($fpath $ZDOTDIR/func) fpath=($fpath $ZDOTDIR/func)