summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-08-29 16:41:27 +0200
committerBram Moolenaar <Bram@vim.org>2020-08-29 16:41:27 +0200
commit98945560c1ae6e2ddee820a7de718a36e3f4b6e5 (patch)
treed0bf5f895d54aa470f852520492c8755e533fa5a
parente3d4685f1f716e0c516332101d85e0930f20fc59 (diff)
patch 8.2.1540: the user cannot try out emoji character widthsv8.2.1540
Problem: The user cannot try out emoji character widths. Solution: Move the emoji script to the runtime/tools directory.
-rw-r--r--Filelist1
-rw-r--r--runtime/tools/emoji_list.vim (renamed from src/testdir/emoji_list.vim)1
-rw-r--r--src/version.c2
3 files changed, 3 insertions, 1 deletions
diff --git a/Filelist b/Filelist
index e44c1fd3a9..42eaa1d3ed 100644
--- a/Filelist
+++ b/Filelist
@@ -197,7 +197,6 @@ SRC_ALL = \
src/testdir/samples/*.txt \
src/testdir/samples/test000 \
src/testdir/color_ramp.vim \
- src/testdir/emoji_list.vim \
src/testdir/silent.wav \
src/testdir/popupbounce.vim \
src/proto.h \
diff --git a/src/testdir/emoji_list.vim b/runtime/tools/emoji_list.vim
index e6a73c354a..1c8a4a3e42 100644
--- a/src/testdir/emoji_list.vim
+++ b/runtime/tools/emoji_list.vim
@@ -1,4 +1,5 @@
" Script to fill the window with emoji characters, one per line.
+" Source this script: :source %
if &modified
new
diff --git a/src/version.c b/src/version.c
index ba308cdba9..cd341e2d85 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1540,
+/**/
1539,
/**/
1538,