From decf0f8e1d3298b21afbfe8a89f06f2eb1ef551c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karl=20Yngve=20Lerv=C3=A5g?= <karl.yngve+git@gmail.com>
Date: Sun, 17 Apr 2016 13:16:00 +0200
Subject: [PATCH] Remove paragraph text objects and motions (#320)

---
 README.md                    |  1 -
 autoload/vimtex.vim          | 10 ----------
 autoload/vimtex/motion.vim   | 10 ----------
 autoload/vimtex/text_obj.vim | 15 ---------------
 doc/vimtex.txt               | 17 -----------------
 5 files changed, 53 deletions(-)

diff --git a/README.md b/README.md
index 1b05ac7..9b97b3e 100644
--- a/README.md
+++ b/README.md
@@ -40,7 +40,6 @@ disabled if desired.
   - `id ad` Delimiters
   - `ie ae` LaTeX environments
   - `i$ a$` Inline math structures
-  - `ip ap` Paragraphs
 - Other mappings
   - Delete the surrounding command or environment with `dsc`/`dse`/`ds$`
   - Change the surrounding command or environment with `csc`/`cse`/`cs$`
diff --git a/autoload/vimtex.vim b/autoload/vimtex.vim
index d574299..ca28bb2 100644
--- a/autoload/vimtex.vim
+++ b/autoload/vimtex.vim
@@ -376,12 +376,6 @@ function! s:init_mappings() " {{{1
   endif
 
   if g:vimtex_motion_enabled
-    call s:map('n', '}', '<plug>(vimtex-})')
-    call s:map('n', '{', '<plug>(vimtex-{)')
-    call s:map('x', '}', '<plug>(vimtex-})')
-    call s:map('x', '{', '<plug>(vimtex-{)')
-    call s:map('o', '}', '<plug>(vimtex-})')
-    call s:map('o', '{', '<plug>(vimtex-{)')
     call s:map('n', ']]', '<plug>(vimtex-]])')
     call s:map('n', '][', '<plug>(vimtex-][)')
     call s:map('n', '[]', '<plug>(vimtex-[])')
@@ -418,10 +412,6 @@ function! s:init_mappings() " {{{1
     call s:map('x', 'a$', '<plug>(vimtex-a$)')
     call s:map('o', 'i$', '<plug>(vimtex-i$)')
     call s:map('o', 'a$', '<plug>(vimtex-a$)')
-    call s:map('x', 'ip', '<plug>(vimtex-ip)')
-    call s:map('x', 'ap', '<plug>(vimtex-ap)')
-    call s:map('o', 'ip', '<plug>(vimtex-ip)')
-    call s:map('o', 'ap', '<plug>(vimtex-ap)')
   endif
 
   if g:vimtex_toc_enabled
diff --git a/autoload/vimtex/motion.vim b/autoload/vimtex/motion.vim
index 90c8e7e..0359524 100644
--- a/autoload/vimtex/motion.vim
+++ b/autoload/vimtex/motion.vim
@@ -66,16 +66,6 @@ function! vimtex#motion#init_buffer() " {{{1
   xmap     <silent><buffer> <plug>(vimtex-%) <sid>(vimtex-%)
   onoremap <silent><buffer> <plug>(vimtex-%) :execute "normal \<sid>(v)\<sid>(vimtex-%)"<cr>
 
-  " Paragraphs
-  nnoremap <silent><buffer> <plug>(vimtex-})  :call vimtex#motion#next_paragraph(0,0)<cr>
-  nnoremap <silent><buffer> <plug>(vimtex-{)  :call vimtex#motion#next_paragraph(1,0)<cr>
-  xnoremap <silent><buffer>  <sid>(vimtex-})  :<c-u>call vimtex#motion#next_paragraph(0,1)<cr>
-  xnoremap <silent><buffer>  <sid>(vimtex-{)  :<c-u>call vimtex#motion#next_paragraph(1,1)<cr>
-  xmap     <silent><buffer> <plug>(vimtex-})  <sid>(vimtex-})
-  xmap     <silent><buffer> <plug>(vimtex-{)  <sid>(vimtex-{)
-  onoremap <silent><buffer> <plug>(vimtex-})  :execute "normal \<sid>(v)\<sid>(vimtex-})"<cr>
-  onoremap <silent><buffer> <plug>(vimtex-{)  :execute "normal \<sid>(v)\<sid>(vimtex-{)"<cr>
-
   " Sections
   nnoremap <silent><buffer> <plug>(vimtex-]]) :call vimtex#motion#next_section(0,0,0)<cr>
   nnoremap <silent><buffer> <plug>(vimtex-][) :call vimtex#motion#next_section(1,0,0)<cr>
diff --git a/autoload/vimtex/text_obj.vim b/autoload/vimtex/text_obj.vim
index 8987ae1..54fd68c 100644
--- a/autoload/vimtex/text_obj.vim
+++ b/autoload/vimtex/text_obj.vim
@@ -23,7 +23,6 @@ function! vimtex#text_obj#init_buffer() " {{{1
         \ ['d', 'delimited', 'delim_all'],
         \ ['e', 'delimited', 'env'],
         \ ['$', 'delimited', 'env_math'],
-        \ ['p', 'paragraphs', ''],
         \]
     let l:p1 = 'noremap <silent><buffer> <plug>(vimtex-'
     let l:p2 = l:map . ') :<c-u>call vimtex#text_obj#' . l:name
@@ -111,20 +110,6 @@ function! vimtex#text_obj#delimited(is_inner, type) " {{{1
   call cursor(l2, c2)
 endfunction
 
-" }}}1
-function! vimtex#text_obj#paragraphs(is_inner) " {{{1
-  " Define selection
-  normal! 0j
-  call vimtex#motion#next_paragraph(1,0)
-  normal! jV
-  call vimtex#motion#next_paragraph(0,0)
-
-  " Go back one line for inner objects
-  if a:is_inner
-    normal! k
-  endif
-endfunction
-
 " }}}1
 
 " vim: fdm=marker sw=2
diff --git a/doc/vimtex.txt b/doc/vimtex.txt
index 08b859d..f1e17e5 100644
--- a/doc/vimtex.txt
+++ b/doc/vimtex.txt
@@ -105,7 +105,6 @@ Feature overview~
   - `id` `ad` Delimiters
   - `ie` `ae` LaTeX environments
   - `i$` `a$` Inline math structures
-  - `ip` `ap` Paragraphs
 - Other mappings
   - Delete the surrounding command or environment with `dsc`/`dse`/`ds$`
   - Change the surrounding command or environment with `csc`/`cse`/`cs$`
@@ -325,15 +324,11 @@ This feature is explained in more detail later, see |vimtex-imaps|.
    ie               |<plug>(vimtex-ie)|                     `nxo`
    a$               |<plug>(vimtex-a$)|                     `nxo`
    i$               |<plug>(vimtex-i$)|                     `nxo`
-   ap               |<plug>(vimtex-ap)|                     `nxo`
-   ip               |<plug>(vimtex-ip)|                     `nxo`
    %                |<plug>(vimtex-%)|                      `nxo`
    ]]               |<plug>(vimtex-]])|                     `nxo`
    ][               |<plug>(vimtex-][)|                     `nxo`
    []               |<plug>(vimtex-[])|                     `nxo`
    [[               |<plug>(vimtex-[[)|                     `nxo`
-   }                |<plug>(vimtex-})|                      `nxo`
-   {                |<plug>(vimtex-{)|                      `nxo`
   -------------------------------------------------------------~
 
 ------------------------------------------------------------------------------
@@ -1213,12 +1208,6 @@ Map definitions~
 *<plug>(vimtex-i$)*
   Text object for inline math (exclusive).
 
-*<plug>(vimtex-ap)*
-  Text object for paragraphs (inclusive).
-
-*<plug>(vimtex-ip)*
-  Text object for paragraphs (exclusive).
-
 *<plug>(vimtex-%)*
   Find matching pair.
 
@@ -1234,12 +1223,6 @@ Map definitions~
 *<plug>(vimtex-[[)*
   Section backward (exclusive).
 
-*<plug>(vimtex-})*
-  Paragraph forward.
-
-*<plug>(vimtex-{)*
-  Paragraph backward.
-
 ------------------------------------------------------------------------------
 Insert mode mappings~
                                                                  *vimtex-imaps*