Update CEDET from upstream.

[bpt/emacs.git] / lisp / cedet / srecode / getset.el

diff --git a/lisp/cedet/srecode/getset.el b/lisp/cedet/srecode/getset.el
index 5155044..49d913a 100644 (file)
--- a/lisp/cedet/srecode/getset.el
+++ b/lisp/cedet/srecode/getset.el
@@ -298,10 +298,10 @@ Base selection on the field related to POINT."
   (let* ((kids (semantic-find-tags-by-class
                'variable (semantic-tag-type-members class)))
         (sel (completing-read "Use Field: " kids))
-        )
-
-    (or (semantic-find-tags-by-name sel kids)
-       sel)
+        (fields (semantic-find-tags-by-name sel kids)))
+    (if fields
+        (car fields)
+      sel)
     ))
 
 (defun srecode-auto-choose-class (point)