Merge branch 'master' of github.com:mavam/dotfiles

.Rprofile

@@ -1,6 +1,20 @@
 options(repos=structure(c(CRAN="http://cran.cnr.berkeley.edu/")))
-if (interactive()) {
-  library(colorout)
-  library(setwidth)
-  library(vimcom)
+
+.First <- function() {
+  if (interactive()) {
+    installed <- utils::installed.packages()[,1]
+    pkgs <- c("setwidth", "vimcom")
+    lacking <- pkgs[!(pkgs %in% installed)]
+    if (length(lacking))
+      install.packages(lacking)
+    lapply(pkgs, library, character.only=T)
+
+    # See http://www.lepem.ufc.br/jaa/colorout.html for details.
+    if (! is.element("colorout", installed)) {
+      download.file("http://www.lepem.ufc.br/jaa/colorout_1.0-1.tar.gz",
+                    destfile="colorout.tar.gz")
+      install.packages("colorout.tar.gz", type="source", repos=NULL)
+    }
+    library(colorout)
+  }
 }

.editrc

@@ -1,3 +1,4 @@
 bind -v
-bind "^R" em-inc-search-prev
 bind \\t rl_complete
+bind ^R em-inc-search-prev
+bind ^L ed-clear-screen

.vimrc

@@ -21,6 +21,9 @@ set suffixes+=.info,.out,.o,.lo
 
 set viminfo='20,\"500
 
+" No header when printing.
+set printoptions+=header:0
+
 scriptencoding utf-8
 
 " =============================================================================
@@ -162,7 +165,7 @@ Bundle 'gmarik/vundle'
 Bundle 'LaTeX-Suite-aka-Vim-LaTeX'
 Bundle 'altercation/vim-colors-solarized'
 Bundle 'godlygeek/tabular'
-Bundle 'rson/vim-conque'
+Bundle 'basepi/vim-conque'
 Bundle 'rstacruz/sparkup'
 Bundle 'tpope/vim-endwise'
 Bundle 'tpope/vim-fugitive'
@@ -232,6 +235,12 @@ autocmd FileType bro set comments+=:#
 autocmd Filetype mail set sw=4 ts=4 tw=72
 autocmd Filetype tex set iskeyword+=:
 
+" Bro-specific coding style.
+augroup BroProject
+  autocmd FileType bro set noexpandtab cino='>1s,f1s,{1s'
+  au BufRead,BufEnter ~/work/bro/**/*{cc,h} set noexpandtab cino='>1s,f1s,{1s'
+augroup END
+
 if has("spell")
   autocmd BufRead,BufNewFile *.dox  set spell
   autocmd Filetype mail             set spell