Commit Graph

27731 Commits

Author SHA1 Message Date
Yee Cheng Chin 4204e69cdc Merge remote-tracking branch 'vim/master' 2023-03-27 19:09:08 -07:00
Yee Cheng Chin ecc0c916cd Merge pull request #1399 from macvim-dev/dependabot/github_actions/actions/stale-8
Bump actions/stale from 7 to 8
2023-03-27 13:51:16 -07:00
dependabot[bot] e56324190e Bump actions/stale from 7 to 8
Bumps [actions/stale](https://github.com/actions/stale) from 7 to 8.
- [Release notes](https://github.com/actions/stale/releases)
- [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/stale/compare/v7...v8)

---
updated-dependencies:
- dependency-name: actions/stale
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-03-27 17:01:34 +00:00
Bram Moolenaar 1a08a3e2a5 patch 9.0.1429: invalid memory access when ending insert mode
Problem:    Invalid memory access when ending insert mode.
Solution:   Check if the insert_skip value is valid.
2023-03-26 21:27:24 +01:00
Bram Moolenaar c174c2e58c patch 9.0.1428: cursor in wrong position when leaving insert mode
Problem:    Cursor in wrong position when leaving insert mode.
Solution:   Update the w_valid flags.  Position the cursor also when not
            redrawing. (closes #12137)
2023-03-25 20:06:49 +00:00
Bram Moolenaar 1f76138ff1 patch 9.0.1427: warning for uninitialized variable
Problem:    Warning for uninitialized variable. (Tony Mechelynck)
Solution:   Add #ifdef.
2023-03-25 11:31:32 +00:00
Virginia Senioria 99e4ab2a1e patch 9.0.1426: indent wrong after "export namespace" in C++
Problem:    Indent wrong after "export namespace" in C++.
Solution:   Skip over "inline" and "export" in any order. (Virginia Senioria,
            closes #12134, closes #12133)
2023-03-24 19:25:06 +00:00
Amaan Qureshi 3ea62381c5 patch 9.0.1425: "wat" and "wast" files are one filetype
Problem:    "wat" and "wast" files are one filetype.
Solution:   Add a separate filetype for "wat" files. (Amaan Qureshi,
            closes #12165)
2023-03-23 15:45:46 +00:00
Bram Moolenaar 7ac36130e0 patch 9.0.1424: unused macros are defined
Problem:    Unused macros are defined.
Solution:   Remove the unused macros.
2023-03-22 22:03:16 +00:00
Amaan Qureshi 890c772036 patch 9.0.1423: WebAssembly Interface Type files are not recognized
Problem:    WebAssembly Interface Type files are not recognized.
Solution:   Add a pattern for WIT files. (Amaan Qureshi, closes #12173)
2023-03-21 22:03:15 +00:00
Amaan Qureshi d0639d717b patch 9.0.1422: Sage files are not recognized
Problem:    Sage files are not recognized.
Solution:   Add a pattern for Sage files. (Amaan Qureshi, closes #12176)
2023-03-21 21:31:55 +00:00
Amaan Qureshi 8aa2a37f89 patch 9.0.1421: Nu files are not recognized
Problem:    Nu files are not recognized.
Solution:   Add a pattern for Nu files. (Amaan Qureshi, closes #12172)
2023-03-21 21:28:06 +00:00
Bram Moolenaar aa26153b6c patch 9.0.1420: build failure because SIZE_MAX is not defined
Problem:    Build failure because SIZE_MAX is not defined.
Solution:   Define SIZE_MAX when missing. (John Marriott)
2023-03-21 20:04:58 +00:00
Amaan Qureshi 4a5c39fc52 patch 9.0.1419: Lean files are not recognized
Problem:    Lean files are not recognized.
Solution:   Add a pattern for Lean files. (Amaan Qureshi, closes #12177)
2023-03-21 19:57:33 +00:00
Yee Cheng Chin 5fedb8a5ab patch 9.0.1418: the included xdiff code is a bit outdated
Problem:    The included xdiff code is a bit outdated.
Solution:   Sync with the latest git xdiff code. (Yee Cheng Chin,
            closes #12181)
2023-03-20 17:30:52 +00:00
Yee Cheng Chin 572c4926c7 Merge pull request #1397 from ychin/remove-locales-dup-encoding
Don't build/install non-UTF-8 and encoding-converted locales
2023-03-19 20:28:35 -07:00
Yee Cheng Chin 9a297e0d5d Merge pull request #1396 from ychin/sparkle-more-descriptive-version-string
Use more descriptive version string in Sparkle 2
2023-03-19 20:28:19 -07:00
Yee Cheng Chin a9d58107e5 Don't build/install non-UTF-8 and encoding-converted locales
Currently a lot of the .po locale files are generated using iconv to
different encodings. This is only necessary if the version of Vim does
not have iconv and cannot dynamically convert encoding, which isn't the
case for MacVim. Furthermore, MacVim should only work in UTF-8 anyway,
so it's not useful to have all the other non-UTF-8 locales (e.g.
zh_CN.cp936.po) being built and bundled together, as they make the build
process more complicated and bulk up the binary size of the app bundle.

Simply modify the Makefile to not install / build any of the duplicate
locale files. For locales like ko/zh_CN/zh_TW, where the "base" version
ko.po is in a non-UTF-8 locale and converted from a ko.UTF-8.po, we keep
only the ko.UTF-8.po version, but during install we install the folder
as "ko" instead of "ko.UTF-8". This way, if someone somehow set
LANG=ko_KR, it will still work instead of having to set
LANG=ko_KR.UTF-8.

Currently, pl.po is an odd one out because pl.UTF-8.po is actually
generated from pl.po, instead of the other way round. We just use pl.po
since that's the source version, instead of using the generated UTF-8
one for simplicity (MacVim can handle it fine).

Also, revert the MacVim-local translations made to these non-UTF8
locales like zh_CN.cp936.po, since we don't use them anymore in MacVim
builds.

Saved ~2 MB in the app bundle, and ~1MB in the generated dmg.
2023-03-19 18:51:25 -07:00
Yee Cheng Chin c311abc422 Use more descriptive version string in Sparkle 2
Sparkle 2.4 added support for customizing the displayed version string
instead of just showing the "display version" from the manifest (see
https://github.com/sparkle-project/Sparkle/issues/2267). Since MacVim
has a somewhat non-standard usage of bundle vs display version (bundle
is release number, and display version is the upstream Vim version), we
really want to show both to the user, in a concise manner. Support this
customization so it looks like "r123 (Vim 9.1.2345)" (here, "123" is the
bundle version / release number, and "9.1.2345" is the display version /
Vim version).

Fix #1293
2023-03-19 18:27:52 -07:00
Yee Cheng Chin 4b30143317 Merge pull request #1395 from ychin/sparkle-2.4.0
Sparkle 2.4.0
2023-03-19 18:27:20 -07:00
Yee Cheng Chin 8cbd16e500 Merge remote-tracking branch 'vim/master' 2023-03-19 18:07:24 -07:00
Yee Cheng Chin 08ae40e054 Sparkle 2.4.0
2.3.2
- Contains a fix to prevent Sparkle (and the app) from crashing if the
  appcast contains file:// or invalid URLs.

2.4
- Add ability to customize version string displays, which is useful for
  MacVim as our bundle version (MacVim release number) and display
  version (Vim release) are different things and we want to customize
  how they are displayed.
- Sparkle binary size reduced roughly by half. This does mean it doesn't
  come with debug symbols anymore so we would need to cross-correlate
  with dSYM files.
2023-03-19 17:26:46 -07:00
Amaan Qureshi a1fa8b3ac2 patch 9.0.1417: ESDL files are not recognized
Problem:    ESDL files are not recognized.
Solution:   Add a pattern for ESDL files. (Amaan Qureshi, closes #12174)
2023-03-19 21:57:07 +00:00
Ernie Rael e6d40dcdc7 patch 9.0.1416: crash when collection is modified when using filter()
Problem:    Crash when collection is modified when using filter().
Solution:   Lock the list/dict/blob. (Ernie Rael, closes #12183)
2023-03-19 21:23:38 +00:00
Amaan Qureshi 7c4516fe93 patch 9.0.1415: Crystal files are not recognized
Problem:    Crystal files are not recognized.
Solution:   Add a pattern for Crystal files. (Amaan Qureshi, closes #12175)
2023-03-19 20:43:26 +00:00
Yee Cheng Chin 2ab2d08a1e MacVim r176.1 (prerelease)
Updated to Vim 9.0.1403
prerelease-176.1
2023-03-19 01:26:37 -07:00
Yee Cheng Chin 01dd4ff3a9 Merge pull request #1393 from ychin/show-pre-release-about-macvim
About MacVim show "pre-release" when running a pre-release build
2023-03-19 01:26:03 -07:00
Yee Cheng Chin e8267a84ce About MacVim show "pre-release" when running a pre-release build
This helps the user know whether they are using a relatively untested
build and should consider going back to a main release. We currently
just define "pre-release" build as any release version with a minor
version, e.g. r176.1 is a pre-release, but r176 isn't.

Also, move the order around so we show "MacVim r123 (Vim
9.0.1234)" instead of "Vim 9.0.1234 (MacVim r123)" which is more
consistent with other ways we show version numbers, and this will be
how we show version number when we upgrade to Sparkle 2.4 as well.
2023-03-18 23:23:37 -07:00
Bram Moolenaar ea83c19462 patch 9.0.1414: <M-S-x> in Kitty does not use the Shift modifier
Problem:    <M-S-x> in Kitty does not use the Shift modifier.
Solution:   Apply the Shift modifier to ASCII letters. (closes #11913)
2023-03-18 17:22:46 +00:00
Yee Cheng Chin 43b496733b Merge pull request #1390 from ychin/fix-macos-13-ventura-printing
Fix :hardcopy not working in macOS 13 Ventura
2023-03-18 04:36:23 -07:00
Yee Cheng Chin 01bcda7077 Merge pull request #1391 from ychin/fix-xcode-project-warnings-parallel-deployment-target
Fix misc MacVim project warnings in Xcode
2023-03-18 04:36:03 -07:00
Yee Cheng Chin e3a5374446 Fix :hardcopy not working in macOS 13 Ventura
MacVim's `:hardcopy` implementation just uses Preview to show the
generated PostScript file and lets the user decide what to do with it.
macOS 13 Ventura removed PostScript support from Preview, so we now have
to manually convert it to PDF first using `pstopdf` (which is thankfully
bundled with macOS).

While we are at it, update the script so that we actually delete the
file after sending it to Preview. Previously MacVim never did that and
therefore leaks the file in a temp folder until Vim closes, which isn't
ideal for privacy. Now, just set a 10 sec timer to delete the file after
it's opened (we just need enough time to allow Preview to open and load
the file, which doesn't take much time. The 10 sec timer is to account
for slow computers).

Fix #1347
2023-03-18 03:00:26 -07:00
Yee Cheng Chin e443fb4040 Fix misc MacVim project warnings in Xcode
Turn on parallel building, to remove the "Building targets in manual
order is deprecated" project warning.

Also, fix configure to only set macOS deployment target to the major
version of macOS when automatically setting it from the client OS
version. E.g. On macOS 13.2 it will set deployment to 13.0. This is
useful because usually we don't want it to be as granular as the minor
version which had caused issues in Homebrew before
(https://github.com/Homebrew/homebrew-core/issues/111693) where they had
to fix on their end, and also 13.2 ends up being too new for Xcode which
only expects to see up to 13.1 as deployment target.

- Note that the logic used to work in OSX 10.X days because the "minor"
  version of X is actually the OS version, whereas in macOS 11/12/13 we
  now have versions like 13.2 where the first number is now the OS
  version. The configure script will now detect whether it's 10.X.Y or
  X.Y (X != 10) and set the correct target correspondingly.
2023-03-17 16:04:53 -07:00
Yee Cheng Chin 988f8b5f75 Merge pull request #1392 from ychin/fix-ci-mouse-shape-error-on-replace
Fix MacVim CI breakage in Test_mouse_shape_after_cancelling_gr
2023-03-17 16:03:47 -07:00
Yee Cheng Chin c8804ae8ff Fix MacVim CI breakage in Test_mouse_shape_after_cancelling_gr
Set mouseshape correctly when using 'r' or 'gr'. Otherwise Vim will only
do it when mouse moves or window receives focus, which is a little
random. This change will be ported upstream.
2023-03-17 15:14:12 -07:00
Bram Moolenaar 2a003177eb patch 9.0.1413: compiler warning for unused variable
Problem:    Compiler warning for unused variable.
Solution:   Move variable declaration. (John Marriott)
2023-03-17 18:50:48 +00:00
Amaan Qureshi 6e377eca8d patch 9.0.1412: Pony files are not recognized
Problem:    Pony files are not recognized.
Solution:   Add a pattern for Pony files. (Amaan Qureshi, closes #12155)
2023-03-17 18:42:58 +00:00
Ernie Rael 076de79ad8 patch 9.0.1411: accuracy of profiling is not optimal
Problem:    Accuracy of profiling is not optimal.
Solution:   Use CLOCK_MONOTONIC if possible. (Ernie Rael, closes #12129)
2023-03-16 21:43:15 +00:00
Yee Cheng Chin 16110ccf11 patch 9.0.1410: MacOS: sed fails on .po files
Problem:    MacOS: sed fails on .po files.
Solution:   Set $LANG to "C". (Yee Cheng Chin, closes #12153)
2023-03-16 21:04:31 +00:00
Gabriel Kakizaki d11ac403db patch 9.0.1409: racket files are recognized as scheme
Problem:    Racket files are recognized as scheme.
Solution:   Recognize rackets files separately. (Gabriel Kakizaki,
            closes #12164, closes #12162)
2023-03-16 20:13:29 +00:00
Amaan Qureshi 1505bef5c4 patch 9.0.1408: QMLdir files are not recognized
Problem:    QMLdir files are not recognized.
Solution:   Add a pattern for QMLdir files. (Amaan Qureshi, closes #12161)
2023-03-16 19:30:44 +00:00
Amaan Qureshi b8ef029ee4 patch 9.0.1407: TableGen files are not recognized
Problem:    TableGen files are not recognized.
Solution:   Add a pattern for TableGen files. (Amaan Qureshi, closes #12156)
2023-03-16 15:54:18 +00:00
Andreas Louv e202ec8a0c patch 9.0.1406: ILE RPG files are not recognized
Problem:    ILE RPG files are not recognized.
Solution:   Add patterns for ILE RPG files. (Andreas Louv, issue #12152)
2023-03-16 12:26:51 +00:00
Yee Cheng Chin e1a8d0a4c7 Merge pull request #1388 from ychin/fix-qlstephen-build-warnings
Fix qlstephen project warnings
2023-03-15 23:36:41 -07:00
Yee Cheng Chin c40d9b4058 Fix qlstephen project warnings
Part of this was originally part of #1178 but we removed the qlstephen
parts to prepare for eventual removal. Couple years later and we haven't
removed qlstephen yet, so just fix the warnings for now first.

From #1178:

- Fix the project localization name from English to "en"
- Set ALWAYS_SEARCH_USER_PATHS to "NO"

Also:

- Remove the hard-coded macOS 10.8 deployment target which actually
  isn't supported by modern Xcode versions. Just unset it as our CI
  usually sets that for us.
- The post-build script is now tagged properly to always run.
- Ignore all deprecation warnings. These were exposed because we removed
  the 10.8 deployment target. Since we aren't going to be fixing them
  (we are either just going to grab newer versions from upsteram, or
  delete this), there's no point in having these warnings.
2023-03-15 23:36:17 -07:00
Yee Cheng Chin 6c302c102e Use autoconf 2.69 to match upstream Vim
Previously MacVim started to use the latest autoconf (2.71) but it's
best to match upstream in version to make it easier to diff/merge
changes, and also because the version upgrade is technically not 100%
backwards compatible.
2023-03-15 15:18:27 -07:00
Bram Moolenaar 14338024c1 patch 9.0.1405: missing check for out-of-memory
Problem:    Missing check for out-of-memory.
Solution:   Check for alloc() returning NULL pointer. (closes #12149)
2023-03-15 22:05:44 +00:00
Bram Moolenaar e638acc927 patch 9.0.1404: compilation error with some compilers
Problem:    Compilation error with some compilers.
Solution:   Adjust array initialization. (John Marriott)
2023-03-15 17:08:51 +00:00
Yee Cheng Chin 92082eb1f2 Implement gui_mch_mousehide to make merging from upstream easier
Add an empty implementation to remove a diff from upstream, which
constantly shows up when resolving merge conflicts. We just make the
implementation empty because we already handle mouse hide in the MacVim
process using NSCursor instead, and don't need Vim's manual handling of
it.

Also, refactor test_macvim.vim a little.
2023-03-14 18:25:59 -07:00
Yee Cheng Chin 841c6ab865 Merge remote-tracking branch 'vim/master' 2023-03-14 18:16:13 -07:00