# HG changeset patch
# User Augie Fackler <durin42@gmail.com>
# Date 1261024135 21600
# Node ID fd92c15701ae96c6948132dfd995fcfbc62217c4
# Parent  593b5263291db216164a18c13ee7b3005e3168b7# Parent  040ac89ffe1e1aa326dd77a04f898fefcd4a5266
Merge

diff --git a/.elisp/settings/50.preferences.el b/.elisp/settings/50.preferences.el
--- a/.elisp/settings/50.preferences.el
+++ b/.elisp/settings/50.preferences.el
@@ -37,6 +37,10 @@
 
 ;; no toolbar
 (setq tool-bar-mode nil)
+(tool-bar-mode 0)
+
+;; scrollbars, but on the right, not the left
+(set-scroll-bar-mode 'right)
 
 ;; Command is meta in OS X.
 (setq ns-command-modifier (quote meta))
diff --git a/.elisp/settings/90.keybindings.el b/.elisp/settings/90.keybindings.el
--- a/.elisp/settings/90.keybindings.el
+++ b/.elisp/settings/90.keybindings.el
@@ -18,6 +18,8 @@
 (global-set-key [(meta m)] 'iconify-or-deiconify-frame)
 (global-set-key [(control backspace)] 'kill-word)
 
+(global-set-key [f3] 'next-error)
+
 ;; M-j for jump to function definition
 (global-set-key [(meta j)] 'textmate-goto-symbol)
 
diff --git a/.shell.d/50.vcs_functions.sh b/.shell.d/50.vcs_functions.sh
--- a/.shell.d/50.vcs_functions.sh
+++ b/.shell.d/50.vcs_functions.sh
@@ -9,9 +9,13 @@ function mq () {
 }
 
 function ezsvnsync() {
-    local url
+    if [ x"$1" = "x" ] ; then
+        echo 'usage: ez-svn-sync repo url'
+        return 0
+    fi
     local repo
     repo=$1
+    local url
     url=$2
     svnadmin create $repo
     echo '#!/bin/sh' >> $repo/hooks/pre-revprop-change
@@ -38,7 +42,7 @@ function svnurlof() {
         url=`hg -R $dir svn info 2> /dev/null | grep '^URL: ' | sed 's/URL: //'`
     fi
     if [ x"$url" = "x" ] ; then
-        echo -n 'No repo found (tried svn, git-svn, hgsvnclient)'
+        echo -n 'No repo found (tried svn, git-svn, hgsubversion)'
     fi
     echo $url
 }