master e8613adb0d 4/6: Make compat alias ede-toplevel-project-or-nil obsolete

[Stefan Kangas]

branch: master
commit e8613adb0dc290bde41fd15dabbef255f5e00d8f
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    Make compat alias ede-toplevel-project-or-nil obsolete
    
    * lisp/cedet/ede/files.el (ede-toplevel-project-or-nil): Make
    compat alias obsolete.
---
 lisp/cedet/ede/files.el  | 5 ++---
 lisp/cedet/ede/system.el | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/lisp/cedet/ede/files.el b/lisp/cedet/ede/files.el
index b8acb192c1..e44ddea32f 100644
--- a/lisp/cedet/ede/files.el
+++ b/lisp/cedet/ede/files.el
@@ -340,7 +340,7 @@ Optional FORCE means to ignore the hash of known 
directories."
 ;;
 ;; These utilities will identify the "toplevel" of a project.
 ;;
-;; NOTE: These two -toplevel- functions return a directory even though
+;; NOTE: This -toplevel- function returns a directory even though
 ;;       the function name implies a project.
 
 (defun ede-toplevel-project (dir)
@@ -365,8 +365,6 @@ If DIR is not part of a project, return nil."
 
      (t nil))))
 
-(defalias 'ede-toplevel-project-or-nil #'ede-toplevel-project)
-
 ;;; DIRECTORY CONVERSION STUFF
 ;;
 (cl-defmethod ede-convert-path ((this ede-project) path)
@@ -535,6 +533,7 @@ Argument DIR is the directory to trim upwards."
        nil
       fnd)))
 
+(define-obsolete-function-alias 'ede-toplevel-project-or-nil 
#'ede-toplevel-project "29.1")
 
 (provide 'ede/files)
 
diff --git a/lisp/cedet/ede/system.el b/lisp/cedet/ede/system.el
index 2da16b37d7..b4fc95c607 100644
--- a/lisp/cedet/ede/system.el
+++ b/lisp/cedet/ede/system.el
@@ -133,7 +133,7 @@ Download tramp, and use /r:machine: for names on remote 
sites w/out FTP access."
 (defun ede-vc-project-directory ()
   "Run `vc-dir' on the current project."
   (interactive)
-  (let ((top (ede-toplevel-project-or-nil default-directory)))
+  (let ((top (ede-toplevel-project default-directory)))
     (vc-dir top nil)))
 
 (provide 'ede/system)