From c07ff221194a2d27346fb7fa3d4c8a877d3db66d Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Thu, 11 Feb 2010 11:00:01 -0500 Subject: [PATCH] (Man-completion-table): Don't signal an error if we can't run manual-program (bug#4056). --- lisp/ChangeLog | 5 +++++ lisp/man.el | 9 +++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 83800e9cb77..e5ad1f14462 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2010-02-11 Stefan Monnier + + * man.el (Man-completion-table): Don't signal an error if we can't run + manual-program (bug#4056). + 2010-02-10 Juanma Barranquero * textmodes/artist.el (artist-mt): Fix typos in docstring. diff --git a/lisp/man.el b/lisp/man.el index e729e11b6ca..dd64fbda574 100644 --- a/lisp/man.el +++ b/lisp/man.el @@ -771,8 +771,13 @@ POS defaults to `point'." ;; quote anything. (let ((process-environment (copy-sequence process-environment))) (setenv "COLUMNS" "999") ;; don't truncate long names - (call-process manual-program nil '(t nil) nil - "-k" (concat "^" prefix))) + ;; manual-program might not even exist. And since it's + ;; run differently in Man-getpage-in-background, an error + ;; here may not necessarily mean that we'll also get an + ;; error later. + (ignore-errors + (call-process manual-program nil '(t nil) nil + "-k" (concat "^" prefix)))) (goto-char (point-min)) (while (re-search-forward "^\\([^ \t\n]+\\)\\(?: ?\\((.+?)\\)\\(?:[ \t]+- \\(.*\\)\\)?\\)?" nil t) (push (propertize (concat (match-string 1) (match-string 2)) -- 2.39.5