Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
c07ff221
Commit
c07ff221
authored
Feb 11, 2010
by
Stefan Monnier
Browse files
(Man-completion-table): Don't signal an error if we can't run
manual-program (bug#4056).
parent
ac9ffe99
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
2 deletions
+12
-2
lisp/ChangeLog
lisp/ChangeLog
+5
-0
lisp/man.el
lisp/man.el
+7
-2
No files found.
lisp/ChangeLog
View file @
c07ff221
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.
...
...
lisp/man.el
View file @
c07ff221
...
...
@@ -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
))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment