Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-37

Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 241-257)

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

 * gnus--rel--5.10  (patch 59-65)

   - Update from CVS
   - Merge from emacs--cvs-trunk--0
   - (mm-string-to-multibyte): Use Gnus trunk definition.

12 files changed, 198 insertions, 136 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 170838bef49..5847c35f37a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,52 @@
+2005-04-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * window.c (Fset_window_configuration): Be careful when you choose
+        among several possible points for the new_current_buffer.
+
+2005-04-12  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * keyboard.c (poll_for_input) [SYNC_INPUT]: Don't call
+        poll_for_input_1.  Set interrupt_input_pending to 1 instead.
+        (Qlanguage_change) [MAC_OS]: New variable.
+        (syms_of_keyboard) [MAC_OS]: Intern and staticpro it.
+        (kbd_buffer_get_event) [MAC_OS]: Make event for LANGUAGE_CHANGE_EVENT.
+
+        * macterm.c (mac_keyboard_text_encoding)
+        (current_mac_keyboard_text_encoding): Remove variables.
+        (XTread_socket): Store language-change event if keyboard script
+        change is detected.  Don't convert input to
+        `mac_keyboard_text_encoding'.
+        (syms_of_macterm): Delete DEFVAR_INT for mac-keyboard-text-encoding.
+
+        * termhooks.h (enum event_kind) [MAC_OS]:
+        Add LANGUAGE_CHANGE_EVENT.
+
+2005-04-10  Richard M. Stallman  <rms@gnu.org>
+
+        * emacs.c (standard_args): Rename --bare-bones to --quick.
+        Add -D aka --basic-display.
+
+        * buffer.c (Fmake_indirect_buffer): Clear out some local variables.
+
+2005-04-09  Richard M. Stallman  <rms@gnu.org>
+
+        * keymap.c (where_is_internal): Convert a string used as event type
+        into "(any string)".
+
+        * lread.c (Vloads_in_progress): Not static.
+
+        * fns.c (Vloads_in_progress): Add extern.
+        (Frequire): Don't do LOADHIST_ATTACH if Vloads_in_progress is nil.
+
+2005-04-09  Thien-Thi Nguyen  <ttn@surf.glug.org>
+
+        * dispnew.c (mirror_line_dance): Avoid crash if W2 is null.
+
+2005-04-09  Lute Kamstra  <lute@gnu.org>
+
+        * print.c (PRINTPREPARE): Check if the marker PRINTCHARFUN is
+        within the accessible part of the buffer.
+
 2005-04-09  Kim F. Storm  <storm@cua.dk>
 
         * lread.c (readevalloop): Add args START and END as region in
@@ -22,8 +71,8 @@
         * mac.c (cfdate_to_lisp): Add `const' for variable `epoch_gdate'.
         (Fmac_get_preference): Doc fix.
 
-        * macfns.c (Fx_create_frame, x_create_tip_frame): Add
-        "fontset-mac" to fallback font/fontsets.
+        * macfns.c (Fx_create_frame, x_create_tip_frame):
+        Add "fontset-mac" to fallback font/fontsets.
 
 2005-04-04  Kim F. Storm  <storm@cua.dk>
 
@@ -41,8 +90,8 @@
 
 2005-04-01  Kenichi Handa  <handa@m17n.org>
 
-        * lisp.h (Vascii_upcase_table, Vascii_canon_table,
-        Vascii_eqv_table): Extern them.
+        * lisp.h (Vascii_upcase_table, Vascii_canon_table)
+        (Vascii_eqv_table): Extern them.
 
         * casetab.c (set_case_table): If standard is nonzero, setup
         Vascii_upcase_table, Vascii_canon_table, and Vascii_eqv_table.
@@ -54,8 +103,8 @@
         Vascii_downcase_table.
         (fast_string_match_ignore_case): Likewise.
         (search_buffer): Fix checking of boyer-moore usability.
-        (boyer_moore): Calculate translate_prev_byte1/2/3 in advance.  No
-        need of tranlating characters in PAT.  Fix calculation of
+        (boyer_moore): Calculate translate_prev_byte1/2/3 in advance.
+        No need of tranlating characters in PAT.  Fix calculation of
         simple_translate.
 
 2005-03-31  Stefan Monnier  <monnier@iro.umontreal.ca>
diff --git a/src/buffer.c b/src/buffer.c
index dcda7bc80ab..d24deb0a9a1 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -631,7 +631,21 @@ CLONE nil means the indirect buffer's state is reset to default values.  */)
       XMARKER (b->zv_marker)->insertion_type = 1;
     }
   else
-    clone_per_buffer_values (b->base_buffer, b);
+    {
+      struct buffer *old_b = current_buffer;
+
+      clone_per_buffer_values (b->base_buffer, b);
+      b->filename = Qnil;
+      b->file_truename = Qnil;
+      b->display_count = make_number (0);
+      b->backed_up = Qnil;
+      b->auto_save_file_name = Qnil;
+      set_buffer_internal_1 (b);
+      Fset (intern ("buffer-save-without-query"), Qnil);
+      Fset (intern ("buffer-file-number"), Qnil);
+      Fset (intern ("buffer-stale-function"), Qnil);
+      set_buffer_internal_1 (old_b);
+    }
 
   return buf;
 }
@@ -932,7 +946,7 @@ is the default binding of variable. */)
 }
 
 /* Return an alist of the Lisp-level buffer-local bindings of
-   buffer BUF.  That is, do't include  the variables maintained
+   buffer BUF.  That is, don't include the variables maintained
    in special slots in the buffer object.  */
 
 static Lisp_Object
diff --git a/src/dispnew.c b/src/dispnew.c
index 7283747047c..cdd7f694ceb 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -3151,14 +3151,20 @@ mirror_line_dance (w, unchanged_at_top, nlines, copy_from, retained_p)
                   int m2_from;
 
                   w2 = frame_row_to_window (root, frame_from);
-                  m2 = w2->current_matrix;
-                  m2_from = frame_from - m2->matrix_y;
-                  copy_row_except_pointers (m->rows + window_to,
-                                            m2->rows + m2_from);
-
-                  /* If frame line is empty, window line is empty, too.  */
-                  if (!retained_p[copy_from[i]])
-                    m->rows[window_to].enabled_p = 0;
+                  /* ttn@surf.glug.org: when enabling menu bar using `emacs
+                     -nw', FROM_FRAME sometimes has no associated window.
+                     This check avoids a segfault if W2 is null.  */
+                  if (w2)
+                    {
+                      m2 = w2->current_matrix;
+                      m2_from = frame_from - m2->matrix_y;
+                      copy_row_except_pointers (m->rows + window_to,
+                                                m2->rows + m2_from);
+
+                      /* If frame line is empty, window line is empty, too.  */
+                      if (!retained_p[copy_from[i]])
+                        m->rows[window_to].enabled_p = 0;
+                    }
                   sync_p = 1;
                 }
               else if (from_inside_window_p)
diff --git a/src/emacs.c b/src/emacs.c
index 1ddde867d0b..79c0654d379 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1814,8 +1814,8 @@ struct standard_args standard_args[] =
   { "-d", "--display", 60, 1 },
   { "-display", 0, 60, 1 },
   /* Now for the options handled in startup.el.  */
-  { "-Q", "--bare-bones", 55, 0 },
-  { "-bare-bones", 0, 55, 0 },
+  { "-Q", "--quick", 55, 0 },
+  { "-quick", 0, 55, 0 },
   { "-q", "--no-init-file", 50, 0 },
   { "-no-init-file", 0, 50, 0 },
   { "-no-site-file", "--no-site-file", 40, 0 },
@@ -1826,6 +1826,8 @@ struct standard_args standard_args[] =
   { "-i", "--icon-type", 15, 0 },
   { "-itype", 0, 15, 0 },
   { "-iconic", "--iconic", 15, 0 },
+  { "-D", "--basic-display", 12, 0},
+  { "--basic-display", 0, 12, 0},
   { "-bg", "--background-color", 10, 1 },
   { "-background", 0, 10, 1 },
   { "-fg", "--foreground-color", 10, 1 },
diff --git a/src/fns.c b/src/fns.c
index 52e258a3590..6f59b85665c 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -1,6 +1,6 @@
 /* Random utility Lisp functions.
-   Copyright (C) 1985, 86, 87, 93, 94, 95, 97, 98, 99, 2000, 2001, 02, 03, 2004
-   Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 1998, 1999, 2000,
+     2001, 2002, 2003, 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -66,6 +66,7 @@ int use_file_dialog;
 extern int minibuffer_auto_raise;
 extern Lisp_Object minibuf_window;
 extern Lisp_Object Vlocale_coding_system;
+extern Lisp_Object Vloads_in_progress;
 
 Lisp_Object Qstring_lessp, Qprovide, Qrequire;
 Lisp_Object Qyes_or_no_p_history;
@@ -2907,9 +2908,15 @@ The normal messages at start and end of loading FILENAME are suppressed.  */)
   CHECK_SYMBOL (feature);
 
   /* Record the presence of `require' in this file
-     even if the feature specified is already loaded.  */
-  LOADHIST_ATTACH (Fcons (Qrequire, feature));
-
+     even if the feature specified is already loaded.
+     But not more than once in any file,
+     and not when we aren't loading a file.  */
+  if (! NILP (Vloads_in_progress))
+    {
+      tem = Fcons (Qrequire, feature);
+      if (NILP (Fmember (tem, Vcurrent_load_list)))
+        LOADHIST_ATTACH (tem);
+    }
   tem = Fmemq (feature, Vfeatures);
 
   if (NILP (tem))
diff --git a/src/keyboard.c b/src/keyboard.c
index bd3e27c0f1a..ab8c8907c00 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -530,7 +530,7 @@ Lisp_Object Qmouse_fixup_help_message;
 /* Symbols to denote kinds of events.  */
 Lisp_Object Qfunction_key;
 Lisp_Object Qmouse_click;
-#ifdef WINDOWSNT
+#if defined (WINDOWSNT) || defined (MAC_OS)
 Lisp_Object Qlanguage_change;
 #endif
 Lisp_Object Qdrag_n_drop;
@@ -2115,7 +2115,11 @@ poll_for_input (timer)
      struct atimer *timer;
 {
   if (poll_suppress_count == 0)
+#ifdef SYNC_INPUT
+    interrupt_input_pending = 1;
+#else
     poll_for_input_1 ();
+#endif
 }
 
 #endif /* POLL_FOR_INPUT */
@@ -2258,12 +2262,16 @@ make_ctrl_char (c)
   return c;
 }
 
-/* Display help echo in the echo area.
+/* Display the help-echo property of the character after the mouse pointer.
+   Either show it in the echo area, or call show-help-function to display
+   it by other means (maybe in a tooltip).
+
+   If HELP is nil, that means clear the previous help echo.
 
-   HELP a string means display that string, HELP nil means clear the
-   help echo.  If HELP is a function, call it with OBJECT and POS as
-   arguments; the function should return a help string or nil for
-   none.  For all other types of HELP evaluate it to obtain a string.
+   If HELP is a string, display that string.  If HELP is a function,
+   call it with OBJECT and POS as arguments; the function should
+   return a help string or nil for none.  For all other types of HELP,
+   evaluate it to obtain a string.
 
    WINDOW is the window in which the help was generated, if any.
    It is nil if not in a window.
@@ -4027,11 +4035,16 @@ kbd_buffer_get_event (kbp, used_mouse_menu)
             x_activate_menubar (XFRAME (event->frame_or_window));
         }
 #endif
-#ifdef WINDOWSNT
+#if defined (WINDOWSNT) || defined (MAC_OS)
       else if (event->kind == LANGUAGE_CHANGE_EVENT)
         {
+#ifdef MAC_OS
+          /* Make an event (language-change (KEY_SCRIPT)).  */
+          obj = Fcons (make_number (event->code), Qnil);
+#else
           /* Make an event (language-change (FRAME CHARSET LCID)).  */
           obj = Fcons (event->frame_or_window, Qnil);
+#endif
           obj = Fcons (Qlanguage_change, Fcons (obj, Qnil));
           kbd_fetch_ptr = event + 1;
         }
@@ -10835,7 +10848,7 @@ syms_of_keyboard ()
   staticpro (&Qfunction_key);
   Qmouse_click = intern ("mouse-click");
   staticpro (&Qmouse_click);
-#ifdef WINDOWSNT
+#if defined (WINDOWSNT) || defined (MAC_OS)
   Qlanguage_change = intern ("language-change");
   staticpro (&Qlanguage_change);
 #endif
diff --git a/src/keymap.c b/src/keymap.c
index 3aaecf1a5d7..3484186404a 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -739,7 +739,9 @@ usage: (map-keymap FUNCTION KEYMAP)  */)
    remove that.  Also remove a menu help string as second element.
 
    If AUTOLOAD is nonzero, load autoloadable keymaps
-   that are referred to with indirection.  */
+   that are referred to with indirection.
+
+   This can GC because menu_item_eval_property calls Feval.  */
 
 Lisp_Object
 get_keyelt (object, autoload)
@@ -2543,6 +2545,19 @@ where_is_internal (definition, keymaps, firstonly, noindirect, no_remap)
                 continue;
 
             record_sequence:
+              /* Don't annoy user with strings from a menu such as
+                 Select Paste.  Change them all to "(any string)",
+                 so that there seems to be only one menu item
+                 to report. */
+              if (! NILP (sequence))
+                {
+                  Lisp_Object tem;
+                  tem = Faref (sequence, make_number (XVECTOR (sequence)->size - 1));
+                  if (STRINGP (tem))
+                    Faset (sequence, make_number (XVECTOR (sequence)->size - 1),
+                           build_string ("(any string)"));
+                }
+
               /* It is a true unshadowed match.  Record it, unless it's already
                  been seen (as could happen when inheriting keymaps).  */
               if (NILP (Fmember (sequence, found)))
@@ -2750,7 +2765,7 @@ where_is_internal_2 (args, key, binding)
 }
 
 
-/* This function cannot GC.  */
+/* This function can GC because get_keyelt can.  */
 
 static Lisp_Object
 where_is_internal_1 (binding, key, definition, noindirect, this, last,
diff --git a/src/lread.c b/src/lread.c
index 9b0b5b90ec6..7fe626fa07c 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -203,7 +203,7 @@ static int new_backquote_flag;
 /* A list of file names for files being loaded in Fload.  Used to
    check for recursive loads.  */
 
-static Lisp_Object Vloads_in_progress;
+Lisp_Object Vloads_in_progress;
 
 /* Non-zero means load dangerous compiled Lisp files.  */
 
diff --git a/src/macterm.c b/src/macterm.c
index 9434cb9a5a2..614158309dd 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -7172,11 +7172,6 @@ Lisp_Object Vmac_pass_command_to_system;
 Lisp_Object Vmac_pass_control_to_system;
 #endif
 
-/* convert input from Mac keyboard (assumed to be in Mac Roman coding)
-   to this text encoding */
-int mac_keyboard_text_encoding;
-int current_mac_keyboard_text_encoding = kTextEncodingMacRoman;
-
 /* Set in term/mac-win.el to indicate that event loop can now generate
    drag and drop events.  */
 Lisp_Object Qmac_ready_for_drag_n_drop;
@@ -8990,6 +8985,23 @@ XTread_socket (sd, expected, hold_quit)
                 break;
               }
 #endif
+            {
+              static SInt16 last_key_script = -1;
+              SInt16 current_key_script = GetScriptManagerVariable (smKeyScript);
+
+              if (last_key_script != current_key_script)
+                {
+                  struct input_event event;
+                  
+                  EVENT_INIT (event);
+                  event.kind = LANGUAGE_CHANGE_EVENT;
+                  event.arg = Qnil;
+                  event.code = current_key_script;
+                  kbd_buffer_store_event (&event);
+                  count++;
+                }
+              last_key_script = current_key_script;
+            }
 
             ObscureCursor ();
 
@@ -9042,70 +9054,6 @@ XTread_socket (sd, expected, hold_quit)
               }
           }
 
-          /* If variable mac-convert-keyboard-input-to-latin-1 is
-             non-nil, convert non-ASCII characters typed at the Mac
-             keyboard (presumed to be in the Mac Roman encoding) to
-             iso-latin-1 encoding before they are passed to Emacs.
-             This enables the Mac keyboard to be used to enter
-             non-ASCII iso-latin-1 characters directly.  */
-          if (mac_keyboard_text_encoding != kTextEncodingMacRoman
-              && inev.kind == ASCII_KEYSTROKE_EVENT && inev.code >= 128)
-            {
-              static TECObjectRef converter = NULL;
-              OSStatus the_err = noErr;
-              OSStatus convert_status = noErr;
-
-              if (converter ==  NULL)
-                {
-                  the_err = TECCreateConverter (&converter,
-                                                kTextEncodingMacRoman,
-                                                mac_keyboard_text_encoding);
-                  current_mac_keyboard_text_encoding
-                    = mac_keyboard_text_encoding;
-                }
-              else if (mac_keyboard_text_encoding
-                       != current_mac_keyboard_text_encoding)
-                {
-                  /* Free the converter for the current encoding
-                     before creating a new one.  */
-                  TECDisposeConverter (converter);
-                  the_err = TECCreateConverter (&converter,
-                                                kTextEncodingMacRoman,
-                                                mac_keyboard_text_encoding);
-                  current_mac_keyboard_text_encoding
-                    = mac_keyboard_text_encoding;
-                }
-
-              if (the_err == noErr)
-                {
-                  unsigned char ch = inev.code;
-                  ByteCount actual_input_length, actual_output_length;
-                  unsigned char outbuf[32];
-
-                  convert_status = TECConvertText (converter, &ch, 1,
-                                                   &actual_input_length,
-                                                   outbuf, 1,
-                                                   &actual_output_length);
-                  if (convert_status == noErr
-                      && actual_input_length == 1
-                      && actual_output_length == 1)
-                    inev.code = *outbuf;
-
-                  /* Reset internal states of the converter object.
-                     If it fails, create another one. */
-                  convert_status = TECFlushText (converter, outbuf,
-                                                 sizeof (outbuf),
-                                                 &actual_output_length);
-                  if (convert_status != noErr)
-                    {
-                      TECDisposeConverter (converter);
-                      TECCreateConverter (&converter,
-                                          kTextEncodingMacRoman,
-                                          mac_keyboard_text_encoding);
-                    }
-                }
-            }
-
 #if USE_CARBON_EVENTS
           inev.modifiers = mac_event_to_emacs_modifiers (eventRef);
 #else
@@ -9918,21 +9866,6 @@ Toolbox for processing before Emacs sees it.  */);
 The text will be rendered using Core Graphics text rendering which
 may anti-alias the text.  */);
   Vmac_use_core_graphics = Qnil;
-
-  DEFVAR_INT ("mac-keyboard-text-encoding", &mac_keyboard_text_encoding,
-    doc: /* One of the Text Encoding Base constant values defined in the
-Basic Text Constants section of Inside Macintosh - Text Encoding
-Conversion Manager.  Its value determines the encoding characters
-typed at the Mac keyboard (presumed to be in the MacRoman encoding)
-will convert into.  E.g., if it is set to kTextEncodingMacRoman (0),
-its default value, no conversion takes place.  If it is set to
-kTextEncodingISOLatin1 (0x201) or kTextEncodingISOLatin2 (0x202),
-characters typed on Mac keyboard are first converted into the
-ISO Latin-1 or ISO Latin-2 encoding, respectively before being
-passed to Emacs.  Together with Emacs's set-keyboard-coding-system
-command, this enables the Mac keyboard to be used to enter non-ASCII
-characters directly.  */);
-  mac_keyboard_text_encoding = kTextEncodingMacRoman;
 }
 
 /* arch-tag: f2259165-4454-4c04-a029-a133c8af7b5b
diff --git a/src/print.c b/src/print.c
index 3a21ef29560..145287707eb 100644
--- a/src/print.c
+++ b/src/print.c
@@ -1,6 +1,6 @@
 /* Lisp object printing and output streams.
-   Copyright (C) 1985, 86, 88, 93, 94, 95, 97, 98, 1999, 2000, 01, 03, 2004
-        Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1988, 1993, 1994, 1995, 1997, 1998, 1999,
+     2000, 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -212,13 +212,17 @@ void print_interval ();
      }                                                                  \
    if (MARKERP (printcharfun))                                          \
      {                                                                  \
-       if (!(XMARKER (original)->buffer))                               \
+       EMACS_INT marker_pos;                                            \
+       if (!(XMARKER (printcharfun)->buffer))                           \
          error ("Marker does not point anywhere");                      \
-       if (XMARKER (original)->buffer != current_buffer)                \
-         set_buffer_internal (XMARKER (original)->buffer);              \
+       if (XMARKER (printcharfun)->buffer != current_buffer)            \
+         set_buffer_internal (XMARKER (printcharfun)->buffer);          \
+       marker_pos = marker_position (printcharfun);                     \
+       if (marker_pos < BEGV || marker_pos > ZV)                        \
+         error ("Marker is outside the accessible part of the buffer"); \
        old_point = PT;                                                  \
        old_point_byte = PT_BYTE;                                        \
-       SET_PT_BOTH (marker_position (printcharfun),                     \
+       SET_PT_BOTH (marker_pos,                                         \
                     marker_byte_position (printcharfun));               \
        start_point = PT;                                                \
        start_point_byte = PT_BYTE;                                      \
diff --git a/src/termhooks.h b/src/termhooks.h
index 83721f65912..3e39e644173 100644
--- a/src/termhooks.h
+++ b/src/termhooks.h
@@ -252,10 +252,11 @@ enum event_kind
                                    the wheel event occurred in.
                                    .timestamp gives a timestamp (in
                                    milliseconds) for the event.  */
-#ifdef WINDOWSNT
-  LANGUAGE_CHANGE_EVENT,        /* A LANGUAGE_CHANGE_EVENT is generated
-                                   on WINDOWSNT when the keyboard layout
-                                   or input language is changed by the
+#if defined (WINDOWSNT) || defined (MAC_OS)
+  LANGUAGE_CHANGE_EVENT,        /* A LANGUAGE_CHANGE_EVENT is
+                                   generated on WINDOWSNT or Mac OS
+                                   when the keyboard layout or input
+                                   language is changed by the
                                    user.  */
 #endif
   SCROLL_BAR_CLICK_EVENT,       /* .code gives the number of the mouse button
diff --git a/src/window.c b/src/window.c
index be0f47da8d4..ec69c5b9aa5 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1,7 +1,7 @@
 /* Window creation, deletion and examination for GNU Emacs.
    Does not include redisplay.
-   Copyright (C) 1985,86,87, 1993,94,95,96,97,98, 2000,01,02,03,04
-   Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998, 2000,
+     2001, 2002, 2003, 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -3171,6 +3171,9 @@ selects the buffer of the selected window before each command.  */)
   if (EQ (window, selected_window))
     return window;
 
+  /* Store the current buffer's actual point into the
+     old selected window.  It belongs to that window,
+     and when the window is not selected, must be in the window.  */
   if (!NILP (selected_window))
     {
       ow = XWINDOW (selected_window);
@@ -5591,7 +5594,20 @@ the return value is nil.  Otherwise the value is t.  */)
       if (XBUFFER (new_current_buffer) == current_buffer)
         old_point = PT;
       else
-        old_point = BUF_PT (XBUFFER (new_current_buffer));
+        /* BUF_PT (XBUFFER (new_current_buffer)) gives us the position of
+           point in new_current_buffer as of the last time this buffer was
+           used.  This can be non-deterministic since it can be changed by
+           things like jit-lock by mere temporary selection of some random
+           window that happens to show this buffer.
+           So if possible we want this arbitrary choice of "which point" to
+           be the one from the to-be-selected-window so as to prevent this
+           window's cursor from being copied from another window.  */
+        if (EQ (XWINDOW (data->current_window)->buffer, new_current_buffer)
+            /* If current_window = selected_window, its point is in BUF_PT.  */
+            && !EQ (selected_window, data->current_window))
+          old_point = XMARKER (XWINDOW (data->current_window)->pointm)->charpos;
+        else
+          old_point = BUF_PT (XBUFFER (new_current_buffer));
     }
 
   frame = XWINDOW (SAVED_WINDOW_N (saved_windows, 0)->window)->frame;
@@ -5636,8 +5652,9 @@ the return value is nil.  Otherwise the value is t.  */)
 #endif
 #endif
 
-      /* "Swap out" point from the selected window
-         into its buffer.  We do this now, before
+      /* "Swap out" point from the selected window's buffer
+         into the window itself.  (Normally the pointm of the selected
+         window holds garbage.)  We do this now, before
          restoring the window contents, and prevent it from
          being done later on when we select a new window.  */
       if (! NILP (XWINDOW (selected_window)->buffer))
@@ -5787,10 +5804,11 @@ the return value is nil.  Otherwise the value is t.  */)
       FRAME_ROOT_WINDOW (f) = data->root_window;
       /* Prevent "swapping out point" in the old selected window
          using the buffer that has been restored into it.
-         Use the point value from the beginning of this function
-         since unshow_buffer (called from delete_all_subwindows)
-         could have altered it.  */
+         We already swapped out point that from that window's old buffer.  */
       selected_window = Qnil;
+
+      /* Arrange *not* to restore point in the buffer that was
+         current when the window configuration was saved.  */
       if (EQ (XWINDOW (data->current_window)->buffer, new_current_buffer))
         set_marker_restricted (XWINDOW (data->current_window)->pointm,
                                make_number (old_point),