diff options
| author | Juri Linkov <juri@jurta.org> | 2007-11-23 00:32:42 +0000 |
|---|---|---|
| committer | Juri Linkov <juri@jurta.org> | 2007-11-23 00:32:42 +0000 |
| commit | fc06dc82477f29c42df7fbd06e1c7c2c7ac1f04a (patch) | |
| tree | ab3134679958ff3bb9419d65260a1b790a9f4509 /lisp/man.el | |
| parent | 0ab1e44e478b6cc82f37ca67206d7b6445b49b27 (diff) | |
| download | emacs-fc06dc82477f29c42df7fbd06e1c7c2c7ac1f04a.tar.gz | |
(Man-getpage-in-background): Don't disregard user option
`Man-width' on non-window systems. Remove test for `window-system'
around setting envvar "COLUMNS" depending on the value of `Man-width'.
Diffstat (limited to 'lisp/man.el')
| -rw-r--r-- | lisp/man.el | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/lisp/man.el b/lisp/man.el index 4056ddedb29..41f1d37bb18 100644 --- a/lisp/man.el +++ b/lisp/man.el @@ -766,17 +766,16 @@ all sections related to a subject, put something appropriate into the ;; minal (using an ioctl(2) if available, the value of ;; $COLUMNS, or falling back to 80 characters if nei- ;; ther is available). - (if window-system - (unless (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. - (setenv "COLUMNS" (number-to-string - (cond - ((and (integerp Man-width) (> Man-width 0)) - Man-width) - (Man-width (frame-width)) - ((window-width))))))) + (unless (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. + (setenv "COLUMNS" (number-to-string + (cond + ((and (integerp Man-width) (> Man-width 0)) + Man-width) + (Man-width (frame-width)) + ((window-width)))))) (setenv "GROFF_NO_SGR" "1") (if (fboundp 'start-process) (set-process-sentinel |