diff options
| author | Paul Eggert | 2011-01-17 11:01:01 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-01-17 11:01:01 -0800 |
| commit | a3e44e793796153ff1534be9c74fcab50b45de30 (patch) | |
| tree | 863d5db087c8e034c96d06ea955515f4d3f3d0a3 /src/keymap.c | |
| parent | 7f818df9420a1320539f7e3e633003573a570413 (diff) | |
| parent | 721be9cd4865e9f7d68020adcfa672d2edd52b07 (diff) | |
| download | emacs-a3e44e793796153ff1534be9c74fcab50b45de30.tar.gz emacs-a3e44e793796153ff1534be9c74fcab50b45de30.zip | |
Merge from mainline.
Diffstat (limited to 'src/keymap.c')
| -rw-r--r-- | src/keymap.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/keymap.c b/src/keymap.c index 4c7af8a203b..e37b0f18e64 100644 --- a/src/keymap.c +++ b/src/keymap.c | |||
| @@ -4013,5 +4013,3 @@ keys_of_keymap (void) | |||
| 4013 | initial_define_key (global_map, Ctl ('X'), "Control-X-prefix"); | 4013 | initial_define_key (global_map, Ctl ('X'), "Control-X-prefix"); |
| 4014 | } | 4014 | } |
| 4015 | 4015 | ||
| 4016 | /* arch-tag: 6dd15c26-7cf1-41c4-b904-f42f7ddda463 | ||
| 4017 | (do not change this comment) */ | ||