Emacs 24.3 doesn't have (window--display-buffer-2) anymore, instead (window--display-buffer) can accept more arguments