patches: fix B5 - replace goto skip_overlay_scan with if-block
This commit is contained in:
@@ -269,7 +269,7 @@ index c9fe93a57b..f7574efb39 100644
|
|||||||
+ byte_pos++;
|
+ byte_pos++;
|
||||||
+ char_pos++;
|
+ char_pos++;
|
||||||
+ }
|
+ }
|
||||||
+ if (char_pos > lstart && nlines < 128)
|
+ if (char_pos > lstart && nlines < 512)
|
||||||
+ {
|
+ {
|
||||||
+ line_starts[nlines] = lstart;
|
+ line_starts[nlines] = lstart;
|
||||||
+ line_ends[nlines] = char_pos;
|
+ line_ends[nlines] = char_pos;
|
||||||
@@ -477,8 +477,8 @@ index c9fe93a57b..f7574efb39 100644
|
|||||||
+ echo produced by postTextChangedNotification, making typed
|
+ echo produced by postTextChangedNotification, making typed
|
||||||
+ characters inaudible. VoiceOver should read the overlay
|
+ characters inaudible. VoiceOver should read the overlay
|
||||||
+ candidate only when the user navigates (C-n/C-p), not types. */
|
+ candidate only when the user navigates (C-n/C-p), not types. */
|
||||||
+ if (!MINI_WINDOW_P (w) || didTextChange)
|
+ if (MINI_WINDOW_P (w) && !didTextChange)
|
||||||
+ goto skip_overlay_scan;
|
+ {
|
||||||
+
|
+
|
||||||
+ int selected_line = -1;
|
+ int selected_line = -1;
|
||||||
+ NSString *candidate
|
+ NSString *candidate
|
||||||
@@ -537,8 +537,7 @@ index c9fe93a57b..f7574efb39 100644
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
+ }
|
||||||
+ skip_overlay_scan:
|
|
||||||
/* --- Cursor moved or selection changed ---
|
/* --- Cursor moved or selection changed ---
|
||||||
Independent check from the overlay branch above. */
|
Independent check from the overlay branch above. */
|
||||||
if (point != self.cachedPoint || markActive != self.cachedMarkActive)
|
if (point != self.cachedPoint || markActive != self.cachedMarkActive)
|
||||||
|
|||||||
Reference in New Issue
Block a user