[jari.aalto@cante.net: [PATCH] Emacs CVS: man.el: detect split word at end of line and grab it]

[Richard Stallman <rms@gnu.org>]

Would someone please DTRT with this patch?
If you install it, please install it in Emacs 22,
since the bug is not new.

------- Start of forwarded message -------
X-Spam-Status: No, score=0.0 required=5.0 tests=UNPARSEABLE_RELAY 
	autolearn=failed version=3.1.0
From: Jari Aalto <jari.aalto@cante.net>
To: bug-gnu-emacs@gnu.org
Date: Mon, 10 Sep 2007 21:52:37 +0300
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Subject: [PATCH] Emacs CVS: man.el: detect split word at end of line and
	grab it

2007-09-10  Jari Aalto  <jari.aalto AT cante.net>

        * man.el (Man-default-man-entry): At end of line, continue looking
        to the next line for possible end of hyphenated command.

diff --git a/man.el b/man.el
index c7593e8..338d6de 100644
- --- a/man.el
+++ b/man.el
@@ -652,7 +652,16 @@ If POS is nil, the current point is used."
       (skip-chars-backward "-a-zA-Z0-9._+:")
       (let ((start (point)))
        (skip-chars-forward "-a-zA-Z0-9._+:")
- -       (setq word (buffer-substring-no-properties start (point))))
+        ;;  If there is continuation at the end of line, check
+        ;;  following line too:
+        ;;
+        ;;     see this-
+        ;;     command-here(1)
+        ;;
+       (setq word (buffer-substring-no-properties start (point)))
+        (if (looking-at "[ \t\r\n]+\\([-a-zA-Z0-9._+:]+\\)([0-9])")
+            (progn
+              (setq word (concat word (match-string 1))))))
       (if (string-match "[._]+$" word)
          (setq word (substring word 0 (match-beginning 0))))
       ;; If looking at something like *strcat(... , remove the '*'
------- End of forwarded message -------