You can view, comment on, or merge this pull request online at:
https://github.com/geany/geany/pull/1908
-- Commit Summary --
* #1907 Add preferences flag to skip the project_ask_close dialog * Merge branch 'master' of https://github.com/StephenWassell/geany
-- File Changes --
M src/editor.h (1) M src/keyfile.c (2) M src/project.c (3)
-- Patch Links --
https://github.com/geany/geany/pull/1908.patch https://github.com/geany/geany/pull/1908.diff
Also needs manual update, see https://github.com/geany/geany/issues/1907
@StephenWassell pushed 1 commit.
d3463d1 #1907 Add preferences flag to skip the project_ask_close dialog - document
@StephenWassell pushed 1 commit.
0aa50f2 Make Symbols tab "Sort by Name" case insensitive
Please remove the last commit, its not relevant to this pull request.
Done! Sorry about that, I didn't realise it would get added automatically
The reason you are getting all the updates and all other changes you make is that you have made the pull request from master not from a branch. If you make a branch there is not need to touch it once you have made the pull request, (except if changes are needed :) and so the PR doesn't see all the noise or accidently get other changes you make (especially as you will make those in other branches now you know about them :) and your master will be clean and able to pull upstream changes without problems. It also makes it easier for testers to not pollute their master with your changes.
Sorry should have pinged you on that first but I didn't notice it wasn't a branch.
On the PR itself.
We don't really want to add more trash to the various prefs, but on the other hand adding it to the proper prefs UI needs Glade 3.8.5 (@kugel does 3.8.6 work?) and on any reasonably recent distro that version is not in the package repository so you have to build it yourself from source.
Otherwise it looks ok by quick inspection, not tested.
@StephenWassell pushed 7 commits.
0aa50f27d91be894d30450eff4bbf99521195e1d Make Symbols tab "Sort by Name" case insensitive cfadfad63d5f26f22cdb1939a78b1f0a856cd83b Merge remote-tracking branch 'upstream/master' into symbols-case-insensitive 31b9d6125d8e94c9ace810611023c7df89b17bf2 Merge remote-tracking branch 'upstream/master' into symbols-case-insensitive d08f52576682f183995ee646e1e2393518f4fc91 Merge remote-tracking branch 'upstream/master' into symbols-case-insensitive 5e1dcf4a40885e3d3c999cab3ccf9aaa562fd948 Merge remote-tracking branch 'upstream/master' into symbols-case-insensitive 3d83273199be07cd51ef6559a7fc1c71c01a0ade Merge remote-tracking branch 'upstream/master' into symbols-case-insensitive fe742c84453dd865c5b1ce4a5785acdb80cf87bd Merge remote-tracking branch 'upstream/master' into symbols-case-insensitive
I've removed the irrelevant commits (sorry it took so long!). Is it ok to merge as is, or should I get the option into the prefs UI?
github-comments@lists.geany.org