diff options
| author | Glenn Morris <rgm@gnu.org> | 2019-08-10 08:44:31 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2019-08-10 08:44:31 -0700 |
| commit | 7343474b79332b05abc1d51ae2bbc3e2ba43deeb (patch) | |
| tree | c584ffae74bddab1b6f8d89035dc0e5af06178aa /lisp/man.el | |
| parent | 6bebfa77a9ae8c63b29f159387600c097ea32eaa (diff) | |
| parent | 0860ac0e9db15ee0f094df7f6b0bbd5961bb08ac (diff) | |
| download | emacs-7343474b79332b05abc1d51ae2bbc3e2ba43deeb.tar.gz | |
Merge from origin/emacs-26
0860ac0 (origin/emacs-26) Improve documentation of features that use ...
fae1ff6 Fix docstrings in pong
82a2894 Improve doc strings of 'append-to-buffer' and friends
cb0403d Fix octave-mode ElDoc support
691790b Avoid Groff hanging on MS-Windows when invoked by "M-x man"
Diffstat (limited to 'lisp/man.el')
| -rw-r--r-- | lisp/man.el | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lisp/man.el b/lisp/man.el index 8858451b384..89d514423b6 100644 --- a/lisp/man.el +++ b/lisp/man.el @@ -624,7 +624,13 @@ This is necessary if one wants to dump man.el with Emacs." ;; so we don't need `2>' even with DOS shells ;; which do support stderr redirection. ((not (fboundp 'make-process)) " %s") - ((concat " %s 2>" null-device))))) + ((concat " %s 2>" null-device + ;; Some MS-Windows ports of Groff + ;; try to read stdin after exhausting + ;; the command-line arguments; make + ;; them exit if/when they do. + (if (eq system-type 'windows-nt) + (concat " <" null-device))))))) (flist Man-filter-list)) (while (and flist (car flist)) (let ((pcom (car (car flist))) |