Merge from origin/emacs-24

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

diff --git a/lisp/cedet/ede/locate.el b/lisp/cedet/ede/locate.el
index 072e2c2666a0c15d3bc55bcd438250c2b9b1d393..fdc03f640a0591aee5374591399dfa22a1d96ab0 100644 (file)
--- a/lisp/cedet/ede/locate.el
+++ b/lisp/cedet/ede/locate.el
@@ -1,6 +1,6 @@
 ;;; ede/locate.el --- Locate support
 
-;; Copyright (C) 2008-2013 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
@@ -163,7 +163,7 @@ that created this EDE locate object."
   "Create or update the database for the current project.
 You cannot create projects for the baseclass."
   (error "Cannot create/update a database of type %S"
-        (object-name loc)))
+        (eieio-object-name loc)))
 
 ;;; LOCATE
 ;;
@@ -310,8 +310,8 @@ that created this EDE locate object."
 ;;; CSCOPE
 ;;
 
-(declare-function cedet-cscope-version-check "cedet-scope")
-(declare-function cedet-cscope-support-for-directory "cedet-scope")
+(declare-function cedet-cscope-version-check "cedet-cscope")
+(declare-function cedet-cscope-support-for-directory "cedet-cscope")
 (declare-function cedet-cscope-expand-filename "cedet-cscope")
 (declare-function cedet-cscope-create/update-database "cedet-cscope")