From 0dd8b6da56db8f711b2707f9fd5340fbe4615355 Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Sun, 3 Jul 2011 03:35:35 +0200 Subject: [PATCH] * man.el (Man-reference-regexp): Allow matching possible word-wrapped references (bug#6289). --- lisp/ChangeLog | 3 +++ lisp/man.el | 8 +++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 17f48ea7b12..112d7faacb0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2011-07-03 Lars Magne Ingebrigtsen + * man.el (Man-reference-regexp): Allow matching possible + word-wrapped references (bug#6289). + * vc/vc.el (vc-modify-change-comment): Change *VC-log* to *vc-log* for consistency with the other vc buffers (bug#6197). (vc-checkin): Ditto. diff --git a/lisp/man.el b/lisp/man.el index 7a9e6e3cca5..b5a70395e59 100644 --- a/lisp/man.el +++ b/lisp/man.el @@ -276,7 +276,9 @@ This regexp should not start with a `^' character.") This regular expression should start with a `^' character.") (defvar Man-reference-regexp - (concat "\\(" Man-name-regexp "\\)[ \t]*(\\(" Man-section-regexp "\\))") + (concat "\\(" Man-name-regexp + "\\(\n[ \t]+" Man-name-regexp "\\)*\\)[ \t]*(\\(" + Man-section-regexp "\\))") "Regular expression describing a reference to another manpage.") (defvar Man-apropos-regexp @@ -597,8 +599,8 @@ and the `Man-section-translations-alist' variables)." (cond ;; "chmod(2V)" case ? ((string-match (concat "^" Man-reference-regexp "$") ref) - (setq name (match-string 1 ref) - section (match-string 2 ref))) + (setq name (replace-regexp-in-string "[\n\t ]" "" (match-string 1 ref)) + section (match-string 3 ref))) ;; "2v chmod" case ? ((string-match (concat "^\\(" Man-section-regexp "\\) +\\(" Man-name-regexp "\\)$") ref) -- 2.39.2