@@ -443,24 +443,14 @@ endfunction
443443
444444function ! s: plugindefine_interface_key_mappings ()" {{{3
445445let RHS_FORMAT=
446- \ ' %s'
447- \ .' :<C-u>call g:__textobj_' self .name .' .%s('
446+ \ ' :<C-u>call g:__textobj_' self .name .' .%s('
448447\ .' "%s",'
449448\ .' "%s",'
450449\ .' "<mode>"'
451450\ .' )<Return>'
452- \ .' %s'
453451
454452for [obj_name, specs]in items (self .obj_specs)
455453for spec_namein filter (keys (specs),' s:is_ui_property_name(v:val)'
456- if spec_name= ~#' ^move'
457- let save= ' '
458- let restore= ' '
459- else " spec_name =~# '^select'
460- let save= ' <SID>(save-marks)'
461- let restore= ' <SID>(restore-marks)'
462- endif
463-
464454" lhs
465455let lhs= self .interface_mapping_name (obj_name, spec_name)
466456
@@ -474,7 +464,7 @@ function! s:plugin.define_interface_key_mappings() "{{{3
474464" skip to allow to define user's own {rhs} of the interface mapping.
475465continue
476466endif
477- let rhs= printf (RHS_FORMAT,save, do , spec_name, obj_name, restore )
467+ let rhs= printf (RHS_FORMAT,do , spec_name, obj_name)
478468
479469" map
480470if spec_name= ~#' ^move'
@@ -781,25 +771,6 @@ function! s:fail(interface_key_mapping_lhs)
781771throw printf (' Text object %s is not defined' a: interface_key_mapping_lhs
782772endfunction
783773
784- noremap <expr> <SID> (save-marks)<SID> save_marks()
785- noremap !<expr> <SID> (save-marks)<SID> save_marks()
786- noremap <expr> <SID> (restore-marks)<SID> restore_marks()
787- noremap !<expr> <SID> (restore-marks)<SID> restore_marks()
788-
789- let s: original_marks= {}
790-
791- function ! s: save_marks
792- let s: original_marks' <' = getpos (" '<"
793- let s: original_marks' >' = getpos (" '>"
794- return ' '
795- endfunction
796-
797- function ! s: restore_marks
798- call setpos (" '<" s: original_marks' <'
799- call setpos (" '>" s: original_marks' >'
800- return ' '
801- endfunction
802-
803774
804775
805776