diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2005-09-20 13:19:29 +0000 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2005-09-20 13:19:29 +0000 |
| commit | 41ea4df8c30cb9c1c7254188c5aa812d9875f383 (patch) | |
| tree | 1049db2c8f921ec9bba2d7602901c781a180aa71 /lib-src | |
| parent | 1768573d120182bb272b9696112bc8427340346b (diff) | |
| download | emacs-41ea4df8c30cb9c1c7254188c5aa812d9875f383.tar.gz | |
(add_sym): Compare namespace names instead of namespace objects. This
prevents the parser from incorrectly treating classes whose superclass
is in another namespace.
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 6 | ||||
| -rw-r--r-- | lib-src/ebrowse.c | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 76e56e77e16..7d22972794f 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,9 @@ +2005-09-20 Chong Yidong <cyd@stupidchicken.com> + + * ebrowse.c (add_sym): Compare namespace names instead of + namespace objects. This prevents the parser from incorrectly + treating classes whose superclass is in another namespace. + 2005-09-15 Richard M. Stallman <rms@gnu.org> * Makefile.in (update-game-score.o): New target. diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c index 49e353cf536..a9a3eb78442 100644 --- a/lib-src/ebrowse.c +++ b/lib-src/ebrowse.c @@ -648,7 +648,10 @@ add_sym (name, nested_in_class) h %= TABLE_SIZE; for (sym = class_table[h]; sym; sym = sym->next) - if (streq (name, sym->name) && sym->namesp == scope) + if (streq (name, sym->name) + && ((!sym->namesp && !scope) + || (sym->namesp && scope + && streq (sym->namesp->name, scope->name)))) break; if (sym == NULL) |