diff --git a/config/src/config.rs b/config/src/config.rs index 7a13f3ea6..e38fe9b22 100644 --- a/config/src/config.rs +++ b/config/src/config.rs @@ -474,7 +474,7 @@ pub struct Config { #[serde(default = "default_true")] pub scroll_to_bottom_on_input: bool, - #[serde(default = "default_use_ime")] + #[serde(default = "default_true")] pub use_ime: bool, #[serde(default)] pub xim_im_name: Option, @@ -1042,14 +1042,6 @@ fn default_ratelimit_line_prefetches_per_second() -> u32 { 10 } -fn default_use_ime() -> bool { - if cfg!(target_os = "macos") { - false - } else { - true - } -} - fn default_cursor_blink_rate() -> u64 { 800 } diff --git a/docs/changelog.md b/docs/changelog.md index 3baa5e97b..c7a48fae1 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -26,6 +26,7 @@ As features stabilize some brief notes about them will accumulate here. * Key assignments now match prior to any dead-key or IME composition [#877](https://github.com/wez/wezterm/issues/877) * `wezterm cli`, when run outside of a wezterm pane, now prefers to connect to the main GUI instance rather than background mux server. Use `wezterm cli --prefer-mux` to ignore the GUI instance and talk only to the mux server. See `wezterm cli --help` for additional information. * [ScrollByPage](config/lua/keyassignment/ScrollByPage.md) now accepts fractional numbers like `0.5` to scroll by half a page at time. Thanks to [@hahuang65](https://github.com/hahuang65)! [#1534](https://github.com/wez/wezterm/pull/1534) +* [use_ime](config/lua/config/use_ime.md) now defaults to `true` on all platforms; previously it was not enabled by default on macOS. #### Updated and Improved diff --git a/docs/config/lua/config/use_ime.md b/docs/config/lua/config/use_ime.md index 63df667d3..35bff4dcf 100644 --- a/docs/config/lua/config/use_ime.md +++ b/docs/config/lua/config/use_ime.md @@ -26,7 +26,6 @@ Changing `use_ime` usually requires re-launching WezTerm to take full effect. The default for `use_ime` is false. The default in earlier releases was `true`. - *Since: 20220101-133340-7edc5b5a* The default for X11 systems is now `true`. Please ensure that the `XMODIFIERS` @@ -34,3 +33,6 @@ environment variable or the new [xim_im_name](xim_im_name.md) configuration option is set appropriately before wezterm is launched! For example, Gnome users will probably want to set `XMODIFIERS=@im=ibus`. +*Since: nightly builds only* + +The default for all systems is now `true`