Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 662-669)

   - Update from CVS
   - Fix read-only prompt problem in isearch
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 207-208)

   - Merge from emacs--devo--0
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-184

3 files changed, 102 insertions, 39 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index af6d98afb2a..2c241cd2a51 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,12 +1,90 @@
+2007-03-11  Sam Steingold  <sds@gnu.org>
+
+        * process.c (sigchld_handler): Sleep before wait3 to avoid a busyloop.
+
+2007-03-11  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macfns.c (Fx_server_vendor): Change vendor string to "Apple Inc.".
+
+2007-03-10  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macterm.c [USE_CARBON_EVENTS] (mac_handle_mouse_event): Ignore
+        mouse wheel movement on title bar or tool bar.
+
+2007-03-10  Chong Yidong  <cyd@stupidchicken.com>
+
+        * keyboard.c (help_form_saved_window_configs): New var.
+        (read_char_help_form_unwind): New function.
+        (read_char): Don't restore window configuration if a mouse click
+        arrives while the help form is being displayed.
+
+2007-03-10  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (redisplay_window): Don't automatically select a new window
+        start for a contination line during mouse-click.
+
+2007-03-09  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * xterm.c (handle_one_xevent): Ignore buttons > 3 for the tool bar.
+
+2007-03-09  Juanma Barranquero  <lekktu@gmail.com>
+
+        * keymap.c (Fdescribe_buffer_bindings): Check that BUFFER is valid.
+
+2007-03-08  Richard Stallman  <rms@gnu.org>
+
+        * keyboard.c (syms_of_keyboard): Doc fix.
+
+2007-03-08  Chong Yidong  <cyd@stupidchicken.com>
+
+        * minibuf.c (Ftry_completion): Don't short circuit if
+        completion-ignore-case is non-nil.
+
+2007-03-07  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macfns.c (mac_set_scroll_bar_width, mac_frame_parm_handlers):
+        Undo 2006-03-06 changes.
+
+        * macterm.c (XTset_vertical_scroll_bar) [MAC_OSX]: Don't show scroll
+        bar if its width is smaller than that of Aqua small scroll bar.
+
+2007-03-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * minibuf.c (read_minibuf): Bind inhibit-read-only a bit longer so as
+        to handle correctly prompts with read-only property.
+
+2007-03-06  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * sound.c (wav_play): Check header->data_length to see how much we
+        shall read.
+        (alsa_period_size): Convert ALSA period size in frames to bytes.
+        (alsa_write): Return if frames is zero.
+
+2007-03-06  Kenichi Handa  <handa@m17n.org>
+
+        * xselect.c (Vselection_coding_system): Documentation improved.
+
+2007-03-05  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macterm.c (x_scroll_bar_create, XTread_socket): Replace #if
+        USE_TOOLKIT_SCROLL_BARS with #ifdef USE_TOOLKIT_SCROLL_BARS.
+        (x_set_window_size): Call SET_FRAME_GARBAGED.  Clear window if
+        internal border width has changed.
+
+        * macterm.h (struct mac_output): New member `internal_border_width'.
+
+2007-03-04  Richard Stallman  <rms@gnu.org>
+
+        * window.c (Fdisplay_buffer): Doc fix.
+
 2007-03-03  Glenn Morris  <rgm@gnu.org>
 
         * Makefile.in: Don't clear out LIB_X11_LIB, since XFT_LIBS does
         not include -lX11 on Solaris.
 
-2007-03-02  Stuart D. Herring <herring@lanl.gov>
+2007-03-02  Stuart D. Herring  <herring@lanl.gov>
 
-        * keymap.c (Fkey_binding): Don't consider two-element lists as
-        events.
+        * keymap.c (Fkey_binding): Don't consider one-element lists as events.
 
 2007-03-01  Kenichi Handa  <handa@m17n.org>
 
@@ -35,8 +113,8 @@
         (x_scroll_bar_create, XTset_vertical_scroll_bar)
         [USE_TOOLKIT_SCROLL_BARS]: Initialize bar->min_handle.
 
-        * macterm.h (struct scroll_bar) [USE_TOOLKIT_SCROLL_BARS]: New
-        member `min_handle'.
+        * macterm.h (struct scroll_bar) [USE_TOOLKIT_SCROLL_BARS]:
+        New member `min_handle'.
 
 2007-02-23  Kim F. Storm  <storm@cua.dk>
 
@@ -59,11 +137,11 @@
         (mac_flush_display_optional) [USE_CG_DRAWING]: New function.
         (x_redisplay_interface) [USE_CG_DRAWING]: Set it as handler for
         flush_display_optional.
-        [USE_TOOLKIT_SCROLL_BARS] (x_scroll_bar_handle_press): New
-        argument MOUSE_POS.  All uses changed.  Set bar->dragging to
+        [USE_TOOLKIT_SCROLL_BARS] (x_scroll_bar_handle_press):
+        New argument MOUSE_POS.  All uses changed.  Set bar->dragging to
         negative integer if scroll bar handle is pressed.
-        [USE_TOOLKIT_SCROLL_BARS] (x_scroll_bar_handle_release): Negative
-        bar->dragging means scroll bar handle is not dragged.
+        [USE_TOOLKIT_SCROLL_BARS] (x_scroll_bar_handle_release):
+        Negative bar->dragging means scroll bar handle is not dragged.
         [USE_TOOLKIT_SCROLL_BARS] (x_scroll_bar_handle_drag): Get initial
         offset of scroll bar handle from negative bar->dragging.
         (XTread_socket) [USE_TOOLKIT_SCROLL_BARS]: Modifiers for scroll
@@ -98,8 +176,7 @@
 
         * w32menu.c (current_popup_menu): Make available globally.
         (menubar_selection_callback): Free menu strings before pushing the
-        menu event into the keyboard buffer.  Remove
-        menu_command_in_progress.
+        menu event into the keyboard buffer.  Remove menu_command_in_progress.
 
         * w32fns.c (current_popup_menu): Use from w32menu.c.
         (w32_wnd_proc) [WM_EXITMENULOOP, WM_TIMER]: Use menubar_active
@@ -369,8 +446,8 @@
 
 2007-01-14  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
-        * macmenu.c (create_and_show_dialog) [TARGET_API_MAC_CARBON]: Use
-        DisableControl for disabled items.  Set default button to first
+        * macmenu.c (create_and_show_dialog) [TARGET_API_MAC_CARBON]:
+        Use DisableControl for disabled items.  Set default button to first
         enabled one.  Use icon of application in execution.
 
 2007-01-13  Eli Zaretskii  <eliz@gnu.org>
diff --git a/src/macfns.c b/src/macfns.c
index 072bc6f50b5..888c3bdf8e8 100644
--- a/src/macfns.c
+++ b/src/macfns.c
@@ -1909,24 +1909,6 @@ x_set_scroll_bar_default_width (f)
 #endif /* not MAC_OSX */
 }
 
-void
-mac_set_scroll_bar_width (f, arg, oldval)
-     struct frame *f;
-     Lisp_Object arg, oldval;
-{
-#ifdef MAC_OSX
-  if (INTEGERP (arg) && XINT (arg) > 0)
-    {
-      if (XINT (arg) < (MAC_AQUA_SMALL_VERTICAL_SCROLL_BAR_WIDTH
-                        + MAC_AQUA_VERTICAL_SCROLL_BAR_WIDTH) / 2)
-        XSETINT (arg, MAC_AQUA_SMALL_VERTICAL_SCROLL_BAR_WIDTH);
-      else
-        XSETINT (arg, MAC_AQUA_VERTICAL_SCROLL_BAR_WIDTH);
-    }
-#endif
-  x_set_scroll_bar_width (f, arg, oldval);
-}
-
 static void
 mac_set_font (f, arg, oldval)
      struct frame *f;
@@ -3052,7 +3034,7 @@ If omitted or nil, that stands for the selected frame's display.  */)
      (display)
      Lisp_Object display;
 {
-  return build_string ("Apple Computers");
+  return build_string ("Apple Inc.");
 }
 
 DEFUN ("x-server-version", Fx_server_version, Sx_server_version, 0, 1, 0,
@@ -4677,7 +4659,7 @@ frame_parm_handler mac_frame_parm_handlers[] =
   x_set_menu_bar_lines,
   x_set_mouse_color,
   x_explicitly_set_name,
-  mac_set_scroll_bar_width,
+  x_set_scroll_bar_width,
   x_set_title,
   x_set_unsplittable,
   x_set_vertical_scroll_bars,
diff --git a/src/process.c b/src/process.c
index 4611ce2c05c..f3162c9d3e5 100644
--- a/src/process.c
+++ b/src/process.c
@@ -6401,12 +6401,16 @@ sigchld_handler (signo)
 #define WUNTRACED 0
 #endif /* no WUNTRACED */
       /* Keep trying to get a status until we get a definitive result.  */
-      do
-        {
-          errno = 0;
-          pid = wait3 (&w, WNOHANG | WUNTRACED, 0);
-        }
-      while (pid < 0 && errno == EINTR);
+      while (1) {
+        errno = 0;
+        pid = wait3 (&w, WNOHANG | WUNTRACED, 0);
+        if (! (pid < 0 && errno == EINTR))
+          break;
+        /* avoid a busyloop: wait3 is a system call, so we do not want
+           to prevent the kernel from actually sending SIGCHLD to emacs
+           by asking for it all the time */
+        sleep (1);
+      }
 
       if (pid <= 0)
         {