--- a/lisp/oobr/java-brows.el	Mon Aug 13 08:50:31 2007 +0200
+++ b/lisp/oobr/java-brows.el	Mon Aug 13 08:51:03 2007 +0200
@@ -3,15 +3,15 @@
 ;; FILE:         java-brows.el
 ;; SUMMARY:      Java source code browser.
 ;; USAGE:        GNU Emacs Lisp Library
-;; KEYWORDS:     java, oop, tools
+;; KEYWORDS:     c, oop, tools
 ;;
 ;; AUTHOR:       Bob Weiner
-;; ORG:          Motorola Inc.
+;; ORG:          InfoDock Associates
 ;;
 ;; ORIG-DATE:    01-Aug-95
-;; LAST-MOD:     20-Sep-95 at 14:18:44 by Bob Weiner
+;; LAST-MOD:     12-Nov-96 at 15:20:24 by Bob Weiner
 ;;
-;; Copyright (C) 1995  Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1996  Free Software Foundation, Inc.
 ;; See the file BR-COPY for license information.
 ;;
 ;; This file is part of the OO-Browser.
@@ -87,14 +87,18 @@
 (defun java-mode-setup ()
   "Load best available java major mode and set 'br-lang-mode' to the function that invokes it."
   (fset 'br-lang-mode
-	(cond ((or (featurep 'java-mode)
-		   (load "java-mode" 'missing-ok 'nomessage))
+	(cond ((and (or (fboundp 'java-mode)
+			(featurep 'cc-mode)
+			(load "cc-mode" 'missing-ok 'nomessage))
+		    (fboundp 'java-mode))
 	       'java-mode)
-	      ((featurep 'cc-mode)
+	      ((load "java-mode" 'missing-ok 'nomessage)
+	       'java-mode)
+	      ((fboundp 'c++-mode)
+	       (provide 'c++-mode)
 	       'c++-mode)
-	      ((load "cc-mode" 'missing-ok 'nomessage)
-	       (provide 'c++-mode))
-	      (t (error "(java-mode-setup): Can't load major mode for Java code.")))))
+	      (t (error
+		  "(java-mode-setup): Can't load major mode for Java code.")))))
 
 ;;; ************************************************************************
 ;;; Internal functions