* man.el (Man-reference-regexp): Allow matching possible

word-wrapped references (bug#6289).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 17f48ea7b12fd7a4b171c11d7356b5e78cd5eae8..112d7faacb070131d56801d44b1218fbc3b41240 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2011-07-03  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+       * 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 7a9e6e3cca534addfce03d4b0d61ac7e34b866f6..b5a70395e596f67f7a18b4a11d56cfe6d00fcd59 100644 (file)
--- 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)