The version of the gun and the swordsman I read was that the script called for Indiana to pull the sword out of his hand with the whip but after several takes he still missed. So finally Ford got disgusted and pulled out his gun and shot him instead. They stopped filming, looked at each other, and exclaimed, "That's exactly what Indiana Jones would do!" and put it in the film.