summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorJuri Linkov <juri@jurta.org>2009-11-25 21:16:58 +0000
committerJuri Linkov <juri@jurta.org>2009-11-25 21:16:58 +0000
commit1e2d9ba1ea7906796966e365d1925b62c47276b7 (patch)
treebf395e2d2fdebf8db6e1b33146f5c25f8463db2d /lisp
parenta1fadc6fdff31d8ceb9036333a12f494d10d7a53 (diff)
downloademacs-1e2d9ba1ea7906796966e365d1925b62c47276b7.tar.gz
(Man-completion-table): Modify regexp to include section names
to completion strings. (Bug#3717)
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/man.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4b3fb327208..fd586757b34 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
2009-11-25 Juri Linkov <juri@jurta.org>
+ * man.el (Man-completion-table): Modify regexp to include
+ section names to completion strings. (Bug#3717)
+
+2009-11-25 Juri Linkov <juri@jurta.org>
+
Search recursively in gzipped files. (Bug#4982)
* progmodes/grep.el (grep-highlight-matches): Add new options
diff --git a/lisp/man.el b/lisp/man.el
index 364a5d248fc..25ba3eb0638 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -770,7 +770,7 @@ POS defaults to `point'."
(call-process manual-program nil '(t nil) nil
"-k" (concat "^" string))
(goto-char (point-min))
- (while (re-search-forward "^[^ \t\n]+" nil t)
+ (while (re-search-forward "^[^ \t\n]+\\(?: (.+?)\\)?" nil t)
(push (match-string 0) table)))
;; Cache the table for later reuse.
(setq Man-completion-cache (cons string table)))