changeset 18673:f1658662ea84 v8.1.2328

patch 8.1.2328: a few hangul input pieces remain Commit: https://github.com/vim/vim/commit/bd3bc0314e27cac061575930144ce5fadc26c22e Author: Bram Moolenaar <Bram@vim.org> Date: Thu Nov 21 17:34:51 2019 +0100 patch 8.1.2328: a few hangul input pieces remain Problem: A few hangul input pieces remain. Solution: Update VMS makefile.
author Bram Moolenaar <Bram@vim.org>
date Thu, 21 Nov 2019 17:45:04 +0100
parents a96d6ea9f73e
children bb7abcd7d417
files src/Make_vms.mms src/version.c
diffstat 2 files changed, 6 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/src/Make_vms.mms
+++ b/src/Make_vms.mms
@@ -2,7 +2,7 @@
 # Makefile for Vim on OpenVMS
 #
 # Maintainer:   Zoltan Arpadffy <arpadffy@polarhome.com>
-# Last change:  2019 Sep 28
+# Last change:  2019 Nov 21
 #
 # This has script been tested on VMS 6.2 to 8.2 on DEC Alpha, VAX and IA64
 # with MMS and MMK
@@ -70,14 +70,10 @@ CCVER = YES
 # VIM_RUBY   = YES
 
 # X Input Method.  For entering special languages like chinese and
-# Japanese. Please define just one: VIM_XIM or VIM_HANGULIN
+# Japanese.
 # If you don't need it really, leave it behind the comment.
 # VIM_XIM = YES
 
-# Internal Hangul input method. GUI only.
-# If you don't need it really, leave it behind the comment.
-# VIM_HANGULIN = YES
-
 # Allow any white space to separate the fields in a tags file
 # When not defined, only a TAB is allowed.
 # VIM_TAG_ANYWHITE = YES
@@ -247,15 +243,6 @@ XIM_DEF = ,"FEAT_XIM"
 .ENDIF
 .ENDIF
 
-.IFDEF VIM_HANGULIN
-# HANGULIN related setup.
-.IFDEF GUI
-HANGULIN_DEF = ,"FEAT_HANGULIN"
-HANGULIN_SRC = hangulin.c
-HANGULIN_OBJ = hangulin.obj
-.ENDIF
-.ENDIF
-
 .IFDEF VIM_MZSCHEME
 # MZSCHEME related setup
 MZSCH_DEF = ,"FEAT_MZSCHEME"
@@ -287,7 +274,7 @@ VIMHOST = "''F$TRNLNM("SYS$NODE")'''F$TR
 .SUFFIXES : .obj .c
 
 ALL_CFLAGS = /def=($(MODEL_DEF)$(DEFS)$(DEBUG_DEF)$(PERL_DEF)$(PYTHON_DEF) -
- $(TCL_DEF)$(RUBY_DEF)$(XIM_DEF)$(HANGULIN_DEF)$(TAG_DEF)$(MZSCH_DEF) -
+ $(TCL_DEF)$(RUBY_DEF)$(XIM_DEF)$(TAG_DEF)$(MZSCH_DEF) -
  $(ICONV_DEF)) -
  $(CFLAGS)$(GUI_FLAG) -
  /include=($(C_INC)$(GUI_INC_DIR)$(GUI_INC)$(PERL_INC)$(PYTHON_INC) -
@@ -298,7 +285,7 @@ ALL_CFLAGS = /def=($(MODEL_DEF)$(DEFS)$(
 # as $(GUI_INC) - replaced with $(GUI_INC_VER)
 # Otherwise should not be any other difference.
 ALL_CFLAGS_VER = /def=($(MODEL_DEF)$(DEFS)$(DEBUG_DEF)$(PERL_DEF)$(PYTHON_DEF) -
- $(TCL_DEF)$(RUBY_DEF)$(XIM_DEF)$(HANGULIN_DEF)$(TAG_DEF)$(MZSCH_DEF) - 
+ $(TCL_DEF)$(RUBY_DEF)$(XIM_DEF)$(TAG_DEF)$(MZSCH_DEF) - 
  $(ICONV_DEF)) -
  $(CFLAGS)$(GUI_FLAG) -
  /include=($(C_INC)$(GUI_INC_DIR)$(GUI_INC_VER)$(PERL_INC)$(PYTHON_INC) -
@@ -406,7 +393,6 @@ SRC = \
 	$(PYTHON_SRC) \
 	$(TCL_SRC) \
 	$(RUBY_SRC) \
-	$(HANGULIN_SRC) \
 	$(MZSCH_SRC) \
 	$(XDIFF_SRC)
 
@@ -510,7 +496,6 @@ OBJ = \
 	$(PYTHON_OBJ) \
 	$(TCL_OBJ) \
 	$(RUBY_OBJ) \
-	$(HANGULIN_OBJ) \
 	$(MZSCH_OBJ) \
 	$(XDIFF_OBJ)
 
@@ -1070,10 +1055,6 @@ gui_at_fs.obj : gui_at_fs.c vim.h [.auto
 pty.obj : pty.c vim.h [.auto]config.h feature.h os_unix.h   \
  ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h beval.h \
  [.proto]gui_beval.pro option.h ex_cmds.h proto.h globals.h
-hangulin.obj : hangulin.c vim.h [.auto]config.h feature.h os_unix.h \
- ascii.h keymap.h term.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
- globals.h
 if_perl.obj : [.auto]if_perl.c vim.h [.auto]config.h feature.h os_unix.h \
  ascii.h keymap.h term.h macros.h structs.h regexp.h \
  gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2328,
+/**/
     2327,
 /**/
     2326,