From: Sam Steingold <sds@gnu.org>
Date: Fri, 16 Dec 2011 03:14:07 +0000 (-0500)
Subject: (Man-getpage-in-background): When running under a window-system, ignore $MANWIDTH... 
X-Git-Tag: emacs-pretest-24.0.93~161
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=763237c468b08353bf89a6fb63a0ad75be7892f8;p=emacs.git

(Man-getpage-in-background): When running under a window-system, ignore $MANWIDTH and $COLUMNS.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e718222e01b..a07d4fa2cde 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-13  Sam Steingold  <sds@gnu.org>
+
+	* man.el (Man-getpage-in-background): When running under a
+	window-system, ignore $MANWIDTH and $COLUMNS.
+
 2011-12-15  Kenichi Handa  <handa@m17n.org>
 
 	* language/ethio-util.el: Change coding tag to utf-8-emacs.
diff --git a/lisp/man.el b/lisp/man.el
index aeba3327c40..3cdbdddb044 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -933,7 +933,8 @@ Return the buffer in which the manpage will appear."
 	;;               minal (using an ioctl(2) if available, the value of
 	;;               $COLUMNS,  or falling back to 80 characters if nei-
 	;;               ther is available).
-	(unless (or (getenv "MANWIDTH") (getenv "COLUMNS"))
+	(when (or window-system
+                  (not (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.