diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2010-01-14 14:14:24 +0100 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2010-01-14 14:14:24 +0100 |
| commit | 8794c483aefa2e99318b259f63055d6f45ba0b4d (patch) | |
| tree | c9fe65a267d16075948b82f6b971dc49c97d590f /lisp | |
| parent | 95005d39eb75a280c36a0f91eb11fc005fd5cf6a (diff) | |
| download | emacs-8794c483aefa2e99318b259f63055d6f45ba0b4d.tar.gz | |
Simplify previous change.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/progmodes/ada-xref.el | 2 |
2 files changed, 6 insertions, 1 deletions
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 |