Merge from emacs--rel--22

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-943

8 files changed, 225 insertions, 14 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index d1507f7edde..f55e4ac786c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,46 @@
+2007-12-05  Magnus Henoch  <mange@freemail.hu>
+
+        * process.c (make_process): Initialize pty_flag to 0.
+
+2007-12-05  Jason Rumney  <jasonr@gnu.org>
+
+        * image.c (xbm_load) [WINDOWSNT]: Shuffle the bits of directly
+        specified XBMs.
+
+2007-12-05  Richard Stallman  <rms@gnu.org>
+
+        * xdisp.c (syms_of_xdisp) <scroll-conservatively>: Doc fix.
+
+2007-12-05  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * mac.c (cfsockets_for_select) [MAC_OSX && SELECT_USE_CFSOCKET]:
+        New variable.
+        (mac_try_close_socket) [MAC_OSX]: New function.
+        [MAC_OSX] (sys_select) [SELECT_USE_CFSOCKET]:
+        Update cfsockets_for_select.  Replace invalid CFRunLoop source.
+
+        * sysdep.c (emacs_close) [MAC_OSX && HAVE_CARBON]:
+        Use mac_try_close_socket.
+
+2007-12-05  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * unexmacosx.c (unrelocate): New argument BASE.  Use it instead of
+        reloc_base.
+        (copy_dysymtab): Compute relocation base here.
+        (rebase_reloc_address) [__ppc64__]: New function.
+        (copy_dysymtab) [__ppc64__]: Use it if relocation base needs to be
+        changed.
+
+2007-12-05  Jason Rumney  <jasonr@gnu.org>
+
+        * w32proc.c (sys_spawnve): Quote args with wildcards.
+
+2007-12-05  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * unexmacosx.c (copy_data_segment): Also copy __gcc_except_tab and
+        __objc_* sections.
+        (unrelocate) [_LP64]: Set relocation base to address of data segment.
+
 2007-12-05  Michael Albinus  <michael.albinus@gmx.de>
 
         * dbusbind.c (xd_read_message): Return value is a Lisp_Object.
diff --git a/src/image.c b/src/image.c
index 91be3f4b57e..a9b1e9835ed 100644
--- a/src/image.c
+++ b/src/image.c
@@ -3128,6 +3128,8 @@ convert_mono_to_color_image (f, img, foreground, background)
   release_frame_dc (f, hdc);
   old_prev = SelectObject (old_img_dc, img->pixmap);
   new_prev = SelectObject (new_img_dc, new_pixmap);
+  /* Windows convention for mono bitmaps is black = background,
+     white = foreground.  */
   SetTextColor (new_img_dc, background);
   SetBkColor (new_img_dc, foreground);
 
@@ -3523,6 +3525,19 @@ xbm_load (f, img)
           else
             bits = XBOOL_VECTOR (data)->data;
 
+#ifdef WINDOWSNT
+          {
+            char *invertedBits;
+            int nbytes, i;
+            /* Windows mono bitmaps are reversed compared with X.  */
+            invertedBits = bits;
+            nbytes = (img->width + BITS_PER_CHAR - 1) / BITS_PER_CHAR 
+              * img->height;
+            bits = (char *) alloca(nbytes);
+            for (i = 0; i < nbytes; i++)
+              bits[i] = XBM_BIT_SHUFFLE (invertedBits[i]);
+          }
+#endif
           /* Create the pixmap.  */
 
           Create_Pixmap_From_Bitmap_Data (f, img, bits,
diff --git a/src/mac.c b/src/mac.c
index 75a606b60b3..9c1a08075f8 100644
--- a/src/mac.c
+++ b/src/mac.c
@@ -5004,6 +5004,10 @@ extern int noninteractive;
 #if SELECT_USE_CFSOCKET
 #define SELECT_TIMEOUT_THRESHOLD_RUNLOOP 0.2
 
+/* Dictionary of file descriptors vs CFSocketRef's allocated in
+   sys_select.  */
+static CFMutableDictionaryRef cfsockets_for_select;
+
 static void
 socket_callback (s, type, address, data, info)
      CFSocketRef s;
@@ -5089,6 +5093,43 @@ select_and_poll_event (nfds, rfds, wfds, efds, timeout)
     return 0;
 }
 
+/* Clean up the CFSocket associated with the file descriptor FD in
+   case the same descriptor is used in other threads later.  If no
+   CFSocket is associated with FD, then return 0 without closing FD.
+   Otherwise, return 1 with closing FD.  */
+
+int
+mac_try_close_socket (fd)
+     int fd;
+{
+#if SELECT_USE_CFSOCKET
+  if (cfsockets_for_select)
+    {
+      void *key = (void *) fd;
+      CFSocketRef socket =
+        (CFSocketRef) CFDictionaryGetValue (cfsockets_for_select, key);
+
+      if (socket)
+        {
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1020
+          CFOptionFlags flags = CFSocketGetSocketFlags (socket);
+
+          if (!(flags & kCFSocketCloseOnInvalidate))
+            CFSocketSetSocketFlags (socket, flags | kCFSocketCloseOnInvalidate);
+#endif
+          BLOCK_INPUT;
+          CFSocketInvalidate (socket);
+          CFDictionaryRemoveValue (cfsockets_for_select, key);
+          UNBLOCK_INPUT;
+
+          return 1;
+        }
+    }
+#endif
+
+  return 0;
+}
+
 int
 sys_select (nfds, rfds, wfds, efds, timeout)
      int nfds;
@@ -5165,6 +5206,11 @@ sys_select (nfds, rfds, wfds, efds, timeout)
               CFDictionaryCreateMutable (NULL, 0, NULL,
                                          &kCFTypeDictionaryValueCallBacks);
 
+          if (cfsockets_for_select == NULL)
+            cfsockets_for_select =
+              CFDictionaryCreateMutable (NULL, 0, NULL,
+                                         &kCFTypeDictionaryValueCallBacks);
+
           for (minfd = 1; ; minfd++) /* nfds-1 works as a sentinel.  */
             if (FD_ISSET (minfd, rfds) || (wfds && FD_ISSET (minfd, wfds)))
               break;
@@ -5176,7 +5222,7 @@ sys_select (nfds, rfds, wfds, efds, timeout)
                 CFRunLoopSourceRef source =
                   (CFRunLoopSourceRef) CFDictionaryGetValue (sources, key);
 
-                if (source == NULL)
+                if (source == NULL || !CFRunLoopSourceIsValid (source))
                   {
                     CFSocketRef socket =
                       CFSocketCreateWithNative (NULL, fd,
@@ -5186,11 +5232,12 @@ sys_select (nfds, rfds, wfds, efds, timeout)
 
                     if (socket == NULL)
                       continue;
+                    CFDictionarySetValue (cfsockets_for_select, key, socket);
                     source = CFSocketCreateRunLoopSource (NULL, socket, 0);
                     CFRelease (socket);
                     if (source == NULL)
                       continue;
-                    CFDictionaryAddValue (sources, key, source);
+                    CFDictionarySetValue (sources, key, source);
                     CFRelease (source);
                   }
                 CFRunLoopAddSource (runloop, source, kCFRunLoopDefaultMode);
diff --git a/src/process.c b/src/process.c
index dc96bc27e78..0204388e672 100644
--- a/src/process.c
+++ b/src/process.c
@@ -631,6 +631,7 @@ make_process (name)
   p->tick = 0;
   p->update_tick = 0;
   p->pid = 0;
+  p->pty_flag = 0;
   p->raw_status_new = 0;
   p->status = Qrun;
   p->mark = Fmake_marker ();
diff --git a/src/sysdep.c b/src/sysdep.c
index 81850919dd3..d1f378a3f87 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -3486,6 +3486,15 @@ emacs_close (fd)
   int did_retry = 0;
   register int rtnval;
 
+#if defined (MAC_OSX) && defined (HAVE_CARBON)
+  {
+    extern int mac_try_close_socket P_ ((int));
+
+    if (mac_try_close_socket (fd))
+      return 0;
+  }
+#endif
+
   while ((rtnval = close (fd)) == -1
          && (errno == EINTR))
     did_retry = 1;
diff --git a/src/unexmacosx.c b/src/unexmacosx.c
index 3646aec6983..dadc19d52e3 100644
--- a/src/unexmacosx.c
+++ b/src/unexmacosx.c
@@ -819,7 +819,9 @@ copy_data_segment (struct load_command *lc)
                || strncmp (sectp->sectname, "__la_sym_ptr2", 16) == 0
                || strncmp (sectp->sectname, "__dyld", 16) == 0
                || strncmp (sectp->sectname, "__const", 16) == 0
-               || strncmp (sectp->sectname, "__cfstring", 16) == 0)
+               || strncmp (sectp->sectname, "__cfstring", 16) == 0
+               || strncmp (sectp->sectname, "__gcc_except_tab", 16) == 0
+               || strncmp (sectp->sectname, "__objc_", 7) == 0)
         {
           if (!unexec_copy (sectp->offset, old_file_offset, sectp->size))
             unexec_error ("cannot copy section %s", sectp->sectname);
@@ -898,12 +900,13 @@ copy_symtab (struct load_command *lc, long delta)
 
 /* Fix up relocation entries. */
 static void
-unrelocate (const char *name, off_t reloff, int nrel)
+unrelocate (const char *name, off_t reloff, int nrel, vm_address_t base)
 {
   int i, unreloc_count;
   struct relocation_info reloc_info;
   struct scattered_relocation_info *sc_reloc_info
     = (struct scattered_relocation_info *) &reloc_info;
+  vm_address_t location;
 
   for (unreloc_count = 0, i = 0; i < nrel; i++)
     {
@@ -917,14 +920,15 @@ unrelocate (const char *name, off_t reloff, int nrel)
         switch (reloc_info.r_type)
           {
           case GENERIC_RELOC_VANILLA:
-            if (reloc_info.r_address >= data_segment_scp->vmaddr
-                && reloc_info.r_address < (data_segment_scp->vmaddr
-                                           + data_segment_scp->vmsize))
+            location = base + reloc_info.r_address;
+            if (location >= data_segment_scp->vmaddr
+                && location < (data_segment_scp->vmaddr
+                               + data_segment_scp->vmsize))
               {
                 off_t src_off = data_segment_old_fileoff
-                  + reloc_info.r_address - data_segment_scp->vmaddr;
+                  + (location - data_segment_scp->vmaddr);
                 off_t dst_off = data_segment_scp->fileoff
-                  + reloc_info.r_address - data_segment_scp->vmaddr;
+                  + (location - data_segment_scp->vmaddr);
 
                 if (!unexec_copy (dst_off, src_off, 1 << reloc_info.r_length))
                   unexec_error ("unrelocate: %s:%d cannot copy original value",
@@ -955,15 +959,73 @@ unrelocate (const char *name, off_t reloff, int nrel)
             unreloc_count, nrel, name);
 }
 
+#if __ppc64__
+/* Rebase r_address in the relocation table.  */
+static void
+rebase_reloc_address (off_t reloff, int nrel, long linkedit_delta, long diff)
+{
+  int i;
+  struct relocation_info reloc_info;
+  struct scattered_relocation_info *sc_reloc_info
+    = (struct scattered_relocation_info *) &reloc_info;
+
+  for (i = 0; i < nrel; i++, reloff += sizeof (reloc_info))
+    {
+      if (lseek (infd, reloff - linkedit_delta, L_SET)
+          != reloff - linkedit_delta)
+        unexec_error ("rebase_reloc_table: cannot seek to reloc_info");
+      if (!unexec_read (&reloc_info, sizeof (reloc_info)))
+        unexec_error ("rebase_reloc_table: cannot read reloc_info");
+
+      if (sc_reloc_info->r_scattered == 0
+          && reloc_info.r_type == GENERIC_RELOC_VANILLA)
+        {
+          reloc_info.r_address -= diff;
+          if (!unexec_write (reloff, &reloc_info, sizeof (reloc_info)))
+            unexec_error ("rebase_reloc_table: cannot write reloc_info");
+        }
+    }
+}
+#endif
+
 /* Copy a LC_DYSYMTAB load command from the input file to the output
    file, adjusting the file offset fields.  */
 static void
 copy_dysymtab (struct load_command *lc, long delta)
 {
   struct dysymtab_command *dstp = (struct dysymtab_command *) lc;
+  vm_address_t base;
 
-  unrelocate ("local", dstp->locreloff, dstp->nlocrel);
-  unrelocate ("external", dstp->extreloff, dstp->nextrel);
+#ifdef _LP64
+#if __ppc64__
+  {
+    int i;
+
+    base = 0;
+    for (i = 0; i < nlc; i++)
+      if (lca[i]->cmd == LC_SEGMENT)
+        {
+          struct segment_command *scp = (struct segment_command *) lca[i];
+
+          if (scp->vmaddr + scp->vmsize > 0x100000000
+              && (scp->initprot & VM_PROT_WRITE) != 0)
+            {
+              base = data_segment_scp->vmaddr;
+              break;
+            }
+        }
+  }
+#else
+  /* First writable segment address.  */
+  base = data_segment_scp->vmaddr;
+#endif
+#else
+  /* First segment address in the file (unless MH_SPLIT_SEGS set). */
+  base = 0;
+#endif
+
+  unrelocate ("local", dstp->locreloff, dstp->nlocrel, base);
+  unrelocate ("external", dstp->extreloff, dstp->nextrel, base);
 
   if (dstp->nextrel > 0) {
     dstp->extreloff += delta;
@@ -982,6 +1044,29 @@ copy_dysymtab (struct load_command *lc, long delta)
     unexec_error ("cannot write symtab command to header");
 
   curr_header_offset += lc->cmdsize;
+
+#if __ppc64__
+  /* Check if the relocation base needs to be changed.  */
+  if (base == 0)
+    {
+      vm_address_t newbase = 0;
+      int i;
+
+      for (i = 0; i < num_unexec_regions; i++)
+        if (unexec_regions[i].range.address + unexec_regions[i].range.size
+            > 0x100000000)
+          {
+            newbase = data_segment_scp->vmaddr;
+            break;
+          }
+
+      if (newbase)
+        {
+          rebase_reloc_address (dstp->locreloff, dstp->nlocrel, delta, newbase);
+          rebase_reloc_address (dstp->extreloff, dstp->nextrel, delta, newbase);
+        }
+    }
+#endif
 }
 
 /* Copy a LC_TWOLEVEL_HINTS load command from the input file to the output
diff --git a/src/w32proc.c b/src/w32proc.c
index c21d589c525..a14a8ee384c 100644
--- a/src/w32proc.c
+++ b/src/w32proc.c
@@ -781,7 +781,14 @@ sys_spawnve (int mode, char *cmdname, char **argv, char **envp)
      variable in their environment.  */
   char ppid_env_var_buffer[64];
   char *extra_env[] = {ppid_env_var_buffer, NULL};
-  char *sepchars = " \t";
+  /* These are the characters that cause an argument to need quoting.
+     Arguments with whitespace characters need quoting to prevent the
+     argument being split into two or more. Arguments with wildcards
+     are also quoted, for consistency with posix platforms, where wildcards
+     are not expanded if we run the program directly without a shell.
+     Some extra whitespace characters need quoting in Cygwin programs,
+     so this list is conditionally modified below.  */
+  char *sepchars = " \t*?";
 
   /* We don't care about the other modes */
   if (mode != _P_NOWAIT)
diff --git a/src/xdisp.c b/src/xdisp.c
index eb0fda1fa91..22f51859eff 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -24160,8 +24160,12 @@ If you want scrolling to always be a line at a time, you should set
 
   DEFVAR_INT ("scroll-conservatively", &scroll_conservatively,
     doc: /* *Scroll up to this many lines, to bring point back on screen.
-A value of zero means to scroll the text to center point vertically
-in the window.  */);
+If point moves off-screen, redisplay will scroll by up to
+`scroll-conservatively' lines in order to bring point just barely
+onto the screen again.   If that cannot be done, then redisplay
+recenters point as usual.
+
+A value of zero means always recenter point if it moves off screen.  */);
   scroll_conservatively = 0;
 
   DEFVAR_INT ("scroll-margin", &scroll_margin,