Commit bf55e415 authored by Eli Zaretskii's avatar Eli Zaretskii
Browse files

(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.
parent d5483ab1
...@@ -364,7 +364,7 @@ This regular expression should start with a `^' character.") ...@@ -364,7 +364,7 @@ This regular expression should start with a `^' character.")
;; utilities ;; utilities
(defun Man-init-defvars () (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." This is necessary if one wants to dump man.el with Emacs."
;; The following is necessary until fonts are implemented on ;; The following is necessary until fonts are implemented on
...@@ -634,23 +634,22 @@ See the variable `Man-notify-method' for the different notification behaviors." ...@@ -634,23 +634,22 @@ See the variable `Man-notify-method' for the different notification behaviors."
(save-excursion (save-excursion
(let ((frame (make-frame Man-frame-parameters))) (let ((frame (make-frame Man-frame-parameters)))
(set-window-buffer (frame-selected-window frame) man-buffer) (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) ((eq Man-notify-method 'pushy)
(switch-to-buffer man-buffer)) (switch-to-buffer man-buffer))
((eq Man-notify-method 'bully) ((eq Man-notify-method 'bully)
(and window-system (and (frame-live-p saved-frame)
(frame-live-p saved-frame)
(select-frame saved-frame)) (select-frame saved-frame))
(pop-to-buffer man-buffer) (pop-to-buffer man-buffer)
(delete-other-windows)) (delete-other-windows))
((eq Man-notify-method 'aggressive) ((eq Man-notify-method 'aggressive)
(and window-system (and (frame-live-p saved-frame)
(frame-live-p saved-frame)
(select-frame saved-frame)) (select-frame saved-frame))
(pop-to-buffer man-buffer)) (pop-to-buffer man-buffer))
((eq Man-notify-method 'friendly) ((eq Man-notify-method 'friendly)
(and window-system (and (frame-live-p saved-frame)
(frame-live-p saved-frame)
(select-frame saved-frame)) (select-frame saved-frame))
(display-buffer man-buffer 'not-this-window)) (display-buffer man-buffer 'not-this-window))
((eq Man-notify-method 'polite) ((eq Man-notify-method 'polite)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment