cvs diff: warning: failed to open /Users/nik/.cvspass for reading: No such file or directory
Index: semantic-analyze.el
===================================================================
RCS file: /cvsroot/cedet/cedet/semantic/semantic-analyze.el,v
retrieving revision 1.53
diff -d -u -r1.53 semantic-analyze.el
--- semantic-analyze.el	17 May 2007 15:46:42 -0000	1.53
+++ semantic-analyze.el	15 Jun 2007 20:29:55 -0000
@@ -137,7 +137,7 @@
                   (eq (semantic-tag-class ans) 'type)
                   (not (semantic-tag-type-members ans)))
              (semantic-analyze-find-tag
-              (semantic-tag-name ans) nil scope))
+              (semantic-tag-name ans) 'type scope))
             (t nil)))))
 
 ;;; SELECTING/MERGING
@@ -251,17 +251,17 @@
      ;; If NAME is solo, then do our searches for it here.
      ((stringp namelst)
       (let ((retlist
-	     (or (and scope (semantic-find-tags-by-name name scope))
-		 (if (and (fboundp 'semanticdb-minor-mode-p)
-			  (semanticdb-minor-mode-p))
-		     ;; Search the database
-		     (semanticdb-strip-find-results
-		      (semanticdb-find-tags-by-name name)
-		      ;; This T means to find files for matching symbols
-		      t)
-		   ;; Search just this file
-		   (semantic-find-tags-by-name
-		    name (current-buffer))))))
+	     (append (and scope (semantic-find-tags-by-name name scope))
+		     (if (and (fboundp 'semanticdb-minor-mode-p)
+			      (semanticdb-minor-mode-p))
+			 ;; Search the database
+			 (semanticdb-strip-find-results
+			  (semanticdb-find-tags-by-name name)
+			  ;; This T means to find files for matching symbols
+			  t)
+		       ;; Search just this file
+		       (semantic-find-tags-by-name
+			name (current-buffer))))))
 
 	(semantic-analyze-select-best-tag retlist tagclass))))))