Merge from mainline.

[gnu-emacs] / lisp / cedet / srecode / getset.el

diff --git a/lisp/cedet/srecode/getset.el b/lisp/cedet/srecode/getset.el
index b9552f541f1f5375c9654299f9dd79699324fd94..b865b5ec6267b892b4568bfd47b245126454b4cd 100644 (file)
--- a/lisp/cedet/srecode/getset.el
+++ b/lisp/cedet/srecode/getset.el
@@ -1,6 +1,6 @@
 ;;; srecode/getset.el --- Package for inserting new get/set methods.
 
-;; Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
@@ -55,8 +55,9 @@ will be derived."
       (error "No templates for inserting get/set"))
 
   ;; Step 1: Try to derive the tag for the class we will use
+  (semantic-fetch-tags)
   (let* ((class (or class-in (srecode-auto-choose-class (point))))
-        (tagstart (semantic-tag-start class))
+        (tagstart (when class (semantic-tag-start class)))
         (inclass (eq (semantic-current-tag-of-class 'type) class))
         (field nil)
         )
@@ -359,9 +360,7 @@ Base selection on the field related to POINT."
 
 ;; Local variables:
 ;; generated-autoload-file: "loaddefs.el"
-;; generated-autoload-feature: srecode/loaddefs
 ;; generated-autoload-load-name: "srecode/getset"
 ;; End:
 
-;; arch-tag: c2098b7a-df7f-4e8a-a9e3-2be8798a7554
 ;;; srecode/getset.el ends here