Mercurial > emacs
comparison src/w32menu.c @ 90580:7f3f771c85fa
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 382-398)
- Update from CVS
- Update from erc--emacs--22
- Fix ERC bug introduced in last patch
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 123-125)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-101
author | Miles Bader <miles@gnu.org> |
---|---|
date | Wed, 16 Aug 2006 14:08:49 +0000 |
parents | a802c5505156 6e63f47b8977 |
children | a1a25ac6c88a |
comparison
equal
deleted
inserted
replaced
90579:c78f05b8f09e | 90580:7f3f771c85fa |
---|---|
1992 } | 1992 } |
1993 i += MENU_ITEMS_ITEM_LENGTH; | 1993 i += MENU_ITEMS_ITEM_LENGTH; |
1994 } | 1994 } |
1995 } | 1995 } |
1996 } | 1996 } |
1997 else if (!for_click) | |
1998 /* Make "Cancel" equivalent to C-g. */ | |
1999 Fsignal (Qquit, Qnil); | |
1997 | 2000 |
1998 return Qnil; | 2001 return Qnil; |
1999 } | 2002 } |
2000 | 2003 |
2001 | 2004 |
2184 } | 2187 } |
2185 i += MENU_ITEMS_ITEM_LENGTH; | 2188 i += MENU_ITEMS_ITEM_LENGTH; |
2186 } | 2189 } |
2187 } | 2190 } |
2188 } | 2191 } |
2192 else | |
2193 /* Make "Cancel" equivalent to C-g. */ | |
2194 Fsignal (Qquit, Qnil); | |
2189 | 2195 |
2190 return Qnil; | 2196 return Qnil; |
2191 } | 2197 } |
2192 #endif /* HAVE_DIALOGS */ | 2198 #endif /* HAVE_DIALOGS */ |
2193 | 2199 |