diff options
| author | Miles Bader | 2005-09-19 10:20:33 +0000 |
|---|---|---|
| committer | Miles Bader | 2005-09-19 10:20:33 +0000 |
| commit | 6f512f0b53ba23b88c686d27a748797add0a89dc (patch) | |
| tree | 03b4e8c24f256dc8d90330ab1021d5ac238508d2 /src/keymap.c | |
| parent | ff8d296438e69b8cf701d95b6ccd271c416c46fd (diff) | |
| parent | 430d3ed772627a9a23fccdeab2b868c6c41e8365 (diff) | |
| download | emacs-6f512f0b53ba23b88c686d27a748797add0a89dc.tar.gz emacs-6f512f0b53ba23b88c686d27a748797add0a89dc.zip | |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-82
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 542-553)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 116-121)
- Merge from emacs--cvs-trunk--0
- Update from CVS
Diffstat (limited to 'src/keymap.c')
| -rw-r--r-- | src/keymap.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/keymap.c b/src/keymap.c index 813030fe728..271b0672b1e 100644 --- a/src/keymap.c +++ b/src/keymap.c | |||
| @@ -725,7 +725,7 @@ usage: (map-keymap FUNCTION KEYMAP) */) | |||
| 725 | Fsignal (Qinvalid_function, Fcons (function, Qnil)); | 725 | Fsignal (Qinvalid_function, Fcons (function, Qnil)); |
| 726 | if (! NILP (sort_first)) | 726 | if (! NILP (sort_first)) |
| 727 | return call3 (intern ("map-keymap-internal"), function, keymap, Qt); | 727 | return call3 (intern ("map-keymap-internal"), function, keymap, Qt); |
| 728 | 728 | ||
| 729 | map_keymap (keymap, map_keymap_call, function, NULL, 1); | 729 | map_keymap (keymap, map_keymap_call, function, NULL, 1); |
| 730 | return Qnil; | 730 | return Qnil; |
| 731 | } | 731 | } |
| @@ -2863,6 +2863,9 @@ You type Translation\n\ | |||
| 2863 | insert (buf, bufend - buf); | 2863 | insert (buf, bufend - buf); |
| 2864 | 2864 | ||
| 2865 | insert ("\n", 1); | 2865 | insert ("\n", 1); |
| 2866 | |||
| 2867 | /* Insert calls signal_after_change which may GC. */ | ||
| 2868 | translate = SDATA (Vkeyboard_translate_table); | ||
| 2866 | } | 2869 | } |
| 2867 | 2870 | ||
| 2868 | insert ("\n", 1); | 2871 | insert ("\n", 1); |