Merge remote-tracking branch 'upstream/master' into colorcolcharcolorcolchar

1 files changed, 2 insertions, 145 deletions

diff --git a/runtime/doc/mbyte.txt b/runtime/doc/mbyte.txt
index 99dfa54218..0a7e0baad3 100644
--- a/runtime/doc/mbyte.txt
+++ b/runtime/doc/mbyte.txt
@@ -358,150 +358,6 @@ conversion needs to be done.  These conversions are supported:
 	Try getting another iconv() implementation.
 
 ==============================================================================
-Input on X11					*mbyte-XIM*
-
-X INPUT METHOD (XIM) BACKGROUND			*XIM* *xim* *x-input-method*
-
-XIM is an international input module for X.  There are two kinds of structures,
-Xlib unit type and |IM-server| (Input-Method server) type.  |IM-server| type
-is suitable for complex input, such as CJK.
-
-- IM-server
-							*IM-server*
-  In |IM-server| type input structures, the input event is handled by either
-  of the two ways: FrontEnd system and BackEnd system.  In the FrontEnd
-  system, input events are snatched by the |IM-server| first, then |IM-server|
-  give the application the result of input.  On the other hand, the BackEnd
-  system works reverse order.  MS-Windows adopt BackEnd system.  In X, most of
-  |IM-server|s adopt FrontEnd system.  The demerit of BackEnd system is the
-  large overhead in communication, but it provides safe synchronization with
-  no restrictions on applications.
-
-- Conversion Server
-							*conversion-server*
-  Some system needs additional server: conversion server.  Most of Japanese
-  |IM-server|s need it, Kana-Kanji conversion server.  For Chinese inputting,
-  it depends on the method of inputting, in some methods, PinYin or ZhuYin to
-  HanZi conversion server is needed.  For Korean inputting, if you want to
-  input Hanja, Hangul-Hanja conversion server is needed.
-
-  For example, the Japanese inputting process is divided into 2 steps.  First
-  we pre-input Hira-gana, second Kana-Kanji conversion.  There are so many
-  Kanji characters (6349 Kanji characters are defined in JIS X 0208) and the
-  number of Hira-gana characters are 76.  So, first, we pre-input text as
-  pronounced in Hira-gana, second, we convert Hira-gana to Kanji or Kata-Kana,
-  if needed.  There are some Kana-Kanji conversion server: jserver
-  (distributed with Wnn, see below) and canna.  Canna can be found at:
-  http://canna.sourceforge.jp/
-
-There is a good input system: Wnn4.2.  Wnn 4.2 contains,
-    xwnmo (|IM-server|)
-    jserver (Japanese Kana-Kanji conversion server)
-    cserver (Chinese PinYin or ZhuYin to simplified HanZi conversion server)
-    tserver (Chinese PinYin or ZhuYin to traditional HanZi conversion server)
-    kserver (Hangul-Hanja conversion server)
-Wnn 4.2 for several systems can be found at various places on the internet.
-Use the RPM or port for your system.
-
-
-- Input Style
-							*xim-input-style*
-  When inputting CJK, there are four areas:
-      1. The area to display of the input while it is being composed
-      2. The area to display the currently active input mode.
-      3. The area to display the next candidate for the selection.
-      4. The area to display other tools.
-
-  The third area is needed when converting.  For example, in Japanese
-  inputting, multiple Kanji characters could have the same pronunciation, so
-  a sequence of Hira-gana characters could map to a distinct sequence of Kanji
-  characters.
-
-  The first and second areas are defined in international input of X with the
-  names of "Preedit Area", "Status Area" respectively.  The third and fourth
-  areas are not defined and are left to be managed by the |IM-server|.  In the
-  international input, four input styles have been defined using combinations
-  of Preedit Area and Status Area: |OnTheSpot|, |OffTheSpot|, |OverTheSpot|
-  and |Root|.
-
-  Currently, GUI Vim supports three styles, |OverTheSpot|, |OffTheSpot| and
-  |Root|.
-
-*.  on-the-spot						*OnTheSpot*
-    Preedit Area and Status Area are performed by the client application in
-    the area of application.  The client application is directed by the
-    |IM-server| to display all pre-edit data at the location of text
-    insertion.  The client registers callbacks invoked by the input method
-    during pre-editing.
-*.  over-the-spot					*OverTheSpot*
-    Status Area is created in a fixed position within the area of application,
-    in case of Vim, the position is the additional status line.  Preedit Area
-    is made at present input position of application.  The input method
-    displays pre-edit data in a window which it brings up directly over the
-    text insertion position.
-*.  off-the-spot					*OffTheSpot*
-    Preedit Area and Status Area are performed in the area of application, in
-    case of Vim, the area is additional status line.  The client application
-    provides display windows for the pre-edit data to the input method which
-    displays into them directly.
-*.  root-window						*Root*
-    Preedit Area and Status Area are outside of the application.  The input
-    method displays all pre-edit data in a separate area of the screen in a
-    window specific to the input method.
-
-
-USING XIM			*multibyte-input* *E284* *E285* *E286* *E287*
-					*E288* *E289*
-
-Note that Display and Input are independent.  It is possible to see your
-language even though you have no input method for it.  But when your Display
-method doesn't match your Input method, the text will be displayed wrong.
-
-To input your language you should run the |IM-server| which supports your
-language and |conversion-server| if needed.
-
-The next 3 lines should be put in your ~/.Xdefaults file.  They are common for
-all X applications which uses |XIM|.  If you already use |XIM|, you can skip
-this. >
-
-	*international: True
-	*.inputMethod: your_input_server_name
-	*.preeditType: your_input_style
-<
-input_server_name	is your |IM-server| name (check your |IM-server|
-			manual).
-your_input_style	is one of |OverTheSpot|, |OffTheSpot|, |Root|.  See
-			also |xim-input-style|.
-
-*international may not be necessary if you use X11R6.
-*.inputMethod and *.preeditType are optional if you use X11R6.
-
-For example, when you are using kinput2 as |IM-server|, >
-
-	*international: True
-	*.inputMethod: kinput2
-	*.preeditType: OverTheSpot
-<
-When using |OverTheSpot|, GUI Vim always connects to the IM Server even in
-Normal mode, so you can input your language with commands like "f" and "r".
-But when using one of the other two methods, GUI Vim connects to the IM Server
-only if it is not in Normal mode.
-
-If your IM Server does not support |OverTheSpot|, and if you want to use your
-language with some Normal mode command like "f" or "r", then you should use a
-localized xterm  or an xterm which supports |XIM|
-
-If needed, you can set the XMODIFIERS environment variable:
-
-	sh:  export XMODIFIERS="@im=input_server_name"
-	csh: setenv XMODIFIERS "@im=input_server_name"
-
-For example, when you are using kinput2 as |IM-server| and sh, >
-
-	export XMODIFIERS="@im=kinput2"
-<
-
-==============================================================================
 Input with a keymap					*mbyte-keymap*
 
 When the keyboard doesn't produce the characters you want to enter in your
@@ -790,7 +646,8 @@ widespread as file format.
 A composing or combining character is used to change the meaning of the
 character before it.  The combining characters are drawn on top of the
 preceding character.
-Up to six combining characters can be displayed.
+Too big combined characters cannot be displayed, but they can still be
+inspected using the |g8| and |ga| commands described below.
 When editing text a composing character is mostly considered part of the
 preceding character.  For example "x" will delete a character and its
 following composing characters by default.