The next time on film he is met with the same decision as at the end of ROTJ, his slight hesitation brings about the second Darth Vader. It was the saber that triggered it. You never see him with a saber again after this point. I would suggest he realises that nothing good comes from weapons.
Luke does retrieve his Lightsaber after his Duel with Vader and Emperor, See pic Attached
Nope,that's Leia,s Mary Poppins umbrella. He was just reminding her she would need it in 40 years or so.