To: vim_dev@googlegroups.com Subject: Patch 7.4.1672 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.1672 Problem: The Dvorak support is a bit difficult to install. Solution: Turn it into an optional package. Files: runtime/macros/dvorak, runtime/macros/README.txt, runtime/pack/dist/opt/dvorak/plugin/dvorak.vim, runtime/pack/dist/opt/dvorak/dvorak/enable.vim, runtime/pack/dist/opt/dvorak/dvorak/disable.vim *** ../vim-7.4.1671/runtime/macros/dvorak 2010-05-15 13:04:01.000000000 +0200 --- runtime/macros/dvorak 1970-01-01 01:00:00.000000000 +0100 *************** *** 1,164 **** - When using a dvorak keyboard this file may be of help to you. - These mappings have been made by Lawrence Kesteloot . - What they do is that the most often used keys, like hjkl, are put in a more - easy to use position. - It may take some time to learn using this. - - Put these lines in your .vimrc: - -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- - " Key to go into dvorak mode: - map ,d :source ~/.dvorak - " Key to get out of dvorak mode: - map ,q :source ~/.qwerty - -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- - - write these lines into the file ~/.dvorak: - -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- - " Dvorak keyboard, only in insert mode and ex mode. - " You may want to add a list of map's too. - imap! a a - imap! b x - imap! c j - imap! d e - imap! e . - imap! f u - imap! g i - imap! h d - imap! i c - imap! j h - imap! k t - imap! l n - imap! m m - imap! n b - imap! o r - imap! p l - imap! q ' - imap! r p - imap! s o - imap! t y - imap! u g - imap! v k - imap! w , - imap! x q - imap! y f - imap! z ; - imap! ; s - imap! ' - - imap! " _ - imap! , w - imap! . v - imap! / z - imap! A A - imap! B X - imap! C J - imap! D E - imap! E > - imap! F U - imap! G I - imap! H D - imap! I C - imap! J H - imap! K T - imap! L N - imap! M M - imap! N B - imap! O R - imap! P L - imap! Q " - imap! R P - imap! S O - imap! T Y - imap! U G - imap! V K - imap! W < - imap! X Q - imap! Y F - imap! Z : - imap! < W - imap! > V - imap! ? Z - imap! : S - imap! [ / - imap! ] = - imap! { ? - imap! } + - imap! - [ - imap! _ { - imap! = ] - imap! + } - -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- - - write these lines into the file ~/.qwerty - -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- - " Qwerty keyboard - unmap! a - unmap! b - unmap! c - unmap! d - unmap! e - unmap! f - unmap! g - unmap! h - unmap! i - unmap! j - unmap! k - unmap! l - unmap! m - unmap! n - unmap! o - unmap! p - unmap! q - unmap! r - unmap! s - unmap! t - unmap! u - unmap! v - unmap! w - unmap! x - unmap! y - unmap! z - unmap! ; - unmap! ' - unmap! \" - unmap! , - unmap! . - unmap! / - unmap! A - unmap! B - unmap! C - unmap! D - unmap! E - unmap! F - unmap! G - unmap! H - unmap! I - unmap! J - unmap! K - unmap! L - unmap! M - unmap! N - unmap! O - unmap! P - unmap! Q - unmap! R - unmap! S - unmap! T - unmap! U - unmap! V - unmap! W - unmap! X - unmap! Y - unmap! Z - unmap! < - unmap! > - unmap! ? - unmap! : - unmap! [ - unmap! ] - unmap! { - unmap! } - unmap! - - unmap! _ - unmap! = - unmap! + - -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- --- 0 ---- *** ../vim-7.4.1671/runtime/macros/README.txt 2016-03-25 17:00:22.091689600 +0100 --- runtime/macros/README.txt 2016-03-28 20:22:23.961558882 +0200 *************** *** 11,18 **** The other files contain some handy utilities. They also serve as examples for how to use Vi and Vim functionality. - dvorak for when you use a Dvorak keyboard - justify.vim user function for justifying text less.sh + less.vim make Vim work like less (or more) --- 11,16 ---- *************** *** 29,32 **** The matchit plugin has been moved to an optional package. To load it put this line in your vimrc file: ! :packadd matchit --- 27,34 ---- The matchit plugin has been moved to an optional package. To load it put this line in your vimrc file: ! packadd! matchit ! ! The Dvorak supported has been moved to an optional package. To load it put ! this line in your vimrc file: ! packadd! dvorak *** ../vim-7.4.1671/runtime/pack/dist/opt/dvorak/plugin/dvorak.vim 1970-01-01 01:00:00.000000000 +0100 --- runtime/pack/dist/opt/dvorak/plugin/dvorak.vim 2016-03-28 20:26:02.795339456 +0200 *************** *** 0 **** --- 1,16 ---- + " When using a dvorak keyboard this file may be of help to you. + " These mappings have been made by Lawrence Kesteloot . + " What they do is that the most often used keys, like hjkl, are put in a more + " easy to use position. + " It may take some time to learn using this. + + if exists("g:loaded_dvorak_plugin") + finish + endif + let g:loaded_dvorak_plugin = 1 + + " Key to go into dvorak mode: + map ,d :runtime dvorak/enable.vim + + " Key to get out of dvorak mode: + map ,q :runtime dvorak/disable.vim *** ../vim-7.4.1671/runtime/pack/dist/opt/dvorak/dvorak/enable.vim 1970-01-01 01:00:00.000000000 +0100 --- runtime/pack/dist/opt/dvorak/dvorak/enable.vim 2016-03-28 20:37:13.160589729 +0200 *************** *** 0 **** --- 1,77 ---- + " Dvorak keyboard, only in Insert mode. + " + " Change "inoremap" to "map!" to also use in Ex mode. + " Also change disable.vim then: "iunmap" to "unmap!". + " + " You may want to add a list of map's too. + + inoremap a a + inoremap b x + inoremap c j + inoremap d e + inoremap e . + inoremap f u + inoremap g i + inoremap h d + inoremap i c + inoremap j h + inoremap k t + inoremap l n + inoremap m m + inoremap n b + inoremap o r + inoremap p l + inoremap q ' + inoremap r p + inoremap s o + inoremap t y + inoremap u g + inoremap v k + inoremap w , + inoremap x q + inoremap y f + inoremap z ; + inoremap ; s + inoremap ' - + inoremap " _ + inoremap , w + inoremap . v + inoremap / z + inoremap A A + inoremap B X + inoremap C J + inoremap D E + inoremap E > + inoremap F U + inoremap G I + inoremap H D + inoremap I C + inoremap J H + inoremap K T + inoremap L N + inoremap M M + inoremap N B + inoremap O R + inoremap P L + inoremap Q " + inoremap R P + inoremap S O + inoremap T Y + inoremap U G + inoremap V K + inoremap W < + inoremap X Q + inoremap Y F + inoremap Z : + inoremap < W + inoremap > V + inoremap ? Z + inoremap : S + inoremap [ / + inoremap ] = + inoremap { ? + inoremap } + + inoremap - [ + inoremap _ { + inoremap = ] + inoremap + } *** ../vim-7.4.1671/runtime/pack/dist/opt/dvorak/dvorak/disable.vim 1970-01-01 01:00:00.000000000 +0100 --- runtime/pack/dist/opt/dvorak/dvorak/disable.vim 2016-03-28 20:36:06.153264707 +0200 *************** *** 0 **** --- 1,72 ---- + " Back to Qwerty keyboard after using Dvorak. + + iunmap a + iunmap b + iunmap c + iunmap d + iunmap e + iunmap f + iunmap g + iunmap h + iunmap i + iunmap j + iunmap k + iunmap l + iunmap m + iunmap n + iunmap o + iunmap p + iunmap q + iunmap r + iunmap s + iunmap t + iunmap u + iunmap v + iunmap w + iunmap x + iunmap y + iunmap z + iunmap ; + iunmap ' + iunmap " + iunmap , + iunmap . + iunmap / + iunmap A + iunmap B + iunmap C + iunmap D + iunmap E + iunmap F + iunmap G + iunmap H + iunmap I + iunmap J + iunmap K + iunmap L + iunmap M + iunmap N + iunmap O + iunmap P + iunmap Q + iunmap R + iunmap S + iunmap T + iunmap U + iunmap V + iunmap W + iunmap X + iunmap Y + iunmap Z + iunmap < + iunmap > + iunmap ? + iunmap : + iunmap [ + iunmap ] + iunmap { + iunmap } + iunmap - + iunmap _ + iunmap = + iunmap + *** ../vim-7.4.1671/src/version.c 2016-03-28 19:58:59.159781342 +0200 --- src/version.c 2016-03-28 20:24:24.304338473 +0200 *************** *** 750,751 **** --- 750,753 ---- { /* Add new patch number below this line */ + /**/ + 1672, /**/ -- Although the scythe isn't pre-eminent among the weapons of war, anyone who has been on the wrong end of, say, a peasants' revolt will know that in skilled hands it is fearsome. -- (Terry Pratchett, Mort) /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///