Mercurial > emacs
diff src/keymap.c @ 83517:b6689e223e2f
Merged from emacs@sv.gnu.org
Patches applied:
* emacs@sv.gnu.org/emacs--devo--0--patch-273
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-274
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-275
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-276
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-277
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-278
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-279
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-280
Update etc/MORE.STUFF.
* emacs@sv.gnu.org/emacs--devo--0--patch-281
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-282
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-283
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-284
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-101
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-557
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Wed, 17 May 2006 18:05:02 +0000 |
| parents | 1321f6cfb389 e1a064810f6f |
| children | b19aaf4ab0ee |
line wrap: on
line diff
--- a/src/keymap.c Wed May 10 15:04:01 2006 +0000 +++ b/src/keymap.c Wed May 17 18:05:02 2006 +0000 @@ -3290,7 +3290,9 @@ tem = shadow_lookup (shadow, kludge, Qt); if (!NILP (tem)) { - if (mention_shadow) + /* Avoid generating duplicate entries if the + shadowed binding has the same definition. */ + if (mention_shadow && !EQ (tem, definition)) this_shadowed = 1; else continue;