diff options
| author | Paul Eggert | 2011-03-01 17:52:03 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-03-01 17:52:03 -0800 |
| commit | ba46f4d85a6938273f52a8cdf7e09d9afee61d7f (patch) | |
| tree | 606ec46b703532d463ccddf287f0053430eb1f4a /src/keymap.c | |
| parent | d9d0d182da35312ed0d7a9859b9c6a03994d86d8 (diff) | |
| parent | 0dc3e4109e0c41bbf5fdcae0ff1156162719693e (diff) | |
| download | emacs-ba46f4d85a6938273f52a8cdf7e09d9afee61d7f.tar.gz emacs-ba46f4d85a6938273f52a8cdf7e09d9afee61d7f.zip | |
Merge from mainline.
Diffstat (limited to 'src/keymap.c')
| -rw-r--r-- | src/keymap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/keymap.c b/src/keymap.c index 0e4715e4b8b..1fbb40f1270 100644 --- a/src/keymap.c +++ b/src/keymap.c | |||
| @@ -2756,7 +2756,7 @@ remapped command in the returned list. */) | |||
| 2756 | && !NILP (firstonly) | 2756 | && !NILP (firstonly) |
| 2757 | && !NILP (tem = Fget (definition, QCadvertised_binding))) | 2757 | && !NILP (tem = Fget (definition, QCadvertised_binding))) |
| 2758 | { | 2758 | { |
| 2759 | /* We have a list of advertized bindings. */ | 2759 | /* We have a list of advertised bindings. */ |
| 2760 | while (CONSP (tem)) | 2760 | while (CONSP (tem)) |
| 2761 | if (EQ (shadow_lookup (keymaps, XCAR (tem), Qnil, 0), definition)) | 2761 | if (EQ (shadow_lookup (keymaps, XCAR (tem), Qnil, 0), definition)) |
| 2762 | return XCAR (tem); | 2762 | return XCAR (tem); |