Mercurial > emacs
comparison src/keymap.c @ 90737:95d0cdf160ea
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 586-614)
- Update from CVS
- Update from erc--emacs--22
- Merge from gnus--rel--5.10
- Merge from erc--main--0
- Make byte compiler correctly write circular constants
* gnus--rel--5.10 (patch 186-196)
- Update from CVS
- Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-162
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Fri, 26 Jan 2007 06:16:11 +0000 |
| parents | bc10a33dd40b 42d89518722a |
| children | ec58e5c426ef |
comparison
equal
deleted
inserted
replaced
| 90736:ef1369583937 | 90737:95d0cdf160ea |
|---|---|
| 1 /* Manipulation of keymaps | 1 /* Manipulation of keymaps |
| 2 Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, | 2 Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, |
| 3 1998, 1999, 2000, 2001, 2002, 2003, 2004, | 3 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
| 4 2005, 2006 Free Software Foundation, Inc. | 4 2005, 2006, 2007 Free Software Foundation, Inc. |
| 5 | 5 |
| 6 This file is part of GNU Emacs. | 6 This file is part of GNU Emacs. |
| 7 | 7 |
| 8 GNU Emacs is free software; you can redistribute it and/or modify | 8 GNU Emacs is free software; you can redistribute it and/or modify |
| 9 it under the terms of the GNU General Public License as published by | 9 it under the terms of the GNU General Public License as published by |
| 3450 if (!NILP (shadow)) | 3450 if (!NILP (shadow)) |
| 3451 { | 3451 { |
| 3452 tem = shadow_lookup (shadow, kludge, Qt); | 3452 tem = shadow_lookup (shadow, kludge, Qt); |
| 3453 if (!NILP (tem)) | 3453 if (!NILP (tem)) |
| 3454 { | 3454 { |
| 3455 /* If both bindings are keymaps, this key is a prefix key, | |
| 3456 so don't say it is shadowed. */ | |
| 3457 if (KEYMAPP (definition) && KEYMAPP (tem)) | |
| 3458 ; | |
| 3455 /* Avoid generating duplicate entries if the | 3459 /* Avoid generating duplicate entries if the |
| 3456 shadowed binding has the same definition. */ | 3460 shadowed binding has the same definition. */ |
| 3457 if (mention_shadow && !EQ (tem, definition)) | 3461 else if (mention_shadow && !EQ (tem, definition)) |
| 3458 this_shadowed = 1; | 3462 this_shadowed = 1; |
| 3459 else | 3463 else |
| 3460 continue; | 3464 continue; |
| 3461 } | 3465 } |
| 3462 } | 3466 } |
