Mercurial > emacs
comparison 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 |
comparison
equal
deleted
inserted
replaced
83516:1321f6cfb389 | 83517:b6689e223e2f |
---|---|
3288 if (!NILP (shadow)) | 3288 if (!NILP (shadow)) |
3289 { | 3289 { |
3290 tem = shadow_lookup (shadow, kludge, Qt); | 3290 tem = shadow_lookup (shadow, kludge, Qt); |
3291 if (!NILP (tem)) | 3291 if (!NILP (tem)) |
3292 { | 3292 { |
3293 if (mention_shadow) | 3293 /* Avoid generating duplicate entries if the |
3294 shadowed binding has the same definition. */ | |
3295 if (mention_shadow && !EQ (tem, definition)) | |
3294 this_shadowed = 1; | 3296 this_shadowed = 1; |
3295 else | 3297 else |
3296 continue; | 3298 continue; |
3297 } | 3299 } |
3298 } | 3300 } |