resolved merge conflicts

emacs

@@ -91,7 +91,9 @@
 ;; chmod u+x files that have a shebang line
 (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))
+
 
 
 ;;;;;;;;;;
@@ -113,7 +115,7 @@
      '(lambda ()
          (inf-ruby-keys)
 	 (ruby-electric-mode)
-	  (c-subword-mode)))
+	 (c-subword-mode)))
 (autoload 'rubydb "rubydb3x" "Ruby debugger" t)
 
 
@@ -418,7 +420,7 @@
  '(js2-mode-escape-quotes nil)
  '(js2-strict-inconsistent-return-warning nil)
  '(mojo-build-directory "~/Projects/brighthouse/webOS/build")
- '(mojo-debug t)
+ '(mojo-debug nil)
  '(mojo-project-directory "~/Projects/brighthouse/webOS")
  '(remote-shell-program "/usr/bin/ssh")
  '(save-place t nil (saveplace))

zsh/zshrc

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

zshenv

@@ -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
 
 fpath=($fpath $ZDOTDIR/func)