# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1334841151 -3600
# Node ID 0b33941b59ef7cbcb25f2d6185a8bfa60e7b9efd
# Parent  f8b4a46387a4cd3a6307502c3e862a7e7a5fbe22# Parent  8a238ba78698073c341a573b79681a55ab093d96
Merge.

diff -r 8a238ba78698 -r 0b33941b59ef bin/bootstrap.sh
--- a/bin/bootstrap.sh	Mon Apr 16 10:39:37 2012 -0400
+++ b/bin/bootstrap.sh	Thu Apr 19 14:12:31 2012 +0100
@@ -39,5 +39,6 @@
 ensure_link "lib/dotfiles/dotcss"         ".css"
 ensure_link "lib/dotfiles/hgignore"       ".hgignore"
 ensure_link "lib/dotfiles/ctags"          ".ctags"
+ensure_link "lib/dotfiles/grc"            ".grc"
 
 echo completed
diff -r 8a238ba78698 -r 0b33941b59ef offlineimaprc
--- a/offlineimaprc	Mon Apr 16 10:39:37 2012 -0400
+++ b/offlineimaprc	Thu Apr 19 14:12:31 2012 +0100
@@ -37,5 +37,4 @@
                                              'Flask',
                                              '[Gmail]/Important',
                                              '[Gmail]/Spam',
-                                             '[Gmail]/All Mail',
                                              ]
diff -r 8a238ba78698 -r 0b33941b59ef tmux/tmux.conf
--- a/tmux/tmux.conf	Mon Apr 16 10:39:37 2012 -0400
+++ b/tmux/tmux.conf	Thu Apr 19 14:12:31 2012 +0100
@@ -90,8 +90,7 @@
 setw -g automatic-rename on
 
 # Better name management
-bind c new-window \; command-prompt "rename-window '%%'"
-bind C new-window
+bind c new-window
 bind , command-prompt "rename-window '%%'"
 
 # Copy mode
diff -r 8a238ba78698 -r 0b33941b59ef vim/custom-dictionary.utf-8.add
--- a/vim/custom-dictionary.utf-8.add	Mon Apr 16 10:39:37 2012 -0400
+++ b/vim/custom-dictionary.utf-8.add	Thu Apr 19 14:12:31 2012 +0100
@@ -7,3 +7,16 @@
 Django
 Solr
 Losh
+Clojure
+offlineimap
+weechat
+tmux
+ack
+Firefox
+zsh
+foo
+etc
+Dropbox
+changelog
+tradeoff
+checkbox
diff -r 8a238ba78698 -r 0b33941b59ef vim/vimrc
--- a/vim/vimrc	Mon Apr 16 10:39:37 2012 -0400
+++ b/vim/vimrc	Thu Apr 19 14:12:31 2012 +0100
@@ -297,9 +297,6 @@
 " HTML tag closing
 inoremap <C-_> <Space><BS><Esc>:call InsertCloseTag()<cr>a
 
-" Less chording
-nnoremap ; :
-
 " Cmdheight switching
 nnoremap <leader>1 :set cmdheight=1<cr>
 nnoremap <leader>2 :set cmdheight=2<cr>
diff -r 8a238ba78698 -r 0b33941b59ef weechat/alias.conf
--- a/weechat/alias.conf	Mon Apr 16 10:39:37 2012 -0400
+++ b/weechat/alias.conf	Thu Apr 19 14:12:31 2012 +0100
@@ -1,5 +1,5 @@
 #
-# alias.conf -- weechat v0.3.6
+# alias.conf -- weechat v0.3.7
 #
 
 [cmd]
diff -r 8a238ba78698 -r 0b33941b59ef weechat/aspell.conf
--- a/weechat/aspell.conf	Mon Apr 16 10:39:37 2012 -0400
+++ b/weechat/aspell.conf	Thu Apr 19 14:12:31 2012 +0100
@@ -1,5 +1,5 @@
 #
-# aspell.conf -- weechat v0.3.6
+# aspell.conf -- weechat v0.3.7
 #
 
 [look]
diff -r 8a238ba78698 -r 0b33941b59ef weechat/buffers.conf
--- a/weechat/buffers.conf	Mon Apr 16 10:39:37 2012 -0400
+++ b/weechat/buffers.conf	Thu Apr 19 14:12:31 2012 +0100
@@ -1,5 +1,5 @@
 #
-# buffers.conf -- weechat v0.3.6
+# buffers.conf -- weechat v0.3.7
 #
 
 [color]
diff -r 8a238ba78698 -r 0b33941b59ef weechat/logger.conf
--- a/weechat/logger.conf	Mon Apr 16 10:39:37 2012 -0400
+++ b/weechat/logger.conf	Thu Apr 19 14:12:31 2012 +0100
@@ -1,5 +1,5 @@
 #
-# logger.conf -- weechat v0.3.6
+# logger.conf -- weechat v0.3.7
 #
 
 [look]
diff -r 8a238ba78698 -r 0b33941b59ef weechat/plugins.conf
--- a/weechat/plugins.conf	Mon Apr 16 10:39:37 2012 -0400
+++ b/weechat/plugins.conf	Thu Apr 19 14:12:31 2012 +0100
@@ -1,5 +1,5 @@
 #
-# plugins.conf -- weechat v0.3.6
+# plugins.conf -- weechat v0.3.7
 #
 
 [var]
@@ -55,6 +55,7 @@
 python.growl.show_upgrade_ended = "on"
 python.growl.sticky = "off"
 python.growl.sticky_away = "on"
+ruby.check_license = "on"
 tcl.check_license = "on"
 
 [desc]
diff -r 8a238ba78698 -r 0b33941b59ef weechat/python/autoload/growl.py
--- a/weechat/python/autoload/growl.py	Mon Apr 16 10:39:37 2012 -0400
+++ b/weechat/python/autoload/growl.py	Thu Apr 19 14:12:31 2012 +0100
@@ -24,12 +24,13 @@
 
 SCRIPT_NAME = 'growl'
 SCRIPT_AUTHOR = 'Sorin Ionescu <sorin.ionescu@gmail.com>'
-SCRIPT_VERSION = '1.0.4'
+SCRIPT_VERSION = '1.0.5'
 SCRIPT_LICENSE = 'MIT'
 SCRIPT_DESC = 'Sends Growl notifications upon events.'
 
 
 # Changelog
+# 2011-12-30: v1.0.5 Fixed a NoneType error.
 # 2011-10-11: v1.0.4 Handle import errors better.
 # 2011-10-10: v1.0.3 Handle Growl exceptions.
 # 2011-10-04: v1.0.2 Growl 1.3 requires GNTP.
@@ -461,9 +462,9 @@
         'WeeChat'
     ]
     if len(hostname) == 0:
-        hostname = None
+        hostname = ''
     if len(password) == 0:
-        password = None
+        password = ''
     growl = GrowlNotifier(
         applicationName=name,
         hostname=hostname,
diff -r 8a238ba78698 -r 0b33941b59ef weechat/relay.conf
--- a/weechat/relay.conf	Mon Apr 16 10:39:37 2012 -0400
+++ b/weechat/relay.conf	Thu Apr 19 14:12:31 2012 +0100
@@ -1,5 +1,5 @@
 #
-# relay.conf -- weechat v0.3.6
+# relay.conf -- weechat v0.3.7
 #
 
 [look]
@@ -17,7 +17,9 @@
 text_selected = white
 
 [network]
+allowed_ips = ""
 bind_address = ""
+compression_level = 6
 max_clients = 5
 password = ""
 
diff -r 8a238ba78698 -r 0b33941b59ef weechat/rmodifier.conf
--- a/weechat/rmodifier.conf	Mon Apr 16 10:39:37 2012 -0400
+++ b/weechat/rmodifier.conf	Thu Apr 19 14:12:31 2012 +0100
@@ -1,5 +1,5 @@
 #
-# rmodifier.conf -- weechat v0.3.6
+# rmodifier.conf -- weechat v0.3.7
 #
 
 [look]
diff -r 8a238ba78698 -r 0b33941b59ef weechat/urlgrab.conf
--- a/weechat/urlgrab.conf	Mon Apr 16 10:39:37 2012 -0400
+++ b/weechat/urlgrab.conf	Thu Apr 19 14:12:31 2012 +0100
@@ -1,5 +1,5 @@
 #
-# urlgrab.conf -- weechat v0.3.6
+# urlgrab.conf -- weechat v0.3.7
 #
 
 [color]
diff -r 8a238ba78698 -r 0b33941b59ef weechat/weechat.conf
--- a/weechat/weechat.conf	Mon Apr 16 10:39:37 2012 -0400
+++ b/weechat/weechat.conf	Thu Apr 19 14:12:31 2012 +0100
@@ -1,5 +1,5 @@
 #
-# weechat.conf -- weechat v0.3.6
+# weechat.conf -- weechat v0.3.7
 #
 
 [debug]
@@ -78,6 +78,7 @@
 save_config_on_exit = on
 save_layout_on_exit = none
 scroll_amount = 3
+scroll_bottom_after_switch = off
 scroll_page_percent = 100
 search_text_not_found_alert = on
 separator_horizontal = "-"
@@ -143,6 +144,7 @@
 status_time = *16
 
 [completion]
+base_word_until_cursor = on
 default_template = "%(nicks)|%(irc_channels)"
 nick_add_space = on
 nick_completer = ":"
@@ -156,8 +158,9 @@
 
 [history]
 display_default = 5
+max_buffer_lines_minutes = 0
+max_buffer_lines_number = 4096
 max_commands = 100
-max_lines = 4096
 max_visited_buffers = 50
 
 [proxy]
diff -r 8a238ba78698 -r 0b33941b59ef weechat/xfer.conf
--- a/weechat/xfer.conf	Mon Apr 16 10:39:37 2012 -0400
+++ b/weechat/xfer.conf	Thu Apr 19 14:12:31 2012 +0100
@@ -1,5 +1,5 @@
 #
-# xfer.conf -- weechat v0.3.6
+# xfer.conf -- weechat v0.3.7
 #
 
 [look]
diff -r 8a238ba78698 -r 0b33941b59ef zshrc
--- a/zshrc	Mon Apr 16 10:39:37 2012 -0400
+++ b/zshrc	Thu Apr 19 14:12:31 2012 +0100
@@ -71,3 +71,6 @@
 
 # Emacs... -------------------------------------------------------------------
 alias e='emacsclient -nc .'
+
+# GRC
+source "`brew --prefix grc`/etc/grc.bashrc"