Changeset 7352c10
- Timestamp:
- Jan 19, 2009, 12:16:00 AM (16 years ago)
- Branches:
- clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
- Children:
- 384af06
- Parents:
- 39806f8b
- Location:
- patches
- Files:
-
- 2 moved
-
ncurses-5.7-branch_update-5.patch (moved) (moved from patches/ncurses-5.7-branch_update-4.patch ) (81 diffs)
-
vim-7.2-branch_update-5.patch (moved) (moved from patches/vim-7.2-branch_update-4.patch ) (81 diffs)
Legend:
- Unmodified
- Added
- Removed
-
patches/ncurses-5.7-branch_update-5.patch
r39806f8b r7352c10 1 1 Submitted By: Jim Gifford (jim at cross-lfs dot org) 2 Date: 01- 08-20092 Date: 01-18-2009 3 3 Initial Package Version: 5.7 4 4 Origin: Upstream 5 5 Upstream Status: Applied 6 6 Description: This is a branch update for NCurses-5.7, and should be 7 rechecked periodically. This patch covers up to 5.7-200901 05.7 rechecked periodically. This patch covers up to 5.7-20090117. 8 8 9 diff -Naur ncurses-5.7.orig/Ada95/gen/Makefile.in ncurses-5.7/Ada95/gen/Makefile.in 10 --- ncurses-5.7.orig/Ada95/gen/Makefile.in 2008-10-04 15:58:31.000000000 -0700 11 +++ ncurses-5.7/Ada95/gen/Makefile.in 2009-01-18 23:56:40.000000000 -0800 12 @@ -1,5 +1,5 @@ 13 ############################################################################## 14 -# Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. # 15 +# Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. # 16 # # 17 # Permission is hereby granted, free of charge, to any person obtaining a # 18 # copy of this software and associated documentation files (the "Software"), # 19 @@ -28,7 +28,7 @@ 20 # 21 # Author: Juergen Pfeifer, 1996 22 # 23 -# $Id: Makefile.in,v 1.61 2008/10/04 22:58:31 tom Exp $ 24 +# $Id: Makefile.in,v 1.63 2009/01/11 01:11:35 tom Exp $ 25 # 26 .SUFFIXES: 27 28 @@ -81,7 +81,7 @@ 29 M4 = m4 30 M4FLAGS = -DNCURSES_EXT_FUNCS=@NCURSES_EXT_FUNCS@ 31 32 -ADACURSES_CONFIG = adacurses-config 33 +ADACURSES_CONFIG = adacurses@DFT_ARG_SUFFIX@-config 34 35 WRAPPER = sh $(top_srcdir)/misc/shlib 36 GENERATE = ./gen$x '@DFT_ARG_SUFFIX@' 37 @@ -166,6 +166,7 @@ 38 39 sources: 40 41 +$(DESTDIR)$(bindir) \ 42 $(ADA_INCLUDE) \ 43 $(ADA_OBJECTS) : 44 sh $(top_srcdir)/mkdirs.sh $@ 45 @@ -187,8 +188,8 @@ 46 @-chmod u+x $(ADA_SRCDIR)/*.ali 47 48 install \ 49 -install.libs :: $(DESTDIR)$(bindir) adacurses-config 50 - $(INSTALL_PROG) adacurses-config $(DESTDIR)$(bindir)/$(ADACURSES_CONFIG) 51 +install.libs :: $(DESTDIR)$(bindir) $(ADACURSES_CONFIG) 52 + $(INSTALL_PROG) $(ADACURSES_CONFIG) $(DESTDIR)$(bindir)/$(ADACURSES_CONFIG) 53 54 uninstall \ 55 uninstall.libs :: 56 @@ -398,7 +399,7 @@ 57 -rm -f $(GEN_TARGETS) instab.tmp *.ad[bs] *.html *.ali *.tmp 58 59 distclean :: clean 60 - -rm -f adacurses-config 61 + -rm -f $(ADACURSES_CONFIG) 62 -rm -f Makefile 63 64 realclean :: distclean 65 diff -Naur ncurses-5.7.orig/Ada95/gen/adacurses-config.in ncurses-5.7/Ada95/gen/adacurses-config.in 66 --- ncurses-5.7.orig/Ada95/gen/adacurses-config.in 2007-04-07 14:06:50.000000000 -0700 67 +++ ncurses-5.7/Ada95/gen/adacurses-config.in 2009-01-18 23:56:40.000000000 -0800 68 @@ -1,18 +1,47 @@ 69 #! /bin/sh 70 -# $Id: adacurses-config.in,v 1.2 2007/04/07 21:06:50 tom Exp $ 71 -# 72 -# This script will return the option to add to `gnatmake' for using 73 -# AdaCurses. 74 +# $Id: adacurses-config.in,v 1.5 2009/01/11 00:08:19 tom Exp $ 75 +############################################################################## 76 +# Copyright (c) 2007,2009 Free Software Foundation, Inc. # 77 +# # 78 +# Permission is hereby granted, free of charge, to any person obtaining a # 79 +# copy of this software and associated documentation files (the "Software"), # 80 +# to deal in the Software without restriction, including without limitation # 81 +# the rights to use, copy, modify, merge, publish, distribute, distribute # 82 +# with modifications, sublicense, and/or sell copies of the Software, and to # 83 +# permit persons to whom the Software is furnished to do so, subject to the # 84 +# following conditions: # 85 +# # 86 +# The above copyright notice and this permission notice shall be included in # 87 +# all copies or substantial portions of the Software. # 88 +# # 89 +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # 90 +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # 91 +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL # 92 +# THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER # 93 +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING # 94 +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER # 95 +# DEALINGS IN THE SOFTWARE. # 96 +# # 97 +# Except as contained in this notice, the name(s) of the above copyright # 98 +# holders shall not be used in advertising or otherwise to promote the sale, # 99 +# use or other dealings in this Software without prior written # 100 +# authorization. # 101 +############################################################################## 102 # 103 +# This script returns the options to add to `gnatmake' for using AdaCurses. 104 + 105 +DESTDIR=@DESTDIR@ 106 +prefix=@prefix@ 107 +exec_prefix=@exec_prefix@ 108 +libdir=@libdir@ 109 110 -prefix="@prefix@" 111 -exec_prefix="@exec_prefix@" 112 -libdir="@libdir@" 113 +ADA_INCLUDE=@ADA_INCLUDE@ 114 +ADA_OBJECTS=@ADA_OBJECTS@ 115 116 -VERSION="@NCURSES_MAJOR@.@NCURSES_MINOR@.@NCURSES_PATCH@" 117 +VERSION=@NCURSES_MAJOR@.@NCURSES_MINOR@.@NCURSES_PATCH@ 118 119 -CFLAGS="-I$libdir/adacurses -L$libdir/adacurses" 120 -LIBS="-L$prefix/lib -lAdaCurses" 121 +CFLAGS="-I$ADA_INCLUDE -aO$ADA_OBJECTS" 122 +LIBS="-L$ADA_OBJECTS -lAdaCurses" 123 124 case "x$1" in 125 x--version) 126 @@ -26,10 +55,10 @@ 127 ;; 128 x) 129 # if no parameter is given, give what gnatmake needs 130 - echo $CFLAGS -largs $LIBS 131 + echo "$CFLAGS -i -largs $LIBS" 132 ;; 133 *) 134 - echo 'Usage: adacurses-config [--version | --cflags | --libs]' >&2 135 + echo 'Usage: adacurses@DFT_ARG_SUFFIX@-config [--version | --cflags | --libs]' >&2 136 exit 1 137 ;; 138 esac 9 139 diff -Naur ncurses-5.7.orig/Ada95/samples/Makefile.in ncurses-5.7/Ada95/samples/Makefile.in 10 140 --- ncurses-5.7.orig/Ada95/samples/Makefile.in 2006-12-17 08:45:02.000000000 -0800 11 +++ ncurses-5.7/Ada95/samples/Makefile.in 2009-01- 08 19:48:08.000000000 -0800141 +++ ncurses-5.7/Ada95/samples/Makefile.in 2009-01-18 23:56:40.000000000 -0800 12 142 @@ -1,5 +1,5 @@ 13 143 ############################################################################## 14 144 -# Copyright (c) 1998-2004,2005 Free Software Foundation, Inc. # 15 +# Copyright (c) 1998-200 5,2008Free Software Foundation, Inc. #145 +# Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. # 16 146 # # 17 147 # Permission is hereby granted, free of charge, to any person obtaining a # … … 22 152 # 23 153 -# $Id: Makefile.in,v 1.34 2006/12/17 16:45:02 tom Exp $ 24 +# $Id: Makefile.in,v 1.3 5 2008/11/23 00:17:20 juergenExp $154 +# $Id: Makefile.in,v 1.36 2009/01/11 01:11:54 tom Exp $ 25 155 # 26 156 .SUFFIXES: 27 157 158 @@ -88,8 +88,8 @@ 159 160 CARGS =-cargs $(ADAFLAGS) 161 LARGS =-largs @TEST_ARG2@ $(LD_FLAGS) -lAdaCurses 162 - 163 -PROGS = tour rain ncurses 164 + 165 +PROGS = tour rain ncurses 166 167 TOUR_OBJS = tour.o sample.o sample-curses_demo.o sample-explanation.o \ 168 sample-form_demo.o sample-function_key_setting.o \ 28 169 @@ -145,7 +145,7 @@ 29 170 … … 37 178 diff -Naur ncurses-5.7.orig/Ada95/src/Makefile.in ncurses-5.7/Ada95/src/Makefile.in 38 179 --- ncurses-5.7.orig/Ada95/src/Makefile.in 2007-09-15 11:22:24.000000000 -0700 39 +++ ncurses-5.7/Ada95/src/Makefile.in 2009-01- 08 19:48:29.000000000 -0800180 +++ ncurses-5.7/Ada95/src/Makefile.in 2009-01-18 23:56:40.000000000 -0800 40 181 @@ -1,5 +1,5 @@ 41 182 ############################################################################## … … 50 191 # 51 192 -# $Id: Makefile.in,v 1.31 2007/09/15 18:22:24 tom Exp $ 52 +# $Id: Makefile.in,v 1.3 2 2009/01/03 19:12:01tom Exp $193 +# $Id: Makefile.in,v 1.34 2009/01/11 01:11:44 tom Exp $ 53 194 # 54 195 .SUFFIXES: 55 196 56 @@ -46,7 +46,7 @@ 57 INSTALL_DATA = @INSTALL_DATA@ 197 @@ -36,17 +36,22 @@ 198 THIS = Makefile 199 200 MODEL = ../../@DFT_OBJ_SUBDIR@ 201 + 202 DESTDIR = @DESTDIR@ 203 + 204 +top_srcdir = @top_srcdir@ 205 srcdir = @srcdir@ 206 prefix = @prefix@ 207 exec_prefix = @exec_prefix@ 208 -ADA_INCLUDE = @ADA_INCLUDE@ 209 + 210 +ADA_INCLUDE = $(DESTDIR)@ADA_INCLUDE@ 211 +ADA_OBJECTS = $(DESTDIR)@ADA_OBJECTS@ 212 213 INSTALL = @INSTALL@ 214 -INSTALL_DATA = @INSTALL_DATA@ 215 +INSTALL_LIB = @INSTALL@ @INSTALL_LIB@ 58 216 59 217 AR = @AR@ … … 63 221 LN_S = @LN_S@ 64 222 65 @@ -168,7 +168,7 @@ 223 @@ -75,11 +80,12 @@ 224 ADAFLAGS = @ADAFLAGS@ -I. -I$(srcdir) 225 226 ADAMAKE = @cf_ada_make@ 227 -ADAMAKEFLAGS = 228 +ADAMAKEFLAGS = 229 230 CARGS = -cargs $(ADAFLAGS) 231 LARGS = 232 233 +LIBRARY_FILE = libAdaCurses.a 234 ALIB = @cf_ada_package@ 235 ABASE = $(ALIB)-curses 236 237 @@ -164,21 +170,25 @@ 238 $(ABASE)-text_io-complex_io.o 239 240 241 -all :: libAdaCurses.a 242 +all :: $(LIBRARY_FILE) 66 243 @echo done 67 244 68 245 -libAdaCurses.a :: dotouch $(LIBOBJS) @cf_generic_objects@ 69 246 - $(AR) $(AR_OPTS) $@ $(LIBOBJS) @cf_generic_objects@ 247 - 248 -dotouch : 249 - @sh -c 'for f in $(LIBALIS) $(GENALIS); do test -f $$f || touch $$f; done' 250 +$(LIBRARY_FILE) :: $(LIBOBJS) @cf_generic_objects@ 70 251 + $(AR) $(ARFLAGS) $@ $(LIBOBJS) @cf_generic_objects@ 71 252 72 dotouch : 73 @sh -c 'for f in $(LIBALIS) $(GENALIS); do test -f $$f || touch $$f; done' 253 sources : 254 @echo made $@ 255 256 libs \ 257 install \ 258 -install.libs \ 259 +install.libs :: $(LIBRARY_FILE) 260 + @echo made $(LIBRARY_FILE) 261 + 262 +install \ 263 +install.libs :: $(LIBRARY_FILE) 264 + @$(top_srcdir)/tar-copy.sh $(LIBRARY_FILE) . $(ADA_OBJECTS) 265 + @echo made $@ 266 + 267 uninstall \ 268 uninstall.libs :: 269 @echo made $@ 74 270 diff -Naur ncurses-5.7.orig/Ada95/src/terminal_interface-curses-mouse.adb ncurses-5.7/Ada95/src/terminal_interface-curses-mouse.adb 75 271 --- ncurses-5.7.orig/Ada95/src/terminal_interface-curses-mouse.adb 2008-07-26 11:51:11.000000000 -0700 76 +++ ncurses-5.7/Ada95/src/terminal_interface-curses-mouse.adb 2009-01- 08 19:48:08.000000000 -0800272 +++ ncurses-5.7/Ada95/src/terminal_interface-curses-mouse.adb 2009-01-18 23:56:21.000000000 -0800 77 273 @@ -35,8 +35,8 @@ 78 274 ------------------------------------------------------------------------------ … … 97 293 diff -Naur ncurses-5.7.orig/INSTALL ncurses-5.7/INSTALL 98 294 --- ncurses-5.7.orig/INSTALL 2008-11-02 13:13:51.000000000 -0800 99 +++ ncurses-5.7/INSTALL 2009-01- 08 19:48:29.000000000 -0800295 +++ ncurses-5.7/INSTALL 2009-01-18 23:56:34.000000000 -0800 100 296 @@ -1,5 +1,5 @@ 101 297 ------------------------------------------------------------------------------- … … 148 344 diff -Naur ncurses-5.7.orig/MANIFEST ncurses-5.7/MANIFEST 149 345 --- ncurses-5.7.orig/MANIFEST 2008-10-25 16:47:24.000000000 -0700 150 +++ ncurses-5.7/MANIFEST 2009-01- 08 19:48:29.000000000 -0800346 +++ ncurses-5.7/MANIFEST 2009-01-18 23:56:34.000000000 -0800 151 347 @@ -640,6 +640,7 @@ 152 348 ./man/ncurses.3x … … 191 387 diff -Naur ncurses-5.7.orig/NEWS ncurses-5.7/NEWS 192 388 --- ncurses-5.7.orig/NEWS 2008-11-01 17:56:22.000000000 -0700 193 +++ ncurses-5.7/NEWS 2009-01- 08 19:48:34.000000000 -0800389 +++ ncurses-5.7/NEWS 2009-01-18 23:56:41.000000000 -0800 194 390 @@ -1,5 +1,5 @@ 195 391 ------------------------------------------------------------------------------- … … 204 400 ------------------------------------------------------------------------------- 205 401 --- $Id: NEWS,v 1.1320 2008/11/02 00:56:22 tom Exp $ 206 +-- $Id: NEWS,v 1.135 3 2009/01/06 00:26:35tom Exp $402 +-- $Id: NEWS,v 1.1358 2009/01/17 23:54:20 tom Exp $ 207 403 ------------------------------------------------------------------------------- 208 404 209 405 This is a log of changes that ncurses has gone through since Zeyd started 210 @@ -45,6 +45,1 05 @@406 @@ -45,6 +45,125 @@ 211 407 Changes through 1.9.9e did not credit all contributions; 212 408 it is not possible to add this information. 213 409 410 +20090117 411 + + add -shared option to MK_SHARED_LIB when -Bsharable is used, for 412 + *BSD's, without which "main" might be one of the shared library's 413 + dependencies (report/analysis by Ken Dickey). 414 + + modify waddch_literal(), updating line-pointer after a multicolumn 415 + character is found to not fit on the current row, and wrapping is 416 + done. Since the line-pointer was not updated, the wrapped 417 + multicolumn character was written to the beginning of the current row 418 + (cf: 20041023, reported by "Nick" regarding problem with ncmpc 419 + http://musicpd.org/mantis/bug_view_page.php?bug_id=1930). 420 + 421 +20090110 422 + + add screen.Eterm terminfo entry (GenToo #124887) -TD 423 + + modify adacurses-config to look for ".ali" files in the adalib 424 + directory. 425 + + correct install for Ada95, which omitted libAdaCurses.a used in 426 + adacurses-config 427 + + change install for adacurses-config to provide additional flavors 428 + such as adacursesw-config, for ncursesw (GenToo #167849). 429 + 214 430 +20090105 215 431 + + remove undeveloped feature in ncurses-config.in for setting … … 316 532 diff -Naur ncurses-5.7.orig/TO-DO ncurses-5.7/TO-DO 317 533 --- ncurses-5.7.orig/TO-DO 2008-10-11 12:22:27.000000000 -0700 318 +++ ncurses-5.7/TO-DO 2009-01- 08 19:48:12.000000000 -0800534 +++ ncurses-5.7/TO-DO 2009-01-18 23:56:23.000000000 -0800 319 535 @@ -25,7 +25,7 @@ 320 536 -- sale, use or other dealings in this Software without prior written -- … … 394 610 diff -Naur ncurses-5.7.orig/aclocal.m4 ncurses-5.7/aclocal.m4 395 611 --- ncurses-5.7.orig/aclocal.m4 2008-10-25 15:15:32.000000000 -0700 396 +++ ncurses-5.7/aclocal.m4 2009-01- 08 19:48:29.000000000 -0800612 +++ ncurses-5.7/aclocal.m4 2009-01-18 23:56:41.000000000 -0800 397 613 @@ -1,5 +1,5 @@ 398 614 dnl*************************************************************************** … … 407 623 dnl 408 624 -dnl $Id: aclocal.m4,v 1.470 2008/10/25 22:15:32 tom Exp $ 409 +dnl $Id: aclocal.m4,v 1.48 1 2009/01/04 00:11:12tom Exp $625 +dnl $Id: aclocal.m4,v 1.482 2009/01/17 21:10:05 tom Exp $ 410 626 dnl Macros used in NCURSES auto-configuration script. 411 627 dnl … … 865 1081 dnl --------------------------------------------------------------------------- 866 1082 -dnl CF_SHARED_OPTS version: 53 updated: 2008/10/25 18:14:20 867 +dnl CF_SHARED_OPTS version: 5 6 updated: 2009/01/03 19:10:381083 +dnl CF_SHARED_OPTS version: 57 updated: 2009/01/17 16:10:05 868 1084 dnl -------------- 869 1085 dnl -------------- … … 921 1137 fi 922 1138 CF_SHARED_SONAME 923 @@ -4306, 7 +4445,7@@1139 @@ -4306,12 +4445,12 @@ 924 1140 LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" 925 1141 fi … … 930 1146 fi 931 1147 CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC" 932 @@ -4323,7 +4462,7 @@ 1148 CF_SHARED_SONAME 1149 - MK_SHARED_LIB='${CC} ${CFLAGS} -Wl,-Bshareable,-soname,'$cf_cv_shared_soname',-stats,-lc -o $[@]' 1150 + MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-Bshareable,-soname,'$cf_cv_shared_soname',-stats,-lc -o $[@]' 1151 ;; 1152 nto-qnx*|openbsd*|freebsd[[12]].*) 1153 CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC" 1154 @@ -4323,15 +4462,15 @@ 933 1155 if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_ld_rpath" = yes ; then 934 1156 LOCAL_LDFLAGS="-rpath \$(LOCAL_LIBDIR)" … … 939 1161 fi 940 1162 CF_SHARED_SONAME 941 @@ -4331,7 +4470,7 @@ 1163 - MK_SHARED_LIB='${LD} -Bshareable -soname=`basename $[@]` -o $[@]' 1164 + MK_SHARED_LIB='${LD} -shared -Bshareable -soname=`basename $[@]` -o $[@]' 942 1165 ;; 943 1166 netbsd*) … … 948 1171 LOCAL_LDFLAGS="-Wl,-rpath,\$(LOCAL_LIBDIR)" 949 1172 LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" 1173 @@ -4346,7 +4485,7 @@ 1174 CF_SHARED_SONAME 1175 MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname' -o $[@]' 1176 else 1177 - MK_SHARED_LIB='${LD} -Bshareable -o $[@]' 1178 + MK_SHARED_LIB='${LD} -shared -Bshareable -o $[@]' 1179 fi 1180 ;; 1181 osf*|mls+*) 950 1182 @@ -4365,7 +4504,7 @@ 951 1183 LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" … … 1136 1368 diff -Naur ncurses-5.7.orig/c++/Makefile.in ncurses-5.7/c++/Makefile.in 1137 1369 --- ncurses-5.7.orig/c++/Makefile.in 2007-04-28 08:29:12.000000000 -0700 1138 +++ ncurses-5.7/c++/Makefile.in 2009-01- 08 19:48:29.000000000 -08001370 +++ ncurses-5.7/c++/Makefile.in 2009-01-18 23:56:34.000000000 -0800 1139 1371 @@ -1,6 +1,6 @@ 1140 1372 -# $Id: Makefile.in,v 1.84 2007/04/28 15:29:12 tom Exp $ … … 1170 1402 diff -Naur ncurses-5.7.orig/c++/cursesw.cc ncurses-5.7/c++/cursesw.cc 1171 1403 --- ncurses-5.7.orig/c++/cursesw.cc 2007-12-15 15:01:57.000000000 -0800 1172 +++ ncurses-5.7/c++/cursesw.cc 2009-01- 08 19:48:09.000000000 -08001404 +++ ncurses-5.7/c++/cursesw.cc 2009-01-18 23:56:21.000000000 -0800 1173 1405 @@ -1,6 +1,6 @@ 1174 1406 // * this is for making emacs happy: -*-Mode: C++;-*- … … 1207 1439 diff -Naur ncurses-5.7.orig/config.guess ncurses-5.7/config.guess 1208 1440 --- ncurses-5.7.orig/config.guess 2008-08-30 13:25:07.000000000 -0700 1209 +++ ncurses-5.7/config.guess 2009-01- 08 19:48:29.000000000 -08001441 +++ ncurses-5.7/config.guess 2009-01-18 23:56:34.000000000 -0800 1210 1442 @@ -4,7 +4,7 @@ 1211 1443 # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 … … 1277 1509 diff -Naur ncurses-5.7.orig/config.sub ncurses-5.7/config.sub 1278 1510 --- ncurses-5.7.orig/config.sub 2008-08-30 13:25:02.000000000 -0700 1279 +++ ncurses-5.7/config.sub 2009-01- 08 19:48:29.000000000 -08001511 +++ ncurses-5.7/config.sub 2009-01-18 23:56:34.000000000 -0800 1280 1512 @@ -4,7 +4,7 @@ 1281 1513 # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 … … 1361 1593 diff -Naur ncurses-5.7.orig/configure ncurses-5.7/configure 1362 1594 --- ncurses-5.7.orig/configure 2008-10-25 17:04:38.000000000 -0700 1363 +++ ncurses-5.7/configure 2009-01- 08 19:48:34.000000000 -08001595 +++ ncurses-5.7/configure 2009-01-18 23:56:41.000000000 -0800 1364 1596 @@ -1,7 +1,7 @@ 1365 1597 #! /bin/sh 1366 1598 -# From configure.in Revision: 1.454 . 1367 +# From configure.in Revision: 1.46 3.1599 +# From configure.in Revision: 1.464 . 1368 1600 # Guess values for system-dependent variables and create Makefiles. 1369 1601 -# Generated by Autoconf 2.52.20080325. … … 4752 4984 fi 4753 4985 CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC" 4986 @@ -5143,7 +5393,7 @@ 4987 cf_cv_shared_soname='`basename $@`' 4988 fi 4989 4990 - MK_SHARED_LIB='${CC} ${CFLAGS} -Wl,-Bshareable,-soname,'$cf_cv_shared_soname',-stats,-lc -o $@' 4991 + MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-Bshareable,-soname,'$cf_cv_shared_soname',-stats,-lc -o $@' 4992 ;; 4993 nto-qnx*|openbsd*|freebsd[12].*) 4994 CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC" 4754 4995 @@ -5155,7 +5405,7 @@ 4755 4996 if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_ld_rpath" = yes ; then … … 4761 5002 fi 4762 5003 4763 @@ -5170,7 +5420,7 @@ 5004 @@ -5166,11 +5416,11 @@ 5005 cf_cv_shared_soname='`basename $@`' 5006 fi 5007 5008 - MK_SHARED_LIB='${LD} -Bshareable -soname=`basename $@` -o $@' 5009 + MK_SHARED_LIB='${LD} -shared -Bshareable -soname=`basename $@` -o $@' 4764 5010 ;; 4765 5011 netbsd*) … … 4770 5016 LOCAL_LDFLAGS="-Wl,-rpath,\$(LOCAL_LIBDIR)" 4771 5017 LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" 5018 @@ -5192,7 +5442,7 @@ 5019 5020 MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname' -o $@' 5021 else 5022 - MK_SHARED_LIB='${LD} -Bshareable -o $@' 5023 + MK_SHARED_LIB='${LD} -shared -Bshareable -o $@' 5024 fi 5025 ;; 5026 osf*|mls+*) 4772 5027 @@ -5211,7 +5461,7 @@ 4773 5028 LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" … … 12578 12833 12579 12834 SUB_MAKEFILES= 12580 @@ -16639,1 0 +16999,10@@12835 @@ -16639,15 +16999,15 @@ 12581 12836 done 12582 12837 … … 12593 12848 fi 12594 12849 12850 if test "$cf_with_ada" != "no" && test "$cf_cv_prog_gnat_correct" != "no"; then 12851 - SUB_MAKEFILES="$SUB_MAKEFILES Ada95/gen/adacurses-config" 12852 + SUB_MAKEFILES="$SUB_MAKEFILES Ada95/gen/adacurses${DFT_ARG_SUFFIX}-config:Ada95/gen/adacurses-config.in" 12853 fi 12854 12855 DIRS_TO_MAKE="lib" 12595 12856 @@ -16760,18 +17120,18 @@ 12596 12857 ### If we're building with rpath, try to link non-standard libs that way too. … … 13017 13278 diff -Naur ncurses-5.7.orig/configure.in ncurses-5.7/configure.in 13018 13279 --- ncurses-5.7.orig/configure.in 2008-10-18 07:53:32.000000000 -0700 13019 +++ ncurses-5.7/configure.in 2009-01- 08 19:48:34.000000000 -080013280 +++ ncurses-5.7/configure.in 2009-01-18 23:56:40.000000000 -0800 13020 13281 @@ -1,5 +1,5 @@ 13021 13282 dnl*************************************************************************** … … 13030 13291 dnl 13031 13292 -dnl $Id: configure.in,v 1.454 2008/10/18 14:53:32 tom Exp $ 13032 +dnl $Id: configure.in,v 1.46 3 2009/01/06 01:40:09tom Exp $13293 +dnl $Id: configure.in,v 1.464 2009/01/10 19:18:03 tom Exp $ 13033 13294 dnl Process this file with autoconf to produce a configure script. 13034 13295 dnl … … 13038 13299 AC_PREREQ(2.13.20020210) 13039 13300 -AC_REVISION($Revision: 1.454 $) 13040 +AC_REVISION($Revision: 1.46 3$)13301 +AC_REVISION($Revision: 1.464 $) 13041 13302 AC_INIT(ncurses/base/lib_initscr.c) 13042 13303 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin) … … 13159 13420 AC_SUBST(WITH_OVERWRITE) 13160 13421 AC_SUBST(TICS_LIST) 13422 @@ -1742,7 +1778,7 @@ 13423 CF_SRC_MODULES($modules_to_build) 13424 13425 if test "$cf_with_ada" != "no" && test "$cf_cv_prog_gnat_correct" != "no"; then 13426 - SUB_MAKEFILES="$SUB_MAKEFILES Ada95/gen/adacurses-config" 13427 + SUB_MAKEFILES="$SUB_MAKEFILES Ada95/gen/adacurses${DFT_ARG_SUFFIX}-config:Ada95/gen/adacurses-config.in" 13428 fi 13429 13430 CF_DIRS_TO_MAKE 13161 13431 @@ -1765,8 +1801,19 @@ 13162 13432 CF_SUBST_IF(["$ac_cv_header_termios_h" = yes], HAVE_TERMIOS_H, 1, 0) … … 13207 13477 diff -Naur ncurses-5.7.orig/dist.mk ncurses-5.7/dist.mk 13208 13478 --- ncurses-5.7.orig/dist.mk 2008-11-01 17:58:38.000000000 -0700 13209 +++ ncurses-5.7/dist.mk 2009-01- 08 19:48:34.000000000 -080013479 +++ ncurses-5.7/dist.mk 2009-01-18 23:56:41.000000000 -0800 13210 13480 @@ -25,7 +25,7 @@ 13211 13481 # use or other dealings in this Software without prior written # … … 13213 13483 ############################################################################## 13214 13484 -# $Id: dist.mk,v 1.671 2008/11/02 00:58:38 tom Exp $ 13215 +# $Id: dist.mk,v 1.68 1 2009/01/05 23:52:40tom Exp $13485 +# $Id: dist.mk,v 1.683 2009/01/17 16:29:15 tom Exp $ 13216 13486 # Makefile for creating ncurses distributions. 13217 13487 # … … 13222 13492 NCURSES_MINOR = 7 13223 13493 -NCURSES_PATCH = 20081102 13224 +NCURSES_PATCH = 200901 0513494 +NCURSES_PATCH = 20090117 13225 13495 13226 13496 # We don't append the patch to the version, since this only applies to releases … … 13228 13498 diff -Naur ncurses-5.7.orig/form/Makefile.in ncurses-5.7/form/Makefile.in 13229 13499 --- ncurses-5.7.orig/form/Makefile.in 2007-04-28 07:56:11.000000000 -0700 13230 +++ ncurses-5.7/form/Makefile.in 2009-01- 08 19:48:30.000000000 -080013500 +++ ncurses-5.7/form/Makefile.in 2009-01-18 23:56:35.000000000 -0800 13231 13501 @@ -1,6 +1,6 @@ 13232 13502 -# $Id: Makefile.in,v 1.47 2007/04/28 14:56:11 tom Exp $ … … 13249 13519 diff -Naur ncurses-5.7.orig/form/frm_driver.c ncurses-5.7/form/frm_driver.c 13250 13520 --- ncurses-5.7.orig/form/frm_driver.c 2008-10-18 09:25:00.000000000 -0700 13251 +++ ncurses-5.7/form/frm_driver.c 2009-01- 08 19:48:14.000000000 -080013521 +++ ncurses-5.7/form/frm_driver.c 2009-01-18 23:56:25.000000000 -0800 13252 13522 @@ -32,7 +32,7 @@ 13253 13523 … … 13269 13539 diff -Naur ncurses-5.7.orig/include/curses.h.in ncurses-5.7/include/curses.h.in 13270 13540 --- ncurses-5.7.orig/include/curses.h.in 2008-08-30 13:11:29.000000000 -0700 13271 +++ ncurses-5.7/include/curses.h.in 2009-01- 08 19:48:22.000000000 -080013541 +++ ncurses-5.7/include/curses.h.in 2009-01-18 23:56:29.000000000 -0800 13272 13542 @@ -32,7 +32,7 @@ 13273 13543 * and: Thomas E. Dickey 1996-on * … … 13325 13595 diff -Naur ncurses-5.7.orig/include/curses.tail ncurses-5.7/include/curses.tail 13326 13596 --- ncurses-5.7.orig/include/curses.tail 2008-07-05 13:20:38.000000000 -0700 13327 +++ ncurses-5.7/include/curses.tail 2009-01- 08 19:48:09.000000000 -080013597 +++ ncurses-5.7/include/curses.tail 2009-01-18 23:56:21.000000000 -0800 13328 13598 @@ -1,4 +1,4 @@ 13329 13599 -/* $Id: curses.tail,v 1.16 2008/07/05 20:20:38 tom Exp $ */ … … 13342 13612 diff -Naur ncurses-5.7.orig/include/curses.wide ncurses-5.7/include/curses.wide 13343 13613 --- ncurses-5.7.orig/include/curses.wide 2007-03-10 09:52:23.000000000 -0800 13344 +++ ncurses-5.7/include/curses.wide 2009-01- 08 19:48:12.000000000 -080013614 +++ ncurses-5.7/include/curses.wide 2009-01-18 23:56:23.000000000 -0800 13345 13615 @@ -1,9 +1,11 @@ 13346 13616 -/* $Id: curses.wide,v 1.34 2007/03/10 17:52:23 tom Exp $ */ … … 13358 13628 diff -Naur ncurses-5.7.orig/man/curs_mouse.3x ncurses-5.7/man/curs_mouse.3x 13359 13629 --- ncurses-5.7.orig/man/curs_mouse.3x 2006-12-30 15:43:34.000000000 -0800 13360 +++ ncurses-5.7/man/curs_mouse.3x 2009-01- 08 19:48:09.000000000 -080013630 +++ ncurses-5.7/man/curs_mouse.3x 2009-01-18 23:56:21.000000000 -0800 13361 13631 @@ -1,6 +1,6 @@ 13362 13632 '\" t … … 13404 13674 diff -Naur ncurses-5.7.orig/man/keybound.3x ncurses-5.7/man/keybound.3x 13405 13675 --- ncurses-5.7.orig/man/keybound.3x 2006-02-25 13:47:06.000000000 -0800 13406 +++ ncurses-5.7/man/keybound.3x 2009-01- 08 19:48:18.000000000 -080013676 +++ ncurses-5.7/man/keybound.3x 2009-01-18 23:56:27.000000000 -0800 13407 13677 @@ -1,5 +1,5 @@ 13408 13678 .\"*************************************************************************** … … 13425 13695 diff -Naur ncurses-5.7.orig/man/tabs.1 ncurses-5.7/man/tabs.1 13426 13696 --- ncurses-5.7.orig/man/tabs.1 1969-12-31 16:00:00.000000000 -0800 13427 +++ ncurses-5.7/man/tabs.1 2009-01- 08 19:48:01.000000000 -080013697 +++ ncurses-5.7/man/tabs.1 2009-01-18 23:56:19.000000000 -0800 13428 13698 @@ -0,0 +1,143 @@ 13429 13699 +.\"*************************************************************************** … … 13572 13842 diff -Naur ncurses-5.7.orig/man/tset.1 ncurses-5.7/man/tset.1 13573 13843 --- ncurses-5.7.orig/man/tset.1 2006-12-24 07:00:30.000000000 -0800 13574 +++ ncurses-5.7/man/tset.1 2009-01- 08 19:48:01.000000000 -080013844 +++ ncurses-5.7/man/tset.1 2009-01-18 23:56:19.000000000 -0800 13575 13845 @@ -1,5 +1,5 @@ 13576 13846 .\"*************************************************************************** … … 13593 13863 diff -Naur ncurses-5.7.orig/menu/Makefile.in ncurses-5.7/menu/Makefile.in 13594 13864 --- ncurses-5.7.orig/menu/Makefile.in 2007-04-28 07:56:11.000000000 -0700 13595 +++ ncurses-5.7/menu/Makefile.in 2009-01- 08 19:48:30.000000000 -080013865 +++ ncurses-5.7/menu/Makefile.in 2009-01-18 23:56:35.000000000 -0800 13596 13866 @@ -1,6 +1,6 @@ 13597 13867 -# $Id: Makefile.in,v 1.48 2007/04/28 14:56:11 tom Exp $ … … 13614 13884 diff -Naur ncurses-5.7.orig/misc/Makefile.in ncurses-5.7/misc/Makefile.in 13615 13885 --- ncurses-5.7.orig/misc/Makefile.in 2007-03-31 08:54:17.000000000 -0700 13616 +++ ncurses-5.7/misc/Makefile.in 2009-01- 08 19:48:30.000000000 -080013886 +++ ncurses-5.7/misc/Makefile.in 2009-01-18 23:56:35.000000000 -0800 13617 13887 @@ -1,6 +1,6 @@ 13618 13888 -# $Id: Makefile.in,v 1.43 2007/03/31 15:54:17 tom Exp $ … … 13679 13949 diff -Naur ncurses-5.7.orig/misc/gen-pkgconfig.in ncurses-5.7/misc/gen-pkgconfig.in 13680 13950 --- ncurses-5.7.orig/misc/gen-pkgconfig.in 1969-12-31 16:00:00.000000000 -0800 13681 +++ ncurses-5.7/misc/gen-pkgconfig.in 2009-01- 08 19:48:32.000000000 -080013951 +++ ncurses-5.7/misc/gen-pkgconfig.in 2009-01-18 23:56:36.000000000 -0800 13682 13952 @@ -0,0 +1,119 @@ 13683 13953 +#!@SHELL@ … … 13802 14072 diff -Naur ncurses-5.7.orig/misc/ncurses-config.in ncurses-5.7/misc/ncurses-config.in 13803 14073 --- ncurses-5.7.orig/misc/ncurses-config.in 2007-03-17 13:02:19.000000000 -0700 13804 +++ ncurses-5.7/misc/ncurses-config.in 2009-01- 08 19:48:34.000000000 -080014074 +++ ncurses-5.7/misc/ncurses-config.in 2009-01-18 23:56:38.000000000 -0800 13805 14075 @@ -1,7 +1,7 @@ 13806 14076 #!@SHELL@ … … 13929 14199 diff -Naur ncurses-5.7.orig/misc/terminfo.src ncurses-5.7/misc/terminfo.src 13930 14200 --- ncurses-5.7.orig/misc/terminfo.src 2008-10-12 16:03:54.000000000 -0700 13931 +++ ncurses-5.7/misc/terminfo.src 2009-01- 08 19:48:12.000000000 -080014201 +++ ncurses-5.7/misc/terminfo.src 2009-01-18 23:56:40.000000000 -0800 13932 14202 @@ -6,8 +6,8 @@ 13933 14203 # Report bugs and new terminal descriptions to … … 13936 14206 -# $Revision: 1.341 $ 13937 14207 -# $Date: 2008/10/12 23:03:54 $ 13938 +# $Revision: 1.34 3$13939 +# $Date: 200 8/11/29 15:27:35$14208 +# $Revision: 1.345 $ 14209 +# $Date: 2009/01/11 00:47:37 $ 13940 14210 # 13941 14211 # The original header is preserved below for reference. It is noted that there … … 14013 14283 # Michael Schroeder, Oliver Laumann. The screen and 14014 14284 # screen-w entries came with version 3.7.1. The screen2 and screen3 entries 14015 @@ -5247,7 +5267,7 @@ 14285 @@ -4497,6 +4517,8 @@ 14286 cvvis@, flash@, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, 14287 kcuu1=\EOA, use=screen+fkeys, use=vt100+enq, 14288 use=rxvt+pcfkeys, use=vt220+keypad, use=screen, 14289 +screen.Eterm|screen in Eterm, 14290 + use=screen+fkeys, use=Eterm, 14291 # fix the backspace key 14292 screen.linux|screen in linux console, 14293 bw, 14294 @@ -5247,7 +5269,7 @@ 14016 14295 setab=\E[4%p1%dm, setaf=\E[3%p1%dm, 14017 14296 sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;12%;m, … … 14022 14301 # Key definitions: 14023 14302 # The encodings for unshifted arrow keys, F1-F12, Home, Insert, etc. match the 14024 @@ -11060,7 +1108 0,7 @@14303 @@ -11060,7 +11082,7 @@ 14025 14304 sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;%;m, 14026 14305 sgr0=\E[m, … … 14031 14310 14032 14311 aaa+rv|ann arbor ambassador in reverse video, 14033 @@ -12147,7 +1216 7,7 @@14312 @@ -12147,7 +12169,7 @@ 14034 14313 sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;%;m, 14035 14314 sgr0=\E[m, smacs=\017$<1>, smcup=\E[=4l\E[1;24w\E2\r, … … 14040 14319 flash=\E[=205l$<200>\E[=205h, is1=\E[=103l\E[=205h, 14041 14320 use=avt-ns, 14042 @@ -14584,7 +1460 4,7 @@14321 @@ -14584,7 +14606,7 @@ 14043 14322 sc=\E[%y, 14044 14323 sgr=\E[%{0}%?%p1%p3%|%t%{7}%+%;%?%p2%t%{2}%+%;%?%p4%t%{5}%+%;%?%p6%t%{1}%+%;m%?%p8%t\E[%{32}%+%d%%{%;%?%p9%t\016%e\017%;, … … 14049 14328 # p9-w: Prism-9 in 132 column mode 14050 14329 # -------------------------------- 14051 @@ -16037,7 +1605 7,7 @@14330 @@ -16037,7 +16059,7 @@ 14052 14331 rep=%p1%c\E[%p2%{1}%-%db, rev=\E[7m, rmam=\E[?7l, 14053 14332 rmso=\E[m, rmul=\E[m, … … 14058 14337 # The tek4125 emulates a vt100 incorrectly - the scrolling region 14059 14338 # command is ignored. The following entry replaces <csr> with the needed 14060 @@ -17729,7 +177 49,7 @@14339 @@ -17729,7 +17751,7 @@ 14061 14340 rmul=\E[m, rs2=\E[?=h\Ec, s0ds=^O, s1ds=^N, 14062 14341 sgr=\E[0%?%p1%p3%|%t;7%;%?%p2%t;4%;%?%p4%t;5%;%?%p5%t;2%;%?%p7%t;8%;m%?%p9%t\016%e\017%;, … … 14067 14346 tws2102-sna|dku7102-sna|BULL Questar tws2102 for SNA, 14068 14347 dsl=\E[0;98v\E[2J\E[v, fsl=\E[v, is3=\Eb, tsl=\E[0;98v, 14069 @@ -21791,6 +2181 1,13@@14348 @@ -21791,6 +21813,16 @@ 14070 14349 # * add "aterm" -TD 14071 14350 # * add "linux2.6.26" -TD … … 14078 14357 +# * add eterm-color -TD 14079 14358 +# 14359 +# 2009-01-10 14360 +# * add screen.Eterm -TD 14361 +# 14080 14362 # The following sets edit modes for GNU EMACS. 14081 14363 # Local Variables: … … 14083 14365 diff -Naur ncurses-5.7.orig/mk-1st.awk ncurses-5.7/mk-1st.awk 14084 14366 --- ncurses-5.7.orig/mk-1st.awk 2007-03-24 15:10:55.000000000 -0700 14085 +++ ncurses-5.7/mk-1st.awk 2009-01- 08 19:48:32.000000000 -080014367 +++ ncurses-5.7/mk-1st.awk 2009-01-18 23:56:36.000000000 -0800 14086 14368 @@ -1,6 +1,6 @@ 14087 14369 -# $Id: mk-1st.awk,v 1.78 2007/03/24 22:10:55 tom Exp $ … … 14113 14395 diff -Naur ncurses-5.7.orig/ncurses/Makefile.in ncurses-5.7/ncurses/Makefile.in 14114 14396 --- ncurses-5.7.orig/ncurses/Makefile.in 2008-10-18 07:11:54.000000000 -0700 14115 +++ ncurses-5.7/ncurses/Makefile.in 2009-01- 08 19:48:30.000000000 -080014397 +++ ncurses-5.7/ncurses/Makefile.in 2009-01-18 23:56:35.000000000 -0800 14116 14398 @@ -1,6 +1,6 @@ 14117 14399 -# $Id: Makefile.in,v 1.113 2008/10/18 14:11:54 tom Exp $ … … 14134 14416 diff -Naur ncurses-5.7.orig/ncurses/base/lib_addch.c ncurses-5.7/ncurses/base/lib_addch.c 14135 14417 --- ncurses-5.7.orig/ncurses/base/lib_addch.c 2008-08-16 12:20:04.000000000 -0700 14136 +++ ncurses-5.7/ncurses/base/lib_addch.c 2009-01-08 19:48:12.000000000 -0800 14418 +++ ncurses-5.7/ncurses/base/lib_addch.c 2009-01-18 23:56:41.000000000 -0800 14419 @@ -1,5 +1,5 @@ 14420 /**************************************************************************** 14421 - * Copyright (c) 1998-2006,2008 Free Software Foundation, Inc. * 14422 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 14423 * * 14424 * Permission is hereby granted, free of charge, to any person obtaining a * 14425 * copy of this software and associated documentation files (the * 14137 14426 @@ -36,7 +36,7 @@ 14138 14427 #include <curses.priv.h> … … 14140 14429 14141 14430 -MODULE_ID("$Id: lib_addch.c,v 1.113 2008/08/16 19:20:04 tom Exp $") 14142 +MODULE_ID("$Id: lib_addch.c,v 1.11 4 2008/11/29 21:02:10tom Exp $")14431 +MODULE_ID("$Id: lib_addch.c,v 1.115 2009/01/17 20:37:32 tom Exp $") 14143 14432 14144 14433 static const NCURSES_CH_T blankchar = NewChar(BLANK_TEXT); … … 14174 14463 return OK; 14175 14464 } 14465 @@ -327,6 +337,7 @@ 14466 return ERR; 14467 x = win->_curx; 14468 y = win->_cury; 14469 + line = win->_line + y; 14470 } 14471 /* 14472 * Check for cells which are orphaned by adding this character, set 14176 14473 diff -Naur ncurses-5.7.orig/ncurses/base/lib_freeall.c ncurses-5.7/ncurses/base/lib_freeall.c 14177 14474 --- ncurses-5.7.orig/ncurses/base/lib_freeall.c 2008-09-27 06:09:57.000000000 -0700 14178 +++ ncurses-5.7/ncurses/base/lib_freeall.c 2009-01- 08 19:48:14.000000000 -080014475 +++ ncurses-5.7/ncurses/base/lib_freeall.c 2009-01-18 23:56:25.000000000 -0800 14179 14476 @@ -40,7 +40,7 @@ 14180 14477 extern int malloc_errfd; /* FIXME */ … … 14197 14494 diff -Naur ncurses-5.7.orig/ncurses/base/lib_mouse.c ncurses-5.7/ncurses/base/lib_mouse.c 14198 14495 --- ncurses-5.7.orig/ncurses/base/lib_mouse.c 2008-10-18 14:48:55.000000000 -0700 14199 +++ ncurses-5.7/ncurses/base/lib_mouse.c 2009-01- 08 19:48:15.000000000 -080014496 +++ ncurses-5.7/ncurses/base/lib_mouse.c 2009-01-18 23:56:25.000000000 -0800 14200 14497 @@ -79,7 +79,7 @@ 14201 14498 … … 14256 14553 diff -Naur ncurses-5.7.orig/ncurses/curses.priv.h ncurses-5.7/ncurses/curses.priv.h 14257 14554 --- ncurses-5.7.orig/ncurses/curses.priv.h 2008-10-04 14:37:45.000000000 -0700 14258 +++ ncurses-5.7/ncurses/curses.priv.h 2009-01- 08 19:48:09.000000000 -080014555 +++ ncurses-5.7/ncurses/curses.priv.h 2009-01-18 23:56:21.000000000 -0800 14259 14556 @@ -34,7 +34,7 @@ 14260 14557 … … 14277 14574 diff -Naur ncurses-5.7.orig/ncurses/tinfo/entries.c ncurses-5.7/ncurses/tinfo/entries.c 14278 14575 --- ncurses-5.7.orig/ncurses/tinfo/entries.c 2008-09-27 06:11:10.000000000 -0700 14279 +++ ncurses-5.7/ncurses/tinfo/entries.c 2009-01- 08 19:48:15.000000000 -080014576 +++ ncurses-5.7/ncurses/tinfo/entries.c 2009-01-18 23:56:25.000000000 -0800 14280 14577 @@ -37,7 +37,7 @@ 14281 14578 #include <tic.h> … … 14299 14596 diff -Naur ncurses-5.7.orig/ncurses/tinfo/hashed_db.c ncurses-5.7/ncurses/tinfo/hashed_db.c 14300 14597 --- ncurses-5.7.orig/ncurses/tinfo/hashed_db.c 2006-08-19 12:48:38.000000000 -0700 14301 +++ ncurses-5.7/ncurses/tinfo/hashed_db.c 2009-01- 08 19:48:18.000000000 -080014598 +++ ncurses-5.7/ncurses/tinfo/hashed_db.c 2009-01-18 23:56:27.000000000 -0800 14302 14599 @@ -1,5 +1,5 @@ 14303 14600 /**************************************************************************** … … 14405 14702 diff -Naur ncurses-5.7.orig/panel/Makefile.in ncurses-5.7/panel/Makefile.in 14406 14703 --- ncurses-5.7.orig/panel/Makefile.in 2007-04-28 07:56:11.000000000 -0700 14407 +++ ncurses-5.7/panel/Makefile.in 2009-01- 08 19:48:30.000000000 -080014704 +++ ncurses-5.7/panel/Makefile.in 2009-01-18 23:56:35.000000000 -0800 14408 14705 @@ -1,6 +1,6 @@ 14409 14706 -# $Id: Makefile.in,v 1.52 2007/04/28 14:56:11 tom Exp $ … … 14426 14723 diff -Naur ncurses-5.7.orig/progs/Makefile.in ncurses-5.7/progs/Makefile.in 14427 14724 --- ncurses-5.7.orig/progs/Makefile.in 2008-09-07 06:58:55.000000000 -0700 14428 +++ ncurses-5.7/progs/Makefile.in 2009-01- 08 19:48:01.000000000 -080014725 +++ ncurses-5.7/progs/Makefile.in 2009-01-18 23:56:19.000000000 -0800 14429 14726 @@ -1,6 +1,6 @@ 14430 14727 -# $Id: Makefile.in,v 1.79 2008/09/07 13:58:55 tom Exp $ … … 14492 14789 diff -Naur ncurses-5.7.orig/progs/modules ncurses-5.7/progs/modules 14493 14790 --- ncurses-5.7.orig/progs/modules 2006-12-23 16:53:21.000000000 -0800 14494 +++ ncurses-5.7/progs/modules 2009-01- 08 19:48:01.000000000 -080014791 +++ ncurses-5.7/progs/modules 2009-01-18 23:56:19.000000000 -0800 14495 14792 @@ -1,7 +1,7 @@ 14496 14793 -# $Id: modules,v 1.13 2006/12/24 00:53:21 tom Exp $ … … 14513 14810 diff -Naur ncurses-5.7.orig/progs/tabs.c ncurses-5.7/progs/tabs.c 14514 14811 --- ncurses-5.7.orig/progs/tabs.c 1969-12-31 16:00:00.000000000 -0800 14515 +++ ncurses-5.7/progs/tabs.c 2009-01- 08 19:48:09.000000000 -080014812 +++ ncurses-5.7/progs/tabs.c 2009-01-18 23:56:21.000000000 -0800 14516 14813 @@ -0,0 +1,506 @@ 14517 14814 +/**************************************************************************** … … 15023 15320 diff -Naur ncurses-5.7.orig/test/README ncurses-5.7/test/README 15024 15321 --- ncurses-5.7.orig/test/README 2008-10-18 14:02:45.000000000 -0700 15025 +++ ncurses-5.7/test/README 2009-01- 08 19:48:22.000000000 -080015322 +++ ncurses-5.7/test/README 2009-01-18 23:56:30.000000000 -0800 15026 15323 @@ -25,7 +25,7 @@ 15027 15324 -- sale, use or other dealings in this Software without prior written -- … … 15319 15616 diff -Naur ncurses-5.7.orig/test/clip_printw.c ncurses-5.7/test/clip_printw.c 15320 15617 --- ncurses-5.7.orig/test/clip_printw.c 1969-12-31 16:00:00.000000000 -0800 15321 +++ ncurses-5.7/test/clip_printw.c 2009-01- 08 19:48:22.000000000 -080015618 +++ ncurses-5.7/test/clip_printw.c 2009-01-18 23:56:30.000000000 -0800 15322 15619 @@ -0,0 +1,360 @@ 15323 15620 +/**************************************************************************** … … 15683 15980 diff -Naur ncurses-5.7.orig/test/demo_forms.c ncurses-5.7/test/demo_forms.c 15684 15981 --- ncurses-5.7.orig/test/demo_forms.c 2008-10-18 13:38:20.000000000 -0700 15685 +++ ncurses-5.7/test/demo_forms.c 2009-01- 08 19:48:22.000000000 -080015982 +++ ncurses-5.7/test/demo_forms.c 2009-01-18 23:56:30.000000000 -0800 15686 15983 @@ -26,7 +26,7 @@ 15687 15984 * authorization. * … … 15718 16015 diff -Naur ncurses-5.7.orig/test/edit_field.c ncurses-5.7/test/edit_field.c 15719 16016 --- ncurses-5.7.orig/test/edit_field.c 2008-10-18 13:40:20.000000000 -0700 15720 +++ ncurses-5.7/test/edit_field.c 2009-01- 08 19:48:22.000000000 -080016017 +++ ncurses-5.7/test/edit_field.c 2009-01-18 23:56:30.000000000 -0800 15721 16018 @@ -26,7 +26,7 @@ 15722 16019 * authorization. * … … 15741 16038 diff -Naur ncurses-5.7.orig/test/edit_field.h ncurses-5.7/test/edit_field.h 15742 16039 --- ncurses-5.7.orig/test/edit_field.h 2006-06-03 09:38:57.000000000 -0700 15743 +++ ncurses-5.7/test/edit_field.h 2009-01- 08 19:48:22.000000000 -080016040 +++ ncurses-5.7/test/edit_field.h 2009-01-18 23:56:30.000000000 -0800 15744 16041 @@ -1,5 +1,5 @@ 15745 16042 /**************************************************************************** … … 15771 16068 diff -Naur ncurses-5.7.orig/test/filter.c ncurses-5.7/test/filter.c 15772 16069 --- ncurses-5.7.orig/test/filter.c 2006-12-09 08:53:47.000000000 -0800 15773 +++ ncurses-5.7/test/filter.c 2009-01- 08 19:48:15.000000000 -080016070 +++ ncurses-5.7/test/filter.c 2009-01-18 23:56:25.000000000 -0800 15774 16071 @@ -1,5 +1,5 @@ 15775 16072 /**************************************************************************** … … 15843 16140 diff -Naur ncurses-5.7.orig/test/insdelln.c ncurses-5.7/test/insdelln.c 15844 16141 --- ncurses-5.7.orig/test/insdelln.c 1969-12-31 16:00:00.000000000 -0800 15845 +++ ncurses-5.7/test/insdelln.c 2009-01- 08 19:48:22.000000000 -080016142 +++ ncurses-5.7/test/insdelln.c 2009-01-18 23:56:30.000000000 -0800 15846 16143 @@ -0,0 +1,380 @@ 15847 16144 +/**************************************************************************** … … 16227 16524 diff -Naur ncurses-5.7.orig/test/modules ncurses-5.7/test/modules 16228 16525 --- ncurses-5.7.orig/test/modules 2007-08-18 10:57:08.000000000 -0700 16229 +++ ncurses-5.7/test/modules 2009-01- 08 19:48:22.000000000 -080016526 +++ ncurses-5.7/test/modules 2009-01-18 23:56:30.000000000 -0800 16230 16527 @@ -1,4 +1,4 @@ 16231 16528 -# $Id: modules,v 1.36 2007/08/18 17:57:08 tom Exp $ … … 16252 16549 diff -Naur ncurses-5.7.orig/test/ncurses.c ncurses-5.7/test/ncurses.c 16253 16550 --- ncurses-5.7.orig/test/ncurses.c 2008-09-27 07:34:58.000000000 -0700 16254 +++ ncurses-5.7/test/ncurses.c 2009-01- 08 19:48:22.000000000 -080016551 +++ ncurses-5.7/test/ncurses.c 2009-01-18 23:56:30.000000000 -0800 16255 16552 @@ -40,7 +40,7 @@ 16256 16553 Author: Eric S. Raymond <esr@snark.thyrsus.com> 1993 … … 16528 16825 diff -Naur ncurses-5.7.orig/test/programs ncurses-5.7/test/programs 16529 16826 --- ncurses-5.7.orig/test/programs 2008-08-16 14:47:39.000000000 -0700 16530 +++ ncurses-5.7/test/programs 2009-01- 08 19:48:22.000000000 -080016827 +++ ncurses-5.7/test/programs 2009-01-18 23:56:30.000000000 -0800 16531 16828 @@ -1,4 +1,4 @@ 16532 16829 -# $Id: programs,v 1.14 2008/08/16 21:47:39 tom Exp $ … … 16553 16850 diff -Naur ncurses-5.7.orig/test/test.priv.h ncurses-5.7/test/test.priv.h 16554 16851 --- ncurses-5.7.orig/test/test.priv.h 2008-10-04 14:53:41.000000000 -0700 16555 +++ ncurses-5.7/test/test.priv.h 2009-01- 08 19:48:22.000000000 -080016852 +++ ncurses-5.7/test/test.priv.h 2009-01-18 23:56:30.000000000 -0800 16556 16853 @@ -29,7 +29,7 @@ 16557 16854 /**************************************************************************** -
patches/vim-7.2-branch_update-5.patch
r39806f8b r7352c10 1 1 Submitted By: Jim Gifford (jim at cross-lfs dot org) 2 Date: 01- 08-20092 Date: 01-19-2009 3 3 Initial Package Version: 7.2 4 4 Origin: Upstream 5 5 Upstream Status: Applied 6 Description: Contains all upstream patches up to 7.2.0 796 Description: Contains all upstream patches up to 7.2.084 7 7 The following patches were skipped 8 8 007 036 041 049 071 072 074 … … 10 10 diff -Naur vim72.orig/Filelist vim72/Filelist 11 11 --- vim72.orig/Filelist 2008-07-06 11:02:23.000000000 -0700 12 +++ vim72/Filelist 2009-01- 08 20:57:31.000000000 -080012 +++ vim72/Filelist 2009-01-19 00:08:05.000000000 -0800 13 13 @@ -285,6 +285,7 @@ 14 14 src/proto/os_win32.pro \ … … 21 21 diff -Naur vim72.orig/runtime/doc/cmdline.txt vim72/runtime/doc/cmdline.txt 22 22 --- vim72.orig/runtime/doc/cmdline.txt 2008-08-09 07:22:59.000000000 -0700 23 +++ vim72/runtime/doc/cmdline.txt 2009-01- 08 20:57:32.000000000 -080023 +++ vim72/runtime/doc/cmdline.txt 2009-01-19 00:08:30.000000000 -0800 24 24 @@ -1,4 +1,4 @@ 25 25 -*cmdline.txt* For Vim version 7.2. Last change: 2008 Jul 29 … … 80 80 diff -Naur vim72.orig/runtime/doc/eval.txt vim72/runtime/doc/eval.txt 81 81 --- vim72.orig/runtime/doc/eval.txt 2008-08-09 07:22:59.000000000 -0700 82 +++ vim72/runtime/doc/eval.txt 2009-01- 08 20:57:45.000000000 -080082 +++ vim72/runtime/doc/eval.txt 2009-01-19 00:10:10.000000000 -0800 83 83 @@ -1,4 +1,4 @@ 84 84 -*eval.txt* For Vim version 7.2. Last change: 2008 Aug 09 … … 200 200 diff -Naur vim72.orig/runtime/doc/netbeans.txt vim72/runtime/doc/netbeans.txt 201 201 --- vim72.orig/runtime/doc/netbeans.txt 2008-08-09 07:22:59.000000000 -0700 202 +++ vim72/runtime/doc/netbeans.txt 2009-01- 08 20:57:54.000000000 -0800202 +++ vim72/runtime/doc/netbeans.txt 2009-01-19 00:10:45.000000000 -0800 203 203 @@ -1,4 +1,4 @@ 204 204 -*netbeans.txt* For Vim version 7.2. Last change: 2008 Jun 28 … … 222 222 diff -Naur vim72.orig/runtime/doc/options.txt vim72/runtime/doc/options.txt 223 223 --- vim72.orig/runtime/doc/options.txt 2008-08-09 07:22:59.000000000 -0700 224 +++ vim72/runtime/doc/options.txt 2009-01- 08 20:57:43.000000000 -0800224 +++ vim72/runtime/doc/options.txt 2009-01-19 00:09:28.000000000 -0800 225 225 @@ -1,4 +1,4 @@ 226 226 -*options.txt* For Vim version 7.2. Last change: 2008 Aug 06 … … 242 242 diff -Naur vim72.orig/runtime/doc/spell.txt vim72/runtime/doc/spell.txt 243 243 --- vim72.orig/runtime/doc/spell.txt 2008-08-09 07:23:00.000000000 -0700 244 +++ vim72/runtime/doc/spell.txt 2009-01- 08 20:57:45.000000000 -0800244 +++ vim72/runtime/doc/spell.txt 2009-01-19 00:09:54.000000000 -0800 245 245 @@ -1,4 +1,4 @@ 246 246 -*spell.txt* For Vim version 7.2. Last change: 2008 Jun 21 … … 372 372 diff -Naur vim72.orig/runtime/doc/starting.txt vim72/runtime/doc/starting.txt 373 373 --- vim72.orig/runtime/doc/starting.txt 2008-08-09 07:23:00.000000000 -0700 374 +++ vim72/runtime/doc/starting.txt 2009-01- 08 20:57:32.000000000 -0800374 +++ vim72/runtime/doc/starting.txt 2009-01-19 00:08:31.000000000 -0800 375 375 @@ -1,4 +1,4 @@ 376 376 -*starting.txt* For Vim version 7.2. Last change: 2008 Jun 21 … … 434 434 diff -Naur vim72.orig/runtime/doc/usr_21.txt vim72/runtime/doc/usr_21.txt 435 435 --- vim72.orig/runtime/doc/usr_21.txt 2008-08-09 07:23:01.000000000 -0700 436 +++ vim72/runtime/doc/usr_21.txt 2009-01- 08 20:57:32.000000000 -0800436 +++ vim72/runtime/doc/usr_21.txt 2009-01-19 00:08:31.000000000 -0800 437 437 @@ -1,4 +1,4 @@ 438 438 -*usr_21.txt* For Vim version 7.2. Last change: 2007 May 01 … … 501 501 diff -Naur vim72.orig/runtime/scripts.vim vim72/runtime/scripts.vim 502 502 --- vim72.orig/runtime/scripts.vim 2008-08-08 15:27:21.000000000 -0700 503 +++ vim72/runtime/scripts.vim 2009-01- 08 20:57:27.000000000 -0800503 +++ vim72/runtime/scripts.vim 2009-01-19 00:07:18.000000000 -0800 504 504 @@ -234,6 +234,10 @@ 505 505 elseif s:line1 =~ '\<DTD\s\+XHTML\s' … … 515 515 diff -Naur vim72.orig/src/auto/configure vim72/src/auto/configure 516 516 --- vim72.orig/src/auto/configure 2008-07-24 05:40:36.000000000 -0700 517 +++ vim72/src/auto/configure 2009-01- 08 20:57:39.000000000 -0800517 +++ vim72/src/auto/configure 2009-01-19 00:09:07.000000000 -0800 518 518 @@ -16819,21 +16819,29 @@ 519 519 LDFLAGS="$LDFLAGS -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc" … … 556 556 diff -Naur vim72.orig/src/buffer.c vim72/src/buffer.c 557 557 --- vim72.orig/src/buffer.c 2008-08-06 04:00:48.000000000 -0700 558 +++ vim72/src/buffer.c 2009-01- 08 20:57:54.000000000 -0800558 +++ vim72/src/buffer.c 2009-01-19 00:10:45.000000000 -0800 559 559 @@ -437,10 +437,6 @@ 560 560 return; … … 674 674 diff -Naur vim72.orig/src/configure.in vim72/src/configure.in 675 675 --- vim72.orig/src/configure.in 2008-07-24 05:40:26.000000000 -0700 676 +++ vim72/src/configure.in 2009-01- 08 20:57:39.000000000 -0800676 +++ vim72/src/configure.in 2009-01-19 00:09:07.000000000 -0800 677 677 @@ -3152,18 +3152,25 @@ 678 678 dnl But only when making dependencies, cproto and lint don't take "-isystem". … … 709 709 diff -Naur vim72.orig/src/diff.c vim72/src/diff.c 710 710 --- vim72.orig/src/diff.c 2008-03-05 03:16:56.000000000 -0800 711 +++ vim72/src/diff.c 2009-01- 08 20:57:45.000000000 -0800711 +++ vim72/src/diff.c 2009-01-19 00:09:50.000000000 -0800 712 712 @@ -73,6 +73,8 @@ 713 713 { … … 797 797 } 798 798 #endif 799 diff -Naur vim72.orig/src/edit.c vim72/src/edit.c 800 --- vim72.orig/src/edit.c 2008-08-06 05:51:17.000000000 -0700 801 +++ vim72/src/edit.c 2009-01-19 00:10:48.000000000 -0800 802 @@ -147,6 +147,7 @@ 803 static int ins_compl_bs __ARGS((void)); 804 static void ins_compl_new_leader __ARGS((void)); 805 static void ins_compl_addleader __ARGS((int c)); 806 +static int ins_compl_len __ARGS((void)); 807 static void ins_compl_restart __ARGS((void)); 808 static void ins_compl_set_original_text __ARGS((char_u *str)); 809 static void ins_compl_addfrommatch __ARGS((void)); 810 @@ -197,7 +198,8 @@ 811 static void mb_replace_pop_ins __ARGS((int cc)); 812 #endif 813 static void replace_flush __ARGS((void)); 814 -static void replace_do_bs __ARGS((void)); 815 +static void replace_do_bs __ARGS((int limit_col)); 816 +static int del_char_after_col __ARGS((int limit_col)); 817 #ifdef FEAT_CINDENT 818 static int cindent_on __ARGS((void)); 819 #endif 820 @@ -1933,6 +1935,8 @@ 821 /* 822 * Backspace the cursor until the given column. Handles REPLACE and VREPLACE 823 * modes correctly. May also be used when not in insert mode at all. 824 + * Will attempt not to go before "col" even when there is a composing 825 + * character. 826 */ 827 void 828 backspace_until_column(col) 829 @@ -1942,13 +1946,49 @@ 830 { 831 curwin->w_cursor.col--; 832 if (State & REPLACE_FLAG) 833 - replace_do_bs(); 834 - else 835 - (void)del_char(FALSE); 836 + replace_do_bs(col); 837 + else if (!del_char_after_col(col)) 838 + break; 839 } 840 } 841 #endif 842 843 +/* 844 + * Like del_char(), but make sure not to go before column "limit_col". 845 + * Only matters when there are composing characters. 846 + * Return TRUE when something was deleted. 847 + */ 848 + static int 849 +del_char_after_col(limit_col) 850 + int limit_col; 851 +{ 852 +#ifdef FEAT_MBYTE 853 + if (enc_utf8 && limit_col >= 0) 854 + { 855 + int ecol = curwin->w_cursor.col + 1; 856 + 857 + /* Make sure the cursor is at the start of a character, but 858 + * skip forward again when going too far back because of a 859 + * composing character. */ 860 + mb_adjust_cursor(); 861 + while (curwin->w_cursor.col < limit_col) 862 + { 863 + int l = utf_ptr2len(ml_get_cursor()); 864 + 865 + if (l == 0) /* end of line */ 866 + break; 867 + curwin->w_cursor.col += l; 868 + } 869 + if (*ml_get_cursor() == NUL || curwin->w_cursor.col == ecol) 870 + return FALSE; 871 + del_bytes((long)(ecol - curwin->w_cursor.col), FALSE, TRUE); 872 + } 873 + else 874 +#endif 875 + (void)del_char(FALSE); 876 + return TRUE; 877 +} 878 + 879 #if defined(FEAT_INS_EXPAND) || defined(PROTO) 880 /* 881 * CTRL-X pressed in Insert mode. 882 @@ -2418,7 +2458,7 @@ 883 { 884 had_match = (curwin->w_cursor.col > compl_col); 885 ins_compl_delete(); 886 - ins_bytes(compl_leader + curwin->w_cursor.col - compl_col); 887 + ins_bytes(compl_leader + ins_compl_len()); 888 ins_redraw(FALSE); 889 890 /* When the match isn't there (to avoid matching itself) remove it 891 @@ -2470,7 +2510,7 @@ 892 *p = NUL; 893 had_match = (curwin->w_cursor.col > compl_col); 894 ins_compl_delete(); 895 - ins_bytes(compl_leader + curwin->w_cursor.col - compl_col); 896 + ins_bytes(compl_leader + ins_compl_len()); 897 ins_redraw(FALSE); 898 899 /* When the match isn't there (to avoid matching itself) remove it 900 @@ -3209,7 +3249,7 @@ 901 { 902 ins_compl_del_pum(); 903 ins_compl_delete(); 904 - ins_bytes(compl_leader + curwin->w_cursor.col - compl_col); 905 + ins_bytes(compl_leader + ins_compl_len()); 906 compl_used_match = FALSE; 907 908 if (compl_started) 909 @@ -3264,6 +3304,20 @@ 910 } 911 912 /* 913 + * Return the length of the completion, from the completion start column to 914 + * the cursor column. Making sure it never goes below zero. 915 + */ 916 + static int 917 +ins_compl_len() 918 +{ 919 + int off = curwin->w_cursor.col - compl_col; 920 + 921 + if (off < 0) 922 + return 0; 923 + return off; 924 +} 925 + 926 +/* 927 * Append one character to the match leader. May reduce the number of 928 * matches. 929 */ 930 @@ -3621,10 +3675,9 @@ 931 { 932 ins_compl_delete(); 933 if (compl_leader != NULL) 934 - ins_bytes(compl_leader + curwin->w_cursor.col - compl_col); 935 + ins_bytes(compl_leader + ins_compl_len()); 936 else if (compl_first_match != NULL) 937 - ins_bytes(compl_orig_text 938 - + curwin->w_cursor.col - compl_col); 939 + ins_bytes(compl_orig_text + ins_compl_len()); 940 retval = TRUE; 941 } 942 943 @@ -4256,7 +4309,7 @@ 944 static void 945 ins_compl_insert() 946 { 947 - ins_bytes(compl_shown_match->cp_str + curwin->w_cursor.col - compl_col); 948 + ins_bytes(compl_shown_match->cp_str + ins_compl_len()); 949 if (compl_shown_match->cp_flags & ORIGINAL_TEXT) 950 compl_used_match = FALSE; 951 else 952 @@ -4425,7 +4478,7 @@ 953 if (!compl_get_longest || compl_used_match) 954 ins_compl_insert(); 955 else 956 - ins_bytes(compl_leader + curwin->w_cursor.col - compl_col); 957 + ins_bytes(compl_leader + ins_compl_len()); 958 } 959 else 960 compl_used_match = FALSE; 961 @@ -7123,9 +7176,12 @@ 962 * cc == 0: character was inserted, delete it 963 * cc > 0: character was replaced, put cc (first byte of original char) back 964 * and check for more characters to be put back 965 + * When "limit_col" is >= 0, don't delete before this column. Matters when 966 + * using composing characters, use del_char_after_col() instead of del_char(). 967 */ 968 static void 969 -replace_do_bs() 970 +replace_do_bs(limit_col) 971 + int limit_col; 972 { 973 int cc; 974 #ifdef FEAT_VREPLACE 975 @@ -7153,7 +7209,7 @@ 976 #ifdef FEAT_MBYTE 977 if (has_mbyte) 978 { 979 - del_char(FALSE); 980 + (void)del_char_after_col(limit_col); 981 # ifdef FEAT_VREPLACE 982 if (State & VREPLACE_FLAG) 983 orig_len = (int)STRLEN(ml_get_cursor()); 984 @@ -7203,7 +7259,7 @@ 985 changed_bytes(curwin->w_cursor.lnum, curwin->w_cursor.col); 986 } 987 else if (cc == 0) 988 - (void)del_char(FALSE); 989 + (void)del_char_after_col(limit_col); 990 } 991 992 #ifdef FEAT_CINDENT 993 @@ -8239,7 +8295,7 @@ 994 * Replace mode */ 995 if (curwin->w_cursor.lnum != Insstart.lnum 996 || curwin->w_cursor.col >= Insstart.col) 997 - replace_do_bs(); 998 + replace_do_bs(-1); 999 } 1000 else 1001 (void)del_char(FALSE); 1002 @@ -8556,7 +8612,7 @@ 1003 break; 1004 } 1005 if (State & REPLACE_FLAG) 1006 - replace_do_bs(); 1007 + replace_do_bs(-1); 1008 else 1009 { 1010 #ifdef FEAT_MBYTE 799 1011 diff -Naur vim72.orig/src/eval.c vim72/src/eval.c 800 1012 --- vim72.orig/src/eval.c 2008-08-07 12:37:22.000000000 -0700 801 +++ vim72/src/eval.c 2009-01- 08 20:57:46.000000000 -08001013 +++ vim72/src/eval.c 2009-01-19 00:10:21.000000000 -0800 802 1014 @@ -32,6 +32,9 @@ 803 1015 … … 1623 1835 diff -Naur vim72.orig/src/ex_cmds.c vim72/src/ex_cmds.c 1624 1836 --- vim72.orig/src/ex_cmds.c 2008-08-04 12:15:00.000000000 -0700 1625 +++ vim72/src/ex_cmds.c 2009-01- 08 20:57:44.000000000 -08001837 +++ vim72/src/ex_cmds.c 2009-01-19 00:10:54.000000000 -0800 1626 1838 @@ -24,7 +24,7 @@ 1627 1839 static void do_filter __ARGS((linenr_T line1, linenr_T line2, exarg_T *eap, char_u *cmd, int do_in, int do_out)); … … 1633 1845 static int read_viminfo_up_to_marks __ARGS((vir_T *virp, int forceit, int writing)); 1634 1846 #endif 1635 @@ -1676,14 +1676,12 @@ 1847 @@ -49,6 +49,7 @@ 1848 exarg_T *eap; 1849 { 1850 int c; 1851 + int cval; 1852 char buf1[20]; 1853 char buf2[20]; 1854 char_u buf3[7]; 1855 @@ -75,6 +76,10 @@ 1856 { 1857 if (c == NL) /* NUL is stored as NL */ 1858 c = NUL; 1859 + if (c == CAR && get_fileformat(curbuf) == EOL_MAC) 1860 + cval = NL; /* NL is stored as CR */ 1861 + else 1862 + cval = c; 1863 if (vim_isprintc_strict(c) && (c < ' ' 1864 #ifndef EBCDIC 1865 || c > '~' 1866 @@ -94,7 +99,7 @@ 1867 buf2[0] = NUL; 1868 vim_snprintf((char *)IObuff, IOSIZE, 1869 _("<%s>%s%s %d, Hex %02x, Octal %03o"), 1870 - transchar(c), buf1, buf2, c, c, c); 1871 + transchar(c), buf1, buf2, cval, cval, cval); 1872 #ifdef FEAT_MBYTE 1873 if (enc_utf8) 1874 c = cc[ci++]; 1875 @@ -1676,14 +1681,12 @@ 1636 1876 1637 1877 /* … … 1652 1892 FILE *fp; 1653 1893 char_u *fname; 1654 @@ -1691,7 +16 89,7 @@1894 @@ -1691,7 +1694,7 @@ 1655 1895 if (no_viminfo()) 1656 1896 return FAIL; … … 1661 1901 return FAIL; 1662 1902 fp = mch_fopen((char *)fname, READBIN); 1663 @@ -1701,8 +1 699,9 @@1903 @@ -1701,8 +1704,9 @@ 1664 1904 verbose_enter(); 1665 1905 smsg((char_u *)_("Reading viminfo file \"%s\"%s%s%s"), … … 1673 1913 verbose_leave(); 1674 1914 } 1675 @@ -1712,10 +171 1,9 @@1915 @@ -1712,10 +1716,9 @@ 1676 1916 return FAIL; 1677 1917 … … 1685 1925 } 1686 1926 1687 @@ -1943,7 +194 1,7 @@1927 @@ -1943,7 +1946,7 @@ 1688 1928 * root. 1689 1929 */ … … 1694 1934 } 1695 1935 } 1696 @@ -1968,7 +19 66,7 @@1936 @@ -1968,7 +1971,7 @@ 1697 1937 } 1698 1938 … … 1703 1943 fclose(fp_out); /* errors are ignored !? */ 1704 1944 if (fp_in != NULL) 1705 @@ -2041,12 +20 39,10 @@1945 @@ -2041,12 +2044,10 @@ 1706 1946 * do_viminfo() -- Should only be called from read_viminfo() & write_viminfo(). 1707 1947 */ … … 1718 1958 int count = 0; 1719 1959 int eof = FALSE; 1720 @@ -2061,8 +20 57,9 @@1960 @@ -2061,8 +2062,9 @@ 1721 1961 1722 1962 if (fp_in != NULL) … … 1730 1970 /* Skip info, find start of marks */ 1731 1971 while (!(eof = viminfo_readline(&vir)) 1732 @@ -2092,8 +20 89,9 @@1972 @@ -2092,8 +2094,9 @@ 1733 1973 write_viminfo_bufferlist(fp_out); 1734 1974 count = write_viminfo_marks(fp_out); … … 1742 1982 vim_free(vir.vir_line); 1743 1983 #ifdef FEAT_MBYTE 1744 @@ -5059,6 +50 57,7 @@1984 @@ -5059,6 +5062,7 @@ 1745 1985 1746 1986 if (did_sub) … … 1752 1992 diff -Naur vim72.orig/src/ex_cmds.h vim72/src/ex_cmds.h 1753 1993 --- vim72.orig/src/ex_cmds.h 2008-06-21 11:47:57.000000000 -0700 1754 +++ vim72/src/ex_cmds.h 2009-01- 08 20:57:32.000000000 -08001994 +++ vim72/src/ex_cmds.h 2009-01-19 00:08:31.000000000 -0800 1755 1995 @@ -278,7 +278,7 @@ 1756 1996 EX(CMD_crewind, "crewind", ex_cc, … … 1800 2040 diff -Naur vim72.orig/src/ex_cmds2.c vim72/src/ex_cmds2.c 1801 2041 --- vim72.orig/src/ex_cmds2.c 2008-07-13 09:18:22.000000000 -0700 1802 +++ vim72/src/ex_cmds2.c 2009-01- 08 20:57:30.000000000 -08002042 +++ vim72/src/ex_cmds2.c 2009-01-19 00:07:35.000000000 -0800 1803 2043 @@ -3145,8 +3145,8 @@ 1804 2044 verbose_leave(); … … 1814 2054 diff -Naur vim72.orig/src/ex_docmd.c vim72/src/ex_docmd.c 1815 2055 --- vim72.orig/src/ex_docmd.c 2008-07-26 04:51:05.000000000 -0700 1816 +++ vim72/src/ex_docmd.c 2009-01- 08 20:57:45.000000000 -08002056 +++ vim72/src/ex_docmd.c 2009-01-19 00:10:13.000000000 -0800 1817 2057 @@ -364,6 +364,7 @@ 1818 2058 # define ex_function ex_ni … … 1957 2197 diff -Naur vim72.orig/src/ex_getln.c vim72/src/ex_getln.c 1958 2198 --- vim72.orig/src/ex_getln.c 2008-08-08 02:31:33.000000000 -0700 1959 +++ vim72/src/ex_getln.c 2009-01- 08 20:57:43.000000000 -08002199 +++ vim72/src/ex_getln.c 2009-01-19 00:09:28.000000000 -0800 1960 2200 @@ -31,6 +31,8 @@ 1961 2201 int cmdattr; /* attributes for prompt */ … … 2091 2331 diff -Naur vim72.orig/src/feature.h vim72/src/feature.h 2092 2332 --- vim72.orig/src/feature.h 2008-08-06 04:00:39.000000000 -0700 2093 +++ vim72/src/feature.h 2009-01- 08 20:57:32.000000000 -08002333 +++ vim72/src/feature.h 2009-01-19 00:08:31.000000000 -0800 2094 2334 @@ -767,9 +767,13 @@ 2095 2335 … … 2110 2350 diff -Naur vim72.orig/src/fileio.c vim72/src/fileio.c 2111 2351 --- vim72.orig/src/fileio.c 2008-08-06 04:01:03.000000000 -0700 2112 +++ vim72/src/fileio.c 2009-01- 08 20:57:54.000000000 -08002352 +++ vim72/src/fileio.c 2009-01-19 00:10:40.000000000 -0800 2113 2353 @@ -932,7 +932,10 @@ 2114 2354 else … … 2340 2580 diff -Naur vim72.orig/src/fold.c vim72/src/fold.c 2341 2581 --- vim72.orig/src/fold.c 2008-08-06 04:01:12.000000000 -0700 2342 +++ vim72/src/fold.c 2009-01- 08 20:57:54.000000000 -08002582 +++ vim72/src/fold.c 2009-01-19 00:10:42.000000000 -0800 2343 2583 @@ -48,7 +48,7 @@ 2344 2584 static int foldFind __ARGS((garray_T *gap, linenr_T lnum, fold_T **fpp)); … … 2429 2669 diff -Naur vim72.orig/src/getchar.c vim72/src/getchar.c 2430 2670 --- vim72.orig/src/getchar.c 2008-07-22 09:57:48.000000000 -0700 2431 +++ vim72/src/getchar.c 2009-01- 08 20:57:43.000000000 -08002671 +++ vim72/src/getchar.c 2009-01-19 00:09:36.000000000 -0800 2432 2672 @@ -4702,7 +4702,7 @@ 2433 2673 return FAIL; … … 2450 2690 diff -Naur vim72.orig/src/globals.h vim72/src/globals.h 2451 2691 --- vim72.orig/src/globals.h 2008-07-26 04:53:29.000000000 -0700 2452 +++ vim72/src/globals.h 2009-01- 08 20:57:54.000000000 -08002692 +++ vim72/src/globals.h 2009-01-19 00:10:45.000000000 -0800 2453 2693 @@ -1022,6 +1022,7 @@ 2454 2694 #endif … … 2484 2724 diff -Naur vim72.orig/src/gui.c vim72/src/gui.c 2485 2725 --- vim72.orig/src/gui.c 2008-07-27 12:32:14.000000000 -0700 2486 +++ vim72/src/gui.c 2009-01- 08 20:57:45.000000000 -08002726 +++ vim72/src/gui.c 2009-01-19 00:10:07.000000000 -0800 2487 2727 @@ -139,7 +139,7 @@ 2488 2728 /* The read returns when the child closes the pipe (or when … … 2577 2817 diff -Naur vim72.orig/src/gui_at_sb.c vim72/src/gui_at_sb.c 2578 2818 --- vim72.orig/src/gui_at_sb.c 2004-06-07 07:32:25.000000000 -0700 2579 +++ vim72/src/gui_at_sb.c 2009-01- 08 20:57:44.000000000 -08002819 +++ vim72/src/gui_at_sb.c 2009-01-19 00:09:39.000000000 -0800 2580 2820 @@ -1078,6 +1078,12 @@ 2581 2821 Cardinal *num_params; /* unused */ … … 2603 2843 diff -Naur vim72.orig/src/gui_gtk_x11.c vim72/src/gui_gtk_x11.c 2604 2844 --- vim72.orig/src/gui_gtk_x11.c 2008-07-04 03:46:24.000000000 -0700 2605 +++ vim72/src/gui_gtk_x11.c 2009-01- 08 20:57:44.000000000 -08002845 +++ vim72/src/gui_gtk_x11.c 2009-01-19 00:09:39.000000000 -0800 2606 2846 @@ -4070,14 +4070,14 @@ 2607 2847 … … 2627 2867 diff -Naur vim72.orig/src/gui_x11.c vim72/src/gui_x11.c 2628 2868 --- vim72.orig/src/gui_x11.c 2008-06-08 08:13:45.000000000 -0700 2629 +++ vim72/src/gui_x11.c 2009-01- 08 20:57:33.000000000 -08002869 +++ vim72/src/gui_x11.c 2009-01-19 00:08:42.000000000 -0800 2630 2870 @@ -2450,7 +2450,7 @@ 2631 2871 *colorPtr = colortable[closest]; … … 2639 2879 diff -Naur vim72.orig/src/gui_xmdlg.c vim72/src/gui_xmdlg.c 2640 2880 --- vim72.orig/src/gui_xmdlg.c 2008-06-21 09:05:32.000000000 -0700 2641 +++ vim72/src/gui_xmdlg.c 2009-01- 08 20:57:44.000000000 -08002881 +++ vim72/src/gui_xmdlg.c 2009-01-19 00:09:39.000000000 -0800 2642 2882 @@ -369,10 +369,10 @@ 2643 2883 char buf[TEMP_BUF_SIZE]; … … 2795 3035 diff -Naur vim72.orig/src/gui_xmebw.c vim72/src/gui_xmebw.c 2796 3036 --- vim72.orig/src/gui_xmebw.c 2007-09-06 03:57:51.000000000 -0700 2797 +++ vim72/src/gui_xmebw.c 2009-01- 08 20:57:44.000000000 -08003037 +++ vim72/src/gui_xmebw.c 2009-01-19 00:09:39.000000000 -0800 2798 3038 @@ -1256,7 +1256,7 @@ 2799 3039 } … … 2822 3062 diff -Naur vim72.orig/src/if_cscope.c vim72/src/if_cscope.c 2823 3063 --- vim72.orig/src/if_cscope.c 2008-06-24 09:32:34.000000000 -0700 2824 +++ vim72/src/if_cscope.c 2009-01- 08 20:57:27.000000000 -08003064 +++ vim72/src/if_cscope.c 2009-01-19 00:07:11.000000000 -0800 2825 3065 @@ -74,7 +74,7 @@ 2826 3066 { "add", cs_add, … … 2852 3092 diff -Naur vim72.orig/src/if_cscope.h vim72/src/if_cscope.h 2853 3093 --- vim72.orig/src/if_cscope.h 2007-09-02 07:51:08.000000000 -0700 2854 +++ vim72/src/if_cscope.h 2009-01- 08 20:57:27.000000000 -08003094 +++ vim72/src/if_cscope.h 2009-01-19 00:07:11.000000000 -0800 2855 3095 @@ -42,17 +42,6 @@ 2856 3096 * f 7name Find this file … … 2873 3113 diff -Naur vim72.orig/src/if_perl.xs vim72/src/if_perl.xs 2874 3114 --- vim72.orig/src/if_perl.xs 2008-07-17 13:55:09.000000000 -0700 2875 +++ vim72/src/if_perl.xs 2009-01- 08 20:57:45.000000000 -08003115 +++ vim72/src/if_perl.xs 2009-01-19 00:10:02.000000000 -0800 2876 3116 @@ -136,6 +136,9 @@ 2877 3117 # define Perl_newXS_flags dll_Perl_newXS_flags … … 2924 3164 diff -Naur vim72.orig/src/if_python.c vim72/src/if_python.c 2925 3165 --- vim72.orig/src/if_python.c 2008-07-17 14:09:32.000000000 -0700 2926 +++ vim72/src/if_python.c 2009-01- 08 20:57:39.000000000 -08003166 +++ vim72/src/if_python.c 2009-01-19 00:10:59.000000000 -0800 2927 3167 @@ -531,6 +531,12 @@ 2928 3168 if (PythonMod_Init()) … … 2938 3178 Python_SaveThread(); 2939 3179 2940 @@ -2345,7 +2351,8 @@ 3180 @@ -1145,14 +1151,23 @@ 3181 3182 /* Check if we run into a recursive loop. The item must be in lookupDict 3183 * then and we can use it again. */ 3184 - sprintf(ptrBuf, PRINTF_DECIMAL_LONG_U, (long_u)our_tv); 3185 - result = PyDict_GetItemString(lookupDict, ptrBuf); 3186 - if (result != NULL) 3187 - Py_INCREF(result); 3188 - else if (our_tv->v_type == VAR_STRING) 3189 + if ((our_tv->v_type == VAR_LIST && our_tv->vval.v_list != NULL) 3190 + || (our_tv->v_type == VAR_DICT && our_tv->vval.v_dict != NULL)) 3191 + { 3192 + sprintf(ptrBuf, PRINTF_DECIMAL_LONG_U, 3193 + our_tv->v_type == VAR_LIST ? (long_u)our_tv->vval.v_list 3194 + : (long_u)our_tv->vval.v_dict); 3195 + result = PyDict_GetItemString(lookupDict, ptrBuf); 3196 + if (result != NULL) 3197 + { 3198 + Py_INCREF(result); 3199 + return result; 3200 + } 3201 + } 3202 + 3203 + if (our_tv->v_type == VAR_STRING) 3204 { 3205 result = Py_BuildValue("s", our_tv->vval.v_string); 3206 - PyDict_SetItemString(lookupDict, ptrBuf, result); 3207 } 3208 else if (our_tv->v_type == VAR_NUMBER) 3209 { 3210 @@ -1161,7 +1176,6 @@ 3211 /* For backwards compatibility numbers are stored as strings. */ 3212 sprintf(buf, "%ld", (long)our_tv->vval.v_number); 3213 result = Py_BuildValue("s", buf); 3214 - PyDict_SetItemString(lookupDict, ptrBuf, result); 3215 } 3216 # ifdef FEAT_FLOAT 3217 else if (our_tv->v_type == VAR_FLOAT) 3218 @@ -1170,7 +1184,6 @@ 3219 3220 sprintf(buf, "%f", our_tv->vval.v_float); 3221 result = Py_BuildValue("s", buf); 3222 - PyDict_SetItemString(lookupDict, ptrBuf, result); 3223 } 3224 # endif 3225 else if (our_tv->v_type == VAR_LIST) 3226 @@ -1179,10 +1192,11 @@ 3227 listitem_T *curr; 3228 3229 result = PyList_New(0); 3230 - PyDict_SetItemString(lookupDict, ptrBuf, result); 3231 3232 if (list != NULL) 3233 { 3234 + PyDict_SetItemString(lookupDict, ptrBuf, result); 3235 + 3236 for (curr = list->lv_first; curr != NULL; curr = curr->li_next) 3237 { 3238 newObj = VimToPython(&curr->li_tv, depth + 1, lookupDict); 3239 @@ -1194,7 +1208,6 @@ 3240 else if (our_tv->v_type == VAR_DICT) 3241 { 3242 result = PyDict_New(); 3243 - PyDict_SetItemString(lookupDict, ptrBuf, result); 3244 3245 if (our_tv->vval.v_dict != NULL) 3246 { 3247 @@ -1203,6 +1216,8 @@ 3248 hashitem_T *hi; 3249 dictitem_T *di; 3250 3251 + PyDict_SetItemString(lookupDict, ptrBuf, result); 3252 + 3253 for (hi = ht->ht_array; todo > 0; ++hi) 3254 { 3255 if (!HASHITEM_EMPTY(hi)) 3256 @@ -2345,7 +2360,8 @@ 2941 3257 { 2942 3258 PyObject *mod; … … 2950 3266 diff -Naur vim72.orig/src/if_xcmdsrv.c vim72/src/if_xcmdsrv.c 2951 3267 --- vim72.orig/src/if_xcmdsrv.c 2008-07-18 06:05:03.000000000 -0700 2952 +++ vim72/src/if_xcmdsrv.c 2009-01- 08 20:57:36.000000000 -08003268 +++ vim72/src/if_xcmdsrv.c 2009-01-19 00:08:50.000000000 -0800 2953 3269 @@ -736,7 +736,7 @@ 2954 3270 + serverReply.ga_len; … … 2980 3296 diff -Naur vim72.orig/src/main.c vim72/src/main.c 2981 3297 --- vim72.orig/src/main.c 2008-07-24 01:40:56.000000000 -0700 2982 +++ vim72/src/main.c 2009-01- 08 20:57:44.000000000 -08003298 +++ vim72/src/main.c 2009-01-19 00:09:39.000000000 -0800 2983 3299 @@ -645,11 +645,12 @@ 2984 3300 … … 3042 3358 diff -Naur vim72.orig/src/mark.c vim72/src/mark.c 3043 3359 --- vim72.orig/src/mark.c 2008-08-08 15:06:49.000000000 -0700 3044 +++ vim72/src/mark.c 2009-01- 08 20:57:32.000000000 -08003360 +++ vim72/src/mark.c 2009-01-19 00:08:31.000000000 -0800 3045 3361 @@ -1627,15 +1627,17 @@ 3046 3362 … … 3111 3427 diff -Naur vim72.orig/src/mbyte.c vim72/src/mbyte.c 3112 3428 --- vim72.orig/src/mbyte.c 2008-07-14 05:38:05.000000000 -0700 3113 +++ vim72/src/mbyte.c 2009-01- 08 20:57:44.000000000 -08003429 +++ vim72/src/mbyte.c 2009-01-19 00:09:39.000000000 -0800 3114 3430 @@ -717,7 +717,7 @@ 3115 3431 * where mblen() returns 0 for invalid character. … … 3193 3509 diff -Naur vim72.orig/src/menu.c vim72/src/menu.c 3194 3510 --- vim72.orig/src/menu.c 2008-06-21 12:53:43.000000000 -0700 3195 +++ vim72/src/menu.c 2009-01- 08 20:57:27.000000000 -08003511 +++ vim72/src/menu.c 2009-01-19 00:07:05.000000000 -0800 3196 3512 @@ -1120,6 +1120,7 @@ 3197 3513 parent = menu; … … 3204 3520 diff -Naur vim72.orig/src/message.c vim72/src/message.c 3205 3521 --- vim72.orig/src/message.c 2008-07-09 11:24:55.000000000 -0700 3206 +++ vim72/src/message.c 2009-01-08 20:57:44.000000000 -0800 3207 @@ -4585,61 +4585,62 @@ 3522 +++ vim72/src/message.c 2009-01-19 00:10:51.000000000 -0800 3523 @@ -4556,7 +4556,13 @@ 3524 remove_trailing_zeroes = TRUE; 3525 } 3526 3527 - if (fmt_spec == 'f' && abs_f > 1.0e307) 3528 + if (fmt_spec == 'f' && 3529 +#ifdef VAX 3530 + abs_f > 1.0e38 3531 +#else 3532 + abs_f > 1.0e307 3533 +#endif 3534 + ) 3535 { 3536 /* Avoid a buffer overflow */ 3537 strcpy(tmp, "inf"); 3538 @@ -4585,61 +4591,62 @@ 3208 3539 if (remove_trailing_zeroes) 3209 3540 { … … 3291 3622 diff -Naur vim72.orig/src/misc1.c vim72/src/misc1.c 3292 3623 --- vim72.orig/src/misc1.c 2008-07-12 12:20:53.000000000 -0700 3293 +++ vim72/src/misc1.c 2009-01- 08 20:57:32.000000000 -08003624 +++ vim72/src/misc1.c 2009-01-19 00:08:31.000000000 -0800 3294 3625 @@ -3245,9 +3245,9 @@ 3295 3626 … … 3306 3637 diff -Naur vim72.orig/src/misc2.c vim72/src/misc2.c 3307 3638 --- vim72.orig/src/misc2.c 2008-07-23 12:12:56.000000000 -0700 3308 +++ vim72/src/misc2.c 2009-01- 08 20:57:52.000000000 -08003639 +++ vim72/src/misc2.c 2009-01-19 00:10:29.000000000 -0800 3309 3640 @@ -873,7 +873,7 @@ 3310 3641 /* 3. check for available memory: call mch_avail_mem() */ … … 3377 3708 diff -Naur vim72.orig/src/move.c vim72/src/move.c 3378 3709 --- vim72.orig/src/move.c 2008-07-12 09:26:47.000000000 -0700 3379 +++ vim72/src/move.c 2009-01- 08 20:57:39.000000000 -08003710 +++ vim72/src/move.c 2009-01-19 00:09:02.000000000 -0800 3380 3711 @@ -280,18 +280,20 @@ 3381 3712 … … 3427 3758 diff -Naur vim72.orig/src/netbeans.c vim72/src/netbeans.c 3428 3759 --- vim72.orig/src/netbeans.c 2008-07-13 09:19:54.000000000 -0700 3429 +++ vim72/src/netbeans.c 2009-01- 08 20:57:54.000000000 -08003760 +++ vim72/src/netbeans.c 2009-01-19 00:10:45.000000000 -0800 3430 3761 @@ -1043,7 +1043,7 @@ 3431 3762 nbdebug(("EVT: %s", buf)); … … 3516 3847 diff -Naur vim72.orig/src/normal.c vim72/src/normal.c 3517 3848 --- vim72.orig/src/normal.c 2008-07-31 13:03:08.000000000 -0700 3518 +++ vim72/src/normal.c 2009-01- 08 20:57:40.000000000 -08003849 +++ vim72/src/normal.c 2009-01-19 00:09:18.000000000 -0800 3519 3850 @@ -183,6 +183,8 @@ 3520 3851 static void nv_cursorhold __ARGS((cmdarg_T *cap)); … … 3704 4035 diff -Naur vim72.orig/src/ops.c vim72/src/ops.c 3705 4036 --- vim72.orig/src/ops.c 2008-06-21 13:08:59.000000000 -0700 3706 +++ vim72/src/ops.c 2009-01- 08 20:57:45.000000000 -08004037 +++ vim72/src/ops.c 2009-01-19 00:10:04.000000000 -0800 3707 4038 @@ -2209,12 +2209,15 @@ 3708 4039 { … … 3725 4056 diff -Naur vim72.orig/src/option.c vim72/src/option.c 3726 4057 --- vim72.orig/src/option.c 2008-07-18 06:05:33.000000000 -0700 3727 +++ vim72/src/option.c 2009-01- 08 20:57:52.000000000 -08004058 +++ vim72/src/option.c 2009-01-19 00:10:29.000000000 -0800 3728 4059 @@ -2593,13 +2593,13 @@ 3729 4060 #ifdef FEAT_VIMINFO … … 3783 4114 diff -Naur vim72.orig/src/os_unix.c vim72/src/os_unix.c 3784 4115 --- vim72.orig/src/os_unix.c 2008-08-06 04:01:40.000000000 -0700 3785 +++ vim72/src/os_unix.c 2009-01- 08 20:57:44.000000000 -08004116 +++ vim72/src/os_unix.c 2009-01-19 00:09:40.000000000 -0800 3786 4117 @@ -315,12 +315,15 @@ 3787 4118 {-1, "Unknown!", FALSE} … … 3897 4228 diff -Naur vim72.orig/src/proto/eval.pro vim72/src/proto/eval.pro 3898 4229 --- vim72.orig/src/proto/eval.pro 2008-08-09 07:31:25.000000000 -0700 3899 +++ vim72/src/proto/eval.pro 2009-01- 08 20:57:40.000000000 -08004230 +++ vim72/src/proto/eval.pro 2009-01-19 00:09:18.000000000 -0800 3900 4231 @@ -17,7 +17,7 @@ 3901 4232 int eval_to_bool __ARGS((char_u *arg, int *error, char_u **nextcmd, int skip)); … … 3939 4270 diff -Naur vim72.orig/src/proto/ex_cmds.pro vim72/src/proto/ex_cmds.pro 3940 4271 --- vim72.orig/src/proto/ex_cmds.pro 2008-08-09 07:31:25.000000000 -0700 3941 +++ vim72/src/proto/ex_cmds.pro 2009-01- 08 20:57:32.000000000 -08004272 +++ vim72/src/proto/ex_cmds.pro 2009-01-19 00:08:31.000000000 -0800 3942 4273 @@ -11,7 +11,7 @@ 3943 4274 char_u *make_filter_cmd __ARGS((char_u *cmd, char_u *itmp, char_u *otmp)); … … 3951 4282 diff -Naur vim72.orig/src/proto/ex_getln.pro vim72/src/proto/ex_getln.pro 3952 4283 --- vim72.orig/src/proto/ex_getln.pro 2008-08-09 07:31:28.000000000 -0700 3953 +++ vim72/src/proto/ex_getln.pro 2009-01- 08 20:57:43.000000000 -08004284 +++ vim72/src/proto/ex_getln.pro 2009-01-19 00:09:28.000000000 -0800 3954 4285 @@ -31,7 +31,7 @@ 3955 4286 void set_cmd_context __ARGS((expand_T *xp, char_u *str, int len, int col)); … … 3963 4294 diff -Naur vim72.orig/src/proto/mark.pro vim72/src/proto/mark.pro 3964 4295 --- vim72.orig/src/proto/mark.pro 2008-08-09 07:31:36.000000000 -0700 3965 +++ vim72/src/proto/mark.pro 2009-01- 08 20:57:32.000000000 -08004296 +++ vim72/src/proto/mark.pro 2009-01-19 00:08:31.000000000 -0800 3966 4297 @@ -26,5 +26,5 @@ 3967 4298 void write_viminfo_filemarks __ARGS((FILE *fp)); … … 3973 4304 diff -Naur vim72.orig/src/proto/misc2.pro vim72/src/proto/misc2.pro 3974 4305 --- vim72.orig/src/proto/misc2.pro 2008-08-09 07:31:40.000000000 -0700 3975 +++ vim72/src/proto/misc2.pro 2009-01- 08 20:57:52.000000000 -08004306 +++ vim72/src/proto/misc2.pro 2009-01-19 00:10:29.000000000 -0800 3976 4307 @@ -59,7 +59,7 @@ 3977 4308 int handle_x_keys __ARGS((int key)); … … 3985 4316 diff -Naur vim72.orig/src/proto/netbeans.pro vim72/src/proto/netbeans.pro 3986 4317 --- vim72.orig/src/proto/netbeans.pro 2008-08-09 07:31:56.000000000 -0700 3987 +++ vim72/src/proto/netbeans.pro 2009-01- 08 20:57:54.000000000 -08004318 +++ vim72/src/proto/netbeans.pro 2009-01-19 00:10:45.000000000 -0800 3988 4319 @@ -11,7 +11,7 @@ 3989 4320 void netbeans_frame_moved __ARGS((int new_x, int new_y)); … … 3997 4328 diff -Naur vim72.orig/src/pty.c vim72/src/pty.c 3998 4329 --- vim72.orig/src/pty.c 2008-06-21 11:52:58.000000000 -0700 3999 +++ vim72/src/pty.c 2009-01- 08 20:57:27.000000000 -08004330 +++ vim72/src/pty.c 2009-01-19 00:07:02.000000000 -0800 4000 4331 @@ -270,9 +270,10 @@ 4001 4332 } … … 4013 4344 diff -Naur vim72.orig/src/screen.c vim72/src/screen.c 4014 4345 --- vim72.orig/src/screen.c 2008-07-24 07:45:07.000000000 -0700 4015 +++ vim72/src/screen.c 2009-01- 08 20:57:31.000000000 -08004346 +++ vim72/src/screen.c 2009-01-19 00:08:07.000000000 -0800 4016 4347 @@ -2439,9 +2439,17 @@ 4017 4348 … … 4037 4368 diff -Naur vim72.orig/src/spell.c vim72/src/spell.c 4038 4369 --- vim72.orig/src/spell.c 2008-07-12 12:20:55.000000000 -0700 4039 +++ vim72/src/spell.c 2009-01- 08 20:57:46.000000000 -08004370 +++ vim72/src/spell.c 2009-01-19 00:10:18.000000000 -0800 4040 4371 @@ -77,7 +77,7 @@ 4041 4372 … … 4872 5203 diff -Naur vim72.orig/src/structs.h vim72/src/structs.h 4873 5204 --- vim72.orig/src/structs.h 2008-07-30 13:02:50.000000000 -0700 4874 +++ vim72/src/structs.h 2009-01- 08 20:57:39.000000000 -08005205 +++ vim72/src/structs.h 2009-01-19 00:09:02.000000000 -0800 4875 5206 @@ -459,7 +459,7 @@ 4876 5207 typedef struct … … 4901 5232 diff -Naur vim72.orig/src/tag.c vim72/src/tag.c 4902 5233 --- vim72.orig/src/tag.c 2008-07-16 14:31:30.000000000 -0700 4903 +++ vim72/src/tag.c 2009-01-08 20:57:45.000000000 -0800 5234 +++ vim72/src/tag.c 2009-01-19 00:10:57.000000000 -0800 5235 @@ -515,7 +515,7 @@ 5236 * If a count is supplied to the ":tag <name>" command, then 5237 * jump to count'th matching tag. 5238 */ 5239 - if (type == DT_TAG && count > 0) 5240 + if (type == DT_TAG && *tag != NUL && count > 0) 5241 cur_match = count - 1; 5242 5243 if (type == DT_SELECT || type == DT_JUMP 4904 5244 @@ -2725,7 +2725,24 @@ 4905 5245 */ … … 4947 5287 diff -Naur vim72.orig/src/testdir/Make_ming.mak vim72/src/testdir/Make_ming.mak 4948 5288 --- vim72.orig/src/testdir/Make_ming.mak 1969-12-31 16:00:00.000000000 -0800 4949 +++ vim72/src/testdir/Make_ming.mak 2009-01- 08 20:57:31.000000000 -08005289 +++ vim72/src/testdir/Make_ming.mak 2009-01-19 00:08:05.000000000 -0800 4950 5290 @@ -0,0 +1,91 @@ 4951 5291 +# Makefile to run tests for Vim, on Dos-like machines … … 5042 5382 diff -Naur vim72.orig/src/testdir/Makefile vim72/src/testdir/Makefile 5043 5383 --- vim72.orig/src/testdir/Makefile 2008-06-19 13:29:46.000000000 -0700 5044 +++ vim72/src/testdir/Makefile 2009-01- 08 20:57:31.000000000 -08005384 +++ vim72/src/testdir/Makefile 2009-01-19 00:07:44.000000000 -0800 5045 5385 @@ -26,15 +26,17 @@ 5046 5386 … … 5076 5416 diff -Naur vim72.orig/src/testdir/test42.ok vim72/src/testdir/test42.ok 5077 5417 --- vim72.orig/src/testdir/test42.ok 2008-02-20 04:27:37.000000000 -0800 5078 +++ vim72/src/testdir/test42.ok 2009-01- 08 20:57:32.000000000 -08005418 +++ vim72/src/testdir/test42.ok 2009-01-19 00:08:36.000000000 -0800 5079 5419 @@ -20,7 +20,7 @@ 5080 5420 ucs-2 … … 5088 5428 diff -Naur vim72.orig/src/ui.c vim72/src/ui.c 5089 5429 --- vim72.orig/src/ui.c 2008-07-14 11:14:56.000000000 -0700 5090 +++ vim72/src/ui.c 2009-01- 08 20:57:44.000000000 -08005430 +++ vim72/src/ui.c 2009-01-19 00:09:40.000000000 -0800 5091 5431 @@ -1820,7 +1820,7 @@ 5092 5432 #ifdef HAVE_DUP … … 5196 5536 diff -Naur vim72.orig/src/version.c vim72/src/version.c 5197 5537 --- vim72.orig/src/version.c 2008-08-09 07:24:52.000000000 -0700 5198 +++ vim72/src/version.c 2009-01- 08 20:57:54.000000000 -08005199 @@ -677,9 +677,1 66 @@5538 +++ vim72/src/version.c 2009-01-19 00:10:59.000000000 -0800 5539 @@ -677,9 +677,176 @@ 5200 5540 static int included_patches[] = 5201 5541 { /* Add new patch number below this line */ 5202 5542 /**/ 5543 + 84, 5544 +/**/ 5545 + 83, 5546 +/**/ 5547 + 82, 5548 +/**/ 5549 + 81, 5550 +/**/ 5551 + 80, 5552 +/**/ 5203 5553 + 79, 5204 5554 +/**/ … … 5364 5714 highest_patch() 5365 5715 { 5366 @@ -786,7 +9 43,7 @@5716 @@ -786,7 +953,7 @@ 5367 5717 MSG_PUTS(_("\nRISC OS version")); 5368 5718 #endif … … 5373 5723 if (*compiled_arch != NUL) 5374 5724 { 5375 @@ -825,6 +9 82,19 @@5725 @@ -825,6 +992,19 @@ 5376 5726 } 5377 5727 } … … 5395 5745 diff -Naur vim72.orig/src/vim.h vim72/src/vim.h 5396 5746 --- vim72.orig/src/vim.h 2008-08-09 09:03:38.000000000 -0700 5397 +++ vim72/src/vim.h 2009-01- 08 20:57:39.000000000 -08005747 +++ vim72/src/vim.h 2009-01-19 00:09:15.000000000 -0800 5398 5748 @@ -341,8 +341,14 @@ 5399 5749 #ifdef BACKSLASH_IN_FILENAME … … 5455 5805 diff -Naur vim72.orig/src/window.c vim72/src/window.c 5456 5806 --- vim72.orig/src/window.c 2008-08-06 04:00:30.000000000 -0700 5457 +++ vim72/src/window.c 2009-01- 08 20:57:44.000000000 -08005807 +++ vim72/src/window.c 2009-01-19 00:09:40.000000000 -0800 5458 5808 @@ -4028,14 +4028,14 @@ 5459 5809 if (mch_dirname(cwd, MAXPATHL) == OK) … … 5476 5826 diff -Naur vim72.orig/src/workshop.c vim72/src/workshop.c 5477 5827 --- vim72.orig/src/workshop.c 2008-06-21 11:53:26.000000000 -0700 5478 +++ vim72/src/workshop.c 2009-01- 08 20:57:43.000000000 -08005828 +++ vim72/src/workshop.c 2009-01-19 00:09:33.000000000 -0800 5479 5829 @@ -1121,8 +1121,12 @@ 5480 5830 ? (char *)curbuf->b_sfname : "<None>");
Note:
See TracChangeset
for help on using the changeset viewer.
