25 Commits

Author SHA1 Message Date
Yee Cheng Chin
644db087e5 Merge remote-tracking branch 'vim/master' 2025-12-31 22:17:11 -08:00
Yee Cheng Chin
37bfc1f53f Merge remote-tracking branch 'vim/master'
This merges the upstream socket client server code. For now it is
disabled to prevent it from interferring with MacVim's own client server
implementation.
2025-09-12 01:09:50 -07:00
Yee Cheng Chin
5e0c33363e Merge remote-tracking branch 'vim/master'
Additional test fixes:
- test_macvim:
  - remove check.vim import which is now done automatically
- test_gui:
  - Test_Buffers_Menu add conditional check to not run the
    LoadBufferMenu autocmd since in MacVim we don't use it.
  - Test_scrollbars remove go-k from the guioptions, due to MacVim's
    implementation being async compared to normal GVim. May need to
    revisit this in the future.

Also fix code indentation for MacVim-specific code to pass the new
Test_indent_of_source_files() test in test_codestyle.vim.
2025-07-22 16:34:55 -07:00
Yee Cheng Chin
081f8e267a Merge remote-tracking branch 'vim/master' 2024-07-24 15:08:29 -07:00
Yee Cheng Chin
de3b365762 Merge remote-tracking branch 'vim/master' 2024-04-19 18:31:42 +08:00
Yee Cheng Chin
f112c12f75 Merge remote-tracking branch 'vim/master'
Vim is updated to 9.1
2024-01-02 16:16:13 -08:00
Yee Cheng Chin
c50fd2fdde Merge remote-tracking branch 'vim/master'
Local fixes:
- Fix usage of `replace_termcodes` which added an additional parameter
  upstream.
2023-08-23 15:28:24 -07:00
Yee Cheng Chin
2b7f6eeb16 Merge remote-tracking branch 'vim/master' 2023-01-17 23:04:10 -08:00
Yee Cheng Chin
41771954ae Merge remote-tracking branch 'vim/master' 2023-01-02 14:51:54 -08:00
Yee Cheng Chin
8cd33f3c43 Merge remote-tracking branch 'vim/master' 2022-09-28 16:54:05 -07:00
ichizok
a615fe731e Merge remote-tracking branch 'vim/master' 2022-08-01 13:24:47 +09:00
ichizok
9243d1d921 Merge remote-tracking branch 'vim/master' 2022-07-04 11:50:07 +09:00
ichizok
adfe7be382 Merge remote-tracking branch 'vim/master' 2022-06-29 10:30:38 +09:00
ichizok
5adc22d15e Merge remote-tracking branch 'vim/master' 2021-12-18 15:18:57 +09:00
ichizok
69f86cf1ed Merge remote-tracking branch 'vim/master' 2021-12-07 16:47:45 +09:00
ichizok
5066f33ff6 Merge remote-tracking branch 'vim/master' 2021-09-05 18:39:35 +09:00
ichizok
ea2a2bed59 Merge remote-tracking branch 'vim/master' 2021-06-16 18:08:27 +09:00
ichizok
0b2587e10c Merge remote-tracking branch 'vim/master' 2021-04-23 11:33:28 +09:00
ichizok
fc7c28e178 Merge remote-tracking branch 'vim/master' 2021-01-06 09:12:53 +09:00
Yee Cheng Chin
7caffe5c20 Merge remote-tracking branch 'vim/master' 2020-12-18 19:38:57 -08:00
Yee Cheng Chin
09c033c047 Merge remote-tracking branch 'vim/master' 2020-01-27 03:21:24 -08:00
Yee Cheng Chin
7b64f50d01 Merge remote-tracking branch 'vim/master' 2020-01-14 08:52:44 -08:00
Yee Cheng Chin
98c61096c7 Update README_vim.md to reflect Vim's latest README.md 2019-02-17 16:54:02 -08:00
Kazuki Sakamoto
0975715099 Sync docs with Vim 8.0 2016-09-13 20:59:51 -07:00
Kazuki Sakamoto
0fffd1cda6 MacVim README.md 2016-04-20 20:28:19 -07:00