Changeset 14691

Timestamp:

04/22/13 10:34:44 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: updated file_line.vim

File:

• issm/trunk-jpl/externalpackages/vim/addons/vim/plugin/file_line.vim (modified) (1 diff)

issm/trunk-jpl/externalpackages/vim/addons/vim/plugin/file_line.vim

@@ +1 @@
+" Avoid installing twice or when in unsupported Vim version.
+if exists('g:loaded_file_line') || (v:version < 700)
+        finish
+endif
+let g:loaded_file_line = 1
+
 function! s:gotoline()
         let file = bufname("%")
-        let names =  matchlist( file, '\(.*\):\(\d\+\)')
 
-        if len(names) != 0 && filereadable(names[1])
+        " :e command calls BufRead even though the file is a new one.
+        " As a workarround Jonas Pfenniger<jonas@pfenniger.name> added an
+        " AutoCmd BufRead, this will test if this file actually exists before
+        " searching for a file and line to goto.
+        if (filereadable(file))
+                return
+        endif
+
+        " Accept file:line:column: or file:line:column and file:line also
+        let names =  matchlist( file, '\(.\{-1,}\):\%(\(\d\+\)\%(:\(\d*\):\?\)\?\)\?$')
+
+        if empty(names)
+                return
+        endif
+
+        let file_name = names[1]
+        let line_num  = names[2] == ''? '0' : names[2]
+        let  col_num  = names[3] == ''? '0' : names[3]
+
+        if filereadable(file_name)
                 let l:bufn = bufnr("%")
-                exec ":e " . names[1]
-                exec ":" . names[2]
-                exec ":bdelete " . l:bufn
-                if foldlevel(names[2]) > 0
-                        exec ":foldopen!"
+                exec ":bwipeout " l:bufn
+
+                exec "keepalt edit " . file_name
+                exec ":" . line_num
+                exec "normal! " . col_num . '|'
+                if foldlevel(line_num) > 0
+                        exec "normal! zv"
                 endif
+
+
+                exec "normal! zz"
         endif
+
 endfunction
 
 autocmd! BufNewFile *:* nested call s:gotoline()
+autocmd! BufRead *:* nested call s:gotoline()