comparison src/xmenu.c @ 83202:42acc7fa8a4f

Merged in changes from CVS trunk. Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-529 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-530 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-531 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-532 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-533 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-534 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-535 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-536 sync-tree with gnus--rel--5.10 * miles@gnu.org--gnu-2004/gnus--devo--0--patch-2 Add {arch}/=cvs-sync-make-log * miles@gnu.org--gnu-2004/gnus--rel--5.8--base-0 Import from Gnus CVS branch V5-8 * miles@gnu.org--gnu-2004/gnus--rel--5.8--patch-1 {arch}/=tagging-method: Add CVS and autoconf grot to junk regexp * miles@gnu.org--gnu-2004/gnus--rel--5.8--patch-2 Use explicit tags for autoconf input files * miles@gnu.org--gnu-2004/gnus--rel--5.8--patch-3 Remove RCS keywords * miles@gnu.org--gnu-2004/gnus--rel--5.8--patch-4 Fix copied explicit id-tags * miles@gnu.org--gnu-2004/gnus--rel--5.8--patch-5 Add {arch}/=cvs-sync-make-log * miles@gnu.org--gnu-2004/gnus--rel--5.8--patch-6 configure.in: Use ifelse instead of m4_if for arch-tag: comment * miles@gnu.org--gnu-2004/gnus--rel--5.10--base-0 tag of miles@gnu.org--gnu-2004/gnus--rel--5.8--base-0 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-1 Gnus 5.10, from CVS branch v5-10 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-2 Merge from gnus--rel--5.8 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-3 Use explicit tags for autoconf input files * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-4 sync-tree with gnus--rel--5.8 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-5 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-6 Merge from gnus--rel--5.8 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-7 Remove RCS keywords * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-8 Merge from gnus--rel--5.8 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-9 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-10 Add {arch}/=cvs-sync-make-log * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-11 Merge from gnus--rel--5.8 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-12 Update from CVS: make.bat: Fix line endings around arch-tag. * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-13 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-14 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-15 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-16 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-17 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-242
author Karoly Lorentey <lorentey@elte.hu>
date Fri, 10 Sep 2004 13:06:10 +0000
parents 0e38a1bd20a8 dc35c2e20d41
children 7a0245dd1848
comparison
equal deleted inserted replaced
83201:8a6fd1c164cd 83202:42acc7fa8a4f
1 /* X Communication module for terminals which understand the X protocol. 1 /* X Communication module for terminals which understand the X protocol.
2 Copyright (C) 1986, 88, 93, 94, 96, 99, 2000, 2001, 2003 2 Copyright (C) 1986, 1988, 1993, 1994, 1996, 1999, 2000, 2001, 2003, 2004
3 Free Software Foundation, Inc. 3 Free Software Foundation, Inc.
4 4
5 This file is part of GNU Emacs. 5 This file is part of GNU Emacs.
6 6
7 GNU Emacs is free software; you can redistribute it and/or modify 7 GNU Emacs is free software; you can redistribute it and/or modify
1799 { 1799 {
1800 widget_value *wv; 1800 widget_value *wv;
1801 1801
1802 for (wv = first_wv; wv; wv = wv->next) 1802 for (wv = first_wv; wv; wv = wv->next)
1803 { 1803 {
1804 if (wv->lname && ! NILP (wv->lname)) 1804 if (STRINGP (wv->lname))
1805 { 1805 {
1806 wv->name = SDATA (wv->lname); 1806 wv->name = SDATA (wv->lname);
1807 1807
1808 /* Ignore the @ that means "separate pane". 1808 /* Ignore the @ that means "separate pane".
1809 This is a kludge, but this isn't worth more time. */ 1809 This is a kludge, but this isn't worth more time. */
1813 wv->name++; 1813 wv->name++;
1814 wv->value = 0; 1814 wv->value = 0;
1815 } 1815 }
1816 } 1816 }
1817 1817
1818 if (wv->lkey && ! NILP (wv->lkey)) 1818 if (STRINGP (wv->lkey))
1819 wv->key = SDATA (wv->lkey); 1819 wv->key = SDATA (wv->lkey);
1820 1820
1821 if (wv->contents) 1821 if (wv->contents)
1822 update_submenu_strings (wv->contents); 1822 update_submenu_strings (wv->contents);
1823 } 1823 }
1886 #ifdef USE_X_TOOLKIT 1886 #ifdef USE_X_TOOLKIT
1887 LWLIB_ID id; 1887 LWLIB_ID id;
1888 #endif 1888 #endif
1889 Lisp_Object items; 1889 Lisp_Object items;
1890 widget_value *wv, *first_wv, *prev_wv = 0; 1890 widget_value *wv, *first_wv, *prev_wv = 0;
1891 int i, last_i; 1891 int i, last_i = 0;
1892 int *submenu_start, *submenu_end; 1892 int *submenu_start, *submenu_end;
1893 int *submenu_top_level_items, *submenu_n_panes; 1893 int *submenu_top_level_items, *submenu_n_panes;
1894 1894
1895 1895
1896 XSETFRAME (Vmenu_updating_frame, f); 1896 XSETFRAME (Vmenu_updating_frame, f);