13 files changed, 234 insertions, 94 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/keyboard.c b/src/keyboard.c
index c7d25088313..e1e53010931 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -2450,6 +2450,17 @@ Lisp_Object print_help ();
 static Lisp_Object kbd_buffer_get_event ();
 static void record_char ();
 
+static Lisp_Object help_form_saved_window_configs;
+static Lisp_Object
+read_char_help_form_unwind (arg)
+{
+  Lisp_Object window_config = XCAR (help_form_saved_window_configs);
+  help_form_saved_window_configs = XCDR (help_form_saved_window_configs);
+  if (!NILP (window_config))
+    Fset_window_configuration (window_config);
+  return Qnil;
+}
+
 #ifdef MULTI_KBOARD
 static jmp_buf wrong_kboard_jmpbuf;
 #endif
@@ -3319,8 +3330,10 @@ read_char (commandflag, nmaps, maps, prev_event, used_mouse_menu, end_time)
       Lisp_Object tem0;
       count = SPECPDL_INDEX ();
 
-      record_unwind_protect (Fset_window_configuration,
-                             Fcurrent_window_configuration (Qnil));
+      help_form_saved_window_configs
+        = Fcons (Fcurrent_window_configuration (Qnil),
+                 help_form_saved_window_configs);
+      record_unwind_protect (read_char_help_form_unwind, Qnil);
 
       tem0 = Feval (Vhelp_form);
       if (STRINGP (tem0))
@@ -3328,7 +3341,12 @@ read_char (commandflag, nmaps, maps, prev_event, used_mouse_menu, end_time)
 
       cancel_echoing ();
       do
-        c = read_char (0, 0, 0, Qnil, 0, NULL);
+        {
+          c = read_char (0, 0, 0, Qnil, 0, NULL);
+          if (EVENT_HAS_PARAMETERS (c)
+              && EQ (EVENT_HEAD_KIND (EVENT_HEAD (c)), Qmouse_click))
+            XSETCAR (help_form_saved_window_configs, Qnil);
+        }
       while (BUFFERP (c));
       /* Remove the help from the frame */
       unbind_to (count, Qnil);
@@ -11334,6 +11352,9 @@ syms_of_keyboard ()
   menu_bar_items_vector = Qnil;
   staticpro (&menu_bar_items_vector);
 
+  help_form_saved_window_configs = Qnil;
+  staticpro (&help_form_saved_window_configs);
+
   defsubr (&Scurrent_idle_time);
   defsubr (&Sevent_convert_list);
   defsubr (&Sread_key_sequence);
@@ -11396,7 +11417,7 @@ An element of the form (t . EVENT) forces EVENT to be added to that list.  */);
   DEFVAR_LISP ("unread-post-input-method-events", &Vunread_post_input_method_events,
                doc: /* List of events to be processed as input by input methods.
 These events are processed before `unread-command-events'
-and actual keyboard input without given to `input-method-function'.  */);
+and actual keyboard input, but are not given to `input-method-function'.  */);
   Vunread_post_input_method_events = Qnil;
 
   DEFVAR_LISP ("unread-input-method-events", &Vunread_input_method_events,
diff --git a/src/keymap.c b/src/keymap.c
index abf934908cc..a612b0d5c6c 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -2989,6 +2989,8 @@ Keyboard translations:\n\n\
 You type        Translation\n\
 --------        -----------\n";
 
+  CHECK_BUFFER (buffer);
+
   shadow = Qnil;
   GCPRO1 (shadow);
 
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/macterm.c b/src/macterm.c
index 3a403c39c26..1fa3daace6f 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -4965,7 +4965,7 @@ x_scroll_bar_create (w, top, left, width, height, disp_top, disp_height)
 #endif
 #if TARGET_API_MAC_CARBON
   ch = NewControl (FRAME_MAC_WINDOW (f), &r, "\p",
-#if USE_TOOLKIT_SCROLL_BARS
+#ifdef USE_TOOLKIT_SCROLL_BARS
                    false,
 #else
                    width < disp_height,
@@ -5219,7 +5219,11 @@ XTset_vertical_scroll_bar (w, portion, whole, position)
 #ifdef USE_TOOLKIT_SCROLL_BARS
   if (NILP (bar->track_top))
     {
-      if (sb_width >= disp_height)
+      if (sb_width >= disp_height
+#ifdef MAC_OSX
+          || sb_width < MAC_AQUA_SMALL_VERTICAL_SCROLL_BAR_WIDTH
+#endif
+          )
         {
           XSETINT (bar->track_top, 0);
           XSETINT (bar->track_height, 0);
@@ -6242,6 +6246,16 @@ x_set_window_size (f, change_gravity, cols, rows)
 #endif
     mac_handle_size_change (f, pixelwidth, pixelheight);
 
+  if (f->output_data.mac->internal_border_width
+      != FRAME_INTERNAL_BORDER_WIDTH (f))
+    {
+      mac_clear_window (f);
+      f->output_data.mac->internal_border_width
+        = FRAME_INTERNAL_BORDER_WIDTH (f);
+    }
+
+  SET_FRAME_GARBAGED (f);
+
   UNBLOCK_INPUT;
 }
 
@@ -9995,23 +10009,30 @@ mac_handle_mouse_event (next_handler, event, data)
         if (err != noErr || axis != kEventMouseWheelAxisY)
           break;
 
-        err = GetEventParameter (event, kEventParamMouseWheelDelta,
-                                 typeSInt32, NULL, sizeof (SInt32),
-                                 NULL, &delta);
-        if (err != noErr)
-          break;
         err = GetEventParameter (event, kEventParamMouseLocation,
                                  typeQDPoint, NULL, sizeof (Point),
                                  NULL, &point);
         if (err != noErr)
           break;
+
+        SetPortWindowPort (wp);
+        GlobalToLocal (&point);
+        if (point.h < 0 || point.v < 0
+            || EQ (window_from_coordinates (f, point.h, point.v, 0, 0, 0, 1),
+                   f->tool_bar_window))
+          break;
+
+        err = GetEventParameter (event, kEventParamMouseWheelDelta,
+                                 typeSInt32, NULL, sizeof (SInt32),
+                                 NULL, &delta);
+        if (err != noErr)
+          break;
+
         read_socket_inev->kind = WHEEL_EVENT;
         read_socket_inev->code = 0;
         read_socket_inev->modifiers =
           (mac_event_to_emacs_modifiers (event)
            | ((delta < 0) ? down_modifier : up_modifier));
-        SetPortWindowPort (wp);
-        GlobalToLocal (&point);
         XSETINT (read_socket_inev->x, point.h);
         XSETINT (read_socket_inev->y, point.v);
         XSETFRAME (read_socket_inev->frame_or_window, f);
@@ -11042,7 +11063,7 @@ XTread_socket (sd, expected, hold_quit)
             else
               {
                 /* A window has been deactivated */
-#if USE_TOOLKIT_SCROLL_BARS
+#ifdef USE_TOOLKIT_SCROLL_BARS
                 if (dpyinfo->grabbed && tracked_scroll_bar)
                   {
                     struct input_event event;
diff --git a/src/macterm.h b/src/macterm.h
index 3d0b41f6efe..b3826c5e7f7 100644
--- a/src/macterm.h
+++ b/src/macterm.h
@@ -327,6 +327,9 @@ struct mac_output
      They are changed only when a different background is involved.  */
   unsigned long relief_background;
 
+  /* Width of the internal border.  */
+  int internal_border_width;
+
   /* Hints for the size and the position of a window.  */
   XSizeHints *size_hints;
 
diff --git a/src/minibuf.c b/src/minibuf.c
index 14f5eac846a..50f48c2344f 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -700,27 +700,27 @@ read_minibuf (map, initial, prompt, backup_n, expflag,
     specbind (Qinhibit_read_only, Qt);
     specbind (Qinhibit_modification_hooks, Qt);
     Ferase_buffer ();
+
+    if (!NILP (current_buffer->enable_multibyte_characters)
+        && ! STRING_MULTIBYTE (minibuf_prompt))
+      minibuf_prompt = Fstring_make_multibyte (minibuf_prompt);
+    
+    /* Insert the prompt, record where it ends.  */
+    Finsert (1, &minibuf_prompt);
+    if (PT > BEG)
+      {
+        Fput_text_property (make_number (BEG), make_number (PT),
+                            Qfront_sticky, Qt, Qnil);
+        Fput_text_property (make_number (BEG), make_number (PT),
+                            Qrear_nonsticky, Qt, Qnil);
+        Fput_text_property (make_number (BEG), make_number (PT),
+                            Qfield, Qt, Qnil);
+        Fadd_text_properties (make_number (BEG), make_number (PT),
+                              Vminibuffer_prompt_properties, Qnil);
+      }
     unbind_to (count1, Qnil);
   }
 
-  if (!NILP (current_buffer->enable_multibyte_characters)
-      && ! STRING_MULTIBYTE (minibuf_prompt))
-    minibuf_prompt = Fstring_make_multibyte (minibuf_prompt);
-
-  /* Insert the prompt, record where it ends.  */
-  Finsert (1, &minibuf_prompt);
-  if (PT > BEG)
-    {
-      Fput_text_property (make_number (BEG), make_number (PT),
-                          Qfront_sticky, Qt, Qnil);
-      Fput_text_property (make_number (BEG), make_number (PT),
-                          Qrear_nonsticky, Qt, Qnil);
-      Fput_text_property (make_number (BEG), make_number (PT),
-                          Qfield, Qt, Qnil);
-      Fadd_text_properties (make_number (BEG), make_number (PT),
-                            Vminibuffer_prompt_properties, Qnil);
-    }
-
   minibuf_prompt_width = (int) current_column (); /* iftc */
 
   /* Put in the initial input.  */
@@ -1483,6 +1483,10 @@ is used to further constrain the set of candidates.  */)
                 matchcount++;
               bestmatchsize = matchsize;
               if (matchsize <= SCHARS (string)
+                  /* If completion-ignore-case is non-nil, don't
+                     short-circuit because we want to find the best
+                     possible match *including* case differences.  */
+                  && !completion_ignore_case
                   && matchcount > 1)
                 /* No need to look any further.  */
                 break;
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)
         {
diff --git a/src/sound.c b/src/sound.c
index 7fb79e64048..5a27e7a6232 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -621,12 +621,18 @@ wav_play (s, sd)
       char *buffer;
       int nbytes;
       int blksize = sd->period_size ? sd->period_size (sd) : 2048;
+      int data_left = header->data_length;
 
       buffer = (char *) alloca (blksize);
       lseek (s->fd, sizeof *header, SEEK_SET);
-
-      while ((nbytes = emacs_read (s->fd, buffer, blksize)) > 0)
-        sd->write (sd, buffer, nbytes);
+      while (data_left > 0
+             && (nbytes = emacs_read (s->fd, buffer, blksize)) > 0)
+        {
+          /* Don't play possible garbage at the end of file */
+          if (data_left < nbytes) nbytes = data_left;
+          data_left -= nbytes;
+          sd->write (sd, buffer, nbytes);
+        }
 
       if (nbytes < 0)
         sound_perror ("Error reading sound file");
@@ -986,7 +992,8 @@ alsa_period_size (sd)
        struct sound_device *sd;
 {
   struct alsa_params *p = (struct alsa_params *) sd->data;
-  return p->period_size;
+  int fact = snd_pcm_format_size (sd->format, 1) * sd->channels;
+  return p->period_size * (fact > 0 ? fact : 1);
 }
 
 static void
@@ -1209,9 +1216,10 @@ alsa_write (sd, buffer, nbytes)
 
   while (nwritten < nbytes)
     {
-      err = snd_pcm_writei (p->handle,
-                            buffer + nwritten,
-                            (nbytes - nwritten)/fact);
+      snd_pcm_uframes_t frames = (nbytes - nwritten)/fact;
+      if (frames == 0) break;
+      
+      err = snd_pcm_writei (p->handle, buffer + nwritten, frames);
       if (err < 0)
         {
           if (err == -EPIPE)
diff --git a/src/window.c b/src/window.c
index 8a25992d783..508ddadae9a 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3612,11 +3612,12 @@ The variables `special-display-buffer-names',
 `same-window-regexps' customize how certain buffer names are handled.
 The latter two take effect only if NOT-THIS-WINDOW is nil.
 
-If optional argument FRAME is `visible', search all visible frames.
-If FRAME is 0, search all visible and iconified frames.
-If FRAME is t, search all frames.
-If FRAME is a frame, search only that frame.
-If FRAME is nil, search only the selected frame
+If optional argument FRAME is `visible', check all visible frames
+for a window to use.
+If FRAME is 0, check all visible and iconified frames.
+If FRAME is t, check all frames.
+If FRAME is a frame, check only that frame.
+If FRAME is nil, check only the selected frame
  (actually the last nonminibuffer frame),
  unless `pop-up-frames' or `display-buffer-reuse-frames' is non-nil,
  which means search visible and iconified frames.
diff --git a/src/xdisp.c b/src/xdisp.c
index cd4683a71b9..ee17abb7794 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -13283,8 +13283,15 @@ redisplay_window (window, just_this_one_p)
 
       /* If first window line is a continuation line, and window start
          is inside the modified region, but the first change is before
-         current window start, we must select a new window start.*/
+         current window start, we must select a new window start.
+
+         However, if this is the result of a down-mouse event (e.g. by
+         extending the mouse-drag-overlay), we don't want to select a
+         new window start, since that would change the position under
+         the mouse, resulting in an unwanted mouse-movement rather
+         than a simple mouse-click.  */
       if (NILP (w->start_at_line_beg)
+          && NILP (do_mouse_tracking)
           && CHARPOS (startp) > BEGV)
         {
           /* Make sure beg_unchanged and end_unchanged are up to date.
diff --git a/src/xselect.c b/src/xselect.c
index 4f6959587fd..3fe109a5b85 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -2975,8 +2975,17 @@ it merely informs you that they have happened.  */);
 
   DEFVAR_LISP ("selection-coding-system", &Vselection_coding_system,
                doc: /* Coding system for communicating with other X clients.
-When sending or receiving text via selection and clipboard, the text is
-encoded or decoded by this coding system.
+
+When sending text via selection and clipboard, if the requested
+data-type is not "UTF8_STRING", the text is encoded by this coding
+system.
+
+When receiving text, if the data-type of the received text is not
+"UTF8_STRING", it is decoded by this coding system.
+
+See also the documentation of the variable `x-select-request-type' how
+to control which data-type to request for receiving text.
+
 The default value is `compound-text-with-extensions'.  */);
   Vselection_coding_system = intern ("compound-text-with-extensions");
 
diff --git a/src/xterm.c b/src/xterm.c
index 925b4e3bd1f..8b33bf00e54 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -5525,7 +5525,7 @@ x_scroll_bar_expose (bar, event)
 
   x_scroll_bar_set_handle (bar, XINT (bar->start), XINT (bar->end), 1);
 
-   /* Switch to scroll bar foreground color. */
+  /* Switch to scroll bar foreground color.  */
   if (f->output_data.x->scroll_bar_foreground_pixel != -1)
     XSetForeground (FRAME_X_DISPLAY (f), gc,
                     f->output_data.x->scroll_bar_foreground_pixel);
@@ -6979,15 +6979,16 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit)
                 int y = event.xbutton.y;
 
                 window = window_from_coordinates (f, x, y, 0, 0, 0, 1);
-                if (EQ (window, f->tool_bar_window))
+                tool_bar_p = EQ (window, f->tool_bar_window);
+
+                if (tool_bar_p && event.xbutton.button < 4)
                   {
-                    if (event.xbutton.type == ButtonPress)
-                      handle_tool_bar_click (f, x, y, 1, 0);
-                    else
-                      handle_tool_bar_click (f, x, y, 0,
-                                             x_x_to_emacs_modifiers (dpyinfo,
+                    if (event.xbutton.type == ButtonPress)
+                      handle_tool_bar_click (f, x, y, 1, 0);
+                    else
+                      handle_tool_bar_click (f, x, y, 0,
+                                             x_x_to_emacs_modifiers (dpyinfo,
                                                                      event.xbutton.state));
-                    tool_bar_p = 1;
                   }
               }