aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStefan Monnier2001-10-18 22:14:45 +0000
committerStefan Monnier2001-10-18 22:14:45 +0000
commitef879104ac3c61732bab1b99a0f3cb4ca5c1ffb4 (patch)
tree634bbdb476f8483a6f180b3f76a17c2ee1e99be3 /src
parent309034797301ae6491392cce252342f49d3a1240 (diff)
downloademacs-ef879104ac3c61732bab1b99a0f3cb4ca5c1ffb4.tar.gz
emacs-ef879104ac3c61732bab1b99a0f3cb4ca5c1ffb4.zip
(current_minor_maps): `override' only shadows its
correspondent in minor-mode-map-alist, not the whole tail.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/keymap.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 10376fddaf5..cda3dc4186f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12001-10-18 Stefan Monnier <monnier@cs.yale.edu>
2
3 * keymap.c (current_minor_maps): `override' only shadows its
4 correspondent in minor-mode-map-alist, not the whole tail.
5
12001-10-18 Andrew Innes <andrewi@gnu.org> 62001-10-18 Andrew Innes <andrewi@gnu.org>
2 7
3 * fontset.c (fs_load_font) [WINDOWSNT && _MSC_VER]: Disable 8 * fontset.c (fs_load_font) [WINDOWSNT && _MSC_VER]: Disable
diff --git a/src/keymap.c b/src/keymap.c
index eb4d3ab375c..85a70a1a1e3 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -1184,7 +1184,7 @@ current_minor_maps (modeptr, mapptr)
1184 { 1184 {
1185 val = assq_no_quit (var, lists[0]); 1185 val = assq_no_quit (var, lists[0]);
1186 if (!NILP (val)) 1186 if (!NILP (val))
1187 break; 1187 continue;
1188 } 1188 }
1189 1189
1190 if (i >= cmm_size) 1190 if (i >= cmm_size)