Jari Aalto <jari.aalto at cante.net>

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 522704335a2bb69bd46360449b88c5430a242dcc..477723cdb1a90ba8d11447dbca5f6db44ceb0f73 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-13  Jari Aalto  <jari.aalto@cante.net>
+
+       * man.el (Man-default-man-entry): At end of line, continue looking
+        to the next line for possible end of hyphenated command.
+
 2007-09-13  Chris Moore  <dooglus@gmail.com>
 
        * shell.el (shell-resync-dirs): Don't move the cursor relative to

diff --git a/lisp/man.el b/lisp/man.el
index c7593e88dda20027dcd1c6ded084c84591a2fb01..52172a5ee264a67fa927ce85138c39145def6746 100644 (file)
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -652,7 +652,13 @@ 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 a continuation at the end of line, check the
+        ;; following line too, eg:
+        ;;     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])")
+            (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 '*'