Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 563-582)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 177-185)

   - Merge from emacs--devo--0
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-158

1 files changed, 8 insertions, 4 deletions

diff --git a/src/window.c b/src/window.c
index d687c831ef6..5bd57496180 100644
--- a/src/window.c
+++ b/src/window.c
@@ -5727,8 +5727,10 @@ With prefix argument ARG, recenter putting point on screen line ARG
 relative to the current window.  If ARG is negative, it counts up from the
 bottom of the window.  (ARG should be less than the height of the window.)
 
-If ARG is omitted or nil, erase the entire frame and then
-redraw with point in the center of the current window.
+If ARG is omitted or nil, erase the entire frame and then redraw with point
+in the center of the current window.  If `auto-resize-tool-bars' is set to
+`grow-only', this resets the tool-bar's height to the minimum height needed.
+
 Just C-u as prefix means put point in the center of the window
 and redisplay normally--don't erase and redraw the frame.  */)
      (arg)
@@ -5753,8 +5755,10 @@ and redisplay normally--don't erase and redraw the frame.  */)
       for (i = 0; i < n_compositions; i++)
         composition_table[i]->font = NULL;
 
-      Fredraw_frame (w->frame);
-      SET_FRAME_GARBAGED (XFRAME (WINDOW_FRAME (w)));
+      WINDOW_XFRAME (w)->minimize_tool_bar_window_p = 1;
+
+      Fredraw_frame (WINDOW_FRAME (w));
+      SET_FRAME_GARBAGED (WINDOW_XFRAME (w));
       center_p = 1;
     }
   else if (CONSP (arg)) /* Just C-u. */