(String comparison was intended, not identity.) Fixes #2883. To minimize conflict with PR #2867, this does not touch the `scintilla_changes.patch` / `update-scintilla.sh` setup. When the time comes, #2867 will obsolete this change. All the best! You can view, comment on, or merge this pull request online at:
https://github.com/geany/geany/pull/2884
-- Commit Summary --
* Correct the backport of UniqueStringSet::Save to Scintilla 3.x. (String comparison was intended, not identity.) Fixes #2883.
-- File Changes --
M scintilla/src/UniqueString.cxx (2)
-- Patch Links --
https://github.com/geany/geany/pull/2884.patch https://github.com/geany/geany/pull/2884.diff
Thanks, I will hopefully try it soon, unless someone else beats me to it.
It will conflict with #2867 since both change the same line, but rebasing before merge should make it go away.
WFM (at least nothing appears to break)
Merged #2884 into master.
I'm rebasing my scintilla5 branch after reading this. As expected, I notice the conflict. I understood that I should keep the `sv == us.get()` line because of `string_view`, is that right?
I'm rebasing my scintilla5 branch after reading this. As expected, I notice the conflict. I understood that I should keep the `sv == us.get()` line because of `string_view`, is that right?
Hi, that's correct. On the Scintilla 5 branch my code should be gleefully thrown away. :)
github-comments@lists.geany.org