Convert browser mappings to normal mode only.
Fix issue with DiffNext not calling DiffWithFile correctly.
winwidth() and columns() not necessarily correct.

Since we use set columns=s:diffwidth to set back, it is better to use &columns.
Besides columns() was getting an error.