[Emacs-diffs] /srv/bzr/emacs/trunk r108788: * window.h (struct window): Change type of 'use_time' and

[Dmitry Antipov]

------------------------------------------------------------
revno: 108788
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Thu 2012-06-28 15:11:48 +0400
message:
  * window.h (struct window): Change type of 'use_time' and
  'sequence_number' from Lisp_Object to int.
  * frame.c (make_frame): Adjust users accordingly.
  * print.c (print_object): Likewise.
  * window.c (select_window, Fwindow_use_time, make_parent_window)
  (make_window): Likewise.
modified:
  src/ChangeLog
  src/frame.c
  src/print.c
  src/window.c
  src/window.h

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-06-28 07:50:50 +0000
+++ b/src/ChangeLog     2012-06-28 11:11:48 +0000
@@ -1,5 +1,14 @@
 2012-06-28  Dmitry Antipov  <address@hidden>
 
+       * window.h (struct window): Change type of 'use_time' and
+       'sequence_number' from Lisp_Object to int.
+       * frame.c (make_frame): Adjust users accordingly.
+       * print.c (print_object): Likewise.
+       * window.c (select_window, Fwindow_use_time, make_parent_window)
+       (make_window): Likewise.
+
+2012-06-28  Dmitry Antipov  <address@hidden>
+
        * dispextern.h (GLYPH_DEBUG): Now defined in config.h if
        enabled with --enable-checking=[all,glyphs] configure option.
        Fix GLYPH_DEBUG usage assuming that it may be undefined,

=== modified file 'src/frame.c'
--- a/src/frame.c       2012-06-26 14:41:01 +0000
+++ b/src/frame.c       2012-06-28 11:11:48 +0000
@@ -356,8 +356,7 @@
   f->selected_window = root_window;
   /* Make sure this window seems more recently used than
      a newly-created, never-selected window.  */
-  ++window_select_count;
-  XSETFASTINT (XWINDOW (f->selected_window)->use_time, window_select_count);
+  XWINDOW (f->selected_window)->use_time = ++window_select_count;
 
   return f;
 }

=== modified file 'src/print.c'
--- a/src/print.c       2012-06-26 02:33:51 +0000
+++ b/src/print.c       2012-06-28 11:11:48 +0000
@@ -1774,8 +1774,7 @@
        {
          int len;
          strout ("#<window ", -1, -1, printcharfun);
-         len = sprintf (buf, "%"pI"d",
-                        XFASTINT (XWINDOW (obj)->sequence_number));
+         len = sprintf (buf, "%d", XWINDOW (obj)->sequence_number);
          strout (buf, len, len, printcharfun);
          if (!NILP (XWINDOW (obj)->buffer))
            {

=== modified file 'src/window.c'
--- a/src/window.c      2012-06-28 07:50:27 +0000
+++ b/src/window.c      2012-06-28 11:11:48 +0000
@@ -331,8 +331,7 @@
 
   if (NILP (norecord))
     {
-      ++window_select_count;
-      XSETFASTINT (w->use_time, window_select_count);
+      w->use_time = ++window_select_count;
       record_buffer (w->buffer);
     }
 
@@ -499,7 +498,7 @@
 selected one.  */)
   (Lisp_Object window)
 {
-  return decode_window (window)->use_time;
+  return make_number (decode_window (window)->use_time);
 }
 
 DEFUN ("window-total-height", Fwindow_total_height, Swindow_total_height, 0, 
1, 0,
@@ -3250,8 +3249,7 @@
          sizeof (Lisp_Object) * VECSIZE (struct window));
   XSETWINDOW (parent, p);
 
-  ++sequence_number;
-  XSETFASTINT (p->sequence_number, sequence_number);
+  p->sequence_number = ++sequence_number;
 
   replace_window (window, parent, 1);
 
@@ -3290,9 +3288,6 @@
   w->pointm = Fmake_marker ();
   XSETFASTINT (w->hscroll, 0);
   XSETFASTINT (w->min_hscroll, 0);
-  XSETFASTINT (w->use_time, 0);
-  ++sequence_number;
-  XSETFASTINT (w->sequence_number, sequence_number);
   XSETFASTINT (w->last_point, 0);
   w->vertical_scroll_bar_type = Qt;
   XSETFASTINT (w->window_end_pos, 0);
@@ -3303,6 +3298,7 @@
   w->nrows_scale_factor = w->ncols_scale_factor = 1;
   w->phys_cursor_type = -1;
   w->phys_cursor_width = -1;
+  w->sequence_number = ++sequence_number;
 
   /* Reset window_list.  */
   Vwindow_list = Qnil;

=== modified file 'src/window.h'
--- a/src/window.h      2012-06-01 03:41:03 +0000
+++ b/src/window.h      2012-06-28 11:11:48 +0000
@@ -147,12 +147,6 @@
        the user has set, by set-window-hscroll for example.  */
     Lisp_Object min_hscroll;
 
-    /* Number saying how recently window was selected.  */
-    Lisp_Object use_time;
-
-    /* Unique number of window assigned when it was created.  */
-    Lisp_Object sequence_number;
-
     /* No permanent meaning; used by save-window-excursion's
        bookkeeping.  */
     Lisp_Object temslot;
@@ -254,6 +248,12 @@
     struct glyph_matrix *current_matrix;
     struct glyph_matrix *desired_matrix;
 
+    /* Number saying how recently window was selected.  */
+    int use_time;
+
+    /* Unique number of window assigned when it was created.  */
+    int sequence_number;
+
     /* Scaling factor for the glyph_matrix size calculation in this window.
        Used if window contains many small images or uses proportional fonts,
        as the normal  may yield a matrix which is too small.  */