Merge from trunk.

3 files changed, 32 insertions, 22 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index fe8df6ffe41..275856c44e0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -421,6 +421,18 @@
         (gs_load): Use printmax_t to print the widest integers possible.
         Check for integer overflow when computing image height and width.
 
+2011-08-18  Eli Zaretskii  <eliz@gnu.org>
+
+        * dispextern.h (struct bidi_it): Move disp_pos and disp_prop_p
+        members before the level stack, so they would be saved and
+        restored when copying iterator state.  Fixes incorrect reordering
+        around TABs covered by display properties.
+
+2011-08-18  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * process.c (Fnetwork_interface_list): Correctly determine buffer
+        size.
+
 2011-08-17  Chong Yidong  <cyd@stupidchicken.com>
 
         * eval.c (internal_condition_case, internal_condition_case_1)
diff --git a/src/dispextern.h b/src/dispextern.h
index 14f2b3ac631..9cefea27e1c 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -1860,6 +1860,9 @@ struct bidi_it {
   EMACS_INT ignore_bn_limit;    /* position until which to ignore BNs */
   bidi_dir_t sor;               /* direction of start-of-run in effect */
   int scan_dir;                 /* direction of text scan, 1: forw, -1: back */
+  EMACS_INT disp_pos;           /* position of display string after ch */
+  int disp_prop_p;              /* if non-zero, there really is a
+                                   `display' property/string at disp_pos */
   int stack_idx;                /* index of current data on the stack */
   /* Note: Everything from here on is not copied/saved when the bidi
      iterator state is saved, pushed, or popped.  So only put here
@@ -1868,9 +1871,6 @@ struct bidi_it {
   struct bidi_string_data string;       /* string to reorder */
   bidi_dir_t paragraph_dir;     /* current paragraph direction */
   EMACS_INT separator_limit;    /* where paragraph separator should end */
-  EMACS_INT disp_pos;           /* position of display string after ch */
-  int disp_prop_p;              /* if non-zero, there really is a
-                                   `display' property/string at disp_pos */
   unsigned first_elt : 1;       /* if non-zero, examine current char first */
   unsigned new_paragraph : 1;   /* if non-zero, we expect a new paragraph */
   unsigned frame_window_p : 1;  /* non-zero if displaying on a GUI frame */
diff --git a/src/process.c b/src/process.c
index 9f3bb0e5803..08da53b4a40 100644
--- a/src/process.c
+++ b/src/process.c
@@ -3581,33 +3581,31 @@ format; see the description of ADDRESS in `make-network-process'.  */)
   if (s < 0)
     return Qnil;
 
- again:
-
-  buf = xpalloc (buf, &buf_size, sizeof *ifreq, INT_MAX, 1);
-  ifconf.ifc_buf = buf;
-  ifconf.ifc_len = buf_size;
-  if (ioctl (s, SIOCGIFCONF, &ifconf))
+  do
     {
-      close (s);
-      xfree (buf);
-      return Qnil;
+      buf = xpalloc (buf, &buf_size, 1, INT_MAX, 1);
+      ifconf.ifc_buf = buf;
+      ifconf.ifc_len = buf_size;
+      if (ioctl (s, SIOCGIFCONF, &ifconf))
+        {
+          close (s);
+          xfree (buf);
+          return Qnil;
+        }
     }
-
-  if (ifconf.ifc_len == buf_size)
-    goto again;
+  while (ifconf.ifc_len == buf_size);
 
   close (s);
 
   res = Qnil;
-  for (ifreq = ifconf.ifc_req;
-       (char *) ifreq < (char *) (ifconf.ifc_req) + ifconf.ifc_len;
-       )
+  ifreq = ifconf.ifc_req;
+  while ((char *) ifreq < (char *) ifconf.ifc_req + ifconf.ifc_len)
     {
       struct ifreq *ifq = ifreq;
 #ifdef HAVE_STRUCT_IFREQ_IFR_ADDR_SA_LEN
-#define SIZEOF_IFREQ(sif)                                               \
-      ((sif)->ifr_addr.sa_len < sizeof(struct sockaddr) ?               \
-       sizeof((*sif)) : sizeof ((sif)->ifr_name) + sif->ifr_addr.sa_len)
+#define SIZEOF_IFREQ(sif)                                               \
+      ((sif)->ifr_addr.sa_len < sizeof (struct sockaddr)                \
+       ? sizeof (*(sif)) : sizeof ((sif)->ifr_name) + (sif)->ifr_addr.sa_len)
 
       int len = SIZEOF_IFREQ (ifq);
 #else
@@ -3615,7 +3613,7 @@ format; see the description of ADDRESS in `make-network-process'.  */)
 #endif
       char namebuf[sizeof (ifq->ifr_name) + 1];
       i += len;
-      ifreq = (struct ifreq*) ((char*) ifreq + len);
+      ifreq = (struct ifreq *) ((char *) ifreq + len);
 
       if (ifq->ifr_addr.sa_family != AF_INET)
         continue;