Check for existence of p4 script before setting $P4EDITOR.
Work around weird bug whereby calling "file [p4 diff]" when in a
directory with a subdirectory called ``d'' would confuse Vim.
Removed old debugging code which shouldn't have been still there.