Mercurial > emacs

changeset 86355:a5e1b70f3ddf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(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'.
author Juri Linkov <juri@jurta.org>
date Fri, 23 Nov 2007 00:32:42 +0000
parents 29047758dd89
children 93df56120f01
files lisp/man.el
diffstat 1 files changed, 10 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/man.el	Fri Nov 23 00:32:05 2007 +0000
+++ b/lisp/man.el	Fri Nov 23 00:32:42 2007 +0000
@@ -766,17 +766,16 @@
 	;;               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