[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/window.c,v
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] Changes to emacs/src/window.c,v |
Date: |
Tue, 10 Jun 2008 16:08:51 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Stefan Monnier <monnier> 08/06/10 16:08:49
Index: src/window.c
===================================================================
RCS file: /sources/emacs/emacs/src/window.c,v
retrieving revision 1.615
retrieving revision 1.616
diff -u -b -r1.615 -r1.616
--- src/window.c 5 Jun 2008 18:00:36 -0000 1.615
+++ src/window.c 10 Jun 2008 16:08:48 -0000 1.616
@@ -167,6 +167,10 @@
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 @@
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 @@
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 @@
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.
- [Emacs-diffs] Changes to emacs/src/window.c,v, Jim Meyering, 2008/06/02
- [Emacs-diffs] Changes to emacs/src/window.c,v, Juanma Barranquero, 2008/06/04
- [Emacs-diffs] Changes to emacs/src/window.c,v, Juanma Barranquero, 2008/06/04
- [Emacs-diffs] Changes to emacs/src/window.c,v, Juanma Barranquero, 2008/06/04
- [Emacs-diffs] Changes to emacs/src/window.c,v, Stefan Monnier, 2008/06/04
- [Emacs-diffs] Changes to emacs/src/window.c,v, Stefan Monnier, 2008/06/05
- [Emacs-diffs] Changes to emacs/src/window.c,v,
Stefan Monnier <=
- [Emacs-diffs] Changes to emacs/src/window.c,v, Glenn Morris, 2008/06/26