diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-05 13:25:23 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-05 13:25:23 -0700 |
| commit | 42eea0d01a839d6bd024a13577d16108696e11e4 (patch) | |
| tree | 4bea93de0b20fb2e433f66926686ca9ad8ac1985 /src | |
| parent | da09ccce7ac9eca4e19f409215cc2897866e0a50 (diff) | |
| download | emacs-42eea0d01a839d6bd024a13577d16108696e11e4.tar.gz emacs-42eea0d01a839d6bd024a13577d16108696e11e4.tar.bz2 emacs-42eea0d01a839d6bd024a13577d16108696e11e4.zip | |
* menu.c (Fx_popup_menu): Don't assume error_name lacks printf formats.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/menu.c | 2 |
2 files changed, 3 insertions, 1 deletions
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; } |