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

This commit is contained in:
Sam Steingold 2011-12-15 22:14:07 -05:00
parent 92a24ea80e
commit 763237c468
2 changed files with 7 additions and 1 deletions

View file

@ -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.

View file

@ -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.