Merge from emacs--rel--22

[gnu-emacs] / src / ChangeLog

diff --git a/src/ChangeLog b/src/ChangeLog
index b6b6be212a527551686746a104758c5167c9199b..e8e50319c12e753206257d7e34c482574c500477 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2008-09-02  Eli Zaretskii  <eliz@gnu.org>
+
+       * fileio.c (Fexpand_file_name): Copy argument `name' into local
+       storage on all platforms, not just on DOS_NT.
+
+2008-09-02  Jason Rumney  <jasonr@gnu.org>
+
+       * w32menu.c (Fx_popup_menu, Fx_popup_dialog, w32_menu_show): Ensure
+       mouse is not grabbed after menu is finished.
+
 2008-09-01  Chong Yidong  <cyd@stupidchicken.com>
 
        * xfaces.c (Finternal_set_alternative_font_family_alist)