aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMiles Bader2007-05-25 02:38:05 +0000
committerMiles Bader2007-05-25 02:38:05 +0000
commit5dfdf72f7aee102988a98447de9d19523af50055 (patch)
tree896c0aa9dc3b41037fd36a3a7fba8f12b4baf8df /src
parent808218747bbd8c6611ec725f406cbaa0ec90191c (diff)
parentea98d5a39afa0e73064fd0d6e4346c8db3f6096b (diff)
downloademacs-5dfdf72f7aee102988a98447de9d19523af50055.tar.gz
emacs-5dfdf72f7aee102988a98447de9d19523af50055.zip
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
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/macterm.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 72b69938002..9782c83c2e5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12007-05-24 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
2
3 * macterm.c [USE_CARBON_EVENTS] (mac_handle_window_event):
4 Call mac_wakeup_from_rne on window size change.
5
12007-05-25 Chong Yidong <cyd@stupidchicken.com> 62007-05-25 Chong Yidong <cyd@stupidchicken.com>
2 7
3 * image.c (uncache_image): Fix typo. 8 * image.c (uncache_image): Fix typo.
diff --git a/src/macterm.c b/src/macterm.c
index 9c1a151f4a9..91522eeda7a 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -9893,6 +9893,7 @@ mac_handle_window_event (next_handler, event, data)
9893 width = bounds.right - bounds.left; 9893 width = bounds.right - bounds.left;
9894 height = bounds.bottom - bounds.top; 9894 height = bounds.bottom - bounds.top;
9895 mac_handle_size_change (f, width, height); 9895 mac_handle_size_change (f, width, height);
9896 mac_wakeup_from_rne ();
9896 } 9897 }
9897 } 9898 }
9898 9899