Changeset badccbe for patches/vim-7.2-branch_update-21.patch
- Timestamp:
- Sep 12, 2009, 8:49:51 AM (15 years ago)
- Branches:
- clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
- Children:
- 18eabd2
- Parents:
- ae4c185
- File:
-
- 1 moved
-
patches/vim-7.2-branch_update-21.patch (moved) (moved from patches/vim-7.2-branch_update-19.patch ) (468 diffs)
Legend:
- Unmodified
- Added
- Removed
-
patches/vim-7.2-branch_update-21.patch
rae4c185 rbadccbe 1 1 Submitted By: Jim Gifford (jim at cross-lfs dot org) 2 Date: 0 7-19-20092 Date: 09-12-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.2 346 Description: Contains all upstream patches up to 7.2.259 7 7 The following patches were skipped 8 007 036 041 049 071 072 074 088 089 093 101 138 150 172 173 191 194 204 205 212 216 219 233 8 007 036 041 049 071 072 074 088 089 093 101 138 150 172 173 191 194 204 205 212 216 219 233 247 248 249 250 9 9 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-0 7-19 15:17:20.000000000 -070012 +++ vim72/Filelist 2009-09-12 08:39:38.000000000 -0700 13 13 @@ -285,6 +285,7 @@ 14 14 src/proto/os_win32.pro \ … … 31 31 diff -Naur vim72.orig/runtime/doc/cmdline.txt vim72/runtime/doc/cmdline.txt 32 32 --- vim72.orig/runtime/doc/cmdline.txt 2008-08-09 07:22:59.000000000 -0700 33 +++ vim72/runtime/doc/cmdline.txt 2009-0 7-19 15:19:00.000000000 -070033 +++ vim72/runtime/doc/cmdline.txt 2009-09-12 08:41:24.000000000 -0700 34 34 @@ -1,4 +1,4 @@ 35 35 -*cmdline.txt* For Vim version 7.2. Last change: 2008 Jul 29 … … 112 112 diff -Naur vim72.orig/runtime/doc/eval.txt vim72/runtime/doc/eval.txt 113 113 --- vim72.orig/runtime/doc/eval.txt 2008-08-09 07:22:59.000000000 -0700 114 +++ vim72/runtime/doc/eval.txt 2009-0 7-19 15:15:05.000000000 -0700114 +++ vim72/runtime/doc/eval.txt 2009-09-12 08:37:22.000000000 -0700 115 115 @@ -1,4 +1,4 @@ 116 116 -*eval.txt* For Vim version 7.2. Last change: 2008 Aug 09 … … 248 248 diff -Naur vim72.orig/runtime/doc/if_cscop.txt vim72/runtime/doc/if_cscop.txt 249 249 --- vim72.orig/runtime/doc/if_cscop.txt 2008-08-09 07:22:59.000000000 -0700 250 +++ vim72/runtime/doc/if_cscop.txt 2009-0 7-19 15:18:44.000000000 -0700250 +++ vim72/runtime/doc/if_cscop.txt 2009-09-12 08:41:56.000000000 -0700 251 251 @@ -1,4 +1,4 @@ 252 252 -*if_cscop.txt* For Vim version 7.2. Last change: 2005 Mar 29 … … 296 296 ============================================================================== 297 297 6. Suggested usage *cscope-suggestions* 298 @@ -475,7 +481,8 @@ 299 any problems, suggestions, patches, et al., you have for the usage of 300 cscope within Vim to him. 301 *cscope-win32* 302 -For a cscope version for Win32 see: http://iamphet.nm.ru/cscope/index.html 303 +For a cscope version for Win32 see: 304 + http://code.google.com/p/cscope-win32/ 305 306 Win32 support was added by Sergey Khorev <sergey.khorev@gmail.com>. Contact 307 him if you have Win32-specific issues. 298 308 diff -Naur vim72.orig/runtime/doc/netbeans.txt vim72/runtime/doc/netbeans.txt 299 309 --- vim72.orig/runtime/doc/netbeans.txt 2008-08-09 07:22:59.000000000 -0700 300 +++ vim72/runtime/doc/netbeans.txt 2009-0 7-19 15:12:02.000000000 -0700310 +++ vim72/runtime/doc/netbeans.txt 2009-09-12 08:34:15.000000000 -0700 301 311 @@ -1,4 +1,4 @@ 302 312 -*netbeans.txt* For Vim version 7.2. Last change: 2008 Jun 28 … … 320 330 diff -Naur vim72.orig/runtime/doc/options.txt vim72/runtime/doc/options.txt 321 331 --- vim72.orig/runtime/doc/options.txt 2008-08-09 07:22:59.000000000 -0700 322 +++ vim72/runtime/doc/options.txt 2009-0 7-19 15:17:33.000000000 -0700332 +++ vim72/runtime/doc/options.txt 2009-09-12 08:39:52.000000000 -0700 323 333 @@ -1,4 +1,4 @@ 324 334 -*options.txt* For Vim version 7.2. Last change: 2008 Aug 06 … … 366 376 diff -Naur vim72.orig/runtime/doc/spell.txt vim72/runtime/doc/spell.txt 367 377 --- vim72.orig/runtime/doc/spell.txt 2008-08-09 07:23:00.000000000 -0700 368 +++ vim72/runtime/doc/spell.txt 2009-0 7-19 15:11:11.000000000 -0700378 +++ vim72/runtime/doc/spell.txt 2009-09-12 08:33:24.000000000 -0700 369 379 @@ -1,4 +1,4 @@ 370 380 -*spell.txt* For Vim version 7.2. Last change: 2008 Jun 21 … … 496 506 diff -Naur vim72.orig/runtime/doc/starting.txt vim72/runtime/doc/starting.txt 497 507 --- vim72.orig/runtime/doc/starting.txt 2008-08-09 07:23:00.000000000 -0700 498 +++ vim72/runtime/doc/starting.txt 2009-0 7-19 15:09:53.000000000 -0700508 +++ vim72/runtime/doc/starting.txt 2009-09-12 08:32:04.000000000 -0700 499 509 @@ -1,4 +1,4 @@ 500 510 -*starting.txt* For Vim version 7.2. Last change: 2008 Jun 21 … … 558 568 diff -Naur vim72.orig/runtime/doc/usr_21.txt vim72/runtime/doc/usr_21.txt 559 569 --- vim72.orig/runtime/doc/usr_21.txt 2008-08-09 07:23:01.000000000 -0700 560 +++ vim72/runtime/doc/usr_21.txt 2009-0 7-19 15:09:53.000000000 -0700570 +++ vim72/runtime/doc/usr_21.txt 2009-09-12 08:32:04.000000000 -0700 561 571 @@ -1,4 +1,4 @@ 562 572 -*usr_21.txt* For Vim version 7.2. Last change: 2007 May 01 … … 625 635 diff -Naur vim72.orig/runtime/doc/various.txt vim72/runtime/doc/various.txt 626 636 --- vim72.orig/runtime/doc/various.txt 2008-08-09 07:23:01.000000000 -0700 627 +++ vim72/runtime/doc/various.txt 2009-0 7-19 15:18:31.000000000 -0700637 +++ vim72/runtime/doc/various.txt 2009-09-12 08:40:55.000000000 -0700 628 638 @@ -508,6 +508,17 @@ 629 639 messages though. Use ":silent" in the command itself … … 646 656 diff -Naur vim72.orig/runtime/scripts.vim vim72/runtime/scripts.vim 647 657 --- vim72.orig/runtime/scripts.vim 2008-08-08 15:27:21.000000000 -0700 648 +++ vim72/runtime/scripts.vim 2009-0 7-19 15:08:47.000000000 -0700658 +++ vim72/runtime/scripts.vim 2009-09-12 08:30:57.000000000 -0700 649 659 @@ -234,6 +234,10 @@ 650 660 elseif s:line1 =~ '\<DTD\s\+XHTML\s' … … 660 670 diff -Naur vim72.orig/src/auto/configure vim72/src/auto/configure 661 671 --- vim72.orig/src/auto/configure 2008-07-24 05:40:36.000000000 -0700 662 +++ vim72/src/auto/configure 2009-0 7-19 15:16:46.000000000 -0700672 +++ vim72/src/auto/configure 2009-09-12 08:42:09.000000000 -0700 663 673 @@ -1,6 +1,6 @@ 664 674 #! /bin/sh … … 1154 1164 cat >>confdefs.h <<\_ACEOF 1155 1165 #define HAVE_SELINUX 1 1156 @@ -5891,7 +5898,7 @@ 1166 @@ -5745,7 +5752,10 @@ 1167 fi 1168 rubyldflags=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG["LDFLAGS"]'` 1169 if test "X$rubyldflags" != "X"; then 1170 - LDFLAGS="$rubyldflags $LDFLAGS" 1171 + rubyldflags=`echo "$rubyldflags" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//'` 1172 + if test "X$rubyldflags" != "X"; then 1173 + LDFLAGS="$rubyldflags $LDFLAGS" 1174 + fi 1175 fi 1176 RUBY_SRC="if_ruby.c" 1177 RUBY_OBJ="objects/if_ruby.o" 1178 @@ -5891,7 +5901,7 @@ 1157 1179 fi 1158 1180 { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5 … … 1163 1185 #define HAVE_LIBSOCKET 1 1164 1186 _ACEOF 1165 @@ -5966,7 +597 3,7 @@1187 @@ -5966,7 +5976,7 @@ 1166 1188 fi 1167 1189 { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 … … 1172 1194 #define HAVE_LIBNSL 1 1173 1195 _ACEOF 1174 @@ -6203,8 +621 0,8 @@1196 @@ -6203,8 +6213,8 @@ 1175 1197 have_x=disabled 1176 1198 else … … 1183 1205 *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then 1184 1206 $as_echo_n "(cached) " >&6 1185 @@ -6242,7 +62 49,7 @@1207 @@ -6242,7 +6252,7 @@ 1186 1208 *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; 1187 1209 esac … … 1192 1214 esac 1193 1215 fi 1194 @@ -6682,7 +66 89,7 @@1216 @@ -6682,7 +6692,7 @@ 1195 1217 fi 1196 1218 { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 … … 1201 1223 fi 1202 1224 1203 @@ -6752,7 +67 59,7 @@1225 @@ -6752,7 +6762,7 @@ 1204 1226 fi 1205 1227 { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 … … 1210 1232 fi 1211 1233 1212 @@ -6924,7 +693 1,7 @@1234 @@ -6924,7 +6934,7 @@ 1213 1235 fi 1214 1236 { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 … … 1219 1241 fi 1220 1242 1221 @@ -6994,7 +700 1,7 @@1243 @@ -6994,7 +7004,7 @@ 1222 1244 fi 1223 1245 { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5 … … 1228 1250 fi 1229 1251 1230 @@ -7160,7 +71 67,7 @@1252 @@ -7160,7 +7170,7 @@ 1231 1253 fi 1232 1254 { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 … … 1237 1259 fi 1238 1260 1239 @@ -7319,7 +732 6,7 @@1261 @@ -7319,7 +7329,7 @@ 1240 1262 fi 1241 1263 { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5 … … 1246 1268 fi 1247 1269 1248 @@ -7478,7 +748 5,7 @@1270 @@ -7478,7 +7488,7 @@ 1249 1271 fi 1250 1272 { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5 … … 1255 1277 fi 1256 1278 1257 @@ -7559,7 +756 6,7 @@1279 @@ -7559,7 +7569,7 @@ 1258 1280 fi 1259 1281 { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 … … 1264 1286 fi 1265 1287 1266 @@ -7727,7 +773 4,7 @@1288 @@ -7727,7 +7737,7 @@ 1267 1289 fi 1268 1290 { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xdmcp__XdmcpAuthDoIt" >&5 … … 1273 1295 fi 1274 1296 1275 @@ -7797,7 +780 4,7 @@1297 @@ -7797,7 +7807,7 @@ 1276 1298 fi 1277 1299 { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceOpenConnection" >&5 … … 1282 1304 fi 1283 1305 1284 @@ -7868,7 +787 5,7 @@1306 @@ -7868,7 +7878,7 @@ 1285 1307 fi 1286 1308 { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&5 … … 1291 1313 fi 1292 1314 1293 @@ -7970,6 +79 77,82 @@1315 @@ -7970,6 +7980,82 @@ 1294 1316 1295 1317 LDFLAGS="$ac_save_LDFLAGS" … … 1374 1396 fi 1375 1397 1376 @@ -9251,7 +933 4,7 @@1398 @@ -9251,7 +9337,7 @@ 1377 1399 fi 1378 1400 { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XShapeQueryExtension" >&5 … … 1383 1405 fi 1384 1406 1385 @@ -9320,7 +940 3,7 @@1407 @@ -9320,7 +9406,7 @@ 1386 1408 fi 1387 1409 { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_w_wslen" >&5 … … 1392 1414 fi 1393 1415 1394 @@ -9389,7 +947 2,7 @@1416 @@ -9389,7 +9475,7 @@ 1395 1417 fi 1396 1418 { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlsym" >&5 … … 1401 1423 fi 1402 1424 1403 @@ -9458,7 +954 1,7 @@1425 @@ -9458,7 +9544,7 @@ 1404 1426 fi 1405 1427 { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xmu_XmuCreateStippledPixmap" >&5 … … 1410 1432 fi 1411 1433 1412 @@ -9528,7 +961 1,7 @@1434 @@ -9528,7 +9614,7 @@ 1413 1435 fi 1414 1436 { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xp_XpEndJob" >&5 … … 1419 1441 fi 1420 1442 1421 @@ -9699,8 +978 2,9 @@1443 @@ -9699,8 +9785,9 @@ 1422 1444 $as_echo "$ac_res" >&6; } 1423 1445 … … 1431 1453 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 1432 1454 _ACEOF 1433 @@ -9852,8 +993 6,9 @@1455 @@ -9852,8 +9939,9 @@ 1434 1456 $as_echo "$ac_res" >&6; } 1435 1457 … … 1443 1465 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 1444 1466 _ACEOF 1445 @@ -10098,8 +1018 3,9 @@1467 @@ -10098,8 +10186,9 @@ 1446 1468 $as_echo "$ac_res" >&6; } 1447 1469 … … 1455 1477 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 1456 1478 _ACEOF 1457 @@ -10489,7 +1057 5,7 @@1479 @@ -10489,7 +10578,7 @@ 1458 1480 $as_echo "$ac_cv_header_elf_h" >&6; } 1459 1481 … … 1464 1486 fi 1465 1487 1466 @@ -10555,7 +1064 1,7 @@1488 @@ -10555,7 +10644,7 @@ 1467 1489 fi 1468 1490 { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_elf_main" >&5 … … 1473 1495 #define HAVE_LIBELF 1 1474 1496 _ACEOF 1475 @@ -10629,8 +1071 5,9 @@1497 @@ -10629,8 +10718,9 @@ 1476 1498 $as_echo "$as_val"'` 1477 1499 { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 … … 1485 1507 #define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 1486 1508 _ACEOF 1487 @@ -10916,7 +1100 3,6 @@1509 @@ -10916,7 +11006,6 @@ 1488 1510 1489 1511 … … 1493 1515 termcap.h fcntl.h sgtty.h sys/ioctl.h sys/time.h sys/types.h termio.h \ 1494 1516 iconv.h langinfo.h math.h unistd.h stropts.h errno.h \ 1495 @@ -10924,7 +1101 0,7 @@1517 @@ -10924,7 +11013,7 @@ 1496 1518 sys/stream.h termios.h libc.h sys/statfs.h \ 1497 1519 poll.h sys/poll.h pwd.h utime.h sys/param.h libintl.h \ … … 1502 1524 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` 1503 1525 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then 1504 @@ -11058,8 +1114 4,9 @@1526 @@ -11058,8 +11147,9 @@ 1505 1527 $as_echo "$ac_res" >&6; } 1506 1528 … … 1514 1536 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 1515 1537 _ACEOF 1516 @@ -11122,8 +112 09,74 @@1538 @@ -11122,8 +11212,74 @@ 1517 1539 $as_echo "$as_val"'` 1518 1540 { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 … … 1591 1613 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 1592 1614 _ACEOF 1593 @@ -11322,8 +1147 5,9 @@1615 @@ -11322,8 +11478,9 @@ 1594 1616 $as_echo "$ac_res" >&6; } 1595 1617 … … 1603 1625 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 1604 1626 _ACEOF 1605 @@ -11565,6 +117 19,67 @@1627 @@ -11565,6 +11722,67 @@ 1606 1628 1607 1629 fi … … 1671 1693 $as_echo_n "checking for mode_t... " >&6; } 1672 1694 if test "${ac_cv_type_mode_t+set}" = set; then 1673 @@ -11659,7 +1187 4,7 @@1695 @@ -11659,7 +11877,7 @@ 1674 1696 fi 1675 1697 { $as_echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5 … … 1680 1702 else 1681 1703 1682 @@ -11763,7 +119 78,7 @@1704 @@ -11763,7 +11981,7 @@ 1683 1705 fi 1684 1706 { $as_echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5 … … 1689 1711 else 1690 1712 1691 @@ -11867,7 +1208 2,7 @@1713 @@ -11867,7 +12085,7 @@ 1692 1714 fi 1693 1715 { $as_echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5 … … 1698 1720 else 1699 1721 1700 @@ -11971,7 +1218 6,7 @@1722 @@ -11971,7 +12189,7 @@ 1701 1723 fi 1702 1724 { $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 … … 1707 1729 else 1708 1730 1709 @@ -12175,7 +1239 0,7 @@1731 @@ -12175,7 +12393,7 @@ 1710 1732 fi 1711 1733 { $as_echo "$as_me:$LINENO: result: $ac_cv_type_ino_t" >&5 … … 1716 1738 else 1717 1739 1718 @@ -12279,7 +1249 4,7 @@1740 @@ -12279,7 +12497,7 @@ 1719 1741 fi 1720 1742 { $as_echo "$as_me:$LINENO: result: $ac_cv_type_dev_t" >&5 … … 1725 1747 else 1726 1748 1727 @@ -12569,8 +1278 4,9 @@1749 @@ -12569,8 +12787,9 @@ 1728 1750 $as_echo "$as_val"'` 1729 1751 { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 … … 1737 1759 #define `$as_echo "HAVE_LIB${libname}" | $as_tr_cpp` 1 1738 1760 _ACEOF 1739 @@ -13818,8 +1403 4,9 @@1761 @@ -13818,8 +14037,9 @@ 1740 1762 $as_echo "$as_val"'` 1741 1763 { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 … … 1749 1771 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 1750 1772 _ACEOF 1751 @@ -14202,7 +144 19,7 @@1773 @@ -14202,7 +14422,7 @@ 1752 1774 fi 1753 1775 { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_strtod" >&5 … … 1758 1780 #define HAVE_LIBM 1 1759 1781 _ACEOF 1760 @@ -14362,7 +145 79,7 @@1782 @@ -14362,7 +14582,7 @@ 1761 1783 fi 1762 1784 { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix1e_acl_get_file" >&5 … … 1767 1789 else 1768 1790 { $as_echo "$as_me:$LINENO: checking for acl_get_file in -lacl" >&5 1769 @@ -14430,7 +146 47,7 @@1791 @@ -14430,7 +14650,7 @@ 1770 1792 fi 1771 1793 { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_acl_acl_get_file" >&5 … … 1776 1798 { $as_echo "$as_me:$LINENO: checking for fgetxattr in -lattr" >&5 1777 1799 $as_echo_n "checking for fgetxattr in -lattr... " >&6; } 1778 @@ -14497,7 +1471 4,7 @@1800 @@ -14497,7 +14717,7 @@ 1779 1801 fi 1780 1802 { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_attr_fgetxattr" >&5 … … 1785 1807 fi 1786 1808 1787 @@ -15226,7 +1544 3,6 @@1809 @@ -15226,7 +15446,6 @@ 1788 1810 1789 1811 … … 1793 1815 #include "confdefs.h" 1794 1816 #ifdef HAVE_STRING_H 1795 @@ -15458,7 +1567 4,7 @@1817 @@ -15458,7 +15677,7 @@ 1796 1818 if test "$enable_multibyte" = "yes"; then 1797 1819 cflags_save=$CFLAGS … … 1802 1824 LDFLAGS="$X_LIBS $LDFLAGS -lX11" 1803 1825 { $as_echo "$as_me:$LINENO: checking whether X_LOCALE needed" >&5 1804 @@ -15635,7 +1585 1,7 @@1826 @@ -15635,7 +15854,7 @@ 1805 1827 fi 1806 1828 { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_xpg4__xpg4_setrunelocale" >&5 … … 1811 1833 fi 1812 1834 1813 @@ -15646,6 +1586 2,7 @@1835 @@ -15646,6 +15865,7 @@ 1814 1836 if (eval ctags --version /dev/null | grep Exuberant) < /dev/null 1>&5 2>&1; then 1815 1837 TAGPRG="ctags -I INIT+ --fields=+S" … … 1819 1841 (eval etags -c /dev/null) < /dev/null 1>&5 2>&1 && TAGPRG="etags -c" 1820 1842 (eval ctags /dev/null) < /dev/null 1>&5 2>&1 && TAGPRG="ctags" 1821 @@ -15933,8 +1615 0,9 @@1843 @@ -15933,8 +16153,9 @@ 1822 1844 $as_echo "$as_val"'` 1823 1845 { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 … … 1831 1853 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 1832 1854 _ACEOF 1833 @@ -16134,7 +1635 2,7 @@1855 @@ -16134,7 +16355,7 @@ 1834 1856 $as_echo "$ac_cv_header_dlfcn_h" >&6; } 1835 1857 … … 1840 1862 else 1841 1863 if test "${ac_cv_header_dl_h+set}" = set; then 1842 @@ -16264,7 +1648 2,7 @@1864 @@ -16264,7 +16485,7 @@ 1843 1865 $as_echo "$ac_cv_header_dl_h" >&6; } 1844 1866 … … 1849 1871 fi 1850 1872 1851 @@ -16783,8 +1700 1,9 @@1873 @@ -16783,8 +17004,9 @@ 1852 1874 $as_echo "$ac_res" >&6; } 1853 1875 … … 1861 1883 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 1862 1884 _ACEOF 1863 @@ -16819,21 +170 38,29 @@1885 @@ -16819,21 +17041,29 @@ 1864 1886 LDFLAGS="$LDFLAGS -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc" 1865 1887 fi … … 1889 1911 +$as_echo_n "checking whether we need -D_FORTIFY_SOURCE=1... " >&6; } 1890 1912 + if test "$gccmajor" -gt "3"; then 1891 + CFLAGS= "$CFLAGS -D_FORTIFY_SOURCE=1"1913 + CFLAGS=`echo "$CFLAGS -D_FORTIFY_SOURCE=1" | sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//g' -e 's/-D_FORTIFY_SOURCE=2//g'` 1892 1914 + { $as_echo "$as_me:$LINENO: result: yes" >&5 1893 1915 $as_echo "yes" >&6; } … … 1899 1921 1900 1922 1901 @@ -16866,8 +1709 3,8 @@1923 @@ -16866,8 +17096,8 @@ 1902 1924 case $ac_val in #( 1903 1925 *${as_nl}*) … … 1910 1932 case $ac_var in #( 1911 1933 _ | IFS | as_nl) ;; #( 1912 @@ -17259,7 +1748 6,7 @@1934 @@ -17259,7 +17489,7 @@ 1913 1935 # values after options handling. 1914 1936 ac_log=" … … 1919 1941 CONFIG_FILES = $CONFIG_FILES 1920 1942 CONFIG_HEADERS = $CONFIG_HEADERS 1921 @@ -17272,6 +17 499,15 @@1943 @@ -17272,6 +17502,15 @@ 1922 1944 1923 1945 _ACEOF … … 1935 1957 # Files that config.status was made for. 1936 1958 config_files="$ac_config_files" 1937 @@ -17284,16 +1752 0,17 @@1959 @@ -17284,16 +17523,17 @@ 1938 1960 \`$as_me' instantiates files from templates according to the 1939 1961 current configuration. … … 1957 1979 1958 1980 Configuration files: 1959 @@ -17308,7 +1754 5,7 @@1981 @@ -17308,7 +17548,7 @@ 1960 1982 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 1961 1983 ac_cs_version="\\ … … 1966 1988 1967 1989 Copyright (C) 2008 Free Software Foundation, Inc. 1968 @@ -17505,7 +1774 2,8 @@1990 @@ -17505,7 +17745,8 @@ 1969 1991 $as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} 1970 1992 { (exit 1); exit 1; }; } … … 1976 1998 elif $ac_last_try; then 1977 1999 { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 1978 @@ -17710,9 +179 48,9 @@2000 @@ -17710,9 +17951,9 @@ 1979 2001 } 1980 2002 split(mac1, mac2, "(") #) … … 1987 2009 next 1988 2010 } else { 1989 @@ -17720,7 +179 58,7 @@2011 @@ -17720,7 +17961,7 @@ 1990 2012 # in the case of _POSIX_SOURCE, which is predefined and required 1991 2013 # on some systems where configure will not decide to define it. … … 1996 2018 } 1997 2019 } 1998 @@ -17744,8 +1798 2,8 @@2020 @@ -17744,8 +17985,8 @@ 1999 2021 esac 2000 2022 case $ac_mode$ac_tag in … … 2007 2029 :[FH]-) ac_tag=-:-;; 2008 2030 :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; 2009 @@ -18063,8 +1830 1,8 @@2031 @@ -18063,8 +18304,8 @@ 2010 2032 $ac_cs_success || { (exit 1); exit 1; } 2011 2033 fi … … 2020 2042 diff -Naur vim72.orig/src/buffer.c vim72/src/buffer.c 2021 2043 --- vim72.orig/src/buffer.c 2008-08-06 04:00:48.000000000 -0700 2022 +++ vim72/src/buffer.c 2009-0 7-19 15:16:33.000000000 -07002044 +++ vim72/src/buffer.c 2009-09-12 08:38:51.000000000 -0700 2023 2045 @@ -44,6 +44,7 @@ 2024 2046 #ifdef FEAT_TITLE … … 2547 2569 diff -Naur vim72.orig/src/charset.c vim72/src/charset.c 2548 2570 --- vim72.orig/src/charset.c 2008-07-24 07:59:44.000000000 -0700 2549 +++ vim72/src/charset.c 2009-0 7-19 15:15:54.000000000 -07002571 +++ vim72/src/charset.c 2009-09-12 08:42:12.000000000 -0700 2550 2572 @@ -17,7 +17,7 @@ 2551 2573 static int win_nolbr_chartabsize __ARGS((win_T *wp, char_u *s, colnr_T col, int *headp)); … … 2557 2579 static int chartab_initialized = FALSE; 2558 2580 2559 @@ -664,7 +664,7 @@ 2581 @@ -174,6 +174,11 @@ 2582 if (VIM_ISDIGIT(*p)) 2583 c = getdigits(&p); 2584 else 2585 +#ifdef FEAT_MBYTE 2586 + if (has_mbyte) 2587 + c = mb_ptr2char_adv(&p); 2588 + else 2589 +#endif 2590 c = *p++; 2591 c2 = -1; 2592 if (*p == '-' && p[1] != NUL) 2593 @@ -664,7 +669,7 @@ 2560 2594 } 2561 2595 #endif … … 2566 2600 buf[++i] = NUL; 2567 2601 } 2568 @@ -674,9 +67 4,9 @@2602 @@ -674,9 +679,9 @@ 2569 2603 * Lower case letters are used to avoid the confusion of <F1> being 0xf1 or 2570 2604 * function key 1. … … 2578 2612 if ((c & 0xf) <= 9) 2579 2613 return (c & 0xf) + '0'; 2580 @@ -884,7 +88 4,7 @@2614 @@ -884,7 +889,7 @@ 2581 2615 if (c >= 0x100) 2582 2616 { … … 2587 2621 return utf_class(c) >= 2; 2588 2622 } 2589 @@ -1090,7 +109 0,7 @@2623 @@ -1090,7 +1095,7 @@ 2590 2624 */ 2591 2625 numberextra = win_col_off(wp); … … 2596 2630 { 2597 2631 n = colmax + win_col_off2(wp); 2598 @@ -1201,17 +120 1,17 @@2632 @@ -1201,17 +1206,17 @@ 2599 2633 win_T *wp; 2600 2634 colnr_T vcol; … … 2618 2652 width2 = width1 + win_col_off2(wp); 2619 2653 return ((vcol - width1) % width2 == width2 - 1); 2620 @@ -1396,13 +1 396,13 @@2654 @@ -1396,13 +1401,13 @@ 2621 2655 # ifdef FEAT_MBYTE 2622 2656 /* Cannot put the cursor on part of a wide character. */ … … 2636 2670 diff -Naur vim72.orig/src/config.h.in vim72/src/config.h.in 2637 2671 --- vim72.orig/src/config.h.in 2008-06-21 08:01:41.000000000 -0700 2638 +++ vim72/src/config.h.in 2009-0 7-19 15:16:46.000000000 -07002672 +++ vim72/src/config.h.in 2009-09-12 08:39:05.000000000 -0700 2639 2673 @@ -36,6 +36,9 @@ 2640 2674 /* Defined to the size of an int */ … … 2659 2693 diff -Naur vim72.orig/src/configure.in vim72/src/configure.in 2660 2694 --- vim72.orig/src/configure.in 2008-07-24 05:40:26.000000000 -0700 2661 +++ vim72/src/configure.in 2009-07-19 15:16:46.000000000 -0700 2662 @@ -1193,6 +1193,28 @@ 2695 +++ vim72/src/configure.in 2009-09-12 08:42:09.000000000 -0700 2696 @@ -957,7 +957,13 @@ 2697 fi 2698 rubyldflags=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG[["LDFLAGS"]]'` 2699 if test "X$rubyldflags" != "X"; then 2700 - LDFLAGS="$rubyldflags $LDFLAGS" 2701 + dnl Ruby on Mac OS X 10.5 adds "-arch" flags but these should only 2702 + dnl be included if requested by passing --with-mac-arch to 2703 + dnl configure, so strip these flags first (if present) 2704 + rubyldflags=`echo "$rubyldflags" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//'` 2705 + if test "X$rubyldflags" != "X"; then 2706 + LDFLAGS="$rubyldflags $LDFLAGS" 2707 + fi 2708 fi 2709 RUBY_SRC="if_ruby.c" 2710 RUBY_OBJ="objects/if_ruby.o" 2711 @@ -1193,6 +1199,28 @@ 2663 2712 2664 2713 LDFLAGS="$ac_save_LDFLAGS" … … 2689 2738 fi 2690 2739 2691 @@ -2095,7 +21 17,7 @@2740 @@ -2095,7 +2123,7 @@ 2692 2741 sys/stream.h termios.h libc.h sys/statfs.h \ 2693 2742 poll.h sys/poll.h pwd.h utime.h sys/param.h libintl.h \ … … 2698 2747 dnl sys/ptem.h depends on sys/stream.h on Solaris 2699 2748 AC_CHECK_HEADERS(sys/ptem.h, [], [], 2700 @@ -2103,6 +21 25,12 @@2749 @@ -2103,6 +2131,12 @@ 2701 2750 # include <sys/stream.h> 2702 2751 #endif]) … … 2711 2760 dnl pthread_np.h may exist but can only be used after including pthread.h 2712 2761 AC_MSG_CHECKING([for pthread_np.h]) 2713 @@ -2148,6 +21 76,7 @@2762 @@ -2148,6 +2182,7 @@ 2714 2763 dnl Checks for typedefs, structures, and compiler characteristics. 2715 2764 AC_PROG_GCC_TRADITIONAL … … 2719 2768 AC_TYPE_OFF_T 2720 2769 AC_TYPE_PID_T 2721 @@ -2869,7 +2 898,6 @@2770 @@ -2869,7 +2904,6 @@ 2722 2771 AC_MSG_RESULT($ac_cv_sizeof_int) 2723 2772 AC_DEFINE_UNQUOTED(SIZEOF_INT, $ac_cv_sizeof_int) … … 2727 2776 dnl present, fixes problem with incompatibility between Solaris 2.4 and 2.5. 2728 2777 2729 @@ -2951,7 +29 79,7 @@2778 @@ -2951,7 +2985,7 @@ 2730 2779 if test "$enable_multibyte" = "yes"; then 2731 2780 cflags_save=$CFLAGS … … 2736 2785 LDFLAGS="$X_LIBS $LDFLAGS -lX11" 2737 2786 AC_MSG_CHECKING(whether X_LOCALE needed) 2738 @@ -2967,7 + 2995,7 @@2787 @@ -2967,7 +3001,7 @@ 2739 2788 dnl Link with xpg4, it is said to make Korean locale working 2740 2789 AC_CHECK_LIB(xpg4, _xpg4_setrunelocale, [LIBS="$LIBS -lxpg4"],,) … … 2745 2794 dnl Add --fields=+S to get function signatures for omni completion. 2746 2795 dnl -t for typedefs (many ctags have this) 2747 @@ -2979,6 +30 07,7 @@2796 @@ -2979,6 +3013,7 @@ 2748 2797 if (eval ctags --version /dev/null | grep Exuberant) < /dev/null 1>&AC_FD_CC 2>&1; then 2749 2798 TAGPRG="ctags -I INIT+ --fields=+S" … … 2753 2802 (eval etags -c /dev/null) < /dev/null 1>&AC_FD_CC 2>&1 && TAGPRG="etags -c" 2754 2803 (eval ctags /dev/null) < /dev/null 1>&AC_FD_CC 2>&1 && TAGPRG="ctags" 2755 @@ -3152,18 +318 1,25 @@2804 @@ -3152,18 +3187,25 @@ 2756 2805 dnl But only when making dependencies, cproto and lint don't take "-isystem". 2757 2806 dnl Mac gcc returns "powerpc-apple-darwin8-gcc-4.0.1 (GCC)...", need to allow … … 2772 2821 + AC_MSG_CHECKING(whether we need -D_FORTIFY_SOURCE=1) 2773 2822 + if test "$gccmajor" -gt "3"; then 2774 + CFLAGS= "$CFLAGS -D_FORTIFY_SOURCE=1"2823 + CFLAGS=`echo "$CFLAGS -D_FORTIFY_SOURCE=1" | sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//g' -e 's/-D_FORTIFY_SOURCE=2//g'` 2775 2824 + AC_MSG_RESULT(yes) 2776 2825 + else … … 2787 2836 diff -Naur vim72.orig/src/diff.c vim72/src/diff.c 2788 2837 --- vim72.orig/src/diff.c 2008-03-05 03:16:56.000000000 -0800 2789 +++ vim72/src/diff.c 2009-0 7-19 15:16:00.000000000 -07002838 +++ vim72/src/diff.c 2009-09-12 08:41:38.000000000 -0700 2790 2839 @@ -8,7 +8,7 @@ 2791 2840 */ … … 2926 2975 char_u *newname = NULL; /* name of patched file buffer */ 2927 2976 #ifdef UNIX 2928 @@ -905,16 +923,17 @@ 2977 @@ -876,6 +894,7 @@ 2978 char_u *browseFile = NULL; 2979 int browse_flag = cmdmod.browse; 2980 #endif 2981 + struct stat st; 2982 2983 #ifdef FEAT_BROWSE 2984 if (cmdmod.browse) 2985 @@ -905,16 +924,17 @@ 2929 2986 /* Get the absolute path of the patchfile, changing directory below. */ 2930 2987 fullname = FullName_save(eap->arg, FALSE); … … 2947 3004 * have our own temp dir use that instead, it will be cleaned up when we 2948 3005 * exit (any .rej files created). Don't change directory if we can't 2949 @@ -925,10 +94 4,10 @@3006 @@ -925,10 +945,10 @@ 2950 3007 { 2951 3008 # ifdef TEMPDIRNAMES … … 2960 3017 } 2961 3018 #endif 2962 @@ -946,7 +96 5,8 @@3019 @@ -946,7 +966,8 @@ 2963 3020 { 2964 3021 /* Build the patch command and execute it. Ignore errors. Switch to … … 2970 3027 fullname != NULL ? fullname : 2971 3028 # endif 2972 @@ -1138,7 +1158,7 @@ 3029 @@ -980,44 +1001,51 @@ 3030 STRCAT(buf, ".rej"); 3031 mch_remove(buf); 3032 3033 - if (curbuf->b_fname != NULL) 3034 + /* Only continue if the output file was created. */ 3035 + if (mch_stat((char *)tmp_new, &st) < 0 || st.st_size == 0) 3036 + EMSG(_("E816: Cannot read patch output")); 3037 + else 3038 { 3039 - newname = vim_strnsave(curbuf->b_fname, 3040 + if (curbuf->b_fname != NULL) 3041 + { 3042 + newname = vim_strnsave(curbuf->b_fname, 3043 (int)(STRLEN(curbuf->b_fname) + 4)); 3044 - if (newname != NULL) 3045 - STRCAT(newname, ".new"); 3046 - } 3047 + if (newname != NULL) 3048 + STRCAT(newname, ".new"); 3049 + } 3050 3051 #ifdef FEAT_GUI 3052 - need_mouse_correct = TRUE; 3053 + need_mouse_correct = TRUE; 3054 #endif 3055 - /* don't use a new tab page, each tab page has its own diffs */ 3056 - cmdmod.tab = 0; 3057 + /* don't use a new tab page, each tab page has its own diffs */ 3058 + cmdmod.tab = 0; 3059 3060 - if (win_split(0, (diff_flags & DIFF_VERTICAL) ? WSP_VERT : 0) != FAIL) 3061 - { 3062 - /* Pretend it was a ":split fname" command */ 3063 - eap->cmdidx = CMD_split; 3064 - eap->arg = tmp_new; 3065 - do_exedit(eap, old_curwin); 3066 - 3067 - if (curwin != old_curwin) /* split must have worked */ 3068 + if (win_split(0, (diff_flags & DIFF_VERTICAL) ? WSP_VERT : 0) != FAIL) 3069 { 3070 - /* Set 'diff', 'scrollbind' on and 'wrap' off. */ 3071 - diff_win_options(curwin, TRUE); 3072 - diff_win_options(old_curwin, TRUE); 3073 + /* Pretend it was a ":split fname" command */ 3074 + eap->cmdidx = CMD_split; 3075 + eap->arg = tmp_new; 3076 + do_exedit(eap, old_curwin); 3077 3078 - if (newname != NULL) 3079 + /* check that split worked and editing tmp_new */ 3080 + if (curwin != old_curwin && win_valid(old_curwin)) 3081 { 3082 - /* do a ":file filename.new" on the patched buffer */ 3083 - eap->arg = newname; 3084 - ex_file(eap); 3085 + /* Set 'diff', 'scrollbind' on and 'wrap' off. */ 3086 + diff_win_options(curwin, TRUE); 3087 + diff_win_options(old_curwin, TRUE); 3088 + 3089 + if (newname != NULL) 3090 + { 3091 + /* do a ":file filename.new" on the patched buffer */ 3092 + eap->arg = newname; 3093 + ex_file(eap); 3094 3095 #ifdef FEAT_AUTOCMD 3096 - /* Do filetype detection with the new name. */ 3097 - if (au_has_group((char_u *)"filetypedetect")) 3098 - do_cmdline_cmd((char_u *)":doau filetypedetect BufRead"); 3099 + /* Do filetype detection with the new name. */ 3100 + if (au_has_group((char_u *)"filetypedetect")) 3101 + do_cmdline_cmd((char_u *)":doau filetypedetect BufRead"); 3102 #endif 3103 + } 3104 } 3105 } 3106 } 3107 @@ -1138,7 +1166,7 @@ 2973 3108 2974 3109 for (wp = firstwin; wp != NULL; wp = wp->w_next) … … 2979 3114 /* Set 'diff', 'scrollbind' off and 'wrap' on. */ 2980 3115 wp->w_p_diff = FALSE; 2981 @@ -2114,6 +21 34,8 @@3116 @@ -2114,6 +2142,8 @@ 2982 3117 EMSG2(_("E102: Can't find buffer \"%s\""), eap->arg); 2983 3118 return; … … 2990 3125 diff -Naur vim72.orig/src/digraph.c vim72/src/digraph.c 2991 3126 --- vim72.orig/src/digraph.c 2008-06-23 14:12:51.000000000 -0700 2992 +++ vim72/src/digraph.c 2009-0 7-19 15:15:54.000000000 -07003127 +++ vim72/src/digraph.c 2009-09-12 08:38:11.000000000 -0700 2993 3128 @@ -32,7 +32,7 @@ 2994 3129 static void printdigraph __ARGS((digr_T *)); … … 3062 3197 diff -Naur vim72.orig/src/edit.c vim72/src/edit.c 3063 3198 --- vim72.orig/src/edit.c 2008-08-06 05:51:17.000000000 -0700 3064 +++ vim72/src/edit.c 2009-0 7-19 15:18:33.000000000 -07003199 +++ vim72/src/edit.c 2009-09-12 08:40:57.000000000 -0700 3065 3200 @@ -57,7 +57,7 @@ 3066 3201 N_(" Keyword Local completion (^N^P)"), … … 3734 3869 diff -Naur vim72.orig/src/eval.c vim72/src/eval.c 3735 3870 --- vim72.orig/src/eval.c 2008-08-07 12:37:22.000000000 -0700 3736 +++ vim72/src/eval.c 2009-0 7-19 15:17:12.000000000 -07003871 +++ vim72/src/eval.c 2009-09-12 08:39:30.000000000 -0700 3737 3872 @@ -32,6 +32,9 @@ 3738 3873 … … 6171 6306 diff -Naur vim72.orig/src/ex_cmds2.c vim72/src/ex_cmds2.c 6172 6307 --- vim72.orig/src/ex_cmds2.c 2008-07-13 09:18:22.000000000 -0700 6173 +++ vim72/src/ex_cmds2.c 2009-0 7-19 15:16:28.000000000 -07006308 +++ vim72/src/ex_cmds2.c 2009-09-12 08:38:46.000000000 -0700 6174 6309 @@ -28,7 +28,8 @@ 6175 6310 { … … 6306 6441 diff -Naur vim72.orig/src/ex_cmds.c vim72/src/ex_cmds.c 6307 6442 --- vim72.orig/src/ex_cmds.c 2008-08-04 12:15:00.000000000 -0700 6308 +++ vim72/src/ex_cmds.c 2009-0 7-19 15:18:39.000000000 -07006443 +++ vim72/src/ex_cmds.c 2009-09-12 08:41:03.000000000 -0700 6309 6444 @@ -24,7 +24,7 @@ 6310 6445 static void do_filter __ARGS((linenr_T line1, linenr_T line2, exarg_T *eap, char_u *cmd, int do_in, int do_out)); … … 7134 7269 diff -Naur vim72.orig/src/ex_cmds.h vim72/src/ex_cmds.h 7135 7270 --- vim72.orig/src/ex_cmds.h 2008-06-21 11:47:57.000000000 -0700 7136 +++ vim72/src/ex_cmds.h 2009-0 7-19 15:18:31.000000000 -07007271 +++ vim72/src/ex_cmds.h 2009-09-12 08:40:55.000000000 -0700 7137 7272 @@ -278,7 +278,7 @@ 7138 7273 EX(CMD_crewind, "crewind", ex_cc, … … 7191 7326 diff -Naur vim72.orig/src/ex_docmd.c vim72/src/ex_docmd.c 7192 7327 --- vim72.orig/src/ex_docmd.c 2008-07-26 04:51:05.000000000 -0700 7193 +++ vim72/src/ex_docmd.c 2009-0 7-19 15:18:41.000000000 -07007328 +++ vim72/src/ex_docmd.c 2009-09-12 08:41:05.000000000 -0700 7194 7329 @@ -364,6 +364,7 @@ 7195 7330 # define ex_function ex_ni … … 7980 8115 diff -Naur vim72.orig/src/ex_eval.c vim72/src/ex_eval.c 7981 8116 --- vim72.orig/src/ex_eval.c 2007-11-24 07:34:09.000000000 -0800 7982 +++ vim72/src/ex_eval.c 2009-0 7-19 15:16:23.000000000 -07008117 +++ vim72/src/ex_eval.c 2009-09-12 08:38:41.000000000 -0700 7983 8118 @@ -60,7 +60,9 @@ 7984 8119 #else … … 8026 8161 diff -Naur vim72.orig/src/ex_getln.c vim72/src/ex_getln.c 8027 8162 --- vim72.orig/src/ex_getln.c 2008-08-08 02:31:33.000000000 -0700 8028 +++ vim72/src/ex_getln.c 2009-0 7-19 15:18:07.000000000 -07008163 +++ vim72/src/ex_getln.c 2009-09-12 08:40:31.000000000 -0700 8029 8164 @@ -31,6 +31,8 @@ 8030 8165 int cmdattr; /* attributes for prompt */ … … 8336 8471 diff -Naur vim72.orig/src/farsi.c vim72/src/farsi.c 8337 8472 --- vim72.orig/src/farsi.c 2007-12-31 08:28:10.000000000 -0800 8338 +++ vim72/src/farsi.c 2009-0 7-19 15:16:23.000000000 -07008473 +++ vim72/src/farsi.c 2009-09-12 08:38:41.000000000 -0700 8339 8474 @@ -103,7 +103,8 @@ 8340 8475 case F_HE: … … 8389 8524 diff -Naur vim72.orig/src/feature.h vim72/src/feature.h 8390 8525 --- vim72.orig/src/feature.h 2008-08-06 04:00:39.000000000 -0700 8391 +++ vim72/src/feature.h 2009-0 7-19 15:09:53.000000000 -07008526 +++ vim72/src/feature.h 2009-09-12 08:32:04.000000000 -0700 8392 8527 @@ -767,9 +767,13 @@ 8393 8528 … … 8408 8543 diff -Naur vim72.orig/src/fileio.c vim72/src/fileio.c 8409 8544 --- vim72.orig/src/fileio.c 2008-08-06 04:01:03.000000000 -0700 8410 +++ vim72/src/fileio.c 2009-0 7-19 15:18:23.000000000 -07008545 +++ vim72/src/fileio.c 2009-09-12 08:42:30.000000000 -0700 8411 8546 @@ -69,7 +69,7 @@ 8412 8547 static int au_find_group __ARGS((char_u *name)); … … 8418 8553 #endif 8419 8554 8420 @@ -144,7 +144,9 @@ 8555 @@ -121,6 +121,8 @@ 8556 char_u *bw_conv_buf; /* buffer for writing converted chars */ 8557 int bw_conv_buflen; /* size of bw_conv_buf */ 8558 int bw_conv_error; /* set for conversion error */ 8559 + linenr_T bw_conv_error_lnum; /* first line with error or zero */ 8560 + linenr_T bw_start_lnum; /* line number at start of buffer */ 8561 # ifdef USE_ICONV 8562 iconv_t bw_iconv_fd; /* descriptor for iconv() or -1 */ 8563 # endif 8564 @@ -132,7 +134,7 @@ 8565 #ifdef FEAT_MBYTE 8566 static linenr_T readfile_linenr __ARGS((linenr_T linecnt, char_u *p, char_u *endp)); 8567 static int ucs2bytes __ARGS((unsigned c, char_u **pp, int flags)); 8568 -static int same_encoding __ARGS((char_u *a, char_u *b)); 8569 +static int need_conversion __ARGS((char_u *fenc)); 8570 static int get_fio_flags __ARGS((char_u *ptr)); 8571 static char_u *check_for_bom __ARGS((char_u *p, long size, int *lenp, int flags)); 8572 static int make_bom __ARGS((char_u *buf, char_u *name)); 8573 @@ -144,7 +146,9 @@ 8421 8574 # endif 8422 8575 #endif … … 8429 8582 void 8430 8583 filemess(buf, name, s, attr) 8431 @@ -295,6 +29 7,19 @@8584 @@ -295,6 +299,19 @@ 8432 8585 int conv_restlen = 0; /* nr of bytes in conv_rest[] */ 8433 8586 #endif … … 8449 8602 8450 8603 /* 8451 @@ -589,7 +60 4,21 @@8604 @@ -589,7 +606,21 @@ 8452 8605 #ifdef FEAT_QUICKFIX 8453 8606 if (!bt_dontwrite(curbuf)) … … 8471 8624 filemess(curbuf, sfname, (char_u *)_("[New File]"), 0); 8472 8625 else 8473 @@ -668,9 +69 7,21 @@8626 @@ -668,9 +699,21 @@ 8474 8627 #endif 8475 8628 { … … 8494 8647 #endif 8495 8648 } 8496 @@ -698,7 +7 39,6 @@8649 @@ -698,7 +741,6 @@ 8497 8650 { 8498 8651 int m = msg_scroll; … … 8502 8655 /* 8503 8656 * The file must be closed again, the autocommands may want to change 8504 @@ -740,8 +78 0,13 @@8657 @@ -740,8 +782,13 @@ 8505 8658 /* 8506 8659 * Don't allow the autocommands to change the current buffer. … … 8516 8669 { 8517 8670 --no_wait_return; 8518 @@ -932,7 +97 7,10 @@8671 @@ -932,7 +979,10 @@ 8519 8672 else 8520 8673 { … … 8527 8680 fileformat = EOL_UNIX; /* binary: use Unix format */ 8528 8681 else if (*p_ffs == NUL) 8529 @@ -2211,7 +2259,7 @@ 8682 @@ -993,13 +1043,12 @@ 8683 } 8684 8685 /* 8686 - * Conversion is required when the encoding of the file is different 8687 - * from 'encoding' or 'encoding' is UTF-16, UCS-2 or UCS-4 (requires 8688 - * conversion to UTF-8). 8689 + * Conversion may be required when the encoding of the file is different 8690 + * from 'encoding' or 'encoding' is UTF-16, UCS-2 or UCS-4. 8691 */ 8692 fio_flags = 0; 8693 - converted = (*fenc != NUL && !same_encoding(p_enc, fenc)); 8694 - if (converted || enc_unicode != 0) 8695 + converted = need_conversion(fenc); 8696 + if (converted) 8697 { 8698 8699 /* "ucs-bom" means we need to check the first bytes of the file 8700 @@ -2211,7 +2260,7 @@ 8530 8701 { 8531 8702 /* Use stderr for stdin, makes shell commands work. */ … … 8536 8707 #endif 8537 8708 8538 @@ -2341,11 +23 89,6 @@8709 @@ -2341,11 +2390,6 @@ 8539 8710 STRCAT(IObuff, _("[CR missing]")); 8540 8711 c = TRUE; … … 8548 8719 { 8549 8720 STRCAT(IObuff, _("[long lines split]")); 8550 @@ -2711,7 +275 4,7 @@8721 @@ -2711,7 +2755,7 @@ 8551 8722 { 8552 8723 if (!curbuf->b_marks_read && get_viminfo_parameter('\'') > 0 … … 8557 8728 /* Always set b_marks_read; needed when 'viminfo' is changed to include 8558 8729 * the ' parameter after opening a buffer. */ 8559 @@ -3451,12 +3494,12 @@ 8730 @@ -2881,6 +2925,7 @@ 8731 linenr_T lnum; 8732 long nchars; 8733 char_u *errmsg = NULL; 8734 + int errmsg_allocated = FALSE; 8735 char_u *errnum = NULL; 8736 char_u *buffer; 8737 char_u smallbuf[SMBUFSIZE]; 8738 @@ -2944,6 +2989,7 @@ 8739 /* must init bw_conv_buf and bw_iconv_fd before jumping to "fail" */ 8740 write_info.bw_conv_buf = NULL; 8741 write_info.bw_conv_error = FALSE; 8742 + write_info.bw_conv_error_lnum = 0; 8743 write_info.bw_restlen = 0; 8744 # ifdef USE_ICONV 8745 write_info.bw_iconv_fd = (iconv_t)-1; 8746 @@ -3451,12 +3497,12 @@ 8560 8747 { 8561 8748 # ifdef UNIX … … 8572 8759 # endif 8573 8760 /* Close the file before removing it, on MS-Windows we 8574 @@ -4367,14 +4410,14 @@ 8761 @@ -3922,10 +3968,9 @@ 8762 fenc = buf->b_p_fenc; 8763 8764 /* 8765 - * The file needs to be converted when 'fileencoding' is set and 8766 - * 'fileencoding' differs from 'encoding'. 8767 + * Check if the file needs to be converted. 8768 */ 8769 - converted = (*fenc != NUL && !same_encoding(p_enc, fenc)); 8770 + converted = need_conversion(fenc); 8771 8772 /* 8773 * Check if UTF-8 to UCS-2/4 or Latin1 conversion needs to be done. Or 8774 @@ -4200,6 +4245,7 @@ 8775 nchars += write_info.bw_len; 8776 } 8777 } 8778 + write_info.bw_start_lnum = start; 8779 #endif 8780 8781 write_info.bw_len = bufsize; 8782 @@ -4235,6 +4281,9 @@ 8783 nchars += bufsize; 8784 s = buffer; 8785 len = 0; 8786 +#ifdef FEAT_MBYTE 8787 + write_info.bw_start_lnum = lnum; 8788 +#endif 8789 } 8790 /* write failed or last line has no EOL: stop here */ 8791 if (end == 0 8792 @@ -4367,14 +4416,14 @@ 8575 8793 || st.st_uid != st_old.st_uid 8576 8794 || st.st_gid != st_old.st_gid) … … 8589 8807 buf_setino(buf); 8590 8808 #endif 8591 @@ -4782,6 +4825,8 @@ 8809 @@ -4431,7 +4480,17 @@ 8810 { 8811 #ifdef FEAT_MBYTE 8812 if (write_info.bw_conv_error) 8813 - errmsg = (char_u *)_("E513: write error, conversion failed (make 'fenc' empty to override)"); 8814 + { 8815 + if (write_info.bw_conv_error_lnum == 0) 8816 + errmsg = (char_u *)_("E513: write error, conversion failed (make 'fenc' empty to override)"); 8817 + else 8818 + { 8819 + errmsg_allocated = TRUE; 8820 + errmsg = alloc(300); 8821 + vim_snprintf((char *)errmsg, 300, _("E513: write error, conversion failed in line %ld (make 'fenc' empty to override)"), 8822 + (long)write_info.bw_conv_error_lnum); 8823 + } 8824 + } 8825 else 8826 #endif 8827 if (got_int) 8828 @@ -4507,6 +4566,12 @@ 8829 { 8830 STRCAT(IObuff, _(" CONVERSION ERROR")); 8831 c = TRUE; 8832 + if (write_info.bw_conv_error_lnum != 0) 8833 + { 8834 + size_t l = STRLEN(IObuff); 8835 + vim_snprintf((char *)IObuff + l, IOSIZE - l, _(" in line %ld;"), 8836 + (long)write_info.bw_conv_error_lnum); 8837 + } 8838 } 8839 else if (notconverted) 8840 { 8841 @@ -4703,6 +4768,8 @@ 8842 } 8843 STRCAT(IObuff, errmsg); 8844 emsg(IObuff); 8845 + if (errmsg_allocated) 8846 + vim_free(errmsg); 8847 8848 retval = FAIL; 8849 if (end == 0) 8850 @@ -4782,6 +4849,8 @@ 8592 8851 char_u *sfname; 8593 8852 { … … 8598 8857 if (curbuf->b_p_bl) 8599 8858 apply_autocmds(EVENT_BUFDELETE, NULL, NULL, FALSE, curbuf); 8600 @@ -4790,6 +48 35,12 @@8859 @@ -4790,6 +4859,12 @@ 8601 8860 if (aborting()) /* autocmds may abort script processing */ 8602 8861 return FAIL; … … 8611 8870 8612 8871 if (setfname(curbuf, fname, sfname, FALSE) == OK) 8613 @@ -5246,13 +5297,16 @@ 8872 @@ -5054,7 +5129,13 @@ 8873 c = buf[wlen]; 8874 } 8875 8876 - ip->bw_conv_error |= ucs2bytes(c, &p, flags); 8877 + if (ucs2bytes(c, &p, flags) && !ip->bw_conv_error) 8878 + { 8879 + ip->bw_conv_error = TRUE; 8880 + ip->bw_conv_error_lnum = ip->bw_start_lnum; 8881 + } 8882 + if (c == NL) 8883 + ++ip->bw_start_lnum; 8884 } 8885 if (flags & FIO_LATIN1) 8886 len = (int)(p - buf); 8887 @@ -5246,13 +5327,16 @@ 8614 8888 /* Convert with iconv(). */ 8615 8889 if (ip->bw_restlen > 0) … … 8631 8905 } 8632 8906 else 8633 @@ -5550,9 +5604,10 @@ 8907 @@ -5332,6 +5416,7 @@ 8908 #ifdef FEAT_MBYTE 8909 /* 8910 * Convert a Unicode character to bytes. 8911 + * Return TRUE for an error, FALSE when it's OK. 8912 */ 8913 static int 8914 ucs2bytes(c, pp, flags) 8915 @@ -5415,20 +5500,37 @@ 8916 } 8917 8918 /* 8919 - * Return TRUE if "a" and "b" are the same 'encoding'. 8920 - * Ignores difference between "ansi" and "latin1", "ucs-4" and "ucs-4be", etc. 8921 + * Return TRUE if file encoding "fenc" requires conversion from or to 8922 + * 'encoding'. 8923 */ 8924 static int 8925 -same_encoding(a, b) 8926 - char_u *a; 8927 - char_u *b; 8928 +need_conversion(fenc) 8929 + char_u *fenc; 8930 { 8931 - int f; 8932 + int same_encoding; 8933 + int enc_flags; 8934 + int fenc_flags; 8935 8936 - if (STRCMP(a, b) == 0) 8937 - return TRUE; 8938 - f = get_fio_flags(a); 8939 - return (f != 0 && get_fio_flags(b) == f); 8940 + if (*fenc == NUL || STRCMP(p_enc, fenc) == 0) 8941 + same_encoding = TRUE; 8942 + else 8943 + { 8944 + /* Ignore difference between "ansi" and "latin1", "ucs-4" and 8945 + * "ucs-4be", etc. */ 8946 + enc_flags = get_fio_flags(p_enc); 8947 + fenc_flags = get_fio_flags(fenc); 8948 + same_encoding = (enc_flags != 0 && fenc_flags == enc_flags); 8949 + } 8950 + if (same_encoding) 8951 + { 8952 + /* Specified encoding matches with 'encoding'. This requires 8953 + * conversion when 'encoding' is Unicode but not UTF-8. */ 8954 + return enc_unicode != 0; 8955 + } 8956 + 8957 + /* Encodings differ. However, conversion is not needed when 'enc' is any 8958 + * Unicode encoding and the file is UTF-8. */ 8959 + return !(enc_utf8 && fenc_flags == FIO_UTF8); 8960 } 8961 8962 /* 8963 @@ -5550,9 +5652,10 @@ 8634 8964 name = "ucs-4le"; /* FF FE 00 00 */ 8635 8965 len = 4; … … 8644 8974 } 8645 8975 else if (p[0] == 0xfe && p[1] == 0xff 8646 @@ -5917,7 + 5972,7 @@8976 @@ -5917,7 +6020,7 @@ 8647 8977 else if (*ext == '.') 8648 8978 #endif … … 8653 8983 s = ptr + 8; 8654 8984 *s = '\0'; 8655 @@ -6031,9 +6 086,9 @@8985 @@ -6031,9 +6134,9 @@ 8656 8986 { 8657 8987 tbuf[FGETS_SIZE - 2] = NUL; … … 8665 8995 } while (tbuf[FGETS_SIZE - 2] != NUL && tbuf[FGETS_SIZE - 2] != '\n'); 8666 8996 } 8667 @@ -6107,12 +6 162,24 @@8997 @@ -6107,12 +6210,24 @@ 8668 8998 #ifdef HAVE_ACL 8669 8999 vim_acl_T acl; /* ACL from original file */ … … 8692 9022 /* 8693 9023 * Fail if the "from" file doesn't exist. Avoids that "to" is deleted. 8694 @@ -6120,6 +6 187,55 @@9024 @@ -6120,6 +6235,55 @@ 8695 9025 if (mch_stat((char *)from, &st) < 0) 8696 9026 return -1; … … 8748 9078 * Delete the "to" file, this is required on some systems to make the 8749 9079 * mch_rename() work, on other systems it makes sure that we don't have 8750 @@ -6260,7 +6 376,7 @@9080 @@ -6260,7 +6424,7 @@ 8751 9081 8752 9082 if (!stuff_empty() || global_busy || !typebuf_typed() … … 8757 9087 ) 8758 9088 need_check_timestamps = TRUE; /* check later */ 8759 @@ -6353,11 +6 469,10 @@9089 @@ -6353,11 +6517,10 @@ 8760 9090 * return 2 if a message has been displayed. 8761 9091 * return 0 otherwise. … … 8770 9100 struct stat st; 8771 9101 int stat_res; 8772 @@ -6462,8 +6 577,10 @@9102 @@ -6462,8 +6625,10 @@ 8773 9103 set_vim_var_string(VV_FCS_REASON, (char_u *)reason, -1); 8774 9104 set_vim_var_string(VV_FCS_CHOICE, (char_u *)"", -1); … … 8781 9111 if (n) 8782 9112 { 8783 @@ -6511,7 +66 28,10 @@9113 @@ -6511,7 +6676,10 @@ 8784 9114 mesg = _("W16: Warning: Mode of file \"%s\" has changed since editing started"); 8785 9115 mesg2 = _("See \":help W16\" for more info."); … … 8793 9123 } 8794 9124 } 8795 @@ -6538,6 +6 658,11 @@9125 @@ -6538,6 +6706,11 @@ 8796 9126 tbuf = alloc((unsigned)(STRLEN(path) + STRLEN(mesg) 8797 9127 + STRLEN(mesg2) + 2)); … … 8805 9135 if (can_reload) 8806 9136 { 8807 @@ -6732,10 +6 857,11 @@9137 @@ -6732,10 +6905,11 @@ 8808 9138 #endif 8809 9139 #ifdef FEAT_FOLDING … … 8819 9149 && !foldmethodIsManual(wp)) 8820 9150 foldUpdateAll(wp); 8821 @@ -6753,12 +6 879,11 @@9151 @@ -6753,12 +6927,11 @@ 8822 9152 /* Careful: autocommands may have made "buf" invalid! */ 8823 9153 } … … 8833 9163 buf->b_mtime = (long)st->st_mtime; 8834 9164 buf->b_orig_size = (size_t)st->st_size; 8835 @@ -6821,10 +69 46,9 @@9165 @@ -6821,10 +6994,9 @@ 8836 9166 * The returned pointer is to allocated memory. 8837 9167 * The returned pointer is NULL if no valid name was found. … … 8845 9175 #ifdef USE_TMPNAM 8846 9176 char_u itmp[L_tmpnam]; /* use tmpnam() */ 8847 @@ -6853,7 + 6977,7 @@9177 @@ -6853,7 +7025,7 @@ 8848 9178 /* 8849 9179 * Try the entries in TEMPDIRNAMES to create the temp directory. … … 8854 9184 /* expand $TMP, leave room for "/v1100000/999999999" */ 8855 9185 expand_env((char_u *)tempdirs[i], itmp, TEMPNAMELEN - 20); 8856 @@ -8245,7 +8 369,7 @@9186 @@ -8245,7 +8417,7 @@ 8857 9187 8858 9188 /* Execute the modeline settings, but don't set window-local … … 8863 9193 /* restore the current window */ 8864 9194 aucmd_restbuf(&aco); 8865 @@ -8261,8 +8 385,8 @@9195 @@ -8261,8 +8433,8 @@ 8866 9196 8867 9197 /* … … 8874 9204 * When FEAT_AUTOCMD is not defined another version is used, see below. 8875 9205 */ 8876 @@ -8272,8 +8 396,9 @@9206 @@ -8272,8 +8444,9 @@ 8877 9207 buf_T *buf; /* new curbuf */ 8878 9208 { … … 8886 9216 /* Find a window that is for the new buffer */ 8887 9217 if (buf == curbuf) /* be quick when buf is curbuf */ 8888 @@ -8287,42 +84 12,51@@9218 @@ -8287,42 +8460,67 @@ 8889 9219 win = NULL; 8890 9220 #endif … … 8904 9234 + win = curwin; 8905 9235 + } 9236 + if (win == NULL && aucmd_win_used) 9237 + /* Strange recursive autocommand, fall back to using the current 9238 + * window. Expect a few side effects... */ 9239 + win = curwin; 8906 9240 + 8907 9241 + aco->save_curwin = curwin; … … 8914 9248 + * curwin. This is preferred, it has the least side effects (esp. if 8915 9249 + * "buf" is curbuf). */ 9250 + aco->use_aucmd_win = FALSE; 8916 9251 curwin = win; 8917 9252 - aco->save_buf = win->w_buffer; … … 8929 9264 + * Anything related to a window (e.g., setting folds) may have 8930 9265 + * unexpected results. */ 9266 + aco->use_aucmd_win = TRUE; 9267 + aucmd_win_used = TRUE; 8931 9268 + aucmd_win->w_buffer = buf; 8932 9269 ++buf->b_nwindows; 8933 9270 + win_init_empty(aucmd_win); /* set cursor and topline to safe values */ 9271 + vim_free(aucmd_win->w_localdir); 9272 + aucmd_win->w_localdir = NULL; 9273 + 9274 + /* Make sure w_localdir and globaldir are NULL to avoid a chdir() in 9275 + * win_enter_ext(). */ 9276 + aucmd_win->w_localdir = NULL; 9277 + aco->globaldir = globaldir; 9278 + globaldir = NULL; 8934 9279 8935 9280 - /* save cursor and topline, set them to safe values */ … … 8942 9287 - aco->save_topfill = curwin->w_topfill; 8943 9288 - curwin->w_topfill = 0; 9289 + 8944 9290 +#ifdef FEAT_WINDOWS 8945 9291 + /* Split the current window, put the aucmd_win in the upper half. … … 8963 9309 8964 9310 /* 8965 @@ -8334,21 +8 468,88@@9311 @@ -8334,21 +8532,92 @@ 8966 9312 aucmd_restbuf(aco) 8967 9313 aco_save_T *aco; /* structure holding saved values */ … … 8972 9318 +#endif 8973 9319 + 8974 + if (aco-> new_curwin ==aucmd_win)9320 + if (aco->use_aucmd_win) 8975 9321 + { 8976 9322 + --curbuf->b_nwindows; … … 8999 9345 + (void)winframe_remove(curwin, &dummy, NULL); 9000 9346 + win_remove(curwin, NULL); 9347 + aucmd_win_used = FALSE; 9001 9348 + last_status(FALSE); /* may need to remove last status line */ 9002 9349 + restore_snapshot(SNAP_AUCMD_IDX, FALSE); … … 9016 9363 +#endif 9017 9364 + curbuf = curwin->w_buffer; 9365 + 9366 + vim_free(globaldir); 9367 + globaldir = aco->globaldir; 9018 9368 + 9019 9369 + /* the buffer contents may have changed */ … … 9043 9393 - * it's still the same window and it's valid */ 9044 9394 + /* Restore the buffer which was previously edited by curwin, if 9045 + * it was cha gned, we are still the same window and the buffer is9395 + * it was changed, we are still the same window and the buffer is 9046 9396 + * valid. */ 9047 9397 if (curwin == aco->new_curwin … … 9058 9408 ++curbuf->b_nwindows; 9059 9409 } 9060 @@ -8357,34 +8 558,6 @@9410 @@ -8357,34 +8626,6 @@ 9061 9411 curbuf = curwin->w_buffer; 9062 9412 } … … 9093 9443 9094 9444 static int autocmd_nested = FALSE; 9095 @@ -8523,6 +8 696,7 @@9445 @@ -8523,6 +8764,7 @@ 9096 9446 char_u *save_sourcing_name; 9097 9447 linenr_T save_sourcing_lnum; … … 9101 9451 char_u *save_autocmd_match; 9102 9452 int save_autocmd_busy; 9103 @@ -8601,6 +8 775,7 @@9453 @@ -8601,6 +8843,7 @@ 9104 9454 * Save the autocmd_* variables and info about the current buffer. 9105 9455 */ … … 9109 9459 save_autocmd_match = autocmd_match; 9110 9460 save_autocmd_busy = autocmd_busy; 9111 @@ -8618,14 +8 793,15 @@9461 @@ -8618,14 +8861,15 @@ 9112 9462 if (fname != NULL && *fname != NUL) 9113 9463 autocmd_fname = fname; … … 9127 9477 /* 9128 9478 * Set the buffer number to be used for <abuf>. 9129 @@ -8667,9 +8 843,11 @@9479 @@ -8667,9 +8911,11 @@ 9130 9480 else 9131 9481 { … … 9140 9490 || event == EVENT_SPELLFILEMISSING 9141 9491 || event == EVENT_QUICKFIXCMDPRE 9142 @@ -8810,6 + 8988,7 @@9492 @@ -8810,6 +9056,7 @@ 9143 9493 sourcing_lnum = save_sourcing_lnum; 9144 9494 vim_free(autocmd_fname); … … 9148 9498 autocmd_match = save_autocmd_match; 9149 9499 #ifdef FEAT_EVAL 9150 @@ -8918,7 +9 097,7 @@9500 @@ -8918,7 +9165,7 @@ 9151 9501 { 9152 9502 apc->curpat = NULL; … … 9157 9507 * buffer number. */ 9158 9508 if (ap->pat != NULL && ap->cmds != NULL 9159 @@ -8967,12 +9 146,11 @@9509 @@ -8967,12 +9214,11 @@ 9160 9510 * Called by do_cmdline() to get the next line for ":if". 9161 9511 * Returns allocated string, or NULL for end of autocommands. … … 9172 9522 AutoPatCmd *acp = (AutoPatCmd *)cookie; 9173 9523 char_u *retval; 9174 @@ -9083,10 +9 261,9 @@9524 @@ -9083,10 +9329,9 @@ 9175 9525 * Function given to ExpandGeneric() to obtain the list of autocommand group 9176 9526 * names. … … 9184 9534 { 9185 9535 if (idx == augroups.ga_len) /* add "END" add the end */ 9186 @@ -9104,7 +9 281,7 @@9536 @@ -9104,7 +9349,7 @@ 9187 9537 set_context_in_autocmd(xp, arg, doautocmd) 9188 9538 expand_T *xp; … … 9193 9543 char_u *p; 9194 9544 int group; 9195 @@ -9152,10 +93 29,9 @@9545 @@ -9152,10 +9397,9 @@ 9196 9546 /* 9197 9547 * Function given to ExpandGeneric() to obtain the list of event names. … … 9205 9555 { 9206 9556 if (idx < augroups.ga_len) /* First list group names, if wanted */ 9207 @@ -9296,9 +9472,11 @@ 9557 @@ -9254,15 +9498,10 @@ 9558 ap = first_autopat[(int)event]; 9559 if (ap == NULL) 9560 goto theend; 9561 - if (pattern == NULL) 9562 - { 9563 - retval = TRUE; 9564 - goto theend; 9565 - } 9566 9567 /* if pattern is "<buffer>", special handling is needed which uses curbuf */ 9568 /* for pattern "<buffer=N>, fnamecmp() will work fine */ 9569 - if (STRICMP(pattern, "<buffer>") == 0) 9570 + if (pattern != NULL && STRICMP(pattern, "<buffer>") == 0) 9571 buflocal_buf = curbuf; 9572 9573 /* Check if there is an autocommand with the given pattern. */ 9574 @@ -9271,9 +9510,10 @@ 9575 /* For buffer-local autocommands, fnamecmp() works fine. */ 9576 if (ap->pat != NULL && ap->cmds != NULL 9577 && (group == AUGROUP_ALL || ap->group == group) 9578 - && (buflocal_buf == NULL 9579 - ? fnamecmp(ap->pat, pattern) == 0 9580 - : ap->buflocal_nr == buflocal_buf->b_fnum)) 9581 + && (pattern == NULL 9582 + || (buflocal_buf == NULL 9583 + ? fnamecmp(ap->pat, pattern) == 0 9584 + : ap->buflocal_nr == buflocal_buf->b_fnum))) 9585 { 9586 retval = TRUE; 9587 break; 9588 @@ -9296,9 +9536,11 @@ 9208 9589 aco_save_T *aco; /* structure to save values in */ 9209 9590 buf_T *buf; /* new curbuf */ … … 9218 9599 9219 9600 /* 9220 @@ -9309,8 +9 487,10 @@9601 @@ -9309,8 +9551,10 @@ 9221 9602 aucmd_restbuf(aco) 9222 9603 aco_save_T *aco; /* structure holding saved values */ … … 9230 9611 9231 9612 #endif /* FEAT_AUTOCMD */ 9232 @@ -9467,13 +9 647,12 @@9613 @@ -9467,13 +9711,12 @@ 9233 9614 * 9234 9615 * Returns NULL when out of memory. … … 9247 9628 diff -Naur vim72.orig/src/fold.c vim72/src/fold.c 9248 9629 --- vim72.orig/src/fold.c 2008-08-06 04:01:12.000000000 -0700 9249 +++ vim72/src/fold.c 2009-0 7-19 15:11:59.000000000 -07009630 +++ vim72/src/fold.c 2009-09-12 08:34:12.000000000 -0700 9250 9631 @@ -48,7 +48,7 @@ 9251 9632 static int foldFind __ARGS((garray_T *gap, linenr_T lnum, fold_T **fpp)); … … 9336 9717 diff -Naur vim72.orig/src/getchar.c vim72/src/getchar.c 9337 9718 --- vim72.orig/src/getchar.c 2008-07-22 09:57:48.000000000 -0700 9338 +++ vim72/src/getchar.c 2009-0 7-19 15:18:49.000000000 -07009719 +++ vim72/src/getchar.c 2009-09-12 08:41:14.000000000 -0700 9339 9720 @@ -1309,6 +1309,9 @@ 9340 9721 return OK; … … 9441 9822 diff -Naur vim72.orig/src/globals.h vim72/src/globals.h 9442 9823 --- vim72.orig/src/globals.h 2008-07-26 04:53:29.000000000 -0700 9443 +++ vim72/src/globals.h 2009-0 7-19 15:17:39.000000000 -07009824 +++ vim72/src/globals.h 2009-09-12 08:41:43.000000000 -0700 9444 9825 @@ -482,8 +482,10 @@ 9445 9826 /* … … 9471 9852 for ((wp) = ((tp) == curtab) \ 9472 9853 ? firstwin : (tp)->tp_firstwin; (wp); (wp) = (wp)->w_next) 9473 @@ -536,6 +539,1 0@@9854 @@ -536,6 +539,11 @@ 9474 9855 9475 9856 EXTERN win_T *curwin; /* currently active window */ … … 9477 9858 +#ifdef FEAT_AUTOCMD 9478 9859 +EXTERN win_T *aucmd_win; /* window used in aucmd_prepbuf() */ 9860 +EXTERN int aucmd_win_used INIT(= FALSE); /* aucmd_win is being used */ 9479 9861 +#endif 9480 9862 + … … 9482 9864 * The window layout is kept in a tree of frames. topframe points to the top 9483 9865 * of the tree. 9484 @@ -597,7 +60 4,8 @@9866 @@ -597,7 +605,8 @@ 9485 9867 EXTERN int really_exiting INIT(= FALSE); 9486 9868 /* TRUE when we are sure to exit, e.g., after … … 9492 9874 * otherwise only writing some messages */ 9493 9875 9494 @@ -616,6 +62 4,11 @@9876 @@ -616,6 +625,11 @@ 9495 9877 EXTERN int curbuf_lock INIT(= 0); 9496 9878 /* non-zero when the current buffer can't be … … 9504 9886 #ifdef FEAT_EVAL 9505 9887 # define HAVE_SANDBOX 9506 @@ -710,7 +72 3,7 @@9888 @@ -710,7 +724,7 @@ 9507 9889 9508 9890 EXTERN pos_T saved_cursor /* w_cursor before formatting text. */ … … 9513 9895 ; 9514 9896 9515 @@ -739,10 +75 2,12 @@9897 @@ -739,10 +753,12 @@ 9516 9898 */ 9517 9899 EXTERN JMP_BUF lc_jump_env; /* argument to SETJMP() */ … … 9529 9911 9530 9912 #if defined(FEAT_MBYTE) || defined(FEAT_POSTSCRIPT) 9531 @@ -800,11 +81 5,14 @@9913 @@ -800,11 +816,14 @@ 9532 9914 */ 9533 9915 /* length of char in bytes, including following composing chars */ … … 9544 9926 EXTERN int (*mb_off2cells) __ARGS((unsigned off, unsigned max_off)) INIT(= latin_off2cells); 9545 9927 EXTERN int (*mb_ptr2char) __ARGS((char_u *p)) INIT(= latin_ptr2char); 9546 @@ -950,7 +96 8,7 @@9928 @@ -950,7 +969,7 @@ 9547 9929 ; 9548 9930 EXTERN typebuf_T typebuf /* typeahead buffer */ … … 9553 9935 ; 9554 9936 #ifdef FEAT_EX_EXTRA 9555 @@ -986,7 +100 4,8 @@9937 @@ -986,7 +1005,8 @@ 9556 9938 EXTERN FILE *scriptout INIT(= NULL); /* stream to write script to */ 9557 9939 EXTERN int read_cmd_fd INIT(= 0); /* fd to read commands from */ … … 9563 9945 #ifdef USE_TERM_CONSOLE 9564 9946 EXTERN int term_console INIT(= FALSE); /* set to TRUE when console used */ 9565 @@ -1022,12 +104 1,13 @@9947 @@ -1022,12 +1042,13 @@ 9566 9948 #endif 9567 9949 #ifdef FEAT_AUTOCMD … … 9578 9960 ; 9579 9961 #endif 9580 @@ -1339,7 +13 59,6 @@9962 @@ -1339,7 +1360,6 @@ 9581 9963 9582 9964 #ifdef FEAT_NETBEANS_INTG … … 9586 9968 EXTERN int netbeansForcedQuit INIT(= 0);/* don't write modified files */ 9587 9969 EXTERN int netbeansReadFile INIT(= 1); /* OK to read from disk if != 0 */ 9588 @@ -1548,6 +156 7,14 @@9970 @@ -1548,6 +1568,14 @@ 9589 9971 EXTERN time_t starttime; 9590 9972 … … 9603 9985 diff -Naur vim72.orig/src/gui_at_fs.c vim72/src/gui_at_fs.c 9604 9986 --- vim72.orig/src/gui_at_fs.c 2006-05-12 02:26:24.000000000 -0700 9605 +++ vim72/src/gui_at_fs.c 2009-0 7-19 15:16:46.000000000 -07009987 +++ vim72/src/gui_at_fs.c 2009-09-12 08:39:05.000000000 -0700 9606 9988 @@ -829,7 +829,7 @@ 9607 9989 text.format = FMT8BIT; … … 9889 10271 diff -Naur vim72.orig/src/gui_athena.c vim72/src/gui_athena.c 9890 10272 --- vim72.orig/src/gui_athena.c 2008-06-21 12:38:58.000000000 -0700 9891 +++ vim72/src/gui_athena.c 2009-0 7-19 15:16:46.000000000 -070010273 +++ vim72/src/gui_athena.c 2009-09-12 08:39:05.000000000 -0700 9892 10274 @@ -86,10 +86,9 @@ 9893 10275 * Scrollbar callback (XtNjumpProc) for when the scrollbar is dragged with the … … 10146 10528 diff -Naur vim72.orig/src/gui_at_sb.c vim72/src/gui_at_sb.c 10147 10529 --- vim72.orig/src/gui_at_sb.c 2004-06-07 07:32:25.000000000 -0700 10148 +++ vim72/src/gui_at_sb.c 2009-0 7-19 15:16:46.000000000 -070010530 +++ vim72/src/gui_at_sb.c 2009-09-12 08:39:05.000000000 -0700 10149 10531 @@ -198,10 +198,13 @@ 10150 10532 /* extension */ NULL … … 10396 10778 diff -Naur vim72.orig/src/gui_beval.c vim72/src/gui_beval.c 10397 10779 --- vim72.orig/src/gui_beval.c 2007-05-07 12:33:41.000000000 -0700 10398 +++ vim72/src/gui_beval.c 2009-0 7-19 15:16:46.000000000 -070010780 +++ vim72/src/gui_beval.c 2009-09-12 08:39:05.000000000 -0700 10399 10781 @@ -15,11 +15,10 @@ 10400 10782 /* … … 10497 10879 diff -Naur vim72.orig/src/gui.c vim72/src/gui.c 10498 10880 --- vim72.orig/src/gui.c 2008-07-27 12:32:14.000000000 -0700 10499 +++ vim72/src/gui.c 2009-0 7-19 15:18:18.000000000 -070010881 +++ vim72/src/gui.c 2009-09-12 08:41:40.000000000 -0700 10500 10882 @@ -139,7 +139,7 @@ 10501 10883 /* The read returns when the child closes the pipe (or when … … 10700 11082 #ifdef FEAT_WINDOWS 10701 11083 int row; 10702 @@ -5120,11 +5134,10 @@ 11084 @@ -4990,6 +5004,19 @@ 11085 char_u *p; 11086 regmatch_T regmatch; 11087 int save_did_emsg = did_emsg; 11088 + static int busy = FALSE; 11089 + 11090 + /* When the screen is being updated we should not change buffers and 11091 + * windows structures, it may cause freed memory to be used. Also don't 11092 + * do this recursively (pressing "Find" quickly several times. */ 11093 + if (updating_screen || busy) 11094 + return FALSE; 11095 + 11096 + /* refuse replace when text cannot be changed */ 11097 + if ((type == FRD_REPLACE || type == FRD_REPLACEALL) && text_locked()) 11098 + return FALSE; 11099 + 11100 + busy = TRUE; 11101 11102 ga_init2(&ga, 1, 100); 11103 if (type == FRD_REPLACEALL) 11104 @@ -5080,6 +5107,7 @@ 11105 } 11106 11107 vim_free(ga.ga_data); 11108 + busy = FALSE; 11109 return (ga.ga_len > 0); 11110 } 11111 11112 @@ -5120,11 +5148,10 @@ 10703 11113 * of dropped files, they will be freed in this function, and caller can't use 10704 11114 * fnames after call this function. … … 10716 11126 diff -Naur vim72.orig/src/gui_gtk.c vim72/src/gui_gtk.c 10717 11127 --- vim72.orig/src/gui_gtk.c 2008-07-31 12:48:20.000000000 -0700 10718 +++ vim72/src/gui_gtk.c 2009-0 7-19 15:16:36.000000000 -070011128 +++ vim72/src/gui_gtk.c 2009-09-12 08:38:54.000000000 -0700 10719 11129 @@ -285,14 +285,14 @@ 10720 11130 return image; … … 10920 11330 diff -Naur vim72.orig/src/gui_gtk_f.c vim72/src/gui_gtk_f.c 10921 11331 --- vim72.orig/src/gui_gtk_f.c 2007-05-07 12:38:02.000000000 -0700 10922 +++ vim72/src/gui_gtk_f.c 2009-0 7-19 15:16:39.000000000 -070011332 +++ vim72/src/gui_gtk_f.c 2009-09-12 08:42:25.000000000 -0700 10923 11333 @@ -227,14 +227,14 @@ 10924 11334 … … 10980 11390 XEvent *xevent; 10981 11391 GtkForm *form; 10982 @@ -911,9 +910,8 @@ 11392 @@ -861,11 +860,9 @@ 11393 gtk_form_set_static_gravity(GdkWindow *window, gboolean use_static) 11394 { 11395 #ifdef HAVE_GTK2 11396 - gboolean static_gravity_supported; 11397 - 11398 - static_gravity_supported = gdk_window_set_static_gravities(window, 11399 - use_static); 11400 - g_return_if_fail(static_gravity_supported); 11401 + /* We don't check if static gravity is actually supported, because it 11402 + * results in an annoying assertion error message. */ 11403 + gdk_window_set_static_gravities(window, use_static); 11404 #else 11405 XSetWindowAttributes xattributes; 11406 11407 @@ -911,9 +908,8 @@ 10983 11408 #endif 10984 11409 } … … 10991 11416 GtkFormChild *child; 10992 11417 10993 @@ -923,9 +9 21,8 @@11418 @@ -923,9 +919,8 @@ 10994 11419 gdk_window_show(child->window); 10995 11420 } … … 11004 11429 diff -Naur vim72.orig/src/gui_gtk_x11.c vim72/src/gui_gtk_x11.c 11005 11430 --- vim72.orig/src/gui_gtk_x11.c 2008-07-04 03:46:24.000000000 -0700 11006 +++ vim72/src/gui_gtk_x11.c 2009-0 7-19 15:18:26.000000000 -070011431 +++ vim72/src/gui_gtk_x11.c 2009-09-12 08:42:22.000000000 -0700 11007 11432 @@ -107,6 +107,7 @@ 11008 11433 TARGET_UTF8_STRING, … … 11745 12170 gui_mch_get_fontset(char_u *name, int report_error, int fixed_width) 11746 12171 { 11747 @@ -4863,7 +4915,7 @@ 12172 @@ -4677,6 +4729,9 @@ 12173 if (oldval != NULL && *oldval != NUL) 12174 gtk_font_selection_dialog_set_font_name( 12175 GTK_FONT_SELECTION_DIALOG(gui.fontdlg), (char *)oldval); 12176 + else 12177 + gtk_font_selection_dialog_set_font_name( 12178 + GTK_FONT_SELECTION_DIALOG(gui.fontdlg), DEFAULT_FONT); 12179 12180 if (gui.fontname) 12181 { 12182 @@ -4764,6 +4819,9 @@ 12183 if (oldname != oldval) 12184 vim_free(oldname); 12185 } 12186 + else 12187 + gtk_font_selection_dialog_set_font_name( 12188 + GTK_FONT_SELECTION_DIALOG(dialog), DEFAULT_FONT); 12189 12190 response = gtk_dialog_run(GTK_DIALOG(dialog)); 12191 12192 @@ -4863,7 +4921,7 @@ 11748 12193 styled_font[1] = &gui.ital_font; 11749 12194 styled_font[2] = &gui.boldital_font; … … 11754 12199 if (*styled_font[i]) 11755 12200 { 11756 @@ -5012,9 +50 64,8 @@12201 @@ -5012,9 +5070,8 @@ 11757 12202 * Initialize Vim to use the font or fontset with the given name. 11758 12203 * Return FAIL if the font could not be loaded, OK otherwise. … … 11765 12210 #ifdef HAVE_GTK2 11766 12211 PangoFontDescription *font_desc; 11767 @@ -5326,9 +53 77,8 @@12212 @@ -5326,9 +5383,8 @@ 11768 12213 /* 11769 12214 * Return the name of font "font" in allocated memory. … … 11776 12221 # ifdef HAVE_GTK2 11777 12222 if (font != NOFONT) 11778 @@ -5732,7 +578 2,7 @@12223 @@ -5732,7 +5788,7 @@ 11779 12224 { 11780 12225 int i; … … 11785 12230 11786 12231 /* Undercurl: draw curl at the bottom of the character cell. */ 11787 @@ -6085,12 +61 35,15 @@12232 @@ -6085,12 +6141,15 @@ 11788 12233 # ifdef FEAT_MBYTE 11789 12234 if (enc_utf8) … … 11803 12248 } 11804 12249 else 11805 @@ -6114,8 +61 67,8 @@12250 @@ -6114,8 +6173,8 @@ 11806 12251 if (has_mbyte) 11807 12252 { … … 11814 12259 else 11815 12260 # endif 11816 @@ -6402,7 +64 55,6 @@12261 @@ -6402,7 +6461,6 @@ 11817 12262 /* 11818 12263 * Callback function, used when data is available on the SNiFF connection. … … 11822 12267 sniff_request_cb( 11823 12268 gpointer data, 11824 @@ -6665,12 +67 17,14 @@12269 @@ -6665,12 +6723,14 @@ 11825 12270 { 11826 12271 GdkAtom target; … … 11839 12284 target = gdk_atom_intern(selection_targets[i].target, FALSE); 11840 12285 11841 @@ -6690,30 +67 44,14 @@12286 @@ -6690,30 +6750,14 @@ 11842 12287 } 11843 12288 … … 11872 12317 /* WEIRD: when using NULL to actually disown the selection, we lose the 11873 12318 * selection the first time we own it. */ 11874 @@ -6741,9 +67 79,8 @@12319 @@ -6741,9 +6785,8 @@ 11875 12320 * Send the current selection to the clipboard. Do nothing for X because we 11876 12321 * will fill in the selection only when requested by another app. … … 11883 12328 } 11884 12329 11885 @@ -6950,7 +69 87,7 @@12330 @@ -6950,7 +6993,7 @@ 11886 12331 else 11887 12332 id &= ~1; /* they are always even (why?) */ … … 11894 12339 diff -Naur vim72.orig/src/gui_motif.c vim72/src/gui_motif.c 11895 12340 --- vim72.orig/src/gui_motif.c 2008-06-07 06:06:33.000000000 -0700 11896 +++ vim72/src/gui_motif.c 2009-0 7-19 15:16:46.000000000 -070012341 +++ vim72/src/gui_motif.c 2009-09-12 08:39:05.000000000 -0700 11897 12342 @@ -117,10 +117,9 @@ 11898 12343 * Call-back routines. … … 12257 12702 diff -Naur vim72.orig/src/gui_x11.c vim72/src/gui_x11.c 12258 12703 --- vim72.orig/src/gui_x11.c 2008-06-08 08:13:45.000000000 -0700 12259 +++ vim72/src/gui_x11.c 2009-0 7-19 15:16:46.000000000 -070012704 +++ vim72/src/gui_x11.c 2009-09-12 08:39:05.000000000 -0700 12260 12705 @@ -570,22 +570,20 @@ 12261 12706 * Call-back routines. … … 12702 13147 diff -Naur vim72.orig/src/gui_xmdlg.c vim72/src/gui_xmdlg.c 12703 13148 --- vim72.orig/src/gui_xmdlg.c 2008-06-21 09:05:32.000000000 -0700 12704 +++ vim72/src/gui_xmdlg.c 2009-0 7-19 15:16:46.000000000 -070013149 +++ vim72/src/gui_xmdlg.c 2009-09-12 08:39:05.000000000 -0700 12705 13150 @@ -369,10 +369,10 @@ 12706 13151 char buf[TEMP_BUF_SIZE]; … … 12924 13369 diff -Naur vim72.orig/src/gui_xmebw.c vim72/src/gui_xmebw.c 12925 13370 --- vim72.orig/src/gui_xmebw.c 2007-09-06 03:57:51.000000000 -0700 12926 +++ vim72/src/gui_xmebw.c 2009-0 7-19 15:16:46.000000000 -070013371 +++ vim72/src/gui_xmebw.c 2009-09-12 08:39:05.000000000 -0700 12927 13372 @@ -235,13 +235,12 @@ 12928 13373 return tmp; … … 13051 13496 diff -Naur vim72.orig/src/hardcopy.c vim72/src/hardcopy.c 13052 13497 --- vim72.orig/src/hardcopy.c 2008-01-11 12:46:20.000000000 -0800 13053 +++ vim72/src/hardcopy.c 2009-0 7-19 15:16:23.000000000 -070013498 +++ vim72/src/hardcopy.c 2009-09-12 08:38:41.000000000 -0700 13054 13499 @@ -442,12 +442,11 @@ 13055 13500 /* … … 13134 13579 diff -Naur vim72.orig/src/if_cscope.c vim72/src/if_cscope.c 13135 13580 --- vim72.orig/src/if_cscope.c 2008-06-24 09:32:34.000000000 -0700 13136 +++ vim72/src/if_cscope.c 2009-0 7-19 15:18:44.000000000 -070013581 +++ vim72/src/if_cscope.c 2009-09-12 08:41:09.000000000 -0700 13137 13582 @@ -46,7 +46,6 @@ 13138 13583 static int cs_find __ARGS((exarg_T *eap)); … … 13726 14171 diff -Naur vim72.orig/src/if_cscope.h vim72/src/if_cscope.h 13727 14172 --- vim72.orig/src/if_cscope.h 2007-09-02 07:51:08.000000000 -0700 13728 +++ vim72/src/if_cscope.h 2009-0 7-19 15:18:44.000000000 -070014173 +++ vim72/src/if_cscope.h 2009-09-12 08:41:09.000000000 -0700 13729 14174 @@ -25,7 +25,6 @@ 13730 14175 … … 13755 14200 diff -Naur vim72.orig/src/if_mzsch.c vim72/src/if_mzsch.c 13756 14201 --- vim72.orig/src/if_mzsch.c 2007-07-01 09:44:49.000000000 -0700 13757 +++ vim72/src/if_mzsch.c 2009-0 7-19 15:18:39.000000000 -070014202 +++ vim72/src/if_mzsch.c 2009-09-12 08:41:03.000000000 -0700 13758 14203 @@ -667,13 +667,11 @@ 13759 14204 static void CALLBACK … … 13796 14241 diff -Naur vim72.orig/src/if_perl.xs vim72/src/if_perl.xs 13797 14242 --- vim72.orig/src/if_perl.xs 2008-07-17 13:55:09.000000000 -0700 13798 +++ vim72/src/if_perl.xs 2009-0 7-19 15:18:52.000000000 -070014243 +++ vim72/src/if_perl.xs 2009-09-12 08:41:16.000000000 -0700 13799 14244 @@ -136,6 +136,9 @@ 13800 14245 # define Perl_newXS_flags dll_Perl_newXS_flags … … 13870 14315 diff -Naur vim72.orig/src/if_python.c vim72/src/if_python.c 13871 14316 --- vim72.orig/src/if_python.c 2008-07-17 14:09:32.000000000 -0700 13872 +++ vim72/src/if_python.c 2009-0 7-19 15:18:39.000000000 -070014317 +++ vim72/src/if_python.c 2009-09-12 08:41:03.000000000 -0700 13873 14318 @@ -531,6 +531,12 @@ 13874 14319 if (PythonMod_Init()) … … 14083 14528 diff -Naur vim72.orig/src/if_ruby.c vim72/src/if_ruby.c 14084 14529 --- vim72.orig/src/if_ruby.c 2007-09-10 01:40:38.000000000 -0700 14085 +++ vim72/src/if_ruby.c 2009-0 7-19 15:16:49.000000000 -070014530 +++ vim72/src/if_ruby.c 2009-09-12 08:39:07.000000000 -0700 14086 14531 @@ -492,7 +492,7 @@ 14087 14532 } … … 14175 14620 diff -Naur vim72.orig/src/if_tcl.c vim72/src/if_tcl.c 14176 14621 --- vim72.orig/src/if_tcl.c 2007-05-07 12:50:14.000000000 -0700 14177 +++ vim72/src/if_tcl.c 2009-0 7-19 15:16:54.000000000 -070014622 +++ vim72/src/if_tcl.c 2009-09-12 08:39:13.000000000 -0700 14178 14623 @@ -161,7 +161,7 @@ 14179 14624 # endif … … 14390 14835 diff -Naur vim72.orig/src/if_xcmdsrv.c vim72/src/if_xcmdsrv.c 14391 14836 --- vim72.orig/src/if_xcmdsrv.c 2008-07-18 06:05:03.000000000 -0700 14392 +++ vim72/src/if_xcmdsrv.c 2009-0 7-19 15:16:23.000000000 -070014837 +++ vim72/src/if_xcmdsrv.c 2009-09-12 08:38:41.000000000 -0700 14393 14838 @@ -682,7 +682,7 @@ 14394 14839 * Scan all of the names out of the property. … … 14506 14951 diff -Naur vim72.orig/src/macros.h vim72/src/macros.h 14507 14952 --- vim72.orig/src/macros.h 2007-08-04 04:44:18.000000000 -0700 14508 +++ vim72/src/macros.h 2009-0 7-19 15:16:33.000000000 -070014953 +++ vim72/src/macros.h 2009-09-12 08:38:51.000000000 -0700 14509 14954 @@ -127,15 +127,31 @@ 14510 14955 #ifdef FEAT_LANGMAP … … 14555 15000 diff -Naur vim72.orig/src/main.c vim72/src/main.c 14556 15001 --- vim72.orig/src/main.c 2008-07-24 01:40:56.000000000 -0700 14557 +++ vim72/src/main.c 2009-0 7-19 15:16:33.000000000 -070015002 +++ vim72/src/main.c 2009-09-12 08:38:51.000000000 -0700 14558 15003 @@ -645,11 +645,12 @@ 14559 15004 … … 14647 15092 diff -Naur vim72.orig/src/Makefile vim72/src/Makefile 14648 15093 --- vim72.orig/src/Makefile 2008-08-09 07:50:04.000000000 -0700 14649 +++ vim72/src/Makefile 2009-0 7-19 15:16:49.000000000 -070015094 +++ vim72/src/Makefile 2009-09-12 08:39:07.000000000 -0700 14650 15095 @@ -105,8 +105,8 @@ 14651 15096 # 4. "make test" {{{1 … … 14761 15206 diff -Naur vim72.orig/src/mark.c vim72/src/mark.c 14762 15207 --- vim72.orig/src/mark.c 2008-08-08 15:06:49.000000000 -0700 14763 +++ vim72/src/mark.c 2009-0 7-19 15:16:23.000000000 -070015208 +++ vim72/src/mark.c 2009-09-12 08:38:41.000000000 -0700 14764 15209 @@ -884,10 +884,9 @@ 14765 15210 /* … … 14882 15327 diff -Naur vim72.orig/src/mbyte.c vim72/src/mbyte.c 14883 15328 --- vim72.orig/src/mbyte.c 2008-07-14 05:38:05.000000000 -0700 14884 +++ vim72/src/mbyte.c 2009-0 7-19 15:17:33.000000000 -070015329 +++ vim72/src/mbyte.c 2009-09-12 08:39:52.000000000 -0700 14885 15330 @@ -127,7 +127,10 @@ 14886 15331 static int dbcs_char2len __ARGS((int c)); … … 15490 15935 diff -Naur vim72.orig/src/memline.c vim72/src/memline.c 15491 15936 --- vim72.orig/src/memline.c 2008-07-13 09:19:22.000000000 -0700 15492 +++ vim72/src/memline.c 2009-0 7-19 15:15:19.000000000 -070015937 +++ vim72/src/memline.c 2009-09-12 08:37:35.000000000 -0700 15493 15938 @@ -1554,10 +1554,15 @@ 15494 15939 for (i = 0; i < num_files; ++i) … … 15550 15995 diff -Naur vim72.orig/src/menu.c vim72/src/menu.c 15551 15996 --- vim72.orig/src/menu.c 2008-06-21 12:53:43.000000000 -0700 15552 +++ vim72/src/menu.c 2009-0 7-19 15:16:33.000000000 -070015997 +++ vim72/src/menu.c 2009-09-12 08:38:51.000000000 -0700 15553 15998 @@ -231,7 +231,7 @@ 15554 15999 if (skipdigits(menu_path + 7) == p) … … 15627 16072 diff -Naur vim72.orig/src/message.c vim72/src/message.c 15628 16073 --- vim72.orig/src/message.c 2008-07-09 11:24:55.000000000 -0700 15629 +++ vim72/src/message.c 2009-0 7-19 15:18:26.000000000 -070016074 +++ vim72/src/message.c 2009-09-12 08:40:50.000000000 -0700 15630 16075 @@ -107,7 +107,7 @@ 15631 16076 } … … 15948 16393 diff -Naur vim72.orig/src/misc1.c vim72/src/misc1.c 15949 16394 --- vim72.orig/src/misc1.c 2008-07-12 12:20:53.000000000 -0700 15950 +++ vim72/src/misc1.c 2009-0 7-19 15:19:00.000000000 -070016395 +++ vim72/src/misc1.c 2009-09-12 08:41:27.000000000 -0700 15951 16396 @@ -2188,12 +2188,11 @@ 15952 16397 * … … 16084 16529 /* Set the state such that text can be selected/copied/pasted and we still 16085 16530 * get mouse events. */ 16086 @@ -4141,10 +4153,9 @@ 16531 @@ -3264,6 +3276,7 @@ 16532 cmdline_row = msg_row - 1; 16533 need_wait_return = FALSE; 16534 msg_didany = FALSE; 16535 + msg_didout = FALSE; 16536 } 16537 else 16538 cmdline_row = save_cmdline_row; 16539 @@ -4141,10 +4154,9 @@ 16087 16540 /* 16088 16541 * Function given to ExpandGeneric() to obtain an environment variable name. … … 16096 16549 { 16097 16550 # if defined(AMIGA) || defined(__MRC__) || defined(__SC__) 16098 @@ -4736,9 +474 7,9 @@16551 @@ -4736,9 +4748,9 @@ 16099 16552 * If it is then restrict the search to below this line and try again. 16100 16553 */ … … 16108 16561 cur_maxcomment = curwin->w_cursor.lnum - pos->lnum - 1; 16109 16562 if (cur_maxcomment <= 0) 16110 @@ -6269,7 +628 0,7 @@16563 @@ -6269,7 +6281,7 @@ 16111 16564 * check for that. 16112 16565 */ … … 16117 16570 linecopy[curwin->w_cursor.col] = NUL; 16118 16571 16119 @@ -8522,11 +853 3,25 @@16572 @@ -8522,11 +8534,25 @@ 16120 16573 for (setsuf = p_su; *setsuf; ) 16121 16574 { … … 16148 16601 return (setsuflen != 0); 16149 16602 } 16150 @@ -9188,7 +921 3,7 @@16603 @@ -9188,7 +9214,7 @@ 16151 16604 else if (vim_strpbrk(p, (char_u *)"$~") != NULL) 16152 16605 { … … 16159 16612 diff -Naur vim72.orig/src/misc2.c vim72/src/misc2.c 16160 16613 --- vim72.orig/src/misc2.c 2008-07-23 12:12:56.000000000 -0700 16161 +++ vim72/src/misc2.c 2009-0 7-19 15:16:25.000000000 -070016614 +++ vim72/src/misc2.c 2009-09-12 08:38:43.000000000 -0700 16162 16615 @@ -496,7 +496,8 @@ 16163 16616 { … … 16365 16818 diff -Naur vim72.orig/src/move.c vim72/src/move.c 16366 16819 --- vim72.orig/src/move.c 2008-07-12 09:26:47.000000000 -0700 16367 +++ vim72/src/move.c 2009-0 7-19 15:16:14.000000000 -070016820 +++ vim72/src/move.c 2009-09-12 08:38:31.000000000 -0700 16368 16821 @@ -280,18 +280,20 @@ 16369 16822 … … 16441 16894 diff -Naur vim72.orig/src/nbdebug.c vim72/src/nbdebug.c 16442 16895 --- vim72.orig/src/nbdebug.c 2008-06-22 08:38:58.000000000 -0700 16443 +++ vim72/src/nbdebug.c 2009-0 7-19 15:13:36.000000000 -070016896 +++ vim72/src/nbdebug.c 2009-09-12 08:35:50.000000000 -0700 16444 16897 @@ -33,7 +33,6 @@ 16445 16898 u_int nb_dlevel = 0; /* nb_debug verbosity level */ … … 16502 16955 diff -Naur vim72.orig/src/nbdebug.h vim72/src/nbdebug.h 16503 16956 --- vim72.orig/src/nbdebug.h 2008-06-22 07:31:50.000000000 -0700 16504 +++ vim72/src/nbdebug.h 2009-0 7-19 15:13:36.000000000 -070016957 +++ vim72/src/nbdebug.h 2009-09-12 08:35:50.000000000 -0700 16505 16958 @@ -43,8 +43,6 @@ 16506 16959 … … 16534 16987 diff -Naur vim72.orig/src/netbeans.c vim72/src/netbeans.c 16535 16988 --- vim72.orig/src/netbeans.c 2008-07-13 09:19:54.000000000 -0700 16536 +++ vim72/src/netbeans.c 2009-0 7-19 15:18:05.000000000 -070016989 +++ vim72/src/netbeans.c 2009-09-12 08:42:14.000000000 -0700 16537 16990 @@ -32,6 +32,7 @@ 16538 16991 /* WinSock API is separated from C API, thus we can't use read(), write(), … … 16579 17032 } 16580 17033 16581 @@ -1582,7 +1585,9 @@ 17034 @@ -1493,7 +1496,8 @@ 17035 return FAIL; 17036 } 17037 first = *pos; 17038 - nbdebug((" FIRST POS: line %d, col %d\n", first.lnum, first.col)); 17039 + nbdebug((" FIRST POS: line %d, col %d\n", 17040 + first.lnum, first.col)); 17041 pos = off2pos(buf->bufp, off+count-1); 17042 if (!pos) 17043 { 17044 @@ -1504,7 +1508,8 @@ 17045 return FAIL; 17046 } 17047 last = *pos; 17048 - nbdebug((" LAST POS: line %d, col %d\n", last.lnum, last.col)); 17049 + nbdebug((" LAST POS: line %d, col %d\n", 17050 + last.lnum, last.col)); 17051 del_from_lnum = first.lnum; 17052 del_to_lnum = last.lnum; 17053 doupdate = 1; 17054 @@ -1515,7 +1520,8 @@ 17055 next = off2pos(buf->bufp, off + count); 17056 17057 /* Remove part of the first line. */ 17058 - if (first.col != 0 || (next != NULL && first.lnum == next->lnum)) 17059 + if (first.col != 0 17060 + || (next != NULL && first.lnum == next->lnum)) 17061 { 17062 if (first.lnum != last.lnum 17063 || (next != NULL && first.lnum != next->lnum)) 17064 @@ -1578,14 +1584,18 @@ 17065 int id = buf_findsign_id(buf->bufp, (linenr_T)i); 17066 if (id > 0) 17067 { 17068 - nbdebug((" Deleting sign %d on line %d\n", id, i)); 17069 + nbdebug((" Deleting sign %d on line %d\n", 17070 + id, i)); 16582 17071 buf_delsign(buf->bufp, id); 16583 17072 } … … 16588 17077 } 16589 17078 16590 nbdebug((" Deleting lines %d through %d\n", del_from_lnum, del_to_lnum)); 16591 @@ -1921,7 +1926,7 @@ 17079 - nbdebug((" Deleting lines %d through %d\n", del_from_lnum, del_to_lnum)); 17080 + nbdebug((" Deleting lines %d through %d\n", 17081 + del_from_lnum, del_to_lnum)); 17082 curwin->w_cursor.lnum = del_from_lnum; 17083 curwin->w_cursor.col = 0; 17084 del_lines(del_to_lnum - del_from_lnum + 1, FALSE); 17085 @@ -1921,7 +1931,7 @@ 16592 17086 vim_free(path); 16593 17087 if (bufp == NULL) … … 16598 17092 return FAIL; 16599 17093 } 16600 @@ -2141,7 +21 46,9 @@17094 @@ -2141,7 +2151,9 @@ 16601 17095 #endif 16602 17096 } … … 16608 17102 /* gui_update_cursor(TRUE, FALSE); */ 16609 17103 /* update_curbuf(NOT_VALID); */ 16610 @@ -2277,9 +228 4,6 @@17104 @@ -2277,9 +2289,6 @@ 16611 17105 int serNum; 16612 17106 int localTypeNum; … … 16618 17112 16619 17113 if (buf == NULL || buf->bufp == NULL) 16620 @@ -2303,13 +23 07,10 @@17114 @@ -2303,13 +2312,10 @@ 16621 17115 pos = get_off_or_lnum(buf->bufp, &args); 16622 17116 … … 16634 17128 nbdebug((" partial line annotation -- Not Yet Implemented!\n")); 16635 17129 } 16636 @@ -2321,7 +232 2,7 @@17130 @@ -2321,7 +2327,7 @@ 16637 17131 } 16638 17132 if (pos) … … 16643 17137 if (typeNum == curPCtype) 16644 17138 coloncmd(":sign jump %d buffer=%d", serNum, 16645 @@ -2425,7 +24 26,7 @@17139 @@ -2425,7 +2431,7 @@ 16646 17140 GUARDED) == 0) 16647 17141 { … … 16652 17146 buf->bufp->b_fnum); 16653 17147 } 16654 @@ -2582,7 +258 3,7 @@17148 @@ -2582,7 +2588,7 @@ 16655 17149 va_list ap; 16656 17150 … … 16661 17155 16662 17156 nbdebug((" COLONCMD %s\n", buf)); 16663 @@ -2747,11 +27 48,10 @@17157 @@ -2747,11 +2753,10 @@ 16664 17158 * cursor and sends it to the debugger for evaluation. The debugger should 16665 17159 * respond with a showBalloon command when there is a useful result. … … 16674 17168 win_T *wp; 16675 17169 char_u *text; 16676 @@ -2924,44 +292 4,26 @@17170 @@ -2924,44 +2929,26 @@ 16677 17171 } 16678 17172 … … 16725 17219 if (nbbuf != NULL) 16726 17220 nbbuf->bufp = NULL; 16727 @@ -3082,9 +306 4,8 @@17221 @@ -3082,9 +3069,8 @@ 16728 17222 /* 16729 17223 * Send netbeans an unmodufied command. … … 16736 17230 #if 0 16737 17231 char_u buf[128]; 16738 @@ -3391,13 +337 2,12 @@17232 @@ -3391,13 +3377,12 @@ 16739 17233 * buf->signmapused[] maps buffer-local annotation IDs to an index in 16740 17234 * globalsignmap[]. … … 16751 17245 int use_fg, 16752 17246 int fg, 17247 @@ -3531,7 +3516,8 @@ 17248 eol_size = 1; 17249 for (lnum = 1; lnum <= bufp->b_ml.ml_line_count; ++lnum) 17250 { 17251 - char_count += (long)STRLEN(ml_get(lnum)) + eol_size; 17252 + char_count += (long)STRLEN(ml_get_buf(bufp, lnum, FALSE)) 17253 + + eol_size; 17254 /* Check for a CTRL-C every 100000 characters */ 17255 if (char_count > last_check) 17256 { 16753 17257 diff -Naur vim72.orig/src/normal.c vim72/src/normal.c 16754 17258 --- vim72.orig/src/normal.c 2008-07-31 13:03:08.000000000 -0700 16755 +++ vim72/src/normal.c 2009-0 7-19 15:16:33.000000000 -070017259 +++ vim72/src/normal.c 2009-09-12 08:38:51.000000000 -0700 16756 17260 @@ -183,6 +183,8 @@ 16757 17261 static void nv_cursorhold __ARGS((cmdarg_T *cap)); … … 17179 17683 diff -Naur vim72.orig/src/ops.c vim72/src/ops.c 17180 17684 --- vim72.orig/src/ops.c 2008-06-21 13:08:59.000000000 -0700 17181 +++ vim72/src/ops.c 2009-0 7-19 15:18:26.000000000 -070017685 +++ vim72/src/ops.c 2009-09-12 08:40:50.000000000 -0700 17182 17686 @@ -72,11 +72,11 @@ 17183 17687 */ … … 17596 18100 diff -Naur vim72.orig/src/option.c vim72/src/option.c 17597 18101 --- vim72.orig/src/option.c 2008-07-18 06:05:33.000000000 -0700 17598 +++ vim72/src/option.c 2009-0 7-19 15:17:52.000000000 -070018102 +++ vim72/src/option.c 2009-09-12 08:42:20.000000000 -0700 17599 18103 @@ -387,6 +387,9 @@ 17600 18104 char_u *def_val[2]; /* default values for variable (vi and vim) */ … … 17607 18111 }; 17608 18112 17609 @@ -477,7 +480,7 @@ 18113 @@ -400,8 +403,9 @@ 18114 #define P_NUM 0x02 /* the option is numeric */ 18115 #define P_STRING 0x04 /* the option is a string */ 18116 #define P_ALLOCED 0x08 /* the string option is in allocated memory, 18117 - must use vim_free() when assigning new 18118 - value. Not set if default is the same. */ 18119 + must use free_string_option() when 18120 + assigning new value. Not set if default is 18121 + the same. */ 18122 #define P_EXPAND 0x10 /* environment expansion. NOTE: P_EXPAND can 18123 never be used for local or hidden options! */ 18124 #define P_NODEFAULT 0x40 /* don't set to default value */ 18125 @@ -477,7 +481,7 @@ 17610 18126 #else 17611 18127 (char_u *)224L, … … 17616 18132 #if defined(FEAT_GUI) && defined(MACOS_X) 17617 18133 (char_u *)&p_antialias, PV_NONE, 17618 @@ -486,35 +4 89,35 @@18134 @@ -486,35 +490,35 @@ 17619 18135 (char_u *)NULL, PV_NONE, 17620 18136 {(char_u *)FALSE, (char_u *)FALSE} … … 17657 18173 #if defined(FEAT_MBYTE) 17658 18174 (char_u *)&p_ambw, PV_NONE, 17659 @@ -523,27 +52 6,27 @@18175 @@ -523,27 +527,27 @@ 17660 18176 (char_u *)NULL, PV_NONE, 17661 18177 {(char_u *)0L, (char_u *)0L} … … 17692 18208 (char_u *)&p_bg, PV_NONE, 17693 18209 { 17694 @@ -552,13 +55 5,13 @@18210 @@ -552,13 +556,13 @@ 17695 18211 #else 17696 18212 (char_u *)"light", … … 17709 18225 (char_u *)&p_bkc, PV_NONE, 17710 18226 #ifdef UNIX 17711 @@ -566,10 +5 69,10 @@18227 @@ -566,10 +570,10 @@ 17712 18228 #else 17713 18229 {(char_u *)"auto", (char_u *)"auto"} … … 17722 18238 (char_u *)&p_bex, PV_NONE, 17723 18239 { 17724 @@ -578,7 +58 1,7 @@18240 @@ -578,7 +582,7 @@ 17725 18241 #else 17726 18242 (char_u *)"~", … … 17731 18247 #ifdef FEAT_WILDIGN 17732 18248 (char_u *)&p_bsk, PV_NONE, 17733 @@ -587,40 +59 0,40 @@18249 @@ -587,40 +591,40 @@ 17734 18250 (char_u *)NULL, PV_NONE, 17735 18251 {(char_u *)0L, (char_u *)0L} … … 17780 18296 #ifdef FEAT_LINEBREAK 17781 18297 (char_u *)&p_breakat, PV_NONE, 17782 @@ -629,7 +63 2,7 @@18298 @@ -629,7 +633,7 @@ 17783 18299 (char_u *)NULL, PV_NONE, 17784 18300 {(char_u *)0L, (char_u *)0L} … … 17789 18305 #ifdef FEAT_BROWSE 17790 18306 (char_u *)&p_bsdir, PV_NONE, 17791 @@ -638,7 +64 1,7 @@18307 @@ -638,7 +642,7 @@ 17792 18308 (char_u *)NULL, PV_NONE, 17793 18309 {(char_u *)0L, (char_u *)0L} … … 17798 18314 #if defined(FEAT_QUICKFIX) 17799 18315 (char_u *)&p_bh, PV_BH, 17800 @@ -647,11 +65 0,11 @@18316 @@ -647,11 +651,11 @@ 17801 18317 (char_u *)NULL, PV_NONE, 17802 18318 {(char_u *)0L, (char_u *)0L} … … 17812 18328 #if defined(FEAT_QUICKFIX) 17813 18329 (char_u *)&p_bt, PV_BT, 17814 @@ -660,7 +66 3,7 @@18330 @@ -660,7 +664,7 @@ 17815 18331 (char_u *)NULL, PV_NONE, 17816 18332 {(char_u *)0L, (char_u *)0L} … … 17821 18337 #ifdef FEAT_MBYTE 17822 18338 (char_u *)&p_cmp, PV_NONE, 17823 @@ -669,7 +67 2,7 @@18339 @@ -669,7 +673,7 @@ 17824 18340 (char_u *)NULL, PV_NONE, 17825 18341 {(char_u *)0L, (char_u *)0L} … … 17830 18346 #ifdef FEAT_SEARCHPATH 17831 18347 (char_u *)&p_cdpath, PV_NONE, 17832 @@ -678,7 +68 1,7 @@18348 @@ -678,7 +682,7 @@ 17833 18349 (char_u *)NULL, PV_NONE, 17834 18350 {(char_u *)0L, (char_u *)0L} … … 17839 18355 #ifdef FEAT_CMDWIN 17840 18356 (char_u *)&p_cedit, PV_NONE, 17841 @@ -687,7 +69 0,7 @@18357 @@ -687,7 +691,7 @@ 17842 18358 (char_u *)NULL, PV_NONE, 17843 18359 {(char_u *)0L, (char_u *)0L} … … 17848 18364 #if defined(FEAT_MBYTE) && defined(FEAT_EVAL) 17849 18365 (char_u *)&p_ccv, PV_NONE, 17850 @@ -696,14 + 699,14 @@18366 @@ -696,14 +700,14 @@ 17851 18367 (char_u *)NULL, PV_NONE, 17852 18368 {(char_u *)0L, (char_u *)0L} … … 17865 18381 #ifdef FEAT_CINDENT 17866 18382 (char_u *)&p_cink, PV_CINK, 17867 @@ -712,14 +71 5,14 @@18383 @@ -712,14 +716,14 @@ 17868 18384 (char_u *)NULL, PV_NONE, 17869 18385 {(char_u *)0L, (char_u *)0L} … … 17882 18398 #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT) 17883 18399 (char_u *)&p_cinw, PV_CINW, 17884 @@ -729,7 +73 2,7 @@18400 @@ -729,7 +733,7 @@ 17885 18401 (char_u *)NULL, PV_NONE, 17886 18402 {(char_u *)0L, (char_u *)0L} … … 17891 18407 #ifdef FEAT_CLIPBOARD 17892 18408 (char_u *)&p_cb, PV_NONE, 17893 @@ -743,20 +74 6,20 @@18409 @@ -743,20 +747,20 @@ 17894 18410 (char_u *)NULL, PV_NONE, 17895 18411 {(char_u *)"", (char_u *)0L} … … 17916 18432 #ifdef FEAT_COMMENTS 17917 18433 (char_u *)&p_com, PV_COM, 17918 @@ -766,7 +7 69,7 @@18434 @@ -766,7 +770,7 @@ 17919 18435 (char_u *)NULL, PV_NONE, 17920 18436 {(char_u *)0L, (char_u *)0L} … … 17925 18441 #ifdef FEAT_FOLDING 17926 18442 (char_u *)&p_cms, PV_CMS, 17927 @@ -775,12 +77 8,12 @@18443 @@ -775,12 +779,12 @@ 17928 18444 (char_u *)NULL, PV_NONE, 17929 18445 {(char_u *)0L, (char_u *)0L} … … 17940 18456 #ifdef FEAT_INS_EXPAND 17941 18457 (char_u *)&p_cpt, PV_CPT, 17942 @@ -789,7 +79 2,7 @@18458 @@ -789,7 +793,7 @@ 17943 18459 (char_u *)NULL, PV_NONE, 17944 18460 {(char_u *)0L, (char_u *)0L} … … 17949 18465 #ifdef FEAT_COMPL_FUNC 17950 18466 (char_u *)&p_cfu, PV_CFU, 17951 @@ -798,7 +80 1,7 @@18467 @@ -798,7 +802,7 @@ 17952 18468 (char_u *)NULL, PV_NONE, 17953 18469 {(char_u *)0L, (char_u *)0L} … … 17958 18474 #ifdef FEAT_INS_EXPAND 17959 18475 (char_u *)&p_cot, PV_NONE, 17960 @@ -807,34 +81 0,35 @@18476 @@ -807,34 +811,35 @@ 17961 18477 (char_u *)NULL, PV_NONE, 17962 18478 {(char_u *)0L, (char_u *)0L} … … 18000 18516 #ifdef FEAT_CSCOPE 18001 18517 (char_u *)&p_csprg, PV_NONE, 18002 @@ -843,7 +84 7,7 @@18518 @@ -843,7 +848,7 @@ 18003 18519 (char_u *)NULL, PV_NONE, 18004 18520 {(char_u *)0L, (char_u *)0L} … … 18009 18525 #if defined(FEAT_CSCOPE) && defined(FEAT_QUICKFIX) 18010 18526 (char_u *)&p_csqf, PV_NONE, 18011 @@ -852,45 +85 6,45 @@18527 @@ -852,45 +857,45 @@ 18012 18528 (char_u *)NULL, PV_NONE, 18013 18529 {(char_u *)0L, (char_u *)0L} … … 18062 18578 #ifdef FEAT_FIND_ID 18063 18579 (char_u *)&p_def, PV_DEF, 18064 @@ -899,28 +90 3,28 @@18580 @@ -899,28 +904,28 @@ 18065 18581 (char_u *)NULL, PV_NONE, 18066 18582 {(char_u *)NULL, (char_u *)0L} … … 18095 18611 #if defined(FEAT_DIFF) && defined(FEAT_EVAL) 18096 18612 (char_u *)&p_dex, PV_NONE, 18097 @@ -929,7 +93 3,7 @@18613 @@ -929,7 +934,7 @@ 18098 18614 (char_u *)NULL, PV_NONE, 18099 18615 {(char_u *)0L, (char_u *)0L} … … 18104 18620 #ifdef FEAT_DIFF 18105 18621 (char_u *)&p_dip, PV_NONE, 18106 @@ -938,20 +94 2,20 @@18622 @@ -938,20 +943,20 @@ 18107 18623 (char_u *)NULL, PV_NONE, 18108 18624 {(char_u *)"", (char_u *)NULL} … … 18129 18645 #ifdef FEAT_VERTSPLIT 18130 18646 (char_u *)&p_ead, PV_NONE, 18131 @@ -960,10 +96 4,10 @@18647 @@ -960,10 +965,10 @@ 18132 18648 (char_u *)NULL, PV_NONE, 18133 18649 {(char_u *)NULL, (char_u *)0L} … … 18142 18658 #ifdef FEAT_MBYTE 18143 18659 (char_u *)&p_enc, PV_NONE, 18144 @@ -972,19 +97 6,19 @@18660 @@ -972,19 +977,19 @@ 18145 18661 (char_u *)NULL, PV_NONE, 18146 18662 {(char_u *)0L, (char_u *)0L} … … 18167 18683 #ifdef FEAT_QUICKFIX 18168 18684 (char_u *)&p_ef, PV_NONE, 18169 @@ -993,32 +99 7,32 @@18685 @@ -993,32 +998,32 @@ 18170 18686 (char_u *)NULL, PV_NONE, 18171 18687 {(char_u *)NULL, (char_u *)0L} … … 18207 18723 #ifdef FEAT_MBYTE 18208 18724 (char_u *)&p_fenc, PV_FENC, 18209 @@ -1027,7 +103 1,7 @@18725 @@ -1027,7 +1032,7 @@ 18210 18726 (char_u *)NULL, PV_NONE, 18211 18727 {(char_u *)0L, (char_u *)0L} … … 18216 18732 #ifdef FEAT_MBYTE 18217 18733 (char_u *)&p_fencs, PV_NONE, 18218 @@ -1036,13 +104 0,14 @@18734 @@ -1036,13 +1041,14 @@ 18219 18735 (char_u *)NULL, PV_NONE, 18220 18736 {(char_u *)0L, (char_u *)0L} … … 18234 18750 #ifdef FEAT_AUTOCMD 18235 18751 (char_u *)&p_ft, PV_FT, 18236 @@ -1051,7 +105 6,7 @@18752 @@ -1051,7 +1057,7 @@ 18237 18753 (char_u *)NULL, PV_NONE, 18238 18754 {(char_u *)0L, (char_u *)0L} … … 18243 18759 #if defined(FEAT_WINDOWS) || defined(FEAT_FOLDING) 18244 18760 (char_u *)&p_fcs, PV_NONE, 18245 @@ -1060,27 +106 5,27 @@18761 @@ -1060,27 +1066,27 @@ 18246 18762 (char_u *)NULL, PV_NONE, 18247 18763 {(char_u *)"", (char_u *)0L} … … 18277 18793 # ifdef FEAT_EVAL 18278 18794 (char_u *)VAR_WIN, PV_FDE, 18279 @@ -1089,33 +109 4,34 @@18795 @@ -1089,33 +1095,34 @@ 18280 18796 (char_u *)NULL, PV_NONE, 18281 18797 {(char_u *)NULL, (char_u *)0L} … … 18321 18837 # ifdef FEAT_EVAL 18322 18838 (char_u *)VAR_WIN, PV_FDT, 18323 @@ -1124,7 +113 0,7 @@18839 @@ -1124,7 +1131,7 @@ 18324 18840 (char_u *)NULL, PV_NONE, 18325 18841 {(char_u *)NULL, (char_u *)0L} … … 18330 18846 {"formatexpr", "fex", P_STRING|P_ALLOCED|P_VI_DEF|P_VIM, 18331 18847 #ifdef FEAT_EVAL 18332 @@ -1134,16 +114 0,18 @@18848 @@ -1134,16 +1141,18 @@ 18333 18849 (char_u *)NULL, PV_NONE, 18334 18850 {(char_u *)0L, (char_u *)0L} … … 18353 18869 #ifdef HAVE_FSYNC 18354 18870 (char_u *)&p_fs, PV_NONE, 18355 @@ -1152,22 +116 0,22 @@18871 @@ -1152,22 +1161,22 @@ 18356 18872 (char_u *)NULL, PV_NONE, 18357 18873 {(char_u *)FALSE, (char_u *)0L} … … 18381 18897 #ifdef FEAT_QUICKFIX 18382 18898 (char_u *)&p_gp, PV_GP, 18383 @@ -1185,15 +119 3,15 @@18899 @@ -1185,15 +1194,15 @@ 18384 18900 (char_u *)"SEARCH/NUMBERS ", 18385 18901 # else … … 18401 18917 #ifdef CURSOR_SHAPE 18402 18918 (char_u *)&p_guicursor, PV_NONE, 18403 @@ -1208,7 +121 6,7 @@18919 @@ -1208,7 +1217,7 @@ 18404 18920 (char_u *)NULL, PV_NONE, 18405 18921 {(char_u *)NULL, (char_u *)0L} … … 18410 18926 #ifdef FEAT_GUI 18411 18927 (char_u *)&p_guifont, PV_NONE, 18412 @@ -1217,7 +122 5,7 @@18928 @@ -1217,7 +1226,7 @@ 18413 18929 (char_u *)NULL, PV_NONE, 18414 18930 {(char_u *)NULL, (char_u *)0L} … … 18419 18935 #if defined(FEAT_GUI) && defined(FEAT_XFONTSET) 18420 18936 (char_u *)&p_guifontset, PV_NONE, 18421 @@ -1226,7 +123 4,7 @@18937 @@ -1226,7 +1235,7 @@ 18422 18938 (char_u *)NULL, PV_NONE, 18423 18939 {(char_u *)NULL, (char_u *)0L} … … 18428 18944 #if defined(FEAT_GUI) && defined(FEAT_MBYTE) 18429 18945 (char_u *)&p_guifontwide, PV_NONE, 18430 @@ -1235,14 +124 3,14 @@18946 @@ -1235,14 +1244,14 @@ 18431 18947 (char_u *)NULL, PV_NONE, 18432 18948 {(char_u *)NULL, (char_u *)0L} … … 18445 18961 #if defined(FEAT_GUI) 18446 18962 (char_u *)&p_go, PV_NONE, 18447 @@ -1255,14 +126 3,14 @@18963 @@ -1255,14 +1264,14 @@ 18448 18964 (char_u *)NULL, PV_NONE, 18449 18965 {(char_u *)NULL, (char_u *)0L} … … 18462 18978 #if defined(FEAT_GUI_TABLINE) 18463 18979 (char_u *)&p_gtl, PV_NONE, 18464 @@ -1271,7 +12 79,7 @@18980 @@ -1271,7 +1280,7 @@ 18465 18981 (char_u *)NULL, PV_NONE, 18466 18982 {(char_u *)NULL, (char_u *)0L} … … 18471 18987 #if defined(FEAT_GUI_TABLINE) 18472 18988 (char_u *)&p_gtt, PV_NONE, 18473 @@ -1280,20 +128 8,21 @@18989 @@ -1280,20 +1289,21 @@ 18474 18990 (char_u *)NULL, PV_NONE, 18475 18991 {(char_u *)NULL, (char_u *)0L} … … 18497 19013 #ifdef FEAT_MULTI_LANG 18498 19014 (char_u *)&p_hlg, PV_NONE, 18499 @@ -1302,64 +131 1,65 @@19015 @@ -1302,64 +1312,65 @@ 18500 19016 (char_u *)NULL, PV_NONE, 18501 19017 {(char_u *)0L, (char_u *)0L} … … 18575 19091 #ifdef USE_IM_CONTROL 18576 19092 (char_u *)&p_imdisable, PV_NONE, 18577 @@ -1371,7 +138 1,7 @@19093 @@ -1371,7 +1382,7 @@ 18578 19094 #else 18579 19095 {(char_u *)FALSE, (char_u *)0L} … … 18584 19100 (char_u *)&p_iminsert, PV_IMI, 18585 19101 #ifdef B_IMODE_IM 18586 @@ -1379,7 +13 89,7 @@19102 @@ -1379,7 +1390,7 @@ 18587 19103 #else 18588 19104 {(char_u *)B_IMODE_NONE, (char_u *)0L} … … 18593 19109 (char_u *)&p_imsearch, PV_IMS, 18594 19110 #ifdef B_IMODE_IM 18595 @@ -1387,7 +139 7,7 @@19111 @@ -1387,7 +1398,7 @@ 18596 19112 #else 18597 19113 {(char_u *)B_IMODE_NONE, (char_u *)0L} … … 18602 19118 #ifdef FEAT_FIND_ID 18603 19119 (char_u *)&p_inc, PV_INC, 18604 @@ -1396,7 +140 6,7 @@19120 @@ -1396,7 +1407,7 @@ 18605 19121 (char_u *)NULL, PV_NONE, 18606 19122 {(char_u *)0L, (char_u *)0L} … … 18611 19127 #if defined(FEAT_FIND_ID) && defined(FEAT_EVAL) 18612 19128 (char_u *)&p_inex, PV_INEX, 18613 @@ -1405,10 +141 5,10 @@19129 @@ -1405,10 +1416,10 @@ 18614 19130 (char_u *)NULL, PV_NONE, 18615 19131 {(char_u *)0L, (char_u *)0L} … … 18624 19140 #if defined(FEAT_CINDENT) && defined(FEAT_EVAL) 18625 19141 (char_u *)&p_inde, PV_INDE, 18626 @@ -1417,7 +142 7,7 @@19142 @@ -1417,7 +1428,7 @@ 18627 19143 (char_u *)NULL, PV_NONE, 18628 19144 {(char_u *)0L, (char_u *)0L} … … 18633 19149 #if defined(FEAT_CINDENT) && defined(FEAT_EVAL) 18634 19150 (char_u *)&p_indk, PV_INDK, 18635 @@ -1426,13 +143 6,13 @@19151 @@ -1426,13 +1437,13 @@ 18636 19152 (char_u *)NULL, PV_NONE, 18637 19153 {(char_u *)0L, (char_u *)0L} … … 18650 19166 (char_u *)&p_isf, PV_NONE, 18651 19167 { 18652 @@ -1455,7 +146 5,7 @@19168 @@ -1455,7 +1466,7 @@ 18653 19169 # endif 18654 19170 # endif … … 18659 19175 (char_u *)&p_isi, PV_NONE, 18660 19176 { 18661 @@ -1472,7 +148 2,7 @@19177 @@ -1472,7 +1483,7 @@ 18662 19178 (char_u *)"@,48-57,_,192-255", 18663 19179 # endif … … 18668 19184 (char_u *)&p_isk, PV_ISK, 18669 19185 { 18670 @@ -1491,7 +150 1,7 @@19186 @@ -1491,7 +1502,7 @@ 18671 19187 ISK_LATIN1 18672 19188 # endif … … 18677 19193 (char_u *)&p_isp, PV_NONE, 18678 19194 { 18679 @@ -1507,10 +151 7,10 @@19195 @@ -1507,10 +1518,10 @@ 18680 19196 ISP_LATIN1, 18681 19197 # endif … … 18690 19206 #ifdef FEAT_CRYPT 18691 19207 (char_u *)&p_key, PV_KEY, 18692 @@ -1519,7 +15 29,7 @@19208 @@ -1519,7 +1530,7 @@ 18693 19209 (char_u *)NULL, PV_NONE, 18694 19210 {(char_u *)0L, (char_u *)0L} … … 18699 19215 #ifdef FEAT_KEYMAP 18700 19216 (char_u *)&p_keymap, PV_KMAP, 18701 @@ -1528,14 +153 8,14 @@19217 @@ -1528,14 +1539,14 @@ 18702 19218 (char_u *)NULL, PV_NONE, 18703 19219 {(char_u *)"", (char_u *)0L} … … 18716 19232 (char_u *)&p_kp, PV_KP, 18717 19233 { 18718 @@ -1556,7 +156 6,7 @@19234 @@ -1556,7 +1567,7 @@ 18719 19235 # endif 18720 19236 #endif … … 18725 19241 #ifdef FEAT_LANGMAP 18726 19242 (char_u *)&p_langmap, PV_NONE, 18727 @@ -1565,31 +157 5,31 @@19243 @@ -1565,31 +1576,31 @@ 18728 19244 (char_u *)NULL, PV_NONE, 18729 19245 {(char_u *)NULL, … … 18762 19278 (char_u *)&Rows, PV_NONE, 18763 19279 { 18764 @@ -1598,7 +160 8,7 @@19280 @@ -1598,7 +1609,7 @@ 18765 19281 #else 18766 19282 (char_u *)24L, … … 18771 19287 #ifdef FEAT_GUI 18772 19288 (char_u *)&p_linespace, PV_NONE, 18773 @@ -1610,14 +162 0,14 @@19289 @@ -1610,14 +1621,14 @@ 18774 19290 #else 18775 19291 {(char_u *)0L, (char_u *)0L} … … 18788 19304 #ifdef FEAT_LISP 18789 19305 (char_u *)&p_lispwords, PV_NONE, 18790 @@ -1626,24 +163 6,24 @@19306 @@ -1626,24 +1637,24 @@ 18791 19307 (char_u *)NULL, PV_NONE, 18792 19308 {(char_u *)"", (char_u *)0L} … … 18819 19335 #ifdef FEAT_QUICKFIX 18820 19336 (char_u *)&p_mef, PV_NONE, 18821 @@ -1652,7 +166 2,7 @@19337 @@ -1652,7 +1663,7 @@ 18822 19338 (char_u *)NULL, PV_NONE, 18823 19339 {(char_u *)NULL, (char_u *)0L} … … 18828 19344 #ifdef FEAT_QUICKFIX 18829 19345 (char_u *)&p_mp, PV_MP, 18830 @@ -1665,49 +167 5,52 @@19346 @@ -1665,49 +1676,52 @@ 18831 19347 (char_u *)NULL, PV_NONE, 18832 19348 {(char_u *)NULL, (char_u *)0L} … … 18892 19408 #ifdef FEAT_SPELL 18893 19409 (char_u *)&p_msm, PV_NONE, 18894 @@ -1716,22 +17 29,22 @@19410 @@ -1716,22 +1730,22 @@ 18895 19411 (char_u *)NULL, PV_NONE, 18896 19412 {(char_u *)0L, (char_u *)0L} … … 18921 19437 (char_u *)&p_mouse, PV_NONE, 18922 19438 { 18923 @@ -1740,21 +175 3,21 @@19439 @@ -1740,21 +1754,21 @@ 18924 19440 #else 18925 19441 (char_u *)"", … … 18946 19462 (char_u *)&p_mousem, PV_NONE, 18947 19463 { 18948 @@ -1767,7 +178 0,7 @@19464 @@ -1767,7 +1781,7 @@ 18949 19465 (char_u *)"extend", 18950 19466 # endif … … 18955 19471 #ifdef FEAT_MOUSESHAPE 18956 19472 (char_u *)&p_mouseshape, PV_NONE, 18957 @@ -1776,33 +17 89,34 @@19473 @@ -1776,33 +1790,34 @@ 18958 19474 (char_u *)NULL, PV_NONE, 18959 19475 {(char_u *)NULL, (char_u *)0L} … … 18997 19513 #ifdef FEAT_COMPL_FUNC 18998 19514 (char_u *)&p_ofu, PV_OFU, 18999 @@ -1811,10 +182 5,10 @@19515 @@ -1811,10 +1826,10 @@ 19000 19516 (char_u *)NULL, PV_NONE, 19001 19517 {(char_u *)0L, (char_u *)0L} … … 19010 19526 #if defined(MSDOS) || defined(MSWIN) || defined(OS2) 19011 19527 (char_u *)&p_odev, PV_NONE, 19012 @@ -1822,13 +183 6,13 @@19528 @@ -1822,13 +1837,13 @@ 19013 19529 (char_u *)NULL, PV_NONE, 19014 19530 #endif … … 19027 19543 #ifdef FEAT_OSFILETYPE 19028 19544 (char_u *)&p_oft, PV_OFT, 19029 @@ -1837,17 +185 1,17 @@19545 @@ -1837,17 +1852,17 @@ 19030 19546 (char_u *)NULL, PV_NONE, 19031 19547 {(char_u *)0L, (char_u *)0L} … … 19049 19565 #if defined(FEAT_DIFF) && defined(FEAT_EVAL) 19050 19566 (char_u *)&p_pex, PV_NONE, 19051 @@ -1856,10 +187 0,10 @@19567 @@ -1856,10 +1871,10 @@ 19052 19568 (char_u *)NULL, PV_NONE, 19053 19569 {(char_u *)0L, (char_u *)0L} … … 19062 19578 (char_u *)&p_path, PV_PATH, 19063 19579 { 19064 @@ -1872,24 +188 6,24 @@19580 @@ -1872,24 +1887,24 @@ 19065 19581 (char_u *)".,/usr/include,,", 19066 19582 # endif … … 19091 19607 #ifdef FEAT_PRINTER 19092 19608 (char_u *)&p_pdev, PV_NONE, 19093 @@ -1898,7 +191 2,7 @@19609 @@ -1898,7 +1913,7 @@ 19094 19610 (char_u *)NULL, PV_NONE, 19095 19611 {(char_u *)NULL, (char_u *)0L} … … 19100 19616 #ifdef FEAT_POSTSCRIPT 19101 19617 (char_u *)&p_penc, PV_NONE, 19102 @@ -1907,7 +192 1,7 @@19618 @@ -1907,7 +1922,7 @@ 19103 19619 (char_u *)NULL, PV_NONE, 19104 19620 {(char_u *)NULL, (char_u *)0L} … … 19109 19625 #ifdef FEAT_POSTSCRIPT 19110 19626 (char_u *)&p_pexpr, PV_NONE, 19111 @@ -1916,7 +193 0,7 @@19627 @@ -1916,7 +1931,7 @@ 19112 19628 (char_u *)NULL, PV_NONE, 19113 19629 {(char_u *)NULL, (char_u *)0L} … … 19118 19634 #ifdef FEAT_PRINTER 19119 19635 (char_u *)&p_pfn, PV_NONE, 19120 @@ -1931,7 +194 5,7 @@19636 @@ -1931,7 +1946,7 @@ 19121 19637 (char_u *)NULL, PV_NONE, 19122 19638 {(char_u *)NULL, (char_u *)0L} … … 19127 19643 #ifdef FEAT_PRINTER 19128 19644 (char_u *)&p_header, PV_NONE, 19129 @@ -1940,7 +195 4,7 @@19645 @@ -1940,7 +1955,7 @@ 19130 19646 (char_u *)NULL, PV_NONE, 19131 19647 {(char_u *)NULL, (char_u *)0L} … … 19136 19652 #if defined(FEAT_POSTSCRIPT) && defined(FEAT_MBYTE) 19137 19653 (char_u *)&p_pmcs, PV_NONE, 19138 @@ -1949,7 +196 3,7 @@19654 @@ -1949,7 +1964,7 @@ 19139 19655 (char_u *)NULL, PV_NONE, 19140 19656 {(char_u *)NULL, (char_u *)0L} … … 19145 19661 #if defined(FEAT_POSTSCRIPT) && defined(FEAT_MBYTE) 19146 19662 (char_u *)&p_pmfn, PV_NONE, 19147 @@ -1958,7 +197 2,7 @@19663 @@ -1958,7 +1973,7 @@ 19148 19664 (char_u *)NULL, PV_NONE, 19149 19665 {(char_u *)NULL, (char_u *)0L} … … 19154 19670 #ifdef FEAT_PRINTER 19155 19671 (char_u *)&p_popt, PV_NONE, 19156 @@ -1967,17 +198 1,17 @@19672 @@ -1967,17 +1982,17 @@ 19157 19673 (char_u *)NULL, PV_NONE, 19158 19674 {(char_u *)NULL, (char_u *)0L} … … 19175 19691 #ifdef FEAT_TEXTOBJ 19176 19692 (char_u *)&p_qe, PV_QE, 19177 @@ -1986,47 +200 0,47 @@19693 @@ -1986,47 +2001,47 @@ 19178 19694 (char_u *)NULL, PV_NONE, 19179 19695 {(char_u *)NULL, (char_u *)0L} … … 19232 19748 #ifdef FEAT_RIGHTLEFT 19233 19749 (char_u *)VAR_WIN, PV_RLC, 19234 @@ -2035,40 +20 49,41 @@19750 @@ -2035,40 +2050,41 @@ 19235 19751 (char_u *)NULL, PV_NONE, 19236 19752 {(char_u *)NULL, (char_u *)0L} … … 19282 19798 #ifdef FEAT_SCROLLBIND 19283 19799 (char_u *)&p_sbo, PV_NONE, 19284 @@ -2077,27 +209 2,29 @@19800 @@ -2077,27 +2093,29 @@ 19285 19801 (char_u *)NULL, PV_NONE, 19286 19802 {(char_u *)0L, (char_u *)0L} … … 19317 19833 #ifdef FEAT_SESSION 19318 19834 (char_u *)&p_ssop, PV_NONE, 19319 @@ -2107,7 +212 4,7 @@19835 @@ -2107,7 +2125,7 @@ 19320 19836 (char_u *)NULL, PV_NONE, 19321 19837 {(char_u *)0L, (char_u *)0L} … … 19326 19842 (char_u *)&p_sh, PV_NONE, 19327 19843 { 19328 @@ -2136,7 +215 3,7 @@19844 @@ -2136,7 +2154,7 @@ 19329 19845 # endif 19330 19846 # endif … … 19335 19851 (char_u *)&p_shcf, PV_NONE, 19336 19852 { 19337 @@ -2149,7 +216 6,7 @@19853 @@ -2149,7 +2167,7 @@ 19338 19854 (char_u *)"-c", 19339 19855 # endif … … 19344 19860 #ifdef FEAT_QUICKFIX 19345 19861 (char_u *)&p_sp, PV_NONE, 19346 @@ -2168,30 +218 5,30 @@19862 @@ -2168,30 +2186,30 @@ 19347 19863 (char_u *)NULL, PV_NONE, 19348 19864 {(char_u *)0L, (char_u *)0L} … … 19381 19897 (char_u *)&p_sxq, PV_NONE, 19382 19898 { 19383 @@ -2200,30 +221 7,31 @@19899 @@ -2200,30 +2218,31 @@ 19384 19900 #else 19385 19901 (char_u *)"", … … 19419 19935 #ifdef FEAT_CMDL_INFO 19420 19936 (char_u *)&p_sc, PV_NONE, 19421 @@ -2236,58 +225 4,58 @@19937 @@ -2236,58 +2255,58 @@ 19422 19938 #else 19423 19939 (char_u *)TRUE … … 19492 20008 #ifdef FEAT_SPELL 19493 20009 (char_u *)&p_spc, PV_SPC, 19494 @@ -2296,7 +231 4,7 @@20010 @@ -2296,7 +2315,7 @@ 19495 20011 (char_u *)NULL, PV_NONE, 19496 20012 {(char_u *)0L, (char_u *)0L} … … 19501 20017 #ifdef FEAT_SPELL 19502 20018 (char_u *)&p_spf, PV_SPF, 19503 @@ -2305,7 +232 3,7 @@20019 @@ -2305,7 +2324,7 @@ 19504 20020 (char_u *)NULL, PV_NONE, 19505 20021 {(char_u *)0L, (char_u *)0L} … … 19510 20026 #ifdef FEAT_SPELL 19511 20027 (char_u *)&p_spl, PV_SPL, 19512 @@ -2314,7 +233 2,7 @@20028 @@ -2314,7 +2333,7 @@ 19513 20029 (char_u *)NULL, PV_NONE, 19514 20030 {(char_u *)0L, (char_u *)0L} … … 19519 20035 #ifdef FEAT_SPELL 19520 20036 (char_u *)&p_sps, PV_NONE, 19521 @@ -2323,35 +234 1,35 @@20037 @@ -2323,35 +2342,35 @@ 19522 20038 (char_u *)NULL, PV_NONE, 19523 20039 {(char_u *)0L, (char_u *)0L} … … 19561 20077 #ifdef FEAT_SEARCHPATH 19562 20078 (char_u *)&p_sua, PV_SUA, 19563 @@ -2360,16 +237 8,16 @@20079 @@ -2360,16 +2379,16 @@ 19564 20080 (char_u *)NULL, PV_NONE, 19565 20081 {(char_u *)0L, (char_u *)0L} … … 19582 20098 #ifdef FEAT_SYN_HL 19583 20099 (char_u *)&p_smc, PV_SMC, 19584 @@ -2378,7 +239 6,7 @@20100 @@ -2378,7 +2397,7 @@ 19585 20101 (char_u *)NULL, PV_NONE, 19586 20102 {(char_u *)0L, (char_u *)0L} … … 19591 20107 #ifdef FEAT_SYN_HL 19592 20108 (char_u *)&p_syn, PV_SYN, 19593 @@ -2387,24 +240 5,24 @@20109 @@ -2387,24 +2406,24 @@ 19594 20110 (char_u *)NULL, PV_NONE, 19595 20111 {(char_u *)0L, (char_u *)0L} … … 19620 20136 (char_u *)&p_tbs, PV_NONE, 19621 20137 #ifdef VMS /* binary searching doesn't appear to work on VMS */ 19622 @@ -2412,13 +243 0,13 @@20138 @@ -2412,13 +2431,13 @@ 19623 20139 #else 19624 20140 {(char_u *)TRUE, (char_u *)0L} … … 19637 20153 (char_u *)&p_tags, PV_TAGS, 19638 20154 { 19639 @@ -2427,20 +244 5,20 @@20155 @@ -2427,20 +2446,20 @@ 19640 20156 #else 19641 20157 (char_u *)"./tags,tags", … … 19662 20178 #ifdef FEAT_MBYTE 19663 20179 (char_u *)&p_tenc, PV_NONE, 19664 @@ -2449,13 +246 7,14 @@20180 @@ -2449,13 +2468,14 @@ 19665 20181 (char_u *)NULL, PV_NONE, 19666 20182 {(char_u *)0L, (char_u *)0L} … … 19680 20196 (char_u *)&p_tx, PV_TX, 19681 20197 { 19682 @@ -2464,40 +248 3,40 @@20198 @@ -2464,40 +2484,40 @@ 19683 20199 #else 19684 20200 (char_u *)FALSE, … … 19729 20245 #ifdef FEAT_TITLE 19730 20246 (char_u *)&p_titleold, PV_NONE, 19731 @@ -2507,49 +252 6,50 @@20247 @@ -2507,49 +2527,50 @@ 19732 20248 (char_u *)NULL, PV_NONE, 19733 20249 {(char_u *)0L, (char_u *)0L} … … 19791 20307 (char_u *)&p_ul, PV_NONE, 19792 20308 { 19793 @@ -2558,19 +257 8,19 @@20309 @@ -2558,19 +2579,19 @@ 19794 20310 #else 19795 20311 (char_u *)100L, … … 19816 20332 #ifdef FEAT_SESSION 19817 20333 (char_u *)&p_vdir, PV_NONE, 19818 @@ -2579,7 +2 599,7 @@20334 @@ -2579,7 +2600,7 @@ 19819 20335 (char_u *)NULL, PV_NONE, 19820 20336 {(char_u *)0L, (char_u *)0L} … … 19825 20341 #ifdef FEAT_SESSION 19826 20342 (char_u *)&p_vop, PV_NONE, 19827 @@ -2588,25 +260 8,25 @@20343 @@ -2588,25 +2609,25 @@ 19828 20344 (char_u *)NULL, PV_NONE, 19829 20345 {(char_u *)0L, (char_u *)0L} … … 19856 20372 #ifdef FEAT_VIRTUALEDIT 19857 20373 (char_u *)&p_ve, PV_NONE, 19858 @@ -2615,51 +263 5,52 @@20374 @@ -2615,51 +2636,52 @@ 19859 20375 (char_u *)NULL, PV_NONE, 19860 20376 {(char_u *)0L, (char_u *)0L} … … 19922 20438 #ifdef FEAT_CMDL_COMPL 19923 20439 (char_u *)&p_wop, PV_NONE, 19924 @@ -2668,7 +26 89,7 @@20440 @@ -2668,7 +2690,7 @@ 19925 20441 (char_u *)NULL, PV_NONE, 19926 20442 {(char_u *)NULL, (char_u *)0L} … … 19931 20447 #ifdef FEAT_WAK 19932 20448 (char_u *)&p_wak, PV_NONE, 19933 @@ -2677,67 +269 8,67 @@20449 @@ -2677,67 +2699,67 @@ 19934 20450 (char_u *)NULL, PV_NONE, 19935 20451 {(char_u *)NULL, (char_u *)0L} … … 20012 20528 (char_u *)&p_wb, PV_NONE, 20013 20529 { 20014 @@ -2746,15 +276 7,15 @@20530 @@ -2746,15 +2768,15 @@ 20015 20531 #else 20016 20532 (char_u *)FALSE, … … 20031 20547 p_term("t_AB", T_CAB) 20032 20548 p_term("t_AF", T_CAF) 20033 @@ -2815,7 +283 6,8 @@20549 @@ -2815,7 +2837,8 @@ 20034 20550 20035 20551 /* terminal key codes are not in here */ … … 20041 20557 20042 20558 #define PARAM_COUNT (sizeof(options) / sizeof(struct vimoption)) 20043 @@ -3984,7 +400 6,7 @@20559 @@ -3984,7 +4007,7 @@ 20044 20560 else 20045 20561 { … … 20050 20566 prefix = 0; 20051 20567 arg += 2; 20052 @@ -4119,11 +414 1,23 @@20568 @@ -4119,11 +4142,23 @@ 20053 20569 && options[opt_idx].var == VAR_WIN) 20054 20570 goto skip; … … 20078 20594 20079 20595 #ifdef HAVE_SANDBOX 20080 @@ -5268,6 +530 2,21 @@20596 @@ -5268,6 +5303,21 @@ 20081 20597 } 20082 20598 #endif … … 20100 20616 * Set a string option to a new value (without checking the effect). 20101 20617 * The string is copied into allocated memory. 20102 @@ -5275,14 +532 4,13 @@20618 @@ -5275,14 +5325,13 @@ 20103 20619 * When "set_sid" is zero set the scriptID to current_SID. When "set_sid" is 20104 20620 * SID_NONE don't set the scriptID. Otherwise set the scriptID to "set_sid". … … 20116 20632 char_u *s; 20117 20633 char_u **varp; 20118 @@ -5407,6 +545 5,10 @@20634 @@ -5407,6 +5456,10 @@ 20119 20635 int did_chartab = FALSE; 20120 20636 char_u **gvarp; … … 20127 20643 /* Get the global option to compare with, otherwise we would have to check 20128 20644 * two values for all local options. */ 20129 @@ -5668,7 +572 0,7 @@20645 @@ -5668,7 +5721,7 @@ 20130 20646 { 20131 20647 # ifdef FEAT_TITLE … … 20136 20652 /* Add 'fileencoding' to the swap file. */ 20137 20653 ml_setflags(curbuf); 20138 @@ -5687,7 +57 39,7 @@20654 @@ -5687,7 +5740,7 @@ 20139 20655 { 20140 20656 errmsg = mb_init(); … … 20145 20661 } 20146 20662 } 20147 @@ -5766,14 +581 8,28 @@20663 @@ -5766,14 +5819,28 @@ 20148 20664 /* load or unload key mapping tables */ 20149 20665 errmsg = keymap_init(); … … 20181 20697 status_redraw_curbuf(); 20182 20698 # endif 20183 @@ -5796,7 +586 2,7 @@20699 @@ -5796,7 +5863,7 @@ 20184 20700 else 20185 20701 curbuf->b_p_tx = FALSE; … … 20190 20706 /* update flag in swap file */ 20191 20707 ml_setflags(curbuf); 20192 @@ -5977,15 +604 3,23 @@20708 @@ -5977,15 +6044,23 @@ 20193 20709 /* ":set t_Co=0" and ":set t_Co=1" do ":set t_Co=" */ 20194 20710 if (varp == &T_CCO) … … 20221 20737 ttest(FALSE); 20222 20738 if (varp == &T_ME) 20223 @@ -6055,6 +61 29,7 @@20739 @@ -6055,6 +6130,7 @@ 20224 20740 errmsg = (char_u *)N_("E596: Invalid font(s)"); 20225 20741 } … … 20229 20745 # ifdef FEAT_XFONTSET 20230 20746 else if (varp == &p_guifontset) 20231 @@ -6063,6 +613 8,7 @@20747 @@ -6063,6 +6139,7 @@ 20232 20748 errmsg = (char_u *)N_("E597: can't select fontset"); 20233 20749 else if (gui.in_use && gui_init_font(p_guifontset, TRUE) != OK) … … 20237 20753 # endif 20238 20754 # ifdef FEAT_MBYTE 20239 @@ -6072,6 +614 8,7 @@20755 @@ -6072,6 +6149,7 @@ 20240 20756 errmsg = (char_u *)N_("E533: can't select wide font"); 20241 20757 else if (gui_get_wide_font() == FAIL) … … 20245 20761 # endif 20246 20762 #endif 20247 @@ -6133,13 +621 0,24 @@20763 @@ -6133,13 +6211,24 @@ 20248 20764 #ifdef FEAT_GUI 20249 20765 /* 'guioptions' */ … … 20270 20786 20271 20787 #if defined(FEAT_MOUSE_TTY) && (defined(UNIX) || defined(VMS)) 20272 @@ -6717,7 +680 5,11 @@20788 @@ -6717,7 +6806,11 @@ 20273 20789 20274 20790 if (curwin->w_curswant != MAXCOL) … … 20283 20799 return errmsg; 20284 20800 } 20285 @@ -6932,6 +702 4,7 @@20801 @@ -6932,6 +7025,7 @@ 20286 20802 int new_unnamed = FALSE; 20287 20803 int new_autoselect = FALSE; … … 20291 20807 char_u *errmsg = NULL; 20292 20808 char_u *p; 20293 @@ -6955,6 +704 8,11 @@20809 @@ -6955,6 +7049,11 @@ 20294 20810 new_autoselectml = TRUE; 20295 20811 p += 12; … … 20303 20819 { 20304 20820 p += 8; 20305 @@ -6976,6 +707 4,7 @@20821 @@ -6976,6 +7075,7 @@ 20306 20822 clip_unnamed = new_unnamed; 20307 20823 clip_autoselect = new_autoselect; … … 20311 20827 clip_exclude_prog = new_exclude_prog; 20312 20828 } 20313 @@ -7105,22 +7204,28 @@ 20829 @@ -7094,6 +7194,14 @@ 20830 compatible_set(); 20831 } 20832 20833 + /* 'list', 'number' */ 20834 + else if ((int *)varp == &curwin->w_p_list 20835 + || (int *)varp == &curwin->w_p_nu) 20836 + { 20837 + if (curwin->w_curswant != MAXCOL) 20838 + curwin->w_set_curswant = TRUE; 20839 + } 20840 + 20841 else if ((int *)varp == &curbuf->b_p_ro) 20842 { 20843 /* when 'readonly' is reset globally, also reset readonlymode */ 20844 @@ -7105,22 +7213,28 @@ 20314 20845 curbuf->b_did_warn = FALSE; 20315 20846 … … 20347 20878 20348 20879 /* when 'bin' is set also set some other options */ 20349 @@ -7128,7 +72 33,7 @@20880 @@ -7128,7 +7242,7 @@ 20350 20881 { 20351 20882 set_options_bin(old_value, curbuf->b_p_bin, opt_flags); … … 20356 20887 } 20357 20888 20358 @@ -7279,7 +73 84,7 @@20889 @@ -7279,7 +7393,7 @@ 20359 20890 if (!value) 20360 20891 save_file_ff(curbuf); /* Buffer is unchanged */ … … 20365 20896 #ifdef FEAT_AUTOCMD 20366 20897 modified_was_set = value; 20367 @@ -7486,9 +7591,13 @@ 20898 @@ -7316,6 +7430,8 @@ 20899 { 20900 if (curwin->w_p_wrap) 20901 curwin->w_leftcol = 0; 20902 + if (curwin->w_curswant != MAXCOL) 20903 + curwin->w_set_curswant = TRUE; 20904 } 20905 20906 #ifdef FEAT_WINDOWS 20907 @@ -7486,9 +7602,13 @@ 20368 20908 * set. */ 20369 20909 if (STRCMP(p_enc, "utf-8") != 0) … … 20381 20921 20382 20922 # ifdef FEAT_MBYTE 20383 @@ -7714,7 +7823,7 @@ 20923 @@ -7535,6 +7655,30 @@ 20924 curbuf->b_p_imsearch = B_IMODE_USE_INSERT; 20925 # endif 20926 } 20927 + if (curwin->w_curswant != MAXCOL) 20928 + curwin->w_set_curswant = TRUE; 20929 + } 20930 + 20931 + else if ((int *)varp == &p_arshape) 20932 + { 20933 + if (curwin->w_curswant != MAXCOL) 20934 + curwin->w_set_curswant = TRUE; 20935 + } 20936 +#endif 20937 + 20938 +#ifdef FEAT_LINEBREAK 20939 + if ((int *)varp == &curwin->w_p_lbr) 20940 + { 20941 + if (curwin->w_curswant != MAXCOL) 20942 + curwin->w_set_curswant = TRUE; 20943 + } 20944 +#endif 20945 + 20946 +#ifdef FEAT_RIGHTLEFT 20947 + if ((int *)varp == &curwin->w_p_rl) 20948 + { 20949 + if (curwin->w_curswant != MAXCOL) 20950 + curwin->w_set_curswant = TRUE; 20951 } 20952 #endif 20953 20954 @@ -7545,8 +7689,7 @@ 20955 options[opt_idx].flags |= P_WAS_SET; 20956 20957 comp_col(); /* in case 'ruler' or 'showcmd' changed */ 20958 - if (curwin->w_curswant != MAXCOL) 20959 - curwin->w_set_curswant = TRUE; /* in case 'list' changed */ 20960 + 20961 check_redraw(options[opt_idx].flags); 20962 20963 return NULL; 20964 @@ -7714,7 +7857,7 @@ 20384 20965 newFoldLevel(); 20385 20966 } … … 20390 20971 { 20391 20972 foldUpdateAll(curwin); 20392 @@ -7974,6 +8 083,11 @@20973 @@ -7974,6 +8117,11 @@ 20393 20974 else /* curwin->w_p_scr > curwin->w_height */ 20394 20975 curwin->w_p_scr = curwin->w_height; … … 20402 20983 { 20403 20984 errmsg = e_positive; 20404 @@ -8227,13 +83 41,13 @@20985 @@ -8227,13 +8375,13 @@ 20405 20986 { 20406 20987 if (number == 0 && string != NULL) … … 20419 21000 /* There's another character after zeros or the string 20420 21001 * is empty. In both cases, we are trying to set a 20421 @@ -8323,7 +84 37,7 @@21002 @@ -8323,7 +8471,7 @@ 20422 21003 { 20423 21004 --arg; /* put arg at the '<' */ … … 20428 21009 key = 0; 20429 21010 } 20430 @@ -9271,10 +9385,9 @@ 21011 @@ -8813,6 +8961,28 @@ 21012 } 21013 21014 /* 21015 + * Free the string for one term option, if it was allocated. 21016 + * Set the string to empty_option and clear allocated flag. 21017 + * "var" points to the option value. 21018 + */ 21019 + void 21020 +free_one_termoption(var) 21021 + char_u *var; 21022 +{ 21023 + struct vimoption *p; 21024 + 21025 + for (p = &options[0]; p->fullname != NULL; p++) 21026 + if (p->var == var) 21027 + { 21028 + if (p->flags & P_ALLOCED) 21029 + free_string_option(*(char_u **)(p->var)); 21030 + *(char_u **)(p->var) = empty_option; 21031 + p->flags &= ~P_ALLOCED; 21032 + break; 21033 + } 21034 +} 21035 + 21036 +/* 21037 * Set the terminal option defaults to the current value. 21038 * Used after setting the terminal name. 21039 */ 21040 @@ -9271,10 +9441,9 @@ 20431 21041 /* 20432 21042 * Check for NULL pointers in a winopt_T and replace them with empty_option. … … 20440 21050 #ifdef FEAT_FOLDING 20441 21051 check_string_option(&wop->wo_fdi); 20442 @@ -9296,10 +94 09,9 @@21052 @@ -9296,10 +9465,9 @@ 20443 21053 /* 20444 21054 * Free the allocated memory inside a winopt_T. … … 20452 21062 #ifdef FEAT_FOLDING 20453 21063 clear_string_option(&wop->wo_fdi); 20454 @@ -9645,7 +9 757,7 @@21064 @@ -9645,7 +9813,7 @@ 20455 21065 } 20456 21066 --p; … … 20461 21071 xp->xp_context = EXPAND_BOOL_SETTINGS; 20462 21072 p += 2; 20463 @@ -9834,7 + 9946,8 @@21073 @@ -9834,7 +10002,8 @@ 20464 21074 regmatch->rm_ic = ic; 20465 21075 if (xp->xp_context != EXPAND_BOOL_SETTINGS) … … 20471 21081 { 20472 21082 if (loop == 0) 20473 @@ -10093,25 +102 06,110 @@21083 @@ -10093,25 +10262,110 @@ 20474 21084 20475 21085 #ifdef FEAT_LANGMAP … … 20489 21099 + * langmap_entry_T. This does the same as langmap_mapchar[] for characters >= 20490 21100 + * 256. 20491 21101 + */ 20492 21102 +# ifdef FEAT_MBYTE 20493 21103 +/* 20494 21104 + * With multi-byte support use growarray for 'langmap' chars >= 256 20495 +*/21105 */ 20496 21106 +typedef struct 20497 21107 +{ … … 20591 21201 20592 21202 /* 20593 @@ -10125,7 +103 23,10 @@21203 @@ -10125,7 +10379,10 @@ 20594 21204 char_u *p2; 20595 21205 int from, to; … … 20603 21213 for (p = p_langmap; p[0] != NUL; ) 20604 21214 { 20605 @@ -10175,7 +10 376,13 @@21215 @@ -10175,7 +10432,13 @@ 20606 21216 transchar(from)); 20607 21217 return; … … 20620 21230 diff -Naur vim72.orig/src/os_unix.c vim72/src/os_unix.c 20621 21231 --- vim72.orig/src/os_unix.c 2008-08-06 04:01:40.000000000 -0700 20622 +++ vim72/src/os_unix.c 2009-0 7-19 15:18:55.000000000 -070021232 +++ vim72/src/os_unix.c 2009-09-12 08:41:32.000000000 -0700 20623 21233 @@ -181,7 +181,8 @@ 20624 21234 && defined(FEAT_TITLE) && !defined(FEAT_GUI_GTK) … … 20881 21491 #endif 20882 21492 21493 @@ -1706,9 +1734,9 @@ 21494 if (oldicon == NULL && !test_only) 21495 { 21496 if (STRNCMP(T_NAME, "builtin_", 8) == 0) 21497 - oldicon = T_NAME + 8; 21498 + oldicon = vim_strsave(T_NAME + 8); 21499 else 21500 - oldicon = T_NAME; 21501 + oldicon = vim_strsave(T_NAME); 21502 } 21503 21504 return retval; 20883 21505 @@ -1897,10 +1925,9 @@ 20884 21506 … … 20891 21513 + int test_only UNUSED; 20892 21514 { 21515 return FALSE; 21516 } 21517 @@ -1912,9 +1939,9 @@ 21518 if (!test_only) 21519 { 21520 if (STRNCMP(T_NAME, "builtin_", 8) == 0) 21521 - oldicon = T_NAME + 8; 21522 + oldicon = vim_strsave(T_NAME + 8); 21523 else 21524 - oldicon = T_NAME; 21525 + oldicon = vim_strsave(T_NAME); 21526 } 20893 21527 return FALSE; 20894 21528 } … … 21360 21994 diff -Naur vim72.orig/src/os_unix.h vim72/src/os_unix.h 21361 21995 --- vim72.orig/src/os_unix.h 2008-06-17 11:01:17.000000000 -0700 21362 +++ vim72/src/os_unix.h 2009-0 7-19 15:18:55.000000000 -070021996 +++ vim72/src/os_unix.h 2009-09-12 08:41:19.000000000 -0700 21363 21997 @@ -124,7 +124,7 @@ 21364 21998 # define SIGDUMMYARG 0, 0, (struct sigcontext *)0 … … 21384 22018 diff -Naur vim72.orig/src/proto/buffer.pro vim72/src/proto/buffer.pro 21385 22019 --- vim72.orig/src/proto/buffer.pro 2008-08-09 07:31:21.000000000 -0700 21386 +++ vim72/src/proto/buffer.pro 2009-0 7-19 15:15:54.000000000 -070022020 +++ vim72/src/proto/buffer.pro 2009-09-12 08:38:11.000000000 -0700 21387 22021 @@ -37,13 +37,12 @@ 21388 22022 int otherfile __ARGS((char_u *ffname)); … … 21414 22048 diff -Naur vim72.orig/src/proto/edit.pro vim72/src/proto/edit.pro 21415 22049 --- vim72.orig/src/proto/edit.pro 2008-08-09 07:31:24.000000000 -0700 21416 +++ vim72/src/proto/edit.pro 2009-0 7-19 15:15:54.000000000 -070022050 +++ vim72/src/proto/edit.pro 2009-09-12 08:38:11.000000000 -0700 21417 22051 @@ -8,7 +8,7 @@ 21418 22052 void backspace_until_column __ARGS((int col)); … … 21426 22060 diff -Naur vim72.orig/src/proto/eval.pro vim72/src/proto/eval.pro 21427 22061 --- vim72.orig/src/proto/eval.pro 2008-08-09 07:31:25.000000000 -0700 21428 +++ vim72/src/proto/eval.pro 2009-0 7-19 15:10:37.000000000 -070022062 +++ vim72/src/proto/eval.pro 2009-09-12 08:32:50.000000000 -0700 21429 22063 @@ -17,7 +17,7 @@ 21430 22064 int eval_to_bool __ARGS((char_u *arg, int *error, char_u **nextcmd, int skip)); … … 21468 22102 diff -Naur vim72.orig/src/proto/ex_cmds.pro vim72/src/proto/ex_cmds.pro 21469 22103 --- vim72.orig/src/proto/ex_cmds.pro 2008-08-09 07:31:25.000000000 -0700 21470 +++ vim72/src/proto/ex_cmds.pro 2009-0 7-19 15:16:00.000000000 -070022104 +++ vim72/src/proto/ex_cmds.pro 2009-09-12 08:38:17.000000000 -0700 21471 22105 @@ -9,9 +9,9 @@ 21472 22106 void do_bang __ARGS((int addr_count, exarg_T *eap, int forceit, int do_in, int do_out)); … … 21492 22126 diff -Naur vim72.orig/src/proto/ex_getln.pro vim72/src/proto/ex_getln.pro 21493 22127 --- vim72.orig/src/proto/ex_getln.pro 2008-08-09 07:31:28.000000000 -0700 21494 +++ vim72/src/proto/ex_getln.pro 2009-0 7-19 15:14:20.000000000 -070022128 +++ vim72/src/proto/ex_getln.pro 2009-09-12 08:36:36.000000000 -0700 21495 22129 @@ -4,6 +4,7 @@ 21496 22130 int text_locked __ARGS((void)); … … 21512 22146 diff -Naur vim72.orig/src/proto/gui.pro vim72/src/proto/gui.pro 21513 22147 --- vim72.orig/src/proto/gui.pro 2008-08-09 07:31:56.000000000 -0700 21514 +++ vim72/src/proto/gui.pro 2009-0 7-19 15:17:39.000000000 -070022148 +++ vim72/src/proto/gui.pro 2009-09-12 08:39:58.000000000 -0700 21515 22149 @@ -43,6 +43,7 @@ 21516 22150 void gui_create_scrollbar __ARGS((scrollbar_T *sb, int type, win_T *wp)); … … 21523 22157 diff -Naur vim72.orig/src/proto/if_cscope.pro vim72/src/proto/if_cscope.pro 21524 22158 --- vim72.orig/src/proto/if_cscope.pro 2008-08-09 07:31:33.000000000 -0700 21525 +++ vim72/src/proto/if_cscope.pro 2009-0 7-19 15:15:24.000000000 -070022159 +++ vim72/src/proto/if_cscope.pro 2009-09-12 08:37:41.000000000 -0700 21526 22160 @@ -1,4 +1,6 @@ 21527 22161 /* if_cscope.c */ … … 21533 22167 diff -Naur vim72.orig/src/proto/mark.pro vim72/src/proto/mark.pro 21534 22168 --- vim72.orig/src/proto/mark.pro 2008-08-09 07:31:36.000000000 -0700 21535 +++ vim72/src/proto/mark.pro 2009-0 7-19 15:09:53.000000000 -070022169 +++ vim72/src/proto/mark.pro 2009-09-12 08:32:04.000000000 -0700 21536 22170 @@ -26,5 +26,5 @@ 21537 22171 void write_viminfo_filemarks __ARGS((FILE *fp)); … … 21543 22177 diff -Naur vim72.orig/src/proto/mbyte.pro vim72/src/proto/mbyte.pro 21544 22178 --- vim72.orig/src/proto/mbyte.pro 2008-08-09 07:31:41.000000000 -0700 21545 +++ vim72/src/proto/mbyte.pro 2009-0 7-19 15:17:30.000000000 -070022179 +++ vim72/src/proto/mbyte.pro 2009-09-12 08:39:49.000000000 -0700 21546 22180 @@ -7,10 +7,12 @@ 21547 22181 int latin_char2len __ARGS((int c)); … … 21567 22201 diff -Naur vim72.orig/src/proto/message.pro vim72/src/proto/message.pro 21568 22202 --- vim72.orig/src/proto/message.pro 2008-08-09 07:31:39.000000000 -0700 21569 +++ vim72/src/proto/message.pro 2009-0 7-19 15:15:14.000000000 -070022203 +++ vim72/src/proto/message.pro 2009-09-12 08:37:30.000000000 -0700 21570 22204 @@ -54,6 +54,7 @@ 21571 22205 void msg_clr_cmdline __ARGS((void)); … … 21578 22212 diff -Naur vim72.orig/src/proto/misc2.pro vim72/src/proto/misc2.pro 21579 22213 --- vim72.orig/src/proto/misc2.pro 2008-08-09 07:31:40.000000000 -0700 21580 +++ vim72/src/proto/misc2.pro 2009-0 7-19 15:11:46.000000000 -070022214 +++ vim72/src/proto/misc2.pro 2009-09-12 08:33:59.000000000 -0700 21581 22215 @@ -59,7 +59,7 @@ 21582 22216 int handle_x_keys __ARGS((int key)); … … 21590 22224 diff -Naur vim72.orig/src/proto/netbeans.pro vim72/src/proto/netbeans.pro 21591 22225 --- vim72.orig/src/proto/netbeans.pro 2008-08-09 07:31:56.000000000 -0700 21592 +++ vim72/src/proto/netbeans.pro 2009-0 7-19 15:12:02.000000000 -070022226 +++ vim72/src/proto/netbeans.pro 2009-09-12 08:34:15.000000000 -0700 21593 22227 @@ -11,7 +11,7 @@ 21594 22228 void netbeans_frame_moved __ARGS((int new_x, int new_y)); … … 21602 22236 diff -Naur vim72.orig/src/proto/option.pro vim72/src/proto/option.pro 21603 22237 --- vim72.orig/src/proto/option.pro 2008-08-09 07:31:43.000000000 -0700 21604 +++ vim72/src/proto/option.pro 2009-07-19 15:13:20.000000000 -0700 21605 @@ -44,6 +44,7 @@ 22238 +++ vim72/src/proto/option.pro 2009-09-12 08:41:35.000000000 -0700 22239 @@ -29,6 +29,7 @@ 22240 int makefoldset __ARGS((FILE *fd)); 22241 void clear_termoptions __ARGS((void)); 22242 void free_termoptions __ARGS((void)); 22243 +void free_one_termoption __ARGS((char_u *var)); 22244 void set_term_defaults __ARGS((void)); 22245 void comp_col __ARGS((void)); 22246 char_u *get_equalprg __ARGS((void)); 22247 @@ -44,6 +45,7 @@ 21606 22248 void set_context_in_set_cmd __ARGS((expand_T *xp, char_u *arg, int opt_flags)); 21607 22249 int ExpandSettings __ARGS((expand_T *xp, regmatch_T *regmatch, int *num_file, char_u ***file)); … … 21613 22255 diff -Naur vim72.orig/src/proto/os_unix.pro vim72/src/proto/os_unix.pro 21614 22256 --- vim72.orig/src/proto/os_unix.pro 2008-08-09 07:31:44.000000000 -0700 21615 +++ vim72/src/proto/os_unix.pro 2009-0 7-19 15:18:55.000000000 -070022257 +++ vim72/src/proto/os_unix.pro 2009-09-12 08:41:19.000000000 -0700 21616 22258 @@ -1,4 +1,5 @@ 21617 22259 /* os_unix.c */ … … 21622 22264 diff -Naur vim72.orig/src/proto/spell.pro vim72/src/proto/spell.pro 21623 22265 --- vim72.orig/src/proto/spell.pro 2008-08-09 07:31:48.000000000 -0700 21624 +++ vim72/src/proto/spell.pro 2009-0 7-19 15:16:00.000000000 -070022266 +++ vim72/src/proto/spell.pro 2009-09-12 08:38:17.000000000 -0700 21625 22267 @@ -22,5 +22,5 @@ 21626 22268 char_u *spell_to_word_end __ARGS((char_u *start, buf_T *buf)); … … 21632 22274 diff -Naur vim72.orig/src/proto/ui.pro vim72/src/proto/ui.pro 21633 22275 --- vim72.orig/src/proto/ui.pro 2008-08-09 07:31:52.000000000 -0700 21634 +++ vim72/src/proto/ui.pro 2009-0 7-19 15:18:26.000000000 -070022276 +++ vim72/src/proto/ui.pro 2009-09-12 08:40:50.000000000 -0700 21635 22277 @@ -48,6 +48,7 @@ 21636 22278 void open_app_context __ARGS((void)); … … 21643 22285 diff -Naur vim72.orig/src/proto/window.pro vim72/src/proto/window.pro 21644 22286 --- vim72.orig/src/proto/window.pro 2008-08-09 07:31:54.000000000 -0700 21645 +++ vim72/src/proto/window.pro 2009-0 7-19 15:18:10.000000000 -070022287 +++ vim72/src/proto/window.pro 2009-09-12 08:40:34.000000000 -0700 21646 22288 @@ -1,6 +1,7 @@ 21647 22289 /* window.c */ … … 21685 22327 diff -Naur vim72.orig/src/pty.c vim72/src/pty.c 21686 22328 --- vim72.orig/src/pty.c 2008-06-21 11:52:58.000000000 -0700 21687 +++ vim72/src/pty.c 2009-0 7-19 15:08:34.000000000 -070022329 +++ vim72/src/pty.c 2009-09-12 08:30:44.000000000 -0700 21688 22330 @@ -270,9 +270,10 @@ 21689 22331 } … … 21701 22343 diff -Naur vim72.orig/src/quickfix.c vim72/src/quickfix.c 21702 22344 --- vim72.orig/src/quickfix.c 2008-07-18 05:53:02.000000000 -0700 21703 +++ vim72/src/quickfix.c 2009-0 7-19 15:18:10.000000000 -070022345 +++ vim72/src/quickfix.c 2009-09-12 08:40:34.000000000 -0700 21704 22346 @@ -1419,6 +1419,7 @@ 21705 22347 int opened_window = FALSE; … … 21888 22530 diff -Naur vim72.orig/src/regexp.c vim72/src/regexp.c 21889 22531 --- vim72.orig/src/regexp.c 2008-08-07 12:58:50.000000000 -0700 21890 +++ vim72/src/regexp.c 2009-0 7-19 15:16:14.000000000 -070022532 +++ vim72/src/regexp.c 2009-09-12 08:38:31.000000000 -0700 21891 22533 @@ -471,7 +471,7 @@ 21892 22534 … … 21948 22590 diff -Naur vim72.orig/src/screen.c vim72/src/screen.c 21949 22591 --- vim72.orig/src/screen.c 2008-07-24 07:45:07.000000000 -0700 21950 +++ vim72/src/screen.c 2009-0 7-19 15:17:49.000000000 -070022592 +++ vim72/src/screen.c 2009-09-12 08:41:48.000000000 -0700 21951 22593 @@ -270,11 +270,10 @@ 21952 22594 * Note that when also inserting/deleting lines w_redraw_top and w_redraw_bot … … 22321 22963 * Allocation of the screen buffers is done only when the size changes and 22322 22964 * when Rows and Columns have been set and we have started doing full 22323 @@ -7440,10 +7499,17 @@ 22965 @@ -7408,6 +7467,10 @@ 22966 */ 22967 FOR_ALL_TAB_WINDOWS(tp, wp) 22968 win_free_lsize(wp); 22969 +#ifdef FEAT_AUTOCMD 22970 + if (aucmd_win != NULL) 22971 + win_free_lsize(aucmd_win); 22972 +#endif 22973 22974 new_ScreenLines = (schar_T *)lalloc((long_u)( 22975 (Rows + 1) * Columns * sizeof(schar_T)), FALSE); 22976 @@ -7440,10 +7503,18 @@ 22324 22977 { 22325 22978 outofmem = TRUE; … … 22331 22984 } 22332 22985 +#ifdef FEAT_AUTOCMD 22333 + if (aucmd_win != NULL && win_alloc_lines(aucmd_win) == FAIL) 22986 + if (aucmd_win != NULL && aucmd_win->w_lines == NULL 22987 + && win_alloc_lines(aucmd_win) == FAIL) 22334 22988 + outofmem = TRUE; 22335 22989 +#endif … … 22340 22994 #ifdef FEAT_MBYTE 22341 22995 for (i = 0; i < p_mco; ++i) 22342 @@ -7628,8 +769 4,17 @@22996 @@ -7628,8 +7699,17 @@ 22343 22997 --RedrawingDisabled; 22344 22998 … … 22359 23013 } 22360 23014 22361 @@ -8590,7 +86 65,6 @@23015 @@ -8590,7 +8670,6 @@ 22362 23016 * 22363 23017 * Return OK for success, FAIL if the lines are not deleted. … … 22367 23021 screen_del_lines(off, row, line_count, end, force, wp) 22368 23022 int off; 22369 @@ -8598,7 +867 2,7 @@23023 @@ -8598,7 +8677,7 @@ 22370 23024 int line_count; 22371 23025 int end; … … 22376 23030 int j; 22377 23031 int i; 22378 @@ -9416,13 +949 0,15 @@23032 @@ -9416,13 +9495,15 @@ 22379 23033 win_T *wp; 22380 23034 int always; … … 22393 23047 #ifdef FEAT_VERTSPLIT 22394 23048 int this_ru_col; 22395 @@ -9537,11 +961 3,12 @@23049 @@ -9537,11 +9618,12 @@ 22396 23050 * Some sprintfs return the length, some return a pointer. 22397 23051 * To avoid portability problems we use strlen() here. … … 22408 23062 (int)virtcol + 1); 22409 23063 22410 @@ -9551,7 +96 28,7 @@23064 @@ -9551,7 +9633,7 @@ 22411 23065 * screen up on some terminals). 22412 23066 */ … … 22417 23071 #ifdef FEAT_WINDOWS 22418 23072 if (wp->w_status_height == 0) /* can't use last char of screen */ 22419 @@ -9578,7 +96 55,7 @@23073 @@ -9578,7 +9660,7 @@ 22420 23074 buffer[i++] = fillchar; 22421 23075 ++o; … … 22428 23082 diff -Naur vim72.orig/src/search.c vim72/src/search.c 22429 23083 --- vim72.orig/src/search.c 2008-07-13 11:18:27.000000000 -0700 22430 +++ vim72/src/search.c 2009-0 7-19 15:16:33.000000000 -070023084 +++ vim72/src/search.c 2009-09-12 08:38:51.000000000 -0700 22431 23085 @@ -345,6 +345,15 @@ 22432 23086 { … … 22569 23223 diff -Naur vim72.orig/src/spell.c vim72/src/spell.c 22570 23224 --- vim72.orig/src/spell.c 2008-07-12 12:20:55.000000000 -0700 22571 +++ vim72/src/spell.c 2009-0 7-19 15:16:33.000000000 -070023225 +++ vim72/src/spell.c 2009-09-12 08:41:27.000000000 -0700 22572 23226 @@ -77,7 +77,7 @@ 22573 23227 … … 23426 24080 totlen += len; 23427 24081 } 23428 @@ -10343,10 +10541,9 @@ 24082 @@ -10054,6 +10252,7 @@ 24083 int limit; 24084 int selected = count; 24085 int badlen = 0; 24086 + int msg_scroll_save = msg_scroll; 24087 24088 if (no_spell_checking(curwin)) 24089 return; 24090 @@ -10218,7 +10417,9 @@ 24091 selected = prompt_for_number(&mouse_used); 24092 if (mouse_used) 24093 selected -= lines_left; 24094 - lines_left = Rows; /* avoid more prompt */ 24095 + lines_left = Rows; /* avoid more prompt */ 24096 + /* don't delay for 'smd' in normal_cmd() */ 24097 + msg_scroll = msg_scroll_save; 24098 } 24099 24100 if (selected > 0 && selected <= sug.su_ga.ga_len && u_save_cursor() == OK) 24101 @@ -10243,7 +10444,8 @@ 24102 } 24103 24104 /* Replace the word. */ 24105 - p = alloc((unsigned)STRLEN(line) - stp->st_orglen + stp->st_wordlen + 1); 24106 + p = alloc((unsigned)STRLEN(line) - stp->st_orglen 24107 + + stp->st_wordlen + 1); 24108 if (p != NULL) 24109 { 24110 c = (int)(sug.su_badptr - line); 24111 @@ -10343,10 +10545,9 @@ 23429 24112 /* 23430 24113 * ":spellrepall" … … 23438 24121 pos_T pos = curwin->w_cursor; 23439 24122 char_u *frompat; 23440 @@ -11480,15 +116 77,24 @@24123 @@ -11480,15 +11681,24 @@ 23441 24124 vim_strncpy(preword + sp->ts_prewordlen, 23442 24125 tword + sp->ts_splitoff, … … 23470 24153 p = preword + sp->ts_prewordlen; 23471 24154 mb_ptr_back(preword, p); 23472 @@ -11685,10 +1189 1,9 @@24155 @@ -11685,10 +11895,9 @@ 23473 24156 && (slang->sl_compsylmax < MAXWLEN 23474 24157 || sp->ts_complen + 1 - sp->ts_compsplit … … 23484 24167 try_compound = TRUE; 23485 24168 compflags[sp->ts_complen] = ((unsigned)flags >> 24); 23486 @@ -14808,7 +1501 3,7 @@24169 @@ -14808,7 +15017,7 @@ 23487 24170 23488 24171 case 0: … … 23493 24176 * 1: check if for identical strings 23494 24177 */ 23495 @@ -15398,10 +1560 3,9 @@24178 @@ -15398,10 +15607,9 @@ 23496 24179 /* 23497 24180 * ":spellinfo" … … 23505 24188 int lpi; 23506 24189 langp_T *lp; 23507 @@ -15945,11 +161 49,9 @@24190 @@ -15945,11 +16153,9 @@ 23508 24191 * Returns the number of matches. The matches are in "matchp[]", array of 23509 24192 * allocated strings. … … 23521 24204 diff -Naur vim72.orig/src/structs.h vim72/src/structs.h 23522 24205 --- vim72.orig/src/structs.h 2008-07-30 13:02:50.000000000 -0700 23523 +++ vim72/src/structs.h 2009-0 7-19 15:18:36.000000000 -070024206 +++ vim72/src/structs.h 2009-09-12 08:41:43.000000000 -0700 23524 24207 @@ -16,7 +16,7 @@ 23525 24208 */ … … 23612 24295 int w_topfill; /* number of filler lines above w_topline */ 23613 24296 int w_old_topfill; /* w_topfill at last redraw */ 23614 @@ -2270,16 +2286,1 1@@24297 @@ -2270,16 +2286,13 @@ 23615 24298 */ 23616 24299 typedef struct … … 23627 24310 - int save_topfill; /* saved topfill of save_curwin */ 23628 24311 -# endif 24312 + int use_aucmd_win; /* using aucmd_win */ 23629 24313 + win_T *save_curwin; /* saved curwin */ 23630 24314 + win_T *new_curwin; /* new curwin */ 23631 24315 + buf_T *new_curbuf; /* new curbuf */ 24316 + char_u *globaldir; /* saved value of globaldir */ 23632 24317 #endif 23633 24318 } aco_save_T; … … 23635 24320 diff -Naur vim72.orig/src/syntax.c vim72/src/syntax.c 23636 24321 --- vim72.orig/src/syntax.c 2008-08-08 14:47:48.000000000 -0700 23637 +++ vim72/src/syntax.c 2009-0 7-19 15:16:33.000000000 -070024322 +++ vim72/src/syntax.c 2009-09-12 08:38:51.000000000 -0700 23638 24323 @@ -3224,11 +3224,10 @@ 23639 24324 /* … … 23823 24508 diff -Naur vim72.orig/src/tag.c vim72/src/tag.c 23824 24509 --- vim72.orig/src/tag.c 2008-07-16 14:31:30.000000000 -0700 23825 +++ vim72/src/tag.c 2009-0 7-19 15:16:33.000000000 -070024510 +++ vim72/src/tag.c 2009-09-12 08:38:51.000000000 -0700 23826 24511 @@ -100,7 +100,7 @@ 23827 24512 * Tag for preview window is remembered separately, to avoid messing up the … … 23997 24682 diff -Naur vim72.orig/src/term.c vim72/src/term.c 23998 24683 --- vim72.orig/src/term.c 2008-07-27 04:48:06.000000000 -0700 23999 +++ vim72/src/term.c 2009-07-19 15:17:27.000000000 -0700 24684 +++ vim72/src/term.c 2009-09-12 08:41:35.000000000 -0700 24685 @@ -2881,7 +2881,7 @@ 24686 24687 /* if 'Sb' and 'AB' are not defined, reset "Co" */ 24688 if (*T_CSB == NUL && *T_CAB == NUL) 24689 - T_CCO = empty_option; 24690 + free_one_termoption(T_CCO); 24691 24692 /* Set 'weirdinvert' according to value of 't_xs' */ 24693 p_wiv = (*T_XS != NUL); 24000 24694 @@ -2906,7 +2906,7 @@ 24001 24695 int i; … … 24044 24738 diff -Naur vim72.orig/src/testdir/Makefile vim72/src/testdir/Makefile 24045 24739 --- vim72.orig/src/testdir/Makefile 2008-06-19 13:29:46.000000000 -0700 24046 +++ vim72/src/testdir/Makefile 2009-0 7-19 15:18:15.000000000 -070024740 +++ vim72/src/testdir/Makefile 2009-09-12 08:42:30.000000000 -0700 24047 24741 @@ -4,9 +4,11 @@ 24048 24742 … … 24065 24759 test59.out test60.out test61.out test62.out test63.out \ 24066 24760 - test64.out test65.out 24067 + test64.out test65.out test66.out 24761 + test64.out test65.out test66.out test67.out 24068 24762 24069 24763 SCRIPTS_GUI = test16.out … … 24100 24794 diff -Naur vim72.orig/src/testdir/Make_ming.mak vim72/src/testdir/Make_ming.mak 24101 24795 --- vim72.orig/src/testdir/Make_ming.mak 1969-12-31 16:00:00.000000000 -0800 24102 +++ vim72/src/testdir/Make_ming.mak 2009-0 7-19 15:09:28.000000000 -070024796 +++ vim72/src/testdir/Make_ming.mak 2009-09-12 08:31:40.000000000 -0700 24103 24797 @@ -0,0 +1,91 @@ 24104 24798 +# Makefile to run tests for Vim, on Dos-like machines … … 24195 24889 diff -Naur vim72.orig/src/testdir/test42.ok vim72/src/testdir/test42.ok 24196 24890 --- vim72.orig/src/testdir/test42.ok 2008-02-20 04:27:37.000000000 -0800 24197 +++ vim72/src/testdir/test42.ok 2009-0 7-19 15:09:58.000000000 -070024891 +++ vim72/src/testdir/test42.ok 2009-09-12 08:32:10.000000000 -0700 24198 24892 @@ -20,7 +20,7 @@ 24199 24893 ucs-2 … … 24207 24901 diff -Naur vim72.orig/src/testdir/test66.in vim72/src/testdir/test66.in 24208 24902 --- vim72.orig/src/testdir/test66.in 1969-12-31 16:00:00.000000000 -0800 24209 +++ vim72/src/testdir/test66.in 2009-0 7-19 15:14:34.000000000 -070024903 +++ vim72/src/testdir/test66.in 2009-09-12 08:36:49.000000000 -0700 24210 24904 @@ -0,0 +1,25 @@ 24211 24905 + … … 24236 24930 diff -Naur vim72.orig/src/testdir/test66.ok vim72/src/testdir/test66.ok 24237 24931 --- vim72.orig/src/testdir/test66.ok 1969-12-31 16:00:00.000000000 -0800 24238 +++ vim72/src/testdir/test66.ok 2009-0 7-19 15:14:34.000000000 -070024932 +++ vim72/src/testdir/test66.ok 2009-09-12 08:36:49.000000000 -0700 24239 24933 @@ -0,0 +1,10 @@ 24240 24934 + abcdefghijklmnopqrstuvwxyz … … 24248 24942 + abc defghijklmnopqrstuvwxyz 24249 24943 + abc defghijklmnopqrstuvwxyz 24944 diff -Naur vim72.orig/src/testdir/test67.in vim72/src/testdir/test67.in 24945 --- vim72.orig/src/testdir/test67.in 1969-12-31 16:00:00.000000000 -0800 24946 +++ vim72/src/testdir/test67.in 2009-09-12 08:42:30.000000000 -0700 24947 @@ -0,0 +1,33 @@ 24948 +Test that groups and patterns are tested correctly when calling exists() for 24949 +autocommands. 24950 + 24951 +STARTTEST 24952 +:so small.vim 24953 +:let results=[] 24954 +:augroup auexists 24955 +:augroup END 24956 +:call add(results, "##BufEnter: " . exists("##BufEnter")) 24957 +:call add(results, "#BufEnter: " . exists("#BufEnter")) 24958 +:au BufEnter * let g:entered=1 24959 +:call add(results, "#BufEnter: " . exists("#BufEnter")) 24960 +:call add(results, "#auexists#BufEnter: " . exists("#auexists#BufEnter")) 24961 +:augroup auexists 24962 +:au BufEnter * let g:entered=1 24963 +:augroup END 24964 +:call add(results, "#auexists#BufEnter: " . exists("#auexists#BufEnter")) 24965 +:call add(results, "#BufEnter#*.test: " . exists("#BufEnter#*.test")) 24966 +:au BufEnter *.test let g:entered=1 24967 +:call add(results, "#BufEnter#*.test: " . exists("#BufEnter#*.test")) 24968 +:edit testfile.test 24969 +:call add(results, "#BufEnter#<buffer>: " . exists("#BufEnter#<buffer>")) 24970 +:au BufEnter <buffer> let g:entered=1 24971 +:call add(results, "#BufEnter#<buffer>: " . exists("#BufEnter#<buffer>")) 24972 +:edit testfile2.test 24973 +:call add(results, "#BufEnter#<buffer>: " . exists("#BufEnter#<buffer>")) 24974 +:e test.out 24975 +:call append(0, results) 24976 +:$d 24977 +:w 24978 +:qa! 24979 +ENDTEST 24980 + 24981 diff -Naur vim72.orig/src/testdir/test67.ok vim72/src/testdir/test67.ok 24982 --- vim72.orig/src/testdir/test67.ok 1969-12-31 16:00:00.000000000 -0800 24983 +++ vim72/src/testdir/test67.ok 2009-09-12 08:42:30.000000000 -0700 24984 @@ -0,0 +1,10 @@ 24985 +##BufEnter: 1 24986 +#BufEnter: 0 24987 +#BufEnter: 1 24988 +#auexists#BufEnter: 0 24989 +#auexists#BufEnter: 1 24990 +#BufEnter#*.test: 0 24991 +#BufEnter#*.test: 1 24992 +#BufEnter#<buffer>: 0 24993 +#BufEnter#<buffer>: 1 24994 +#BufEnter#<buffer>: 0 24250 24995 diff -Naur vim72.orig/src/ui.c vim72/src/ui.c 24251 24996 --- vim72.orig/src/ui.c 2008-07-14 11:14:56.000000000 -0700 24252 +++ vim72/src/ui.c 2009-0 7-19 15:18:26.000000000 -070024997 +++ vim72/src/ui.c 2009-09-12 08:42:28.000000000 -0700 24253 24998 @@ -320,10 +320,9 @@ 24254 24999 * The gui_set_shellsize() or mch_set_shellsize() function will try to set the … … 24441 25186 { 24442 25187 if (*sel_atom == clip_plus.sel_atom) 24443 @@ -2344,1 4 +2352,67@@25188 @@ -2344,11 +2352,64 @@ 24444 25189 * Send the current selection to the clipboard. Do nothing for X because we 24445 25190 * will fill in the selection only when requested by another app. … … 24450 25195 - VimClipboard *cbd; 24451 25196 + VimClipboard *cbd UNUSED; 24452 24453 24454 24455 25197 +{ 25198 +} 25199 +#endif 25200 + 24456 25201 +#if defined(FEAT_XCLIPBOARD) || defined(FEAT_GUI_X11) \ 24457 25202 + || defined(FEAT_GUI_GTK) || defined(PROTO) … … 24463 25208 + Display *dpy; 24464 25209 + VimClipboard *cbd; 24465 +{25210 { 24466 25211 + int nbytes = 0; 24467 25212 + char_u *buffer = (char_u *)XFetchBuffer(dpy, &nbytes, 0); … … 24505 25250 + } 24506 25251 + } 24507 +} 24508 +#endif 24509 + 24510 #if defined(FEAT_MOUSE) || defined(PROTO) 24511 24512 /* 25252 } 25253 #endif 25254 24513 25255 @@ -2898,11 +2959,10 @@ 24514 25256 * Find the window at screen position "*rowp" and "*colp". The positions are … … 24524 25266 frame_T *fp; 24525 25267 25268 @@ -2995,18 +3055,17 @@ 25269 int vcol; 25270 { 25271 /* try to advance to the specified column */ 25272 - int col = 0; 25273 int count = 0; 25274 char_u *ptr; 25275 + char_u *start; 25276 25277 - ptr = ml_get_buf(wp->w_buffer, lnum, FALSE); 25278 + start = ptr = ml_get_buf(wp->w_buffer, lnum, FALSE); 25279 while (count <= vcol && *ptr != NUL) 25280 { 25281 - ++col; 25282 count += win_lbr_chartabsize(wp, ptr, count, NULL); 25283 mb_ptr_adv(ptr); 25284 } 25285 - return col; 25286 + return (int)(ptr - start); 25287 } 25288 #endif 25289 24526 25290 diff -Naur vim72.orig/src/version.c vim72/src/version.c 24527 25291 --- vim72.orig/src/version.c 2008-08-09 07:24:52.000000000 -0700 24528 +++ vim72/src/version.c 2009-0 7-19 15:19:00.000000000 -070024529 @@ -677,9 +677,4 44@@25292 +++ vim72/src/version.c 2009-09-12 08:42:30.000000000 -0700 25293 @@ -677,9 +677,486 @@ 24530 25294 static int included_patches[] = 24531 25295 { /* Add new patch number below this line */ 24532 25296 /**/ 25297 + 259, 25298 +/**/ 25299 + 258, 25300 +/**/ 25301 + 257, 25302 +/**/ 25303 + 256, 25304 +/**/ 25305 + 255, 25306 +/**/ 25307 + 254, 25308 +/**/ 25309 + 253, 25310 +/**/ 25311 + 252, 25312 +/**/ 25313 + 251, 25314 +/**/ 25315 + 246, 25316 +/**/ 25317 + 245, 25318 +/**/ 25319 + 244, 25320 +/**/ 25321 + 243, 25322 +/**/ 25323 + 242, 25324 +/**/ 25325 + 241, 25326 +/**/ 25327 + 240, 25328 +/**/ 25329 + 239, 25330 +/**/ 25331 + 238, 25332 +/**/ 25333 + 237, 25334 +/**/ 25335 + 236, 25336 +/**/ 25337 + 235, 25338 +/**/ 24533 25339 + 234, 24534 25340 +/**/ … … 24972 25778 highest_patch() 24973 25779 { 24974 @@ -786,7 +12 21,7 @@25780 @@ -786,7 +1263,7 @@ 24975 25781 MSG_PUTS(_("\nRISC OS version")); 24976 25782 #endif … … 24981 25787 if (*compiled_arch != NUL) 24982 25788 { 24983 @@ -825,6 +1 260,19 @@25789 @@ -825,6 +1302,19 @@ 24984 25790 } 24985 25791 } … … 25003 25809 diff -Naur vim72.orig/src/vim.h vim72/src/vim.h 25004 25810 --- vim72.orig/src/vim.h 2008-08-09 09:03:38.000000000 -0700 25005 +++ vim72/src/vim.h 2009-0 7-19 15:17:25.000000000 -070025811 +++ vim72/src/vim.h 2009-09-12 08:39:43.000000000 -0700 25006 25812 @@ -341,8 +341,14 @@ 25007 25813 #ifdef BACKSLASH_IN_FILENAME … … 25108 25914 diff -Naur vim72.orig/src/window.c vim72/src/window.c 25109 25915 --- vim72.orig/src/window.c 2008-08-06 04:00:30.000000000 -0700 25110 +++ vim72/src/window.c 2009-0 7-19 15:18:10.000000000 -070025916 +++ vim72/src/window.c 2009-09-12 08:40:34.000000000 -0700 25111 25917 @@ -11,8 +11,8 @@ 25112 25918 … … 25903 26709 diff -Naur vim72.orig/src/workshop.c vim72/src/workshop.c 25904 26710 --- vim72.orig/src/workshop.c 2008-06-21 11:53:26.000000000 -0700 25905 +++ vim72/src/workshop.c 2009-0 7-19 15:16:46.000000000 -070026711 +++ vim72/src/workshop.c 2009-09-12 08:39:05.000000000 -0700 25906 26712 @@ -204,12 +204,11 @@ 25907 26713 * Function: … … 26041 26847 diff -Naur vim72.orig/src/xxd/xxd.c vim72/src/xxd/xxd.c 26042 26848 --- vim72.orig/src/xxd/xxd.c 2007-11-29 12:05:16.000000000 -0800 26043 +++ vim72/src/xxd/xxd.c 2009-0 7-19 15:17:54.000000000 -070026849 +++ vim72/src/xxd/xxd.c 2009-09-12 08:40:18.000000000 -0700 26044 26850 @@ -64,6 +64,9 @@ 26045 26851 # define _CRT_SECURE_NO_DEPRECATE
Note:
See TracChangeset
for help on using the changeset viewer.
