diff options
| author | Karoly Lorentey | 2006-01-06 16:13:05 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2006-01-06 16:13:05 +0000 |
| commit | a8bf7299ee74781dd485c33c5eac20aee0f0ebef (patch) | |
| tree | d2bc1c0d3d7a64a19945b5bb5d175cae37088bca /src/keymap.c | |
| parent | e079ecf45241cc5d2904db7ede9592f9861bb9aa (diff) | |
| parent | 600bc46cd52fbdedf592158c6b03ccfca88dbade (diff) | |
| download | emacs-a8bf7299ee74781dd485c33c5eac20aee0f0ebef.tar.gz emacs-a8bf7299ee74781dd485c33c5eac20aee0f0ebef.zip | |
Merged from miles@gnu.org--gnu-2005 (patch 683-684)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-683
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-684
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-493
Diffstat (limited to 'src/keymap.c')
| -rw-r--r-- | src/keymap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/keymap.c b/src/keymap.c index 64069ca4deb..b09358dbbcb 100644 --- a/src/keymap.c +++ b/src/keymap.c | |||
| @@ -3189,8 +3189,8 @@ describe_map_compare (aa, bb) | |||
| 3189 | if (INTEGERP (a->event) && !INTEGERP (b->event)) | 3189 | if (INTEGERP (a->event) && !INTEGERP (b->event)) |
| 3190 | return -1; | 3190 | return -1; |
| 3191 | if (SYMBOLP (a->event) && SYMBOLP (b->event)) | 3191 | if (SYMBOLP (a->event) && SYMBOLP (b->event)) |
| 3192 | return (Fstring_lessp (a->event, b->event) ? -1 | 3192 | return (!NILP (Fstring_lessp (a->event, b->event)) ? -1 |
| 3193 | : Fstring_lessp (b->event, a->event) ? 1 | 3193 | : !NILP (Fstring_lessp (b->event, a->event)) ? 1 |
| 3194 | : 0); | 3194 | : 0); |
| 3195 | return 0; | 3195 | return 0; |
| 3196 | } | 3196 | } |