* window.c (Vwindow_point_insertion_type): New var.

(set_window_buffer): Use it.
(syms_of_window): Init and export it to Lisp.
* progmodes/compile.el (compilation-mode):
Set window-point-insertion-type.
(compilation-filter): Don't use insert-before-markers any more.
* emacs-lisp/trace.el (trace-make-advice):
Set window-point-insertion-type in the trace buffer.
* startup.el (normal-top-level): Set window-point-insertion-type in
*Messages*.
* net/telnet.el (telnet-mode): Set window-point-insertion-type.
(telnet-filter): Don't use insert-before-markers any more.
* comint.el (comint-mode): Set window-point-insertion-type.
(comint-output-filter): Don't use insert-before-markers any more.
* button.el (make-text-button): Allow `start' to be a string.

2 files changed, 35 insertions, 23 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index a4481d2fab7..23189ad9cf9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,21 +1,21 @@
+2008-06-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * window.c (Vwindow_point_insertion_type): New var.
+        (set_window_buffer): Use it.
+        (syms_of_window): Init and export it to Lisp.
+
 2008-06-10  Kenichi Handa  <handa@m17n.org>
 
         * font.h (font_intern_prop): Prototype adjusted.
 
         * font.c (font_intern_prop): New arg force_symbol.
-        (font_parse_xlfd): Adjusted for the change of font_intern_prop.
-        (font_parse_fcname): Likewise.
-        (font_parse_family_registry): Likewise.
-
-        * ftfont.c (ftfont_pattern_entity): Adjusted for the change of
-        font_intern_prop.
-
-        * w32font.c (add_font_name_to_list): Adjusted for
-        the change of font_intern_prop.
-        (w32_enumfont_pattern_entity): Likewise.
-        (w32_registry): Likewise.
+        (font_parse_xlfd, font_parse_fcname, font_parse_family_registry):
+        Adjust for the change of font_intern_prop.
 
-        * w32uniscribe.c (add_opentype_font_name_to_list): Adjusted for
+        * ftfont.c (ftfont_pattern_entity):
+        * w32font.c (add_font_name_to_list, w32_enumfont_pattern_entity)
+        (w32_registry):
+        * w32uniscribe.c (add_opentype_font_name_to_list): Adjust for
         the change of font_intern_prop.
 
 2008-06-09  Juanma Barranquero  <lekktu@gmail.com>
@@ -24,15 +24,15 @@
 
 2008-06-09  Jason Rumney  <jasonr@gnu.org>
 
-        * w32term.c (x_make_frame_visible): Use alternate restore flags.
+        * w32term.c (x_make_frame_visible): Use alternate restore flags.
 
-        * w32menu.c (Fx_popup_menu): Unwind protect while building menu.
-        (parse_single_submenu): Remove.
-        (digest_single_submenu): Remove.
-        (syms_of_w32menu): Don't initialise variables that have moved
-        to menu.c.
-        (set_frame_menubar): Sync with version in xmenu.c.
-        (w32_menu_show): Sync with xmenu_show in xmenu.c.
+        * w32menu.c (Fx_popup_menu): Unwind protect while building menu.
+        (parse_single_submenu): Remove.
+        (digest_single_submenu): Remove.
+        (syms_of_w32menu): Don't initialise variables that have moved
+        to menu.c.
+        (set_frame_menubar): Sync with version in xmenu.c.
+        (w32_menu_show): Sync with xmenu_show in xmenu.c.
 
         * menu.c (single_keymap_panes, push_menu_pane, push_menu_item):
         Make static again.
diff --git a/src/window.c b/src/window.c
index 7af0c6db711..27db0296dcf 100644
--- a/src/window.c
+++ b/src/window.c
@@ -167,6 +167,10 @@ static Lisp_Object Vwindow_configuration_change_hook;
 
 Lisp_Object Vscroll_preserve_screen_position;
 
+/* Non-nil means that text is inserted before window's markers.  */
+
+Lisp_Object Vwindow_point_insertion_type;
+
 /* Incremented by 1 whenever a window is deleted.  */
 
 int window_deletion_count;
@@ -3420,6 +3424,8 @@ set_window_buffer (window, buffer, run_hooks_p, keep_margins_p)
       Fset_buffer (buffer);
     }
 
+  XMARKER (w->pointm)->insertion_type = !NILP (Vwindow_point_insertion_type);
+
   if (!keep_margins_p)
     {
       /* Set left and right marginal area width etc. from buffer.  */
@@ -3486,9 +3492,11 @@ This function runs the hook `window-scroll-functions'.  */)
   else if (! EQ (tem, Qt))      /* w->buffer is t when the window
                                    is first being set up.  */
     {
-      if (!NILP (w->dedicated) && !EQ (tem, buffer))
-        error ("Window is dedicated to `%s'",
-               SDATA (XBUFFER (tem)->name));
+      if (!EQ (tem, buffer))
+        if (EQ (w->dedicated, Qt))
+          error ("Window is dedicated to `%s'", SDATA (XBUFFER (tem)->name));
+        else
+          w->dedicated = Qnil;
 
       unshow_buffer (w);
     }
@@ -7151,6 +7159,10 @@ by full screens.
 Any other value means point always keeps its screen position.  */);
   Vscroll_preserve_screen_position = Qnil;
 
+  DEFVAR_LISP ("window-point-insertion-type", &Vwindow_point_insertion_type,
+               doc: /* Type of marker to use for `window-point'.  */);
+  Vwindow_point_insertion_type = Qnil;
+
   DEFVAR_LISP ("window-configuration-change-hook",
                &Vwindow_configuration_change_hook,
                doc: /* Functions to call when window configuration changes.