Mercurial > emacs
changeset 29973:be9760ddad44
(Man-notify-when-ready): Don't use window-system. If
Man-notify-method is newframe, and the display is not
multi-frame, select the frame created for the man page.
(Man-init-defvars): Doc fix.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Wed, 28 Jun 2000 15:31:31 +0000 |
| parents | 39c1579e89a8 |
| children | 16e551942724 |
| files | lisp/man.el |
| diffstat | 1 files changed, 7 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/man.el Wed Jun 28 11:59:30 2000 +0000 +++ b/lisp/man.el Wed Jun 28 15:31:31 2000 +0000 @@ -364,7 +364,7 @@ ;; utilities (defun Man-init-defvars () - "Used for initialising variables based on the value of `window-system'. + "Used for initialising variables based on display's color support. This is necessary if one wants to dump man.el with Emacs." ;; The following is necessary until fonts are implemented on @@ -634,23 +634,22 @@ (save-excursion (let ((frame (make-frame Man-frame-parameters))) (set-window-buffer (frame-selected-window frame) man-buffer) - (set-window-dedicated-p (frame-selected-window frame) t)))) + (set-window-dedicated-p (frame-selected-window frame) t) + (or (display-multi-frame-p frame) + (select-frame frame))))) ((eq Man-notify-method 'pushy) (switch-to-buffer man-buffer)) ((eq Man-notify-method 'bully) - (and window-system - (frame-live-p saved-frame) + (and (frame-live-p saved-frame) (select-frame saved-frame)) (pop-to-buffer man-buffer) (delete-other-windows)) ((eq Man-notify-method 'aggressive) - (and window-system - (frame-live-p saved-frame) + (and (frame-live-p saved-frame) (select-frame saved-frame)) (pop-to-buffer man-buffer)) ((eq Man-notify-method 'friendly) - (and window-system - (frame-live-p saved-frame) + (and (frame-live-p saved-frame) (select-frame saved-frame)) (display-buffer man-buffer 'not-this-window)) ((eq Man-notify-method 'polite)