[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r117031: * src/window.c (struct saved_window): Remov
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] trunk r117031: * src/window.c (struct saved_window): Remove mark. |
Date: |
Tue, 29 Apr 2014 15:16:15 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117031
revision-id: address@hidden
parent: address@hidden
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Tue 2014-04-29 11:16:07 -0400
message:
* src/window.c (struct saved_window): Remove mark.
(Fset_window_configuration, save_window_save)
(compare_window_configurations): Don't touch marks any more.
* doc/lispref/windows.texi (Window Configurations, Window Configurations):
Window configs don't store marks any more.
modified:
doc/lispref/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-6155
doc/lispref/windows.texi
windows.texi-20091113204419-o5vbwnq5f7feedwu-6224
etc/NEWS news-20100311060928-aoit31wvzf25yr1z-1
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/window.c window.c-20091113204419-o5vbwnq5f7feedwu-231
=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog 2014-04-25 16:11:07 +0000
+++ b/doc/lispref/ChangeLog 2014-04-29 15:16:07 +0000
@@ -1,8 +1,12 @@
+2014-04-29 Stefan Monnier <address@hidden>
+
+ * windows.texi (Window Configurations, Window Configurations):
+ Window configs don't store marks any more.
+
2014-04-25 Eli Zaretskii <address@hidden>
- * strings.texi (Text Comparison): Mention
- equal-including-properties for when text properties of the strings
- matter for comparison.
+ * strings.texi (Text Comparison): Mention equal-including-properties
+ for when text properties of the strings matter for comparison.
2014-04-22 Eli Zaretskii <address@hidden>
=== modified file 'doc/lispref/windows.texi'
--- a/doc/lispref/windows.texi 2014-03-21 09:23:22 +0000
+++ b/doc/lispref/windows.texi 2014-04-29 15:16:07 +0000
@@ -3655,7 +3655,7 @@
A @dfn{window configuration} records the entire layout of one
frame---all windows, their sizes, which buffers they contain, how those
-buffers are scrolled, and their values of point and the mark; also their
+buffers are scrolled, and their value of point; also their
fringes, margins, and scroll bar settings. It also includes the value
of @code{minibuffer-scroll-window}. As a special exception, the window
configuration does not record the value of point in the selected window
@@ -3731,13 +3731,13 @@
@defun compare-window-configurations config1 config2
This function compares two window configurations as regards the
-structure of windows, but ignores the values of point and mark and the
+structure of windows, but ignores the values of point and the
saved scrolling positions---it can return @code{t} even if those
aspects differ.
The function @code{equal} can also compare two window configurations; it
regards configurations as unequal if they differ in any respect, even a
-saved point or mark.
+saved point.
@end defun
@defun window-configuration-frame config
=== modified file 'etc/NEWS'
--- a/etc/NEWS 2014-04-22 21:32:51 +0000
+++ b/etc/NEWS 2014-04-29 15:16:07 +0000
@@ -85,6 +85,8 @@
* Incompatible Lisp Changes in Emacs 24.5
+** window-configurations do not record the buffers's marks any more.
+
** inhibit-modification-hooks now also inhibits lock-file checks as well as
active region handling.
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2014-04-28 16:59:41 +0000
+++ b/src/ChangeLog 2014-04-29 15:16:07 +0000
@@ -1,3 +1,9 @@
+2014-04-29 Stefan Monnier <address@hidden>
+
+ * window.c (struct saved_window): Remove mark.
+ (Fset_window_configuration, save_window_save)
+ (compare_window_configurations): Don't touch marks any more.
+
2014-04-28 Paul Eggert <address@hidden>
Use bits_word for gcmarkbits.
@@ -19,8 +25,7 @@
2014-04-25 Eli Zaretskii <address@hidden>
* search.c (Fnewline_cache_check): Don't try to count newlines
- outside the buffer's restriction, as find_newline doesn't support
- that.
+ outside the buffer's restriction, as find_newline doesn't support that.
2014-04-24 Stefan Monnier <address@hidden>
=== modified file 'src/window.c'
--- a/src/window.c 2014-04-24 03:59:19 +0000
+++ b/src/window.c 2014-04-29 15:16:07 +0000
@@ -5953,12 +5953,12 @@
int frame_menu_bar_height, frame_tool_bar_height;
};
-/* This is saved as a Lisp_Vector */
+/* This is saved as a Lisp_Vector. */
struct saved_window
{
struct vectorlike_header header;
- Lisp_Object window, buffer, start, pointm, mark;
+ Lisp_Object window, buffer, start, pointm;
Lisp_Object pixel_left, pixel_top, pixel_height, pixel_width;
Lisp_Object left_col, top_line, total_cols, total_lines;
Lisp_Object normal_cols, normal_lines;
@@ -6260,17 +6260,6 @@
set_marker_restricted (w->start, p->start, w->contents);
set_marker_restricted (w->pointm, p->pointm,
w->contents);
- if (MARKERP (p->mark) && !XMARKER (p->mark)->buffer
- && !NILP (BVAR (XBUFFER (w->contents), mark_active)))
- {
- struct buffer *old = current_buffer;
- extern Lisp_Object Qdeactivate_mark;
- set_buffer_internal (XBUFFER (w->contents));
- call0 (Qdeactivate_mark);
- set_buffer_internal (old);
- }
- Fset_marker (BVAR (XBUFFER (w->contents), mark),
- p->mark, w->contents);
/* As documented in Fcurrent_window_configuration, don't
restore the location of point in the buffer which was
@@ -6626,27 +6615,16 @@
p->start = Fcopy_marker (w->start, Qnil);
p->start_at_line_beg = w->start_at_line_beg ? Qt : Qnil;
-
- tem = BVAR (XBUFFER (w->contents), mark);
- p->mark = Fcopy_marker (tem, Qnil);
}
else
{
p->pointm = Qnil;
p->start = Qnil;
- p->mark = Qnil;
p->start_at_line_beg = Qnil;
}
- if (NILP (w->parent))
- p->parent = Qnil;
- else
- p->parent = XWINDOW (w->parent)->temslot;
-
- if (NILP (w->prev))
- p->prev = Qnil;
- else
- p->prev = XWINDOW (w->prev)->temslot;
+ p->parent = NILP (w->parent) ? Qnil : XWINDOW (w->parent)->temslot;
+ p->prev = NILP (w->prev) ? Qnil : XWINDOW (w->prev)->temslot;
if (WINDOWP (w->contents))
i = save_window_save (w->contents, vector, i);
@@ -6660,8 +6638,8 @@
doc: /* Return an object representing the current window configuration
of FRAME.
If FRAME is nil or omitted, use the selected frame.
This describes the number of windows, their sizes and current buffers,
-and for each displayed buffer, where display starts, and the positions of
-point and mark. An exception is made for point in the current buffer:
+and for each displayed buffer, where display starts, and the position of
+point. An exception is made for point in the current buffer:
its value is -not- saved.
This also records the currently selected frame, and FRAME's focus
redirection (see `redirect-frame-focus'). The variable
@@ -7105,8 +7083,7 @@
|| !EQ (sw1->min_hscroll, sw2->min_hscroll)
|| !EQ (sw1->start_at_line_beg, sw2->start_at_line_beg)
|| NILP (Fequal (sw1->start, sw2->start))
- || NILP (Fequal (sw1->pointm, sw2->pointm))
- || NILP (Fequal (sw1->mark, sw2->mark))))
+ || NILP (Fequal (sw1->pointm, sw2->pointm))))
|| !EQ (sw1->left_margin_cols, sw2->left_margin_cols)
|| !EQ (sw1->right_margin_cols, sw2->right_margin_cols)
|| !EQ (sw1->left_fringe_width, sw2->left_fringe_width)
@@ -7123,7 +7100,7 @@
DEFUN ("compare-window-configurations", Fcompare_window_configurations,
Scompare_window_configurations, 2, 2, 0,
doc: /* Compare two window configurations as regards the structure of
windows.
-This function ignores details such as the values of point and mark
+This function ignores details such as the values of point
and scrolling positions. */)
(Lisp_Object x, Lisp_Object y)
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r117031: * src/window.c (struct saved_window): Remove mark.,
Stefan Monnier <=