(help-make-xrefs): Adjust position of new forward

button.

2 files changed, 17 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b31f7fce041..dfa56972c1a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2007-06-20  Martin Rudalics  <rudalics@gmx.at>
+
+        * mouse.el (mouse-drag-mode-line-1): Quit mouse tracking when
+        event is not a cons cell.  Do not unread drag-mouse-1 events.
+        Select right window in check whether space was stolen from
+        window above.
+
+        * help-mode.el (help-make-xrefs): Adjust position of new forward
+        button.
+
 2007-06-20  Riccardo Murri  <riccardo.murri@gmail.com>
 
         * vc-bzr.el (vc-bzr-with-process-environment)
diff --git a/lisp/help-mode.el b/lisp/help-mode.el
index f7c33d85286..98b27623ce0 100644
--- a/lisp/help-mode.el
+++ b/lisp/help-mode.el
@@ -500,16 +500,19 @@ that."
         (while (and (not (bobp)) (bolp))
           (delete-char -1))
         (insert "\n")
+        (when (or help-xref-stack help-xref-forward-stack)
+          (insert "\n"))
         ;; Make a back-reference in this buffer if appropriate.
         (when help-xref-stack
-          (insert "\n")
           (help-insert-xref-button help-back-label 'help-back
-                                   (current-buffer))
-          (insert "\t"))
+                                   (current-buffer)))
         ;; Make a forward-reference in this buffer if appropriate.
         (when help-xref-forward-stack
+          (when help-xref-stack
+            (insert "\t"))
           (help-insert-xref-button help-forward-label 'help-forward
-                                   (current-buffer))
+                                   (current-buffer)))
+        (when (or help-xref-stack help-xref-forward-stack)
           (insert "\n")))
       ;; View mode steals RET from us.
       (set (make-local-variable 'minor-mode-overriding-map-alist)