Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 781-792)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 33-41)
 * gnus--rel--5.10  (patch 226-228)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-21

1 files changed, 257 insertions, 34 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 1ffb57b761a..a2e1e5b8484 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,224 @@
+2007-06-10  Jason Rumney  <jasonr@gnu.org>
+
+        * w32fns.c (Fx_file_dialog): Take size from struct not pointer.
+
+2007-06-08  Juanma Barranquero  <lekktu@gmail.com>
+
+        * callint.c (Fcall_interactively):
+        * editfns.c (Fdelete_and_extract_region):
+        * fileio.c (Fread_file_name):
+        * fns.c (Fmapconcat):
+        * keyboard.c (cmd_error_internal):
+        * keymap.c (Fkey_description):
+        * lread.c (openp):
+        * minibuf.c (read_minibuf):
+        * search.c (wordify):
+        * sunfns.c (sel_read):
+        * xdisp.c (Fformat_mode_line, syms_of_xdisp):
+        * xfns.c (x_default_scroll_bar_color_parameter):
+        * xmenu.c (menu_help_callback):
+        * xselect.c (Fx_get_atom_name):
+        * xterm.c (x_term_init): Use empty_unibyte_string.
+
+2007-06-08  Dmitry Antipov  <dmitry.antipov@mail.ru>  (tiny change)
+
+        * alloc.c (init_strings): Initialize canonical empty strings.
+        (make_uninit_string, make_uninit_multibyte_string): Return appropriate
+        canonical empty string when the requested size is 0.
+
+        * emacs.c (empty_unibyte_string): Rename from empty_string.
+        (empty_multibyte_string): New canonical empty string.
+        (syms_of_emacs): Don't initialize empty_string.
+
+        * lisp.h (STRING_SET_UNIBYTE): Return the canonical empty unibyte
+        string, if appropriate.
+        (empty_unibyte_string, empty_multibyte_string): New externs.
+        (empty_string): Remove extern.
+
+        * lread.c (syms_of_lread): Use empty_unibyte_string.
+
+2007-06-07  Jason Rumney  <jasonr@gnu.org>
+
+        * s/ms-w32.h: Don't define HAVE_TZNAME.
+
+        * editfns.c (Fcurrent_time_zone): Remove hack for Japanese Windows.
+
+2007-06-07  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * mac.c (xrm_get_preference_database): Remove BLOCK_INPUT.
+
+        * macfns.c (mac_get_window_bounds): Move extern to macterm.h.
+        (compute_tip_xy) [TARGET_API_MAC_CARBON]: Use GetGlobalMouse.
+
+        * macmenu.c [TARGET_API_MAC_CARBON] (menu_target_item_handler):
+        Don't call next handler.
+        [TARGET_API_MAC_CARBON] (install_menu_target_item_handler):
+        Remove argument.  Install handler to application.
+        (set_frame_menubar): Don't change deep_p.
+        (mac_menu_show):  Use FRAME_OUTER_TO_INNER_DIFF_X and
+        FRAME_OUTER_TO_INNER_DIFF_Y.
+        (DIALOG_BUTTON_COMMAND_ID_OFFSET, DIALOG_BUTTON_COMMAND_ID_P)
+        (DIALOG_BUTTON_COMMAND_ID_VALUE, DIALOG_BUTTON_MAKE_COMMAND_ID)
+        [HAVE_DIALOGS]: New macros.
+        [HAVE_DIALOGS] (mac_handle_dialog_event, create_and_show_dialog):
+        Use them.
+        (fill_menubar) [TARGET_API_MAC_CARBON]: Use CFString.
+
+        * macselect.c [MAC_OSX] (install_service_handler): Rename from
+        init_service_handler.  All callers changed.  Return OSStatus value.
+
+        * macterm.c (mac_begin_cg_clip): New arg F.  Call SetPortWindowPort.
+        All callers changed so as not to call SetPortWindowPort.
+        (mac_begin_cg_clip) [USE_CG_DRAWING]: Call mac_prepare_for_quickdraw.
+        (mac_draw_image_string_atsui) [USE_ATSUI]: New function created from
+        mac_draw_string_common.
+        (mac_draw_image_string_qd): Likewise.
+        (mac_draw_string_common): Use them.  Add INLINE.
+        (XTmouse_position, x_scroll_bar_report_motion) [TARGET_API_MAC_CARBON]:
+        Use FRAME_OUTER_TO_INNER_DIFF_X, FRAME_OUTER_TO_INNER_DIFF_Y, and
+        GetGlobalMouse.
+        (x_set_mouse_pixel_position) [MAC_OSX]: Use FRAME_OUTER_TO_INNER_DIFF_X
+        and FRAME_OUTER_TO_INNER_DIFF_Y.
+        [TARGET_API_MAC_CARBON] (mac_handle_mouse_event): Likewise.
+        [USE_MAC_TSM] (mac_handle_text_input_event): Likewise.
+        (x_make_frame_visible) [TARGET_API_MAC_CARBON]: Move code for
+        repositioning window to mac_handle_window_event.
+        (x_make_frame_invisible) [TARGET_API_MAC_CARBON]: Move code for
+        saving window location to mac_handle_window_event
+        [USE_MAC_FONT_PANEL] (mac_show_hide_font_panel): Install handler here.
+        (install_menu_target_item_handler): Remove argument in extern.
+        [TARGET_API_MAC_CARBON] (mac_event_to_emacs_modifiers):
+        Also accept command events.
+        (do_keystroke): New function created from XTread_socket.
+        (init_command_handler): Remove functions.
+        [TARGET_API_MAC_CARBON] (mac_handle_window_event): Reposition window
+        and save window location by kEventWindowShowing and kEventWindowHiding
+        handlers here.  Don't call next handler for window state change and
+        focus events.
+        (mac_handle_application_event, mac_handle_keyboard_event)
+        [TARGET_API_MAC_CARBON]: New functions.
+        (install_window_handler) [TARGET_API_MAC_CARBON]: Register handlers for
+        kEventWindowShowing and kEventWindowHiding events.  Move installation
+        of mouse, font, text input and menu target item handlers to
+        install_application_handler.
+        (install_application_handler) [TARGET_API_MAC_CARBON]: New function.
+        (mac_handle_cg_display_reconfig) [MAC_OS_X_VERSION_MAX_ALLOWED >= 1030]:
+        New function.
+        (init_dm_notification_handler) [MAC_OS_X_VERSION_MAX_ALLOWED >= 1030]:
+        Register it.
+        (XTread_socket) [TARGET_API_MAC_CARBON]: Consolidate
+        SendEventToEventTarget calls.  Use FRAME_OUTER_TO_INNER_DIFF_X and
+        FRAME_OUTER_TO_INNER_DIFF_Y.  Move application activation handler
+        to mac_handle_application_event.  Move keyboard handler to
+        mac_handle_keyboard_event.
+        (XTread_socket) [!TARGET_API_MAC_CARBON]: Use do_keystroke.
+        (mac_initialize) [TARGET_API_MAC_CARBON]: Don't call
+        init_command_handler.  Call install_application_handler.
+
+        * macterm.h (mac_get_window_bounds): Move extern from macfns.c.
+        (FRAME_OUTER_TO_INNER_DIFF_X, FRAME_OUTER_TO_INNER_DIFF_Y): New macros.
+
+2007-06-07  Glenn Morris  <rgm@gnu.org>
+
+        * emacs.c (main): Use `emacs-copyright' in --version output.
+
+2007-06-06  Chong Yidong  <cyd@stupidchicken.com>
+
+        * image.c (xpm_load): Remove spurious call to
+        xpm_init_color_cache.
+
+2007-06-06  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macfns.c (mac_window): Replace WindowPtr with WindowRef.
+
+        * macgui.h: Replace WindowPtr with WindowRef.
+
+        * macmenu.c: Replace MenuHandle and GetMenuHandle with MenuRef and
+        GetMenuRef, respectively.  Replace WindowPtr with WindowRef.
+        Replace ControlHandle with ControlRef.
+        (install_menu_quit_handler): Rename arg MENU_HANDLE to ROOT_MENU.
+
+        * macterm.c: Replace MenuHandle and GetMenuHandle with MenuRef and
+        GetMenuRef, respectively.  Replace WindowPtr with WindowRef.
+        Replace ControlHandle with ControlRef.
+        (USE_CARBON_EVENTS): Remove.  Use TARGET_API_MAC_CARBON instead.
+        [MAC_OS8] (do_get_menus): Rename variable `menu_handle' to `menu'.
+
+        * macterm.h (struct scroll_bar): Rename member control_handle_low
+        and control_handle_high to control_ref_low and control_ref_high.
+        All uses changed.
+        (SCROLL_BAR_CONTROL_REF, SET_SCROLL_BAR_CONTROL_REF): Rename from
+        SCROLL_BAR_CONTROL_HANDLE and SET_SCROLL_BAR_CONTROL_HANDLE,
+        respectively.  All uses changed.
+        (XCreatePixmap, XCreatePixmapFromBitmapData, XSetWindowBackground)
+        (install_window_handler, remove_window_handler): Replace WindowPtr
+        with WindowRef in externs.
+
+2007-06-05  Juanma Barranquero  <lekktu@gmail.com>
+
+        * xfaces.c (Finternal_lisp_face_p): Signal error for face alias loops.
+
+2007-06-03  Nick Roberts  <nickrob@snap.net.nz>
+
+        * keyboard.c (discard_mouse_events): Add GPM_CLICK_EVENT case.
+
+        * frame.c (Fmouse_position, Fmouse_pixel_position):
+        Condition on HAVE_GPM too.
+
+        * term.c (term_mouse_highlight): Remove unused variables.
+        (Fterm_open_connection): Set gpm_zerobased to 1.
+        (term_mouse_movement, term_mouse_click, handle_one_term_event):
+        Use zero based co-ordinates.
+        (handle_one_term_event): Report a drag as mouse movement too.
+
+        * Makefile.in (MOUSE_SUPPORT): Define for HAVE_GPM.
+
+2007-06-03  Chong Yidong  <cyd@stupidchicken.com>
+
+        * image.c (search_image_cache): New function.  Require background
+        color match if background color is unspecified in the image spec.
+        (uncache_image, lookup_image): Use it.
+
+2007-06-01  Juanma Barranquero  <lekktu@gmail.com>
+
+        * window.c (Fshrink_window): Reflow docstring.
+
+2007-06-02  Chong Yidong  <cyd@stupidchicken.com>
+
+        * Version 22.1 released.
+
+2007-06-01  Richard Stallman  <rms@gnu.org>
+
+        * xfns.c (x_encode_text): Add GCPRO.
+
+2007-06-01  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * xfns.c (x_set_name_internal): Save encoded name before
+        x_encode_text in case string data is relocated.
+
+2007-05-31  Richard Stallman  <rms@gnu.org>
+
+        * buffer.c (syms_of_buffer): Doc fix.
+
+2007-05-30  Nick Roberts  <nickrob@snap.net.nz>
+
+        * sysdep.c (init_sys_modes): Add rather than replace with
+        O_NONBLOCK.
+
+        * frame.c [HAVE_GPM] (Fset_mouse_pixel_position): Add call to
+        term_mouse_moveto.
+
+        * termhooks.h (term_mouse_moveto): New extern.
+
+        * term.c (mouse_face_window): Rename...
+        (Qmouse_face_window): ...to this.
+        (term_show_mouse_face, term_clear_mouse_face)
+        (term_mouse_highlight): Use Qmouse_face_window.
+        (term_mouse_moveto): New function.
+        (term_mouse_position): Make it work.
+        (syms_of_term): Uncomment assignment to mouse_position_hook.
+        Staticpro Qmouse_face_window.
+
 2007-05-28  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
         * xdisp.c (redisplay_internal): Bind inhibit-point-motion-hooks to t
@@ -6,14 +227,14 @@
 2007-05-26  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * xfaces.c (syms_of_xfaces): Delete stray semicolon.
-        * xdisp.c (next_element_from_buffer): 
-        * window.c (delete_window): 
-        * term.c (term_mouse_highlight): 
-        * msdos.c (getdefdir): 
+        * xdisp.c (next_element_from_buffer):
+        * window.c (delete_window):
+        * term.c (term_mouse_highlight):
+        * msdos.c (getdefdir):
         * macterm.c (mac_create_bitmap_from_bitmap_data)
-        (init_font_name_table): 
-        * fns.c (Fsxhash): 
-        * data.c (Fmake_local_variable): 
+        (init_font_name_table):
+        * fns.c (Fsxhash):
+        * data.c (Fmake_local_variable):
         * ccl.c (ccl_driver): Likewise.
 
 2007-05-24  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
@@ -25,7 +246,7 @@
 
         * image.c (uncache_image): Fix typo.
 
-2007-05-23  Johannes Weiner <hannes@saeurebad.de> (tiny change)
+2007-05-23  Johannes Weiner  <hannes@saeurebad.de>  (tiny change)
 
         * keyboard.c (make_lispy_movement): Condition on HAVE_GPM too.
 
@@ -78,7 +299,7 @@
 
         * termhooks.h [HAVE_GPM_H] (enum event_kind): Add GPM_CLICK_EVENT.
         Include gpm.h.
-        (handle_one_term_event, term_gpm) New externs.
+        (handle_one_term_event, term_gpm): New externs.
 
         * sysdep.c [HAVE_GPM_H] (init_sys_modes): Make gpm_fd nonblocking
         and allow it to be interrupted by SIGIO.
@@ -144,11 +365,12 @@
 
 2007-05-07  Stefan Monnier  <monnier@iro.umontreal.ca>
 
-        * editfns.c (Ftranspose_regions): Yet another int/Lisp_Object mixup (YAILOM)
+        * editfns.c (Ftranspose_regions): Yet another int/Lisp_Object
+        mixup (YAILOM).
 
 2007-05-07  Andreas Schwab  <schwab@suse.de>
 
-        * keymap.c (Flookup_key): Fix typo in last change. 
+        * keymap.c (Flookup_key): Fix typo in last change.
 
 2007-05-07  Stefan Monnier  <monnier@iro.umontreal.ca>
 
@@ -2599,7 +2821,7 @@
         for writing files.  Call gtk_file_chooser_set_current_name to keep
         default filename.
 
-        * minibuf.c (Finternal_complete_buffer): Move after DEFUN:s it calls
+        * minibuf.c (Finternal_complete_buffer): Move after DEFUN:s it calls.
 
 2006-09-02  Jindrich Makovicka  <makovick@gmail.com>  (tiny change)
 
@@ -2856,7 +3078,7 @@
         * xterm.h (struct x_display_info): Add x_dnd_atoms* to keep track
         of drag and drop Atoms.
 
-        * xterm.c (x_term_init): Initialize dpyinfo->x_dnd_atoms*
+        * xterm.c (x_term_init): Initialize dpyinfo->x_dnd_atoms*.
 
 2006-08-10  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
@@ -4022,7 +4244,7 @@
 
 2006-05-23  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
-        * xterm.c: Remove declarations already in xterm.h
+        * xterm.c: Remove declarations already in xterm.h.
 
         * xterm.h: Add extern declarations for x_clear_errors,
         x_fully_uncatch_errors, x_catching_errors and
@@ -4763,7 +4985,8 @@
 
         * puresize.h (pure_write_error): Mark as NO_RETURN.
 
-        * lisp.h (args_out_of_range, args_out_of_range_3)
+        * lisp.h (args_out_of_range, args_out_of_range_3, Fkill_emacs):
+        Likewise.
 
 2006-04-08  Eli Zaretskii  <eliz@gnu.org>
 
@@ -6380,7 +6603,7 @@
 
         * macterm.c (Qmac_ready_for_drag_n_drop, Qapplication, Qabout)
         (Qpreferences): Remove variables.
-        (syms_of_macterm) : Don't initialize them.
+        (syms_of_macterm): Don't initialize them.
         (Qhicommand) [USE_CARBON_EVENTS]: New variable.
         (syms_of_macterm) [USE_CARBON_EVENTS]: Initialize it.
         (init_required_apple_events, do_ae_open_application)
@@ -7062,7 +7285,7 @@
 
         * mac.c [TARGET_API_MAC_CARBON] (get_cfstring_encoding_from_lisp):
         Allow nil as argument.
-         [TARGET_API_MAC_CARBON] (Fmac_code_convert_string): Regard nil
+        [TARGET_API_MAC_CARBON] (Fmac_code_convert_string): Regard nil
         for encoding arguments as UTF-16 in native byte order, no BOM.
 
         * macfns.c (Fx_create_frame): Add debugging code.
@@ -9998,7 +10221,7 @@
         (cfobject_desc_to_lisp, cfproperty_list_to_lisp): Likewise.
 
         * process.c (init_process): Change `#ifdef DARWIN' to `#if
-        defined (DARWIN) || defined (MAC_OSX)'
+        defined (DARWIN) || defined (MAC_OSX)'.
 
         * s/darwin.h (DARWIN): Don't define.
 
@@ -10535,7 +10758,7 @@
 2005-02-03  Kim F. Storm  <storm@cua.dk>
 
         * dispnew.c (build_frame_matrix_from_leaf_window)
-         [!GLYPH_DEBUG]: Fix xassert.
+        [!GLYPH_DEBUG]: Fix xassert.
 
         * xfaces.c (x_free_gc) [!GLYPH_DEBUG]: Fix xassert.
 
@@ -11425,7 +11648,7 @@
 
 2004-12-20  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
-        * macterm.c (mac_do_list_fonts): Fix memory leak
+        * macterm.c (mac_do_list_fonts): Fix memory leak.
 
 2004-12-20  Richard M. Stallman  <rms@gnu.org>
 
@@ -12205,7 +12428,7 @@
         * Makefile.in (SOME_MACHINE_OBJECTS): Add fringe.o, image.o
         and w32*.o.
         (temacs${EXEEXT}): Generate buildobj.lst when temacs is linked.
-        (mostlyclean): Rm buildobj.lst
+        (mostlyclean): Rm buildobj.lst.
 
         * makefile.w32-in ($(TEMACS)): Generate buildobj.lst when temacs
         is linked.
@@ -12543,7 +12766,7 @@
         (SAFE_ALLOCA, SAFE_ALLOCA_LISP): Increment it when malloc is used.
         (SAFE_FREE): Test it to determine if we need to unwind to free.
         Remove size arg.  All users changed.
-        (SAFE_FREE_LISP) Remove.  All users changed to use SAFE_FREE.
+        (SAFE_FREE_LISP): Remove.  All users changed to use SAFE_FREE.
 
 2004-10-26  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
@@ -13205,7 +13428,7 @@
         (single_submenu): Use ENCODE_MENU_STRING
         (mac_menu_show): Use ENCODE_MENU_STRING.  Reset grabbed because
         button release isn't passed to event loop
-        (add_menu_item): Use SetMenuItemWithCFString
+        (add_menu_item): Use SetMenuItemWithCFString.
 
 2004-08-26  Steven Tamm  <steventamm@mac.com>
 
@@ -13474,7 +13697,7 @@
         blocking on event queue only by calling ReceiveNextEvent
         instead of select (since GUI events aren't on an fd).
         (sys_read): Remove function
-        * sysdep.c: Remove redefine of read to sys_read if HAVE_CARBON
+        * sysdep.c: Remove redefine of read to sys_read if HAVE_CARBON.
 
 2004-07-18  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
@@ -13484,12 +13707,12 @@
         * macterm.c (x_make_frame_visible): Comment in polling on
         frame creation.
 
-        * keyboard.c: Undef SIGIO on Carbon
+        * keyboard.c: Undef SIGIO on Carbon.
 
         * atimer.c (alarm_signal_handler): Call alarm handlers after
         scheduling.
 
-        * eval.c (Feval): Remove quit_char test
+        * eval.c (Feval): Remove quit_char test.
 
         * process.c (wait_reading_process_input): Remove clearing
         stdin for select call on process input.
@@ -14441,7 +14664,7 @@
 2004-05-11  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
         * macterm.c (x_flush, XTframe_up_to_date): Use FRAME_MAC_P
-        instead of FRAME_X_P
+        instead of FRAME_X_P.
 
 2004-05-11  Kim F. Storm  <storm@cua.dk>
 
@@ -14611,7 +14834,7 @@
 
 2004-05-01  Jason Rumney  <jasonr@gnu.org>
 
-        * w32term.c (x_draw_hollow_cursor): Sync with xterm.c
+        * w32term.c (x_draw_hollow_cursor): Sync with xterm.c.
 
 2004-04-30  Kim F. Storm  <storm@cua.dk>
 
@@ -17404,7 +17627,7 @@
 
         * makefile.w32-in (alloca.o): Remove.
         (coding.o): Depend on intervals.h
-        (emacs.o, bytecode.o): Depend on window.h
+        (emacs.o, bytecode.o): Depend on window.h.
 
 2003-09-01  Dave Love  <fx@gnu.org>
 
@@ -18185,7 +18408,7 @@
         * gtkutil.c: Include keyboard.h, charset.h, coding.h.
         (xg_create_frame_widgets): Use ENCODE_UTF_8.
 
-        * xterm.c (Qutf_8): Move to coding.c
+        * xterm.c (Qutf_8): Move to coding.c.
 
         * xmenu.c (ENCODE_MENU_STRING): New.
         (list_of_panes, list_of_items, digest_single_submenu, xmenu_show):
@@ -20914,7 +21137,7 @@
         (redisplay_internal): Add check for USE_GTK and popup_activated.
         (redisplay_window): Add check for USE_GTK and FRAME_EXTERNAL_MENU_BAR.
         (redisplay_window): Add check for USE_GTK and FRAME_EXTERNAL_TOOL_BAR.
-        (display_menu_bar): Add check for USE_GTK
+        (display_menu_bar): Add check for USE_GTK.
 
         * lisp.h (Vx_resource_name): Declare extern.
 
@@ -22032,7 +22255,7 @@
 
         * buffer.c (assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
         (call_overlay_mod_hooks): Use CONSP and XCAR/XCDR.
-        (Fget_buffer_create, advance_to_char_boundary): Use BEG and BEG_BYTE;
+        (Fget_buffer_create, advance_to_char_boundary): Use BEG and BEG_BYTE.
 
 2002-10-21  Stefan Monnier  <monnier@cs.yale.edu>
 
@@ -23731,8 +23954,8 @@
         * fns.c (Fstring_make_unibyte): Doc fix.
 
         * xselect.c (lisp_data_to_selection_data): If the requested type
-         is STRING, call string_make_unibyte to encode the selected text
-         as a string.
+        is STRING, call string_make_unibyte to encode the selected text
+        as a string.
 
         * window.c (Fset_window_hscroll): Doc fix.