Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-285
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-286
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-287
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-288
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-102
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-558

16 files changed, 537 insertions, 74 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 1a58d0b5905..5acc6313bbb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,54 @@
+2006-05-19  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * frame.c (x_set_border_width): Remove #ifndef MAC_OS.
+
+        * image.c [MAC_OS] (gif_load): Allocate Lisp string first.
+
+        * macfns.c (Fx_focus_frame): Don't check dpyinfo->x_focus_frame.
+
+        * macterm.c (XTread_socket) [TARGET_API_MAC_CARBON && MAC_OSX]:
+        Forward keyUp events to toolbox_dispatcher.
+
+        * window.c (foreach_window): Check WINDOWP (FRAME_ROOT_WINDOW (f)).
+
+2006-05-18  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * config.in: Regenerated (HAVE_ALSA).
+
+        * sound.c (alsa_sound_perror, alsa_open, alsa_period_size)
+        (alsa_configure, alsa_close, alsa_choose_format, alsa_write)
+        (snd_error_quiet, alsa_init): New functions.
+        (vox_init): Return 0 if unable to open device.
+        (Fplay_sound_internal): Test for alsa first and use vox (oss) as
+        a fallback.
+        (struct sound_device): Add period_size.
+        (wav_play, au_play): Use period_size if set.
+
+        * Makefile.in (CFLAGS_SOUND): New flags for ALSA
+        (ALL_CFLAGS): Add CFLAGS_SOUND
+
+2006-05-18  Kenichi Handa  <handa@m17n.org>
+
+        * callproc.c (Fcall_process): Reject encoding arguments by
+        ascii-incompatible coding systems (e.g. utf-16).
+
+        * coding.c (Qascii_incompatible): New variable.
+        (syms_of_coding): Setup Qascii_incompatible.
+        (setup_coding_system): Be sure to initialize coding->common_flags.
+        Check `ascii-incompatible' property of the coding system.
+
+        * coding.h (CODING_ASCII_INCOMPATIBLE_MASK): New macro.
+
+2006-05-18  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (display_tool_bar_line): Restore entire tool-bar geometry when
+        backtracking in case last image doesn't fit on line.
+
+2006-05-18  MIYOSHI Masanori <miyoshi@meadowy.org>  (tiny change)
+
+        * xdisp.c (display_tool_bar_line): Don't adjust tool-bar height by more than
+        height of one frame default line.
+
 2006-05-16  Kim F. Storm  <storm@cua.dk>
 
         * xterm.c (handle_one_xevent): Check that f is not NULL before
@@ -17012,8 +17063,7 @@
         (Fapropos_internal): Initialize them and clear them out.
         Don't GCPRO them.
 
-        * buffer.c (syms_of_buffer) <scroll-up-aggressively, scroll-down-aggressively>:
-        Doc fixes.
+        * buffer.c (syms_of_buffer) <scroll-up|down-aggressively>: Doc fixes.
 
         * lisp.h: New misc type Lisp_Save_Value.
         (enum Lisp_Misc_Type): Add Lisp_Misc_Save_Value.
diff --git a/src/Makefile.in b/src/Makefile.in
index d5ae100dc0f..89096b93b2d 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -280,7 +280,7 @@ TOOLKIT_DEFINES =
 
 /* C_SWITCH_X_SITE must come before C_SWITCH_X_MACHINE and C_SWITCH_X_SYSTEM
    since it may have -I options that should override those two.  */
-ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(TOOLKIT_DEFINES) $(MYCPPFLAGS) -I. -I${srcdir} C_SWITCH_MACHINE C_SWITCH_SYSTEM C_SWITCH_SITE C_SWITCH_X_SITE C_SWITCH_X_MACHINE C_SWITCH_X_SYSTEM C_SWITCH_SYSTEM_TEMACS ${CFLAGS}
+ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(TOOLKIT_DEFINES) $(MYCPPFLAGS) -I. -I${srcdir} C_SWITCH_MACHINE C_SWITCH_SYSTEM C_SWITCH_SITE C_SWITCH_X_SITE C_SWITCH_X_MACHINE C_SWITCH_X_SYSTEM C_SWITCH_SYSTEM_TEMACS ${CFLAGS_SOUND} ${CFLAGS}
 .c.o:
         $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $<
 
@@ -453,6 +453,7 @@ LIBX= $(LIBXMENU) LD_SWITCH_X_SITE -lX10 LIBX10_MACHINE LIBX10_SYSTEM
 #endif /* not HAVE_X_WINDOWS */
 
 LIBSOUND= @LIBSOUND@
+CFLAGS_SOUND= @CFLAGS_SOUND@
 
 #ifndef ORDINARY_LINK
 /* Fix linking if compiled with GCC.  */
diff --git a/src/buffer.c b/src/buffer.c
index baa977ab853..6317c14d393 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -2495,10 +2495,10 @@ swap_out_buffer_local_variables (b)
    Return the number found, and store them in a vector in *VEC_PTR.
    Store in *LEN_PTR the size allocated for the vector.
    Store in *NEXT_PTR the next position after POS where an overlay starts,
-     or ZV if there are no more overlays.
+     or ZV if there are no more overlays between POS and ZV.
    Store in *PREV_PTR the previous position before POS where an overlay ends,
      or where an overlay starts which ends at or after POS;
-     or BEGV if there are no such overlays.
+     or BEGV if there are no such overlays from BEGV to POS.
    NEXT_PTR and/or PREV_PTR may be 0, meaning don't store that info.
 
    *VEC_PTR and *LEN_PTR should contain a valid vector and size
@@ -3969,7 +3969,8 @@ or between BEG and END.  */)
 DEFUN ("next-overlay-change", Fnext_overlay_change, Snext_overlay_change,
        1, 1, 0,
        doc: /* Return the next position after POS where an overlay starts or ends.
-If there are no more overlay boundaries after POS, return (point-max).  */)
+If there are no overlay boundaries from POS to (point-max),
+the value is (point-max).  */)
      (pos)
      Lisp_Object pos;
 {
@@ -4010,7 +4011,8 @@ If there are no more overlay boundaries after POS, return (point-max).  */)
 DEFUN ("previous-overlay-change", Fprevious_overlay_change,
        Sprevious_overlay_change, 1, 1, 0,
        doc: /* Return the previous position before POS where an overlay starts or ends.
-If there are no more overlay boundaries before POS, return (point-min).  */)
+If there are no overlay boundaries from (point-min) to POS,
+the value is (point-min).  */)
      (pos)
      Lisp_Object pos;
 {
diff --git a/src/callproc.c b/src/callproc.c
index 25c79bf926c..fb187d757d5 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -302,6 +302,8 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
               val = Qnil;
           }
         setup_coding_system (Fcheck_coding_system (val), &argument_coding);
+        if (argument_coding.common_flags & CODING_ASCII_INCOMPATIBLE_MASK)
+          setup_coding_system (Qraw_text, &argument_coding);
         if (argument_coding.eol_type == CODING_EOL_UNDECIDED)
           argument_coding.eol_type = system_eol_type;
       }
diff --git a/src/coding.c b/src/coding.c
index a83aadfd468..659b52b93fb 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -365,6 +365,7 @@ Lisp_Object Qno_conversion, Qundecided;
 Lisp_Object Qcoding_system_history;
 Lisp_Object Qsafe_chars;
 Lisp_Object Qvalid_codes;
+Lisp_Object Qascii_incompatible;
 
 extern Lisp_Object Qinsert_file_contents, Qwrite_region;
 Lisp_Object Qcall_process, Qcall_process_region;
@@ -3621,7 +3622,10 @@ setup_coding_system (coding_system, coding)
         = CODING_REQUIRE_DECODING_MASK | CODING_REQUIRE_ENCODING_MASK;
     }
   else
-    coding->eol_type = CODING_EOL_LF;
+    {
+      coding->common_flags = 0;
+      coding->eol_type = CODING_EOL_LF;
+    }
 
   coding_type = XVECTOR (coding_spec)->contents[0];
   /* Try short cut.  */
@@ -3681,6 +3685,12 @@ setup_coding_system (coding_system, coding)
   if (!NILP (val))
     coding->composing = COMPOSITION_NO;
 
+  /* If the coding system is ascii-incompatible, record it in
+     common_flags.   */
+  val = Fplist_get (plist, Qascii_incompatible);
+  if (! NILP (val))
+    coding->common_flags |= CODING_ASCII_INCOMPATIBLE_MASK;
+
   switch (XFASTINT (coding_type))
     {
     case 0:
@@ -7820,6 +7830,9 @@ syms_of_coding ()
   Qvalid_codes = intern ("valid-codes");
   staticpro (&Qvalid_codes);
 
+  Qascii_incompatible = intern ("ascii-incompatible");
+  staticpro (&Qascii_incompatible);
+
   Qemacs_mule = intern ("emacs-mule");
   staticpro (&Qemacs_mule);
 
diff --git a/src/coding.h b/src/coding.h
index cac11d1514c..be68753acb2 100644
--- a/src/coding.h
+++ b/src/coding.h
@@ -443,10 +443,12 @@ struct coding_system
   Lisp_Object translation_table_for_encode;
 };
 
-#define CODING_REQUIRE_FLUSHING_MASK    1
-#define CODING_REQUIRE_DECODING_MASK    2
-#define CODING_REQUIRE_ENCODING_MASK    4
-#define CODING_REQUIRE_DETECTION_MASK   8
+/* Mask bits for (struct coding_system *)->common_flags.  */
+#define CODING_REQUIRE_FLUSHING_MASK    0x01
+#define CODING_REQUIRE_DECODING_MASK    0x02
+#define CODING_REQUIRE_ENCODING_MASK    0x04
+#define CODING_REQUIRE_DETECTION_MASK   0x08
+#define CODING_ASCII_INCOMPATIBLE_MASK  0x10
 
 /* Return 1 if the coding system CODING requires specific code to be
    attached at the tail of converted text.  */
diff --git a/src/config.in b/src/config.in
index ddbbbce97d2..51f4aaa07fa 100644
--- a/src/config.in
+++ b/src/config.in
@@ -87,6 +87,9 @@ Boston, MA 02110-1301, USA.  */
    */
 #undef HAVE_ALLOCA_H
 
+/* Define to 1 if ALSA is available. */
+#undef HAVE_ALSA
+
 /* Define to 1 if you have the `bcmp' function. */
 #undef HAVE_BCMP
 
@@ -949,6 +952,9 @@ Boston, MA 02110-1301, USA.  */
 #ifdef HAVE_SOUNDCARD_H
 #define HAVE_SOUND 1
 #endif
+#ifdef HAVE_ALSA
+#define HAVE_SOUND 1
+#endif
 #endif /* __FreeBSD__ || __NetBSD__ || __linux__  */
 
 /* If using GNU, then support inline function declarations. */
diff --git a/src/frame.c b/src/frame.c
index 094453ed33e..f29bca1796f 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -3443,10 +3443,8 @@ x_set_border_width (f, arg, oldval)
   if (XINT (arg) == f->border_width)
     return;
 
-#ifndef MAC_OS
   if (FRAME_X_WINDOW (f) != 0)
     error ("Cannot change the border width of a frame");
-#endif /* MAC_TODO */
 
   f->border_width = XINT (arg);
 }
diff --git a/src/image.c b/src/image.c
index b71f31e3b50..b8a640a9391 100644
--- a/src/image.c
+++ b/src/image.c
@@ -8069,18 +8069,18 @@ gif_load (f, img)
   /* Save GIF image extension data for `image-extension-data'.
      Format is (count IMAGES 0xf9 GRAPHIC_CONTROL_EXTENSION_BLOCK).  */
   {
-    unsigned char gce[4];
+    Lisp_Object gce = make_uninit_string (4);
     int centisec = ((float)duration / time_scale) * 100.0f + 0.5f;
 
     /* Fill the delay time field.  */
-    gce[1] = centisec & 0xff;
-    gce[2] = (centisec >> 8) & 0xff;
+    SSET (gce, 1, centisec & 0xff);
+    SSET (gce, 2, (centisec >> 8) & 0xff);
     /* We don't know about other fields.  */
-    gce[0] = gce[3] = 0;
+    SSET (gce, 0, 0);
+    SSET (gce, 3, 0);
 
     img->data.lisp_val = list4 (Qcount, make_number (nsamples),
-                                make_number (0xf9),
-                                make_unibyte_string (gce, 4));
+                                make_number (0xf9), gce);
   }
 
   /* Maybe fill in the background field while we have ximg handy. */
diff --git a/src/macfns.c b/src/macfns.c
index ab23865507b..577167e6fe3 100644
--- a/src/macfns.c
+++ b/src/macfns.c
@@ -2829,26 +2829,22 @@ FRAME nil means use the selected frame.  */)
      Lisp_Object frame;
 {
   struct frame *f = check_x_frame (frame);
-  struct mac_display_info *dpyinfo = FRAME_MAC_DISPLAY_INFO (f);
 
-  if (dpyinfo->x_focus_frame != f)
-    {
-      BLOCK_INPUT;
+  BLOCK_INPUT;
 #ifdef MAC_OSX
-      ActivateWindow (ActiveNonFloatingWindow (), false);
-      ActivateWindow (FRAME_MAC_WINDOW (f), true);
+  ActivateWindow (ActiveNonFloatingWindow (), false);
+  ActivateWindow (FRAME_MAC_WINDOW (f), true);
 #else
 #if !TARGET_API_MAC_CARBON
-      /* SelectWindow (Non-Carbon) does not issue deactivate events if
-         the possibly inactive window that is to be selected is
-         already the frontmost one.  */
-      SendBehind (FRAME_MAC_WINDOW (f), NULL);
+  /* SelectWindow (Non-Carbon) does not issue deactivate events if the
+     possibly inactive window that is to be selected is already the
+     frontmost one.  */
+  SendBehind (FRAME_MAC_WINDOW (f), NULL);
 #endif
-      /* This brings the window to the front.  */
-      SelectWindow (FRAME_MAC_WINDOW (f));
+  /* This brings the window to the front.  */
+  SelectWindow (FRAME_MAC_WINDOW (f));
 #endif
-      UNBLOCK_INPUT;
-    }
+  UNBLOCK_INPUT;
 
   return Qnil;
 }
diff --git a/src/macterm.c b/src/macterm.c
index beaecfdc790..68959758e98 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -10333,6 +10333,7 @@ XTread_socket (sd, expected, hold_quit)
           break;
 
         case keyDown:
+        case keyUp:
         case autoKey:
           {
             int keycode = (er.message & keyCodeMask) >> 8;
@@ -10354,6 +10355,8 @@ XTread_socket (sd, expected, hold_quit)
                   != eventNotHandledErr)
                 break;
 #endif
+            if (er.what == keyUp)
+              break;
 
 #if 0
             if (dpyinfo->x_focus_frame == NULL)
diff --git a/src/sound.c b/src/sound.c
index 0fbeceb4b9e..2ceefd3bce3 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -73,6 +73,10 @@ Boston, MA 02110-1301, USA.  */
 #ifdef HAVE_SOUNDCARD_H
 #include <soundcard.h>
 #endif
+#ifdef HAVE_ALSA
+#include <asoundlib.h>
+#endif
+
 /* END: Non Windows Includes */
 
 #else /* WINDOWSNT */
@@ -121,6 +125,9 @@ static int parse_sound P_ ((Lisp_Object, Lisp_Object *));
 #ifndef DEFAULT_SOUND_DEVICE
 #define DEFAULT_SOUND_DEVICE "/dev/dsp"
 #endif
+#ifndef DEFAULT_ALSA_SOUND_DEVICE
+#define DEFAULT_ALSA_SOUND_DEVICE "default"
+#endif
 
 
 /* Structure forward declarations.  */
@@ -227,6 +234,10 @@ struct sound_device
   void (* choose_format) P_ ((struct sound_device *sd,
                               struct sound *s));
 
+  /* Return a preferred data size in bytes to be sent to write (below)
+     each time.  2048 is used if this is NULL.  */
+  int (* period_size) P_ ((struct sound_device *sd));
+
   /* Write NYBTES bytes from BUFFER to device SD.  */
   void (* write) P_ ((struct sound_device *sd, const char *buffer,
                       int nbytes));
@@ -280,7 +291,7 @@ static void vox_open P_ ((struct sound_device *));
 static void vox_configure P_ ((struct sound_device *));
 static void vox_close P_ ((struct sound_device *sd));
 static void vox_choose_format P_ ((struct sound_device *, struct sound *));
-static void vox_init P_ ((struct sound_device *));
+static int vox_init P_ ((struct sound_device *));
 static void vox_write P_ ((struct sound_device *, const char *, int));
 static void find_sound_type P_ ((struct sound *));
 static u_int32_t le2hl P_ ((u_int32_t));
@@ -604,7 +615,7 @@ wav_play (s, sd)
     {
       char *buffer;
       int nbytes;
-      int blksize = 2048;
+      int blksize = sd->period_size ? sd->period_size (sd) : 2048;
 
       buffer = (char *) alloca (blksize);
       lseek (s->fd, sizeof *header, SEEK_SET);
@@ -633,7 +644,8 @@ enum au_encoding
   AU_ENCODING_32,
   AU_ENCODING_IEEE32,
   AU_ENCODING_IEEE64,
-  AU_COMPRESSED = 23
+  AU_COMPRESSED = 23,
+  AU_ENCODING_ALAW_8 = 27
 };
 
 
@@ -689,7 +701,7 @@ au_play (s, sd)
                SBYTES (s->data) - header->data_offset);
   else
     {
-      int blksize = 2048;
+      int blksize = sd->period_size ? sd->period_size (sd) : 2048;
       char *buffer;
       int nbytes;
 
@@ -868,16 +880,33 @@ vox_choose_format (sd, s)
 /* Initialize device SD.  Set up the interface functions in the device
    structure.  */
 
-static void
+static int
 vox_init (sd)
      struct sound_device *sd;
 {
+  char *file;
+  int fd;
+
+  /* Open the sound device.  Default is /dev/dsp.  */
+  if (sd->file)
+    file = sd->file;
+  else
+    file = DEFAULT_SOUND_DEVICE;
+  fd = emacs_open (file, O_WRONLY, 0);
+  if (fd >= 0)
+    emacs_close (fd);
+  else
+    return 0;
+
   sd->fd = -1;
   sd->open = vox_open;
   sd->close = vox_close;
   sd->configure = vox_configure;
   sd->choose_format = vox_choose_format;
   sd->write = vox_write;
+  sd->period_size = NULL;
+
+  return 1;
 }
 
 /* Write NBYTES bytes from BUFFER to device SD.  */
@@ -893,6 +922,359 @@ vox_write (sd, buffer, nbytes)
     sound_perror ("Error writing to sound device");
 }
 
+#ifdef HAVE_ALSA
+/***********************************************************************
+                       ALSA Driver Interface
+ ***********************************************************************/
+
+/* This driver is available on GNU/Linux. */
+
+static void
+alsa_sound_perror (msg, err)
+     char *msg;
+     int err;
+{
+  error ("%s: %s", msg, snd_strerror (err));
+}
+
+struct alsa_params
+{
+  snd_pcm_t *handle;
+  snd_pcm_hw_params_t *hwparams;
+  snd_pcm_sw_params_t *swparams;
+  snd_pcm_uframes_t period_size;
+};
+
+/* Open device SD.  If SD->file is non-null, open that device,
+   otherwise use a default device name.  */
+
+static void
+alsa_open (sd)
+     struct sound_device *sd;
+{
+  char *file;
+  struct alsa_params *p;
+  int err;
+
+  /* Open the sound device.  Default is "default".  */
+  if (sd->file)
+    file = sd->file;
+  else
+    file = DEFAULT_ALSA_SOUND_DEVICE;
+
+  p = xmalloc (sizeof (*p));
+  p->handle = NULL;
+  p->hwparams = NULL;
+  p->swparams = NULL;
+
+  sd->fd = -1;
+  sd->data = p;
+
+
+  if ((err = snd_pcm_open (&p->handle, file, SND_PCM_STREAM_PLAYBACK, 0)) < 0)
+    alsa_sound_perror (file, err);
+}
+
+static int
+alsa_period_size (sd)
+       struct sound_device *sd;
+{
+  struct alsa_params *p = (struct alsa_params *) sd->data;
+  return p->period_size;
+}
+
+static void
+alsa_configure (sd)
+     struct sound_device *sd;
+{
+  int val, err, dir;
+  struct alsa_params *p = (struct alsa_params *) sd->data;
+  snd_pcm_uframes_t buffer_size;
+
+  xassert (p->handle != 0);
+
+  if ((err = snd_pcm_hw_params_malloc (&p->hwparams)) < 0)
+    alsa_sound_perror ("Could not allocate hardware parameter structure", err);
+
+  if ((err = snd_pcm_sw_params_malloc (&p->swparams)) < 0)
+    alsa_sound_perror ("Could not allocate software parameter structure", err);
+
+  if ((err = snd_pcm_hw_params_any (p->handle, p->hwparams)) < 0)
+    alsa_sound_perror ("Could not initialize hardware parameter structure", err);
+
+  if ((err = snd_pcm_hw_params_set_access (p->handle, p->hwparams,
+                                           SND_PCM_ACCESS_RW_INTERLEAVED)) < 0)
+    alsa_sound_perror ("Could not set access type", err);
+
+  val = sd->format;
+  if ((err = snd_pcm_hw_params_set_format (p->handle, p->hwparams, val)) < 0) 
+    alsa_sound_perror ("Could not set sound format", err);
+
+  val = sd->sample_rate;
+  if ((err = snd_pcm_hw_params_set_rate_near (p->handle, p->hwparams, &val, 0))
+      < 0)
+    alsa_sound_perror ("Could not set sample rate", err);
+  
+  val = sd->channels;
+  if ((err = snd_pcm_hw_params_set_channels (p->handle, p->hwparams, val)) < 0)
+    alsa_sound_perror ("Could not set channel count", err);
+
+
+  err = snd_pcm_hw_params_get_period_size (p->hwparams, &p->period_size, &dir);
+  if (err < 0)
+    alsa_sound_perror ("Unable to get period size for playback", err);
+
+  err = snd_pcm_hw_params_get_buffer_size (p->hwparams, &buffer_size);
+  if (err < 0)
+    alsa_sound_perror("Unable to get buffer size for playback", err);
+
+  if ((err = snd_pcm_hw_params (p->handle, p->hwparams)) < 0)
+    alsa_sound_perror ("Could not set parameters", err);
+
+  err = snd_pcm_sw_params_current (p->handle, p->swparams);
+  if (err < 0)
+    alsa_sound_perror ("Unable to determine current swparams for playback",
+                       err);
+
+  /* Start the transfer when the buffer is almost full */
+  err = snd_pcm_sw_params_set_start_threshold (p->handle, p->swparams,
+                                               (buffer_size / p->period_size)
+                                               * p->period_size);
+  if (err < 0)
+    alsa_sound_perror ("Unable to set start threshold mode for playback", err);
+
+  /* Allow the transfer when at least period_size samples can be processed */
+  err = snd_pcm_sw_params_set_avail_min (p->handle, p->swparams, p->period_size);
+  if (err < 0)
+    alsa_sound_perror ("Unable to set avail min for playback", err);
+
+  /* Align all transfers to 1 period */
+  err = snd_pcm_sw_params_set_xfer_align (p->handle, p->swparams,
+                                          p->period_size);
+  if (err < 0)
+    alsa_sound_perror ("Unable to set transfer align for playback", err);
+
+  err = snd_pcm_sw_params (p->handle, p->swparams);
+  if (err < 0)
+    alsa_sound_perror ("Unable to set sw params for playback\n", err);
+
+  snd_pcm_hw_params_free (p->hwparams);
+  p->hwparams = NULL;
+  snd_pcm_sw_params_free (p->swparams);
+  p->swparams = NULL;
+  
+  if ((err = snd_pcm_prepare (p->handle)) < 0)
+    alsa_sound_perror ("Could not prepare audio interface for use", err);
+  
+  if (sd->volume > 0)
+    {
+      int chn;
+      snd_mixer_t *handle;
+      snd_mixer_elem_t *e;
+      char *file = sd->file ? sd->file : DEFAULT_ALSA_SOUND_DEVICE;
+
+      if (snd_mixer_open (&handle, 0) >= 0)
+        {
+          if (snd_mixer_attach (handle, file) >= 0
+              && snd_mixer_load (handle) >= 0
+              && snd_mixer_selem_register (handle, NULL, NULL) >= 0)
+            for (e = snd_mixer_first_elem (handle);
+                 e;
+                 e = snd_mixer_elem_next (e))
+              {
+                if (snd_mixer_selem_has_playback_volume (e))
+                  {
+                    long pmin, pmax;
+                    snd_mixer_selem_get_playback_volume_range (e, &pmin, &pmax);
+                    long vol = pmin + (sd->volume * (pmax - pmin)) / 100;
+                    
+                    for (chn = 0; chn <= SND_MIXER_SCHN_LAST; chn++)
+                      snd_mixer_selem_set_playback_volume (e, chn, vol);
+                  }
+              }
+          snd_mixer_close(handle);
+        }
+    }
+}
+
+
+/* Close device SD if it is open.  */
+
+static void
+alsa_close (sd)
+     struct sound_device *sd;
+{
+  struct alsa_params *p = (struct alsa_params *) sd->data;
+  if (p)
+    {
+      if (p->hwparams)
+        snd_pcm_hw_params_free (p->hwparams);
+      if (p->swparams)
+        snd_pcm_sw_params_free (p->swparams);
+      if (p->handle)
+        {
+          snd_pcm_drain(p->handle);
+          snd_pcm_close (p->handle);
+        }
+      free (p);
+    }
+}
+
+/* Choose device-dependent format for device SD from sound file S.  */
+
+static void
+alsa_choose_format (sd, s)
+     struct sound_device *sd;
+     struct sound *s;
+{
+  struct alsa_params *p = (struct alsa_params *) sd->data;
+  if (s->type == RIFF)
+    {
+      struct wav_header *h = (struct wav_header *) s->header;
+      if (h->precision == 8)
+        sd->format = SND_PCM_FORMAT_U8;
+      else if (h->precision == 16)
+          sd->format = SND_PCM_FORMAT_S16_LE;
+      else
+        error ("Unsupported WAV file format");
+    }
+  else if (s->type == SUN_AUDIO)
+    {
+      struct au_header *header = (struct au_header *) s->header;
+      switch (header->encoding)
+        {
+        case AU_ENCODING_ULAW_8:
+          sd->format = SND_PCM_FORMAT_MU_LAW;
+          break;
+        case AU_ENCODING_ALAW_8:
+          sd->format = SND_PCM_FORMAT_A_LAW;
+          break;
+        case AU_ENCODING_IEEE32:
+          sd->format = SND_PCM_FORMAT_FLOAT_BE;
+          break;
+        case AU_ENCODING_IEEE64:
+          sd->format = SND_PCM_FORMAT_FLOAT64_BE;
+          break;
+        case AU_ENCODING_8:
+          sd->format = SND_PCM_FORMAT_S8;
+          break;
+        case AU_ENCODING_16:
+          sd->format = SND_PCM_FORMAT_S16_BE;
+          break;
+        case AU_ENCODING_24:
+          sd->format = SND_PCM_FORMAT_S24_BE;
+          break;
+        case AU_ENCODING_32:
+          sd->format = SND_PCM_FORMAT_S32_BE;
+          break;
+
+        default:
+          error ("Unsupported AU file format");
+        }
+    }
+  else
+    abort ();
+}
+
+
+/* Write NBYTES bytes from BUFFER to device SD.  */
+
+static void
+alsa_write (sd, buffer, nbytes)
+     struct sound_device *sd;
+     const char *buffer;
+     int nbytes;
+{
+  struct alsa_params *p = (struct alsa_params *) sd->data;
+
+  /* The the third parameter to snd_pcm_writei is frames, not bytes. */
+  int fact = snd_pcm_format_size (sd->format, 1) * sd->channels;
+  int nwritten = 0;
+  int err;
+
+  while (nwritten < nbytes)
+    {
+      if ((err = snd_pcm_writei (p->handle,
+                                 buffer + nwritten,
+                                 (nbytes - nwritten)/fact)) < 0)
+        {
+          fprintf(stderr, "Err %d/%s\n", err, snd_strerror(err));
+          if (err == -EPIPE)
+            {   /* under-run */
+              err = snd_pcm_prepare (p->handle);
+              if (err < 0)
+                alsa_sound_perror ("Can't recover from underrun, prepare failed",
+                                   err);
+            }
+          else if (err == -ESTRPIPE)
+            {
+              while ((err = snd_pcm_resume (p->handle)) == -EAGAIN)
+                sleep(1);       /* wait until the suspend flag is released */
+              if (err < 0)
+                {
+                  err = snd_pcm_prepare (p->handle);
+                  if (err < 0)
+                    alsa_sound_perror ("Can't recover from suspend, "
+                                       "prepare failed",
+                                       err);
+                }
+            }
+          else 
+            alsa_sound_perror ("Error writing to sound device", err);
+          
+        }
+      else
+        nwritten += err * fact;
+    }
+}
+
+static void
+snd_error_quiet (file, line, function, err, fmt)
+     const char *file;
+     int line;
+     const char *function;
+     int err;
+     const char *fmt;
+{
+}
+
+/* Initialize device SD.  Set up the interface functions in the device
+   structure.  */
+
+static int
+alsa_init (sd)
+     struct sound_device *sd;
+{
+  char *file;
+  snd_pcm_t *handle;
+  int err;
+
+  /* Open the sound device.  Default is "default".  */
+  if (sd->file)
+    file = sd->file;
+  else
+    file = DEFAULT_ALSA_SOUND_DEVICE;
+
+  snd_lib_error_set_handler ((snd_lib_error_handler_t) snd_error_quiet);
+  err = snd_pcm_open (&handle, file, SND_PCM_STREAM_PLAYBACK, 0);
+  snd_lib_error_set_handler (NULL);
+  if (err < 0)
+    return 0;
+
+  sd->fd = -1;
+  sd->open = alsa_open;
+  sd->close = alsa_close;
+  sd->configure = alsa_configure;
+  sd->choose_format = alsa_choose_format;
+  sd->write = alsa_write;
+  sd->period_size = alsa_period_size;
+
+  return 1;
+}
+
+#endif /* HAVE_ALSA */
+
+
 /* END: Non Windows functions */
 #else /* WINDOWSNT */
 
@@ -1056,10 +1438,11 @@ Internal use only, use `play-sound' instead.\n  */)
   args[1] = sound;
   Frun_hook_with_args (2, args);
 
-  /* There is only one type of device we currently support, the VOX
-     sound driver.  Set up the device interface functions for that
-     device.  */
-  vox_init (current_sound_device);
+#ifdef HAVE_ALSA
+  if (!alsa_init (current_sound_device))
+#endif
+    if (!vox_init (current_sound_device))
+      error ("No usable sound device driver found");
 
   /* Open the device.  */
   current_sound_device->open (current_sound_device);
diff --git a/src/window.c b/src/window.c
index 966960edd90..5dced198811 100644
--- a/src/window.c
+++ b/src/window.c
@@ -6798,7 +6798,9 @@ foreach_window (f, fn, user_data)
      int (* fn) P_ ((struct window *, void *));
      void *user_data;
 {
-  foreach_window_1 (XWINDOW (FRAME_ROOT_WINDOW (f)), fn, user_data);
+  /* Fdelete_frame may set FRAME_ROOT_WINDOW (f) to Qnil.  */
+  if (WINDOWP (FRAME_ROOT_WINDOW (f)))
+    foreach_window_1 (XWINDOW (FRAME_ROOT_WINDOW (f)), fn, user_data);
 }
 
 
diff --git a/src/xdisp.c b/src/xdisp.c
index a271d64fdbb..32255f92da7 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -9492,7 +9492,8 @@ display_tool_bar_line (it, height)
 
   while (it->current_x < max_x)
     {
-      int x_before, x, n_glyphs_before, i, nglyphs;
+      int x, n_glyphs_before, i, nglyphs;
+      struct it it_before;
 
       /* Get the next display element.  */
       if (!get_next_display_element (it))
@@ -9504,22 +9505,23 @@ display_tool_bar_line (it, height)
         }
 
       /* Produce glyphs.  */
-      x_before = it->current_x;
-      n_glyphs_before = it->glyph_row->used[TEXT_AREA];
+      n_glyphs_before = row->used[TEXT_AREA];
+      it_before = *it;
+
       PRODUCE_GLYPHS (it);
 
-      nglyphs = it->glyph_row->used[TEXT_AREA] - n_glyphs_before;
+      nglyphs = row->used[TEXT_AREA] - n_glyphs_before;
       i = 0;
-      x = x_before;
+      x = it_before.current_x;
       while (i < nglyphs)
         {
           struct glyph *glyph = row->glyphs[TEXT_AREA] + n_glyphs_before + i;
 
           if (x + glyph->pixel_width > max_x)
             {
-              /* Glyph doesn't fit on line.  */
-              it->glyph_row->used[TEXT_AREA] = n_glyphs_before + i;
-              it->current_x = x;
+              /* Glyph doesn't fit on line.  Backtrack.  */
+              row->used[TEXT_AREA] = n_glyphs_before;
+              *it = it_before;
               goto out;
             }
 
@@ -9550,6 +9552,8 @@ display_tool_bar_line (it, height)
   /* Make line the desired height and center it vertically.  */
   if ((height -= it->max_ascent + it->max_descent) > 0)
     {
+      /* Don't add more than one line height.  */
+      height %= FRAME_LINE_HEIGHT (it->f);
       it->max_ascent += height / 2;
       it->max_descent += (height + 1) / 2;
     }
diff --git a/src/xfaces.c b/src/xfaces.c
index fc2c8a768bf..15556ca88f8 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -6400,6 +6400,12 @@ better_font_p (values, font1, font2, compare_pt_p, avgwidth)
 {
   int i;
 
+  /* Any font is better than no font.  */
+  if (! font1)
+    return 0;
+  if (! font2)
+    return 1;
+
   for (i = 0; i < DIM (font_sort_order); ++i)
     {
       int xlfd_idx = font_sort_order[i];
@@ -6644,29 +6650,19 @@ best_matching_font (f, attrs, fonts, nfonts, width_ratio, needs_overstrike)
   if (needs_overstrike)
     *needs_overstrike = 0;
 
-  /* Start with the first non-scalable font in the list.  */
-  for (i = 0; i < nfonts; ++i)
-    if (!font_scalable_p (fonts + i))
-      break;
+  best = NULL;
 
   /* Find the best match among the non-scalable fonts.  */
-  if (i < nfonts)
-    {
-      best = fonts + i;
-
-      for (i = 1; i < nfonts; ++i)
-        if (!font_scalable_p (fonts + i)
-            && better_font_p (specified, fonts + i, best, 1, avgwidth))
-          {
-            best = fonts + i;
+  for (i = 1; i < nfonts; ++i)
+    if (!font_scalable_p (fonts + i)
+        && better_font_p (specified, fonts + i, best, 1, avgwidth))
+      {
+        best = fonts + i;
 
-            exact_p = exact_face_match_p (specified, best, avgwidth);
-            if (exact_p)
-              break;
-          }
-    }
-  else
-    best = NULL;
+        exact_p = exact_face_match_p (specified, best, avgwidth);
+        if (exact_p)
+          break;
+      }
 
   /* Unless we found an exact match among non-scalable fonts, see if
      we can find a better match among scalable fonts.  */
@@ -6690,8 +6686,7 @@ best_matching_font (f, attrs, fonts, nfonts, width_ratio, needs_overstrike)
       for (i = 0; i < nfonts; ++i)
         if (font_scalable_p (fonts + i))
           {
-            if (best == NULL
-                || better_font_p (specified, fonts + i, best, 0, 0)
+            if (better_font_p (specified, fonts + i, best, 0, 0)
                 || (!non_scalable_has_exact_height_p
                     && !better_font_p (specified, best, fonts + i, 0, 0)))
               {
@@ -6719,6 +6714,10 @@ best_matching_font (f, attrs, fonts, nfonts, width_ratio, needs_overstrike)
         }
     }
 
+  /* We should have found SOME font.  */
+  if (best == NULL)
+    abort ();
+
   if (font_scalable_p (best))
     font_name = build_scalable_font_name (f, best, pt);
   else
diff --git a/src/xterm.c b/src/xterm.c
index 1c07c56241e..2070c65d76a 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -6097,6 +6097,8 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit)
 
       f = x_any_window_to_frame (dpyinfo, event.xkey.window);
 
+      /* If mouse-highlight is an integer, input clears out
+         mouse highlighting.  */
       if (!dpyinfo->mouse_face_hidden && INTEGERP (Vmouse_highlight)
           && (f == 0
               || !EQ (f->tool_bar_window, dpyinfo->mouse_face_window)))