*** empty log message ***

2 files changed, 223 insertions, 223 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index d01a5029438..5042ff7b0db 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1931,6 +1931,229 @@
 
         * 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
+        around current_column call.
+
+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):
+        * macterm.c (mac_create_bitmap_from_bitmap_data)
+        (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>
+
+        * macterm.c [USE_CARBON_EVENTS] (mac_handle_window_event):
+        Call mac_wakeup_from_rne on window size change.
+
+2007-05-25  Chong Yidong  <cyd@stupidchicken.com>
+
+        * image.c (uncache_image): Fix typo.
+
+2007-05-23  Johannes Weiner  <hannes@saeurebad.de>  (tiny change)
+
+        * keyboard.c (make_lispy_movement): Condition on HAVE_GPM too.
+
+2007-05-22  Richard Stallman  <rms@gnu.org>
+
+        * xterm.c (x_connection_closed): Remove NO_RETURN.
+
+2007-05-22  Martin Rudalics  <rudalics@gmx.at>
+
+        * syntax.c (scan_words): Fix arg to UPDATE_SYNTAX_TABLE_BACKWARD.
+
+2007-05-21  Chong Yidong  <cyd@stupidchicken.com>
+
+        * image.c (uncache_image): New function.
+        (Fimage_refresh): New function.
+
+2007-05-20  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * Makefile.in: Move GPM check outside HAVE_X_WINDOWS.
+
+2007-05-20  Nick Roberts  <nickrob@snap.net.nz>
+
+        * config.in, keyboard.c, Makefile.in, sysdep.c, term.c,
+        * termhooks.h: Use HAVE_GPM instead of HAVE_GPM_H.
+
+2007-05-20  Nick Roberts  <nickrob@snap.net.nz>
+
+        * keyboard.c (make_lispy_event): Make case GPM_CLICK_EVENT
+        conditional on [HAVE_GPM_H].
+
+2007-05-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * syntax.c (skip_chars): Update syntax-table only after we checked that
+        the new location is valid.
+
+2007-05-19  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macterm.c (x_calc_absolute_position): Add BLOCK_INPUT around
+        mac_get_window_bounds.
+
+2007-05-20  Nick Roberts  <nickrob@snap.net.nz>
+
+        * Makefile.in (LIBGPM): Allow it to be set from configure.
+        If set then link Emacs with it.
+
+        * config.in: Regenerate.
+
+        * lisp.h (add_gpm_wait_descriptor, delete_gpm_wait_descriptor):
+        New externs.
+
+        * termhooks.h [HAVE_GPM_H] (enum event_kind): Add GPM_CLICK_EVENT.
+        Include gpm.h.
+        (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.
+
+        * process.c (gpm_wait_mask, max_gpm_desc): New variables.
+        (wait_reading_process_output): Wait on gpm_fd too.
+        (add_gpm_wait_descriptor, delete_gpm_wait_descriptor)): New functions.
+        (add_gpm_wait_descriptor_called_flag): New variable.
+        (delete_keyboard_wait_descriptor): Check gpm_wait_mask.
+
+        * keyboard.c [HAVE_GPM_H] (Qmouse_fixup_help_message)
+        (make_lispy_movement, tracking_off, Ftrack_mouse, some_mouse_moved)
+        (show_help_echo, readable_events, kbd_buffer_get_event, init_keyboard):
+        Extend HAVE_MOUSE ifdefs to HAVE_GPM_H.
+        (make_lispy_event): Add case GPM_CLICK_EVENT.
+        (read_avail_input): Handle mouse input.
+
+        * term.c (write_glyphs_with_face): New function.
+        [HAVE_GPM_H]: Include buffer.h, sys/fcntl.h.
+        (mouse_face_beg_row, mouse_face_beg_col, mouse_face_end_row)
+        (mouse_face_end_col, mouse_face_past_end, mouse_face_window)
+        (mouse_face_face_id, term_gpm, pos_x, pos_y)
+        (last_mouse_x, last_mouse_y): New variables.
+        (term_show_mouse_face, term_clear_mouse_face, fast_find_position)
+        (term_mouse_highlight, term_mouse_movement, term_mouse_position)
+        (term_mouse_click, handle_one_term_event, Fterm_open_connection)
+        (Fterm_close_connection): New functions.
+        (term_init): Initialise mouse_face_window.
+
+2007-05-19  Chong Yidong  <cyd@stupidchicken.com>
+
+        * xdisp.c (redisplay_window): If first window line is a
+        continuation line, recompute the new window start instead of
+        recentering.
+
+2007-05-18  Glenn Morris  <rgm@gnu.org>
+
+        * m/alpha.h (ORDINARY_LINK): No longer define on OpenBSD.
+        Suggested by Alfred M. Szmidt <ams@gnu.org>.
+
+2007-05-17  Glenn Morris  <rgm@gnu.org>
+
+        * m/macppc.h (ORDINARY_LINK): No longer define on OpenBSD.
+
+2007-05-16  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macterm.c [USE_CARBON_EVENTS] (mac_convert_event_ref): Also convert
+        dead key repeat and up events.
+
+2007-05-14  Chong Yidong  <cyd@stupidchicken.com>
+
+        * image.c (pbm_load): Check image size for monochrome pbm.
+
+2007-05-13  Chong Yidong  <cyd@stupidchicken.com>
+
+        * xterm.c (XTread_socket): Revert last change.
+
+2007-05-12  Chong Yidong  <cyd@stupidchicken.com>
+
+        * image.c (pbm_load): Correctly check image size for greyscale pbm.
+
+        * xterm.c (XTread_socket): Yet Another Uncaught X Error Crash (YAUXEC).
+
+2007-05-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * 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.
+
+2007-05-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * keymap.c (Fdefine_key, Flookup_key): Only do the 0x80->meta_modifier
+        mapping for unibyte strings.
+
+2007-05-01  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macmenu.c (mac_dialog_show): Apply 2007-04-27 change for xmenu.c.
+        (Fx_popup_dialog) [MAC_OSX]: Likewise.
+
+2007-04-29  Richard Stallman  <rms@gnu.org>
+
+        * insdel.c (replace_range): For undo, record insertion first.
+
+2007-04-29  Andreas Schwab  <schwab@suse.de>
+
+        * lisp.h (VECSIZE): Use OFFSETOF.
+
+2007-04-29  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * xdisp.c (try_window_reusing_current_matrix): Fix number of
+        disabled lines.
+
+2007-04-28  Richard Stallman  <rms@gnu.org>
+
+        * lread.c (read_escape): In a string, \s is always space.
+
+2007-04-27  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * xmenu.c (xdialog_show): Call Fredisplay before showing the dialog.
+
+        * gtkutil.c (xg_update_menubar, create_menus): Create empty
+        submenu for menu bar items.
+
 See ChangeLog.10 for earlier changes.
 
 ;; Local Variables:
diff --git a/src/ChangeLog.10 b/src/ChangeLog.10
index b8ddfe26c9d..c5e7bc61e47 100644
--- a/src/ChangeLog.10
+++ b/src/ChangeLog.10
@@ -1,226 +1,3 @@
-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
-        around current_column call.
-
-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):
-        * macterm.c (mac_create_bitmap_from_bitmap_data)
-        (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>
-
-        * macterm.c [USE_CARBON_EVENTS] (mac_handle_window_event):
-        Call mac_wakeup_from_rne on window size change.
-
-2007-05-25  Chong Yidong  <cyd@stupidchicken.com>
-
-        * image.c (uncache_image): Fix typo.
-
-2007-05-23  Johannes Weiner  <hannes@saeurebad.de>  (tiny change)
-
-        * keyboard.c (make_lispy_movement): Condition on HAVE_GPM too.
-
-2007-05-22  Richard Stallman  <rms@gnu.org>
-
-        * xterm.c (x_connection_closed): Remove NO_RETURN.
-
-2007-05-22  Martin Rudalics  <rudalics@gmx.at>
-
-        * syntax.c (scan_words): Fix arg to UPDATE_SYNTAX_TABLE_BACKWARD.
-
-2007-05-21  Chong Yidong  <cyd@stupidchicken.com>
-
-        * image.c (uncache_image): New function.
-        (Fimage_refresh): New function.
-
-2007-05-20  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
-
-        * Makefile.in: Move GPM check outside HAVE_X_WINDOWS.
-
-2007-05-20  Nick Roberts  <nickrob@snap.net.nz>
-
-        * config.in, keyboard.c, Makefile.in, sysdep.c, term.c,
-        * termhooks.h: Use HAVE_GPM instead of HAVE_GPM_H.
-
-2007-05-20  Nick Roberts  <nickrob@snap.net.nz>
-
-        * keyboard.c (make_lispy_event): Make case GPM_CLICK_EVENT
-        conditional on [HAVE_GPM_H].
-
-2007-05-19  Stefan Monnier  <monnier@iro.umontreal.ca>
-
-        * syntax.c (skip_chars): Update syntax-table only after we checked that
-        the new location is valid.
-
-2007-05-19  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
-
-        * macterm.c (x_calc_absolute_position): Add BLOCK_INPUT around
-        mac_get_window_bounds.
-
-2007-05-20  Nick Roberts  <nickrob@snap.net.nz>
-
-        * Makefile.in (LIBGPM): Allow it to be set from configure.
-        If set then link Emacs with it.
-
-        * config.in: Regenerate.
-
-        * lisp.h (add_gpm_wait_descriptor, delete_gpm_wait_descriptor):
-        New externs.
-
-        * termhooks.h [HAVE_GPM_H] (enum event_kind): Add GPM_CLICK_EVENT.
-        Include gpm.h.
-        (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.
-
-        * process.c (gpm_wait_mask, max_gpm_desc): New variables.
-        (wait_reading_process_output): Wait on gpm_fd too.
-        (add_gpm_wait_descriptor, delete_gpm_wait_descriptor)): New functions.
-        (add_gpm_wait_descriptor_called_flag): New variable.
-        (delete_keyboard_wait_descriptor): Check gpm_wait_mask.
-
-        * keyboard.c [HAVE_GPM_H] (Qmouse_fixup_help_message)
-        (make_lispy_movement, tracking_off, Ftrack_mouse, some_mouse_moved)
-        (show_help_echo, readable_events, kbd_buffer_get_event, init_keyboard):
-        Extend HAVE_MOUSE ifdefs to HAVE_GPM_H.
-        (make_lispy_event): Add case GPM_CLICK_EVENT.
-        (read_avail_input): Handle mouse input.
-
-        * term.c (write_glyphs_with_face): New function.
-        [HAVE_GPM_H]: Include buffer.h, sys/fcntl.h.
-        (mouse_face_beg_row, mouse_face_beg_col, mouse_face_end_row)
-        (mouse_face_end_col, mouse_face_past_end, mouse_face_window)
-        (mouse_face_face_id, term_gpm, pos_x, pos_y)
-        (last_mouse_x, last_mouse_y): New variables.
-        (term_show_mouse_face, term_clear_mouse_face, fast_find_position)
-        (term_mouse_highlight, term_mouse_movement, term_mouse_position)
-        (term_mouse_click, handle_one_term_event, Fterm_open_connection)
-        (Fterm_close_connection): New functions.
-        (term_init): Initialise mouse_face_window.
-
-2007-05-19  Chong Yidong  <cyd@stupidchicken.com>
-
-        * xdisp.c (redisplay_window): If first window line is a
-        continuation line, recompute the new window start instead of
-        recentering.
-
-2007-05-18  Glenn Morris  <rgm@gnu.org>
-
-        * m/alpha.h (ORDINARY_LINK): No longer define on OpenBSD.
-        Suggested by Alfred M. Szmidt <ams@gnu.org>.
-
-2007-05-17  Glenn Morris  <rgm@gnu.org>
-
-        * m/macppc.h (ORDINARY_LINK): No longer define on OpenBSD.
-
-2007-05-16  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
-
-        * macterm.c [USE_CARBON_EVENTS] (mac_convert_event_ref): Also convert
-        dead key repeat and up events.
-
-2007-05-14  Chong Yidong  <cyd@stupidchicken.com>
-
-        * image.c (pbm_load): Check image size for monochrome pbm.
-
-2007-05-13  Chong Yidong  <cyd@stupidchicken.com>
-
-        * xterm.c (XTread_socket): Revert last change.
-
-2007-05-12  Chong Yidong  <cyd@stupidchicken.com>
-
-        * image.c (pbm_load): Correctly check image size for greyscale pbm.
-
-        * xterm.c (XTread_socket): Yet Another Uncaught X Error Crash (YAUXEC).
-
-2007-05-07  Stefan Monnier  <monnier@iro.umontreal.ca>
-
-        * 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.
-
-2007-05-07  Stefan Monnier  <monnier@iro.umontreal.ca>
-
-        * keymap.c (Fdefine_key, Flookup_key): Only do the 0x80->meta_modifier
-        mapping for unibyte strings.
-
-2007-05-01  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
-
-        * macmenu.c (mac_dialog_show): Apply 2007-04-27 change for xmenu.c.
-        (Fx_popup_dialog) [MAC_OSX]: Likewise.
-
-2007-04-29  Richard Stallman  <rms@gnu.org>
-
-        * insdel.c (replace_range): For undo, record insertion first.
-
-2007-04-29  Andreas Schwab  <schwab@suse.de>
-
-        * lisp.h (VECSIZE): Use OFFSETOF.
-
-2007-04-29  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
-
-        * xdisp.c (try_window_reusing_current_matrix): Fix number of
-        disabled lines.
-
-2007-04-28  Richard Stallman  <rms@gnu.org>
-
-        * lread.c (read_escape): In a string, \s is always space.
-
-2007-04-27  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
-
-        * xmenu.c (xdialog_show): Call Fredisplay before showing the dialog.
-
-        * gtkutil.c (xg_update_menubar, create_menus): Create empty
-        submenu for menu bar items.
-
 2007-04-24  Chong Yidong  <cyd@stupidchicken.com>
 
         * Branch for 22.1.