(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'.

diff --git a/lisp/man.el b/lisp/man.el
index 4056ddedb292dbab84ded595bd267479658c3d6e..41f1d37bb181ae9afcb9415b746cb91ebf7e58f8 100644 (file)
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -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