aboutsummaryrefslogtreecommitdiff
path: root/vim
diff options
context:
space:
mode:
authorDavid Bremner <bremner@debian.org>2011-06-23 21:54:50 -0300
committerDavid Bremner <bremner@debian.org>2011-06-23 21:54:50 -0300
commit68a2c7a8b0f749cb33a8ce7cfa2aa7781d2529bb (patch)
tree321c591bd62e32d315ae6430958b416c54620c75 /vim
parentd6f05fde23c7d4180a69176a685022fb81a293cf (diff)
parent8bf0c1c3deb49d54e86c04826a05f0217a81cf47 (diff)
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'vim')
-rw-r--r--vim/README2
-rw-r--r--vim/plugin/notmuch.vim4
2 files changed, 3 insertions, 3 deletions
diff --git a/vim/README b/vim/README
index 12ad2bb..aa3245c 100644
--- a/vim/README
+++ b/vim/README
@@ -37,7 +37,7 @@ Buffer types:
You are presented with the search results when you run :NotMuch.
Keybindings:
- <Space> - show the selected thread colapsing unmatched items
+ <Space> - show the selected thread collapsing unmatched items
<Enter> - show the entire selected thread
a - archive message (remove inbox tag)
f - filter the current search terms
diff --git a/vim/plugin/notmuch.vim b/vim/plugin/notmuch.vim
index c731c47..768a011 100644
--- a/vim/plugin/notmuch.vim
+++ b/vim/plugin/notmuch.vim
@@ -765,7 +765,7 @@ function! s:NM_cmd_show_parse(inlines)
if part_end
" FIXME: this is a hack for handling two folds being added for one line
- " we should handle addinga fold in a function
+ " we should handle adding a fold in a function
if len(foldinfo) && foldinfo[1] < foldinfo[2]
call add(info['folds'], foldinfo[0:3])
let info['foldtext'][foldinfo[1]] = foldinfo[4]
@@ -1314,7 +1314,7 @@ endfunction
function! s:NM_tag(filter, tags)
let filter = len(a:filter) ? a:filter : [<SID>NM_search_thread_id()]
if !len(filter)
- throw 'Eeek! I couldn''t find the thead id!'
+ throw 'Eeek! I couldn''t find the thread id!'
endif
let args = ['tag']
call extend(args, a:tags)