Merge from emacs-26

3434edc731 Enlarge DUMPED_HEAP_SIZE for 64-bit Windows builds
36bbdfc017 Update Unicode data files to version 11.0.0 of Unicode
b7b7a5f4f3 * etc/NEWS: Belatedly call out vc-hg changes in v26.1.  (B...
5b6f8b54d1 Clarify the documentation of 'dired-recursive-deletes'
9db97b49cd ; * etc/DEBUG: Add information about debugging libXft prob...
0214ffbe60 Clarify doc string of 'update-glyphless-char-display'
ef35d405b1 Clarify subtle issues with 'eq' in byte-compiled code
c6ef3c8321 Make cl-print respect print-quoted (bug#31649)
26b52ac40e Fix unexpected jumps of window-point in 'set-window-config...
4af077ab4d * etc/emacs.appdata.xml: Update Emacs screenshot.
e5ab25deae Fix cursor movement by 'next-logical-line' after 'next-line'
d20beef5f1 Fix prompt in bookmark.el (Bug#24726)
c57e7eaae8 Improve documentation of 'empty' whitespace-style

# Conflicts:
#	etc/NEWS

3 files changed, 26 insertions, 17 deletions

diff --git a/src/indent.c b/src/indent.c
index 316171e609b..bcffa0d11e5 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -2278,7 +2278,9 @@ whether or not it is currently displayed in some window.  */)
           overshoot_handled = 1;
         }
       if (lcols_given)
-        to_x = window_column_x (w, window, extract_float (lcols), lcols);
+        to_x =
+          window_column_x (w, window, extract_float (lcols), lcols)
+          + lnum_pixel_width;
       if (nlines <= 0)
         {
           it.vpos = vpos_init;
@@ -2330,12 +2332,6 @@ whether or not it is currently displayed in some window.  */)
          an addition to the hscroll amount.  */
       if (lcols_given)
         {
-          /* If we are displaying line numbers, we could cross the
-             line where the width of the line-number display changes,
-             in which case we need to fix up the pixel coordinate
-             accordingly.  */
-          if (lnum_pixel_width > 0)
-            to_x += it.lnum_pixel_width - lnum_pixel_width;
           move_it_in_display_line (&it, ZV, first_x + to_x, MOVE_TO_X);
           /* If we find ourselves in the middle of an overlay string
              which includes a newline after current string position,
diff --git a/src/w32heap.c b/src/w32heap.c
index a3f87bfc7e6..df79f8c2cef 100644
--- a/src/w32heap.c
+++ b/src/w32heap.c
@@ -116,7 +116,7 @@ typedef struct _RTL_HEAP_PARAMETERS {
    to build only the first bootstrap-emacs.exe with the large size,
    and reset that to a lower value afterwards.  */
 #if defined _WIN64 || defined WIDE_EMACS_INT
-# define DUMPED_HEAP_SIZE (22*1024*1024)
+# define DUMPED_HEAP_SIZE (23*1024*1024)
 #else
 # define DUMPED_HEAP_SIZE (13*1024*1024)
 #endif
diff --git a/src/window.c b/src/window.c
index 2c6ff01ea43..81fd7f2b477 100644
--- a/src/window.c
+++ b/src/window.c
@@ -6609,10 +6609,10 @@ the return value is nil.  Otherwise the value is t.  */)
                                make_number (old_point),
                                XWINDOW (data->current_window)->contents);
 
-      /* In the following call to `select-window', prevent "swapping out
+      /* In the following call to select_window, prevent "swapping out
          point" in the old selected window using the buffer that has
-         been restored into it.  We already swapped out that point from
-         that window's old buffer.
+         been restored into it.  We already swapped out that point
+         from that window's old buffer.
 
          Do not record the buffer here.  We do that in a separate call
          to select_window below.  See also Bug#16207.  */
@@ -6655,10 +6655,10 @@ the return value is nil.  Otherwise the value is t.  */)
       if (WINDOW_LIVE_P (data->current_window))
         select_window (data->current_window, Qnil, false);
 
-      /* Fselect_window will have made f the selected frame, so we
-         reselect the proper frame here.  Fhandle_switch_frame will change the
-         selected window too, but that doesn't make the call to
-         Fselect_window above totally superfluous; it still sets f's
+      /* select_window will have made f the selected frame, so we
+         reselect the proper frame here.  do_switch_frame will change
+         the selected window too, but that doesn't make the call to
+         select_window above totally superfluous; it still sets f's
          selected window.  */
       if (FRAME_LIVE_P (XFRAME (data->selected_frame)))
         do_switch_frame (data->selected_frame, 0, 0, Qnil);
@@ -6695,8 +6695,21 @@ the return value is nil.  Otherwise the value is t.  */)
     {
       Fset_buffer (new_current_buffer);
       /* If the new current buffer doesn't appear in the selected
-         window, go to its old point (see bug#12208).  */
-      if (!EQ (XWINDOW (data->current_window)->contents, new_current_buffer))
+         window, go to its old point (Bug#12208).
+
+         The original fix used data->current_window below which caused
+         false positives (compare Bug#31695) when data->current_window
+         is not on data->selected_frame.  This happens, for example,
+         when read_minibuf restores the configuration of a stand-alone
+         minibuffer frame: After switching to the previously selected
+         "normal" frame, point of that frame's selected window jumped
+         unexpectedly because new_current_buffer is usually *not*
+         shown in data->current_window - the minibuffer frame's
+         selected window.  Using selected_window instead fixes this
+         because do_switch_frame has set up selected_window already to
+         the "normal" frame's selected window and that window *does*
+         show new_current_buffer.  */
+      if (!EQ (XWINDOW (selected_window)->contents, new_current_buffer))
         Fgoto_char (make_number (old_point));
     }