Merge pull request #22429 from bfredl/hkmap

feat(edit)!: remove old c implementation of hebrew keymap

6 files changed, 17 insertions, 42 deletions

diff --git a/runtime/doc/hebrew.txt b/runtime/doc/hebrew.txt
index 76266d777f..e38385e13a 100644
--- a/runtime/doc/hebrew.txt
+++ b/runtime/doc/hebrew.txt
@@ -30,17 +30,10 @@ Details
    +  'rightleft' ('rl') sets window orientation to right-to-left.  This means
       that the logical text 'ABC' will be displayed as 'CBA', and will start
       drawing at the right edge of the window, not the left edge.
-   +  'hkmap' ('hk') sets keyboard mapping to Hebrew, in insert/replace modes.
-   +  'aleph' ('al'), numeric, holds the decimal code of Aleph, for keyboard
-      mapping.
-   +  'hkmapp' ('hkp') sets keyboard mapping to "phonetic hebrew"
-
-   NOTE: these three ('hkmap', 'hkmapp' and 'aleph') are obsolete.  You should
-	 use ":set keymap=hebrewp" instead.
-
-   +  'delcombine' ('deco'), boolean, if editing UTF-8 encoded Hebrew, allows
-      one to remove the niqud or te`amim by pressing 'x' on a character (with
-      associated niqud).
+   +  'keymap' ('kmp') sets keyboard mapping. use values "hebrew" or "heprewp"
+      (the latter option enables phonetic mapping)
+   +  'delcombine' ('deco'), boolean, allows one to remove the niqud or
+      te`amim by pressing 'x' on a character (with associated niqud).
 
    +  'rightleftcmd' ('rlc') makes the command-prompt for searches show up on
       the right side.  It only takes effect if the window is 'rightleft'.
@@ -62,10 +55,10 @@ Details
 
    +  CTRL-_ in insert/replace modes toggles 'revins' and 'hkmap' as follows:
 
-      When in rightleft window, 'revins' and 'nohkmap' are toggled, since
+      When in rightleft window, 'revins' is toggled, since
       English will likely be inserted in this case.
 
-      When in norightleft window, 'revins' 'hkmap' are toggled, since Hebrew
+      When in norightleft window, 'revins' is toggled, since Hebrew
       will likely be inserted in this case.
 
       CTRL-_ moves the cursor to the end of the typed text.
diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt
index 84aee43af4..49aa2a79a4 100644
--- a/runtime/doc/insert.txt
+++ b/runtime/doc/insert.txt
@@ -221,11 +221,11 @@ CTRL-Y		Insert the character which is above the cursor.
 		able to copy characters from a long line.
 
 						*i_CTRL-_*
-CTRL-_		Switch between languages, as follows:
-		-  When in a rightleft window, revins and nohkmap are toggled,
+CTRL-_		Switch between insert direction, by toggling 'revins', as follows:
+		-  When in a rightleft window, 'revins' is toggled,
 		   since English will likely be inserted in this case.
-		-  When in a norightleft window, revins and hkmap are toggled,
-		   since Hebrew will likely be inserted in this case.
+		-  When in a norightleft window, 'revins' is toggled,
+		   since a rightleft language will likely be inserted in this case.
 
 		CTRL-_ moves the cursor to the end of the typed text.
 
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 90e17d3678..919f8ceaee 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -216,6 +216,8 @@ The following deprecated functions or APIs were removed.
   changes need to be contributed there first.)
   See https://github.com/neovim/neovim/pull/20674.
 
+- 'hkmap', 'hkmapp' and 'aleph' options were removed. Use 'keymap' option instead.
+
 ==============================================================================
 DEPRECATIONS                                                *news-deprecations*
 
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index f44b6f28e3..6c5b168402 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -575,16 +575,6 @@ supported use something like this: >
 							*E355*
 A jump table for the options with a short description can be found at |Q_op|.
 
-					*'aleph'* *'al'* *aleph* *Aleph*
-'aleph' 'al'		number	(default 224)
-			global
-	The ASCII code for the first letter of the Hebrew alphabet.  The
-	routine that maps the keyboard in Hebrew mode, both in Insert mode
-	(when hkmap is set) and on the command-line (when hitting CTRL-_)
-	outputs the Hebrew characters in the range [aleph..aleph+26].
-	aleph=128 applies to PC code, and aleph=224 applies to ISO 8859-8.
-	See |rileft.txt|.
-
 			*'allowrevins'* *'ari'* *'noallowrevins'* *'noari'*
 'allowrevins' 'ari'	boolean	(default off)
 			global
@@ -3195,20 +3185,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	each of these histories (see |cmdline-editing|).
 	The maximum value is 10000.
 
-					 *'hkmap'* *'hk'* *'nohkmap'* *'nohk'*
-'hkmap' 'hk'		boolean (default off)
-			global
-	When on, the keyboard is mapped for the Hebrew character set.
-	Normally you would set 'allowrevins' and use CTRL-_ in insert mode to
-	toggle this option.  See |rileft.txt|.
-
-				 *'hkmapp'* *'hkp'* *'nohkmapp'* *'nohkp'*
-'hkmapp' 'hkp'		boolean (default off)
-			global
-	When on, phonetic keyboard mapping is used.  'hkmap' must also be on.
-	This is useful if you have a non-Hebrew keyboard.
-	See |rileft.txt|.
-
 				 *'hlsearch'* *'hls'* *'nohlsearch'* *'nohls'*
 'hlsearch' 'hls'	boolean	(default on)
 			global
diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index a8a149def8..8c9ec7df9c 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -258,7 +258,7 @@ argument.
 -A		Arabic mode.  Sets the 'arabic' option on.
 
 							*-H*
--H		Hebrew mode.  Sets the 'hkmap' and 'rightleft' options on.
+-H		Hebrew mode.  Sets the 'rightleft' option on and 'keymap' to "hebrew"
 
 							*-V* *verbose*
 -V[N]		Verbose.  Sets the 'verbose' option to [N] (default: 10).
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 79808eccc9..5efe094226 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -594,6 +594,7 @@ Highlight groups:
 <
 
 Options:
+  *'aleph'* *'al'*
   antialias
   *'balloondelay'* *'bdlay'*
   *'ballooneval'* *'beval'* *'noballooneval'* *'nobeval'*
@@ -617,6 +618,9 @@ Options:
   *'guifontset'* *'gfs'* (Use 'guifont' instead.)
   *'guipty'* (Nvim uses pipes and PTYs consistently on all platforms.)
   'highlight' (Names of builtin |highlight-groups| cannot be changed.)
+  *'hkmap'* *'hk'* use `set keymap=hebrew` instead.
+  *'hkmapp'* *'hkp'* use `set keymap=hebrewp` instead.
+
   *'imactivatefunc'* *'imaf'*
   *'imactivatekey'* *'imak'*
   *'imstatusfunc'* *'imsf'*