hjk
29af23cdb1
fakevim: implement some of the :bn/bp commands
2010-07-14 14:33:56 +02:00
hjk
816f60f0e1
fakevim: implement Ctrl-J, Ctrl-N, Ctrl-P
...
Funny to see what people are using instead of 'j' and 'k'...
2010-07-14 14:33:56 +02:00
hjk
e0f6d43bf7
fakevim: implement [( and ])
2010-07-14 14:33:55 +02:00
hjk
5574a13849
fakevim: implement [{ and ]}
2010-07-14 13:08:38 +02:00
con
d24d01f49c
Merge commit '52b9fcca2ddd5d5e95c6e13cbded018699c7dd68' (origin/2.0)
...
Conflicts:
src/plugins/debugger/debuggeragents.cpp
src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.h
src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp
src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp
src/plugins/qt4projectmanager/qt-maemo/maemosshthread.h
2010-07-13 11:31:05 +02:00
hjk
6f58124007
fakevim: fix mark positions after <Delete>
...
(cherry picked from commit 7ccf903ee3d9da4a104310ed423130857d59d91b)
2010-07-06 16:42:16 +02:00
hjk
312509fcdb
fakevim: fix backspace in the presence of physical tabs
...
(cherry picked from commit 2b40e2906fc070c6253a84c0ca507ff0db912f73)
2010-07-06 16:42:10 +02:00
hjk
cd433a52de
fakevim: fix insertion of tabs in insert mode
...
(cherry picked from commit 474ec252a23745bf5106b239054c17d7dfc2fbf2)
2010-07-06 16:42:03 +02:00
hjk
5f67f7c42b
fakevim: fix insert of tabs when shifting to the right
...
(cherry picked from commit 3eb7b6bfbde6a847154c6053e7b4171554207865)
2010-07-06 16:41:56 +02:00
hjk
210f2784c5
fakevim: make Ctrl-V <Tab> and Ctrl-V <Return> work in Insert and Ex mode
...
(cherry picked from commit cbdd9202d2
2010-07-06 14:25:51 +02:00
hjk
91ab134ff4
fakevim: fix up/down movement in the presence of real tabs
...
(cherry picked from commit 2e09a8f421
2010-07-06 14:25:39 +02:00
hjk
3cae595b7a
fakevim: fix insert of Tabs
...
(cherry picked from commit d3cea8a4d1
2010-07-06 14:25:32 +02:00
hjk
2e09a8f421
fakevim: fix up/down movement in the presence of real tabs
2010-07-06 14:24:54 +02:00
hjk
d3cea8a4d1
fakevim: fix insert of Tabs
2010-07-06 14:24:54 +02:00
hjk
cbdd9202d2
fakevim: make Ctrl-V <Tab> and Ctrl-V <Return> work in Insert and Ex mode
2010-07-06 14:24:54 +02:00
hjk
7c44271932
fakevim: fix Delete key in command mode
...
(cherry picked from commit bb0f033b92
2010-06-23 15:29:29 +02:00
hjk
c2580c91b1
fakevim: fix '$' handling on Finnish keyboards
...
(cherry picked from commit d2ea5a4843
2010-06-23 15:29:25 +02:00
hjk
bb0f033b92
fakevim: fix Delete key in command mode
2010-06-23 15:13:51 +02:00
hjk
d2ea5a4843
fakevim: fix '$' handling on Finnish keyboards
2010-06-23 14:55:10 +02:00
Thorbjørn Lindeijer
173cdff56c
Merge branch '2.0'
...
Conflicts:
src/plugins/cppeditor/cppquickfix.cpp
src/plugins/mercurial/mercurialjobrunner.cpp
src/plugins/subversion/subversionplugin.cpp
2010-06-15 13:22:33 +02:00
Thorbjørn Lindeijer
a6e5298591
Fixed handling of text wrapping and a text layout corner case
...
Due to using QTextCursor::columnNumber() instead of
QTextCursor::positionInBlock(), a lot of code would not work correctly
when used with wrapped lines.
In addition, there was an issue with columnNumber() returning 0 right
after inserting a character before the last character of a line.
Reviewed-by: mae
2010-06-15 12:25:01 +02:00
con
7f733b1545
Merge remote branch 'origin/2.0'
...
Conflicts:
README
doc/qt-html-templates.qdocconf
doc/qtcreator.qdoc
doc/qtcreator.qdocconf
src/app/Info.plist
src/plugins/bineditor/BinEditor.pluginspec
src/plugins/bookmarks/Bookmarks.pluginspec
src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec
src/plugins/coreplugin/Core.pluginspec
src/plugins/coreplugin/coreconstants.h
src/plugins/cpaster/CodePaster.pluginspec
src/plugins/cppeditor/CppEditor.pluginspec
src/plugins/cpptools/CppTools.pluginspec
src/plugins/cvs/CVS.pluginspec
src/plugins/debugger/Debugger.pluginspec
src/plugins/designer/Designer.pluginspec
src/plugins/fakevim/FakeVim.pluginspec
src/plugins/find/Find.pluginspec
src/plugins/genericprojectmanager/GenericProjectManager.pluginspec
src/plugins/git/ScmGit.pluginspec
src/plugins/helloworld/HelloWorld.pluginspec
src/plugins/help/Help.pluginspec
src/plugins/locator/Locator.pluginspec
src/plugins/mercurial/Mercurial.pluginspec
src/plugins/perforce/Perforce.pluginspec
src/plugins/projectexplorer/ProjectExplorer.pluginspec
src/plugins/qmldesigner/QmlDesigner.pluginspec
src/plugins/qmlinspector/QmlInspector.pluginspec
src/plugins/qmljseditor/QmlJSEditor.pluginspec
src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
src/plugins/regexp/RegExp.pluginspec
src/plugins/resourceeditor/ResourceEditor.pluginspec
src/plugins/snippets/Snippets.pluginspec
src/plugins/subversion/Subversion.pluginspec
src/plugins/texteditor/TextEditor.pluginspec
src/plugins/vcsbase/VCSBase.pluginspec
src/plugins/welcome/Welcome.pluginspec
2010-06-08 10:39:45 +02:00
hjk
fe396a5146
fakevim: fix cursor keys on Mac.
...
On Mac, QKeyEvent::text() returns non-empty strings for cursor keys. This
breaks some of the logic relying on text() being empty for "special" keys.
This is a quick fix to make it usable.
2010-06-04 12:53:38 +02:00
hjk
90bd009835
fakevim: implement {}/[]/<>-block text objects
2010-06-04 11:17:55 +02:00
hjk
419f587518
fakevim: clear opcount and mvcount on escape
2010-06-04 09:07:39 +02:00
hjk
3bff717f37
fakevim: use basetext indentation access instead of the cppeditor based one
2010-06-03 13:29:17 +02:00
hjk
b67369393e
fakevim: synchronize with master
...
In theory this should have been a backport of the search-related commits
7e8c345a46fa3aa7
2010-06-02 11:09:39 +02:00
hjk
4c2c654c2a
fakevim: fix (again) 'r' at last position of a line
2010-05-28 15:48:20 +02:00
hjk
5c44689793
fakevim: cleanup 'r' handling
2010-05-28 13:16:13 +02:00
hjk
0c4c66f228
fakevim: fix undo after cjaaa<Esc>
2010-05-20 16:49:48 +02:00
hjk
9b6c86bdc1
fakevim: implement :reg[isters]
2010-05-20 14:08:11 +02:00
hjk
7e8c345a64
fakevim: refactor searching
...
Less random jumps now.
2010-05-19 12:00:52 +02:00
hjk
2f99706031
fakevim: prepare for better integration with creator core
...
For :ex commands, the plugin is now asked first unconditionally.
The handler only provides fallbacks for the standalone case.
2010-05-19 12:00:52 +02:00
hjk
a87e93103a
fakevim: fix range parsing if only start line is given
2010-05-19 12:00:52 +02:00
hjk
53e9c4fad6
fakevim: uniformly use double quote around file names in status messages
2010-05-18 12:13:27 +02:00
hjk
5d5eeed6c0
fakevim: set target column and mark after undo/redo, 'o' and 'O' and Return
2010-05-18 12:13:27 +02:00
hjk
4243b56229
fakevim: ~ uses 'exclusive' motion
2010-05-12 14:43:41 +02:00
hjk
84f4193019
fakevim: rework range passing
2010-05-12 11:18:18 +02:00
hjk
a13530eba0
fakevim: rework support for marks
2010-05-11 14:27:00 +02:00
hjk
cb8c40d7e9
fakevim: consolidate Key_Return and Key_Backspace handling
2010-05-11 14:26:59 +02:00
hjk
034ee0a947
fakevim: add option to show positions of marks in the main text editor
2010-05-11 14:26:59 +02:00
hjk
0b3b398800
fakevim: try to "export" also block selections.
2010-05-10 09:48:12 +02:00
hjk
c22678ef64
fakevim: don't import a selection if there wasn't one
2010-05-10 09:36:57 +02:00
hjk
16f6fda51a
fakevim: small fixes
2010-05-10 09:01:30 +02:00
hjk
0dd38fb829
fakevim: fix crash on shutdown
2010-05-10 08:40:15 +02:00
hjk
9721a142dd
fakevim: import texteditor selection from base text editor as soon as it
...
is changed using the mouse.
2010-05-07 19:46:16 +02:00
hjk
462b78713d
famevim: make <C-.> etc work in mappings
2010-05-07 17:32:46 +02:00
hjk
fe9ab6d76a
fakevim: add some debugging code to track down unexpected mark changes
2010-05-07 15:17:44 +02:00
hjk
e6dc3fbf4c
fakevim: remove m_beginEditBlock hack. This is not needed with Qt 4.7 anymore.
2010-05-06 16:05:44 +02:00
hjk
b4260c9a18
fakevim: consolidate transformation related code
2010-05-06 15:49:11 +02:00
