Permalink
Browse files

Merge branch 'master' into split-browser

  • Loading branch information...
2 parents bee6454 + 54b2b3c commit 6558ecc883f37756401ebb109ca5d5448d0b1098 @alloy committed Oct 10, 2011
View
@@ -1657,3 +1657,14 @@ dc7f2f9759208aa07bf136deca661fd080a1ee68 v7-3-319
738ea87c196431c452bd499c5a9849597ac938de v7-3-320
fc0804089b2945bfe683f9bc9ee0238b8c64a46e v7-3-321
38a7fd9043474dfb464c338ffd7f393361f5a6c1 v7-3-322
+3bdb646fc8a46ee5a5fe474dccdce098680d24d6 v7-3-323
+f04619f1fc1663f4ab05798c410e4fa35a9dd863 v7-3-324
+8aca621c00910556d4f52bd650d6841d6059d6ec v7-3-325
+d3758064ff9946d23aeccc9d2340686766647b84 v7-3-326
+9028c70adafd109ab294102f74dfb5005a20bbfb v7-3-327
+5b53cea62e5d1be2a1a36ce685c15f99bb8a41ba v7-3-328
+ec901ddc84d5c66c5d0c1dcca093584598487f9f v7-3-329
+abb03be99d661455fd3790cd25355459448fa432 v7-3-330
+4b8c614c1c914ce5d712368a75dbfea9b7e44e17 v7-3-331
+0ecfe54a273f6bc440684aca4ebe5926a2dfc6e2 v7-3-332
+992b24149a9ee0d6f417e40a7462891a9f62ec6a v7-3-333
View
@@ -313,6 +313,7 @@ SRC_DOS = \
src/xxd/Make_bc5.mak \
src/xxd/Make_cyg.mak \
src/xxd/Make_djg.mak \
+ src/xxd/Make_ming.mak \
src/xxd/Make_mvc.mak \
nsis/gvim.nsi \
nsis/README.txt \
@@ -0,0 +1,77 @@
+# Project: gvimext
+# Generates gvimext.dll with gcc.
+# To be used with Cygwin.
+#
+# Originally, the DLL base address was fixed: -Wl,--image-base=0x1C000000
+# Now it is allocated dymanically by the linker by evaluating all DLLs
+# already loaded in memory. The binary image contains as well information
+# for automatic pseudo-rebasing, if needed by the system. ALV 2004-02-29
+
+# If cross-compiling set this to yes, else set it to no
+CROSS = no
+#CROSS = yes
+# For the old MinGW 2.95 (the one you get e.g. with debian woody)
+# set the following variable to yes and check if the executables are
+# really named that way.
+# If you have a newer MinGW or you are using cygwin set it to no and
+# check also the executables
+MINGWOLD = no
+
+# Link against the shared versions of libgcc/libstdc++ by default. Set
+# STATIC_STDCPLUS to "yes" to link against static versions instead.
+STATIC_STDCPLUS=no
+#STATIC_STDCPLUS=yes
+
+# Note: -static-libstdc++ is not available until gcc 4.5.x.
+LDFLAGS += -shared
+ifeq (yes, $(STATIC_STDCPLUS))
+LDFLAGS += -static-libgcc -static-libstdc++
+endif
+
+ifeq ($(CROSS),yes)
+DEL = rm
+ifeq ($(MINGWOLD),yes)
+CXXFLAGS := -O2 -mno-cygwin -fvtable-thunks
+else
+CXXFLAGS := -O2 -mno-cygwin
+endif
+else
+CXXFLAGS := -O2 -mno-cygwin
+ifneq (sh.exe, $(SHELL))
+DEL = rm
+else
+DEL = del
+endif
+endif
+CXX := $(CROSS_COMPILE)g++
+WINDRES := $(CROSS_COMPILE)windres
+WINDRES_CXX = $(CXX)
+WINDRES_FLAGS = --preprocessor="$(WINDRES_CXX) -E -xc" -DRC_INVOKED
+LIBS := -luuid
+RES := gvimext.res
+DEFFILE = gvimext_ming.def
+OBJ := gvimext.o
+
+DLL := gvimext.dll
+
+.PHONY: all all-before all-after clean clean-custom
+
+all: all-before $(DLL) all-after
+
+$(DLL): $(OBJ) $(RES) $(DEFFILE)
+ $(CXX) $(LDFLAGS) $(CXXFLAGS) -s -o $@ \
+ -Wl,--enable-auto-image-base \
+ -Wl,--enable-auto-import \
+ -Wl,--whole-archive \
+ $^ \
+ -Wl,--no-whole-archive \
+ $(LIBS)
+
+gvimext.o: gvimext.cpp
+ $(CXX) $(CXXFLAGS) -DFEAT_GETTEXT -c $? -o $@
+
+$(RES): gvimext_ming.rc
+ $(WINDRES) $(WINDRES_FLAGS) --input-format=rc --output-format=coff -DMING $? -o $@
+
+clean: clean-custom
+ -$(DEL) $(OBJ) $(RES) $(DLL)
@@ -1,6 +1,6 @@
# Project: gvimext
# Generates gvimext.dll with gcc.
-# Can be used for Cygwin and MingW (MingW ignores -mno-cygwin)
+# To be used with MingW.
#
# Originally, the DLL base address was fixed: -Wl,--image-base=0x1C000000
# Now it is allocated dymanically by the linker by evaluating all DLLs
@@ -31,12 +31,12 @@ endif
ifeq ($(CROSS),yes)
DEL = rm
ifeq ($(MINGWOLD),yes)
-CXXFLAGS := -O2 -mno-cygwin -fvtable-thunks
+CXXFLAGS := -O2 -fvtable-thunks
else
-CXXFLAGS := -O2 -mno-cygwin
+CXXFLAGS := -O2
endif
else
-CXXFLAGS := -O2 -mno-cygwin
+CXXFLAGS := -O2
ifneq (sh.exe, $(SHELL))
DEL = rm
else
@@ -75,4 +75,3 @@ $(RES): gvimext_ming.rc
clean: clean-custom
-$(DEL) $(OBJ) $(RES) $(DLL)
-
@@ -233,13 +233,6 @@
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
- 0395AA980D76E86200881434 /* Edit in ODBEditor */ = {
- isa = PBXGroup;
- children = (
- );
- name = "Edit in ODBEditor";
- sourceTree = "<group>";
- };
080E96DDFE201D6D7F000001 /* MacVim Source */ = {
isa = PBXGroup;
children = (
@@ -416,7 +409,6 @@
isa = PBXGroup;
children = (
1D8B5A52104AF9FF002E59D5 /* Carbon.framework */,
- 0395AA980D76E86200881434 /* Edit in ODBEditor */,
1D493DB30C52533B00AB718C /* PSMTabBarControl.xcodeproj */,
1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */,
1058C7A2FEA54F0111CA2CBB /* Other Frameworks */,
@@ -645,6 +637,7 @@
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
+ GCC_VERSION = "";
GCC_WARN_PEDANTIC = NO;
HEADER_SEARCH_PATHS = "";
INFOPLIST_FILE = Info.plist;
@@ -675,6 +668,7 @@
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = s;
+ GCC_VERSION = "";
HEADER_SEARCH_PATHS = "";
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(HOME)/Applications";
@@ -551,7 +551,7 @@
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
- GCC_VERSION = 4.2;
+ GCC_VERSION = "";
INFOPLIST_FILE = "PSMTabBarControlFramework-Info.plist";
INSTALL_PATH = "@executable_path/../Frameworks";
ONLY_ACTIVE_ARCH = YES;
@@ -573,7 +573,7 @@
GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
- GCC_VERSION = 4.2;
+ GCC_VERSION = "";
INFOPLIST_FILE = "PSMTabBarControlFramework-Info.plist";
INSTALL_PATH = "@executable_path/../Frameworks";
ONLY_ACTIVE_ARCH = YES;
View
@@ -536,7 +536,7 @@ xxd/xxd.exe: xxd/xxd.c
$(MAKE) -C xxd -f Make_cyg.mak CC=$(CC) USEDLL=$(USEDLL)
GvimExt/gvimext.dll: GvimExt/gvimext.cpp GvimExt/gvimext.rc GvimExt/gvimext.h
- $(MAKE) -C GvimExt -f Make_ming.mak CROSS_COMPILE=$(CROSS_COMPILE)
+ $(MAKE) -C GvimExt -f Make_cyg.mak CROSS_COMPILE=$(CROSS_COMPILE)
vimrun.exe: vimrun.c
$(CC) $(CFLAGS) -o vimrun.exe vimrun.c $(LIBS)
@@ -565,7 +565,7 @@ ifdef MZSCHEME
endif
-$(DEL) pathdef.c
$(MAKE) -C xxd -f Make_cyg.mak clean
- $(MAKE) -C GvimExt -f Make_ming.mak clean
+ $(MAKE) -C GvimExt -f Make_cyg.mak clean
distclean: clean
-$(DEL) obj$(DIRSLASH)*.o
View
@@ -641,7 +641,7 @@ upx: exes
upx vim.exe
xxd/xxd.exe: xxd/xxd.c
- $(MAKE) -C xxd -f Make_cyg.mak CC=$(CC)
+ $(MAKE) -C xxd -f Make_ming.mak CC=$(CC)
GvimExt/gvimext.dll: GvimExt/gvimext.cpp GvimExt/gvimext.rc GvimExt/gvimext.h
$(MAKE) -C GvimExt -f Make_ming.mak CROSS=$(CROSS) CROSS_COMPILE=$(CROSS_COMPILE)
@@ -659,7 +659,7 @@ ifdef MZSCHEME
-$(DEL) mzscheme_base.c
endif
$(MAKE) -C GvimExt -f Make_ming.mak clean
- $(MAKE) -C xxd -f Make_cyg.mak clean
+ $(MAKE) -C xxd -f Make_ming.mak clean
###########################################################################
INCL = vim.h feature.h os_win32.h os_dos.h ascii.h keymap.h term.h macros.h \
View
@@ -3377,7 +3377,10 @@ ex_call(eap)
/* trans_function_name() doesn't work well when skipping, use eval0()
* instead to skip to any following command, e.g. for:
* :if 0 | call dict.foo().bar() | endif */
- eval0(eap->arg, &rettv, &eap->nextcmd, FALSE);
+ ++emsg_skip;
+ if (eval0(eap->arg, &rettv, &eap->nextcmd, FALSE) != FAIL)
+ clear_tv(&rettv);
+ --emsg_skip;
return;
}
@@ -20489,6 +20492,7 @@ ex_function(eap)
exarg_T *eap;
{
char_u *theline;
+ int i;
int j;
int c;
int saved_did_emsg;
@@ -20735,6 +20739,15 @@ ex_function(eap)
arg = vim_strsave(arg);
if (arg == NULL)
goto erret;
+
+ /* Check for duplicate argument name. */
+ for (i = 0; i < newargs.ga_len; ++i)
+ if (STRCMP(((char_u **)(newargs.ga_data))[i], arg) == 0)
+ {
+ EMSG2(_("E853: Duplicate argument name: %s"), arg);
+ goto erret;
+ }
+
((char_u **)(newargs.ga_data))[newargs.ga_len] = arg;
*p = c;
newargs.ga_len++;
View
@@ -5508,6 +5508,9 @@ ex_help(eap)
int len;
char_u *lang;
#endif
+#ifdef FEAT_FOLDING
+ int old_KeyTyped = KeyTyped;
+#endif
if (eap != NULL)
{
@@ -5671,6 +5674,12 @@ ex_help(eap)
if (!p_im)
restart_edit = 0; /* don't want insert mode in help file */
+#ifdef FEAT_FOLDING
+ /* Restore KeyTyped, setting 'filetype=help' may reset it.
+ * It is needed for do_tag top open folds under the cursor. */
+ KeyTyped = old_KeyTyped;
+#endif
+
if (tag != NULL)
do_tag(tag, DT_HELP, 1, FALSE, TRUE);
View
@@ -373,11 +373,9 @@ static void ex_tag_cmd __ARGS((exarg_T *eap, char_u *name));
# define ex_endif ex_ni
# define ex_else ex_ni
# define ex_while ex_ni
-# define ex_for ex_ni
# define ex_continue ex_ni
# define ex_break ex_ni
# define ex_endwhile ex_ni
-# define ex_endfor ex_ni
# define ex_throw ex_ni
# define ex_try ex_ni
# define ex_catch ex_ni
View
@@ -2881,6 +2881,7 @@ put_on_cmdline(str, len, redraw)
{
msg_no_more = TRUE;
i = cmdline_row;
+ cursorcmd();
draw_cmdline(ccline.cmdpos, ccline.cmdlen - ccline.cmdpos);
/* Avoid clearing the rest of the line too often. */
if (cmdline_row != i || ccline.overstrike)
@@ -4557,7 +4558,7 @@ ExpandFromContext(xp, pat, num_file, file, options)
}
if (xp->xp_context == EXPAND_COMPILER)
{
- char *directories[] = {"colors", NULL};
+ char *directories[] = {"compiler", NULL};
return ExpandRTDir(pat, num_file, file, directories);
}
if (xp->xp_context == EXPAND_OWNSYNTAX)
View
@@ -1074,6 +1074,7 @@ main_loop(cmdwin, noexmode)
skip_redraw = FALSE;
RedrawingDisabled = 0;
no_wait_return = 0;
+ vgetc_busy = 0;
# ifdef FEAT_EVAL
emsg_skip = 0;
# endif
Oops, something went wrong.

0 comments on commit 6558ecc

Please sign in to comment.