summaryrefslogtreecommitdiff
path: root/lisp/man.el
diff options
context:
space:
mode:
authorSam Steingold <sds@gnu.org>2011-12-15 22:14:07 -0500
committerSam Steingold <sds@gnu.org>2011-12-15 22:14:07 -0500
commit763237c468b08353bf89a6fb63a0ad75be7892f8 (patch)
treef94277a1d2c9ff7c3ebe7b3333c65f90a9cde7dd /lisp/man.el
parent92a24ea80eaebfdcebab8577d322ca67d4e1d236 (diff)
downloademacs-763237c468b08353bf89a6fb63a0ad75be7892f8.tar.gz
(Man-getpage-in-background): When running under a window-system, ignore $MANWIDTH and $COLUMNS.
Diffstat (limited to 'lisp/man.el')
-rw-r--r--lisp/man.el3
1 files changed, 2 insertions, 1 deletions
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.