Mercurial > hg > xemacs-beta
comparison src/gui.c @ 5125:b5df3737028a ben-lisp-object
merge
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Wed, 24 Feb 2010 01:58:04 -0600 |
parents | 623d57b7fbe8 e813cf16c015 |
children | a9c41067dd88 |
comparison
equal
deleted
inserted
replaced
5124:623d57b7fbe8 | 5125:b5df3737028a |
---|---|
510 suffix = Feval (suffix); | 510 suffix = Feval (suffix); |
511 suffix = IGNORE_MULTIPLE_VALUES (suffix); | 511 suffix = IGNORE_MULTIPLE_VALUES (suffix); |
512 CHECK_STRING (suffix); | 512 CHECK_STRING (suffix); |
513 } | 513 } |
514 | 514 |
515 retval = concat3 (pgui_item->name, build_string (" "), suffix); | 515 retval = concat3 (pgui_item->name, build_ascstring (" "), suffix); |
516 } | 516 } |
517 | 517 |
518 return retval; | 518 return retval; |
519 } | 519 } |
520 | 520 |
672 return 0; | 672 return 0; |
673 return 1; | 673 return 1; |
674 } | 674 } |
675 | 675 |
676 static int | 676 static int |
677 gui_item_equal (Lisp_Object obj1, Lisp_Object obj2, int depth) | 677 gui_item_equal (Lisp_Object obj1, Lisp_Object obj2, int depth, |
678 int UNUSED (foldcase)) | |
678 { | 679 { |
679 Lisp_Gui_Item *p1 = XGUI_ITEM (obj1); | 680 Lisp_Gui_Item *p1 = XGUI_ITEM (obj1); |
680 Lisp_Gui_Item *p2 = XGUI_ITEM (obj2); | 681 Lisp_Gui_Item *p2 = XGUI_ITEM (obj2); |
681 | 682 |
682 if (!(gui_item_equal_sans_selected (obj1, obj2, depth) && | 683 if (!(gui_item_equal_sans_selected (obj1, obj2, depth) && |
690 int UNUSED (escapeflag)) | 691 int UNUSED (escapeflag)) |
691 { | 692 { |
692 Lisp_Gui_Item *g = XGUI_ITEM (obj); | 693 Lisp_Gui_Item *g = XGUI_ITEM (obj); |
693 | 694 |
694 if (print_readably) | 695 if (print_readably) |
695 printing_unreadable_object ("#<gui-item 0x%x>", g->header.uid); | 696 printing_unreadable_lcrecord (obj, 0); |
696 | 697 |
697 write_fmt_string (printcharfun, "#<gui-item 0x%x>", g->header.uid); | 698 write_fmt_string (printcharfun, "#<gui-item 0x%x>", g->header.uid); |
698 } | 699 } |
699 | 700 |
700 Lisp_Object | 701 Lisp_Object |