diff options
| author | Miles Bader <miles@gnu.org> | 2007-10-11 16:14:00 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-10-11 16:14:00 +0000 |
| commit | 41520ab0b3f0a0ae6bd81731f67eb43cf23500d8 (patch) | |
| tree | 4bca9a170abd1057555ecc73c8ba6b58640cd8db /lisp/edmacro.el | |
| parent | ea50afbd1738693ae470f282330aecf2746809c7 (diff) | |
| parent | 39e55877e2bfca874f1640302fec16ded1bbf7d3 (diff) | |
| download | emacs-41520ab0b3f0a0ae6bd81731f67eb43cf23500d8.tar.gz | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 866-879)
- Merge multi-tty branch
- Update from CVS
- Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-257
Diffstat (limited to 'lisp/edmacro.el')
| -rw-r--r-- | lisp/edmacro.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/edmacro.el b/lisp/edmacro.el index 6a0b28a4b82..55138f18bca 100644 --- a/lisp/edmacro.el +++ b/lisp/edmacro.el @@ -486,9 +486,9 @@ doubt, use whitespace." (fkey nil) tlen tkey (bind (or (loop for map in maps for b = (lookup-key map key) thereis (and (not (integerp b)) b)) - (and (setq fkey (lookup-key function-key-map rest-mac)) + (and (setq fkey (lookup-key local-function-key-map rest-mac)) (setq tlen fkey tkey (edmacro-subseq rest-mac 0 tlen) - fkey (lookup-key function-key-map tkey)) + fkey (lookup-key local-function-key-map tkey)) (loop for map in maps for b = (lookup-key map fkey) when (and (not (integerp b)) b) |