consider currentFile when searching for global symbols

Signed-off-by: Adrian Negreanu <adrian.m.negreanu@intel.com>
Merge branch 'for-upstream' of https://github.com/groleo/doxygen-1 into groleo-for-upstream
Minor layout tweaks and extra guard
Merge branch 'master' of github.com:doxygen/doxygen