* lisp.h (WIDE_EMACS_INT): Now defaults to 1.

diff --cc src/ChangeLog
index 2b81f66d8b6c213116609407b95e3861e952621c,3f5d9e19c1e6e0dcd032f8dc262c73aff801bd03..490f5428e3a519fa8c0e84616a318196c860fad9
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,9 -1,7 +1,11 @@@
 -2011-06-02  Paul Eggert  <eggert@cs.ucla.edu>
 +2011-06-03  Paul Eggert  <eggert@cs.ucla.edu>
  
+       * lisp.h (WIDE_EMACS_INT): Now defaults to 1.
+ 
 +      * xselect.c: Use 'unsigned' more consistently.
 +      (selection_data_to_lisp_data, lisp_data_to_selection_data):
 +      Use 'unsigned' consistently when computing sizes of unsigned objects.
 +
        * fileio.c (Fverify_visited_file_modtime): Avoid time overflow
        if b->modtime has its maximal value.
  

diff --cc src/lisp.h
Simple merge