[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r114996: *.[chm]: Number every assignment to windows
|
From: |
Stefan Monnier |
|
Subject: |
[Emacs-diffs] trunk r114996: *.[chm]: Number every assignment to windows_or_buffers_changed. |
|
Date: |
Wed, 06 Nov 2013 04:11:24 +0000 |
|
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 114996
revision-id: address@hidden
parent: address@hidden
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Tue 2013-11-05 23:11:04 -0500
message:
*.[chm]: Number every assignment to windows_or_buffers_changed.
modified:
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/buffer.c buffer.c-20091113204419-o5vbwnq5f7feedwu-264
src/dispnew.c dispnew.c-20091113204419-o5vbwnq5f7feedwu-258
src/frame.c frame.c-20091113204419-o5vbwnq5f7feedwu-243
src/image.c image.c-20091113204419-o5vbwnq5f7feedwu-2969
src/insdel.c insdel.c-20091113204419-o5vbwnq5f7feedwu-175
src/keyboard.c keyboard.c-20091113204419-o5vbwnq5f7feedwu-449
src/minibuf.c minibuf.c-20091113204419-o5vbwnq5f7feedwu-242
src/nsfns.m nsfns.m-20091113204419-o5vbwnq5f7feedwu-8741
src/nsterm.m nsterm.m-20091113204419-o5vbwnq5f7feedwu-8747
src/w32fns.c w32fns.c-20091113204419-o5vbwnq5f7feedwu-945
src/window.c window.c-20091113204419-o5vbwnq5f7feedwu-231
src/xdisp.c xdisp.c-20091113204419-o5vbwnq5f7feedwu-240
src/xfaces.c xfaces.c-20091113204419-o5vbwnq5f7feedwu-560
src/xfns.c xfns.c-20091113204419-o5vbwnq5f7feedwu-274
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2013-11-06 00:14:56 +0000
+++ b/src/ChangeLog 2013-11-06 04:11:04 +0000
@@ -1,10 +1,15 @@
+2013-11-06 Stefan Monnier <address@hidden>
+
+ * *.[chm]: Number every assignment to windows_or_buffers_changed so we
+ can track why it is set.
+
2013-11-06 Paul Eggert <address@hidden>
Integer-related fixes for term.c etc.
* dispextern.h (face_tty_specified_color): New function.
* term.c (turn_on_face): Don't rely on undefined behavior when
- assigning an out-of-range value to 'long'. Simplify
- test for toggling highlight.
+ assigning an out-of-range value to 'long'.
+ Simplify test for toggling highlight.
(tty_capable_p): Omit last two (unused) args. All callers changed.
* term.c (tty_capable_p, tty_menu_display, tty_menu_add_selection)
(read_menu_input, tty_menu_activate, tty_menu_show):
@@ -232,8 +237,8 @@
2013-11-02 Jan Djärv <address@hidden>
- * xfaces.c (check_lface_attrs, realize_default_face): Add
- LFACE_DISTANT_FOREGROUND_INDEX (Bug#15788).
+ * xfaces.c (check_lface_attrs, realize_default_face):
+ Add LFACE_DISTANT_FOREGROUND_INDEX (Bug#15788).
(realize_default_face): Set DISTANT_FOREGROUND to unspecified_fg.
2013-11-02 Paul Eggert <address@hidden>
@@ -257,13 +262,13 @@
foreground.
(syms_of_xfaces): DEFSYM QCdistant_foreground.
- * dispextern.h (lface_attribute_index): Add
- LFACE_DISTANT_FOREGROUND_INDEX.
+ * dispextern.h (lface_attribute_index):
+ Add LFACE_DISTANT_FOREGROUND_INDEX.
2013-11-01 Claudio Bley <address@hidden>
- * image.c (pbm_next_char): New function. See
- http://netpbm.sourceforge.net/doc/pbm.html for the details.
+ * image.c (pbm_next_char): New function.
+ See http://netpbm.sourceforge.net/doc/pbm.html for the details.
(pbm_scan_number): Use it.
(Qlibjpeg_version): New variable.
(syms_of_image): DEFSYM and initialize it.
=== modified file 'src/buffer.c'
--- a/src/buffer.c 2013-11-04 17:30:33 +0000
+++ b/src/buffer.c 2013-11-06 04:11:04 +0000
@@ -2705,7 +2705,7 @@
/* If buffer is shown in a window, let redisplay consider other windows. */
if (buffer_window_count (current_buffer))
- ++windows_or_buffers_changed;
+ windows_or_buffers_changed = 10;
/* Copy this buffer's new multibyte status
into all of its indirect buffers. */
@@ -3911,11 +3911,11 @@
{
/* ... it's visible in other window than selected, */
if (buf != XBUFFER (XWINDOW (selected_window)->contents))
- windows_or_buffers_changed = 1;
+ windows_or_buffers_changed = 11;
/* ... or if we modify an overlay at the end of the buffer
and so we cannot be sure that window end is still valid. */
else if (end >= ZV && start <= ZV)
- windows_or_buffers_changed = 1;
+ windows_or_buffers_changed = 12;
}
++BUF_OVERLAY_MODIFF (buf);
=== modified file 'src/dispnew.c'
--- a/src/dispnew.c 2013-11-04 06:09:03 +0000
+++ b/src/dispnew.c 2013-11-06 04:11:04 +0000
@@ -2940,7 +2940,7 @@
clear_frame (f);
clear_current_matrices (f);
update_end (f);
- windows_or_buffers_changed++;
+ windows_or_buffers_changed = 13;
/* Mark all windows as inaccurate, so that every window will have
its redisplay done. */
mark_window_display_accurate (FRAME_ROOT_WINDOW (f), 0);
=== modified file 'src/frame.c'
--- a/src/frame.c 2013-10-29 16:08:08 +0000
+++ b/src/frame.c 2013-11-06 04:11:04 +0000
@@ -231,7 +231,7 @@
if (nlines != olines)
{
- windows_or_buffers_changed++;
+ windows_or_buffers_changed = 14;
FRAME_WINDOW_SIZES_CHANGED (f) = 1;
FRAME_MENU_BAR_LINES (f) = nlines;
set_menu_bar_lines_1 (f->root_window, nlines - olines);
@@ -1699,7 +1699,7 @@
make_frame_visible_1 (f->root_window);
/* Make menu bar update for the Buffers and Frames menus. */
- windows_or_buffers_changed++;
+ windows_or_buffers_changed = 15;
XSETFRAME (frame, f);
return frame;
@@ -1753,7 +1753,7 @@
#endif
/* Make menu bar update for the Buffers and Frames menus. */
- windows_or_buffers_changed++;
+ windows_or_buffers_changed = 16;
return Qnil;
}
@@ -1776,7 +1776,7 @@
#endif
/* Make menu bar update for the Buffers and Frames menus. */
- windows_or_buffers_changed++;
+ windows_or_buffers_changed = 17;
return Qnil;
}
@@ -3245,7 +3245,7 @@
XSETFRAME (frame, f);
x_set_font (f, Fframe_parameter (frame, Qfont), Qnil);
++face_change_count;
- ++windows_or_buffers_changed;
+ windows_or_buffers_changed = 18;
}
}
=== modified file 'src/image.c'
--- a/src/image.c 2013-11-05 07:11:24 +0000
+++ b/src/image.c 2013-11-06 04:11:04 +0000
@@ -1521,7 +1521,7 @@
clear_current_matrices (fr);
}
- ++windows_or_buffers_changed;
+ windows_or_buffers_changed = 19;
}
unblock_input ();
=== modified file 'src/insdel.c'
--- a/src/insdel.c 2013-10-30 02:45:53 +0000
+++ b/src/insdel.c 2013-11-06 04:11:04 +0000
@@ -1803,7 +1803,7 @@
let redisplay consider other windows if this buffer is visible. */
if (XBUFFER (XWINDOW (selected_window)->contents) != current_buffer
&& buffer_window_count (current_buffer))
- ++windows_or_buffers_changed;
+ windows_or_buffers_changed = 20;
if (buffer_intervals (current_buffer))
{
=== modified file 'src/keyboard.c'
--- a/src/keyboard.c 2013-11-05 22:41:57 +0000
+++ b/src/keyboard.c 2013-11-06 04:11:04 +0000
@@ -1667,7 +1667,7 @@
cluster to prevent automatic composition. To recover
the automatic composition, we must update the
display. */
- windows_or_buffers_changed++;
+ windows_or_buffers_changed = 21;
if (!already_adjusted)
adjust_point_for_property (last_point_position,
MODIFF != prev_modiff);
=== modified file 'src/minibuf.c'
--- a/src/minibuf.c 2013-09-09 12:15:45 +0000
+++ b/src/minibuf.c 2013-11-06 04:11:04 +0000
@@ -866,7 +866,7 @@
resize_mini_window (XWINDOW (window), 0);
/* Enforce full redisplay. FIXME: make it more selective. */
- windows_or_buffers_changed++;
+ windows_or_buffers_changed = 22;
/* In case the previous minibuffer displayed in this miniwindow is
dead, we may keep displaying this buffer (tho it's inactive), so reset it,
=== modified file 'src/nsfns.m'
--- a/src/nsfns.m 2013-11-05 07:51:55 +0000
+++ b/src/nsfns.m 2013-11-06 04:11:04 +0000
@@ -403,23 +403,23 @@
if (!NILP (f->title))
arg = f->title;
else
- /* explicit name and no icon-name -> explicit_name */
+ /* Explicit name and no icon-name -> explicit_name. */
if (f->explicit_name)
arg = f->name;
else
{
- /* no explicit name and no icon-name ->
- name has to be rebuild from icon_title_format */
- windows_or_buffers_changed++;
+ /* No explicit name and no icon-name ->
+ name has to be rebuild from icon_title_format. */
+ windows_or_buffers_changed = 62;
return;
}
}
/* Don't change the name if it's already NAME. */
- if ([[view window] miniwindowTitle] &&
- ([[[view window] miniwindowTitle]
+ if ([[view window] miniwindowTitle]
+ && ([[[view window] miniwindowTitle]
isEqualToString: [NSString stringWithUTF8String:
- SSDATA (arg)]]))
+ SSDATA (arg)]]))
return;
[[view window] setMiniwindowTitle:
=== modified file 'src/nsterm.m'
--- a/src/nsterm.m 2013-11-04 17:57:17 +0000
+++ b/src/nsterm.m 2013-11-06 04:11:04 +0000
@@ -6089,7 +6089,7 @@
SET_FRAME_ICONIFIED (emacsframe, 0);
SET_FRAME_VISIBLE (emacsframe, 1);
- windows_or_buffers_changed++;
+ windows_or_buffers_changed = 63;
if (emacs_event)
{
=== modified file 'src/w32fns.c'
--- a/src/w32fns.c 2013-10-18 12:57:44 +0000
+++ b/src/w32fns.c 2013-11-06 04:11:04 +0000
@@ -1664,7 +1664,7 @@
nlines = 0;
/* Make sure we redisplay all windows in this frame. */
- ++windows_or_buffers_changed;
+ windows_or_buffers_changed = 23;
delta = nlines - FRAME_TOOL_BAR_LINES (f);
=== modified file 'src/window.c'
--- a/src/window.c 2013-11-04 06:09:03 +0000
+++ b/src/window.c 2013-11-06 04:11:04 +0000
@@ -500,7 +500,7 @@
select_window_1 (window, inhibit_point_swap);
bset_last_selected_window (XBUFFER (w->contents), window);
- windows_or_buffers_changed++;
+ windows_or_buffers_changed = 24;
record_and_return:
/* record_buffer can run QUIT, so make sure it is run only after we have
@@ -1553,7 +1553,7 @@
set_marker_restricted (w->pointm, pos, w->contents);
/* We have to make sure that redisplay updates the window to show
the new value of point. */
- ++windows_or_buffers_changed;
+ windows_or_buffers_changed = 25;
}
return pos;
@@ -1576,7 +1576,7 @@
w->update_mode_line = 1;
if (w != XWINDOW (selected_window))
/* Enforce full redisplay. FIXME: make it more selective. */
- windows_or_buffers_changed++;
+ windows_or_buffers_changed = 26;
return pos;
}
@@ -2837,7 +2837,7 @@
}
free_window_matrices (r);
- windows_or_buffers_changed++;
+ windows_or_buffers_changed = 27;
Vwindow_list = Qnil;
FRAME_WINDOW_SIZES_CHANGED (f) = 1;
resize_failed = 0;
@@ -3171,7 +3171,7 @@
}
/* Maybe we could move this into the `if' but it's not obviously safe and
I doubt it's worth the trouble. */
- windows_or_buffers_changed++;
+ windows_or_buffers_changed = 28;
/* We must select BUFFER for running the window-scroll-functions. */
/* We can't check ! NILP (Vwindow_scroll_functions) here
@@ -3278,7 +3278,7 @@
{
if (NILP (object))
{
- windows_or_buffers_changed++;
+ windows_or_buffers_changed = 29;
update_mode_lines++;
return Qt;
}
@@ -3646,7 +3646,7 @@
block_input ();
window_resize_apply (r, horflag);
- windows_or_buffers_changed++;
+ windows_or_buffers_changed = 30;
FRAME_WINDOW_SIZES_CHANGED (f) = 1;
adjust_frame_glyphs (f);
@@ -3741,7 +3741,7 @@
}
}
- windows_or_buffers_changed++;
+ windows_or_buffers_changed = 31;
}
@@ -3862,7 +3862,7 @@
else
p = XWINDOW (o->parent);
- windows_or_buffers_changed++;
+ windows_or_buffers_changed = 32;
FRAME_WINDOW_SIZES_CHANGED (f) = 1;
new = make_window ();
n = XWINDOW (new);
@@ -4012,7 +4012,7 @@
hlinfo->mouse_face_window = Qnil;
}
- windows_or_buffers_changed++;
+ windows_or_buffers_changed = 33;
Vwindow_list = Qnil;
FRAME_WINDOW_SIZES_CHANGED (f) = 1;
@@ -4134,7 +4134,7 @@
w->top_line = r->top_line + r->total_lines;
w->total_lines -= XINT (value);
/* Enforce full redisplay. FIXME: make it more selective. */
- windows_or_buffers_changed++;
+ windows_or_buffers_changed = 34;
adjust_frame_glyphs (f);
unblock_input ();
}
@@ -4168,7 +4168,7 @@
w->top_line = r->top_line + r->total_lines;
w->total_lines = 1;
/* Enforce full redisplay. FIXME: make it more selective. */
- windows_or_buffers_changed++;
+ windows_or_buffers_changed = 35;
adjust_frame_glyphs (f);
unblock_input ();
}
@@ -4208,7 +4208,7 @@
w->total_lines = XFASTINT (w->new_total);
w->top_line = r->top_line + r->total_lines;
- windows_or_buffers_changed++;
+ windows_or_buffers_changed = 36;
FRAME_WINDOW_SIZES_CHANGED (f) = 1;
adjust_frame_glyphs (f);
unblock_input ();
@@ -4830,7 +4830,7 @@
Fset_buffer (XWINDOW (selected_window)->contents);
/* Make redisplay consider other windows than just selected_window. */
- ++windows_or_buffers_changed;
+ windows_or_buffers_changed = 37;
}
if (NILP (n))
@@ -4940,7 +4940,7 @@
/* Don't screw up if window_scroll gets an error. */
record_unwind_protect (save_excursion_restore, save_excursion_save ());
- ++windows_or_buffers_changed;
+ windows_or_buffers_changed = 38;
Fset_buffer (w->contents);
SET_PT_BOTH (marker_position (w->pointm), marker_byte_position (w->pointm));
@@ -5575,7 +5575,7 @@
BUF_PT_BYTE (XBUFFER (w->contents)));
}
- windows_or_buffers_changed++;
+ windows_or_buffers_changed = 39;
FRAME_WINDOW_SIZES_CHANGED (f) = 1;
/* Problem: Freeing all matrices and later allocating them again
@@ -6103,7 +6103,7 @@
adjust_window_margins (w);
clear_glyph_matrix (w->current_matrix);
w->window_end_valid = 0;
- windows_or_buffers_changed++;
+ windows_or_buffers_changed = 40;
adjust_frame_glyphs (XFRAME (WINDOW_FRAME (w)));
}
=== modified file 'src/xdisp.c'
--- a/src/xdisp.c 2013-11-05 22:45:44 +0000
+++ b/src/xdisp.c 2013-11-06 04:11:04 +0000
@@ -9633,7 +9633,7 @@
shown in some window. So we must manually incrementing
windows_or_buffers_changed here to make up for that. */
if (shown)
- windows_or_buffers_changed++;
+ windows_or_buffers_changed = 41;
else
windows_or_buffers_changed = old_windows_or_buffers_changed;
message_log_need_newline = !nlflag;
@@ -10336,7 +10336,7 @@
(intptr_t) w, resize_exactly);
if (resized_p)
{
- ++windows_or_buffers_changed;
+ windows_or_buffers_changed = 42;
++update_mode_lines;
redisplay_internal ();
}
@@ -10733,7 +10733,7 @@
frame_garbaged = 0;
if (changed_count)
- ++windows_or_buffers_changed;
+ windows_or_buffers_changed = 43;
}
}
@@ -10802,7 +10802,7 @@
pending input. */
ptrdiff_t count = SPECPDL_INDEX ();
specbind (Qredisplay_dont_pause, Qt);
- windows_or_buffers_changed = 1;
+ windows_or_buffers_changed = 44;
redisplay_internal ();
unbind_to (count, Qnil);
}
@@ -10821,11 +10821,11 @@
redisplay displays the minibuffer, so that the cursor will
be replaced with what the minibuffer wants. */
if (cursor_in_echo_area)
- ++windows_or_buffers_changed;
+ windows_or_buffers_changed = 45;
}
}
else if (!EQ (mini_window, selected_window))
- windows_or_buffers_changed++;
+ windows_or_buffers_changed = 46;
/* Last displayed message is now the current message. */
echo_area_buffer[1] = echo_area_buffer[0];
@@ -12947,7 +12947,7 @@
realized faces, which includes the faces referenced from current
matrices. So, we can't reuse current matrices in this case. */
if (face_change_count)
- ++windows_or_buffers_changed;
+ windows_or_buffers_changed = 47;
if ((FRAME_TERMCAP_P (sf) || FRAME_MSDOS_P (sf))
&& FRAME_TTY (sf)->previous_frame != sf)
@@ -12955,7 +12955,7 @@
/* Since frames on a single ASCII terminal share the same
display area, displaying a different frame means redisplay
the whole thing. */
- windows_or_buffers_changed++;
+ windows_or_buffers_changed = 48;
SET_FRAME_GARBAGED (sf);
#ifndef DOS_NT
set_tty_color_mode (FRAME_TTY (sf), sf);
@@ -13031,7 +13031,7 @@
/* If specs for an arrow have changed, do thorough redisplay
to ensure we remove any arrow that should no longer exist. */
if (overlay_arrows_changed_p ())
- consider_all_windows_p = windows_or_buffers_changed = 1;
+ consider_all_windows_p = windows_or_buffers_changed = 49;
/* Normally the message* functions will have already displayed and
updated the echo area, but the frame may have been trashed, or
@@ -13064,7 +13064,7 @@
{
consider_all_windows_p = 1;
++update_mode_lines;
- ++windows_or_buffers_changed;
+ windows_or_buffers_changed = 50;
/* If window configuration was changed, frames may have been
marked garbaged. Clear them or we will experience
@@ -13084,7 +13084,7 @@
needs to be rewritten with two variables, consider_all_windows and
consider_all_frames. */
consider_all_windows_p = 1;
- ++windows_or_buffers_changed;
+ windows_or_buffers_changed = 51;
++update_mode_lines;
/* If window configuration was changed, frames may have been
@@ -13524,7 +13524,7 @@
}
if (new_count != number_of_visible_frames)
- windows_or_buffers_changed++;
+ windows_or_buffers_changed = 52;
}
/* Change frame size now if a change is pending. */
=== modified file 'src/xfaces.c'
--- a/src/xfaces.c 2013-11-06 00:14:56 +0000
+++ b/src/xfaces.c 2013-11-06 04:11:04 +0000
@@ -788,7 +788,7 @@
{
clear_face_cache (!NILP (thoroughly));
++face_change_count;
- ++windows_or_buffers_changed;
+ windows_or_buffers_changed = 53;
return Qnil;
}
@@ -2637,7 +2637,7 @@
if (NILP (Fget (face, Qface_no_inherit)))
{
++face_change_count;
- ++windows_or_buffers_changed;
+ windows_or_buffers_changed = 54;
}
eassert (LFACEP (lface));
@@ -2716,7 +2716,7 @@
if (NILP (Fget (to, Qface_no_inherit)))
{
++face_change_count;
- ++windows_or_buffers_changed;
+ windows_or_buffers_changed = 55;
}
return to;
@@ -3207,7 +3207,7 @@
&& NILP (Fequal (old_value, value)))
{
++face_change_count;
- ++windows_or_buffers_changed;
+ windows_or_buffers_changed = 56;
}
if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)
@@ -3221,7 +3221,7 @@
{
#ifdef HAVE_WINDOW_SYSTEM
/* Changed font-related attributes of the `default' face are
- reflected in changed `font' frame parameters. */
+ reflected in changed `font' frame parameters. */
if (FRAMEP (frame)
&& (prop_index || EQ (attr, QCfont))
&& lface_fully_specified_p (XVECTOR (lface)->contents))
@@ -3380,7 +3380,7 @@
&& NILP (Fget (face, Qface_no_inherit)))
{
++face_change_count;
- ++windows_or_buffers_changed;
+ windows_or_buffers_changed = 57;
}
}
@@ -4273,7 +4273,7 @@
if (WINDOWP (f->root_window))
{
clear_current_matrices (f);
- ++windows_or_buffers_changed;
+ windows_or_buffers_changed = 58;
}
unblock_input ();
=== modified file 'src/xfns.c'
--- a/src/xfns.c 2013-10-29 05:55:25 +0000
+++ b/src/xfns.c 2013-11-06 04:11:04 +0000
@@ -959,7 +959,7 @@
nlines = 0;
/* Make sure we redisplay all windows in this frame. */
- windows_or_buffers_changed++;
+ windows_or_buffers_changed = 59;
#if defined (USE_X_TOOLKIT) || defined (USE_GTK)
FRAME_MENU_BAR_LINES (f) = 0;
@@ -1068,8 +1068,8 @@
#else /* !USE_GTK */
- /* Make sure we redisplay all windows in this frame. */
- ++windows_or_buffers_changed;
+ /* Make sure we redisplay all windows in this frame. */
+ windows_or_buffers_changed = 60;
delta = nlines - FRAME_TOOL_BAR_LINES (f);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r114996: *.[chm]: Number every assignment to windows_or_buffers_changed.,
Stefan Monnier <=