Mercurial > emacs
comparison 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 |
comparison
equal
deleted
inserted
replaced
90084:befae6bafecb | 90085:f8a7a9ba3d08 |
---|---|
1 /* Manipulation of keymaps | 1 /* Manipulation of keymaps |
2 Copyright (C) 1985, 86,87,88,93,94,95,98,99, 2000, 01, 2004 | 2 Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1998, 1999, 2000, |
3 Free Software Foundation, Inc. | 3 2001, 2004, 2005 Free Software Foundation, Inc. |
4 | 4 |
5 This file is part of GNU Emacs. | 5 This file is part of GNU Emacs. |
6 | 6 |
7 GNU Emacs is free software; you can redistribute it and/or modify | 7 GNU Emacs is free software; you can redistribute it and/or modify |
8 it under the terms of the GNU General Public License as published by | 8 it under the terms of the GNU General Public License as published by |
525 struct gcpro gcpro1; | 525 struct gcpro gcpro1; |
526 Lisp_Object meta_map; | 526 Lisp_Object meta_map; |
527 GCPRO1 (map); | 527 GCPRO1 (map); |
528 /* A strange value in which Meta is set would cause | 528 /* A strange value in which Meta is set would cause |
529 infinite recursion. Protect against that. */ | 529 infinite recursion. Protect against that. */ |
530 if (meta_prefix_char & CHAR_META) | 530 if (XINT (meta_prefix_char) & CHAR_META) |
531 meta_prefix_char = make_number (27); | 531 meta_prefix_char = make_number (27); |
532 meta_map = get_keymap (access_keymap (map, meta_prefix_char, | 532 meta_map = get_keymap (access_keymap (map, meta_prefix_char, |
533 t_ok, noinherit, autoload), | 533 t_ok, noinherit, autoload), |
534 0, autoload); | 534 0, autoload); |
535 UNGCPRO; | 535 UNGCPRO; |