Permalink
Browse files

Upgraded VimClojure from 2.3.5 to 2.3.6, a bugfix release to fix resu…

…lt window handling.
  • Loading branch information...
1 parent 9900c68 commit c030e690f31c9417291b305c69dba2f31ea3f19f @ctford ctford committed Aug 26, 2012
Showing with 17 additions and 4 deletions.
  1. 0 bundle/{vimclojure-2.3.5 → vimclojure-2.3.6}/LICENSE.txt
  2. 0 bundle/{vimclojure-2.3.5 → vimclojure-2.3.6}/README.markdown
  3. +17 −4 bundle/{vimclojure-2.3.5 → vimclojure-2.3.6}/autoload/vimclojure.vim
  4. 0 bundle/{vimclojure-2.3.5 → vimclojure-2.3.6}/autoload/vimclojure/util.vim
  5. 0 bundle/{vimclojure-2.3.5 → vimclojure-2.3.6}/bin/clj
  6. 0 bundle/{vimclojure-2.3.5 → vimclojure-2.3.6}/bin/clj.bat
  7. 0 bundle/{vimclojure-2.3.5 → vimclojure-2.3.6}/bin/ng-server
  8. 0 bundle/{vimclojure-2.3.5 → vimclojure-2.3.6}/bin/ng-server.bat
  9. 0 bundle/{vimclojure-2.3.5 → vimclojure-2.3.6}/doc/clojure.txt
  10. 0 bundle/{vimclojure-2.3.5 → vimclojure-2.3.6}/ftdetect/clojure.vim
  11. 0 bundle/{vimclojure-2.3.5 → vimclojure-2.3.6}/ftplugin/clojure.vim
  12. 0 bundle/{vimclojure-2.3.5 → vimclojure-2.3.6}/ftplugin/clojure/completions-clojure.core.txt
  13. 0 bundle/{vimclojure-2.3.5 → vimclojure-2.3.6}/ftplugin/clojure/completions-clojure.data.txt
  14. 0 bundle/{vimclojure-2.3.5 → vimclojure-2.3.6}/ftplugin/clojure/completions-clojure.inspector.txt
  15. 0 bundle/{vimclojure-2.3.5 → vimclojure-2.3.6}/ftplugin/clojure/completions-clojure.java.browse.txt
  16. 0 bundle/{vimclojure-2.3.5 → vimclojure-2.3.6}/ftplugin/clojure/completions-clojure.java.io.txt
  17. 0 bundle/{vimclojure-2.3.5 → vimclojure-2.3.6}/ftplugin/clojure/completions-clojure.java.javadoc.txt
  18. 0 bundle/{vimclojure-2.3.5 → vimclojure-2.3.6}/ftplugin/clojure/completions-clojure.java.shell.txt
  19. 0 bundle/{vimclojure-2.3.5 → vimclojure-2.3.6}/ftplugin/clojure/completions-clojure.main.txt
  20. 0 bundle/{vimclojure-2.3.5 → vimclojure-2.3.6}/ftplugin/clojure/completions-clojure.pprint.txt
  21. 0 bundle/{vimclojure-2.3.5 → vimclojure-2.3.6}/ftplugin/clojure/completions-clojure.repl.txt
  22. 0 bundle/{vimclojure-2.3.5 → vimclojure-2.3.6}/ftplugin/clojure/completions-clojure.set.txt
  23. 0 bundle/{vimclojure-2.3.5 → vimclojure-2.3.6}/ftplugin/clojure/completions-clojure.stacktrace.txt
  24. 0 bundle/{vimclojure-2.3.5 → vimclojure-2.3.6}/ftplugin/clojure/completions-clojure.string.txt
  25. 0 bundle/{vimclojure-2.3.5 → vimclojure-2.3.6}/ftplugin/clojure/completions-clojure.template.txt
  26. 0 bundle/{vimclojure-2.3.5 → vimclojure-2.3.6}/ftplugin/clojure/completions-clojure.test.junit.txt
  27. 0 bundle/{vimclojure-2.3.5 → vimclojure-2.3.6}/ftplugin/clojure/completions-clojure.test.tap.txt
  28. 0 bundle/{vimclojure-2.3.5 → vimclojure-2.3.6}/ftplugin/clojure/completions-clojure.test.txt
  29. 0 bundle/{vimclojure-2.3.5 → vimclojure-2.3.6}/ftplugin/clojure/completions-clojure.walk.txt
  30. 0 bundle/{vimclojure-2.3.5 → vimclojure-2.3.6}/ftplugin/clojure/completions-clojure.xml.txt
  31. 0 bundle/{vimclojure-2.3.5 → vimclojure-2.3.6}/ftplugin/clojure/completions-clojure.zip.txt
  32. 0 bundle/{vimclojure-2.3.5 → vimclojure-2.3.6}/indent/clojure.vim
  33. 0 bundle/{vimclojure-2.3.5 → vimclojure-2.3.6}/plugin/clojure.vim
  34. 0 bundle/{vimclojure-2.3.5 → vimclojure-2.3.6}/syntax/clojure.vim
@@ -321,14 +321,16 @@ endfunction
function! vimclojure#Window.Init(buftype) dict
call self.__superObjectInit()
- let self._window = winnr()
+ let w:vimclojure_window = self
let self._buffer = a:buftype.New()
endfunction
function! vimclojure#Window.goHere() dict
- if winnr() != self._window
- execute self._window "wincmd w"
+ let wn = self.findThis()
+ if wn == -1
+ echoerr 'A crisis has arisen! Cannot find my window.'
endif
+ execute wn . "wincmd w"
call self._buffer.goHere()
endfunction
@@ -366,10 +368,21 @@ function! vimclojure#Window.clear() dict
endfunction
function! vimclojure#Window.close() dict
- close!
call self._buffer.close()
endfunction
+function! vimclojure#Window.findThis() dict
+ for w in range(1, winnr("$"))
+ if type(getwinvar(w, "vimclojure_window")) == type({})
+ if getwinvar(w, "vimclojure_window") == self
+ return w
+ endif
+ endif
+ endfor
+
+ return -1
+endfunction
+
" The transient buffer, used to display results.
let vimclojure#ResultWindow = copy(vimclojure#Window)
let vimclojure#ResultWindow["__superWindowNew"] = vimclojure#ResultWindow["New"]

0 comments on commit c030e69

Please sign in to comment.