From: Juanma Barranquero <lekktu@gmail.com>
Date: Thu, 14 Jan 2010 13:14:24 +0000 (+0100)
Subject: Simplify previous change.
X-Git-Tag: emacs-pretest-23.1.92~38^2^2~12
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8794c483aefa2e99318b259f63055d6f45ba0b4d;p=emacs.git

Simplify previous change.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 80b33e56a57..833a25c39a8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-14  Juanma Barranquero  <lekktu@gmail.com>
+
+	* progmodes/ada-xref.el (ada-default-prj-properties):
+	Simplify previous change.
+
 2010-01-14  Stephen Leake  <stephen_leake@member.fsf.org>
 
 	* progmodes/ada-xref.el (ada-default-prj-properties):
diff --git a/lisp/progmodes/ada-xref.el b/lisp/progmodes/ada-xref.el
index f3fd076c655..bf836b20eee 100644
--- a/lisp/progmodes/ada-xref.el
+++ b/lisp/progmodes/ada-xref.el
@@ -755,7 +755,7 @@ is non-nil, prompt the user to select one.  If none are found, return
   (let ((file (buffer-file-name nil)))
     (list
      ;; variable name alphabetical order
-     'ada_project_path (let ((path (getenv "ADA_PROJECT_PATH"))) (if path path ""))
+     'ada_project_path (or (getenv "ADA_PROJECT_PATH") "")
      'ada_project_path_sep  ada-prj-ada-project-path-sep
      'bind_opt        ada-prj-default-bind-opt
      'build_dir       default-directory