From 05d7b23daa7ae82493757b05996d61cddaf870d5 Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Mon, 12 Sep 2016 23:07:06 +0900 Subject: [PATCH 1/7] update for Vim 8.0 --- VERSION | 4 ++-- contrib/lang-ja | 2 +- kaoriya/doc/{CHANGES.txt => CHANGES-7.txt} | 0 kaoriya/doc/CHANGES.md | 8 ++++++++ kaoriya/doc/README.txt | 20 +++++++++++--------- patches | 2 +- vim | 2 +- 7 files changed, 24 insertions(+), 14 deletions(-) rename kaoriya/doc/{CHANGES.txt => CHANGES-7.txt} (100%) create mode 100644 kaoriya/doc/CHANGES.md diff --git a/VERSION b/VERSION index da036b0..6657000 100644 --- a/VERSION +++ b/VERSION @@ -1,4 +1,4 @@ -VIM_VER = 7.4.2358 -PATCHSET_VER = 20160910 +VIM_VER = 8.0.0000 +PATCHSET_VER = 20160912 # vim:set ts=8 sts=8 sw=8 tw=0 noet ft=make: diff --git a/contrib/lang-ja b/contrib/lang-ja index b5fef4b..4be9b93 160000 --- a/contrib/lang-ja +++ b/contrib/lang-ja @@ -1 +1 @@ -Subproject commit b5fef4be9ec8edec0d9d6dea608e653f2daf14c7 +Subproject commit 4be9b93f8477b0780e6250fff511e92fe8416192 diff --git a/kaoriya/doc/CHANGES.txt b/kaoriya/doc/CHANGES-7.txt similarity index 100% rename from kaoriya/doc/CHANGES.txt rename to kaoriya/doc/CHANGES-7.txt diff --git a/kaoriya/doc/CHANGES.md b/kaoriya/doc/CHANGES.md new file mode 100644 index 0000000..8413ed0 --- /dev/null +++ b/kaoriya/doc/CHANGES.md @@ -0,0 +1,8 @@ +## 2016/09/12 の変更点 + +* ベースコードを8.0.0000に更新しました +* contrib 更新 + * lang-ja (2016-09-11 4be9b93) +* 過去の変更点(CHANGES.txt)を別ファイルへ移動しました + + diff --git a/kaoriya/doc/README.txt b/kaoriya/doc/README.txt index 86e15d3..854e289 100644 --- a/kaoriya/doc/README.txt +++ b/kaoriya/doc/README.txt @@ -1,9 +1,9 @@ - Vim version 7.4 香り屋版 導入マニュアル + Vim version 8.0 香り屋版 導入マニュアル - Version: 1.8.1 + Version: 1.9.0 Author: MURAOKA Taro Since: 23-Aug-1999 - Last Change: 04-Sep-2016. + Last Change: 12-Sep-2016. 概要 Vimはviクローンに分類されるテキストエディタです。 @@ -20,12 +20,12 @@ いるので、解凍してシステム内の好きな場所に配置してください。 32bit版 - 配布ファイル: vim74-kaoriya-win32-V.V.VVV-YYYYMMDD.zip - Vimプログラムフォルダ: vim74-kaoriya-win32.zip + 配布ファイル: vim80-kaoriya-win32-V.V.VVV-YYYYMMDD.zip + Vimプログラムフォルダ: vim80-kaoriya-win32.zip 64bit版 - 配布ファイル: vim74-kaoriya-win64-V.V.V-YYYYMMDD.zip - Vimプログラムフォルダ: vim74-kaoriya-win64 + 配布ファイル: vim80-kaoriya-win64-V.V.V-YYYYMMDD.zip + Vimプログラムフォルダ: vim80-kaoriya-win64 上記のV.V.VにはベースとなったVimのバージョンがパッチ番号まで含めて入ります。 上記のYYYYMMDDにはリリースの年月日が入ります。 @@ -217,10 +217,12 @@ Vim https://github.com/vim-jp/issues/issues (バグ報告、機能要望) - vim_jp Google グループ http://groups.google.com/group/vim_jp/?hl=ja - - Vimドキュメント翻訳(vimdoc-ja) + - 日本語ドキュメント https://github.com/vim-jp/vimdoc-ja/ + https://github.com/vim-jp/vimdoc-ja-working/ + https://github.com/vim-jp/lang-ja/ - 香り屋版メンテナ - http://www.kaoriya.net/software/vim + https://github.com/koron/vim-kaoriya/ MURAOKA Taro Twitter @kaoriya diff --git a/patches b/patches index 1959b3f..91f2de1 160000 --- a/patches +++ b/patches @@ -1 +1 @@ -Subproject commit 1959b3f098a8c927b66c370108a94deaa2253dab +Subproject commit 91f2de17f125f0fb98892e5621bb2a36e98b5fda diff --git a/vim b/vim index d47d837..bb76f24 160000 --- a/vim +++ b/vim @@ -1 +1 @@ -Subproject commit d47d83745ff450232328ca7a4b8b00b31bad22fc +Subproject commit bb76f24af2010943387ce696a7092175b4ecccf2 From 33718a1fcb4e2fb32a429f1a006ca981b9b1ac48 Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Mon, 12 Sep 2016 23:20:19 +0900 Subject: [PATCH 2/7] update maintenance scripts for 8.0 --- VERSION | 2 ++ build/msvc/11-build-all.bat | 13 ++++++++----- build/msvc/12-upload-all.bat | 1 - build/msvc/13-update-canary.bat | 8 ++++---- build/msvc/14-update-develop.bat | 8 ++++---- build/msvc/Makefile | 8 ++++---- build/msvc/vim.mak | 2 +- kaoriya/doc/CHANGES.md | 4 ++-- {kaoriya/doc => old}/CHANGES-7.txt | 0 9 files changed, 25 insertions(+), 21 deletions(-) rename {kaoriya/doc => old}/CHANGES-7.txt (100%) diff --git a/VERSION b/VERSION index 6657000..bd675b4 100644 --- a/VERSION +++ b/VERSION @@ -1,4 +1,6 @@ VIM_VER = 8.0.0000 PATCHSET_VER = 20160912 +VIM_VER_SHORT = 80 + # vim:set ts=8 sts=8 sw=8 tw=0 noet ft=make: diff --git a/build/msvc/11-build-all.bat b/build/msvc/11-build-all.bat index 944c83e..a51e08c 100644 --- a/build/msvc/11-build-all.bat +++ b/build/msvc/11-build-all.bat @@ -1,6 +1,9 @@ @ECHO OFF -SET DATE_VER=%date:~-10,4%%date:~-5,2%%date:~-2,2% +FOR /F "usebackq tokens=1,2 delims== " %%i IN ("..\..\VERSION") do SET %%i=%%j +SET RELZIP_W32=vim%VIM_VER_SHORT%-kaoriya-win32-%VIM_VER%-%PATCHSET_VER%.zip +SET RELZIP_W64=vim%VIM_VER_SHORT%-kaoriya-win64-%VIM_VER%-%PATCHSET_VER%.zip + SET CURDIR=%~dp0 SET VIMDIR=%~dp0..\..\vim @@ -11,10 +14,10 @@ IF %ERRORLEVEL% NEQ 0 GOTO :FAILURE CD "%CURDIR%" REM Clear previous releases. -RD /S /Q "target\vim74-kaoriya-win32" -RD /S /Q "target\vim74-kaoriya-win64" -DEL /F "target\vim74-kaoriya-win32-%DATE_VER%.zip" -DEL /F "target\vim74-kaoriya-win64-%DATE_VER%.zip" +RD /S /Q "target\vim%VIM_VER_SHORT%-kaoriya-win32" +RD /S /Q "target\vim%VIM_VER_SHORT%-kaoriya-win64" +DEL /F "target\%RELZIP_W32%" +DEL /F "target\%RELZIP_W64%" REM Build releases. CMD /C "tools\msvc-nmake.bat" x86 build-release-pre diff --git a/build/msvc/12-upload-all.bat b/build/msvc/12-upload-all.bat index 744b8b3..719bc87 100644 --- a/build/msvc/12-upload-all.bat +++ b/build/msvc/12-upload-all.bat @@ -1,7 +1,6 @@ @ECHO OFF FOR /F "usebackq tokens=1,2 delims== " %%i IN ("..\..\VERSION") do SET %%i=%%j - SET RELZIP_W32=vim74-kaoriya-win32-%VIM_VER%-%PATCHSET_VER%.zip SET RELZIP_W64=vim74-kaoriya-win64-%VIM_VER%-%PATCHSET_VER%.zip diff --git a/build/msvc/13-update-canary.bat b/build/msvc/13-update-canary.bat index f1f7366..ed0c800 100644 --- a/build/msvc/13-update-canary.bat +++ b/build/msvc/13-update-canary.bat @@ -4,10 +4,10 @@ FOR /F "usebackq tokens=1,2 delims== " %%i IN ("..\..\VERSION") do SET %%i=%%j SET REMOTE_HOST=koron@files.kaoriya.net SET REMOTE_WORKDIR=/home/htdocs/files.kaoriya.net/vim/ -SET RELZIP_W32=vim74-kaoriya-win32-%VIM_VER%-%PATCHSET_VER%.zip -SET RELZIP_W64=vim74-kaoriya-win64-%VIM_VER%-%PATCHSET_VER%.zip -SET ABSZIP_W32=vim74-kaoriya-win32-test.zip -SET ABSZIP_W64=vim74-kaoriya-win64-test.zip +SET RELZIP_W32=vim%VIM_VER_SHORT%-kaoriya-win32-%VIM_VER%-%PATCHSET_VER%.zip +SET RELZIP_W64=vim%VIM_VER_SHORT%-kaoriya-win64-%VIM_VER%-%PATCHSET_VER%.zip +SET ABSZIP_W32=vim%VIM_VER_SHORT%-kaoriya-win32-test.zip +SET ABSZIP_W64=vim%VIM_VER_SHORT%-kaoriya-win64-test.zip ssh "%REMOTE_HOST%" "cd %REMOTE_WORKDIR%; ln -fv %RELZIP_W32% %ABSZIP_W32%; ln -fv %RELZIP_W64% %ABSZIP_W64%" diff --git a/build/msvc/14-update-develop.bat b/build/msvc/14-update-develop.bat index 4f751a9..6573ca7 100644 --- a/build/msvc/14-update-develop.bat +++ b/build/msvc/14-update-develop.bat @@ -4,10 +4,10 @@ FOR /F "usebackq tokens=1,2 delims== " %%i IN ("..\..\VERSION") do SET %%i=%%j SET REMOTE_HOST=koron@files.kaoriya.net SET REMOTE_WORKDIR=/home/htdocs/files.kaoriya.net/vim/ -SET RELZIP_W32=vim74-kaoriya-win32-%VIM_VER%-%PATCHSET_VER%.zip -SET RELZIP_W64=vim74-kaoriya-win64-%VIM_VER%-%PATCHSET_VER%.zip -SET ABSZIP_W32=vim74-kaoriya-win32.zip -SET ABSZIP_W64=vim74-kaoriya-win64.zip +SET RELZIP_W32=vim%VIM_VER_SHORT%-kaoriya-win32-%VIM_VER%-%PATCHSET_VER%.zip +SET RELZIP_W64=vim%VIM_VER_SHORT%-kaoriya-win64-%VIM_VER%-%PATCHSET_VER%.zip +SET ABSZIP_W32=vim%VIM_VER_SHORT%-kaoriya-win32.zip +SET ABSZIP_W64=vim%VIM_VER_SHORT%-kaoriya-win64.zip ssh "%REMOTE_HOST%" "cd %REMOTE_WORKDIR%; ln -fv %RELZIP_W32% %ABSZIP_W32%; ln -fv %RELZIP_W64% %ABSZIP_W64%" diff --git a/build/msvc/Makefile b/build/msvc/Makefile index b31968a..139c08d 100644 --- a/build/msvc/Makefile +++ b/build/msvc/Makefile @@ -8,12 +8,12 @@ # DISABLE_LUA=1 Disalbe Lua interfaces # DISABLE_RUBY=1 Disalbe Ruby interfaces -DIST_VER = 74-kaoriya-$(WINDOWS_CPUTYPE) -DATE_VER = %%date:~-10,4%%%%date:~-5,2%%%%date:~-2,2%% - !include ..\..\VERSION -RTDIR_NAME = vim74 +DIST_VER = $(VIM_VER_SHORT)-kaoriya-$(WINDOWS_CPUTYPE) +DATE_VER = %%date:~-10,4%%%%date:~-5,2%%%%date:~-2,2%% + +RTDIR_NAME = vim$(VIM_VER_SHORT) BUILD_DIR = $(MAKEDIR) OUTPUT_DIR = $(MAKEDIR)\target diff --git a/build/msvc/vim.mak b/build/msvc/vim.mak index d91f0b6..8d51fa7 100644 --- a/build/msvc/vim.mak +++ b/build/msvc/vim.mak @@ -50,7 +50,7 @@ LUA= ..\..\build\msvc\target\install-x32\include\lua # Rubyの設定. !if !defined(DISABLE_IF) && !defined(DISABLE_RUBY) RUBY_VER=23 -RUBY_VER_LONG=2.3.0 +RUBY_API_VER_LONG=2.3.0 DYNAMIC_RUBY=yes !if "$(PROCESSOR_ARCHITECTURE)" == "AMD64" RUBY = D:\Ruby\ruby-2.3.1-x64-mswin64 diff --git a/kaoriya/doc/CHANGES.md b/kaoriya/doc/CHANGES.md index 8413ed0..23d879c 100644 --- a/kaoriya/doc/CHANGES.md +++ b/kaoriya/doc/CHANGES.md @@ -3,6 +3,6 @@ * ベースコードを8.0.0000に更新しました * contrib 更新 * lang-ja (2016-09-11 4be9b93) -* 過去の変更点(CHANGES.txt)を別ファイルへ移動しました +* 過去の変更点(CHANGES.txt)を移動しました - + diff --git a/kaoriya/doc/CHANGES-7.txt b/old/CHANGES-7.txt similarity index 100% rename from kaoriya/doc/CHANGES-7.txt rename to old/CHANGES-7.txt From 82db5d42021dbbf5fbaf7b9c0ab8125bd35795f2 Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Mon, 12 Sep 2016 23:27:54 +0900 Subject: [PATCH 3/7] change filename (URL) of canary and develop ver. --- build/msvc/13-update-canary.bat | 4 ++-- build/msvc/14-update-develop.bat | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/msvc/13-update-canary.bat b/build/msvc/13-update-canary.bat index ed0c800..c35585f 100644 --- a/build/msvc/13-update-canary.bat +++ b/build/msvc/13-update-canary.bat @@ -6,8 +6,8 @@ SET REMOTE_HOST=koron@files.kaoriya.net SET REMOTE_WORKDIR=/home/htdocs/files.kaoriya.net/vim/ SET RELZIP_W32=vim%VIM_VER_SHORT%-kaoriya-win32-%VIM_VER%-%PATCHSET_VER%.zip SET RELZIP_W64=vim%VIM_VER_SHORT%-kaoriya-win64-%VIM_VER%-%PATCHSET_VER%.zip -SET ABSZIP_W32=vim%VIM_VER_SHORT%-kaoriya-win32-test.zip -SET ABSZIP_W64=vim%VIM_VER_SHORT%-kaoriya-win64-test.zip +SET ABSZIP_W32=vim-kaoriya-win32-canary.zip +SET ABSZIP_W64=vim-kaoriya-win64-canary.zip ssh "%REMOTE_HOST%" "cd %REMOTE_WORKDIR%; ln -fv %RELZIP_W32% %ABSZIP_W32%; ln -fv %RELZIP_W64% %ABSZIP_W64%" diff --git a/build/msvc/14-update-develop.bat b/build/msvc/14-update-develop.bat index 6573ca7..c01b42f 100644 --- a/build/msvc/14-update-develop.bat +++ b/build/msvc/14-update-develop.bat @@ -6,8 +6,8 @@ SET REMOTE_HOST=koron@files.kaoriya.net SET REMOTE_WORKDIR=/home/htdocs/files.kaoriya.net/vim/ SET RELZIP_W32=vim%VIM_VER_SHORT%-kaoriya-win32-%VIM_VER%-%PATCHSET_VER%.zip SET RELZIP_W64=vim%VIM_VER_SHORT%-kaoriya-win64-%VIM_VER%-%PATCHSET_VER%.zip -SET ABSZIP_W32=vim%VIM_VER_SHORT%-kaoriya-win32.zip -SET ABSZIP_W64=vim%VIM_VER_SHORT%-kaoriya-win64.zip +SET ABSZIP_W32=vim-kaoriya-win32-develop.zip +SET ABSZIP_W64=vim-kaoriya-win64-develop.zip ssh "%REMOTE_HOST%" "cd %REMOTE_WORKDIR%; ln -fv %RELZIP_W32% %ABSZIP_W32%; ln -fv %RELZIP_W64% %ABSZIP_W64%" From 49c8158d6d714aeb76784bcfaaebb71b28432bf7 Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Mon, 12 Sep 2016 23:30:20 +0900 Subject: [PATCH 4/7] change 'enc' and 'ff' of CHANGE.md --- kaoriya/doc/CHANGES.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/kaoriya/doc/CHANGES.md b/kaoriya/doc/CHANGES.md index 23d879c..057a45d 100644 --- a/kaoriya/doc/CHANGES.md +++ b/kaoriya/doc/CHANGES.md @@ -1,8 +1,8 @@ -## 2016/09/12 の変更点 - -* ベースコードを8.0.0000に更新しました -* contrib 更新 - * lang-ja (2016-09-11 4be9b93) -* 過去の変更点(CHANGES.txt)を移動しました - - +## 2016/09/12 縺ｮ螟画峩轤ｹ + +* 繝吶ｼ繧ｹ繧ｳ繝ｼ繝峨ｒ8.0.0000縺ｫ譖ｴ譁ｰ縺励∪縺励◆ +* contrib 譖ｴ譁ｰ + * lang-ja (2016-09-11 4be9b93) +* 驕主悉縺ｮ螟画峩轤ｹ(CHANGES.txt)繧堤ｧｻ蜍輔＠縺ｾ縺励◆ + + From 3ad74263388b70cd50c38ec0bcda6a492d800483 Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Mon, 12 Sep 2016 23:40:19 +0900 Subject: [PATCH 5/7] fix script problems --- build/msvc/12-upload-all.bat | 4 ++-- build/msvc/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/msvc/12-upload-all.bat b/build/msvc/12-upload-all.bat index 719bc87..f09ea84 100644 --- a/build/msvc/12-upload-all.bat +++ b/build/msvc/12-upload-all.bat @@ -1,8 +1,8 @@ @ECHO OFF FOR /F "usebackq tokens=1,2 delims== " %%i IN ("..\..\VERSION") do SET %%i=%%j -SET RELZIP_W32=vim74-kaoriya-win32-%VIM_VER%-%PATCHSET_VER%.zip -SET RELZIP_W64=vim74-kaoriya-win64-%VIM_VER%-%PATCHSET_VER%.zip +SET RELZIP_W32=vim%VIM_VER_SHORT%-kaoriya-win32-%VIM_VER%-%PATCHSET_VER%.zip +SET RELZIP_W64=vim%VIM_VER_SHORT%-kaoriya-win64-%VIM_VER%-%PATCHSET_VER%.zip REM Uplaod release files to server. diff --git a/build/msvc/Makefile b/build/msvc/Makefile index 139c08d..1658945 100644 --- a/build/msvc/Makefile +++ b/build/msvc/Makefile @@ -387,7 +387,7 @@ archive-dist: build-dist zip-dist: cd "$(OUTPUT_DIR)" - zip -r9q vim$(DIST_VER)-$(VIM_VER)-$(DATE_VER).zip vim$(DIST_VER) + zip -r9q vim$(DIST_VER)-$(VIM_VER)-$(PATCHSET_VER).zip vim$(DIST_VER) cd "$(BUILD_DIR)" clean-dist: @@ -422,7 +422,7 @@ snapshot-install: snapshot-archive: cd "$(OUTPUT_DIR)" - zip -r9q vim$(DIST_VER)-snapshot-$(DATE_VER).zip vim$(DIST_VER)-snapshot + zip -r9q vim$(DIST_VER)-snapshot-$(PATCHSET_VER).zip vim$(DIST_VER)-snapshot cd "$(BUILD_DIR)" From f001e4eaca23346085ebca1c0cbf6f21e0fb6c3b Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Tue, 13 Sep 2016 01:08:42 +0900 Subject: [PATCH 6/7] catch up Vim 8.0.0002 --- VERSION | 2 +- vim | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index bd675b4..42124b9 100644 --- a/VERSION +++ b/VERSION @@ -1,4 +1,4 @@ -VIM_VER = 8.0.0000 +VIM_VER = 8.0.0002 PATCHSET_VER = 20160912 VIM_VER_SHORT = 80 diff --git a/vim b/vim index bb76f24..b56e7ff 160000 --- a/vim +++ b/vim @@ -1 +1 @@ -Subproject commit bb76f24af2010943387ce696a7092175b4ecccf2 +Subproject commit b56e7ff0dbbfa85361bdbc5b4a86ff8b57a7acbb From f957246a9cdfbbd78652de6229330a440c2497d6 Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Tue, 13 Sep 2016 09:53:13 +0900 Subject: [PATCH 7/7] catch up Vim 8.0.0003 --- VERSION | 4 ++-- contrib/lang-ja | 2 +- contrib/vimdoc-ja | 2 +- kaoriya/doc/CHANGES.md | 7 ++++--- vim | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/VERSION b/VERSION index 42124b9..31a6b8c 100644 --- a/VERSION +++ b/VERSION @@ -1,5 +1,5 @@ -VIM_VER = 8.0.0002 -PATCHSET_VER = 20160912 +VIM_VER = 8.0.0003 +PATCHSET_VER = 20160913 VIM_VER_SHORT = 80 diff --git a/contrib/lang-ja b/contrib/lang-ja index 4be9b93..57db842 160000 --- a/contrib/lang-ja +++ b/contrib/lang-ja @@ -1 +1 @@ -Subproject commit 4be9b93f8477b0780e6250fff511e92fe8416192 +Subproject commit 57db84234fbd4b24d0e0bd82048c8f7d135ede4f diff --git a/contrib/vimdoc-ja b/contrib/vimdoc-ja index 135a75f..da005d9 160000 --- a/contrib/vimdoc-ja +++ b/contrib/vimdoc-ja @@ -1 +1 @@ -Subproject commit 135a75fba6e5412bb21d84063c32e2633b35deb5 +Subproject commit da005d90a18b6500163ad9fb4c8118ec31437281 diff --git a/kaoriya/doc/CHANGES.md b/kaoriya/doc/CHANGES.md index 057a45d..6ded29c 100644 --- a/kaoriya/doc/CHANGES.md +++ b/kaoriya/doc/CHANGES.md @@ -1,8 +1,9 @@ -## 2016/09/12 縺ｮ螟画峩轤ｹ +## 2016/09/13 縺ｮ螟画峩轤ｹ -* 繝吶ｼ繧ｹ繧ｳ繝ｼ繝峨ｒ8.0.0000縺ｫ譖ｴ譁ｰ縺励∪縺励◆ +* 繝吶ｼ繧ｹ繧ｳ繝ｼ繝峨ｒ8.0.0003縺ｫ譖ｴ譁ｰ縺励∪縺励◆ * contrib 譖ｴ譁ｰ - * lang-ja (2016-09-11 4be9b93) + * lang-ja (2016-09-13 57db842) + * vimdoc-ja (2016-09-12 da005d9) * 驕主悉縺ｮ螟画峩轤ｹ(CHANGES.txt)繧堤ｧｻ蜍輔＠縺ｾ縺励◆ diff --git a/vim b/vim index b56e7ff..789a5c0 160000 --- a/vim +++ b/vim @@ -1 +1 @@ -Subproject commit b56e7ff0dbbfa85361bdbc5b4a86ff8b57a7acbb +Subproject commit 789a5c0e3d27f09456678f0cfb6c1bd2d8ab4a35