; Fix documentation of last change.

* etc/NEWS:
* doc/lispref/display.texi (Other Display Specs):
* doc/lispref/text.texi (Special Properties): Fix last changes.

(cherry picked from commit 952f20fabe76c087aa96645389cfd4786fc95380)

diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 88fdbe547f73dd1e180608cd86b3b0ad322e9e4b..df84630a721ab6734161caecb9cefcfca93e4b1d 100644 (file)
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -5530,7 +5530,7 @@ colors are to be used for the bitmap display.  @xref{Fringe Bitmaps},
 for the details.
 
 It also possible to add context help for fringe bitmaps through the
-@code{show-help-function} mechanism by using @code{left-fringe-help} or
+@code{show-help-function} mechanism by using @code{left-fringe-help} and
 @code{right-fringe-help} text properties (@pxref{Special Properties}).
 
 @item (space-width @var{factor})

diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi
index a12629904b481ba228765073d79bd968fc270df6..b322b9d4754cf61a6d2f6fb947661a1ec44eeadb 100644 (file)
--- a/doc/lispref/text.texi
+++ b/doc/lispref/text.texi
@@ -3669,11 +3669,12 @@ through @code{substitute-command-keys}.
 @item left-fringe-help
 @itemx right-fringe-help
 @cindex help-echo text on fringes
-If any visible text of a buffer line has @code{left-fringe-help} or
-@code{right-fringe-help} string text property defined on it, then the
-string will be displayed for a corresponding line's fringe through
-@code{show-help-function} (@pxref{Help display}).  This is useful when
-used together with fringe cursors and bitmaps (@pxref{Fringes}).
+If any visible text of a screen line has the @code{left-fringe-help} or
+@code{right-fringe-help} text property whose value is a string, then
+that string will be displayed when the mouse pointer hovers over the
+corresponding line's fringe through @code{show-help-function}
+(@pxref{Help display}).  This is useful when used together with fringe
+cursors and bitmaps (@pxref{Fringes}).
 
 @item keymap
 @cindex keymap of character

diff --git a/etc/NEWS b/etc/NEWS
index e1b5200ddfc2015890cae17c85d93756772f1781..aedf0806dc88261f5f129a282b900c89b18ba25a 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1988,8 +1988,9 @@ the Info node "(elisp) Handling Errors".
 +++
 ** Tooltips on fringes.
 It is now possible to provide tooltips on fringes by adding special text
-properties.  See the "Special Properties" Info node in the Emacs Lisp
-Reference Manual.
+properties 'left-fringe-help' and 'right-fringe-help'.  See the "Special
+Properties" Info node in the Emacs Lisp Reference Manual for more
+details.
 
 +++
 ** New 'pop-up-frames' action alist entry for 'display-buffer'.

diff --git a/src/window.c b/src/window.c
index fe26311fbb2ba833e328449ad4452cf31a875cfd..0945b244319d38820f0af9740e2e5400b8221854 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -5407,13 +5407,13 @@ shrink_mini_window (struct window *w)
 
   eassert (MINI_WINDOW_P (w));
 
+  FRAME_WINDOWS_FROZEN (f) = false;
   if (delta > 0)
     {
       Lisp_Object root = FRAME_ROOT_WINDOW (f);
       struct window *r = XWINDOW (root);
       Lisp_Object grow;
 
-      FRAME_WINDOWS_FROZEN (f) = false;
       grow = call3 (Qwindow__resize_root_window_vertically,
                    root, make_fixnum (delta), Qt);