Merge from trunk.

Subversion-branch: /branches/opl-branch
Subversion-revision: 1624

1 files changed, 25 insertions, 0 deletions

diff --git a/.lvimrc b/.lvimrc
index e37c50f9..cc2893d9 100644
--- a/.lvimrc
+++ b/.lvimrc
@@ -4,3 +4,28 @@ set tabstop=8
 set softtabstop=4
 set shiftwidth=4
 
+" Add all tag files to tags path.
+
+let topdir = findfile("configure.in", ".;")
+let topdir = substitute(topdir, "configure.in", "", "")
+
+" Check tags file in current dir:
+set tags+=tags
+
+" Add tag files in parent directories:
+let tagfiles = findfile("tags", ".;", -1)
+
+" Add tag files for libraries:
+call add(tagfiles, topdir . "textscreen/tags")
+call add(tagfiles, topdir . "pcsound/tags")
+
+for tagfile in tagfiles
+    " Don't go beyond the project top level when adding parent dirs:
+    if stridx(tagfile, topdir) >= 0
+        exec "set tags+=" . tagfile
+    endif
+endfor
+
+unlet topdir
+unlet tagfiles
+