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

1 files changed, 113 insertions, 34 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.