diff options
| author | Stefan Monnier | 2007-07-16 19:26:14 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2007-07-16 19:26:14 +0000 |
| commit | 4bb99e3a15f1e7e13103df4908814294dc974463 (patch) | |
| tree | 9c88a8202037a3e1b95791af84c6b44ac793a645 /src/ChangeLog.unicode | |
| parent | 8c406a9bc42ee77fcbbb4201fe8bda855eafd832 (diff) | |
| download | emacs-4bb99e3a15f1e7e13103df4908814294dc974463.tar.gz emacs-4bb99e3a15f1e7e13103df4908814294dc974463.zip | |
Fix up failed merge from the trunk:
(Faccessible_keymaps, where_is_internal): Use map_keymap.
(where_is_internal_2): Remove.
(where_is_internal_1): Update interface for its new use.
Diffstat (limited to 'src/ChangeLog.unicode')
| -rw-r--r-- | src/ChangeLog.unicode | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ChangeLog.unicode b/src/ChangeLog.unicode index 3a739bf7724..58585123587 100644 --- a/src/ChangeLog.unicode +++ b/src/ChangeLog.unicode | |||
| @@ -42,7 +42,7 @@ | |||
| 42 | 42 | ||
| 43 | * chartab.c (map_sub_char_table): Make it work for the top-level | 43 | * chartab.c (map_sub_char_table): Make it work for the top-level |
| 44 | char-table. Fix handling of parent char-table. | 44 | char-table. Fix handling of parent char-table. |
| 45 | (map_char_table): Adjusted for the above change. | 45 | (map_char_table): Adjust for the above change. |
| 46 | 46 | ||
| 47 | 2007-06-24 Jason Rumney <jasonr@gnu.org> | 47 | 2007-06-24 Jason Rumney <jasonr@gnu.org> |
| 48 | 48 | ||