Skip to content

Fix typing emoji#47835

Merged
ConradIrwin merged 2 commits intomainfrom
fix-typing-emoji
Jan 28, 2026
Merged

Fix typing emoji#47835
ConradIrwin merged 2 commits intomainfrom
fix-typing-emoji

Conversation

@ConradIrwin
Copy link
Member

Closes #ISSUE

Release Notes:

  • (preview only) Fixed typing emoji using the macOS system palette (cmd-ctrl-space)

@cla-bot cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Jan 28, 2026
@ConradIrwin
Copy link
Member Author

/cherry-pick preview

@ConradIrwin ConradIrwin enabled auto-merge (squash) January 28, 2026 07:00
@ConradIrwin ConradIrwin merged commit ade8749 into main Jan 28, 2026
29 checks passed
@ConradIrwin ConradIrwin deleted the fix-typing-emoji branch January 28, 2026 07:04
github-actions bot pushed a commit that referenced this pull request Jan 28, 2026
- **Revert "ui: Dismiss context menus when window loses focus
(#46866)"**
- **Revert "Preserve and restore focus across window activation cycles
(#47044)"**

Closes #ISSUE

Release Notes:

- (preview only) Fixed typing emoji using the macOS system palette
(cmd-ctrl-space)
zed-zippy bot added a commit that referenced this pull request Jan 28, 2026
Cherry-pick of #47835 to preview

----
- **Revert "ui: Dismiss context menus when window loses focus
(#46866)"**
- **Revert "Preserve and restore focus across window activation cycles
(#47044)"**

Closes #ISSUE

Release Notes:

- (preview only) Fixed typing emoji using the macOS system palette
(cmd-ctrl-space)

Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
naaiyy added a commit to Glass-HQ/Glass that referenced this pull request Feb 16, 2026
Key changes:
- Version bump v0.223
- Bold folder labels setting (zed-industries#47631) for project panel
- min_size/max_size style methods in GPUI (zed-industries#47775)
- Emoji typing fix (zed-industries#47835)
- Heap allocation reductions in GPUI (zed-industries#47858)
- Git graph: feature graph support (zed-industries#47861)
- Editor: select to start/end of larger syntax node (zed-industries#47571)
- Scroll position persistence moved to background with debounce (zed-industries#47834)
- Markdown: improved double-click word selection (zed-industries#47844)
- Language injections fix (zed-industries#46134)
- SharedString::new_static for string literals (zed-industries#47865)
- ACP registry improvements and agent deprecation banners

Conflict resolutions:
- Kept our version (0.0.1), not upstream's 0.223.0
- Removed vim settings from default.json, settings_content, settings_ui
- Took upstream's bold_folder_labels in project panel
- Removed deleted crate files (gpui, vim, util)

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cla-signed The user has signed the Contributor License Agreement

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant