Permalink
Browse files

Version 100917

* Changed the use of vimrplugin_r_path: now the option includes only the directory part of the path.
* Initial support to Conque Shell plugin. Thanks to "il_principe orange" for suggesting the use of Conque Shell, "ZyX-I" for writing the initial code to use Conque Shell, and Nico Raffo for writing the plugin and additional code to integrate both plugins.
* New options: vimrplugin_conqueplugin and vimrplugin_conquevsplit, vimrplugin_r_args.
* Initial support for Vim-R communication on Windows using Python.
* Fixed bug when the plugin was installed in a directory other than ~/.vim (thanks to Tom Link).
  • Loading branch information...
1 parent b9e62ef commit b52c7fd7ce5c115cf8c655dc3768e72c6c4f03c1 @jalvesaq jalvesaq committed with Sep 17, 2010
View
@@ -1,7 +1,7 @@
" Vim completion script
" Language: R
" Maintainer: Jakson Alves de Aquino <jalvesaq@gmail.com>
-" Last Change: Sun Jul 18, 2010 12:52AM
+" Last Change: Fri Aug 27, 2010 11:30PM
"
fun! rcomplete#CompleteR(findstart, base)
@@ -21,12 +21,8 @@ fun! rcomplete#CompleteR(findstart, base)
if strlen(a:base) == 0
return res
endif
- if has("gui_win32")
- let flines = b:flines1
- else
- let flines2 = readfile(b:romnilistfile)
- let flines = b:flines1 + flines2
- endif
+ let flines2 = readfile(b:globalenvlistfile)
+ let flines = b:flines1 + flines2
" The char '$' at the end of 'a:base' is treated as end of line, and
" the pattern is never found in 'line'.
let newbase = '^' . substitute(a:base, "\\$$", "", "")
View
Binary file not shown.
File renamed without changes
View
Binary file not shown.
File renamed without changes
View
Binary file not shown.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Binary file not shown.
File renamed without changes
View
Binary file not shown.
File renamed without changes
View
Binary file not shown.
File renamed without changes
View
Binary file not shown.
File renamed without changes
View
Binary file not shown.
File renamed without changes
View
Binary file not shown.
File renamed without changes
View
Binary file not shown.
File renamed without changes
View
Binary file not shown.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
@@ -1,160 +0,0 @@
-/* XPM */
-static char * r_close_xpm[] = {
-"24 24 133 2",
-" c None",
-". c #DF421E",
-"+ c #C4CACC",
-"@ c #D4DAEC",
-"# c #D4DEEC",
-"$ c #D4DEE4",
-"% c #D4DAE4",
-"& c #C4CEDC",
-"* c #FCF1EF",
-"= c #FDFBFA",
-"- c #FDF6F4",
-"; c #F9DFDA",
-"> c #ACB2D4",
-", c #8492BC",
-"' c #6C7A9C",
-") c #6C7AA4",
-"! c #7C82AC",
-"~ c #9CA2BC",
-"{ c #9CA6CC",
-"] c #949EC4",
-"^ c #9CA2C4",
-"/ c #949ECC",
-"( c #8C96C4",
-"_ c #7C86B4",
-": c #747EAC",
-"< c #FFFFFF",
-"[ c #FBECE9",
-"} c #ACB2CC",
-"| c #8492C4",
-"1 c #7482A4",
-"2 c #8496C4",
-"3 c #BCC2EC",
-"4 c #545E74",
-"5 c #4C4E6C",
-"6 c #444E64",
-"7 c #545E7C",
-"8 c #747AA4",
-"9 c #8492CC",
-"0 c #7486B4",
-"a c #9CA6DC",
-"b c #A4B2DC",
-"c c #4C526C",
-"d c #8C8A8C",
-"e c #8C8A94",
-"f c #8C8E94",
-"g c #848694",
-"h c #545E84",
-"i c #FBEAE7",
-"j c #FDF9F8",
-"k c #7486AC",
-"l c #94A2D4",
-"m c #5C6674",
-"n c #7C8AB4",
-"o c #8C92C4",
-"p c #7482B4",
-"q c #5C6274",
-"r c #8C9AC4",
-"s c #E38670",
-"t c #BC3719",
-"u c #9CA6D4",
-"v c #949ACC",
-"w c #5C627C",
-"x c #9CAAD4",
-"y c #5C5E74",
-"z c #C4C6CC",
-"A c #949ED4",
-"B c #6C769C",
-"C c #DCDEF4",
-"D c #8C92AC",
-"E c #7C8EAC",
-"F c #CCD6EC",
-"G c #3C465C",
-"H c #8C96CC",
-"I c #949AAC",
-"J c #D4D6DC",
-"K c #DCDEE4",
-"L c #DCE2E4",
-"M c #CCD2E4",
-"N c #CCCED4",
-"O c #A4AAC4",
-"P c #8C96B4",
-"Q c #C4CADC",
-"R c #BCC2D4",
-"S c #2C2E3C",
-"T c #9C9EA4",
-"U c #7482AC",
-"V c #8C9ACC",
-"W c #9CAACC",
-"X c #94A2C4",
-"Y c #8496B4",
-"Z c #747EA4",
-"` c #949ABC",
-" . c #242A34",
-".. c #3C3A3C",
-"+. c #D4D2D4",
-"@. c #CCD2F4",
-"#. c #7C82A4",
-"$. c #8C9ECC",
-"%. c #94A2DC",
-"&. c #BCC6F4",
-"*. c #4C4E54",
-"=. c #ACAEB4",
-"-. c #94A6D4",
-";. c #3C424C",
-">. c #646A84",
-",. c #94A6DC",
-"'. c #9CAADC",
-"). c #B4BAC4",
-"!. c #5C668C",
-"~. c #B4BAD4",
-"{. c #ACAEBC",
-"]. c #848EBC",
-"^. c #848EC4",
-"/. c #64728C",
-"(. c #848EB4",
-"_. c #DCDEDC",
-":. c #8496CC",
-"<. c #8C96BC",
-"[. c #ACBAE4",
-"}. c #9CA6BC",
-"|. c #A4B2E4",
-"1. c #B4BEDC",
-"2. c #A4B2D4",
-"3. c #ACB6D4",
-"4. c #848EAC",
-"5. c #BCBECC",
-"6. c #747A8C",
-"7. c #6C727C",
-"8. c #6C6E7C",
-"9. c #84868C",
-"0. c #BCBEC4",
-"a. c #747684",
-"b. c #ACAEAC",
-" ",
-" . . . . . . . ",
-" + @ # $ % $ % $ @ $ $ % % & . * = . - ; . ",
-" > , ' ) ! ~ { ] ^ / ^ ( _ : . = < [ < - . ",
-" } | 1 2 3 ~ 4 5 6 5 7 8 / 2 . . * < [ . . ",
-" } 9 0 a b c d d d e f g h , . - < i < j . ",
-" } 9 k l / m } n . * j . - ; . ",
-" } o p l / q r s . . . . . t ",
-" } | 0 u v w x : l b y z ",
-" } o k A v B C D E F D G ",
-" } | 0 H | I J K L K M N O P Q R S T ",
-" } 2 U H ( , V W X Y Z B ` & g ...+. ",
-" } 9 U A @.M D #.D u $.%.&.G *.=. ",
-" } ( U -.3 4 ..;.c >.( ,.'.c R ",
-" } 9 k l / q ).!.( $.E ~. ",
-" } 9 ! %./ q {.Z | _ ].' z ",
-" } ^.0 l / q )./.(.^.^., D _. ",
-" > | _ l v q {.Z | :.o B I ",
-" } 9 k %./ m I , :.V ].B N ",
-" > o <.[.{ q }.: 2 |.W #.I ",
-" } ].X 1.` 4 !.n 2.3.4.4 ",
-" 5.6.7.>.8.9. 0.6.8.8.8.a.b. ",
-" ",
-" "};
View
@@ -1,181 +0,0 @@
-/* XPM */
-static char * r_start_xpm[] = {
-"24 24 154 2",
-" c None",
-". c #FFFFFF",
-"+ c #000000",
-"@ c #868686",
-"# c #6CBC8E",
-"$ c #A6A6A6",
-"% c #C4CACC",
-"& c #D4DAEC",
-"* c #D4DEEC",
-"= c #D4DEE4",
-"- c #D4DAE4",
-"; c #C4CEDC",
-"> c #BCC6E4",
-", c #63B985",
-"' c #7E7E7E",
-") c #ACB2D4",
-"! c #8492BC",
-"~ c #6C7A9C",
-"{ c #6C7AA4",
-"] c #7C82AC",
-"^ c #9CA2BC",
-"/ c #9CA6CC",
-"( c #949EC4",
-"_ c #B2B2B2",
-": c #989898",
-"< c #7F7F7F",
-"[ c #666666",
-"} c #4C4C4C",
-"| c #323232",
-"1 c #191919",
-"2 c #58B67E",
-"3 c #B3B3B3",
-"4 c #ACB2CC",
-"5 c #8492C4",
-"6 c #7482A4",
-"7 c #8496C4",
-"8 c #BCC2EC",
-"9 c #545E74",
-"0 c #4C4E6C",
-"a c #D7E4DC",
-"b c #CBDFD4",
-"c c #BCDAC8",
-"d c #ACD4BD",
-"e c #9CCEB1",
-"f c #8CC8A5",
-"g c #7CC299",
-"h c #C1C1C1",
-"i c #8492CC",
-"j c #7486B4",
-"k c #9CA6DC",
-"l c #A4B2DC",
-"m c #4C526C",
-"n c #8C8A8C",
-"o c #BAC6BF",
-"p c #AEC6B8",
-"q c #A0C3AE",
-"r c #91C0A4",
-"s c #83BE9B",
-"t c #75BB91",
-"u c #66B887",
-"v c #48745A",
-"w c #7486AC",
-"x c #94A2D4",
-"y c #949ECC",
-"z c #5C6674",
-"A c #D5DFD9",
-"B c #BFD2C6",
-"C c #A9C6B4",
-"D c #92B9A2",
-"E c #7CAD8F",
-"F c #65A07D",
-"G c #4E9369",
-"H c #398758",
-"I c #335D44",
-"J c #8C92C4",
-"K c #7482B4",
-"L c #5C6274",
-"M c #181818",
-"N c #439F68",
-"O c #9CA6D4",
-"P c #949ACC",
-"Q c #5C627C",
-"R c #9CAAD4",
-"S c #747EAC",
-"T c #949ED4",
-"U c #6C769C",
-"V c #DCDEF4",
-"W c #8C92AC",
-"X c #7C8EAC",
-"Y c #8C96CC",
-"Z c #949AAC",
-"` c #D4D6DC",
-" . c #DCDEE4",
-".. c #DCE2E4",
-"+. c #CCD2E4",
-"@. c #CCCED4",
-"#. c #A4AAC4",
-"$. c #8C96B4",
-"%. c #C4CADC",
-"&. c #7482AC",
-"*. c #8C96C4",
-"=. c #8C9ACC",
-"-. c #9CAACC",
-";. c #94A2C4",
-">. c #8496B4",
-",. c #747EA4",
-"'. c #949ABC",
-"). c #848694",
-"!. c #242A34",
-"~. c #3C3A3C",
-"{. c #D4D2D4",
-"]. c #CCD2F4",
-"^. c #7C82A4",
-"/. c #8C9ECC",
-"(. c #94A2DC",
-"_. c #BCC6F4",
-":. c #3C465C",
-"<. c #4C4E54",
-"[. c #ACAEB4",
-"}. c #94A6D4",
-"|. c #3C424C",
-"1. c #646A84",
-"2. c #94A6DC",
-"3. c #9CAADC",
-"4. c #BCC2D4",
-"5. c #B4BAC4",
-"6. c #5C668C",
-"7. c #B4BAD4",
-"8. c #ACAEBC",
-"9. c #7C86B4",
-"0. c #848EBC",
-"a. c #C4C6CC",
-"b. c #848EC4",
-"c. c #64728C",
-"d. c #848EB4",
-"e. c #DCDEDC",
-"f. c #8496CC",
-"g. c #8C96BC",
-"h. c #ACBAE4",
-"i. c #9CA6BC",
-"j. c #A4B2E4",
-"k. c #B4BEDC",
-"l. c #7C8AB4",
-"m. c #A4B2D4",
-"n. c #ACB6D4",
-"o. c #848EAC",
-"p. c #BCBECC",
-"q. c #747A8C",
-"r. c #6C727C",
-"s. c #6C6E7C",
-"t. c #84868C",
-"u. c #BCBEC4",
-"v. c #747684",
-"w. c #ACAEAC",
-" . + @ . . ",
-" + # + + $ ",
-" % & * = - = - = & = = - - ; > + # , + ' ",
-" ) ! ~ { ] ^ / ( _ : < [ } | 1 + # 2 , + 3 . ",
-" 4 5 6 7 8 ^ 9 0 a b c d e f g # , 2 2 2 + h ",
-" 4 i j k l m n n o p q r s t u 2 2 2 2 2 v + ",
-" 4 i w x y z A B C D E F G H H H H I + h ",
-" 4 J K x y L _ : < [ } | M + N H I + 3 . ",
-" 4 5 j O P Q R S + N I + ' ",
-" 4 J w T P U V W X + v + + . ",
-" 4 5 j Y 5 Z ` ... .+.@.#.$.%.. + @ . . ",
-" 4 7 &.Y *.! =.-.;.>.,.U '.; ).!.~.{. ",
-" 4 i &.T ].+.W ^.W O /.(._.:.<.[. ",
-" 4 *.&.}.8 9 ~.|.m 1.*.2.3.m 4. ",
-" 4 i w x y L 5.6.*./.X 7. ",
-" 4 i ] (.y L 8.,.5 9.0.~ a. ",
-" 4 b.j x y L 5.c.d.b.b.! W e. ",
-" ) 5 9.x P L 8.,.5 f.J U Z ",
-" 4 i w (.y z Z ! f.=.0.U @. ",
-" ) J g.h./ L i.S 7 j.-.^.Z ",
-" 4 0.;.k.'.9 6.l.m.n.o.9 ",
-" p.q.r.1.s.t. u.q.s.s.s.v.w. ",
-" ",
-" "};
Oops, something went wrong.

0 comments on commit b52c7fd

Please sign in to comment.