diff options
| author | Glenn Morris <rgm@gnu.org> | 2007-09-13 08:01:54 +0000 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2007-09-13 08:01:54 +0000 |
| commit | 162a12b1d7b1e985a8810bad24d068c825286f56 (patch) | |
| tree | 584510272fa8a1a840a19b23c7fa6f7d9c438142 | |
| parent | 14bc401e0d5afef54f7fe8b310991cab92e68a25 (diff) | |
| download | emacs-162a12b1d7b1e985a8810bad24d068c825286f56.tar.gz | |
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.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/man.el | 8 |
2 files changed, 12 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 522704335a2..477723cdb1a 100644 --- 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 c7593e88dda..52172a5ee26 100644 --- 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 '*' |