patches: pre-upstream review fixes (all blockers + nits)
- 0000: fix double blank line before #ifdef, remove extra block scope braces - 0001: spell out 'AT' -> 'assistive technology'; fix stub comment - 0002: revert unrelated em-dash->triple-dash in windowWillResize strings - 0003-0005: renumber from [PATCH N/9] to [PATCH N/8] - 0006: remove 'Block-style cursors' from Known Limitations; fix @xref note - 0007: remove spurious ns_ax_face_is_selected ChangeLog entry - 0008: refactor goto skip_overlay_scan to nested if; remove spurious blank line - All: renumber series (0000=[PATCH 1/1], 0001-0008=[PATCH 1/8]-[PATCH 8/8])
This commit is contained in:
211
FIXES-APPLIED.md
Normal file
211
FIXES-APPLIED.md
Normal file
@@ -0,0 +1,211 @@
|
||||
# Fixes Applied to Patch Series
|
||||
|
||||
All fixes applied to `/tmp/emacs-doom-review/patches/` on 2026-03-04.
|
||||
|
||||
---
|
||||
|
||||
## FIX 1 — 0002: Revert em-dash → triple-dash in windowWillResize strings
|
||||
|
||||
**File:** `0002-ns-implement-buffer-accessibility-element.patch`
|
||||
|
||||
The `windowWillResize:` hunk incorrectly changed the window-resize title separator from
|
||||
em-dash (U+2014, ` — `) to triple-dash (` --- `) in:
|
||||
- `strstr (t, " — ")` — used to strip the size suffix when resizing begins
|
||||
- `esprintf (size_title, "%s — (%d × %d)", …)` — used to format the title
|
||||
|
||||
Both `-` lines were converted to context (` ` prefix) and the corresponding `+` lines
|
||||
were removed. The hunk header counts remained unchanged (13,13) since the net effect
|
||||
on old/new line counts is zero.
|
||||
|
||||
---
|
||||
|
||||
## FIX 2 — 0007: Remove spurious ns_ax_face_is_selected from commit message
|
||||
|
||||
**File:** `0007-ns-announce-overlay-completions-to-VoiceOver.patch`
|
||||
|
||||
The ChangeLog entry for `ns_ax_face_is_selected` was removed from the commit message:
|
||||
```
|
||||
* src/nsterm.m (ns_ax_face_is_selected): New static function; matches
|
||||
'current', 'selected', 'selection' in face symbol names.
|
||||
```
|
||||
This function does not exist in the diff — the actual function is
|
||||
`ns_face_name_matches_selected_p` (introduced in patch 0000/0001).
|
||||
|
||||
---
|
||||
|
||||
## FIX 3 — All patches: Renumber series for proper separation
|
||||
|
||||
The patches were renumbered to reflect two independent series:
|
||||
|
||||
| File | Before | After | Series |
|
||||
|--------|---------------|---------------|-------------------|
|
||||
| 0000 | [PATCH 1/9] | [PATCH 1/1] | Zoom (standalone) |
|
||||
| 0001 | [PATCH 2/9] | [PATCH 1/8] | VoiceOver |
|
||||
| 0002 | [PATCH 3/9] | [PATCH 2/8] | VoiceOver |
|
||||
| 0003 | [PATCH 4/9] | [PATCH 3/8] | VoiceOver |
|
||||
| 0004 | [PATCH 5/9] | [PATCH 4/8] | VoiceOver |
|
||||
| 0005 | [PATCH 6/9] | [PATCH 5/8] | VoiceOver |
|
||||
| 0006 | [PATCH 7/9] | [PATCH 6/8] | VoiceOver |
|
||||
| 0007 | [PATCH 8/9] | [PATCH 7/8] | VoiceOver |
|
||||
| 0008 | [PATCH 9/9] | [PATCH 8/8] | VoiceOver |
|
||||
|
||||
---
|
||||
|
||||
## FIX 4 — 0008: Refactor goto to nested if
|
||||
|
||||
**File:** `0008-ns-announce-child-frame-completions-to-VoiceOver.patch`
|
||||
|
||||
**Note:** The task description incorrectly named file 0007; the goto is in 0008.
|
||||
|
||||
In `postAccessibilityNotificationsForFrame:`, the overlay completion scan used a
|
||||
`goto skip_overlay_scan;` pattern. Refactored to a standard nested `if` block:
|
||||
|
||||
Before (in diff):
|
||||
```c
|
||||
if (!MINI_WINDOW_P (w) || didTextChange)
|
||||
goto skip_overlay_scan;
|
||||
|
||||
int selected_line = -1;
|
||||
NSString *candidate = ns_ax_selected_overlay_text (…);
|
||||
if (candidate)
|
||||
{ … }
|
||||
|
||||
skip_overlay_scan:
|
||||
/* --- Cursor moved … */
|
||||
```
|
||||
|
||||
After (in diff):
|
||||
```c
|
||||
if (MINI_WINDOW_P (w) && !didTextChange)
|
||||
{
|
||||
int selected_line = -1;
|
||||
NSString *candidate = ns_ax_selected_overlay_text (…);
|
||||
if (candidate)
|
||||
{ … }
|
||||
}
|
||||
/* --- Cursor moved … */
|
||||
```
|
||||
|
||||
The extended comment explaining the `didTextChange` guard was preserved. The inner
|
||||
body code is restored to its original indentation level. Hunk header updated from
|
||||
`+9609,49` to `+9609,48` (one fewer net added line).
|
||||
|
||||
---
|
||||
|
||||
## FIX 5 — 0006: Remove "Block-style cursors" from Known Limitations
|
||||
|
||||
**File:** `0006-doc-add-VoiceOver-section-to-macOS-appendix.patch`
|
||||
|
||||
Removed the `@item` bullet from the Known Limitations `@itemize`:
|
||||
```texinfo
|
||||
@item
|
||||
Block-style cursors are handled correctly: character navigation
|
||||
announces the character at the cursor position, not the character
|
||||
before it.
|
||||
```
|
||||
This is a feature, not a limitation. The hunk header was updated from
|
||||
`+273,82` to `+273,78` (4 fewer added lines).
|
||||
|
||||
---
|
||||
|
||||
## FIX 6 — 0001: Spell out "AT" in commit message
|
||||
|
||||
**File:** `0001-ns-add-accessibility-base-classes-and-helpers.patch`
|
||||
|
||||
In the ChangeLog entry for `syms_of_nsterm`:
|
||||
|
||||
Before: `set non-nil automatically when an AT is detected at startup.`
|
||||
After: `set non-nil automatically when an assistive technology (AT) is detected at startup.`
|
||||
|
||||
---
|
||||
|
||||
## FIX 7 — 0005: Spell out "AT" in commit message
|
||||
|
||||
**File:** `0005-ns-wire-accessibility-into-EmacsView-and-redisplay.patch`
|
||||
|
||||
**Result: No-op.** The commit message of patch 0005 (lines before the `---` separator)
|
||||
contains no "AT" abbreviation. The "AT" occurrences found by grep are in code comments
|
||||
within the diff body (not the commit message proper). No changes were made.
|
||||
|
||||
---
|
||||
|
||||
## FIX 8 — 0006: Remove spurious @xref note from commit message
|
||||
|
||||
**File:** `0006-doc-add-VoiceOver-section-to-macOS-appendix.patch`
|
||||
|
||||
Removed the sentence "Use @xref for cross-reference at sentence start." from the
|
||||
ChangeLog entry. This referenced an `@xref` that does not appear in the patch.
|
||||
|
||||
Before:
|
||||
```
|
||||
enabled, and known limitations. Use @xref for cross-reference at
|
||||
sentence start. Correct description of ns-accessibility-enabled
|
||||
```
|
||||
After:
|
||||
```
|
||||
enabled, and known limitations. Correct description of ns-accessibility-enabled
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## FIX 9 — 0001: Update stub comment reference
|
||||
|
||||
**File:** `0001-ns-add-accessibility-base-classes-and-helpers.patch`
|
||||
|
||||
In the stub `@implementation EmacsAccessibilityBuffer (InteractiveSpans)`:
|
||||
|
||||
Before: `/* Stub: full implementation added in patch 0004. */`
|
||||
After: `/* Stub: full implementation in the following patch. */`
|
||||
|
||||
This avoids a hard-coded patch number that may shift if the series is reordered.
|
||||
|
||||
---
|
||||
|
||||
## FIX 10 — 0000: Style nits
|
||||
|
||||
**File:** `0000-ns-integrate-with-macOS-Zoom-for-cursor-tracking.patch`
|
||||
|
||||
### a) Double blank line before `#ifdef NS_IMPL_COCOA`
|
||||
|
||||
In the large inserted block starting at `-1081,6 +1086,N`, an extra blank `+` line
|
||||
preceded `+#ifdef NS_IMPL_COCOA`, creating a triple blank gap. The extra `+\n` line
|
||||
was removed. Hunk header updated from `+1086,293` to `+1086,292`.
|
||||
|
||||
### b) Unnecessary block scope in `ns_draw_window_cursor`
|
||||
|
||||
The Zoom integration block used a gratuitous `{ … }` scope wrapper:
|
||||
```c
|
||||
{
|
||||
EmacsView *view = FRAME_NS_VIEW (f);
|
||||
if (view && on_p && active_p)
|
||||
{ … }
|
||||
}
|
||||
```
|
||||
Removed the outer braces and dedented the contents by one level:
|
||||
```c
|
||||
EmacsView *view = FRAME_NS_VIEW (f);
|
||||
if (view && on_p && active_p)
|
||||
{ … }
|
||||
```
|
||||
Hunk header updated from `+3559,45` to `+3559,43` (2 fewer added lines).
|
||||
|
||||
---
|
||||
|
||||
## FIX 11 — 0008: Remove spurious blank line in announceChildFrameCompletion
|
||||
|
||||
**File:** `0008-ns-announce-child-frame-completions-to-VoiceOver.patch`
|
||||
|
||||
Removed the blank line between the opening `{` and the first comment in the
|
||||
`announceChildFrameCompletion` method body. Hunk header updated from
|
||||
`+12991,156` to `+12991,155`.
|
||||
|
||||
---
|
||||
|
||||
## Verification
|
||||
|
||||
All 9 patch files pass post-fix verification:
|
||||
- All Subject: lines present with correct [PATCH N/M] numbering
|
||||
- All @@ hunk headers syntactically valid
|
||||
- No `goto skip_overlay_scan` or `skip_overlay_scan:` label remaining
|
||||
- No triple-dash in functional window-resize strings
|
||||
- No `ns_ax_face_is_selected` in 0007 commit message
|
||||
Reference in New Issue
Block a user