* help-mode.el (help-make-xrefs): For Info node links turn

newlines into spaces.  Link node names with newlines are matched
by help-xref-info-regexp and buttonized, this change ensures they
can be followed successfully with RET.  (Bug#6206)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7c6ec59aa64b06ac6ffbaf47a5ff7a673700ae1d..c6aebdd8f132268f3e176f1c45aac9281abfda2d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2010-05-20  Kevin Ryde  <user42@zip.com.au>
+
+       * help-mode.el (help-make-xrefs): For Info node links turn
+       newlines into spaces.  Link node names with newlines are matched
+       by help-xref-info-regexp and buttonized, this change ensures they
+       can be followed successfully with RET.  (Bug#6206)
+
 2010-05-20  Juri Linkov  <juri@jurta.org>
 
        * locate.el (locate): Use pop-to-buffer instead of

diff --git a/lisp/help-mode.el b/lisp/help-mode.el
index bad4ae94e2af4916d4ea392dbcc46a1eee80ae03..f115e4253252f44471358f68595fa6d3476833e2 100644 (file)
--- a/lisp/help-mode.el
+++ b/lisp/help-mode.el
@@ -433,7 +433,9 @@ that."
                     (let ((data (match-string 2)))
                       (save-match-data
                         (unless (string-match "^([^)]+)" data)
-                          (setq data (concat "(emacs)" data))))
+                          (setq data (concat "(emacs)" data)))
+                       (setq data ;; possible newlines if para filled
+                             (replace-regexp-in-string "[ \t\n]+" " " data t t)))
                       (help-xref-button 2 'help-info data))))
                 ;; URLs
                 (save-excursion