Merge changes from emacs-23 branch

[gnu-emacs] / lisp / cedet / semantic / tag-file.el

diff --git a/lisp/cedet/semantic/tag-file.el b/lisp/cedet/semantic/tag-file.el
index 74720b481c343b3c716a36cf90d18ca19b29f792..17fd3b453568ea12eee82270738a30e52f26cb42 100644 (file)
--- a/lisp/cedet/semantic/tag-file.el
+++ b/lisp/cedet/semantic/tag-file.el
@@ -1,7 +1,6 @@
 ;;; semantic/tag-file.el --- Routines that find files based on tags.
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008,
-;;   2009  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2005, 2007-2011  Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: syntax
@@ -32,7 +31,7 @@
 (declare-function semanticdb-table-child-p "semantic/db" t t)
 (declare-function semanticdb-get-buffer "semantic/db")
 (declare-function semantic-dependency-find-file-on-path "semantic/dep")
-(declare-function ede-toplevel "ede/files")
+(declare-function ede-toplevel "ede/base")
 
 ;;; Code:
 
@@ -103,7 +102,7 @@ PARENT can also be a `semanticdb-table' object."
   )
 
 (make-obsolete-overload 'semantic-find-nonterminal
-                        'semantic-go-to-tag)
+                        'semantic-go-to-tag "23.2")
 
 ;;; Dependencies
 ;;
@@ -177,7 +176,7 @@ Depends on `semantic-dependency-include-path' for searching.  Always searches
       )))
 
 (make-obsolete-overload 'semantic-find-dependency
-                        'semantic-dependency-tag-file)
+                        'semantic-dependency-tag-file "23.2")
 
 ;;; PROTOTYPE FILE
 ;;
@@ -193,29 +192,25 @@ file prototypes belong in."
   (:override
    ;; Perform some default behaviors
    (if (and (fboundp 'ede-header-file) ede-minor-mode)
-       (save-excursion
-         (set-buffer buffer)
+       (with-current-buffer buffer
          (ede-header-file))
      ;; No EDE options for a quick answer.  Search.
-     (save-excursion
-       (set-buffer buffer)
+     (with-current-buffer buffer
        (if (re-search-forward "::Header:: \\([a-zA-Z0-9.]+\\)" nil t)
            (match-string 1))))))
 
 (semantic-alias-obsolete 'semantic-find-nonterminal
-                         'semantic-go-to-tag)
+                         'semantic-go-to-tag "23.2")
 
 (semantic-alias-obsolete 'semantic-find-dependency
-                         'semantic-dependency-tag-file)
+                         'semantic-dependency-tag-file "23.2")
 
 
 (provide 'semantic/tag-file)
 
 ;; Local variables:
 ;; generated-autoload-file: "loaddefs.el"
-;; generated-autoload-feature: semantic/loaddefs
 ;; generated-autoload-load-name: "semantic/tag-file"
 ;; End:
 
-;; arch-tag: 71d4cf18-c1ec-414c-bb0a-c2ed914c1361
 ;;; semantic/tag-file.el ends here