Merged from miles@gnu.org--gnu-2005 (patch 292-295)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-292
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-293
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-294
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-295
   Update from CVS

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

12 files changed, 580 insertions, 130 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 02a81fb7f7c..a8e248a1718 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,85 @@
+2005-05-09  Juanma Barranquero  <lekktu@gmail.com>
+
+        * fileio.c (Fexpand_file_name, Frename_file, Fadd_name_to_file)
+        (Fmake_symbolic_link, Faccess_file, Frecent_auto_save_p):
+        Doc fixes.
+
+        * dired.c (Ffile_name_completion): Make argument name
+        match its use in docstring.
+
+2005-05-08  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * eval.c (Fdefvaralias): Remove any pre-existing
+        variable-documentation property of the alias.
+
+2005-05-07  Thien-Thi Nguyen  <ttn@gnu.org>
+
+        * xfns.c (start_hourglass): Do nothing when running on a tty.
+
+2005-05-07  Juanma Barranquero  <lekktu@gmail.com>
+
+        * fns.c (Fchar_table_range): Fix typos in docstring.
+
+2005-05-06  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * fns.c (Fchar_table_range): Yet Another Int/Lisp_Object Mixup.
+
+2005-05-06  Eli Zaretskii  <eliz@gnu.org>
+
+        * lread.c (Flocate_file_internal): Doc fix.
+
+        * Makefile.in (lisp, shortlisp): Add jka-cmpr-hook.elc.
+
+2005-05-06  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macselect.c (x_own_selection): Accept Lisp string as result of
+        selection converter function.
+        (x_clear_frame_selections): Don't call x-lost-selection-functions
+        if Emacs is not owner of the selection.
+        (Vmac_services_selection): Put variable and initialization in
+        #ifdef MAC_OSX.
+        (syms_of_macselect) [MAC_OSX]: Set default value of
+        Vmac_services_selection to PRIMARY.
+
+        * macterm.c (toolkit_scroll_bar_interaction): Remove unused variable.
+        (mac_handle_tool_bar_click): Remove unused function and declaration.
+        [USE_TOOLKIT_SCROLL_BARS] (scroll_bar_timer_callback)
+        (install_scroll_bar_timer, set_scroll_bar_timer)
+        (control_part_code_to_scroll_bar_part, construct_scroll_bar_click)
+        (get_control_part_bound, x_scroll_bar_handle_press)
+        (x_scroll_bar_handle_release, x_scroll_bar_handle_drag)
+        (x_set_toolkit_scroll_bar_thumb): New functions and declarations.
+        [USE_TOOLKIT_SCROLL_BARS] (last_scroll_bar_part, scroll_bar_timer)
+        (scroll_bar_timer_event_posted_p): New variables.
+        [USE_TOOLKIT_SCROLL_BARS] (SCROLL_BAR_FIRST_DELAY)
+        (SCROLL_BAR_CONTINUOUS_DELAY): New macros.
+        (x_scroll_bar_create): Set control reference with NewControl.
+        (x_scroll_bar_create) [USE_TOOLKIT_SCROLL_BARS]:
+        Initialize track_top and track_height to nil.
+        (x_scroll_bar_set_handle, x_scroll_bar_note_movement):
+        Put functions in #ifndef USE_TOOLKIT_SCROLL_BARS.
+        (XTset_vertical_scroll_bar): Don't make space between scroll bar
+        and associated window.
+        (XTset_vertical_scroll_bar) [MAC_OSX]: Get scroll bar area width
+        from window config.
+        (XTset_vertical_scroll_bar) [USE_TOOLKIT_SCROLL_BARS]:
+        Set track_top and track_height to nil when scroll bar size is changed.
+        Recalculate them if they are nil.
+        (XTread_socket) [MAC_OSX]: Use control kind to determine if the
+        clicked control is a scroll bar.
+        (XTread_socket) [USE_TOOLKIT_SCROLL_BARS]: Use toolkit scroll bar
+        event handler functions.  Don't add modifiers to scroll bar click
+        events.  Call scroll bar release handler when window is deactivated.
+        (mac_initialize): Remove unused code for X toolkit.
+        (syms_of_macterm) [!USE_TOOLKIT_SCROLL_BARS]:
+        Initialize Vx_toolkit_scroll_bars to nil.
+
+        * macterm.h (struct scroll_bar) [USE_TOOLKIT_SCROLL_BARS]:
+        New members track_top and track_height.
+
+        * sysselect.h [DARWIN || MAC_OSX]: Temporarily undefine
+        init_process when including sys/select.h.
+
 2005-05-05  Luc Teirlinck  <teirllm@auburn.edu>
 
         * eval.c (Fdefvaralias): Doc fix.
@@ -61,7 +143,7 @@
 2005-05-01  Kim F. Storm  <storm@cua.dk>
 
         * xdisp.c (move_it_in_display_line_to): Stop if we move beyond
-        TO_CHARPOS. This may happen if last glyphs was an image or stretch
+        TO_CHARPOS.  This may happen if last glyphs was an image or stretch
         glyph.
 
 2005-05-01  Luc Teirlinck  <teirllm@auburn.edu>
@@ -73,7 +155,7 @@
         * xmenu.c [not HAVE_X_TOOLKIT] (xmenu_show):
         If user cancels the menu, quit unless FOR_CLICK.
 
-        * macros.c (Vexecuting_kbd_macro): Renamed from Vexecuting_macro.
+        * macros.c (Vexecuting_kbd_macro): Rename from Vexecuting_macro.
         All uses changed.
         (syms_of_macros): Define only executing-kbd-macro, not executing-macro.
         * keyboard.c: Change Vexecuting_macro to Vexecuting_kbd_macro.
@@ -95,8 +177,7 @@
 
 2005-04-29  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
-        * mac.c: Don't include time.h.  Include sysselect.h after
-        systime.h.
+        * mac.c: Don't include time.h.  Include sysselect.h after systime.h.
 
         * macfns.c (Fx_server_version): Add BLOCK_INPUT around Gestalt.
 
@@ -159,13 +240,12 @@
         (mac.o): Depend on ccl.h.
         (macselect.o): New target.
 
-        * emacs.c (main) [MAC_OS8 || MAC_OSX && HAVE_CARBON]: Call
-        syms_of_macselect.
+        * emacs.c (main) [MAC_OS8 || MAC_OSX && HAVE_CARBON]:
+        Call syms_of_macselect.
 
         * frame.c (Fdelete_frame) [MAC_OS]: Call x_clear_frame_selections.
 
-        * mac.c [!TARGET_API_MAC_CARBON]: Don't include charset.h or
-        coding.h.
+        * mac.c [!TARGET_API_MAC_CARBON]: Don't include charset.h or coding.h.
         (QCLIPBOARD): Remove variable.
         (syms_of_mac): Don't initialize it.
         (Fmac_paste_function, Fmac_cut_function, Fx_selection_exists_p):
@@ -179,10 +259,10 @@
         [TARGET_API_MAC_CARBON] (Fmac_code_convert_string): Likewise.
         (syms_of_mac) [TARGET_API_MAC_CARBON]: Defsubr it.
 
-        * macterm.c (handling_window_update, terminate_flag): Remove
-        variables.
-        (do_window_update, do_ae_quit_application, XTread_socket): Don't
-        use them.
+        * macterm.c (handling_window_update, terminate_flag):
+        Remove variables.
+        (do_window_update, do_ae_quit_application, XTread_socket):
+        Don't use them.
         (WNE_SLEEP_AT_SUSPEND, WNE_SLEEP_AT_RESUME): Don't define.
         [USE_CARBON_EVENTS && MAC_OSX] (mac_handle_service_event)
         (init_service_handler): Move to macselect.c.  Remove declarations.
@@ -277,8 +357,8 @@
         Make a sub-chartable with correct initial value.
 
         * fns.c (Fset_char_table_range): Don't set slots used as default
-        values for ascii, eight-bit-control, eight-bit-graphic.  Don't
-        call Faref with charset-id.
+        values for ascii, eight-bit-control, eight-bit-graphic.
+        Don't call Faref with charset-id.
         (Fset_char_table_default): Document how to treat normal character
         argument.  Handle special slots used as default values of ascii,
         eight-bit-control, eight-bit-control.  Make a sub chartable if
@@ -313,8 +393,8 @@
         create_text_encoding_info_alist instead.
         (init_font_name_table) [TARGET_API_MAC_CARBON]: Use Font Manager
         routines also on Mac OS Classic.
-        (init_font_name_table) [!TARGET_API_MAC_CARBON]: Use
-        add_font_name_table_entry.
+        (init_font_name_table) [!TARGET_API_MAC_CARBON]:
+        Use add_font_name_table_entry.
         (mac_do_list_fonts): Regard 0 in XLFD scaleble fields as
         specified.  Derive unspecified scalable fields from specified one.
         (x_list_fonts): Consider Valternate_fontname_alist.
@@ -412,8 +492,7 @@
 
         * mac.c: Include charset.h and coding.h.
         [TARGET_API_MAC_CARBON] (Qutf_8): Remove extern.
-        [TARGET_API_MAC_CARBON] (cfstring_create_with_string): New
-        function.
+        [TARGET_API_MAC_CARBON] (cfstring_create_with_string): New function.
         [TARGET_API_MAC_CARBON] (Fmac_get_preference): Use it.
 
         * macfns.c [TARGET_API_MAC_CARBON] (Fx_file_dialog): Likewise.
@@ -422,8 +501,8 @@
 
         * macterm.c (x_autoselect_window_p): Remove variable.
         (last_window): New variable.
-        (XTreassert_line_highlight, x_change_line_highlight): Remove
-        declarations.
+        (XTreassert_line_highlight, x_change_line_highlight):
+        Remove declarations.
         (mac_focus_changed, x_detect_focus_change): New functions and
         declarations.
         (XTextExtents16, front_emacs_window): Remove function.
@@ -436,8 +515,8 @@
         (XTread_socket): Move its contents here.  Generate select-window
         event on mouse movement if needed.  Use x_detect_focus_change on
         activate/deactivate events.  Don't deiconify frame or invalidate
-        window rectangle when dnd items are dropped.  Don't
-        activate/deactivate root control.
+        window rectangle when dnd items are dropped.
+        Don't activate/deactivate root control.
         (frame_highlight, frame_unhighlight): Activate/deactivate root
         control here.
         (syms_of_macterm): Delete DEFVAR_BOOL for x_autoselect_window_p.
@@ -453,17 +532,17 @@
 
 2005-04-14  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
-        * mac.c [!TARGET_API_MAC_CARBON]: Include MacLocales.h.  Don't
-        include TextEncodingConverter.h.
+        * mac.c [!TARGET_API_MAC_CARBON]: Include MacLocales.h.
+        Don't include TextEncodingConverter.h.
         (mac_system_script_code, Vmac_system_locale): New variables.
         (syms_of_mac): Defvar them.
         (mac_get_system_locale): New function.
 
-        * macfns.c (x_set_name, x_set_title) [!TARGET_API_MAC_CARBON]: Use
-        ENCODE_SYSTEM to encode title bar string.
+        * macfns.c (x_set_name, x_set_title) [!TARGET_API_MAC_CARBON]:
+        Use ENCODE_SYSTEM to encode title bar string.
         (x_create_tip_frame): Apply 2005-03-18 change for xfns.c.
-        (Fx_file_dialog) [TARGET_API_MAC_CARBON && !MAC_OSX]: Use
-        CFStringGetSystemEncoding to get system default string encoding.
+        (Fx_file_dialog) [TARGET_API_MAC_CARBON && !MAC_OSX]:
+        Use CFStringGetSystemEncoding to get system default string encoding.
 
         * macterm.c [!TARGET_API_MAC_CARBON]: Don't include
         TextEncodingConverter.h.
@@ -1080,7 +1159,7 @@
         * xdisp.c (init_from_display_pos): Don't read past end of
         it->overlay_strings array.
 
-2005-02-25  Stephan Stahl <stahl@eos.franken.de>  (tiny change)
+2005-02-25  Stephan Stahl  <stahl@eos.franken.de>  (tiny change)
 
         * buffer.c (syms_of_buffer): Fix typo.
 
@@ -1110,7 +1189,7 @@
         I think those asserts are bogus if buffer contains invisible text
         or images.
 
-2005-02-21  David Kastrup <dak@gnu.org>
+2005-02-21  David Kastrup  <dak@gnu.org>
 
         * gtkutil.c (xg_create_frame_widgets): UNBLOCK_INPUT on error.
 
@@ -3710,7 +3789,7 @@
         compositions to encode.
         (encode_coding_string): Likewise.  Free composition data.
 
-2004-09-30  Florian Weimer <fw@deneb.enyo.de>
+2004-09-30  Florian Weimer  <fw@deneb.enyo.de>
 
         * coding.c (code_convert_region): Free composition data.
 
@@ -4248,7 +4327,7 @@
         * xfns.c (x_icon_verify): New function.
         (Fx_create_frame): Use it.
 
-2004-07-22  Barry Fishman <barry_fishman@att.net>  (tiny change)
+2004-07-22  Barry Fishman  <barry_fishman@att.net>  (tiny change)
 
         * s/gnu-linux.h: Use GC_MARK_STACK if __amd64__ is defined.
 
@@ -5911,7 +5990,7 @@
         * xdisp.c (note_mode_line_or_margin_highlight): Accept HEADER_LINE
         when keymap and cursor are setup.
 
-2004-03-14  Steven Tamm <steventamm@mac.com>
+2004-03-14  Steven Tamm  <steventamm@mac.com>
 
         * Makefile.in (XMENU_OBJ) [HAVE_CARBON]: Do not include xmenu.o.
 
@@ -5973,7 +6052,7 @@
         (GTK_OBJ) [USE_GTK]: New declaration.
         (obj): Add $(GTK_OBJ) to list.
 
-2004-03-11  Steven Tamm <steventamm@mac.com>
+2004-03-11  Steven Tamm  <steventamm@mac.com>
 
         * image.c [MAC_OSX]: Include sys/stat.h.
 
diff --git a/src/Makefile.in b/src/Makefile.in
index a7013ce4de5..3407f9024ef 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -784,6 +784,7 @@ lisp= \
         ${lispsource}textmodes/paragraphs.elc \
         ${lispsource}textmodes/text-mode.elc \
         ${lispsource}emacs-lisp/timer.elc \
+        ${lispsource}jka-cmpr-hook.elc \
         ${lispsource}vc-hooks.elc \
         ${lispsource}ediff-hook.elc \
         TOOLTIP_SUPPORT \
@@ -878,6 +879,7 @@ shortlisp= \
         ../lisp/textmodes/text-mode.elc \
         ../lisp/emacs-lisp/timer.elc \
         ../lisp/vc-hooks.elc \
+        ../lisp/jka-cmpr-hook.elc \
         ../lisp/ediff-hook.elc \
         ../lisp/widget.elc \
         ../lisp/window.elc \
diff --git a/src/dired.c b/src/dired.c
index 87b48ba2d78..349154e1ac0 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -400,7 +400,7 @@ DEFUN ("file-name-completion", Ffile_name_completion, Sfile_name_completion,
 Returns the longest string
 common to all file names in DIRECTORY that start with FILE.
 If there is only one and FILE matches it exactly, returns t.
-Returns nil if DIR contains no name starting with FILE.
+Returns nil if DIRECTORY contains no name starting with FILE.
 
 This function ignores some of the possible completions as
 determined by the variable `completion-ignored-extensions', which see.  */)
diff --git a/src/eval.c b/src/eval.c
index 8b6c1885727..7f043daa555 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -747,6 +747,8 @@ The return value is ALIASED.  */)
   LOADHIST_ATTACH (symbol);
   if (!NILP (docstring))
     Fput (symbol, Qvariable_documentation, docstring);
+  else
+    Fput (symbol, Qvariable_documentation, Qnil);
 
   return aliased;
 }
diff --git a/src/fileio.c b/src/fileio.c
index d8a0a5a729f..b62dac5b3d7 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -1022,7 +1022,7 @@ DEFUN ("expand-file-name", Fexpand_file_name, Sexpand_file_name, 1, 2, 0,
        doc: /* Convert filename NAME to absolute, and canonicalize it.
 Second arg DEFAULT-DIRECTORY is directory to start with if NAME is relative
 \(does not start with slash); if DEFAULT-DIRECTORY is nil or missing,
-the current buffer's value of default-directory is used.
+the current buffer's value of `default-directory' is used.
 File name components that are `.' are removed, and
 so are file name components followed by `..', along with the `..' itself;
 note that these simplifications are done without checking the resulting
@@ -2708,7 +2708,7 @@ internal_delete_file (filename)
 
 DEFUN ("rename-file", Frename_file, Srename_file, 2, 3,
        "fRename file: \nGRename %s to file: \np",
-       doc: /* Rename FILE as NEWNAME.  Both args strings.
+       doc: /* Rename FILE as NEWNAME.  Both args must be strings.
 If file has names other than FILE, it continues to have those names.
 Signals a `file-already-exists' error if a file NEWNAME already exists
 unless optional third argument OK-IF-ALREADY-EXISTS is non-nil.
@@ -2797,7 +2797,7 @@ This is what happens in interactive use with M-x.  */)
 
 DEFUN ("add-name-to-file", Fadd_name_to_file, Sadd_name_to_file, 2, 3,
        "fAdd name to file: \nGName to add to %s: \np",
-       doc: /* Give FILE additional name NEWNAME.  Both args strings.
+       doc: /* Give FILE additional name NEWNAME.  Both args must be strings.
 Signals a `file-already-exists' error if a file NEWNAME already exists
 unless optional third argument OK-IF-ALREADY-EXISTS is non-nil.
 A number as third arg means request confirmation if NEWNAME already exists.
@@ -2864,7 +2864,7 @@ This is what happens in interactive use with M-x.  */)
 #ifdef S_IFLNK
 DEFUN ("make-symbolic-link", Fmake_symbolic_link, Smake_symbolic_link, 2, 3,
        "FMake symbolic link to file: \nGMake symbolic link to file %s: \np",
-       doc: /* Make a symbolic link to FILENAME, named LINKNAME.  Both args strings.
+       doc: /* Make a symbolic link to FILENAME, named LINKNAME.  Both args must be strings.
 Signals a `file-already-exists' error if a file LINKNAME already exists
 unless optional third argument OK-IF-ALREADY-EXISTS is non-nil.
 A number as third arg means request confirmation if LINKNAME already exists.
@@ -3209,7 +3209,7 @@ DEFUN ("file-writable-p", Ffile_writable_p, Sfile_writable_p, 1, 1, 0,
 DEFUN ("access-file", Faccess_file, Saccess_file, 2, 2, 0,
        doc: /* Access file FILENAME, and get an error if that does not work.
 The second argument STRING is used in the error message.
-If there is no error, we return nil.  */)
+If there is no error, returns nil.  */)
      (filename, string)
      Lisp_Object filename, string;
 {
@@ -6038,7 +6038,7 @@ DEFUN ("clear-buffer-auto-save-failure", Fclear_buffer_auto_save_failure,
 
 DEFUN ("recent-auto-save-p", Frecent_auto_save_p, Srecent_auto_save_p,
        0, 0, 0,
-       doc: /* Return t if buffer has been auto-saved since last read in or saved.  */)
+       doc: /* Return t if current buffer has been auto-saved since last read in or saved.  */)
      ()
 {
   return (SAVE_MODIFF < current_buffer->auto_save_modified) ? Qt : Qnil;
diff --git a/src/fns.c b/src/fns.c
index f0dff278117..216852f893e 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -2536,19 +2536,19 @@ char_table_range (table, from, to, defalt)
         error ("Characters in the range have inconsistent values");
     }
   return val;
-}  
+}
 
 
 DEFUN ("char-table-range", Fchar_table_range, Schar_table_range,
        2, 2, 0,
        doc: /* Return the value in CHAR-TABLE for a range of characters RANGE.
-RANGE should be nil (for the default value)
+RANGE should be nil (for the default value),
 a vector which identifies a character set or a row of a character set,
 a character set name, or a character code.
 If the characters in the specified range have different values,
 an error is signalled.
 
-Note that this function doesn't check the parent of CHAR_TABLE.  */)
+Note that this function doesn't check the parent of CHAR-TABLE.  */)
      (char_table, range)
      Lisp_Object char_table, range;
 {
@@ -2582,7 +2582,7 @@ Note that this function doesn't check the parent of CHAR_TABLE.  */)
     {
       size = ASIZE (range);
       if (size == 0)
-        args_out_of_range (range, 0);
+        args_out_of_range (range, make_number (0));
       CHECK_NUMBER (AREF (range, 0));
       charset_id = XINT (AREF (range, 0));
       if (size > 1)
@@ -2631,7 +2631,7 @@ Note that this function doesn't check the parent of CHAR_TABLE.  */)
         current_default = XCHAR_TABLE (char_table)->contents[defalt];
       return char_table_range (char_table, from, to, current_default);
     }
-  
+
   val = XCHAR_TABLE (char_table)->contents[128 + charset_id];
   if (! SUB_CHAR_TABLE_P (val))
     return (NILP (val) ? current_default : val);
diff --git a/src/lread.c b/src/lread.c
index 869e95a00e0..ffc7d87d977 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -1006,6 +1006,7 @@ complete_filename_p (pathname)
 
 DEFUN ("locate-file-internal", Flocate_file_internal, Slocate_file_internal, 2, 4, 0,
        doc: /* Search for FILENAME through PATH.
+Returns the file's name in absolute form, or nil if not found.
 If SUFFIXES is non-nil, it should be a list of suffixes to append to
 file name when searching.
 If non-nil, PREDICATE is used instead of `file-readable-p'.
diff --git a/src/macselect.c b/src/macselect.c
index 49246f7eddc..a115c9b3229 100644
--- a/src/macselect.c
+++ b/src/macselect.c
@@ -98,8 +98,10 @@ static Lisp_Object Vselection_converter_alist;
    selection type with a scrap flavor type via `mac-ostype'.  */
 static Lisp_Object Qmac_scrap_name, Qmac_ostype;
 
+#ifdef MAC_OSX
 /* Selection name for communication via Services menu.  */
 static Lisp_Object Vmac_services_selection;
+#endif
 
 /* Get a reference to the scrap corresponding to the symbol SYM.  The
    reference is set to *SCRAP, and it becomes NULL if there's no
@@ -455,9 +457,11 @@ x_own_selection (selection_name, selection_value)
             value = call3 (handler_fn, selection_name,
                            type, selection_value);
 
-          if (CONSP (value)
-              && EQ (XCAR (value), type)
-              && STRINGP (XCDR (value)))
+          if (STRINGP (value))
+            err = put_scrap_string (scrap, type, value);
+          else if (CONSP (value)
+                   && EQ (XCAR (value), type)
+                   && STRINGP (XCDR (value)))
             err = put_scrap_string (scrap, type, XCDR (value));
         }
 
@@ -622,7 +626,8 @@ x_clear_frame_selections (f)
       hooks = Vx_lost_selection_functions;
       selection_symbol = Fcar (Fcar (Vselection_alist));
 
-      if (!EQ (hooks, Qunbound))
+      if (!EQ (hooks, Qunbound)
+          && !NILP (Fx_selection_owner_p (selection_symbol)))
         {
           for (; CONSP (hooks); hooks = Fcdr (hooks))
             call1 (Fcar (hooks), selection_symbol);
@@ -646,7 +651,8 @@ x_clear_frame_selections (f)
         hooks = Vx_lost_selection_functions;
         selection_symbol = Fcar (Fcar (XCDR (rest)));
 
-        if (!EQ (hooks, Qunbound))
+        if (!EQ (hooks, Qunbound)
+          && !NILP (Fx_selection_owner_p (selection_symbol)))
           {
             for (; CONSP (hooks); hooks = Fcdr (hooks))
               call1 (Fcar (hooks), selection_symbol);
diff --git a/src/macterm.c b/src/macterm.c
index aeb990a80e7..1e8aba4e178 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -154,10 +154,6 @@ extern int waiting_for_input;
 
 struct frame *pending_autoraise_frame;
 
-/* Non-zero means user is interacting with a toolkit scroll bar.  */
-
-static int toolkit_scroll_bar_interaction;
-
 /* Mouse movement.
 
    Formerly, we used PointerMotionHintMask (in standard_event_mask)
@@ -256,7 +252,6 @@ QDGlobals qd;  /* QuickDraw global information structure.  */
 struct frame * x_window_to_frame (struct mac_display_info *, WindowPtr);
 struct mac_display_info *mac_display_info_for_display (Display *);
 static void x_update_window_end P_ ((struct window *, int, int));
-static void mac_handle_tool_bar_click P_ ((struct frame *, EventRecord *));
 static int x_io_error_quitter P_ ((Display *));
 int x_catch_errors P_ ((Display *));
 void x_uncatch_errors P_ ((Display *, int));
@@ -4131,30 +4126,316 @@ XTmouse_position (fp, insist, bar_window, part, x, y, time)
 }
 
 
-/***********************************************************************
-                               Tool-bars
- ***********************************************************************/
+/************************************************************************
+                         Toolkit scroll bars
+ ************************************************************************/
+
+#ifdef USE_TOOLKIT_SCROLL_BARS
+
+static pascal void scroll_bar_timer_callback P_ ((EventLoopTimerRef, void *));
+static OSStatus install_scroll_bar_timer P_ ((void));
+static OSStatus set_scroll_bar_timer P_ ((EventTimerInterval));
+static int control_part_code_to_scroll_bar_part P_((ControlPartCode));
+static void construct_scroll_bar_click P_ ((struct scroll_bar *, int,
+                                            unsigned long,
+                                            struct input_event *));
+static OSErr get_control_part_bound P_((ControlHandle, ControlPartCode,
+                                        Rect *));
+static void x_scroll_bar_handle_press P_ ((struct scroll_bar *,
+                                           ControlPartCode,
+                                           unsigned long,
+                                           struct input_event *));
+static void x_scroll_bar_handle_release P_ ((struct scroll_bar *,
+                                             unsigned long,
+                                             struct input_event *));
+static void x_scroll_bar_handle_drag P_ ((WindowPtr, struct scroll_bar *,
+                                          Point, unsigned long,
+                                          struct input_event *));
+static void x_set_toolkit_scroll_bar_thumb P_ ((struct scroll_bar *,
+                                                int, int, int));
+
+/* Last scroll bar part sent in x_scroll_bar_handle_*.  */
+
+static int last_scroll_bar_part;
+
+static EventLoopTimerRef scroll_bar_timer;
+
+static int scroll_bar_timer_event_posted_p;
+
+#define SCROLL_BAR_FIRST_DELAY 0.5
+#define SCROLL_BAR_CONTINUOUS_DELAY (1.0 / 15)
+
+static pascal void
+scroll_bar_timer_callback (timer, data)
+     EventLoopTimerRef timer;
+     void *data;
+{
+  EventRef event = NULL;
+  OSErr err;
+
+  err = CreateEvent (NULL, kEventClassMouse, kEventMouseMoved, 0,
+                     kEventAttributeNone, &event);
+  if (err == noErr)
+    {
+      Point mouse_pos;
+
+      GetMouse (&mouse_pos);
+      LocalToGlobal (&mouse_pos);
+      err = SetEventParameter (event, kEventParamMouseLocation, typeQDPoint,
+                               sizeof (Point), &mouse_pos);
+    }
+  if (err == noErr)
+    {
+      UInt32 modifiers = GetCurrentKeyModifiers ();
+
+      err = SetEventParameter (event, kEventParamKeyModifiers, typeUInt32,
+                               sizeof (UInt32), &modifiers);
+    }
+  if (err == noErr)
+    err = PostEventToQueue (GetCurrentEventQueue (), event,
+                            kEventPriorityStandard);
+  if (err == noErr)
+    scroll_bar_timer_event_posted_p = 1;
 
-/* Handle mouse button event on the tool-bar of frame F, at
-   frame-relative coordinates X/Y.  EVENT_TYPE is either ButtionPress
-   or ButtonRelase.  */
+  if (event)
+    ReleaseEvent (event);
+}
+
+static OSStatus
+install_scroll_bar_timer ()
+{
+  static EventLoopTimerUPP scroll_bar_timer_callbackUPP = NULL;
+
+  if (scroll_bar_timer_callbackUPP == NULL)
+    scroll_bar_timer_callbackUPP =
+      NewEventLoopTimerUPP (scroll_bar_timer_callback);
+
+  if (scroll_bar_timer == NULL)
+    /* Mac OS X and CarbonLib 1.5 and later allow us to specify
+       kEventDurationForever as delays.  */
+    return
+      InstallEventLoopTimer (GetCurrentEventLoop (),
+                             kEventDurationForever, kEventDurationForever,
+                             scroll_bar_timer_callbackUPP, NULL,
+                             &scroll_bar_timer);
+}
+
+static OSStatus
+set_scroll_bar_timer (delay)
+     EventTimerInterval delay;
+{
+  if (scroll_bar_timer == NULL)
+    install_scroll_bar_timer ();
+
+  scroll_bar_timer_event_posted_p = 0;
+
+  return SetEventLoopTimerNextFireTime (scroll_bar_timer, delay);
+}
+
+static int
+control_part_code_to_scroll_bar_part (part_code)
+     ControlPartCode part_code;
+{
+  switch (part_code)
+    {
+    case kControlUpButtonPart:          return scroll_bar_up_arrow;
+    case kControlDownButtonPart:        return scroll_bar_down_arrow;
+    case kControlPageUpPart:            return scroll_bar_above_handle;
+    case kControlPageDownPart:          return scroll_bar_below_handle;
+    case kControlIndicatorPart:         return scroll_bar_handle;
+    }
+
+  return -1;
+}
 
 static void
-mac_handle_tool_bar_click (f, button_event)
-     struct frame *f;
-     EventRecord *button_event;
+construct_scroll_bar_click (bar, part, timestamp, bufp)
+     struct scroll_bar *bar;
+     int part;
+     unsigned long timestamp;
+     struct input_event *bufp;
+{
+  bufp->kind = SCROLL_BAR_CLICK_EVENT;
+  bufp->frame_or_window = bar->window;
+  bufp->arg = Qnil;
+  bufp->part = part;
+  bufp->code = 0;
+  bufp->timestamp = timestamp;
+  XSETINT (bufp->x, 0);
+  XSETINT (bufp->y, 0);
+  bufp->modifiers = 0;
+}
+
+static OSErr
+get_control_part_bound (ch, part_code, rect)
+     ControlHandle ch;
+     ControlPartCode part_code;
+     Rect *rect;
+{
+  RgnHandle region = NewRgn ();
+  OSStatus err;
+
+  err = GetControlRegion (ch, part_code, region);
+  if (err == noErr)
+    GetRegionBounds (region, rect);
+  DisposeRgn (region);
+
+  return err;
+}
+
+static void
+x_scroll_bar_handle_press (bar, part_code, timestamp, bufp)
+     struct scroll_bar *bar;
+     ControlPartCode part_code;
+     unsigned long timestamp;
+     struct input_event *bufp;
+{
+  int part = control_part_code_to_scroll_bar_part (part_code);
+
+  if (part < 0)
+    return;
+
+  if (part != scroll_bar_handle)
+    {
+      construct_scroll_bar_click (bar, part, timestamp, bufp);
+      HiliteControl (SCROLL_BAR_CONTROL_HANDLE (bar), part_code);
+      set_scroll_bar_timer (SCROLL_BAR_FIRST_DELAY);
+    }
+
+  last_scroll_bar_part = part;
+  bar->dragging = Qnil;
+  tracked_scroll_bar = bar;
+}
+
+static void
+x_scroll_bar_handle_release (bar, timestamp, bufp)
+     struct scroll_bar *bar;
+     unsigned long timestamp;
+     struct input_event *bufp;
+{
+  if (last_scroll_bar_part != scroll_bar_handle
+      || !GC_NILP (bar->dragging))
+    construct_scroll_bar_click (bar, scroll_bar_end_scroll, timestamp, bufp);
+
+  HiliteControl (SCROLL_BAR_CONTROL_HANDLE (bar), 0);
+  set_scroll_bar_timer (kEventDurationForever);
+
+  last_scroll_bar_part = -1;
+  bar->dragging = Qnil;
+  tracked_scroll_bar = NULL;
+}
+
+static void
+x_scroll_bar_handle_drag (win, bar, mouse_pos, timestamp, bufp)
+     WindowPtr win;
+     struct scroll_bar *bar;
+     Point mouse_pos;
+     unsigned long timestamp;
+     struct input_event *bufp;
+{
+  ControlHandle ch = SCROLL_BAR_CONTROL_HANDLE (bar);
+
+  if (last_scroll_bar_part == scroll_bar_handle)
+    {
+      int top, top_range;
+      Rect r;
+
+      get_control_part_bound (SCROLL_BAR_CONTROL_HANDLE (bar),
+                              kControlIndicatorPart, &r);
+
+      if (GC_NILP (bar->dragging))
+        XSETINT (bar->dragging, mouse_pos.v - r.top);
+
+      top = mouse_pos.v - XINT (bar->dragging) - XINT (bar->track_top);
+      top_range = (XINT (bar->track_height) - (r.bottom - r.top)) *
+        (1.0 + (float) GetControlViewSize (ch) / GetControl32BitMaximum (ch))
+        + .5;
+      
+      if (top < 0)
+        top = 0;
+      if (top > top_range)
+        top = top_range;
+
+      construct_scroll_bar_click (bar, scroll_bar_handle, timestamp, bufp);
+      XSETINT (bufp->x, top);
+      XSETINT (bufp->y, top_range);
+    }
+  else
+    {
+      ControlPartCode part_code;
+      int unhilite_p = 0, part;
+
+      if (ch != FindControlUnderMouse (mouse_pos, win, &part_code))
+        unhilite_p = 1;
+      else
+        {
+          part = control_part_code_to_scroll_bar_part (part_code);
+
+          switch (last_scroll_bar_part)
+            {
+            case scroll_bar_above_handle:
+            case scroll_bar_below_handle:
+              if (part != scroll_bar_above_handle
+                  && part != scroll_bar_below_handle)
+                unhilite_p = 1;
+              break;
+
+            case scroll_bar_up_arrow:
+            case scroll_bar_down_arrow:
+              if (part != scroll_bar_up_arrow
+                  && part != scroll_bar_down_arrow)
+                unhilite_p = 1;
+              break;
+            }
+        }
+
+      if (unhilite_p)
+        HiliteControl (SCROLL_BAR_CONTROL_HANDLE (bar), 0);
+      else if (part != last_scroll_bar_part
+               || scroll_bar_timer_event_posted_p)
+        {
+          construct_scroll_bar_click (bar, part, timestamp, bufp);
+          last_scroll_bar_part = part;
+          HiliteControl (SCROLL_BAR_CONTROL_HANDLE (bar), part_code);
+          set_scroll_bar_timer (SCROLL_BAR_CONTINUOUS_DELAY);
+        }
+    }
+}
+
+/* Set the thumb size and position of scroll bar BAR.  We are currently
+   displaying PORTION out of a whole WHOLE, and our position POSITION.  */
+
+static void
+x_set_toolkit_scroll_bar_thumb (bar, portion, position, whole)
+     struct scroll_bar *bar;
+     int portion, position, whole;
 {
-  int x = button_event->where.h;
-  int y = button_event->where.v;
+  ControlHandle ch = SCROLL_BAR_CONTROL_HANDLE (bar);
 
-  if (button_event->what == mouseDown)
-    handle_tool_bar_click (f, x, y, 1, 0);
+  int value, viewsize, maximum;
+
+  if (whole == 0 || XINT (bar->track_height) == 0)
+    value = 0, viewsize = 1, maximum = 0;
   else
-    handle_tool_bar_click (f, x, y, 0,
-                           x_mac_to_emacs_modifiers (FRAME_MAC_DISPLAY_INFO (f),
-                                                     button_event->modifiers));
+    {
+      value = position;
+      viewsize = portion;
+      maximum = max (0, whole - portion);
+    }
+
+  BLOCK_INPUT;
+
+  SetControl32BitMinimum (ch, 0);
+  SetControl32BitMaximum (ch, maximum);
+  SetControl32BitValue (ch, value);
+  SetControlViewSize (ch, viewsize);
+
+  UNBLOCK_INPUT;
 }
 
+#endif /* USE_TOOLKIT_SCROLL_BARS */
+
+
 
 /************************************************************************
                          Scroll bars, general
@@ -4185,13 +4466,12 @@ x_scroll_bar_create (w, top, left, width, height, disp_top, disp_height)
 
 #if TARGET_API_MAC_CARBON
   ch = NewControl (FRAME_MAC_WINDOW (f), &r, "\p", 1, 0, 0, 0,
-                   kControlScrollBarProc, 0L);
+                   kControlScrollBarProc, (long) bar);
 #else
-  ch = NewControl (FRAME_MAC_WINDOW (f), &r, "\p", 1, 0, 0, 0, scrollBarProc,
-                   0L);
+  ch = NewControl (FRAME_MAC_WINDOW (f), &r, "\p", 1, 0, 0, 0,
+                   scrollBarProc, (long) bar);
 #endif
   SET_SCROLL_BAR_CONTROL_HANDLE (bar, ch);
-  SetControlReference (ch, (long) bar);
 
   XSETWINDOW (bar->window, w);
   XSETINT (bar->top, top);
@@ -4201,6 +4481,10 @@ x_scroll_bar_create (w, top, left, width, height, disp_top, disp_height)
   XSETINT (bar->start, 0);
   XSETINT (bar->end, 0);
   bar->dragging = Qnil;
+#ifdef USE_TOOLKIT_SCROLL_BARS
+  bar->track_top = Qnil;
+  bar->track_height = Qnil;
+#endif
 
   /* Add bar to its frame's list of scroll bars.  */
   bar->next = FRAME_SCROLL_BARS (f);
@@ -4227,6 +4511,8 @@ x_scroll_bar_create (w, top, left, width, height, disp_top, disp_height)
    the bar's top is as far down as it goes; otherwise, there's no way
    to move to the very end of the buffer.  */
 
+#ifndef USE_TOOLKIT_SCROLL_BARS
+
 static void
 x_scroll_bar_set_handle (bar, start, end, rebuild)
      struct scroll_bar *bar;
@@ -4286,6 +4572,7 @@ x_scroll_bar_set_handle (bar, start, end, rebuild)
   UNBLOCK_INPUT;
 }
 
+#endif /* !USE_TOOLKIT_SCROLL_BARS */
 
 /* Destroy scroll bar BAR, and set its Emacs window's scroll bar to
    nil.  */
@@ -4324,11 +4611,7 @@ XTset_vertical_scroll_bar (w, portion, whole, position)
   /* Get window dimensions.  */
   window_box (w, -1, 0, &window_y, 0, &window_height);
   top = window_y;
-#ifdef MAC_OSX
-  width = 16;
-#else
   width = WINDOW_CONFIG_SCROLL_BAR_COLS (w) * FRAME_COLUMN_WIDTH (f);
-#endif
   height = window_height;
 
   /* Compute the left edge of the scroll bar area.  */
@@ -4343,9 +4626,9 @@ XTset_vertical_scroll_bar (w, portion, whole, position)
 
   /* Compute the left edge of the scroll bar.  */
   if (WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_RIGHT (w))
-    sb_left = left + width - sb_width - (width - sb_width) / 2;
+    sb_left = left;
   else
-    sb_left = left + (width - sb_width) / 2;
+    sb_left = left + width - sb_width;
 
   /* Adjustments according to Inside Macintosh to make it look nice */
   disp_top = top;
@@ -4418,11 +4701,44 @@ XTset_vertical_scroll_bar (w, portion, whole, position)
           XSETINT (bar->top, top);
           XSETINT (bar->width, sb_width);
           XSETINT (bar->height, height);
+#ifdef USE_TOOLKIT_SCROLL_BARS
+          bar->track_top = Qnil;
+          bar->track_height = Qnil;
+#endif
         }
 
       UNBLOCK_INPUT;
     }
 
+#ifdef USE_TOOLKIT_SCROLL_BARS
+  if (NILP (bar->track_top))
+    {
+      ControlHandle ch = SCROLL_BAR_CONTROL_HANDLE (bar);
+      Rect r0, r1;
+
+      BLOCK_INPUT;
+
+      SetControl32BitMinimum (ch, 0);
+      SetControl32BitMaximum (ch, 1);
+      SetControlViewSize (ch, 1);
+
+      /* Move the scroll bar thumb to the top.  */
+      SetControl32BitValue (ch, 0);
+      get_control_part_bound (ch, kControlIndicatorPart, &r0);
+
+      /* Move the scroll bar thumb to the bottom.  */
+      SetControl32BitValue (ch, 1);
+      get_control_part_bound (ch, kControlIndicatorPart, &r1);
+
+      UnionRect (&r0, &r1, &r0);
+      XSETINT (bar->track_top, r0.top);
+      XSETINT (bar->track_height, r0.bottom - r0.top);
+
+      UNBLOCK_INPUT;
+    }
+
+  x_set_toolkit_scroll_bar_thumb (bar, portion, position, whole);
+#else /* not USE_TOOLKIT_SCROLL_BARS */
   /* Set the scroll bar's current state, unless we're currently being
      dragged.  */
   if (NILP (bar->dragging))
@@ -4438,6 +4754,7 @@ XTset_vertical_scroll_bar (w, portion, whole, position)
           x_scroll_bar_set_handle (bar, start, end, 0);
         }
     }
+#endif /* not USE_TOOLKIT_SCROLL_BARS */
 }
 
 
@@ -4619,6 +4936,7 @@ x_scroll_bar_handle_click (bar, part_code, er, bufp)
   XSETINT (bufp->y, top_range);
 }
 
+#ifndef USE_TOOLKIT_SCROLL_BARS
 
 /* Handle some mouse motion while someone is dragging the scroll bar.
 
@@ -4653,6 +4971,7 @@ x_scroll_bar_note_movement (bar, y_pos, t)
     }
 }
 
+#endif /* !USE_TOOLKIT_SCROLL_BARS */
 
 /* Return information to the user about the current position of the
    mouse on the scroll bar.  */
@@ -8657,6 +8976,9 @@ XTread_socket (sd, expected, hold_quit)
                     SInt16 control_part_code;
                     ControlHandle ch;
                     Point mouse_loc = er.where;
+#ifdef MAC_OSX
+                    ControlKind control_kind;
+#endif
 
                     f = mac_window_to_frame (window_ptr);
                     /* convert to local coordinates of new window */
@@ -8666,6 +8988,10 @@ XTread_socket (sd, expected, hold_quit)
 #if TARGET_API_MAC_CARBON
                     ch = FindControlUnderMouse (mouse_loc, window_ptr,
                                                 &control_part_code);
+#ifdef MAC_OSX
+                    if (ch)
+                      GetControlKind (ch, &control_kind);
+#endif
 #else
                     control_part_code = FindControl (mouse_loc, window_ptr,
                                                      &ch);
@@ -8684,19 +9010,42 @@ XTread_socket (sd, expected, hold_quit)
                     /* ticks to milliseconds */
 
                     if (dpyinfo->grabbed && tracked_scroll_bar
+                        || ch != 0
+#ifndef USE_TOOLKIT_SCROLL_BARS
                         /* control_part_code becomes kControlNoPart if
-                           a progress indicator is clicked.  */
-                        || ch != 0 && control_part_code != kControlNoPart)
+                           a progress indicator is clicked.  */
+                        && control_part_code != kControlNoPart
+#else  /* USE_TOOLKIT_SCROLL_BARS */
+#ifdef MAC_OSX
+                        && control_kind.kind == kControlKindScrollBar
+#endif  /* MAC_OSX */
+#endif  /* USE_TOOLKIT_SCROLL_BARS */
+                        )
                       {
                         struct scroll_bar *bar;
 
                         if (dpyinfo->grabbed && tracked_scroll_bar)
                           {
                             bar = tracked_scroll_bar;
+#ifndef USE_TOOLKIT_SCROLL_BARS
                             control_part_code = kControlIndicatorPart;
+#endif
                           }
                         else
                           bar = (struct scroll_bar *) GetControlReference (ch);
+#ifdef USE_TOOLKIT_SCROLL_BARS
+                        /* Make the "Ctrl-Mouse-2 splits window" work
+                           for toolkit scroll bars.  */
+                        if (er.modifiers & controlKey)
+                          x_scroll_bar_handle_click (bar, control_part_code,
+                                                     &er, &inev);
+                        else if (er.what == mouseDown)
+                          x_scroll_bar_handle_press (bar, control_part_code,
+                                                     inev.timestamp, &inev);
+                        else
+                          x_scroll_bar_handle_release (bar, inev.timestamp,
+                                                       &inev);
+#else  /* not USE_TOOLKIT_SCROLL_BARS */
                         x_scroll_bar_handle_click (bar, control_part_code,
                                                    &er, &inev);
                         if (er.what == mouseDown
@@ -8704,6 +9053,7 @@ XTread_socket (sd, expected, hold_quit)
                           tracked_scroll_bar = bar;
                         else
                           tracked_scroll_bar = NULL;
+#endif  /* not USE_TOOLKIT_SCROLL_BARS */
                       }
                     else
                       {
@@ -8753,15 +9103,18 @@ XTread_socket (sd, expected, hold_quit)
                           dpyinfo->grabbed &= ~(1 << inev.code);
                       }
 
-                    switch (er.what)
-                      {
-                      case mouseDown:
-                        inev.modifiers |= down_modifier;
-                        break;
-                      case mouseUp:
-                        inev.modifiers |= up_modifier;
-                        break;
-                      }
+#ifdef USE_TOOLKIT_SCROLL_BARS
+                    if (inev.kind == MOUSE_CLICK_EVENT)
+#endif
+                      switch (er.what)
+                        {
+                        case mouseDown:
+                          inev.modifiers |= down_modifier;
+                          break;
+                        case mouseUp:
+                          inev.modifiers |= up_modifier;
+                          break;
+                        }
                   }
                 break;
 
@@ -8863,10 +9216,16 @@ XTread_socket (sd, expected, hold_quit)
                   GlobalToLocal (&mouse_pos);
 
                   if (dpyinfo->grabbed && tracked_scroll_bar)
+#ifdef USE_TOOLKIT_SCROLL_BARS
+                    x_scroll_bar_handle_drag (wp, tracked_scroll_bar,
+                                              mouse_pos, er.when * (1000 / 60),
+                                              &inev);
+#else /* not USE_TOOLKIT_SCROLL_BARS */
                     x_scroll_bar_note_movement (tracked_scroll_bar,
                                                 mouse_pos.v
                                                 - XINT (tracked_scroll_bar->top),
-                                                TickCount() * (1000 / 60));
+                                                er.when * (1000 / 60));
+#endif /* not USE_TOOLKIT_SCROLL_BARS */
                   else
                     {
                       /* Generate SELECT_WINDOW_EVENTs when needed.  */
@@ -8941,6 +9300,23 @@ XTread_socket (sd, expected, hold_quit)
             else
               {
                 /* A window has been deactivated */
+#if USE_TOOLKIT_SCROLL_BARS
+                if (dpyinfo->grabbed && tracked_scroll_bar)
+                  {
+                    struct input_event event;
+
+                    EVENT_INIT (event);
+                    event.kind = NO_EVENT;
+                    x_scroll_bar_handle_release (tracked_scroll_bar,
+                                                 er.when * (1000 / 60),
+                                                 &event);
+                    if (event.kind != NO_EVENT)
+                      {
+                        kbd_buffer_store_event_hold (&event, hold_quit);
+                        count++;
+                      }
+                  }
+#endif
                 dpyinfo->grabbed = 0;
 
                 x_detect_focus_change (dpyinfo, &er, &inev);
@@ -9720,42 +10096,6 @@ mac_initialize ()
   /* Try to use interrupt input; if we can't, then start polling.  */
   Fset_input_mode (Qt, Qnil, Qt, Qnil);
 
-#ifdef USE_X_TOOLKIT
-  XtToolkitInitialize ();
-  Xt_app_con = XtCreateApplicationContext ();
-  XtAppSetFallbackResources (Xt_app_con, Xt_default_resources);
-
-  /* Install an asynchronous timer that processes Xt timeout events
-     every 0.1s.  This is necessary because some widget sets use
-     timeouts internally, for example the LessTif menu bar, or the
-     Xaw3d scroll bar.  When Xt timouts aren't processed, these
-     widgets don't behave normally.  */
-  {
-    EMACS_TIME interval;
-    EMACS_SET_SECS_USECS (interval, 0, 100000);
-    start_atimer (ATIMER_CONTINUOUS, interval, x_process_timeouts, 0);
-  }
-#endif
-
-#if USE_TOOLKIT_SCROLL_BARS
-  xaw3d_arrow_scroll = False;
-  xaw3d_pick_top = True;
-#endif
-
-#if 0
-  /* Note that there is no real way portable across R3/R4 to get the
-     original error handler.  */
-  XSetErrorHandler (x_error_handler);
-  XSetIOErrorHandler (x_io_error_quitter);
-
-  /* Disable Window Change signals;  they are handled by X events.  */
-#ifdef SIGWINCH
-  signal (SIGWINCH, SIG_DFL);
-#endif /* ! defined (SIGWINCH) */
-
-  signal (SIGPIPE, x_connection_signal);
-#endif
-
   BLOCK_INPUT;
 
 #if TARGET_API_MAC_CARBON
@@ -9832,7 +10172,11 @@ syms_of_macterm ()
 
   DEFVAR_LISP ("x-toolkit-scroll-bars", &Vx_toolkit_scroll_bars,
                doc: /* If not nil, Emacs uses toolkit scroll bars.  */);
+#ifdef USE_TOOLKIT_SCROLL_BARS
   Vx_toolkit_scroll_bars = Qt;
+#else
+  Vx_toolkit_scroll_bars = Qnil;
+#endif
 
   DEFVAR_BOOL ("x-use-underline-position-properties",
                &x_use_underline_position_properties,
diff --git a/src/macterm.h b/src/macterm.h
index 5c724aac7b2..79c78e3f0e0 100644
--- a/src/macterm.h
+++ b/src/macterm.h
@@ -492,6 +492,12 @@ struct scroll_bar {
      place where the user grabbed it.  If the handle isn't currently
      being dragged, this is Qnil.  */
   Lisp_Object dragging;
+
+#ifdef USE_TOOLKIT_SCROLL_BARS
+  /* The position and size of the scroll bar handle track area in
+     pixels, relative to the frame.  */
+  Lisp_Object track_top, track_height;
+#endif
 };
 
 /* The number of elements a vector holding a struct scroll_bar needs.  */
diff --git a/src/sysselect.h b/src/sysselect.h
index 4c52bba677a..866a65e9208 100644
--- a/src/sysselect.h
+++ b/src/sysselect.h
@@ -19,7 +19,13 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 #ifdef HAVE_SYS_SELECT_H
+#if defined (DARWIN) || defined (MAC_OSX)
+#undef init_process
+#endif
 #include <sys/select.h>
+#if defined (DARWIN) || defined (MAC_OSX)
+#define init_process emacs_init_process
+#endif
 #endif
 
 #ifdef FD_SET
diff --git a/src/xfns.c b/src/xfns.c
index 666acfec773..4a5ff0894f1 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -4388,6 +4388,10 @@ start_hourglass ()
   EMACS_TIME delay;
   int secs, usecs = 0;
 
+  /* Don't bother for ttys.  */
+  if (NILP (Vwindow_system))
+    return;
+
   cancel_hourglass ();
 
   if (INTEGERP (Vhourglass_delay)