soywiki 0.3.3 → 0.3.4

data/README.markdown

@@ -169,7 +169,7 @@ commands:
 
 * `CTRL-j` and `CTRL-k` move the cursor directly to the next or previous WikiLink on the page
 * `ENTER` follows the WikiLink under the cursor
-* If there is nothing under the cursor, `ENTER` is equivalent to `CTRL-w p` and moves the cursor to the last accessed window
+* If there is no WikiLink under the cursor, `ENTER` is equivalent to `CTRL-w p` and moves the cursor to the last accessed window
 * `,f` follows the first WikiLink after the cursor
 * `CTRL-l` opens a WikiLink in a vertical split window; press `CTRL-l` again
 while the cursor is on the top line to close the new window 

data/lib/soywiki.rb

@@ -1,7 +1,7 @@
 require 'string_ext'
 
 module Soywiki
-  VERSION = '0.3.3'
+  VERSION = '0.3.4'
   WIKI_WORD = /\b([a-z][\w_]+\.)?[A-Z][a-z]+[A-Z]\w*\b/
   HYPERLINK = %r|\bhttps?://[^ >)\n\]]+|
 

data/lib/soywiki.vim

@@ -127,19 +127,16 @@ func! s:find_next_wiki_link(backward)
 endfunc
 
 func! s:follow_link_under_cursor(split)
-  if expand("<cWORD>>") == ''
-    " just switch windows
-    silent wincmd p
-    echom "Switched to last accessed window"
-    return
-  endif
-  if match(expand("<cWORD>>"), s:http_link_pattern) != -1
+  let word = expand("<cWORD>")
+  if match(word, s:http_link_pattern) != -1
     call s:open_href_under_cursor()
     return
   endif
   let link = s:link_under_cursor()
   if link == ""
-    echom "'" . expand("<cWORD>")  . "' is not a wiki link"
+    " just switch windows
+    silent wincmd p
+    echom "'" . word  . "' is not a wiki link. " . (winnr('$') > 1 ? "Switched to last accessed window." : "")
     return ""
   elseif line('.') == 1
     " SPECIAL CASE

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 3
-  version: 0.3.3
+  - 4
+  version: 0.3.4
 platform: ruby
 authors: 
 - Daniel Choi