API tools faq
paste
Guest User

Untitled

a guest
Oct 21st, 2018
85
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 5.01 KB | None | 0 0
raw download clone embed print report
  1. diff -r 869a63c3f311 runtime/autoload/ccomplete.vim
  2. --- a/runtime/autoload/ccomplete.vim Wed Jun 13 19:19:41 2012 +0200
  3. +++ b/runtime/autoload/ccomplete.vim Wed Jun 20 10:37:50 2012 +0900
  4. @@ -500,7 +500,7 @@
  5. endif
  6. if !cached
  7. while 1
  8. - exe 'silent! ' . n . 'vimgrep /\t' . typename . '\(\t\|$\)/j ' . fnames
  9. + exe 'silent! keepj noautocmd ' . n . 'vimgrep /\t' . typename . '\(\t\|$\)/j ' . fnames
  10.  
  11. let qflist = getqflist()
  12. if len(qflist) > 0 || match(typename, "::") < 0
  13. diff -r 869a63c3f311 runtime/autoload/phpcomplete.vim
  14. --- a/runtime/autoload/phpcomplete.vim Wed Jun 13 19:19:41 2012 +0200
  15. +++ b/runtime/autoload/phpcomplete.vim Wed Jun 20 10:37:50 2012 +0900
  16. @@ -89,7 +89,7 @@
  17. let ext_classes = {}
  18. let fnames = join(map(tagfiles(), 'escape(v:val, " \\#%")'))
  19. if fnames != ''
  20. - exe 'silent! vimgrep /^'.a:base.'.*\tc\(\t\|$\)/j '.fnames
  21. + exe 'silent! keepj noautocmd vimgrep /^'.a:base.'.*\tc\(\t\|$\)/j '.fnames
  22. let qflist = getqflist()
  23. if len(qflist) > 0
  24. for field in qflist
  25. @@ -270,7 +270,7 @@
  26. let ext_vars = {}
  27. if fnames != ''
  28. let sbase = substitute(a:base, '^\$', '', '')
  29. - exe 'silent! vimgrep /^'.sbase.'.*\tv\(\t\|$\)/j '.fnames
  30. + exe 'silent! keepj noautocmd vimgrep /^'.sbase.'.*\tv\(\t\|$\)/j '.fnames
  31. let qflist = getqflist()
  32. if len(qflist) > 0
  33. for field in qflist
  34. @@ -309,7 +309,7 @@
  35. " Prepare list of functions from tags file
  36. let ext_functions = {}
  37. if fnames != ''
  38. - exe 'silent! vimgrep /^'.a:base.'.*\tf\(\t\|$\)/j '.fnames
  39. + exe 'silent! keepj noautocmd vimgrep /^'.a:base.'.*\tf\(\t\|$\)/j '.fnames
  40. let qflist = getqflist()
  41. if len(qflist) > 0
  42. for field in qflist
  43. @@ -405,7 +405,7 @@
  44. let ext_vars = {}
  45. if fnames != ''
  46. let sbase = substitute(a:base, '^\$', '', '')
  47. - exe 'silent! vimgrep /^'.sbase.'.*\tv\(\t\|$\)/j '.fnames
  48. + exe 'silent! keepj noautocmd vimgrep /^'.sbase.'.*\tv\(\t\|$\)/j '.fnames
  49. let qflist = getqflist()
  50. if len(qflist) > 0
  51. for field in qflist
  52. @@ -476,7 +476,7 @@
  53. " Prepare list of functions from tags file
  54. let ext_functions = {}
  55. if fnames != ''
  56. - exe 'silent! vimgrep /^'.a:base.'.*\tf\(\t\|$\)/j '.fnames
  57. + exe 'silent! keepj noautocmd vimgrep /^'.a:base.'.*\tf\(\t\|$\)/j '.fnames
  58. let qflist = getqflist()
  59. if len(qflist) > 0
  60. for field in qflist
  61. @@ -513,7 +513,7 @@
  62. let fnames = join(map(tagfiles(), 'escape(v:val, " \\#%")'))
  63. let ext_constants = {}
  64. if fnames != ''
  65. - exe 'silent! vimgrep /^'.a:base.'.*\td\(\t\|$\)/j '.fnames
  66. + exe 'silent! keepj noautocmd vimgrep /^'.a:base.'.*\td\(\t\|$\)/j '.fnames
  67. let qflist = getqflist()
  68. if len(qflist) > 0
  69. for field in qflist
  70. @@ -591,7 +591,7 @@
  71.  
  72. " OK, first way failed, now check tags file(s)
  73. let fnames = join(map(tagfiles(), 'escape(v:val, " \\#%")'))
  74. - exe 'silent! vimgrep /^'.object.'.*\$'.object.'.*=\s*new\s\+.*\tv\(\t\|$\)/j '.fnames
  75. + exe 'silent! keepj noautocmd vimgrep /^'.object.'.*\$'.object.'.*=\s*new\s\+.*\tv\(\t\|$\)/j '.fnames
  76. let qflist = getqflist()
  77. if len(qflist) == 0
  78. return ''
  79. @@ -624,7 +624,7 @@
  80. let fhead .= psep
  81. endif
  82. let fname = escape(fname, " \\")
  83. - exe 'silent! vimgrep /^'.a:classname.'.*\tc\(\t\|$\)/j '.fname
  84. + exe 'silent! keepj noautocmd vimgrep /^'.a:classname.'.*\tc\(\t\|$\)/j '.fname
  85. let qflist = getqflist()
  86. " As in GetClassName we can manage only one element if it exists
  87. if len(qflist) > 0
  88. diff -r 869a63c3f311 runtime/autoload/python3complete.vim
  89. --- a/runtime/autoload/python3complete.vim Wed Jun 13 19:19:41 2012 +0200
  90. +++ b/runtime/autoload/python3complete.vim Wed Jun 20 10:37:50 2012 +0900
  91. @@ -297,12 +297,12 @@
  92. str = ""
  93. if len(self.docstr) > 0: str += '"""'+self.docstr+'"""\n'
  94. for l in self.locals:
  95. - if l.startswith('import'): str += l+'\n'
  96. + if l.startswith('import') or l.startswith('from'): str += l+'\n'
  97. str += 'class _PyCmplNoType:\n def __getattr__(self,name):\n return None\n'
  98. for sub in self.subscopes:
  99. str += sub.get_code()
  100. for l in self.locals:
  101. - if not l.startswith('import'): str += l+'\n'
  102. + if not l.startswith('import') and not l.startswith('from'): str += l+'\n'
  103.  
  104. return str
  105.  
  106. diff -r 869a63c3f311 runtime/autoload/pythoncomplete.vim
  107. --- a/runtime/autoload/pythoncomplete.vim Wed Jun 13 19:19:41 2012 +0200
  108. +++ b/runtime/autoload/pythoncomplete.vim Wed Jun 20 10:37:50 2012 +0900
  109. @@ -315,12 +315,12 @@
  110. str = ""
  111. if len(self.docstr) > 0: str += '"""'+self.docstr+'"""\n'
  112. for l in self.locals:
  113. - if l.startswith('import'): str += l+'\n'
  114. + if l.startswith('import') or l.startswith('from'): str += l+'\n'
  115. str += 'class _PyCmplNoType:\n def __getattr__(self,name):\n return None\n'
  116. for sub in self.subscopes:
  117. str += sub.get_code()
  118. for l in self.locals:
  119. - if not l.startswith('import'): str += l+'\n'
  120. + if not l.startswith('import') and not l.startswith('from'): str += l+'\n'
  121.  
  122. return str
Add Comment
Please, Sign In to add comment
Public Pastes
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!