* menu.c (Fx_popup_menu): Don't assume error_name lacks printf formats.

diff --git a/src/ChangeLog b/src/ChangeLog
index fd864a460f40ab502a07238cd34cce7a25fac13e..99cdde192348fbc8f1d4ce74e225c3eb6bf189c9 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,8 @@
 
        Fix more problems found by GCC 4.6.0's static checks.
 
+       * menu.c (Fx_popup_menu): Don't assume error_name lacks printf formats.
+
        * fns.c (Fstring_to_unibyte): Don't rely on undefined behavior
        by passing a long int to a printf format expecting an int.
 

diff --git a/src/menu.c b/src/menu.c
index a9098deed7e4ad6936cde59a802b7ba85999d6e1..3bfb74863ae3a79b33f971ab0e07d4136d18472a 100644 (file)
--- a/src/menu.c
+++ b/src/menu.c
@@ -1340,7 +1340,7 @@ no quit occurs and `x-popup-menu' returns nil.  */)
 
   UNGCPRO;
 
-  if (error_name) error (error_name);
+  if (error_name) error ("%s", error_name);
   return selection;
 }