[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r99486: (Man-completion-table): Don't
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r99486: (Man-completion-table): Don't signal an error if we can't run |
Date: |
Thu, 11 Feb 2010 11:00:01 -0500 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 99486
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Thu 2010-02-11 11:00:01 -0500
message:
(Man-completion-table): Don't signal an error if we can't run
manual-program (bug#4056).
modified:
lisp/ChangeLog
lisp/man.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2010-02-11 04:13:39 +0000
+++ b/lisp/ChangeLog 2010-02-11 16:00:01 +0000
@@ -1,3 +1,8 @@
+2010-02-11 Stefan Monnier <address@hidden>
+
+ * man.el (Man-completion-table): Don't signal an error if we can't run
+ manual-program (bug#4056).
+
2010-02-10 Juanma Barranquero <address@hidden>
* textmodes/artist.el (artist-mt): Fix typos in docstring.
=== modified file 'lisp/man.el'
--- a/lisp/man.el 2010-01-13 08:35:10 +0000
+++ b/lisp/man.el 2010-02-11 16:00:01 +0000
@@ -771,8 +771,13 @@
;; 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))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r99486: (Man-completion-table): Don't signal an error if we can't run,
Stefan Monnier <=