[Emacs-diffs] /srv/bzr/emacs/trunk r106684: (Man-getpage-in-background): When running under a window-system, ignore $MANWIDTH and $COLUMNS.

[Sam Steingold]

------------------------------------------------------------
revno: 106684
committer: Sam Steingold <address@hidden>
branch nick: trunk
timestamp: Thu 2011-12-15 22:14:07 -0500
message:
  (Man-getpage-in-background): When running under a window-system, ignore 
$MANWIDTH and $COLUMNS.
modified:
  lisp/ChangeLog
  lisp/man.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-12-15 07:50:05 +0000
+++ b/lisp/ChangeLog    2011-12-16 03:14:07 +0000
@@ -1,3 +1,8 @@
+2011-12-13  Sam Steingold  <address@hidden>
+
+       * man.el (Man-getpage-in-background): When running under a
+       window-system, ignore $MANWIDTH and $COLUMNS.
+
 2011-12-15  Kenichi Handa  <address@hidden>
 
        * language/ethio-util.el: Change coding tag to utf-8-emacs.

=== modified file 'lisp/man.el'
--- a/lisp/man.el       2011-12-04 08:02:42 +0000
+++ b/lisp/man.el       2011-12-16 03:14:07 +0000
@@ -933,7 +933,8 @@
        ;;               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.