mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-24 07:20:37 +00:00
Code Issues Releases Activity

(Man-completion-table): Don't signal an error if we can't run

Browse Source 
manual-program (bug#4056).
This commit is contained in:
Stefan Monnier 2010-02-11 11:00:01 -05:00
parent ac9ffe99b5
commit c07ff22119
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/ChangeLog
View File

@ -1,3 +1,8 @@
2010-02-11 Stefan Monnier <monnier@iro.umontreal.ca>
* man.el (Man-completion-table): Don't signal an error if we can't run
manual-program (bug#4056).
2010-02-10 Juanma Barranquero <lekktu@gmail.com>
* textmodes/artist.el (artist-mt): Fix typos in docstring.

9
lisp/man.el
View File

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