Patch 8.0.1488 (after 8.0.1218)
Problem: Emacs tags no longer work. (zdohnal)
Solution: Do not skip over end of line.
Files: src/tag.c, src/testdir/test_tagjump.vim
*** ../vim-8.0.1487/src/tag.c 2017-12-19 10:49:30.828391001 +0100
--- src/tag.c 2018-02-09 18:58:24.833931802 +0100
***************
*** 2958,2969 ****
char_u *p = lbuf + 1;
/* does the same thing as parse_match() */
! p += STRLEN(p) + 2;
#ifdef FEAT_EMACS_TAGS
! if (*p)
! p += STRLEN(p);
! else
! ++p;
#endif
return (p - lbuf) + STRLEN(p);
}
--- 2958,2966 ----
char_u *p = lbuf + 1;
/* does the same thing as parse_match() */
! p += STRLEN(p) + 1;
#ifdef FEAT_EMACS_TAGS
! p += STRLEN(p) + 1;
#endif
return (p - lbuf) + STRLEN(p);
}
*** ../vim-8.0.1487/src/testdir/test_tagjump.vim 2017-11-02
21:04:17.987345075 +0100
--- src/testdir/test_tagjump.vim 2018-02-09 18:30:21.746268652 +0100
***************
*** 229,232 ****
--- 229,260 ----
call delete('Xtags1')
endfunc
+ func Test_tagjump_etags()
+ if !has('emacs_tags')
+ return
+ endif
+ call writefile([
+ \ "void foo() {}",
+ \ "int main(int argc, char **argv)",
+ \ "{",
+ \ "\tfoo();",
+ \ "\treturn 0;",
+ \ "}",
+ \ ], 'Xmain.c')
+
+ call writefile([
+ \ "\x0c",
+ \ "Xmain.c,64",
+ \ "void foo() {}\x7ffoo\x011,0",
+ \ "int main(int argc, char **argv)\x7fmain\x012,14",
+ \ ], 'Xtags')
+ set tags=Xtags
+ ta foo
+ call assert_equal('void foo() {}', getline('.'))
+
+ call delete('Xtags')
+ call delete('Xmain.c')
+ bwipe!
+ endfunc
+
" vim: shiftwidth=2 sts=2 expandtab
*** ../vim-8.0.1487/src/version.c 2018-02-09 19:23:57.018446646 +0100
--- src/version.c 2018-02-09 19:25:03.457903413 +0100
***************
*** 773,774 ****
--- 773,776 ----
{ /* Add new patch number below this line */
+ /**/
+ 1488,
/**/
--
GUARD #2: It could be carried by an African swallow!
GUARD #1: Oh, yeah, an African swallow maybe, but not a European swallow,
that's my point.
GUARD #2: Oh, yeah, I agree with that...
The Quest for the Holy Grail (Monty Python)
/// Bram Moolenaar -- b...@moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to vim_dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
