# HG changeset patch # User Juanma Barranquero # Date 1263474864 -3600 # Node ID fbb584e66cf6201fc56d9be6f9065aea1951880b # Parent 30e3c13d2383b528993c55042fa36a8340adfce1 Simplify previous change. diff -r 30e3c13d2383 -r fbb584e66cf6 lisp/ChangeLog --- a/lisp/ChangeLog Thu Jan 14 14:12:05 2010 +0100 +++ b/lisp/ChangeLog Thu Jan 14 14:14:24 2010 +0100 @@ -1,3 +1,8 @@ +2010-01-14 Juanma Barranquero + + * progmodes/ada-xref.el (ada-default-prj-properties): + Simplify previous change. + 2010-01-14 Stephen Leake * progmodes/ada-xref.el (ada-default-prj-properties): diff -r 30e3c13d2383 -r fbb584e66cf6 lisp/progmodes/ada-xref.el --- a/lisp/progmodes/ada-xref.el Thu Jan 14 14:12:05 2010 +0100 +++ b/lisp/progmodes/ada-xref.el Thu Jan 14 14:14:24 2010 +0100 @@ -755,7 +755,7 @@ (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