.vim: Fix name `SearchConflictMarkers`

[dotfiles.git] / .vim / autoload / text.vim

diff --git a/.vim/autoload/text.vim b/.vim/autoload/text.vim
index 8fe0e716c18c69f62f7b083f0da229c46108a562..16e6c343004eed899ce231e103e66aeeaaf01fe6 100644 (file)
--- a/.vim/autoload/text.vim
+++ b/.vim/autoload/text.vim
@@ -1,3 +1,11 @@
+function! text#SearchConflictMarkers()
+   normal /<<<<<<<\|=======\||||||||\|>>>>>>>
+endfunction
+
+function! text#RemoveTrailingSpaces()
+    %s/ \+$//
+endfunction
+
 function! text#SqueezeEmptyLines()
     " Replace multiple consecutive empty lines with just one
     %s/\n\{3,\}/\r\r/