[Emacs-diffs] /srv/bzr/emacs/trunk r104898: * man.el (Man-reference-regexp): Allow matching possible

[Lars Magne Ingebrigtsen]

------------------------------------------------------------
revno: 104898
fixes bug(s): http://debbugs.gnu.org/6289
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Sun 2011-07-03 03:35:35 +0200
message:
  * man.el (Man-reference-regexp): Allow matching possible
  word-wrapped references (bug#6289).
modified:
  lisp/ChangeLog
  lisp/man.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-07-03 01:15:38 +0000
+++ b/lisp/ChangeLog    2011-07-03 01:35:35 +0000
@@ -1,5 +1,8 @@
 2011-07-03  Lars Magne Ingebrigtsen  <address@hidden>
 
+       * 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.

=== modified file 'lisp/man.el'
--- a/lisp/man.el       2011-04-08 03:30:26 +0000
+++ b/lisp/man.el       2011-07-03 01:35:35 +0000
@@ -276,7 +276,9 @@
 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 @@
     (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)