diff options
| author | Miles Bader | 2006-03-28 23:08:20 +0000 |
|---|---|---|
| committer | Miles Bader | 2006-03-28 23:08:20 +0000 |
| commit | 1ef7e5599f5aa981399221e657ff34e80cc2c1a3 (patch) | |
| tree | 539ff4cf9ea84af29a4e8628d049f3a4253a51f4 /src/keymap.c | |
| parent | 33bd75ec5fb277e58731c8cbbb942cba4d9a9f19 (diff) | |
| parent | 29314e0fd78063d663bd272787d0ea81cc61e38e (diff) | |
| download | emacs-1ef7e5599f5aa981399221e657ff34e80cc2c1a3.tar.gz emacs-1ef7e5599f5aa981399221e657ff34e80cc2c1a3.zip | |
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-49
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 164-184)
- Update from CVS
- Merge from gnus--rel--5.10
- Update from CVS: man/mh-e.texi (Folders): Various edits.
- Update from erc--emacs--0
* gnus--rel--5.10 (patch 62-70)
- Merge from emacs--devo--0
- Update from CVS
Diffstat (limited to 'src/keymap.c')
| -rw-r--r-- | src/keymap.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/keymap.c b/src/keymap.c index 233dff2c6f2..5e01566efaa 100644 --- a/src/keymap.c +++ b/src/keymap.c | |||
| @@ -676,6 +676,7 @@ map_keymap (map, fun, args, data, autoload) | |||
| 676 | struct gcpro gcpro1, gcpro2, gcpro3; | 676 | struct gcpro gcpro1, gcpro2, gcpro3; |
| 677 | Lisp_Object tail; | 677 | Lisp_Object tail; |
| 678 | 678 | ||
| 679 | tail = Qnil; | ||
| 679 | GCPRO3 (map, args, tail); | 680 | GCPRO3 (map, args, tail); |
| 680 | map = get_keymap (map, 1, autoload); | 681 | map = get_keymap (map, 1, autoload); |
| 681 | for (tail = (CONSP (map) && EQ (Qkeymap, XCAR (map))) ? XCDR (map) : map; | 682 | for (tail = (CONSP (map) && EQ (Qkeymap, XCAR (map))) ? XCDR (map) : map; |