Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 586-614)

   - Update from CVS
   - Update from erc--emacs--22
   - Merge from gnus--rel--5.10
   - Merge from erc--main--0
   - Make byte compiler correctly write circular constants

 * gnus--rel--5.10  (patch 186-196)

   - Update from CVS
   - Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-162

1 files changed, 261 insertions, 7 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 717e4cdf963..208084ff12a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,257 @@
+2007-01-24  Kim F. Storm  <storm@cua.dk>
+
+        * keymap.c (describe_map): Don't consider prefix keys to be shadowed.
+
+2007-01-23  Juanma Barranquero  <lekktu@gmail.com>
+
+        * editfns.c (Finsert_char): Doc fix.
+        (Fget_internal_run_time, Fdecode_time): Fix typos in docstrings.
+
+2007-01-22  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macselect.c [TARGET_API_MAC_CARBON] (mac_do_receive_drag): Don't
+        pass keyboard modifiers to mac_store_drag_event, but put them as
+        kEventParamKeyModifiers Apple event parameter.
+
+2007-01-21  Chong Yidong  <cyd@stupidchicken.com>
+
+        * xdisp.c (try_window): Revert previous change.
+
+        * dispnew.c (update_text_area): Revert 2006-09-17 change.
+        Always redraw non-mode-line rows with mouse-face.
+
+2007-01-20  Chong Yidong  <cyd@stupidchicken.com>
+
+        * xdisp.c (try_window): Clear mouse-face highlights first.
+
+        * window.c (set_window_buffer): Revert 2006-11-22 change.
+
+2007-01-20  Eli Zaretskii  <eliz@gnu.org>
+
+        * .gdbinit (ppt, xtype, xmisctype, xint, xptr, xmarker, xframe)
+        (xbuffer, xcons, xcar, xcdr): Fix doc strings.
+
+2007-01-20  Chong Yidong  <cyd@stupidchicken.com>
+
+        * keyboard.c (read_key_sequence): Extract local map only if the
+        given position is in an accessible buffer region.
+
+2007-01-19  Nick Roberts  <nickrob@snap.net.nz>
+
+        * .gdbinit: Reformat documentation so that first sentence
+        displays properly with "help user-defined" (like apropos).
+
+2007-01-18  Bruno Haible  <bruno@clisp.org>  (tiny change)
+
+        * epaths.in: Move PATH_DOC from local/info to local/share/info.
+
+2007-01-15  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macmenu.c (create_and_show_dialog) [TARGET_API_MAC_CARBON]:
+        Create movable modal window instead of movable alert window.
+        (create_and_show_dialog) [!MAC_OSX]: Use DeactivateControl instead
+        of DisableControl.
+
+        * macselect.c (Fmac_resume_apple_event): Set error number when
+        descriptor type of reply is non-null.
+
+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
+        enabled one.  Use icon of application in execution.
+
+2007-01-13  Eli Zaretskii  <eliz@gnu.org>
+
+        * process.c (Fdelete_process, Fprocess_id, sigchld_handler):
+        Copy PID into EMACS_INT to avoid GCC warnings.
+
+        * fns.c (maybe_resize_hash_table): Copy new size of hash table
+        into EMACS_INT to avoid GCC warnings.
+
+        * editfns.c (Fuser_uid, Fuser_real_uid): Copy values returned by
+        geteuid and getuid into EMACS_INT to avoid GCC warnings.
+
+        * dired.c (Ffile_attributes): Fix last change.
+
+2007-01-12  Eli Zaretskii  <eliz@gnu.org>
+
+        * dired.c (Ffile_attributes): Copy some members of `struct stat'
+        into int's to avoid GCC warnings about limited range of short in
+        arguments to FIXNUM_OVERFLOW_P.
+
+2007-01-12  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macmenu.c (HAVE_DIALOGS): Define if TARGET_API_MAC_CARBON.
+        (mac_handle_dialog_event, install_dialog_event_handler)
+        (create_and_show_dialog) [TARGET_API_MAC_CARBON]: New functions.
+        (DIALOG_LEFT_MARGIN, DIALOG_TOP_MARGIN, DIALOG_RIGHT_MARGIN)
+        (DIALOG_BOTTOM_MARGIN, DIALOG_MIN_INNER_WIDTH)
+        (DIALOG_MAX_INNER_WIDTH, DIALOG_BUTTON_BUTTON_HORIZONTAL_SPACE)
+        (DIALOG_BUTTON_BUTTON_VERTICAL_SPACE, DIALOG_BUTTON_MIN_WIDTH)
+        (DIALOG_TEXT_MIN_HEIGHT, DIALOG_TEXT_BUTTONS_VERTICAL_SPACE)
+        (DIALOG_ICON_WIDTH, DIALOG_ICON_HEIGHT, DIALOG_ICON_LEFT_MARGIN)
+        (DIALOG_ICON_TOP_MARGIN) [TARGET_API_MAC_CARBON]: New macros.
+        (mac_dialog) [TARGET_API_MAC_CARBON]: Remove function.
+        (mac_dialog_show) [TARGET_API_MAC_CARBON]: Use create_and_show_dialog.
+
+        * macterm.c (x_free_frame_resources) [USE_CG_DRAWING]: Call
+        mac_prepare_for_quickdraw.
+        (quit_char, make_ctrl_char) [TARGET_API_MAC_CARBON]: Move externs
+        outside #ifdef MAC_OSX.
+        (mac_quit_char_key_p) [TARGET_API_MAC_CARBON]: Move function
+        outside #ifdef MAC_OSX.
+        (mac_check_bundle) [MAC_OSX]: Remove unused function.
+
+        * macterm.h (mac_quit_char_key_p): Move extern outside #ifdef MAC_OSX.
+        (HOURGLASS_WIDTH, HOURGLASS_HEIGHT): Parenthesize definitions.
+
+2007-01-11  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * alloc.c (BLOCK_INPUT_ALLOC, UNBLOCK_INPUT_ALLOC): Use pthread_equal,
+        block/unblock SIGIO.
+
+2007-01-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * editfns.c (Fformat): Allow integer-format to work with floats of size
+        larger than most-positive-fixnum (but still smaller than MAXINT).
+
+        * dired.c (Ffile_attributes): Use floats for large uids/gids.
+
+2007-01-09  Eli Zaretskii  <eliz@gnu.org>
+
+        * emacs.c (syms_of_emacs) <path-separator>: Doc fix.
+
+2007-01-09  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * callproc.c (Fcall_process_region) [HAVE_MKSTEMP]: Add BLOCK_INPUT
+        around mkstemp.
+
+        * image.c (XDrawLine) [MAC_OS]: Remove macro.
+        (XCreateGC_pixmap) [!HAVE_NTGUI]: Likewise.
+        (x_disable_image) [!HAVE_NTGUI]: Use XCreateGC instead of
+        XCreateGC_pixmap.
+
+        * macgui.h (Display): Typedef to opaque type.
+
+        * macmenu.c (mac_dialog_modal_filter) [MAC_OSX]: New function.
+        (Fx_popup_dialog) [MAC_OSX]: Use standard alert if called from
+        Fmessage_box, Fyes_or_no_p, or Fy_or_n_p.
+        [MAC_OS_X_VERSION_MAX_ALLOWED >= 1030] (menu_quit_handler):
+        Use mac_quit_char_key_p.
+
+        * macterm.c (XDrawLine): Rename from mac_draw_line_to_pixmap.
+        (XCreateGC): Change type of 2nd argument to void *.
+        (XFreeGC) [USE_CG_DRAWING && MAC_OS_X_VERSION_MAX_ALLOWED >= 1030]:
+        Fix last change.
+        (mac_to_emacs_modifiers): Change return type to int.
+        [USE_CARBON_EVENTS] (mac_event_to_emacs_modifiers): Likewise.
+        (mac_mapped_modifiers): New function.
+        (XTread_socket): Use it.
+        [USE_TSM] (mac_handle_text_input_event): Likewise.
+        (do_window_update) [USE_CG_DRAWING]: Call mac_prepare_for_quickdraw.
+        (mac_quit_char_modifiers, mac_quit_char_keycode) [MAC_OSX]:
+        Remove variables.
+        (mac_determine_quit_char_modifiers, init_quit_char_handler)
+        [MAC_OSX]: Remove functions.
+        (make_ctrl_char) [MAC_OSX]: Add extern.
+        (mac_quit_char_key_p) [MAC_OSX]: New function.
+        (mac_initialize) [MAC_OSX]: Don't call init_quit_char_handler.
+
+        * macterm.h (FONT_MAX_WIDTH): Remove unused macro.
+        (XCreateGC): Change type in extern.
+        (XDrawLine): Rename from mac_draw_line_to_pixmap.
+        (mac_quit_char_key_p) [MAC_OSX]: Add extern.
+
+2007-01-08  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * keyboard.c (init_keyboard): Initialize interrupt_input_blocked and
+        interrupt_input_pending.
+
+        * xterm.h (x_display_info): New: net_supported_atoms,
+        nr_net_supported_atoms and net_supported_window.
+
+        * xterm.c (last_user_time): New variable.
+        (handle_one_xevent): Set last_user_time from events that have Time.
+        Set net_supported_window to 0 when reparented.
+        (wm_supports): New function.
+        (do_ewmh_fullscreen): Use wm_supports to check for _NET_WM_STATE.
+        (x_term_init): Initialize net_supported_atoms, nr_net_supported_atoms
+        and net_supported_window.
+
+2007-01-05  Kim F. Storm  <storm@cua.dk>
+
+        * indent.c (Fvertical_motion): Fix it overshoot check for overlay
+        strings without embedded newlines immediately followed by newline.
+
+2007-01-05  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * editfns.c (Fformat_time_string, Fdecode_time, Fencode_time)
+        (Fcurrent_time_string, Fcurrent_time_zone): Add BLOCK_INPUT around
+        gmtime/localtime/emacs_memftimeu/mktime.
+
+        * mac.c (Fmac_set_file_creator): Use MAC_EMACS_CREATOR_CODE
+        instead of 'EMAx'.
+        [!MAC_OSX] (sys_open, sys_creat, sys_fopen): Likewise.
+
+        * macgui.h (struct _XGC) [USE_CG_DRAWING
+        && MAC_OS_X_VERSION_MAX_ALLOWED >= 1030]: New members cg_fore_color
+        and cg_back_color.
+
+        * macmenu.c (Vshow_help_function) [TARGET_API_MAC_CARBON]: Add extern.
+        (restore_show_help_function, menu_target_item_handler)
+        [TARGET_API_MAC_CARBON]: New functions.
+        (install_menu_target_item_handler): New function.
+        (add_menu_item) [TARGET_API_MAC_CARBON]: Set help string as menu
+        item property.
+
+        * macterm.c (CG_SET_FILL_COLOR_MAYBE_WITH_CGCOLOR)
+        (CG_SET_FILL_COLOR_WITH_GC_FOREGROUND)
+        (CG_SET_FILL_COLOR_WITH_GC_BACKGROUND)
+        (CG_SET_STROKE_COLOR_MAYBE_WITH_CGCOLOR)
+        (CG_SET_STROKE_COLOR_WITH_GC_FOREGROUND): New macros.
+        (mac_cg_color_space_rgb) [USE_CG_DRAWING]: New variable.
+        (mac_cg_color_black) [USE_CG_DRAWING
+        && MAC_OS_X_VERSION_MAX_ALLOWED >= 1030]: New variable.
+        (init_cg_color) [USE_CG_DRAWING]: New function.
+        (mac_draw_line, mac_draw_rectangle) [USE_CG_DRAWING]: Use
+        CG_SET_STROKE_COLOR_WITH_GC_FOREGROUND instead of CG_SET_STROKE_COLOR.
+        (mac_erase_rectangle, mac_clear_window, mac_draw_cg_image)
+        (mac_fill_rectangle, mac_draw_image_string_cg) [USE_CG_DRAWING]:
+        Use CG_SET_FILL_COLOR_WITH_GC_FOREGROUND or
+        CG_SET_FILL_COLOR_WITH_GC_BACKGROUND instead of CG_SET_FILL_COLOR.
+        (mac_draw_string_common) [MAC_OSX && USE_ATSUI]: Likewise.
+        (XCreateGC, XFreeGC, XSetForeground, XSetBackground) [USE_CG_DRAWING
+        && MAC_OS_X_VERSION_MAX_ALLOWED >= 1030]: Use gc->cg_fore_color and/or
+        gc->cg_back_color.
+        (install_drag_handler, remove_drag_handler): Make extern.
+        (install_menu_target_item_handler): Add extern.
+        (install_window_handler): Call install_menu_target_item_handler.
+        [MAC_OS8] (main): Use MAC_EMACS_CREATOR_CODE instead of 'EMAx'.
+        (mac_initialize) [USE_CG_DRAWING]: Call init_cg_color.
+
+        * macterm.h (MAC_EMACS_CREATOR_CODE): New enumerator.
+
+2007-01-04  Juanma Barranquero  <lekktu@gmail.com>
+
+        * window.c (Fwindow_end): Fix use of >= operator.
+
+2007-01-03  Richard Stallman  <rms@gnu.org>
+
+        * window.c (Fwindow_end): Check BUF_OVERLAY_MODIFF like BUF_MODIFF.
+
+2007-01-02  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * gtkutil.h (xg_menu_item_cb_data_): Remove highlight_id and
+        unhighlight_id.
+
+        * gtkutil.c (menuitem_highlight_callback): Invoked widget is the
+        parent of the menu item.  Get menu item widget from event.
+        (xg_create_one_menuitem, xg_update_menu_item): highlight_id and
+        unhighlight_id has been removed.
+        (create_menus): Connect enter/leave-notify-event to the menu instead
+        of individual items.
+
 2006-12-31  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
         * gtkutil.c (update_frame_tool_bar): Connect create-menu-proxy with
@@ -75,8 +329,8 @@
 
 2006-12-22  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
-        * macfns.c (mac_update_title_bar) [TARGET_API_MAC_CARBON]: Call
-        mac_update_proxy_icon also when buffer modification flag changed.
+        * macfns.c (mac_update_title_bar) [TARGET_API_MAC_CARBON]:
+        Call mac_update_proxy_icon also when buffer modification flag changed.
         [TARGET_API_MAC_CARBON] (mac_update_proxy_icon): Don't update alias,
         but compare FSRef/FSSpec of resolved alias.
 
@@ -169,8 +423,8 @@
         (Fmac_atsu_font_face_attributes) [USE_ATSUI]: New function.
         (syms_of_macfns) [USE_ATSUI]: Defsubr it.
 
-        * macselect.c [TARGET_API_MAC_CARBON] (mac_do_receive_drag): Use
-        mac_wakeup_from_rne instead of mac_post_mouse_moved_event.
+        * macselect.c [TARGET_API_MAC_CARBON] (mac_do_receive_drag):
+        Use mac_wakeup_from_rne instead of mac_post_mouse_moved_event.
 
         * macterm.c (mac_query_char_extents) [USE_ATSUI]: Don't call
         ATSUGetGlyphBounds if not necessary.
@@ -183,8 +437,8 @@
         (mac_load_query_font) [USE_ATSUI]: Use atsu_find_font_from_family_name.
         Don't get metrics for Latin-1 right half characters.
         (mac_load_query_font): Don't load font if space width is not positive.
-        [TARGET_API_MAC_CARBON] (mac_store_event_ref_as_apple_event): Use
-        mac_wakeup_from_rne instead of mac_post_mouse_moved_event.
+        [TARGET_API_MAC_CARBON] (mac_store_event_ref_as_apple_event):
+        Use mac_wakeup_from_rne instead of mac_post_mouse_moved_event.
         (XTread_socket): Call SelectWindow when unfocused frame is clicked.
 
         * macterm.h (mac_wakeup_from_rne) [TARGET_API_MAC_CARBON]: Add extern.
@@ -26933,7 +27187,7 @@ See ChangeLog.9 for earlier changes.
 ;; End:
 
     Copyright (C) 2001, 2002, 2003, 2004, 2005,
-        2006 Free Software Foundation, Inc.
+        2006, 2007 Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.