From: Miles Bader <miles@gnu.org>
Date: Fri, 25 May 2007 02:38:05 +0000 (+0000)
Subject: Merge from emacs--rel--22
X-Git-Tag: emacs-pretest-23.0.90~12558
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5dfdf72f7aee102988a98447de9d19523af50055;p=emacs.git

Merge from emacs--rel--22

Patches applied:

 * emacs--rel--22  (patch 25)

   - Update from CVS

2007-05-24  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>

   * mac/INSTALL: Add note about moving self-contained application bundle
   to non-ASCII directory.

2007-05-24  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>

   * src/macterm.c [USE_CARBON_EVENTS] (mac_handle_window_event):
   Call mac_wakeup_from_rne on window size change.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-770
---

5dfdf72f7aee102988a98447de9d19523af50055
diff --cc src/ChangeLog
index 72b69938002,3c837ccf2b5..9782c83c2e5
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,11 -1,3 +1,16 @@@
++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.