From: Juri Linkov <juri@jurta.org>
Date: Fri, 23 Nov 2007 00:32:42 +0000 (+0000)
Subject: (Man-getpage-in-background): Don't disregard user option
X-Git-Tag: emacs-pretest-23.0.90~9531
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8783fe91be449416e1aab353afed54ff965c236f;p=emacs.git

(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 4056ddedb29..41f1d37bb18 100644
--- 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