aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDmitry Antipov2012-06-25 08:05:48 +0400
committerDmitry Antipov2012-06-25 08:05:48 +0400
commitb00876c993de49c79af45f8b92b18baa545940f7 (patch)
treea15de990a123b945dbfbdc1b51d3a6723805915f /src
parent885d1d74a769b8d97ecb0b67fecdc810aaad9b93 (diff)
downloademacs-b00876c993de49c79af45f8b92b18baa545940f7.tar.gz
emacs-b00876c993de49c79af45f8b92b18baa545940f7.zip
* xmenu.c (xmenu_show, xdialog_show): Explicit cast from
`const char *' to `char *' to avoid compiler warning.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/xmenu.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 7878a4d6f68..b8051d13680 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12012-06-25 Dmitry Antipov <dmantipov@yandex.ru>
2
3 * xmenu.c (xmenu_show, xdialog_show): Explicit cast from
4 `const char *' to `char *' to avoid compiler warning.
5
12012-06-24 Paul Eggert <eggert@cs.ucla.edu> 62012-06-24 Paul Eggert <eggert@cs.ucla.edu>
2 7
3 * xterm.c (x_term_init): Build proper-sized _XSETTINGS_Snnn string 8 * xterm.c (x_term_init): Build proper-sized _XSETTINGS_Snnn string
diff --git a/src/xmenu.c b/src/xmenu.c
index 98b71b15f05..ad2ebc09128 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -1729,7 +1729,7 @@ xmenu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps,
1729 save_wv->next = wv; 1729 save_wv->next = wv;
1730 else 1730 else
1731 first_wv->contents = wv; 1731 first_wv->contents = wv;
1732 wv->name = pane_string; 1732 wv->name = (char *) pane_string;
1733 if (keymaps && !NILP (prefix)) 1733 if (keymaps && !NILP (prefix))
1734 wv->name++; 1734 wv->name++;
1735 wv->value = 0; 1735 wv->value = 0;
@@ -2060,7 +2060,7 @@ xdialog_show (FRAME_PTR f,
2060 pane_string = (NILP (pane_name) 2060 pane_string = (NILP (pane_name)
2061 ? "" : SSDATA (pane_name)); 2061 ? "" : SSDATA (pane_name));
2062 prev_wv = xmalloc_widget_value (); 2062 prev_wv = xmalloc_widget_value ();
2063 prev_wv->value = pane_string; 2063 prev_wv->value = (char *) pane_string;
2064 if (keymaps && !NILP (prefix)) 2064 if (keymaps && !NILP (prefix))
2065 prev_wv->name++; 2065 prev_wv->name++;
2066 prev_wv->enabled = 1; 2066 prev_wv->enabled = 1;