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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e718222e01b4cec0c12ab1241cefcf0f658f64f9..a07d4fa2cdebf972e2f575fab7196310ca2799df 100644 (file)
--- 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 aeba3327c405da0a19f29ce86a868908b43c7df1..3cdbdddb04448935223e112e6e1509816930cb65 100644 (file)
--- 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.