Skip to content

Commit ff2b0d5

Browse files
committed
Merge remote-tracking branch 'macvim/vim' into kaoriya
Conflicts: src/gui_w32.c src/gui_w48.c
2 parents 204c014 + 4fa0083 commit ff2b0d5

File tree

249 files changed

+5178
-1948
lines changed

Some content is hidden

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

249 files changed

+5178
-1948
lines changed

.hgtags

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2667,3 +2667,65 @@ f72d49c406c48293e30d774303493e4c8d120bfb v7-4a-004
26672667
c624928fbc49408ab932e5c79f5f79e53327d700 v7-4a-007
26682668
b3bd43ef012d975cafb7b2a4c41fb78486ee4cc0 v7-4a-008
26692669
467efeee8f9e2060891bc718e6aeffaf79eab43b v7-4a-009
2670+
a4e08386a6aa29c5e58302f1650fa2ad3f03b76b v7-4a-010
2671+
ce587b26b8d6bec140af41712bb99c4c73c3bf99 v7-4a-011
2672+
fca6ba0d2d66d38da8ae023e73944a69662c0d66 v7-4a-012
2673+
42d592dbbec3706429e3f3f75c9c394db6b9c1bd v7-4a-013
2674+
08eb573821869727e5951e6586207dfbe5fd982c v7-4a-014
2675+
7a1b782ec64ac55052755ed72ff023093b246d96 v7-4a-015
2676+
4104bed69ea561a105c3db590aa6c75be2a24836 v7-4a-016
2677+
4cbff53717d4920cb64d417c7a603b45519138f1 v7-4a-017
2678+
c6dd0c545e5ca25e0b45fc1dbd7d1cb20642830e v7-4a-018
2679+
bea5eb942011c09a6a8805e6b21079375462a710 v7-4a-019
2680+
fa76be660fa914de79e3856caea8261cc7ab6c5b v7-4a-020
2681+
fc6f4a653265f9e6b3dfa82faf067329dd5044a2 v7-4a-021
2682+
c28202427d71b4460122754884bb548f084c3d7a v7-4a-022
2683+
45b2278e6f461689d068f138428e9f3fdb01615c v7-4a-023
2684+
ba9a11fe25637103e1a77fefbbaed4ac2ff182f9 v7-4a-024
2685+
1b89e3f916c59fbdfdbd31e4d8af8b22274275b2 v7-4a-025
2686+
b3ff17862b4c9d06411bd3c854cfceb77d5b97b6 v7-4a-026
2687+
8edba3805d787f50b51d7fd59899c5361c09a348 v7-4a-027
2688+
7aca84c0cd37ab4eceab8897e0297e2e318b8fff v7-4a-028
2689+
2b58913e19a5a40d169f2aa1ef9530a78c375d2e v7-4a-029
2690+
bc4fb031746594e4e84b36e64389e78454617a86 v7-4a-030
2691+
839ebe7c1b2fb8150714fc48ec597d2e1f1c7557 v7-4a-031
2692+
2741b46e96bfe6c06a5e9704bcad649655f7b50f v7-4a-032
2693+
fa024ce48542356206bf86bdc9286ecf0510ad49 v7-4a-033
2694+
947edb6335d1e196c27e2e7e0e0a5ed8f6b78498 v7-4a-034
2695+
4ceacc1b00548c0b21c0dc2628608515899df721 v7-4a-035
2696+
9982ec574beb1866536f0e8a0ace3073faa3bb97 v7-4a-036
2697+
91d478da863e0779c482c790cc96b14188f3ecaf v7-4a-037
2698+
8f983df0299fb4f1c7359eb3b844ee93e8f7e8fb v7-4a-038
2699+
a08fa2919f2b39be0416109d87a42fbb5880ac76 v7-4a-039
2700+
1261caf9bc5193d304140647c08ca5b52120ce52 v7-4a-040
2701+
74d2f3188cd0aaa0d3d7cd3df001d88b04f77f5c v7-4a-041
2702+
1899acc5aebd40f625b9fed7bc4c1b5f67e5bc3f v7-4a-042
2703+
6fa64615c8d38ecf464702b102538c09fe250813 v7-4a-043
2704+
647596ab1ae2f4b36bfc20293adf4b3a43372818 v7-4a-044
2705+
da95a7f1d5a8413ae719188cec5b706b99db4a91 v7-4a-045
2706+
f0361e297d9ceb533a17530647b4482c3990df3c v7-4a-046
2707+
8c6615a30951fb9f2d2b218e55626f5dfa3fa24e v7-4a-047
2708+
09c88160095d98a0b1403e9230c76e8adbb75d59 v7-4b-000
2709+
47a09a572ea670d0498983eaa6ded5ab4f12fd15 v7-4b-001
2710+
2e63b6c763f7af2ef11f751d3047847652dddfe0 v7-4b-002
2711+
ea876fe914833a69018c54d6927dbbdb42ce6ecc v7-4b-003
2712+
3c6e2b89875f39c8417021aa369695ec1ba762df v7-4b-004
2713+
e63e4b4be9236c2d811b5ec7bdd79e387ec8bac9 v7-4b-005
2714+
6b7ab6a4f31a54bceb4e7d6f0f9404b5a37bdad3 v7-4b-006
2715+
b882d4b14e00af23444fd630aae3ac32214dd097 v7-4b-007
2716+
3059c799fcd997ea60a63ed10a2a09d73e3ed3cf v7-4b-008
2717+
cd971e951b0626c253059d8e25859032560920a6 v7-4b-009
2718+
585b623a1aa3baea87a1584e6064612b2183d312 v7-4b-010
2719+
7d1f89b2710305a00e6adac35a1fa6edd47982ba v7-4b-011
2720+
25f67b62afd8c58b6c661961cc762f00ee89e562 v7-4b-012
2721+
1ed6fd19c36051da73f9987777002b331853f5ea v7-4b-013
2722+
3ddec3d25bd178d4f90114bce9ce889f3889e6d2 v7-4b-014
2723+
d96f16667cc48d89c380fae29d86286b20040d5b v7-4b-015
2724+
ba37e955913e85700677b89a720c6e5fc8d23cc3 v7-4b-016
2725+
8c42772f05438e9f06200bca731cf301097be8ea v7-4b-017
2726+
7ed1ec814dafe8109a2f34302174267d31bbc924 v7-4b-018
2727+
74a211a0d3a3135dd67329cd981f5100f5e4d064 v7-4b-019
2728+
46cf49cc9289920704999a971f397eee1efdb3fc v7-4b-020
2729+
059c8a4b103f6971276435127c7ad970a81b0b2c v7-4b-021
2730+
d5d6b78cff090e87d52924179e44131b5ba7436d v7-4b-022
2731+
359743c1f59af353454dd80a26d9f8c20ae6ee8e v7-4

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.4. Also runs under UNIX, MSDOS and other systems.
13+
vim74rt.tgz contains the documentation and syntax files.
14+
vim74bin.tgz contains the binaries.
15+
vim74src.tgz contains the sources.
1616
Author: Bram Moolenaar et al.
1717

1818

Filelist

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -694,6 +694,7 @@ LANG_GEN = \
694694
runtime/doc/*-fr.UTF-8.1 \
695695
runtime/doc/*-it.1 \
696696
runtime/doc/*-it.UTF-8.1 \
697+
runtime/doc/*-ja.UTF-8.1 \
697698
runtime/doc/*-pl.1 \
698699
runtime/doc/*-pl.UTF-8.1 \
699700
runtime/doc/*-ru.1 \

Makefile

Lines changed: 12 additions & 8 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 = 4
7878

7979
# Uncomment this line if the Win32s version is to be included.
8080
# DOSBIN_S = dosbin_s
@@ -92,8 +92,6 @@ MINOR = 4a
9292
# runtime/doc/*.txt and nsis/gvim.nsi. Other things in README_os2.txt. For a
9393
# minor/major version: src/GvimExt/GvimExt.reg, src/vim.def, src/vim16.def,
9494
# src/gvim.exe.mnf.
95-
# - Adjust the date and other info in src/version.h.
96-
# - Correct included_patches[] in src/version.c.
9795
# - Compile Vim with GTK, Perl, Python, Python3, TCL, Ruby, MZscheme, Lua (if
9896
# you can make it all work), Cscope and "huge" features. Exclude workshop
9997
# and SNiFF.
@@ -102,17 +100,23 @@ MINOR = 4a
102100
# - With these features: "make depend" (works best with gcc).
103101
# - If you have a lint program: "make lint" and check the output (ignore GTK
104102
# warnings).
105-
# - Enable the efence library in "src/Makefile" and run "make test". Disable
106-
# Python and Ruby to avoid trouble with threads (efence is not threadsafe).
103+
# - If you have valgrind, enable it in src/testdir/Makefile and run "make
104+
# test". Enable EXITFREE, disable GUI, scheme and tcl to avoid false alarms.
105+
# Check the valgrind output.
106+
# - If you have the efence library, enable it in "src/Makefile" and run "make
107+
# test". Disable Python and Ruby to avoid trouble with threads (efence is
108+
# not threadsafe).
109+
# - Adjust the date and other info in src/version.h.
110+
# - Correct included_patches[] in src/version.c.
107111
# - Check for missing entries in runtime/makemenu.vim (with checkmenu script).
108112
# - Check for missing options in runtime/optwin.vim et al. (with check.vim).
109113
# - Do "make menu" to update the runtime/synmenu.vim file.
110114
# - Add remarks for changes to runtime/doc/version7.txt.
111115
# - Check that runtime/doc/help.txt doesn't contain entries in "LOCAL
112116
# ADDITIONS".
113117
# - In runtime/doc run "make" and "make html" to check for errors.
114-
# - Check if src/Makefile and src/feature.h don't contain any personal
115-
# preferences or the GTK, Perl, etc. mentioned above.
118+
# - Check if src/Makefile, src/testdir/Makefile and src/feature.h don't contain
119+
# any personal preferences or the changes mentioned above.
116120
# - Check file protections to be "644" for text and "755" for executables (run
117121
# the "check" script).
118122
# - Check compiling on Amiga, MS-DOS and MS-Windows.
@@ -137,7 +141,7 @@ MINOR = 4a
137141
# Or, when using the Visual C++ Toolkit 2003: "msvcsetup.bat" (adjust the
138142
# paths when necessary).
139143
# For Windows 98/ME the 2003 version is required, but then the executable
140-
# won't work on Windows 7 and 64 bit.
144+
# won't work on Windows 7 and 64 bit systems.
141145
# - "nmake -f Make_mvc.mak" (use the same path as for vcvars32.bat)
142146
# - "rm testdir/*.out", "nmake -f Make_mvc.mak test" and check the output.
143147
# - 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.4 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.4 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.4 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.4 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.4 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.4 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.

0 commit comments

Comments
 (0)