soywiki 0.5.3 → 0.5.4

data/README.markdown

@@ -181,7 +181,7 @@ commands:
 while the cursor is on the top line to close the new window 
 * `CTRL-h` does the same, but in a regular split window
 * `q` closes a split window 
-* `,H` takes you to the `HomePage` of the namespace if it exists and you're not already on it. Otherwise, it takes you to `main.Homepage`.
+* `,H` takes you to the `HomePage` of the current namespace if it exists and you're not already on it. Otherwise, it takes you to `main.Homepage`.
 
 These key mappings may not be very mnemonic, but they are easy to
 memorize through muscle memory and were chosen to keep the hands

data/lib/soywiki.rb

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

data/lib/soywiki.vim

@@ -5,6 +5,8 @@
 " This regex matches namedspaced WikiWords and unqualified WikiWords 
 let s:wiki_link_pattern =  '\C\m\<\([a-z][[:alnum:]_]\+\.\)\?[A-Z][a-z]\+[A-Z]\w*\>'
 let s:http_link_pattern = 'https\?:[^ >)\]]\+'
+let s:wiki_or_web_link_pattern =  '\C\<\([a-z][[:alnum:]_]\+\.\)\?[A-Z][a-z]\+[A-Z]\w*\>\|https\?:[^ >)\]]\+'
+
 let s:rename_links_command = 'soywiki-rename '
 let s:find_pages_linking_in_command = 'soywiki-pages-linking-in '
 let s:expand_command = 'soywiki-expand '
@@ -121,9 +123,9 @@ func! s:find_next_wiki_link(backward)
   " don't wrap
   if a:backward == 1 
     normal lb
-    let result = search(s:wiki_link_pattern, 'Wb') 
+    let result = search(s:wiki_or_web_link_pattern, 'Wb') 
   else
-    let result = search(s:wiki_link_pattern, 'W')
+    let result = search(s:wiki_or_web_link_pattern, 'W')
   endif
   if (result == 0) 
     return ""
@@ -586,7 +588,8 @@ func! s:global_mappings()
   command! -bar -nargs=1 SWNamespaceSearch :call s:wiki_search(<f-args>, 1)
 
   autocmd  BufReadPost,BufNewFile,WinEnter,BufEnter,BufNew,BufAdd * call s:highlight_wikiwords() 
-  autocmd  BufEnter * call s:prep_buffer() 
+  autocmd  BufReadPost,BufNewFile,WinEnter,BufEnter,BufNew,BufAdd * call s:prep_buffer() 
+  " autocmd  BufEnter * call s:prep_buffer() 
 endfunc 
 
 " this checks if the buffer is a SoyWiki file (from firstline)
@@ -624,7 +627,6 @@ func! s:prep_buffer()
     nnoremap <buffer> \ gqap 
     nnoremap <buffer> <Leader>- o<Esc>k72i-<Esc><CR>
     nnoremap <buffer> <Leader>d :r !date<CR>o
-
     "   set nu
     setlocal completefunc=CompletePageTitle
     augroup <buffer>

metadata

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