projects
/
chise
/
xemacs-chise.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update.
[chise/xemacs-chise.git-]
/
src
/
dialog-x.c
diff --git
a/src/dialog-x.c
b/src/dialog-x.c
index
1b311dd
..
a61eee8
100644
(file)
--- a/
src/dialog-x.c
+++ b/
src/dialog-x.c
@@
-25,9
+25,7
@@
Boston, MA 02111-1307, USA. */
#include "lisp.h"
#include "console-x.h"
#include "lisp.h"
#include "console-x.h"
-#include "EmacsManager.h"
#include "EmacsFrame.h"
#include "EmacsFrame.h"
-#include "EmacsShell.h"
#include "gui-x.h"
#include "buffer.h"
#include "gui-x.h"
#include "buffer.h"
@@
-122,7
+120,7
@@
dbox_descriptor_to_widget_value (Lisp_Object desc)
widget_value *prev = 0, *kids = 0;
int n = 0;
int count = specpdl_depth ();
widget_value *prev = 0, *kids = 0;
int n = 0;
int count = specpdl_depth ();
- Lisp_Object wv_closure;
+ Lisp_Object wv_closure, gui_item;
CHECK_CONS (desc);
CHECK_STRING (XCAR (desc));
CHECK_CONS (desc);
CHECK_STRING (XCAR (desc));
@@
-165,7
+163,8
@@
dbox_descriptor_to_widget_value (Lisp_Object desc)
CHECK_VECTOR (button);
wv = xmalloc_widget_value ();
CHECK_VECTOR (button);
wv = xmalloc_widget_value ();
- if (!button_item_to_widget_value (button, wv, allow_text_p, 1))
+ gui_item = gui_parse_item_keywords (button);
+ if (!button_item_to_widget_value (gui_item, wv, allow_text_p, 1))
{
free_widget_value (wv);
continue;
{
free_widget_value (wv);
continue;