From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 5 Apr 2011 20:25:23 +0000 (-0700)
Subject: * menu.c (Fx_popup_menu): Don't assume error_name lacks printf formats.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~394^2~4
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=42eea0d01a839d6bd024a13577d16108696e11e4;p=emacs.git

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

diff --git a/src/ChangeLog b/src/ChangeLog
index fd864a460f4..99cdde19234 100644
--- 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 a9098deed7e..3bfb74863ae 100644
--- 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;
 }