diff options
-rw-r--r-- | runtime/doc/autocmd.txt | 3 | ||||
-rw-r--r-- | runtime/doc/eval.txt | 1 | ||||
-rw-r--r-- | runtime/doc/mbyte.txt | 74 | ||||
-rw-r--r-- | runtime/doc/options.txt | 2 | ||||
-rw-r--r-- | runtime/doc/spell.txt | 10 |
5 files changed, 6 insertions, 84 deletions
diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt index e37fe9e5ce..733a01e761 100644 --- a/runtime/doc/autocmd.txt +++ b/runtime/doc/autocmd.txt @@ -1051,8 +1051,7 @@ TextChanged After a change was made to the text in the was defined). Not triggered when there is typeahead or when an operator is pending. - Note: This can not be skipped with - `:noautocmd`. + Note: Cannot be skipped with `:noautocmd`. Careful: This is triggered very often, don't do anything that the user does not expect or that is slow. diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 57ef380cc5..023a3acb78 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -5038,7 +5038,6 @@ iconv({expr}, {from}, {to}) *iconv()* Note that Vim uses UTF-8 for all Unicode encodings, conversion from/to UCS-2 is automatically changed to use UTF-8. You cannot use UCS-2 in a string anyway, because of the NUL bytes. - {only available when compiled with the |+multi_byte| feature} *indent()* indent({lnum}) The result is a Number, which is indent of line {lnum} in the diff --git a/runtime/doc/mbyte.txt b/runtime/doc/mbyte.txt index 24d9d01af0..850ad69d2a 100644 --- a/runtime/doc/mbyte.txt +++ b/runtime/doc/mbyte.txt @@ -696,80 +696,6 @@ For example, when you are using kinput2 as |IM-server| and sh, > < ============================================================================== -Input on MS-Windows *mbyte-IME* - -(Windows IME support) *multibyte-ime* *IME* - -{only works Windows GUI and compiled with the |+multi_byte_ime| feature} - -To input multibyte characters on Windows, you can use an Input Method Editor -(IME). In process of your editing text, you must switch status (on/off) of -IME many many many times. Because IME with status on is hooking all of your -key inputs, you cannot input 'j', 'k', or almost all of keys to Vim directly. - -This |+multi_byte_ime| feature help this. It reduce times of switch status of -IME manually. In normal mode, there are almost no need working IME, even -editing multibyte text. So exiting insert mode with ESC, Vim memorize last -status of IME and force turn off IME. When re-enter insert mode, Vim revert -IME status to that memorized automatically. - -This works on not only insert-normal mode, but also search-command input and -replace mode. -The options 'iminsert', 'imsearch' and 'imcmdline' can be used to chose -the different input methods or disable them temporarily. - -WHAT IS IME - IME is a part of East asian version Windows. That helps you to input - multibyte character. English and other language version Windows does not - have any IME. (Also there is no need usually.) But there is one that - called Microsoft Global IME. Global IME is a part of Internet Explorer - 4.0 or above. You can get more information about Global IME, at below - URL. - -WHAT IS GLOBAL IME *global-ime* - Global IME enables input of Chinese, Japanese, and Korean text into Vim - buffer on any language version of Windows. Global IME is built in, and - the Input Locales can be added through Control Panel/Regional - Options/Input Locales. Please see below URL for detail of Global IME. - You can also find various language version of Global IME at same place. - - - Global IME detailed information. - http://search.microsoft.com/results.aspx?q=global+ime - - - Active Input Method Manager (Global IME) - http://msdn.microsoft.com/en-us/library/aa741221(v=VS.85).aspx - - Support for Global IME is an experimental feature. - -NOTE: For IME to work you must make sure the input locales of your language -are added to your system. The exact location of this depends on the version -of Windows you use. For example, on my Windows 2000 box: -1. Control Panel -2. Regional Options -3. Input Locales Tab -4. Add Installed input locales -> Chinese(PRC) - The default is still English (United Stated) - - -Cursor color when IME or XIM is on *CursorIM* - There is a little cute feature for IME. Cursor can indicate status of IME - by changing its color. Usually status of IME was indicated by little icon - at a corner of desktop (or taskbar). It is not easy to verify status of - IME. But this feature help this. - This works in the same way when using XIM. - - You can select cursor color when status is on by using highlight group - CursorIM. For example, add these lines to your |ginit.vim|: > - - if has('multi_byte_ime') - highlight Cursor guifg=NONE guibg=Green - highlight CursorIM guifg=NONE guibg=Purple - endif -< - Cursor color with off IME is green. And purple cursor indicates that - status is on. - -============================================================================== Input with a keymap *mbyte-keymap* When the keyboard doesn't produce the characters you want to enter in your diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index a206bec44e..ce0e01265b 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -3145,8 +3145,6 @@ A jump table for the options with a short description can be found at |Q_op|. 0 :lmap is off and IM is off 1 :lmap is ON and IM is off 2 :lmap is off and IM is ON - 2 is available only when compiled with the |+multi_byte_ime|, |+xim| - or |global-ime|. To always reset the option to zero when leaving Insert mode with <Esc> this can be used: > :inoremap <ESC> <ESC>:set iminsert=0<CR> diff --git a/runtime/doc/spell.txt b/runtime/doc/spell.txt index 955861bd2d..110c6ef221 100644 --- a/runtime/doc/spell.txt +++ b/runtime/doc/spell.txt @@ -298,25 +298,25 @@ Exceptions: spell file is used. For example, with these values: - 'runtimepath' is "~/.config/nvim,/usr/local/share/nvim/runtime/,~/.config/nvim/after" + 'runtimepath' is "~/.config/nvim,/usr/share/nvim/runtime/,~/.config/nvim/after" 'encoding' is "iso-8859-2" 'spelllang' is "pl" Vim will look for: 1. ~/.config/nvim/spell/pl.iso-8859-2.spl -2. /usr/local/share/nvim/runtime/spell/pl.iso-8859-2.spl +2. /usr/share/nvim/runtime/spell/pl.iso-8859-2.spl 3. ~/.config/nvim/spell/pl.iso-8859-2.add.spl -4. /usr/local/share/nvim/runtime/spell/pl.iso-8859-2.add.spl +4. /usr/share/nvim/runtime/spell/pl.iso-8859-2.add.spl 5. ~/.config/nvim/after/spell/pl.iso-8859-2.add.spl This assumes 1. is not found and 2. is found. If 'encoding' is "latin1" Vim will look for: 1. ~/.config/nvim/spell/pl.latin1.spl -2. /usr/local/share/nvim/runtime/spell/pl.latin1.spl +2. /usr/share/nvim/runtime/spell/pl.latin1.spl 3. ~/.config/nvim/after/spell/pl.latin1.spl 4. ~/.config/nvim/spell/pl.ascii.spl -5. /usr/local/share/nvim/runtime/spell/pl.ascii.spl +5. /usr/share/nvim/runtime/spell/pl.ascii.spl 6. ~/.config/nvim/after/spell/pl.ascii.spl This assumes none of them are found (Polish doesn't make sense when leaving |