Do not assume EMACS_INT is the same width as a pointer.

This prepares for a future patch that will prefer 64-bit EMACS_INT if
available.  That patch can be tried now, by compiling with -DWIDE_EMACS_INT,
but it is temporarily not the default so that it can be further tested.

Also, install some other fixes for problems discovered by the static
checking of GCC 4.6.0.

Fixes: debbugs:8545 debbugs:8601 debbugs:8600 debbugs:8602

diff --git a/ChangeLog b/ChangeLog
index 4e675fcca9ad3b5442d240e19524ad54ae075b3c..c7038691a32638f4a298e33cef2060f18ed8509b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-2011-05-05  Paul Eggert  <eggert@cs.ucla.edu>
+2011-05-06  Paul Eggert  <eggert@cs.ucla.edu>
 
        Use C99's va_copy to avoid undefined behavior on x86-64 GNU/Linux.
        * Makefile.in (GNULIB_MODULES): Add stdarg, for va_copy.

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 163de31f22098945759b3b15d8283b1919f37716..7ef3be46b68c980957d79208505957956241b39c 100644 (file)
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,4 +1,4 @@
-2011-05-03  Paul Eggert  <eggert@cs.ucla.edu>
+2011-05-06  Paul Eggert  <eggert@cs.ucla.edu>
 
        * numbers.texi (Integer Basics): Large integers are treated as floats.
 

diff --git a/src/callproc.c b/src/callproc.c
index 2763331bde2c74a69009b867497c1aca05f483f4..946670320cac605564e2750c4074e696ab369c43 100644 (file)
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -590,7 +590,7 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
     BLOCK_INPUT;
 
     /* vfork, and prevent local vars from being clobbered by the vfork.  */
-   {
+    {
       int volatile fd_error_volatile = fd_error;
       int volatile fd_output_volatile = fd_output;
       int volatile output_to_buffer_volatile = output_to_buffer;

diff --git a/src/doc.c b/src/doc.c
index d764b66e75e03389f413a828b1f072973b4d2d2b..89a7d322966079fe0029b55e4399d88f7d89b29a 100644 (file)
--- a/src/doc.c
+++ b/src/doc.c
@@ -506,11 +506,11 @@ store_function_docstring (Lisp_Object fun, EMACS_INT offset)
   /* The type determines where the docstring is stored.  */
 
   /* Lisp_Subrs have a slot for it.  */
-   if (SUBRP (fun))
-     {
-       intptr_t negative_offset = - offset;
-       XSUBR (fun)->doc = (char *) negative_offset;
-     }
+  if (SUBRP (fun))
+    {
+      intptr_t negative_offset = - offset;
+      XSUBR (fun)->doc = (char *) negative_offset;
+    }
 
   /* If it's a lisp form, stick it in the form.  */
   else if (CONSP (fun))