Merge from emacs--rel--22

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

4 files changed, 19 insertions, 4 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index b6b6be212a5..e8e50319c12 100644
--- 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)
diff --git a/src/fileio.c b/src/fileio.c
index 02c41243cb6..ad8f7d7a538 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -932,12 +932,11 @@ See also the function `substitute-in-file-name'.  */)
   nm = SDATA (name);
   nm_in_name = 1;
 
-#ifdef DOS_NT
-  /* We will force directory separators to be either all \ or /, so make
-     a local copy to modify, even if there ends up being no change. */
+  /* Make a local copy of nm[] to protect it from GC in DECODE_FILE below. */
   nm = strcpy (alloca (strlen (nm) + 1), nm);
   nm_in_name = 0;
 
+#ifdef DOS_NT
   /* Note if special escape prefix is present, but remove for now.  */
   if (nm[0] == '/' && nm[1] == ':')
     {
@@ -1038,7 +1037,7 @@ See also the function `substitute-in-file-name'.  */)
             }
           return name;
 #else /* not DOS_NT */
-          if (nm == SDATA (name))
+          if (strcmp (nm, SDATA (name)) == 0)
             return name;
           return make_specified_string (nm, -1, strlen (nm), multibyte);
 #endif /* not DOS_NT */
diff --git a/src/w32menu.c b/src/w32menu.c
index fb54caf8806..067049808ad 100644
--- a/src/w32menu.c
+++ b/src/w32menu.c
@@ -342,6 +342,7 @@ cached information about equivalent key sequences.  */)
   if (NILP (position))
     {
       discard_menu_items ();
+      FRAME_X_DISPLAY_INFO (f)->grabbed = 0;
       UNGCPRO;
       return Qnil;
     }
@@ -355,6 +356,7 @@ cached information about equivalent key sequences.  */)
   if (current_popup_menu)
     {
       discard_menu_items ();
+      FRAME_X_DISPLAY_INFO (f)->grabbed = 0;
       UNGCPRO;
       return Qnil;
     }
@@ -367,6 +369,7 @@ cached information about equivalent key sequences.  */)
   UNBLOCK_INPUT;
 
   discard_menu_items ();
+  FRAME_X_DISPLAY_INFO (f)->grabbed = 0;
 
 #endif /* HAVE_MENUS */
 
@@ -495,6 +498,7 @@ otherwise it is "Question". */)
     UNBLOCK_INPUT;
 
     discard_menu_items ();
+    FRAME_X_DISPLAY_INFO (f)->grabbed = 0;
 
     if (error_name) error (error_name);
     return selection;
@@ -1165,6 +1169,7 @@ w32_menu_show (f, x, y, for_click, keymaps, title, error)
   /* Clean up extraneous mouse events which might have been generated
      during the call. */
   discard_mouse_events ();
+  FRAME_X_DISPLAY_INFO (f)->grabbed = 0;
 
   /* Free the widget_value objects we used to specify the contents.  */
   free_menubar_widget_value_tree (first_wv);
diff --git a/src/xterm.c b/src/xterm.c
index 88fb04d665e..603ec993af2 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -10516,6 +10516,7 @@ x_delete_display (dpyinfo)
   /* Xt and GTK do this themselves.  */
 #if ! defined (USE_X_TOOLKIT) && ! defined (USE_GTK)
 #ifndef AIX             /* On AIX, XCloseDisplay calls this.  */
+  /* Xt and GTK does this themselves. */
   XrmDestroyDatabase (dpyinfo->xrdb);
 #endif
 #endif