diff options
Diffstat (limited to 'lisp/cedet/srecode/java.el')
| -rw-r--r-- | lisp/cedet/srecode/java.el | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/lisp/cedet/srecode/java.el b/lisp/cedet/srecode/java.el index 1b8922c2746..d812df1c935 100644 --- a/lisp/cedet/srecode/java.el +++ b/lisp/cedet/srecode/java.el @@ -1,6 +1,6 @@ ;;; srecode/java.el --- Srecode Java support -;; Copyright (C) 2009-2013 Free Software Foundation, Inc. +;; Copyright (C) 2009-2015 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <eric@siege-engine.com> @@ -40,16 +40,15 @@ FILENAME_AS_CLASS - file converted to a Java class name." (fnox (file-name-sans-extension fsym)) (dir (file-name-directory (buffer-file-name))) (fpak fsym) + (proj (ede-current-project)) + (pths (ede-source-paths proj 'java-mode)) ) (while (string-match "\\.\\| " fpak) (setq fpak (replace-match "_" t t fpak))) ;; We can extract package from: ;; 1) a java EDE project source paths, - (cond ((ede-current-project) - (let* ((proj (ede-current-project)) - (pths (ede-source-paths proj 'java-mode)) - (pth) - (res)) + (cond ((and proj pths) + (let* ((pth) (res)) (while (and (not res) (setq pth (expand-file-name (car pths)))) (when (string-match pth dir) |