Here is an updated patch with a small display improvement: File name
doesn't appear in the middle of the line anymore.