[Emacs-diffs] /srv/bzr/emacs/trunk r100392: * help-mode.el (help-make-xrefs): For Info node links turn

[Juri Linkov]

------------------------------------------------------------
revno: 100392
author: Kevin Ryde  <address@hidden>
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Fri 2010-05-21 02:54:55 +0300
message:
  * 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)
modified:
  lisp/ChangeLog
  lisp/help-mode.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-05-20 22:55:11 +0000
+++ b/lisp/ChangeLog    2010-05-20 23:54:55 +0000
@@ -1,3 +1,10 @@
+2010-05-20  Kevin Ryde  <address@hidden>
+
+       * 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  <address@hidden>
 
        * locate.el (locate): Use pop-to-buffer instead of

=== modified file 'lisp/help-mode.el'
--- a/lisp/help-mode.el 2010-01-13 08:35:10 +0000
+++ b/lisp/help-mode.el 2010-05-20 23:54:55 +0000
@@ -433,7 +433,9 @@
                     (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