Fix bug in browse-kill-ring-occur.

The parameters to browse-kill-ring-setup have changed at some point in
the past, and browse-kill-ring-occur had not been update to the new
usage, with the result that browse-kill-ring-occur no longer worked.
Fixed in this commit, brings use of browse-kill-ring-setup up to date.

ChangeLog:

	Fix bug in `browse-kill-ring-occur' due to change in parameters of
	`browse-kill-ring-setup'.
Merge remote-tracking branch 'official/master' into edit-delete-empty-v3
Update delete after edit to empty solution.

Now selects the entry after the deleted entry.