diff options
| author | Miles Bader <miles@gnu.org> | 2005-01-22 21:39:38 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2005-01-22 21:39:38 +0000 |
| commit | 18643d1d412928c57690271c8b7a65e50503441f (patch) | |
| tree | a9303ce501314fc316c20ca29928b2fa168d0421 /src/keymap.c | |
| parent | cfa4901a57cc9920eec0401d8b33abac7d3f8e5b (diff) | |
| parent | ddff82cf89b20912729a1483da3f28608b44115a (diff) | |
| download | emacs-18643d1d412928c57690271c8b7a65e50503441f.tar.gz emacs-18643d1d412928c57690271c8b7a65e50503441f.tar.bz2 emacs-18643d1d412928c57690271c8b7a65e50503441f.zip | |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-4
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-41
- miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-46
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-47
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-4
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-5
Update from CVS: exi/gnus-faq.texi ([4.1]): Typo.
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-6
Update from CVS
Diffstat (limited to 'src/keymap.c')
| -rw-r--r-- | src/keymap.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/keymap.c b/src/keymap.c index ea0b1843b85..074cc1706bf 100644 --- a/src/keymap.c +++ b/src/keymap.c @@ -525,6 +525,10 @@ access_keymap (map, idx, t_ok, noinherit, autoload) struct gcpro gcpro1; Lisp_Object meta_map; GCPRO1 (map); + /* A strange value in which Meta is set would cause + infinite recursion. Protect against that. */ + if (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), 0, autoload); |