(Man-getpage-in-background): Don't disregard user option

`Man-width' on non-window systems.  Remove test for `window-system'
around setting envvar "COLUMNS" depending on the value of `Man-width'.
This commit is contained in:
Juri Linkov 2007-11-23 00:32:42 +00:00
parent 6b8d0852a0
commit 8783fe91be

View file

@ -766,17 +766,16 @@ all sections related to a subject, put something appropriate into the
;; minal (using an ioctl(2) if available, the value of
;; $COLUMNS, or falling back to 80 characters if nei-
;; ther is available).
(if window-system
(unless (or (getenv "MANWIDTH") (getenv "COLUMNS"))
;; This isn't strictly correct, since we don't know how
;; the page will actually be displayed, but it seems
;; reasonable.
(setenv "COLUMNS" (number-to-string
(cond
((and (integerp Man-width) (> Man-width 0))
Man-width)
(Man-width (frame-width))
((window-width)))))))
(unless (or (getenv "MANWIDTH") (getenv "COLUMNS"))
;; This isn't strictly correct, since we don't know how
;; the page will actually be displayed, but it seems
;; reasonable.
(setenv "COLUMNS" (number-to-string
(cond
((and (integerp Man-width) (> Man-width 0))
Man-width)
(Man-width (frame-width))
((window-width))))))
(setenv "GROFF_NO_SGR" "1")
(if (fboundp 'start-process)
(set-process-sentinel