4 files changed, 11 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 61ef1a21065..2973fa64360 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-23  Martin Rudalics  <rudalics@gmx.at>
+
+        * help.el (help-window-setup): Fix message displayed when other
+        window is reused.  (Bug#9341)
+
 2011-08-23  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * shell.el (shell-completion-vars): Set pcomplete-arg-quote-list.
diff --git a/lisp/help.el b/lisp/help.el
index e6496f625d1..710dc34ea89 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -1104,7 +1104,7 @@ This relies on `display-buffer-window' being correctly set up by
           ((eq help-value 'new-window)
            "Type \\[delete-other-windows] to delete the help window")
           ((eq help-value 'reuse-other-window)
-           "Type \\[switch-to-prev-buffer] RET to restore previous buffer"))
+           "Type \"q\" in other window to quit"))
          help-window 'other))
        (t
         ;; Not much to say here.
diff --git a/src/ChangeLog b/src/ChangeLog
index d4f654a1028..1b1a8f67e43 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2011-08-23  Eli Zaretskii  <eliz@gnu.org>
 
+        * xdisp.c (redisplay_window): When computing centering_position,
+        account for the height of the header line.  (Bug#8874)
+
         * dispnew.c (buffer_posn_from_coords): Use buf_charpos_to_bytepos
         instead of CHAR_TO_BYTE.  Fixes a crash when a completion
         candidate is selected by the mouse, and that candidate has a
diff --git a/src/xdisp.c b/src/xdisp.c
index 6fbbc69a7ca..f38c2828b8e 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -15305,7 +15305,8 @@ redisplay_window (Lisp_Object window, int just_this_one_p)
               if (pt_offset)
                 centering_position -= pt_offset;
               centering_position -=
-                FRAME_LINE_HEIGHT (f) * (1 + margin + (last_line_misfit != 0));
+                FRAME_LINE_HEIGHT (f) * (1 + margin + (last_line_misfit != 0))
+                + WINDOW_HEADER_LINE_HEIGHT (w);
               /* Don't let point enter the scroll margin near top of
                  the window.  */
               if (centering_position < margin * FRAME_LINE_HEIGHT (f))