Mercurial > emacs
diff src/keymap.c @ 90085:f8a7a9ba3d08
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-7
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-52
- miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-53
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-54
Update from CVS: lisp/cus-start.el (all): Add `undo-outer-limit'.
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-55
- miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-57
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-58
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-7
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-8
- miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-11
Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sat, 29 Jan 2005 00:06:24 +0000 |
parents | 6d92d69fae33 a9fbaec66c84 |
children | 7e3f621f1dd4 |
line wrap: on
line diff
--- a/src/keymap.c Mon Jan 24 22:34:31 2005 +0000 +++ b/src/keymap.c Sat Jan 29 00:06:24 2005 +0000 @@ -1,6 +1,6 @@ /* Manipulation of keymaps - Copyright (C) 1985, 86,87,88,93,94,95,98,99, 2000, 01, 2004 - Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1998, 1999, 2000, + 2001, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -527,7 +527,7 @@ GCPRO1 (map); /* A strange value in which Meta is set would cause infinite recursion. Protect against that. */ - if (meta_prefix_char & CHAR_META) + if (XINT (meta_prefix_char) & CHAR_META) meta_prefix_char = make_number (27); meta_map = get_keymap (access_keymap (map, meta_prefix_char, t_ok, noinherit, autoload),