From: Andrew <Andrew@ClearSCM.com>
Date: Fri, 16 May 2014 07:00:07 +0000 (-0700)
Subject: Merge branch 'master' of defaria.com:/opt/git/clearscm
X-Git-Url: https://defaria.com/gitweb/?a=commitdiff_plain;h=f906b32bb535bd2ca3993b78ef51a27618854b23;hp=61f15729e253c24944463573214c449a69c24044;p=clearscm.git

Merge branch 'master' of defaria.com:/opt/git/clearscm
---

diff --git a/lib/GetConfig.pm b/lib/GetConfig.pm
index 9ccf965..88917a2 100644
--- a/lib/GetConfig.pm
+++ b/lib/GetConfig.pm
@@ -28,7 +28,7 @@ $Date: 2013/01/17 01:08:34 $
 
 =head1 SYNOPSIS
 
-Parse config files.
+Parse config files. 
 
  # Comment lines are skipped - white space is eliminated...
  app:                   MyApp
@@ -48,11 +48,12 @@ yields
 
 =head1 DESCRIPTION
 
-This module is a simple interface to reading config files. Config file
-format is roughly like .XDefaults format - <name>:<value> pairs. A
-hash of the name/value pairs are returned. Variable interpolation is
-supported such that env(1) variables will be interpolated as well as
-previously defined values. Thus:
+This module is a simple interface to reading config files. Config file format is
+roughly like .XDefaults format - <name>:<value> pairs. Note that you can use 
+either ':' or '=' as a separator between the name and value. A hash of the 
+name/value pairs are returned. Variable interpolation is supported such that 
+env(1) variables will be interpolated as well as previously defined values. 
+Thus:
 
  temp_files: tmp
  temp_dir:   $HOME/$temp_files
@@ -124,7 +125,7 @@ sub _processFile ($%) {
 
     next if /^\s*[\#|\!]/;    # Skip comments
 
-    if (/\s*(\w*)\s*:\s*(.*)\s*$/) {
+    if (/\s*(.*?)\s*[:=]\s*(.*)\s*/) {
       my $key   = $1;
       my $value = $2;
 
diff --git a/rc/vimrc b/rc/vimrc
index d8e1a71..ce14e6e 100644
--- a/rc/vimrc
+++ b/rc/vimrc
@@ -4,6 +4,7 @@ set autowrite
 syntax enable
 set nocompatible
 set backspace=indent,eol,start
-colorscheme evening
 set hlsearch
+set ff=unix
+colorscheme evening
 map!