* dispextern.h (struct it.selective): Now EMACS_INT, not int.

* xdisp.c (forward_to_next_line_start)
(back_to_previous_visible_line_start)
(reseat_at_next_visible_line_start, next_element_from_buffer):
Don't arbitrarily truncate the value of 'selective' to int.

diff --git a/src/ChangeLog b/src/ChangeLog
index d88aa4929cab0fef24504098c7e3d1a98b210397..70bdbeea3b2e2ba2bdd589081efb5089a2108149 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,11 @@
 2011-06-17  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * dispextern.h (struct it.selective): Now EMACS_INT, not int.
+       * xdisp.c (forward_to_next_line_start)
+       (back_to_previous_visible_line_start)
+       (reseat_at_next_visible_line_start, next_element_from_buffer):
+       Don't arbitrarily truncate the value of 'selective' to int.
+
        * xdisp.c (init_iterator): Use XINT, not XFASTINT; it might be < 0.
 
        * composite.c: Don't truncate sizes to 'int'.

diff --git a/src/dispextern.h b/src/dispextern.h
index 0ededf33ac6c40499b9c29efb29b5661b4af2ee0..774c880fee893048855cc87ec756c35fa31eff27 100644 (file)
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -2259,7 +2259,7 @@ struct it
 
   /* -1 means selective display hides everything between a \r and the
      next newline; > 0 means hide lines indented more than that value.  */
-  int selective;
+  EMACS_INT selective;
 
   /* An enumeration describing what the next display element is
      after a call to get_next_display_element.  */

diff --git a/src/xdisp.c b/src/xdisp.c
index 2694bb4848d7859771d0dc151b909495c7abc635..c71acf8871973a4afb6c5e064e9fde8837984b92 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -5179,7 +5179,8 @@ back_to_previous_line_start (struct it *it)
 static int
 forward_to_next_line_start (struct it *it, int *skipped_p)
 {
-  int old_selective, newline_found_p, n;
+  EMACS_INT old_selective;
+  int newline_found_p, n;
   const int MAX_NEWLINE_DISTANCE = 500;
 
   /* If already on a newline, just consume it to avoid unintended
@@ -5271,7 +5272,7 @@ back_to_previous_visible_line_start (struct it *it)
         invisible.  */
       if (it->selective > 0
          && indented_beyond_p (IT_CHARPOS (*it), IT_BYTEPOS (*it),
-                               (double) it->selective)) /* iftc */
+                               it->selective))
        continue;
 
       /* Check the newline before point for invisibility.  */
@@ -5365,7 +5366,7 @@ reseat_at_next_visible_line_start (struct it *it, int on_newline_p)
   if (it->selective > 0)
     while (IT_CHARPOS (*it) < ZV
           && indented_beyond_p (IT_CHARPOS (*it), IT_BYTEPOS (*it),
-                                (double) it->selective)) /* iftc */
+                                it->selective))
       {
        xassert (IT_BYTEPOS (*it) == BEGV
                 || FETCH_BYTE (IT_BYTEPOS (*it) - 1) == '\n');
@@ -6813,7 +6814,7 @@ next_element_from_buffer (struct it *it)
                  && IT_CHARPOS (*it) + 1 < ZV
                  && indented_beyond_p (IT_CHARPOS (*it) + 1,
                                        IT_BYTEPOS (*it) + 1,
-                                       (double) it->selective)) /* iftc */
+                                       it->selective))
                {
                  success_p = next_element_from_ellipsis (it);
                  it->dpvec_char_len = -1;