Merge from trunk and resolve conflicts.

[gnu-emacs] / lisp / cedet / ede / speedbar.el

diff --git a/lisp/cedet/ede/speedbar.el b/lisp/cedet/ede/speedbar.el
index 252ce47df67be5f262d3416f477127fcd32195eb..ded9c78cf4021ce275c53149992091a0065d3376 100644 (file)
--- a/lisp/cedet/ede/speedbar.el
+++ b/lisp/cedet/ede/speedbar.el
@@ -1,7 +1,7 @@
 ;;; ede/speedbar.el --- Speedbar viewing of EDE projects
 
-;; Copyright (C) 1998-2001, 2003, 2005, 2007-2011
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 1998-2001, 2003, 2005, 2007-2014 Free Software
+;; Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: project, make, tags
@@ -257,7 +257,7 @@ It has depth DEPTH."
 INDENT is the current indentation level."
   (speedbar-find-file-in-frame
    (expand-file-name token (speedbar-line-directory indent)))
-  (speedbar-maybee-jump-to-attached-frame))
+  (dframe-maybee-jump-to-attached-frame))
 
 (defun ede-create-tag-buttons (filename indent)
   "Create the tag buttons associated with FILENAME at INDENT."
@@ -297,14 +297,14 @@ INDENT is the current indentation level."
   (let ((file (ede-find-nearest-file-line)))
     (speedbar-find-file-in-frame file)
     (save-excursion (speedbar-stealthy-updates))
-    ;; Reset the timer with a new timeout when cliking a file
+    ;; Reset the timer with a new timeout when clicking a file
     ;; in case the user was navigating directories, we can cancel
     ;; that other timer.
 ;    (speedbar-set-timer speedbar-update-speed)
     (goto-char token)
     (run-hooks 'speedbar-visiting-tag-hook)
     ;;(recenter)
-    (speedbar-maybee-jump-to-attached-frame)
+    (dframe-maybee-jump-to-attached-frame)
     ))
 
 ;;; EDE and the speedbar FILE display