diff options
| author | Miles Bader | 2006-04-09 00:38:22 +0000 |
|---|---|---|
| committer | Miles Bader | 2006-04-09 00:38:22 +0000 |
| commit | 49d395cd57e646162e7f646a8561a416abacac82 (patch) | |
| tree | d7fabed45dfc19d6bff30024f82613f372b97951 /src/keymap.c | |
| parent | b6828792a25d042ede1ed164389531e30cc3e202 (diff) | |
| parent | 1b155fbd766b0a0f78fca5de62dd16a3542883f1 (diff) | |
| download | emacs-49d395cd57e646162e7f646a8561a416abacac82.tar.gz emacs-49d395cd57e646162e7f646a8561a416abacac82.zip | |
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-54
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 190-203)
- Update from CVS
- Undo incorrect merge of etc/images/README from Gnus 5.10
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 74-80)
- Update from CVS
- Update from CVS: README: Addition from 5.10.6 tar ball.
Diffstat (limited to 'src/keymap.c')
| -rw-r--r-- | src/keymap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/keymap.c b/src/keymap.c index 5e01566efaa..e5122c84efc 100644 --- a/src/keymap.c +++ b/src/keymap.c | |||
| @@ -3362,7 +3362,7 @@ describe_map (map, prefix, elt_describer, partial, shadow, | |||
| 3362 | if (INTEGERP (vect[i].event)) | 3362 | if (INTEGERP (vect[i].event)) |
| 3363 | { | 3363 | { |
| 3364 | while (i + 1 < slots_used | 3364 | while (i + 1 < slots_used |
| 3365 | && XINT (vect[i + 1].event) == XINT (vect[i].event) + 1 | 3365 | && EQ (vect[i+1].event, make_number (XINT (vect[i].event) + 1)) |
| 3366 | && !NILP (Fequal (vect[i + 1].definition, definition)) | 3366 | && !NILP (Fequal (vect[i + 1].definition, definition)) |
| 3367 | && vect[i].shadowed == vect[i + 1].shadowed) | 3367 | && vect[i].shadowed == vect[i + 1].shadowed) |
| 3368 | i++; | 3368 | i++; |