(Maintaining) [ifnottex]: Add menu entry for "Emerge".

[gnu-emacs] / lib-src / ebrowse.c

diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c
index 4ad45d195f66ed2ff14821ca533ab1795ae5d374..94fa9114d2317a99124e97fbc329253c9c37905a 100644 (file)
--- a/lib-src/ebrowse.c
+++ b/lib-src/ebrowse.c
@@ -1,7 +1,7 @@
 /* ebrowse.c --- parsing files for the ebrowse C++ browser
 
-   Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99,
-                 2000, 2001, 2002   Free Software Foundation Inc.
+   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+                 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
    This file is part of GNU Emacs.
 
@@ -17,8 +17,8 @@
 
    You should have received a copy of the GNU General Public License
    along with GNU Emacs; see the file COPYING.  If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -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)
@@ -3686,7 +3689,7 @@ void
 version ()
 {
   printf ("ebrowse %s\n", VERSION);
-  puts ("Copyright (C) 1992-1999, 2000, 2001 Free Software Foundation, Inc.");
+  puts ("Copyright (C) 1992-2006 Free Software Foundation, Inc.");
   puts ("This program is distributed under the same terms as Emacs.");
   exit (EXIT_SUCCESS);
 }