-(defun special-display-popup-frame (buffer)
- (let ((window (get-buffer-window buffer t)))
- (if window
- ;; If we have a window already, make it visible.
- (let ((frame (window-frame window)))
- (make-frame-visible frame)
- (raise-frame frame)
- window)
- ;; If no window yet, make one in a new frame.
- (let ((frame (make-frame special-display-frame-alist)))
- (set-window-buffer (frame-selected-window frame) buffer)
- (set-window-dedicated-p (frame-selected-window frame) t)
- (frame-selected-window frame)))))
-
-(setq special-display-function 'special-display-popup-frame)
+;; If ARGS is an alist, use it as a list of frame parameter specs.
+;; If ARGS is a list whose car is a symbol,
+;; use (car ARGS) as a function to do the work.
+;; Pass it BUFFER as first arg, and (cdr ARGS) gives the rest of the args.
+(defun special-display-popup-frame (buffer &optional args)
+ (if (and args (symbolp (car args)))
+ (apply (car args) buffer (cdr args))
+ (let ((window (get-buffer-window buffer t)))
+ (if window
+ ;; If we have a window already, make it visible.
+ (let ((frame (window-frame window)))
+ (make-frame-visible frame)
+ (raise-frame frame)
+ window)
+ ;; If no window yet, make one in a new frame.
+ (let ((frame (make-frame (append args special-display-frame-alist))))
+ (set-window-buffer (frame-selected-window frame) buffer)
+ (set-window-dedicated-p (frame-selected-window frame) t)
+ (frame-selected-window frame))))))
+
+;; Handle delete-frame events from the X server.
+(defun handle-delete-frame (event)
+ (interactive "e")
+ (let ((frame (posn-window (event-start event)))
+ (i 0)
+ (tail (frame-list)))
+ (while tail
+ (and (frame-visible-p (car tail))
+ (not (eq (car tail) frame))
+ (setq i (1+ i)))
+ (setq tail (cdr tail)))
+ (if (> i 0)
+ (delete-frame frame t)
+ ;; Gildea@x.org says it is ok to ask questions before terminating.
+ (save-buffers-kill-emacs))))