> +        (and (if (eq pop-up-frames 'graphic-only)
> +	         (display-graphic-p)
> +	       pop-up-frames)
> +	     (display-buffer-pop-up-frame buffer alist))

Nah, this can't be right.  Better to create new functions for this: