Skip to content

Commit 9fc84fb

Browse files
b4wincklerb4winckler
committed
Merge branch 'vim'
Conflicts: src/auto/configure
2 parents 606fa88 + 1619625 commit 9fc84fb

File tree

206 files changed

+2296
-1052
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

206 files changed

+2296
-1052
lines changed

‎.hgtags‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2687,3 +2687,16 @@ bc4fb031746594e4e84b36e64389e78454617a86 v7-4a-030
26872687
fa024ce48542356206bf86bdc9286ecf0510ad49 v7-4a-033
26882688
947edb6335d1e196c27e2e7e0e0a5ed8f6b78498 v7-4a-034
26892689
4ceacc1b00548c0b21c0dc2628608515899df721 v7-4a-035
2690+
9982ec574beb1866536f0e8a0ace3073faa3bb97 v7-4a-036
2691+
91d478da863e0779c482c790cc96b14188f3ecaf v7-4a-037
2692+
8f983df0299fb4f1c7359eb3b844ee93e8f7e8fb v7-4a-038
2693+
a08fa2919f2b39be0416109d87a42fbb5880ac76 v7-4a-039
2694+
1261caf9bc5193d304140647c08ca5b52120ce52 v7-4a-040
2695+
74d2f3188cd0aaa0d3d7cd3df001d88b04f77f5c v7-4a-041
2696+
1899acc5aebd40f625b9fed7bc4c1b5f67e5bc3f v7-4a-042
2697+
6fa64615c8d38ecf464702b102538c09fe250813 v7-4a-043
2698+
647596ab1ae2f4b36bfc20293adf4b3a43372818 v7-4a-044
2699+
da95a7f1d5a8413ae719188cec5b706b99db4a91 v7-4a-045
2700+
f0361e297d9ceb533a17530647b4482c3990df3c v7-4a-046
2701+
8c6615a30951fb9f2d2b218e55626f5dfa3fa24e v7-4a-047
2702+
09c88160095d98a0b1403e9230c76e8adbb75d59 v7-4b-000

‎Contents‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ Vim Vi IMproved. A clone of the UNIX text editor Vi. Very useful
99
messages, shows current file name in window title, on-line
1010
help, rectangular cut/paste, etc., etc., etc...
1111

12-
Version 7.4a. Also runs under UNIX, MSDOS and other systems.
13-
vim74art.tgz contains the documentation and syntax files.
14-
vim74abin.tgz contains the binaries.
15-
vim74asrc.tgz contains the sources.
12+
Version 7.4b. Also runs under UNIX, MSDOS and other systems.
13+
vim74brt.tgz contains the documentation and syntax files.
14+
vim74bbin.tgz contains the binaries.
15+
vim74bsrc.tgz contains the sources.
1616
Author: Bram Moolenaar et al.
1717

1818

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ all install uninstall tools config configure reconfig proto depend lint tags typ
7474
# Before creating an archive first delete all backup files, *.orig, etc.
7575

7676
MAJOR = 7
77-
MINOR = 4a
77+
MINOR = 4b
7878

7979
# Uncomment this line if the Win32s version is to be included.
8080
# DOSBIN_S = dosbin_s
@@ -137,7 +137,7 @@ MINOR = 4a
137137
# Or, when using the Visual C++ Toolkit 2003: "msvcsetup.bat" (adjust the
138138
# paths when necessary).
139139
# For Windows 98/ME the 2003 version is required, but then the executable
140-
# won't work on Windows 7 and 64 bit.
140+
# won't work on Windows 7 and 64 bit systems.
141141
# - "nmake -f Make_mvc.mak" (use the same path as for vcvars32.bat)
142142
# - "rm testdir/*.out", "nmake -f Make_mvc.mak test" and check the output.
143143
# - Rename vim.exe to vimw32.exe, xxd/xxd.exe to xxdw32.exe.

‎README.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
README.txt for version 7.4a of Vim: Vi IMproved.
1+
README.txt for version 7.4b of Vim: Vi IMproved.
22

33

44
WHAT IS VIM

‎README_ami.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
README_ami.txt for version 7.4a of Vim: Vi IMproved.
1+
README_ami.txt for version 7.4b of Vim: Vi IMproved.
22

33
This file explains the installation of Vim on Amiga systems.
44
See README.txt for general information about Vim.

‎README_amibin.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
README_amibin.txt for version 7.4a of Vim: Vi IMproved.
1+
README_amibin.txt for version 7.4b of Vim: Vi IMproved.
22

33
See "README.txt" for general information about Vim.
44
See "README_ami.txt" for installation instructions for the Amiga.

‎README_amisrc.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
README_amisrc.txt for version 7.4a of Vim: Vi IMproved.
1+
README_amisrc.txt for version 7.4b of Vim: Vi IMproved.
22

33
See "README.txt" for general information about Vim.
44
See "README_ami.txt" for installation instructions for the Amiga.

‎README_bindos.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
README_bindos.txt for version 7.4a of Vim: Vi IMproved.
1+
README_bindos.txt for version 7.4b of Vim: Vi IMproved.
22

33
See "README.txt" for general information about Vim.
44
See "README_dos.txt" for installation instructions for MS-DOS and MS-Windows.

‎README_dos.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
README_dos.txt for version 7.4a of Vim: Vi IMproved.
1+
README_dos.txt for version 7.4b of Vim: Vi IMproved.
22

33
This file explains the installation of Vim on MS-DOS and MS-Windows systems.
44
See "README.txt" for general information about Vim.

‎README_extra.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
README_extra.txt for version 7.4a of Vim: Vi IMproved.
1+
README_extra.txt for version 7.4b of Vim: Vi IMproved.
22

33
These extra files of Vim are for special purposes. This README explains what
44
the files are for. For general information about Vim, see the "README.txt"

0 commit comments

Comments
 (0)