From: Paul Eggert Date: Fri, 17 Jun 2011 19:49:04 +0000 (-0700) Subject: * xdisp.c (init_iterator): Use XINT, not XFASTINT; it might be < 0. X-Git-Tag: emacs-pretest-24.0.90~104^2~473^2~63 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=76031fad32560b8a47739bd57b02c762e39ec27d;p=emacs.git * xdisp.c (init_iterator): Use XINT, not XFASTINT; it might be < 0. --- diff --git a/src/ChangeLog b/src/ChangeLog index f9ed0c6cfc7..d88aa4929ca 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2011-06-17 Paul Eggert + * xdisp.c (init_iterator): Use XINT, not XFASTINT; it might be < 0. + * composite.c: Don't truncate sizes to 'int'. (composition_gstring_p, composition_reseat_it) (composition_adjust_point): Use EMACS_INT, not int. diff --git a/src/xdisp.c b/src/xdisp.c index 5a0b0060fa3..2694bb4848d 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -2385,7 +2385,7 @@ init_iterator (struct it *it, struct window *w, is invisible. >0 means lines indented more than this value are invisible. */ it->selective = (INTEGERP (BVAR (current_buffer, selective_display)) - ? XFASTINT (BVAR (current_buffer, selective_display)) + ? XINT (BVAR (current_buffer, selective_display)) : (!NILP (BVAR (current_buffer, selective_display)) ? -1 : 0)); it->selective_display_ellipsis_p