--- /dev/null
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.048
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.3.048
+Problem: ":earlier 1f" doesn't work after loading undo file.
+Solution: Set b_u_save_nr_cur when loading an undo file. (Christian
+ Brabandt)
+ Fix only showing time in ":undolist"
+Files: src/undo.c
+
+
+*** ../vim-7.3.047/src/undo.c 2010-08-15 21:57:28.000000000 +0200
+--- src/undo.c 2010-11-03 19:26:38.000000000 +0100
+***************
+*** 1861,1866 ****
+--- 1861,1867 ----
+ curbuf->b_u_seq_cur = seq_cur;
+ curbuf->b_u_time_cur = seq_time;
+ curbuf->b_u_save_nr_last = last_save_nr;
++ curbuf->b_u_save_nr_cur = last_save_nr;
+
+ curbuf->b_u_synced = TRUE;
+ vim_free(uhp_table);
+***************
+*** 2794,2800 ****
+ uhp->uh_time);
+ if (uhp->uh_save_nr > 0)
+ {
+! while (STRLEN(IObuff) < 32)
+ STRCAT(IObuff, " ");
+ vim_snprintf_add((char *)IObuff, IOSIZE,
+ " %3ld", uhp->uh_save_nr);
+--- 2795,2801 ----
+ uhp->uh_time);
+ if (uhp->uh_save_nr > 0)
+ {
+! while (STRLEN(IObuff) < 33)
+ STRCAT(IObuff, " ");
+ vim_snprintf_add((char *)IObuff, IOSIZE,
+ " %3ld", uhp->uh_save_nr);
+***************
+*** 2849,2855 ****
+ sort_strings((char_u **)ga.ga_data, ga.ga_len);
+
+ msg_start();
+! msg_puts_attr((char_u *)_("number changes time saved"),
+ hl_attr(HLF_T));
+ for (i = 0; i < ga.ga_len && !got_int; ++i)
+ {
+--- 2850,2856 ----
+ sort_strings((char_u **)ga.ga_data, ga.ga_len);
+
+ msg_start();
+! msg_puts_attr((char_u *)_("number changes when saved"),
+ hl_attr(HLF_T));
+ for (i = 0; i < ga.ga_len && !got_int; ++i)
+ {
+***************
+*** 2879,2885 ****
+ if (time(NULL) - tt >= 100)
+ {
+ curtime = localtime(&tt);
+! (void)strftime((char *)buf, buflen, "%H:%M:%S", curtime);
+ }
+ else
+ #endif
+--- 2880,2894 ----
+ if (time(NULL) - tt >= 100)
+ {
+ curtime = localtime(&tt);
+! if (time(NULL) - tt < (60L * 60L * 12L))
+! /* within 12 hours */
+! (void)strftime((char *)buf, buflen, "%H:%M:%S", curtime);
+! else if (time(NULL) - tt < (60L * 60L * 24L * 180L))
+! /* within 6 months */
+! (void)strftime((char *)buf, buflen, "%m/%d %H:%M:%S", curtime);
+! else
+! /* long ago */
+! (void)strftime((char *)buf, buflen, "%y/%m/%d %H:%M:%S", curtime);
+ }
+ else
+ #endif
+*** ../vim-7.3.047/src/version.c 2010-10-27 18:36:32.000000000 +0200
+--- src/version.c 2010-11-03 19:27:07.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+ { /* Add new patch number below this line */
++ /**/
++ 48,
+ /**/
+
+--
+TIM: To the north there lies a cave, the cave of Caerbannog, wherein, carved
+ in mystic runes, upon the very living rock, the last words of Olfin
+ Bedwere of Rheged make plain the last resting place of the most Holy
+ Grail.
+ "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
+/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\ download, build and distribute -- http://www.A-A-P.org ///
+ \\\ help me help AIDS victims -- http://ICCF-Holland.org ///
--- /dev/null
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.049
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.3.049
+Problem: PLT has rebranded their Scheme to Racket.
+Solution: Add support for Racket 5.x. (Sergey Khorev)
+Files: src/Make_cyg.mak, src/Make_ming.mak, src/Make_mvc.mak,
+ src/auto/configure, src/configure.in, src/if_mzsch.c
+
+
+*** ../vim-7.3.048/src/Make_cyg.mak 2010-08-15 21:57:27.000000000 +0200
+--- src/Make_cyg.mak 2010-11-03 21:50:42.000000000 +0100
+***************
+*** 1,6 ****
+ #
+ # Makefile for VIM on Win32, using Cygnus gcc
+! # Last updated by Dan Sharp. Last Change: 2010 Feb 24
+ #
+ # Also read INSTALLpc.txt!
+ #
+--- 1,6 ----
+ #
+ # Makefile for VIM on Win32, using Cygnus gcc
+! # Last updated by Dan Sharp. Last Change: 2010 Nov 03
+ #
+ # Also read INSTALLpc.txt!
+ #
+***************
+*** 27,32 ****
+--- 27,33 ----
+ # MZSCHEME_VER define to version of MzScheme being used (209_000)
+ # DYNAMIC_MZSCHEME no or yes: use yes to load the MzScheme DLLs dynamically (yes)
+ # MZSCHEME_DLLS path to MzScheme DLLs (libmzgc and libmzsch), for "static" build.
++ # MZSCHEME_USE_RACKET define to use "racket" instead of "mzsch".
+ # LUA define to path to Lua dir to get Lua support (not defined)
+ # LUA_VER define to version of Lua being used (51)
+ # DYNAMIC_LUA no or yes: use yes to load the Lua DLL dynamically (yes)
+***************
+*** 254,269 ****
+ MZSCHEME_GENERATE_BASE=no
+ endif
+
+ ifeq (yes, $(DYNAMIC_MZSCHEME))
+! DEFINES += -DDYNAMIC_MZSCHEME -DDYNAMIC_MZSCH_DLL=\"libmzsch$(MZSCHEME_VER).dll\" -DDYNAMIC_MZGC_DLL=\"libmzgc$(MZSCHEME_VER).dll\"
+ else
+ ifndef MZSCHEME_DLLS
+ MZSCHEME_DLLS = $(MZSCHEME)
+ endif
+ ifeq (yes,$(MZSCHEME_PRECISE_GC))
+! MZSCHEME_LIB=-lmzsch$(MZSCHEME_VER)
+ else
+! MZSCHEME_LIB = -lmzsch$(MZSCHEME_VER) -lmzgc$(MZSCHEME_VER)
+ endif
+ EXTRA_LIBS += -L$(MZSCHEME_DLLS) -L$(MZSCHEME_DLLS)/lib $(MZSCHEME_LIB)
+ endif
+--- 255,276 ----
+ MZSCHEME_GENERATE_BASE=no
+ endif
+
++ ifndef MZSCHEME_USE_RACKET
++ MZSCHEME_MAIN_LIB=mzsch
++ else
++ MZSCHEME_MAIN_LIB=racket
++ endif
++
+ ifeq (yes, $(DYNAMIC_MZSCHEME))
+! DEFINES += -DDYNAMIC_MZSCHEME -DDYNAMIC_MZSCH_DLL=\"lib$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER).dll\" -DDYNAMIC_MZGC_DLL=\"libmzgc$(MZSCHEME_VER).dll\"
+ else
+ ifndef MZSCHEME_DLLS
+ MZSCHEME_DLLS = $(MZSCHEME)
+ endif
+ ifeq (yes,$(MZSCHEME_PRECISE_GC))
+! MZSCHEME_LIB=-l$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER)
+ else
+! MZSCHEME_LIB = -l$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER) -lmzgc$(MZSCHEME_VER)
+ endif
+ EXTRA_LIBS += -L$(MZSCHEME_DLLS) -L$(MZSCHEME_DLLS)/lib $(MZSCHEME_LIB)
+ endif
+*** ../vim-7.3.048/src/Make_ming.mak 2010-09-29 18:42:25.000000000 +0200
+--- src/Make_ming.mak 2010-11-03 21:48:14.000000000 +0100
+***************
+*** 141,151 ****
+ MZSCHEME_GENERATE_BASE=no
+ endif
+
+ ifeq (no,$(DYNAMIC_MZSCHEME))
+ ifeq (yes,$(MZSCHEME_PRECISE_GC))
+! MZSCHEME_LIB=-lmzsch$(MZSCHEME_VER)
+ else
+! MZSCHEME_LIB = -lmzsch$(MZSCHEME_VER) -lmzgc$(MZSCHEME_VER)
+ endif
+ # the modern MinGW can dynamically link to dlls directly.
+ # point MZSCHEME_DLLS to where you put libmzschXXXXXXX.dll and libgcXXXXXXX.dll
+--- 141,157 ----
+ MZSCHEME_GENERATE_BASE=no
+ endif
+
++ ifndef MZSCHEME_USE_RACKET
++ MZSCHEME_MAIN_LIB=mzsch
++ else
++ MZSCHEME_MAIN_LIB=racket
++ endif
++
+ ifeq (no,$(DYNAMIC_MZSCHEME))
+ ifeq (yes,$(MZSCHEME_PRECISE_GC))
+! MZSCHEME_LIB=-l$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER)
+ else
+! MZSCHEME_LIB = -l$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER) -lmzgc$(MZSCHEME_VER)
+ endif
+ # the modern MinGW can dynamically link to dlls directly.
+ # point MZSCHEME_DLLS to where you put libmzschXXXXXXX.dll and libgcXXXXXXX.dll
+***************
+*** 343,349 ****
+ ifdef MZSCHEME
+ CFLAGS += -I$(MZSCHEME)/include -DFEAT_MZSCHEME -DMZSCHEME_COLLECTS=\"$(MZSCHEME)/collects\"
+ ifeq (yes, $(DYNAMIC_MZSCHEME))
+! CFLAGS += -DDYNAMIC_MZSCHEME -DDYNAMIC_MZSCH_DLL=\"libmzsch$(MZSCHEME_VER).dll\" -DDYNAMIC_MZGC_DLL=\"libmzgc$(MZSCHEME_VER).dll\"
+ endif
+ endif
+
+--- 349,355 ----
+ ifdef MZSCHEME
+ CFLAGS += -I$(MZSCHEME)/include -DFEAT_MZSCHEME -DMZSCHEME_COLLECTS=\"$(MZSCHEME)/collects\"
+ ifeq (yes, $(DYNAMIC_MZSCHEME))
+! CFLAGS += -DDYNAMIC_MZSCHEME -DDYNAMIC_MZSCH_DLL=\"lib$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER).dll\" -DDYNAMIC_MZGC_DLL=\"libmzgc$(MZSCHEME_VER).dll\"
+ endif
+ endif
+
+*** ../vim-7.3.048/src/Make_mvc.mak 2010-08-15 21:57:27.000000000 +0200
+--- src/Make_mvc.mak 2010-11-03 21:48:14.000000000 +0100
+***************
+*** 705,716 ****
+ MZSCHEME_VER = 205_000
+ !endif
+ CFLAGS = $(CFLAGS) -DFEAT_MZSCHEME -I $(MZSCHEME)\include
+! !if EXIST("$(MZSCHEME)\collects\scheme\base.ss")
+! # for MzScheme 4.x we need to include byte code for basic Scheme stuff
+ MZSCHEME_EXTRA_DEP = mzscheme_base.c
+ CFLAGS = $(CFLAGS) -DINCLUDE_MZSCHEME_BASE
+ !endif
+! !if EXIST("$(MZSCHEME)\lib\msvc\libmzsch$(MZSCHEME_VER).lib") \
+ && !EXIST("$(MZSCHEME)\lib\msvc\libmzgc$(MZSCHEME_VER).lib")
+ !message Building with Precise GC
+ MZSCHEME_PRECISE_GC = yes
+--- 705,722 ----
+ MZSCHEME_VER = 205_000
+ !endif
+ CFLAGS = $(CFLAGS) -DFEAT_MZSCHEME -I $(MZSCHEME)\include
+! !if EXIST("$(MZSCHEME)\collects\scheme\base.ss") \
+! || EXIST("$(MZSCHEME)\collects\scheme\base.rkt")
+! # for MzScheme >= 4 we need to include byte code for basic Scheme stuff
+ MZSCHEME_EXTRA_DEP = mzscheme_base.c
+ CFLAGS = $(CFLAGS) -DINCLUDE_MZSCHEME_BASE
+ !endif
+! !if EXIST("$(MZSCHEME)\lib\msvc\libmzsch$(MZSCHEME_VER).lib")
+! MZSCHEME_MAIN_LIB=mzsch
+! !else
+! MZSCHEME_MAIN_LIB=racket
+! !endif
+! !if EXIST("$(MZSCHEME)\lib\msvc\lib$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER).lib") \
+ && !EXIST("$(MZSCHEME)\lib\msvc\libmzgc$(MZSCHEME_VER).lib")
+ !message Building with Precise GC
+ MZSCHEME_PRECISE_GC = yes
+***************
+*** 722,728 ****
+ !endif
+ !message MzScheme DLLs will be loaded dynamically
+ CFLAGS = $(CFLAGS) -DDYNAMIC_MZSCHEME \
+! -DDYNAMIC_MZSCH_DLL=\"libmzsch$(MZSCHEME_VER).dll\" \
+ -DDYNAMIC_MZGC_DLL=\"libmzgc$(MZSCHEME_VER).dll\"
+ !else
+ !if "$(MZSCHEME_DEBUG)" == "yes"
+--- 728,734 ----
+ !endif
+ !message MzScheme DLLs will be loaded dynamically
+ CFLAGS = $(CFLAGS) -DDYNAMIC_MZSCHEME \
+! -DDYNAMIC_MZSCH_DLL=\"lib$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER).dll\" \
+ -DDYNAMIC_MZGC_DLL=\"libmzgc$(MZSCHEME_VER).dll\"
+ !else
+ !if "$(MZSCHEME_DEBUG)" == "yes"
+***************
+*** 730,739 ****
+ !endif
+ !if "$(MZSCHEME_PRECISE_GC)" == "yes"
+ # Precise GC does not use separate dll
+! MZSCHEME_LIB = $(MZSCHEME)\lib\msvc\libmzsch$(MZSCHEME_VER).lib
+ !else
+ MZSCHEME_LIB = $(MZSCHEME)\lib\msvc\libmzgc$(MZSCHEME_VER).lib \
+! $(MZSCHEME)\lib\msvc\libmzsch$(MZSCHEME_VER).lib
+ !endif
+ !endif
+ MZSCHEME_OBJ = $(OUTDIR)\if_mzsch.obj
+--- 736,745 ----
+ !endif
+ !if "$(MZSCHEME_PRECISE_GC)" == "yes"
+ # Precise GC does not use separate dll
+! MZSCHEME_LIB = $(MZSCHEME)\lib\msvc\lib$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER).lib
+ !else
+ MZSCHEME_LIB = $(MZSCHEME)\lib\msvc\libmzgc$(MZSCHEME_VER).lib \
+! $(MZSCHEME)\lib\msvc\lib$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER).lib
+ !endif
+ !endif
+ MZSCHEME_OBJ = $(OUTDIR)\if_mzsch.obj
+*** ../vim-7.3.048/src/auto/configure 2010-10-27 16:49:41.000000000 +0200
+--- src/auto/configure 2010-11-03 21:53:09.000000000 +0100
+***************
+*** 4862,4877 ****
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+! { $as_echo "$as_me:${as_lineno-$LINENO}: checking if scheme.h can be found in /usr/include/plt/" >&5
+! $as_echo_n "checking if scheme.h can be found in /usr/include/plt/... " >&6; }
+! if test -f /usr/include/plt/scheme.h; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+! SCHEME_INC=/usr/include/plt
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+! vi_cv_path_mzscheme_pfx=
+ fi
+ fi
+ fi
+--- 4862,4897 ----
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+! { $as_echo "$as_me:${as_lineno-$LINENO}: checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include/racket" >&5
+! $as_echo_n "checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include/racket... " >&6; }
+! if test -f $vi_cv_path_mzscheme_pfx/include/racket/scheme.h; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+! SCHEME_INC=${vi_cv_path_mzscheme_pfx}/include/racket
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+! { $as_echo "$as_me:${as_lineno-$LINENO}: checking if scheme.h can be found in /usr/include/plt/" >&5
+! $as_echo_n "checking if scheme.h can be found in /usr/include/plt/... " >&6; }
+! if test -f /usr/include/plt/scheme.h; then
+! { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+! $as_echo "yes" >&6; }
+! SCHEME_INC=/usr/include/plt
+! else
+! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+! $as_echo "no" >&6; }
+! { $as_echo "$as_me:${as_lineno-$LINENO}: checking if scheme.h can be found in /usr/include/racket/" >&5
+! $as_echo_n "checking if scheme.h can be found in /usr/include/racket/... " >&6; }
+! if test -f /usr/include/racket/scheme.h; then
+! { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+! $as_echo "yes" >&6; }
+! SCHEME_INC=/usr/include/racket
+! else
+! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+! $as_echo "no" >&6; }
+! vi_cv_path_mzscheme_pfx=
+! fi
+! fi
+ fi
+ fi
+ fi
+***************
+*** 4883,4894 ****
+ elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.a"; then
+ MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.a"
+ MZSCHEME_CFLAGS="-DMZ_PRECISE_GC"
+! elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"; then
+ MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzscheme.a ${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"
+ else
+ if test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.so"; then
+ MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lmzscheme3m"
+ MZSCHEME_CFLAGS="-DMZ_PRECISE_GC"
+ else
+ MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lmzscheme -lmzgc"
+ fi
+--- 4903,4924 ----
+ elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.a"; then
+ MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.a"
+ MZSCHEME_CFLAGS="-DMZ_PRECISE_GC"
+! elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libracket3m.a"; then
+! MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libracket3m.a"
+! MZSCHEME_CFLAGS="-DMZ_PRECISE_GC"
+! elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libracket.a"; then
+! MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libracket.a ${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"
+! elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzscheme.a"; then
+ MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzscheme.a ${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"
+ else
+ if test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.so"; then
+ MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lmzscheme3m"
+ MZSCHEME_CFLAGS="-DMZ_PRECISE_GC"
++ elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libracket3m.so"; then
++ MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lracket3m"
++ MZSCHEME_CFLAGS="-DMZ_PRECISE_GC"
++ elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libracket.so"; then
++ MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lracket -lmzgc"
+ else
+ MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lmzscheme -lmzgc"
+ fi
+***************
+*** 4901,4910 ****
+ fi
+ if test -d $vi_cv_path_mzscheme_pfx/lib/plt/collects; then
+ SCHEME_COLLECTS=lib/plt/
+ fi
+ if test -f "${vi_cv_path_mzscheme_pfx}/${SCHEME_COLLECTS}collects/scheme/base.ss" ; then
+! MZSCHEME_EXTRA="mzscheme_base.c"
+! MZSCHEME_CFLAGS="${MZSCHEME_CFLAGS} -DINCLUDE_MZSCHEME_BASE"
+ MZSCHEME_MZC="${vi_cv_path_mzscheme_pfx}/bin/mzc"
+ fi
+ MZSCHEME_CFLAGS="${MZSCHEME_CFLAGS} -I${SCHEME_INC} \
+--- 4931,4950 ----
+ fi
+ if test -d $vi_cv_path_mzscheme_pfx/lib/plt/collects; then
+ SCHEME_COLLECTS=lib/plt/
++ else
++ if test -d $vi_cv_path_mzscheme_pfx/lib/racket/collects; then
++ SCHEME_COLLECTS=lib/racket/
++ fi
+ fi
+ if test -f "${vi_cv_path_mzscheme_pfx}/${SCHEME_COLLECTS}collects/scheme/base.ss" ; then
+! MZSCHEME_EXTRA="mzscheme_base.c"
+! else
+! if test -f "${vi_cv_path_mzscheme_pfx}/${SCHEME_COLLECTS}collects/scheme/base.rkt" ; then
+! MZSCHEME_EXTRA="mzscheme_base.c"
+! fi
+! fi
+! if test "X$MZSCHEME_EXTRA" != "X" ; then
+! MZSCHEME_CFLAGS="${MZSCHEME_CFLAGS} -DINCLUDE_MZSCHEME_BASE"
+ MZSCHEME_MZC="${vi_cv_path_mzscheme_pfx}/bin/mzc"
+ fi
+ MZSCHEME_CFLAGS="${MZSCHEME_CFLAGS} -I${SCHEME_INC} \
+*** ../vim-7.3.048/src/configure.in 2010-10-27 16:49:41.000000000 +0200
+--- src/configure.in 2010-11-03 21:48:14.000000000 +0100
+***************
+*** 568,580 ****
+ SCHEME_INC=${vi_cv_path_mzscheme_pfx}/include/plt
+ else
+ AC_MSG_RESULT(no)
+! AC_MSG_CHECKING(if scheme.h can be found in /usr/include/plt/)
+! if test -f /usr/include/plt/scheme.h; then
+ AC_MSG_RESULT(yes)
+! SCHEME_INC=/usr/include/plt
+ else
+ AC_MSG_RESULT(no)
+! vi_cv_path_mzscheme_pfx=
+ fi
+ fi
+ fi
+--- 568,594 ----
+ SCHEME_INC=${vi_cv_path_mzscheme_pfx}/include/plt
+ else
+ AC_MSG_RESULT(no)
+! AC_MSG_CHECKING(if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include/racket)
+! if test -f $vi_cv_path_mzscheme_pfx/include/racket/scheme.h; then
+ AC_MSG_RESULT(yes)
+! SCHEME_INC=${vi_cv_path_mzscheme_pfx}/include/racket
+ else
+ AC_MSG_RESULT(no)
+! AC_MSG_CHECKING(if scheme.h can be found in /usr/include/plt/)
+! if test -f /usr/include/plt/scheme.h; then
+! AC_MSG_RESULT(yes)
+! SCHEME_INC=/usr/include/plt
+! else
+! AC_MSG_RESULT(no)
+! AC_MSG_CHECKING(if scheme.h can be found in /usr/include/racket/)
+! if test -f /usr/include/racket/scheme.h; then
+! AC_MSG_RESULT(yes)
+! SCHEME_INC=/usr/include/racket
+! else
+! AC_MSG_RESULT(no)
+! vi_cv_path_mzscheme_pfx=
+! fi
+! fi
+ fi
+ fi
+ fi
+***************
+*** 586,598 ****
+ elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.a"; then
+ MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.a"
+ MZSCHEME_CFLAGS="-DMZ_PRECISE_GC"
+! elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"; then
+ MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzscheme.a ${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"
+ else
+ dnl Using shared objects
+ if test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.so"; then
+ MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lmzscheme3m"
+ MZSCHEME_CFLAGS="-DMZ_PRECISE_GC"
+ else
+ MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lmzscheme -lmzgc"
+ fi
+--- 600,622 ----
+ elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.a"; then
+ MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.a"
+ MZSCHEME_CFLAGS="-DMZ_PRECISE_GC"
+! elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libracket3m.a"; then
+! MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libracket3m.a"
+! MZSCHEME_CFLAGS="-DMZ_PRECISE_GC"
+! elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libracket.a"; then
+! MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libracket.a ${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"
+! elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzscheme.a"; then
+ MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzscheme.a ${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"
+ else
+ dnl Using shared objects
+ if test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.so"; then
+ MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lmzscheme3m"
+ MZSCHEME_CFLAGS="-DMZ_PRECISE_GC"
++ elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libracket3m.so"; then
++ MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lracket3m"
++ MZSCHEME_CFLAGS="-DMZ_PRECISE_GC"
++ elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libracket.so"; then
++ MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lracket -lmzgc"
+ else
+ MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lmzscheme -lmzgc"
+ fi
+***************
+*** 607,616 ****
+ fi
+ if test -d $vi_cv_path_mzscheme_pfx/lib/plt/collects; then
+ SCHEME_COLLECTS=lib/plt/
+ fi
+ if test -f "${vi_cv_path_mzscheme_pfx}/${SCHEME_COLLECTS}collects/scheme/base.ss" ; then
+- dnl need to generate bytecode for MzScheme base
+ MZSCHEME_EXTRA="mzscheme_base.c"
+ MZSCHEME_CFLAGS="${MZSCHEME_CFLAGS} -DINCLUDE_MZSCHEME_BASE"
+ MZSCHEME_MZC="${vi_cv_path_mzscheme_pfx}/bin/mzc"
+ fi
+--- 631,650 ----
+ fi
+ if test -d $vi_cv_path_mzscheme_pfx/lib/plt/collects; then
+ SCHEME_COLLECTS=lib/plt/
++ else
++ if test -d $vi_cv_path_mzscheme_pfx/lib/racket/collects; then
++ SCHEME_COLLECTS=lib/racket/
++ fi
+ fi
+ if test -f "${vi_cv_path_mzscheme_pfx}/${SCHEME_COLLECTS}collects/scheme/base.ss" ; then
+ MZSCHEME_EXTRA="mzscheme_base.c"
++ else
++ if test -f "${vi_cv_path_mzscheme_pfx}/${SCHEME_COLLECTS}collects/scheme/base.rkt" ; then
++ MZSCHEME_EXTRA="mzscheme_base.c"
++ fi
++ fi
++ if test "X$MZSCHEME_EXTRA" != "X" ; then
++ dnl need to generate bytecode for MzScheme base
+ MZSCHEME_CFLAGS="${MZSCHEME_CFLAGS} -DINCLUDE_MZSCHEME_BASE"
+ MZSCHEME_MZC="${vi_cv_path_mzscheme_pfx}/bin/mzc"
+ fi
+*** ../vim-7.3.048/src/if_mzsch.c 2010-10-23 14:02:48.000000000 +0200
+--- src/if_mzsch.c 2010-11-03 21:48:14.000000000 +0100
+***************
+*** 794,802 ****
+--- 794,809 ----
+ #endif
+ }
+
++ #if MZSCHEME_VERSION_MAJOR >= 500 && defined(WIN32) && defined(USE_THREAD_LOCAL)
++ static __declspec(thread) void *tls_space;
++ #endif
++
+ void
+ mzscheme_main(void)
+ {
++ #if MZSCHEME_VERSION_MAJOR >= 500 && defined(WIN32) && defined(USE_THREAD_LOCAL)
++ scheme_register_tls_space(&tls_space, 0);
++ #endif
+ #if defined(MZ_PRECISE_GC) && MZSCHEME_VERSION_MAJOR >= 400
+ /* use trampoline for precise GC in MzScheme >= 4.x */
+ scheme_main_setup(TRUE, mzscheme_env_main, 0, NULL);
+*** ../vim-7.3.048/src/version.c 2010-11-03 19:32:36.000000000 +0100
+--- src/version.c 2010-11-03 21:57:04.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+ { /* Add new patch number below this line */
++ /**/
++ 49,
+ /**/
+
+--
+TIM: But follow only if you are men of valour. For the entrance to this cave
+ is guarded by a monster, a creature so foul and cruel that no man yet has
+ fought with it and lived. Bones of full fifty men lie strewn about its
+ lair ...
+ "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
+/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\ download, build and distribute -- http://www.A-A-P.org ///
+ \\\ help me help AIDS victims -- http://ICCF-Holland.org ///
--- /dev/null
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.050
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.3.050
+Problem: The link script is clumsy.
+Solution: Use the --as-needed linker option if available. (Kirill A.
+ Shutemov)
+Files: src/Makefile, src/auto/configure, src/config.mk.in,
+ src/configure.in, src/link.sh
+
+
+*** ../vim-7.3.049/src/Makefile 2010-10-27 16:49:41.000000000 +0200
+--- src/Makefile 2010-11-03 22:26:45.000000000 +0100
+***************
+*** 1700,1706 ****
+ $(CCC) version.c -o objects/version.o
+ @LINK="$(PURIFY) $(SHRPENV) $(CClink) $(ALL_LIB_DIRS) $(LDFLAGS) \
+ -o $(VIMTARGET) $(OBJ) objects/version.o $(ALL_LIBS)" \
+! MAKE="$(MAKE)" sh $(srcdir)/link.sh
+
+ xxd/xxd$(EXEEXT): xxd/xxd.c
+ cd xxd; CC="$(CC)" CFLAGS="$(CPPFLAGS) $(CFLAGS)" \
+--- 1700,1707 ----
+ $(CCC) version.c -o objects/version.o
+ @LINK="$(PURIFY) $(SHRPENV) $(CClink) $(ALL_LIB_DIRS) $(LDFLAGS) \
+ -o $(VIMTARGET) $(OBJ) objects/version.o $(ALL_LIBS)" \
+! MAKE="$(MAKE)" LINK_AS_NEEDED=$(LINK_AS_NEEDED) \
+! sh $(srcdir)/link.sh
+
+ xxd/xxd$(EXEEXT): xxd/xxd.c
+ cd xxd; CC="$(CC)" CFLAGS="$(CPPFLAGS) $(CFLAGS)" \
+*** ../vim-7.3.049/src/auto/configure 2010-11-03 21:59:23.000000000 +0100
+--- src/auto/configure 2010-11-03 22:28:03.000000000 +0100
+***************
+*** 593,598 ****
+--- 593,599 ----
+
+ ac_subst_vars='LTLIBOBJS
+ LIBOBJS
++ LINK_AS_NEEDED
+ DEPEND_CFLAGS_FILTER
+ MAKEMO
+ MSGFMT
+***************
+*** 12404,12409 ****
+--- 12405,12427 ----
+ fi
+
+
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking linker --as-needed support" >&5
++ $as_echo_n "checking linker --as-needed support... " >&6; }
++ LINK_AS_NEEDED=
++ # Check if linker supports --as-needed and --no-as-needed options
++ if $CC -Wl,--help 2>/dev/null | grep as-needed > /dev/null; then
++ LDFLAGS="$LDFLAGS -Wl,--as-needed"
++ LINK_AS_NEEDED=yes
++ fi
++ if test "$LINK_AS_NEEDED" = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++ $as_echo "yes" >&6; }
++ else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++ $as_echo "no" >&6; }
++ fi
++
++
+ ac_config_files="$ac_config_files auto/config.mk:config.mk.in"
+
+ cat >confcache <<\_ACEOF
+*** ../vim-7.3.049/src/config.mk.in 2010-08-15 21:57:28.000000000 +0200
+--- src/config.mk.in 2010-11-03 22:26:24.000000000 +0100
+***************
+*** 30,35 ****
+--- 30,36 ----
+ CPP = @CPP@
+ CPP_MM = @CPP_MM@
+ DEPEND_CFLAGS_FILTER = @DEPEND_CFLAGS_FILTER@
++ LINK_AS_NEEDED = @LINK_AS_NEEDED@
+ X_CFLAGS = @X_CFLAGS@
+ X_LIBS_DIR = @X_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+*** ../vim-7.3.049/src/configure.in 2010-11-03 21:59:23.000000000 +0100
+--- src/configure.in 2010-11-03 22:26:16.000000000 +0100
+***************
+*** 3527,3532 ****
+--- 3527,3549 ----
+ fi
+ AC_SUBST(DEPEND_CFLAGS_FILTER)
+
++ dnl link.sh tries to avoid overlinking in a hackish way.
++ dnl At least GNU ld supports --as-needed which provides the same functionality
++ dnl at linker level. Let's use it.
++ AC_MSG_CHECKING(linker --as-needed support)
++ LINK_AS_NEEDED=
++ # Check if linker supports --as-needed and --no-as-needed options
++ if $CC -Wl,--help 2>/dev/null | grep as-needed > /dev/null; then
++ LDFLAGS="$LDFLAGS -Wl,--as-needed"
++ LINK_AS_NEEDED=yes
++ fi
++ if test "$LINK_AS_NEEDED" = yes; then
++ AC_MSG_RESULT(yes)
++ else
++ AC_MSG_RESULT(no)
++ fi
++ AC_SUBST(LINK_AS_NEEDED)
++
+ dnl write output files
+ AC_OUTPUT(auto/config.mk:config.mk.in)
+
+*** ../vim-7.3.049/src/link.sh 2010-08-15 21:57:25.000000000 +0200
+--- src/link.sh 2010-11-03 22:26:08.000000000 +0100
+***************
+*** 5,11 ****
+ # libraries when they exist, but this doesn't mean they are needed for Vim.
+ #
+ # Author: Bram Moolenaar
+! # Last change: 2006 Sep 26
+ # License: Public domain
+ #
+ # Warning: This fails miserably if the linker doesn't return an error code!
+--- 5,11 ----
+ # libraries when they exist, but this doesn't mean they are needed for Vim.
+ #
+ # Author: Bram Moolenaar
+! # Last change: 2010 Nov 03
+ # License: Public domain
+ #
+ # Warning: This fails miserably if the linker doesn't return an error code!
+***************
+*** 16,26 ****
+ echo "$LINK " >link.cmd
+ exit_value=0
+
+ #
+ # If auto/link.sed already exists, use it. We assume a previous run of
+ # link.sh has found the correct set of libraries.
+ #
+- if test -f auto/link.sed; then
+ echo "link.sh: The file 'auto/link.sed' exists, which is going to be used now."
+ echo "link.sh: If linking fails, try deleting the auto/link.sed file."
+ echo "link.sh: If this fails too, try creating an empty auto/link.sed file."
+--- 16,38 ----
+ echo "$LINK " >link.cmd
+ exit_value=0
+
++ if test "$LINK_AS_NEEDED" = yes; then
++ echo "link.sh: \$LINK_AS_NEEDED set to 'yes': invoking linker directly."
++ cat link.cmd
++ if sh link.cmd; then
++ exit_value=0
++ echo "link.sh: Linked fine"
++ else
++ exit_value=$?
++ echo "link.sh: Linking failed"
++ fi
++ else
++ if test -f auto/link.sed; then
++
+ #
+ # If auto/link.sed already exists, use it. We assume a previous run of
+ # link.sh has found the correct set of libraries.
+ #
+ echo "link.sh: The file 'auto/link.sed' exists, which is going to be used now."
+ echo "link.sh: If linking fails, try deleting the auto/link.sed file."
+ echo "link.sh: If this fails too, try creating an empty auto/link.sed file."
+***************
+*** 124,129 ****
+--- 136,143 ----
+ fi
+ fi
+
++ fi
++
+ #
+ # cleanup
+ #
+*** ../vim-7.3.049/src/version.c 2010-11-03 21:59:23.000000000 +0100
+--- src/version.c 2010-11-03 22:30:17.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+ { /* Add new patch number below this line */
++ /**/
++ 50,
+ /**/
+
+--
+Save the plankton - eat a whale.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
+/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\ download, build and distribute -- http://www.A-A-P.org ///
+ \\\ help me help AIDS victims -- http://ICCF-Holland.org ///
projects / packages / vim.git / commitdiff