Merged changes.

zeekay · Dec 26, 2011 · 921278b · 921278b
2 parents 8dad4da + cc82b2f
commit 921278b
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/plugin/lawrencium.vim b/plugin/lawrencium.vim
@@ -761,8 +761,11 @@ function! lawrencium#statusline(...)
     endif
     let l:prefix = (a:0 > 0 ? a:1 : '')
     let l:suffix = (a:0 > 1 ? a:2 : '')
+    let l:branch = 'default'
     let l:branch_file = s:hg_repo().GetFullPath('.hg/branch')
-    let l:branch = readfile(l:branch_file)[0]
+    if filereadable(l:branch_file)
+        let l:branch = readfile(l:branch_file)[0]
+    endif
     return l:prefix . l:branch .  l:suffix
 endfunction