Diffusion KTextEditor d1423b15796d

Merge branch 'master' into multicursor
d1423b15796d
Actions

Authored by brauch on Jul 18 2017, 7:23 PM.

Description

Merge branch 'master' into multicursor

Conflicts:
src/undo/kateundo.cpp
src/view/kateview.h

Details

Committed

brauch

Jul 18 2017, 7:23 PM

Parents

R39:2605240f0920: Merge branch 'master' into multicursor
R39:3b202d26f2ee: Emit signals from icon border when no mark was clicked

Branches

Unknown

Tags

Unknown

brauch committed R39:d1423b15796d: Merge branch 'master' into multicursor (authored by brauch).Jul 18 2017, 7:23 PM

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

Commit		Author	Details	Committed
3b202d26f2ee	D6541	croick	Emit signals from icon border when no mark was clicked	Jul 12 2017
ad51cece443b		dhaumann	Fix crash in vi input mode (sequence: "o" "Esc" "O" "Esc" ".")	Jul 11 2017
98aec940ec0b	D6535	kfunk	Use mutually exclusive group in Default Mark Type	Jul 9 2017
6461ebe5a76c		l10n daemon script	GIT_SILENT Upgrade KF5 version to 5.37.0.	Jul 8 2017
86f75f4f384a		sandsmark	Fix cpu usage spiking after showing vi command bar	Jul 1 2017
dfafd429c71e		l10n daemon script	GIT_SILENT Upgrade ECM and KF5 version requirements for 5.36.0 release.	Jun 30 2017
7f0ad267e9b1		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jun 30 2017
726cbb474e09		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jun 20 2017
70ed98448507		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jun 11 2017
24e614ffb67d		l10n daemon script	GIT_SILENT Upgrade KF5 version to 5.36.0.	Jun 10 2017
574647ef74e1		sars	Fix jumpy scrollbar-dragging when mini-map is enabled.	Jun 6 2017
7bb1f434afaf	D6086	sars	Jump to the clicked scrollbar position when minim-map is enabled.	Jun 5 2017
d4a38ecd3134		kossebau	[FEATURE] Option to build & install QCH file with the public API dox	Jun 5 2017
5d2b70a8c8c0		l10n daemon script	GIT_SILENT Upgrade ECM and KF5 version requirements for 5.35.0 release.	Jun 3 2017
e9dcee3951b1		mlaurent	Add Q_FALLTHROUGH	Jun 2 2017
fdd22b5277d0		mlaurent	Add missing break	Jun 2 2017
fb2dd27054a5		kossebau	Unbreak KateSyntaxTest in paths with dots, check only dir entry name for .	Jun 1 2017
a198421c2b33		kossebau	Revert "Add temporary debug output for investigating KateSyntaxTest fail on CI"	Jun 1 2017
1e1786a718bd		kossebau	Add temporary debug output for investigating KateSyntaxTest fail on CI	Jun 1 2017
62dc8721c111		kossebau	Remove duplicated path separator	Jun 1 2017
b42d73f82d46		kossebau	Unbreak autotests in paths with spaces, properly escape " chars	Jun 1 2017
a3fe7b6b6983		kossebau	Use explicit flag values or explicit constructor instead of nullptr	Jun 1 2017
ecb0055dfe37		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	May 24 2017
bf01d4a6fdb3		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	May 22 2017
b1ab7ec09858		l10n daemon script	GIT_SILENT Upgrade KF5 version to 5.35.0.	May 13 2017
baf7b2f7b133		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	May 10 2017
517d8e04a7e4		l10n daemon script	GIT_SILENT Upgrade ECM and KF5 version requirements for 5.34.0 release.	May 6 2017
a6052c505a7e		l10n daemon script	GIT_SILENT Upgrade KF5 version to 5.34.0.	May 5 2017
a4fef6066c58		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	May 3 2017
daaf3f96692e		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	May 2 2017
f7a9573d973e	D5394	martinkostolny	KAuth integration in document saving - vol. 2 - various security improvements	Apr 30 2017
c24b36b8936e		mwolff	Fix assertion when applying code folding that changes cursor position	Apr 26 2017
5f98480aeea8		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Apr 24 2017
ae7f80ff77e3		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Apr 20 2017
957b4fb7896f		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Apr 19 2017
25ff739c4d6b		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Apr 16 2017
eef379fbb4ee		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Apr 14 2017
293fd2b24b59		kossebau	Use non-deprecated <gui> root element in ui.rc file	Apr 11 2017
9c727b0afc83		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Apr 11 2017
2815be70060a		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Apr 10 2017
1bd9d474763c		sars	Add scroll-bar-marks also to the built-in search&replace	Apr 9 2017
92ffdfed6a36		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Apr 9 2017
602f7ff92b73		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Apr 8 2017
899d223451b6		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Apr 6 2017
ff3697918462		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Apr 4 2017
ae60880c5f9b	D4847	martinkostolny	KAuth integration in document saving	Apr 2 2017
cef14d5f3f50		l10n daemon script	Upgrade ECM and KF5 version requirements for 5.33.0 release.	Apr 1 2017
9a9f51956d44	D5108	cullmann	fix debug warning (and wrong pen value) found by kfunk, introduced my me	Mar 19 2017
c9cb3e9761f3	D4947	jsalatas	Expose additional internal View's functionality to the public API	Mar 19 2017
92f0f8d0b80b		l10n daemon script	Upgrade KF5 version to 5.33.0.	Mar 11 2017

Changes (192)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

		Path
M		CMakeLists.txt
M		KF5TextEditorConfig.cmake.in
M		autotests/CMakeLists.txt
M		autotests/input/md5checksum.txt
M		autotests/src/bug205447.cpp
M		autotests/src/bug286887.cpp
M		autotests/src/bug313759.cpp
M		autotests/src/bug313769.cpp
M		autotests/src/bug317111.cpp
M		autotests/src/codecompletiontestmodel.h
M		autotests/src/codecompletiontestmodels.h
M		autotests/src/completion_test.cpp
A		autotests/src/configinterface_test.cpp
P		autotests/src/configinterface_test.h Copied from autotests/src/kateview_test.h
M		autotests/src/katedocument_test.cpp
M		autotests/src/kateencodingtest.cpp
M		autotests/src/katefoldingtest.cpp
M		autotests/src/katesyntaxtest.cpp
M		autotests/src/katetextbuffertest.cpp
M		autotests/src/katetextbuffertest.h
M		autotests/src/kateview_test.cpp
P		autotests/src/kateview_test.h Copied to autotests/src/configinterface_test.h
M		autotests/src/kte_documentcursor.cpp
M		autotests/src/messagetest.cpp
M		autotests/src/movingrange_test.cpp
M		autotests/src/multicursor_test.cpp
M		autotests/src/plaintextsearch_test.cpp
M		autotests/src/script_test_base.cpp
M		autotests/src/scriptdocument_test.cpp
M		autotests/src/searchbar_test.cpp
M		autotests/src/templatehandler_test.cpp
M		autotests/src/testutils.cpp
M		autotests/src/undomanager_test.cpp
M		autotests/src/vimode/base.cpp
M		autotests/src/vimode/emulatedcommandbar.cpp
M		autotests/src/vimode/keys.cpp
M		autotests/src/wordcompletiontest.cpp
A	(dir)	cmake/
A		cmake/FindEditorConfig.cmake
M		src/CMakeLists.txt
A		src/buffer/katesecuretextbuffer.cpp
A		src/buffer/katesecuretextbuffer_p.h
M		src/buffer/katetextbuffer.cpp
M		src/buffer/katetextbuffer.h
M		src/buffer/katetextcursor.cpp
M		src/buffer/katetextfolding.cpp
M		src/buffer/katetextfolding.h
M		src/buffer/katetextloader.h
M		src/buffer/katetextrange.cpp
M		src/buffer/katetextrange.h
A		src/buffer/org.kde.ktexteditor.katetextbuffer.actions
M		src/completion/expandingtree/expandingdelegate.h
M		src/completion/expandingtree/expandingwidgetmodel.cpp
M		src/completion/kateargumenthinttree.cpp
M		src/completion/katecompletionconfig.cpp
M		src/completion/katecompletionconfig.h
M		src/completion/katecompletionmodel.cpp
M		src/completion/katecompletionmodel.h
M		src/completion/katecompletionwidget.cpp
M		src/completion/katecompletionwidget.h
M		src/completion/katewordcompletion.cpp
M		src/data/katepart5ui.rc
M		src/data/ktexteditor.desktop
M		src/data/ktexteditorplugin.desktop
M		src/dialogs/bordersappearanceconfigwidget.ui
M		src/dialogs/editconfigwidget.ui
M		src/dialogs/filetypeconfigwidget.ui
M		src/dialogs/kateconfigpage.h
M		src/dialogs/katedialogs.cpp
M		src/dialogs/katedialogs.h
M		src/dialogs/opensaveconfigadvwidget.ui
M		src/dialogs/opensaveconfigwidget.ui
M		src/dialogs/textareaappearanceconfigwidget.ui
A		src/document/editorconfig.cpp
A		src/document/editorconfig.h
M		src/document/katebuffer.cpp
M		src/document/katebuffer.h
M		src/document/katedocument.cpp
M		src/document/katedocument.h
M		src/export/abstractexporter.h
M		src/export/exporter.cpp
M		src/include/ktexteditor/codecompletionmodelcontrollerinterface.h
M		src/include/ktexteditor/command.h
M		src/include/ktexteditor/configinterface.h
M		src/include/ktexteditor/document.h
M		src/include/ktexteditor/markinterface.h
M		src/include/ktexteditor/movingrange.h
M		src/include/ktexteditor/sessionconfiginterface.h
M		src/include/ktexteditor/view.h
M		src/inputmode/katenormalinputmode.cpp
M		src/inputmode/katenormalinputmodefactory.cpp
M		src/inputmode/kateviinputmode.cpp
M		src/mode/katemodemanager.cpp
M		src/mode/katemodemenu.cpp
M		src/part/katepart.desktop
M		src/printing/kateprinter.cpp
M		src/printing/printconfigwidgets.cpp
M		src/printing/printconfigwidgets.h
M		src/render/katelayoutcache.cpp
M		src/render/katelinelayout.cpp
M		src/render/katerenderer.cpp
M		src/render/katerenderer.h
M		src/schema/katecategorydrawer.cpp
M		src/schema/katecolortreewidget.cpp
M		src/schema/katecolortreewidget.h
M		src/schema/kateschema.cpp
M		src/schema/kateschemaconfig.cpp
M		src/schema/kateschemaconfig.h
M		src/schema/katestyletreewidget.cpp
M		src/schema/katestyletreewidget.h
M		src/script/data/commands/emmet.js
M		src/script/data/commands/utils.js
M		src/script/katescript.cpp
M		src/script/katescriptdocument.cpp
M		src/script/katescriptdocument.h
M		src/script/katescriptmanager.cpp
M		src/script/katescriptmanager.h
M		src/script/katescriptview.cpp
M		src/script/katescriptview.h
M		src/search/kateplaintextsearch.h
M		src/search/kateregexp.cpp
M		src/search/kateregexpsearch.h
M		src/search/katesearchbar.cpp
M		src/search/katesearchbar.h
M		src/spellcheck/ontheflycheck.cpp
M		src/spellcheck/spellcheck.h
M		src/spellcheck/spellcheckbar.cpp
M		src/spellcheck/spellcheckbar.h
M		src/spellcheck/spellcheckdialog.cpp
M		src/spellcheck/spellingmenu.cpp
M		src/swapfile/kateswapdiffcreator.cpp
M		src/swapfile/kateswapfile.cpp
M		src/syntax/katehighlight.cpp
M		src/syntax/katehighlight.h
M		src/syntax/katehighlighthelpers.cpp
M		src/syntax/katehighlightingcmds.cpp
M		src/syntax/katehighlightingcmds.h
M		src/syntax/katehighlightmenu.cpp
M		src/syntax/katesyntaxdocument.cpp
M		src/syntax/katesyntaxmanager.cpp
M		src/syntax/katesyntaxmanager.h
M		src/undo/kateundo.cpp
M		src/undo/kateundomanager.cpp
M		src/utils/application.cpp
M		src/utils/codecompletionmodel.cpp
M		src/utils/configinterface.cpp
M		src/utils/document.cpp
M		src/utils/kateautoindent.cpp
M		src/utils/kateautoindent.h
M		src/utils/katebookmarks.cpp
M		src/utils/katecmds.cpp
M		src/utils/katecmds.h
M		src/utils/kateconfig.cpp
M		src/utils/kateglobal.cpp
M		src/utils/katesedcmd.cpp
M		src/utils/katesedcmd.h
M		src/utils/katetemplatehandler.cpp
M		src/utils/katetemplatehandler.h
M		src/utils/ktexteditor.cpp
M		src/utils/mainwindow.cpp
M		src/utils/messageinterface.cpp
M		src/utils/movinginterface.cpp
M		src/utils/movingrangefeedback.cpp
M		src/variableeditor/katehelpbutton.h
M		src/variableeditor/variableeditor.h
M		src/variableeditor/variablelineedit.cpp
M		src/variableeditor/variablelineedit.h
M		src/variableeditor/variablelistview.h
M		src/view/kateanimation.cpp
M		src/view/katefadeeffect.cpp
M		src/view/katefadeeffect.h
M		src/view/katemessagewidget.cpp
M		src/view/katestatusbar.cpp
M		src/view/kateview.cpp
M		src/view/kateview.h
M		src/view/kateviewaccessible.h
M		src/view/kateviewhelpers.cpp
M		src/view/kateviewhelpers.h
M		src/view/kateviewinternal.cpp
M		src/vimode/appcommands.cpp
M		src/vimode/appcommands.h
M		src/vimode/cmds.cpp
M		src/vimode/cmds.h
M		src/vimode/emulatedcommandbar/emulatedcommandbar.cpp
M		src/vimode/emulatedcommandbar/emulatedcommandbar.h
M		src/vimode/inputmodemanager.cpp
M		src/vimode/keyparser.cpp
M		src/vimode/keyparser.h
M		src/vimode/modes/insertvimode.cpp
M		src/vimode/modes/modebase.cpp
M		src/vimode/modes/normalvimode.cpp
M		src/vimode/motion.cpp