fix: Make diff wrapping toggle always available in command_list and correct a type error (resolves #10682)

fix: Make diff wrapping toggle always available in command_list and correct a type error (resolves #10682) #5038