Skip to content

Commit e934e8f

Browse files
brammoolbrammool
committed
patch 7.4.1672
Problem: The Dvorak support is a bit difficult to install. Solution: Turn it into an optional package.
1 parent 61264d9 commit e934e8f

6 files changed

Lines changed: 172 additions & 167 deletions

File tree

‎runtime/macros/README.txt‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ urm Macros that simulate a simple computer: "Universal Register Machine"
1111
The other files contain some handy utilities. They also serve as examples for
1212
how to use Vi and Vim functionality.
1313

14-
dvorak for when you use a Dvorak keyboard
15-
1614
justify.vim user function for justifying text
1715

1816
less.sh + less.vim make Vim work like less (or more)
@@ -29,4 +27,8 @@ file_select.vim macros that make a handy file selector
2927

3028
The matchit plugin has been moved to an optional package. To load it put this
3129
line in your vimrc file:
32-
:packadd matchit
30+
packadd! matchit
31+
32+
The Dvorak supported has been moved to an optional package. To load it put
33+
this line in your vimrc file:
34+
packadd! dvorak

‎runtime/macros/dvorak‎

Lines changed: 0 additions & 164 deletions
This file was deleted.

‎runtime/pack/dist/opt/dvorak/dvorak/disable.vim‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
" Back to Qwerty keyboard after using Dvorak.
2+
3+
iunmap a
4+
iunmap b
5+
iunmap c
6+
iunmap d
7+
iunmap e
8+
iunmap f
9+
iunmap g
10+
iunmap h
11+
iunmap i
12+
iunmap j
13+
iunmap k
14+
iunmap l
15+
iunmap m
16+
iunmap n
17+
iunmap o
18+
iunmap p
19+
iunmap q
20+
iunmap r
21+
iunmap s
22+
iunmap t
23+
iunmap u
24+
iunmap v
25+
iunmap w
26+
iunmap x
27+
iunmap y
28+
iunmap z
29+
iunmap ;
30+
iunmap '
31+
iunmap "
32+
iunmap ,
33+
iunmap .
34+
iunmap /
35+
iunmap A
36+
iunmap B
37+
iunmap C
38+
iunmap D
39+
iunmap E
40+
iunmap F
41+
iunmap G
42+
iunmap H
43+
iunmap I
44+
iunmap J
45+
iunmap K
46+
iunmap L
47+
iunmap M
48+
iunmap N
49+
iunmap O
50+
iunmap P
51+
iunmap Q
52+
iunmap R
53+
iunmap S
54+
iunmap T
55+
iunmap U
56+
iunmap V
57+
iunmap W
58+
iunmap X
59+
iunmap Y
60+
iunmap Z
61+
iunmap <
62+
iunmap >
63+
iunmap ?
64+
iunmap :
65+
iunmap [
66+
iunmap ]
67+
iunmap {
68+
iunmap }
69+
iunmap -
70+
iunmap _
71+
iunmap =
72+
iunmap +

‎runtime/pack/dist/opt/dvorak/dvorak/enable.vim‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
" Dvorak keyboard, only in Insert mode.
2+
"
3+
" Change "inoremap" to "map!" to also use in Ex mode.
4+
" Also change disable.vim then: "iunmap" to "unmap!".
5+
"
6+
" You may want to add a list of map's too.
7+
8+
inoremap a a
9+
inoremap b x
10+
inoremap c j
11+
inoremap d e
12+
inoremap e .
13+
inoremap f u
14+
inoremap g i
15+
inoremap h d
16+
inoremap i c
17+
inoremap j h
18+
inoremap k t
19+
inoremap l n
20+
inoremap m m
21+
inoremap n b
22+
inoremap o r
23+
inoremap p l
24+
inoremap q '
25+
inoremap r p
26+
inoremap s o
27+
inoremap t y
28+
inoremap u g
29+
inoremap v k
30+
inoremap w ,
31+
inoremap x q
32+
inoremap y f
33+
inoremap z ;
34+
inoremap ; s
35+
inoremap ' -
36+
inoremap " _
37+
inoremap , w
38+
inoremap . v
39+
inoremap / z
40+
inoremap A A
41+
inoremap B X
42+
inoremap C J
43+
inoremap D E
44+
inoremap E >
45+
inoremap F U
46+
inoremap G I
47+
inoremap H D
48+
inoremap I C
49+
inoremap J H
50+
inoremap K T
51+
inoremap L N
52+
inoremap M M
53+
inoremap N B
54+
inoremap O R
55+
inoremap P L
56+
inoremap Q "
57+
inoremap R P
58+
inoremap S O
59+
inoremap T Y
60+
inoremap U G
61+
inoremap V K
62+
inoremap W <
63+
inoremap X Q
64+
inoremap Y F
65+
inoremap Z :
66+
inoremap < W
67+
inoremap > V
68+
inoremap ? Z
69+
inoremap : S
70+
inoremap [ /
71+
inoremap ] =
72+
inoremap { ?
73+
inoremap } +
74+
inoremap - [
75+
inoremap _ {
76+
inoremap = ]
77+
inoremap + }

‎runtime/pack/dist/opt/dvorak/plugin/dvorak.vim‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
" When using a dvorak keyboard this file may be of help to you.
2+
" These mappings have been made by Lawrence Kesteloot <[email protected]>.
3+
" What they do is that the most often used keys, like hjkl, are put in a more
4+
" easy to use position.
5+
" It may take some time to learn using this.
6+
7+
if exists("g:loaded_dvorak_plugin")
8+
finish
9+
endif
10+
let g:loaded_dvorak_plugin = 1
11+
12+
" Key to go into dvorak mode:
13+
map ,d :runtime dvorak/enable.vim<CR>
14+
15+
" Key to get out of dvorak mode:
16+
map ,q :runtime dvorak/disable.vim<CR>

‎src/version.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -748,6 +748,8 @@ static char *(features[]) =
748748

749749
static int included_patches[] =
750750
{ /* Add new patch number below this line */
751+
/**/
752+
1672,
751753
/**/
752754
1671,
753755
/**/

0 commit comments

Comments
 (0)