Upgrade CSApprox to 1.1.0 with the included rgb.txt

TeaMoe · Nov 8, 2008 · 877be96 · 877be96
1 parent 1a723df
commit 877be96
Show file tree

Hide file tree

Showing 3 changed files with 764 additions and 7 deletions.
diff --git a/doc/CSApprox.txt b/doc/CSApprox.txt
@@ -8,7 +8,7 @@
                 \___//___//_/ |_|/ .__// .__//_/   \___//_\_\  ~
                                 /_/   /_/                      ~
                                                   For Vim version 7.0 or newer
-                                                      Last changed 05 Oct 2008
+                                                      Last changed 28 Oct 2008
 
                                By Matt Wozniski
                                 mjw@drexel.edu
@@ -162,11 +162,12 @@ g:CSApprox_attr_map                                      *g:CSApprox_attr_map*
 g:CSApprox_extra_rgb_txt_dirs                  *g:CSApprox_extra_rgb_txt_dirs*
     When the colorscheme author uses a color by name, CSApprox needs to figure
     out what #rrggbb value it stands for.  It does this by parsing rgb.txt,
-    but first needs to locate it.  It has a default search path included, but
+    but first needs to locate it.  It has a default search path included, and
-    should it fail to find rgb.txt, this variable can be set to a List of
+    will also search in any directory in the user's 'runtimepath', but first
-    other directories that ought to be searched.  Default search path: >
+    any directory included in this variable will be searched.  Failing to find
+    any valid rgb.txt is an unrecoverable error.  Default search path: >
     [ /usr/local/share/X11, /usr/share/X11, /etc/X11, /usr/local/lib/X11,
-      /usr/lib/X11, /usr/local/X11R6/lib/X11, /usr/X11R6/lib/X11]
+      /usr/lib/X11, /usr/local/X11R6/lib/X11, /usr/X11R6/lib/X11 ]
 
 g:CSApprox_approximator_function            *g:CSApprox_approximator_function*
     If the default approximation function doesn't work well enough, the user
@@ -347,6 +348,9 @@ kterm (as of version 6.2.0)
 ==============================================================================
 7. Changelog                                              *csapprox-changelog*
 
+ 1.10   28 Oct 2008   Enable running on systems with no rgb.txt (Penn Su)
+                      Begin distributing a copy of rgb.txt with CSApprox
+
  1.00   04 Oct 2008   First public release
 
  0.90   14 Sep 2008   Initial beta release

diff --git a/plugin/CSApprox.vim b/plugin/CSApprox.vim
@@ -1,7 +1,7 @@
 " CSApprox:    Make gvim-only colorschemes work transparently in terminal vim
 " Maintainer:  Matthew Wozniski (mjw@drexel.edu)
-" Date:        Sun, 05 Oct 2008 00:26:22 -0400
+" Date:        Tue, 28 Oct 2008 01:35:25 -0400
-" Version:     1.00
+" Version:     1.10
 " History:     :help csapprox-changelog
 
 " Whenever you change colorschemes using the :colorscheme command, this script
@@ -294,6 +294,7 @@ function! s:UpdateRgbHash()
                     \ '/usr/lib/X11',
                     \ '/usr/local/X11R6/lib/X11',
                     \ '/usr/X11R6/lib/X11' ]
+                    \ + split(globpath(&rtp, ''), '\n')
     let s:rgb = copy(s:rgb_defaults)
     sil! let lines = readfile(dir . '/rgb.txt')