patches: fix 0004 hunk context for accessibilityRangeForPosition:
Patch 0002 introduces accessibilityRangeForPosition: with the correct block_input-before-record_unwind ordering. Patch 0004 was trying to fix the ordering again (expecting wrong-order context), causing git am to fail at 0005 with 'patch does not apply'. Fix: remove the ordering swap from the 0004 hunk; retain only the comment improvement. The context now correctly reflects the state after 0002 applies (block_input followed by record_unwind_protect_void).
This commit is contained in:
@@ -32,9 +32,8 @@ index 16343f978a..f5e5cea074 100644
|
|||||||
+ record_unwind_protect_void (unblock_input) so that the unwind
|
+ record_unwind_protect_void (unblock_input) so that the unwind
|
||||||
+ handler is never called without a matching block_input. */
|
+ handler is never called without a matching block_input. */
|
||||||
specpdl_ref count = SPECPDL_INDEX ();
|
specpdl_ref count = SPECPDL_INDEX ();
|
||||||
- record_unwind_protect_void (unblock_input);
|
|
||||||
block_input ();
|
block_input ();
|
||||||
+ record_unwind_protect_void (unblock_input);
|
record_unwind_protect_void (unblock_input);
|
||||||
|
|
||||||
/* Find the glyph row at this y coordinate. */
|
/* Find the glyph row at this y coordinate. */
|
||||||
struct glyph_matrix *matrix = w->current_matrix;
|
struct glyph_matrix *matrix = w->current_matrix;
|
||||||
|
|||||||
Reference in New Issue
Block a user