* lisp.h: Include <intprops.h>, as it'll useful in later changes.

* character.c, data.c, editfns.c, insdel.c, intervals.c:
Don't include <intprops.h>, since lisp.h does.

diff --cc src/ChangeLog
index 94cfd94,708e081..fa13259
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,5 -1,9 +1,9 @@@
 -2011-06-02  Paul Eggert  <eggert@cs.ucla.edu>
 +2011-06-03  Paul Eggert  <eggert@cs.ucla.edu>
  
+       * lisp.h: Include <intprops.h>, as it'll useful in later changes.
+       * character.c, data.c, editfns.c, insdel.c, intervals.c:
+       Don't include <intprops.h>, since lisp.h does.
+ 
        Don't assume time_t can fit into int.
        * buffer.h (struct buffer.modtime): Now time_t, not int.
        * fileio.c (Fvisited_file_modtime): No need for time_t cast now.

diff --cc src/editfns.c
Simple merge

diff --cc src/lisp.h
Simple merge