aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorGlenn Morris2018-12-02 10:32:24 -0800
committerGlenn Morris2018-12-02 10:32:24 -0800
commit3895e2229fafa6cc92d3b1df1895f08c16ae0ab6 (patch)
tree90803cba8b1b48fd466b59b531e7b06b66432b9e /lisp
parentfa9411eddccb1eebbc0c362afe9026d51af222dd (diff)
parente06562ce7c164fd1f1b93154e34e6edab004719b (diff)
downloademacs-3895e2229fafa6cc92d3b1df1895f08c16ae0ab6.tar.gz
emacs-3895e2229fafa6cc92d3b1df1895f08c16ae0ab6.zip
Merge from origin/emacs-26
e06562c Fix "M-x man" when there's no 'man' program on PATH
Diffstat (limited to 'lisp')
-rw-r--r--lisp/man.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/man.el b/lisp/man.el
index abba4879dbd..defe992074a 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -1378,7 +1378,8 @@ manpage command."
1378 1378
1379 (with-current-buffer Man-buffer 1379 (with-current-buffer Man-buffer
1380 (save-excursion 1380 (save-excursion
1381 (let ((case-fold-search nil)) 1381 (let ((case-fold-search nil)
1382 (inhibit-read-only t))
1382 (goto-char (point-min)) 1383 (goto-char (point-min))
1383 (cond ((or (looking-at "No \\(manual \\)*entry for") 1384 (cond ((or (looking-at "No \\(manual \\)*entry for")
1384 (looking-at "[^\n]*: nothing appropriate$")) 1385 (looking-at "[^\n]*: nothing appropriate$"))