33866: addendum to completion trap fix

We need the multifuncdef option on for the trap function definitions to
work.  It is by default by this wasn't enforced for the completion
functions.
33845: save correct cursor position with push-line from vi command mode
33860: minor fixes to vi mode changes
33861: update lsof completion for new options