summaryrefslogtreecommitdiffstats
path: root/patches/source/vim/patches/7.4.212
blob: 6bc98eb387e7e91bcc24cfd49d45219241e86b85 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
1451
1452
1453
1454
1455
1456
1457
1458
1459
1460
1461
1462
1463
1464
1465
1466
1467
1468
1469
1470
1471
1472
1473
1474
1475
1476
1477
1478
1479
1480
1481
1482
1483
1484
1485
1486
1487
1488
1489
1490
1491
1492
1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
1507
1508
1509
1510
1511
1512
1513
1514
1515
1516
1517
1518
1519
1520
1521
1522
1523
1524
1525
1526
1527
1528
1529
1530
1531
1532
1533
1534
1535
1536
1537
1538
1539
1540
1541
1542
1543
1544
1545
1546
1547
1548
1549
1550
1551
1552
1553
1554
1555
1556
1557
1558
1559
1560
1561
1562
1563
1564
1565
1566
1567
1568
1569
1570
1571
1572
1573
1574
1575
1576
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
1596
1597
1598
1599
1600
1601
1602
1603
1604
1605
1606
1607
1608
1609
1610
1611
1612
1613
1614
1615
1616
1617
1618
1619
1620
1621
1622
1623
1624
1625
1626
1627
1628
1629
1630
1631
1632
1633
1634
1635
1636
1637
1638
1639
1640
1641
1642
1643
1644
1645
1646
1647
1648
1649
1650
1651
1652
1653
1654
1655
1656
1657
1658
1659
1660
1661
1662
1663
1664
1665
1666
1667
1668
1669
1670
1671
1672
1673
1674
1675
1676
1677
1678
1679
1680
1681
1682
1683
1684
1685
1686
1687
1688
1689
1690
1691
1692
1693
1694
1695
1696
1697
1698
1699
1700
1701
1702
1703
1704
1705
1706
1707
1708
1709
1710
1711
1712
1713
1714
1715
1716
1717
1718
1719
1720
1721
1722
1723
1724
1725
1726
1727
1728
1729
1730
1731
1732
1733
1734
1735
1736
1737
1738
1739
1740
1741
1742
1743
1744
1745
1746
1747
1748
1749
1750
1751
1752
1753
1754
1755
1756
1757
1758
1759
1760
1761
1762
1763
1764
1765
1766
1767
1768
1769
1770
1771
1772
1773
1774
1775
1776
1777
1778
1779
1780
1781
1782
1783
1784
1785
1786
1787
1788
1789
1790
1791
1792
1793
1794
1795
1796
1797
1798
1799
1800
1801
1802
1803
1804
1805
1806
1807
1808
1809
1810
1811
1812
1813
1814
1815
1816
1817
1818
1819
1820
1821
1822
1823
1824
1825
1826
1827
1828
1829
1830
1831
1832
1833
1834
1835
1836
1837
1838
1839
1840
1841
1842
1843
1844
1845
1846
1847
1848
1849
1850
1851
1852
1853
1854
1855
1856
1857
1858
1859
1860
1861
1862
1863
1864
1865
1866
1867
1868
1869
1870
1871
1872
1873
1874
1875
1876
1877
1878
1879
1880
1881
1882
1883
1884
1885
1886
1887
1888
1889
1890
1891
1892
1893
1894
1895
1896
1897
1898
1899
1900
1901
1902
1903
1904
1905
1906
1907
1908
1909
1910
1911
1912
1913
1914
1915
1916
1917
1918
1919
1920
1921
1922
1923
1924
1925
1926
1927
1928
1929
1930
1931
1932
1933
1934
1935
1936
1937
1938
1939
1940
1941
1942
1943
1944
1945
1946
1947
1948
1949
1950
1951
1952
1953
1954
1955
1956
1957
1958
1959
1960
1961
1962
1963
1964
1965
1966
1967
1968
1969
1970
1971
1972
1973
1974
1975
1976
1977
1978
1979
1980
1981
1982
1983
1984
1985
1986
1987
1988
1989
1990
1991
1992
1993
1994
1995
1996
1997
1998
1999
2000
2001
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
2017
2018
2019
2020
2021
2022
2023
2024
2025
2026
2027
2028
2029
2030
2031
2032
2033
2034
2035
2036
2037
2038
2039
2040
2041
2042
2043
2044
2045
2046
2047
2048
2049
2050
2051
2052
2053
2054
2055
2056
2057
2058
2059
2060
2061
2062
2063
2064
2065
2066
2067
2068
2069
2070
2071
2072
2073
2074
2075
2076
2077
2078
2079
2080
2081
2082
2083
2084
2085
2086
2087
2088
2089
2090
2091
2092
2093
2094
2095
2096
2097
2098
2099
2100
2101
2102
2103
2104
2105
2106
2107
2108
2109
2110
2111
2112
2113
2114
2115
2116
2117
2118
2119
2120
2121
2122
2123
2124
2125
2126
2127
2128
2129
2130
2131
2132
2133
2134
2135
2136
2137
2138
2139
2140
2141
2142
2143
2144
2145
2146
2147
2148
2149
2150
2151
2152
2153
2154
2155
2156
2157
2158
2159
2160
2161
2162
2163
2164
2165
2166
2167
2168
2169
2170
2171
2172
2173
2174
2175
2176
2177
2178
2179
2180
2181
2182
2183
2184
2185
2186
2187
2188
2189
2190
2191
2192
2193
2194
2195
2196
2197
2198
2199
2200
2201
2202
2203
2204
2205
2206
2207
2208
2209
2210
2211
2212
2213
2214
2215
2216
2217
2218
2219
2220
2221
2222
2223
2224
2225
2226
2227
2228
2229
2230
2231
2232
2233
2234
2235
2236
2237
2238
2239
2240
2241
2242
2243
2244
2245
2246
2247
2248
2249
2250
2251
2252
2253
2254
2255
2256
2257
2258
2259
2260
2261
2262
2263
2264
2265
2266
2267
2268
2269
2270
2271
2272
2273
2274
2275
2276
2277
2278
2279
2280
2281
2282
2283
2284
2285
2286
2287
2288
2289
2290
2291
2292
2293
2294
2295
2296
2297
2298
2299
2300
2301
2302
2303
2304
2305
2306
2307
2308
2309
2310
2311
2312
2313
2314
2315
2316
2317
2318
2319
2320
2321
2322
2323
2324
2325
2326
2327
2328
2329
2330
2331
2332
2333
2334
2335
2336
2337
2338
2339
2340
2341
2342
2343
2344
2345
2346
2347
2348
2349
2350
2351
2352
2353
2354
2355
2356
2357
2358
2359
2360
2361
2362
2363
2364
2365
2366
2367
2368
2369
2370
2371
2372
2373
2374
2375
2376
2377
2378
2379
2380
2381
2382
2383
2384
2385
2386
2387
2388
2389
2390
2391
2392
2393
2394
2395
2396
2397
2398
2399
2400
2401
2402
2403
2404
2405
2406
2407
2408
2409
2410
2411
2412
2413
2414
2415
2416
2417
2418
2419
2420
2421
2422
2423
2424
2425
2426
2427
2428
2429
2430
2431
2432
2433
2434
2435
2436
2437
2438
2439
2440
2441
2442
2443
2444
2445
2446
2447
2448
2449
2450
2451
2452
2453
2454
2455
2456
2457
2458
2459
2460
2461
2462
2463
2464
2465
2466
2467
2468
2469
2470
2471
2472
2473
2474
2475
2476
2477
2478
2479
2480
2481
2482
2483
2484
2485
2486
2487
2488
2489
2490
2491
2492
2493
2494
2495
2496
2497
2498
2499
2500
2501
2502
2503
2504
2505
2506
2507
2508
2509
2510
2511
2512
2513
2514
2515
2516
2517
2518
2519
2520
2521
2522
2523
2524
2525
2526
2527
2528
2529
2530
2531
2532
2533
2534
2535
2536
2537
2538
2539
2540
2541
2542
2543
2544
2545
2546
2547
2548
2549
2550
2551
2552
2553
2554
2555
2556
2557
2558
2559
2560
2561
2562
2563
2564
2565
2566
2567
2568
2569
2570
2571
2572
2573
2574
2575
2576
2577
2578
2579
2580
2581
2582
2583
2584
2585
2586
2587
2588
2589
2590
2591
2592
2593
2594
2595
2596
2597
2598
2599
2600
2601
2602
2603
2604
2605
2606
2607
2608
2609
2610
2611
2612
2613
2614
2615
2616
2617
2618
2619
2620
2621
2622
2623
2624
2625
2626
2627
2628
2629
2630
2631
2632
2633
2634
2635
2636
2637
2638
2639
2640
2641
2642
2643
2644
2645
2646
2647
2648
2649
2650
2651
2652
2653
2654
2655
2656
2657
2658
2659
2660
2661
2662
2663
2664
2665
2666
2667
2668
2669
2670
2671
2672
2673
2674
2675
2676
2677
2678
2679
2680
2681
2682
2683
2684
2685
2686
2687
2688
2689
2690
2691
2692
2693
2694
2695
2696
2697
2698
2699
2700
2701
2702
2703
2704
2705
2706
2707
2708
2709
2710
2711
2712
2713
2714
2715
2716
2717
2718
2719
2720
2721
2722
2723
2724
2725
2726
2727
2728
2729
2730
2731
2732
2733
2734
2735
2736
2737
2738
2739
2740
2741
2742
2743
2744
2745
2746
2747
2748
2749
2750
2751
2752
2753
2754
2755
2756
2757
2758
2759
2760
2761
2762
2763
2764
2765
2766
2767
2768
2769
2770
2771
2772
2773
2774
2775
2776
2777
2778
2779
2780
2781
2782
2783
2784
2785
2786
2787
2788
2789
2790
2791
2792
2793
2794
2795
2796
2797
2798
2799
2800
2801
2802
2803
2804
2805
2806
2807
2808
2809
2810
2811
2812
2813
2814
2815
2816
2817
2818
2819
2820
2821
2822
2823
2824
2825
2826
2827
2828
2829
2830
2831
2832
2833
2834
2835
2836
2837
2838
2839
2840
2841
2842
2843
2844
2845
2846
2847
2848
2849
2850
2851
2852
2853
2854
2855
2856
2857
2858
2859
2860
2861
2862
2863
2864
2865
2866
2867
2868
2869
2870
2871
2872
2873
2874
2875
2876
2877
2878
2879
2880
2881
2882
2883
2884
2885
2886
2887
2888
2889
2890
2891
2892
2893
2894
2895
2896
2897
2898
2899
2900
2901
2902
2903
2904
2905
2906
2907
2908
2909
2910
2911
2912
2913
2914
2915
2916
2917
2918
2919
2920
2921
2922
2923
2924
2925
2926
2927
2928
2929
2930
2931
2932
2933
2934
2935
2936
2937
2938
2939
2940
2941
2942
2943
2944
2945
2946
2947
2948
2949
2950
2951
2952
2953
2954
2955
2956
2957
2958
2959
2960
2961
2962
2963
2964
2965
2966
2967
2968
2969
2970
2971
2972
2973
2974
2975
2976
2977
2978
2979
2980
2981
2982
2983
2984
2985
2986
2987
2988
2989
2990
2991
2992
2993
2994
2995
2996
2997
2998
2999
3000
3001
3002
3003
3004
3005
3006
3007
3008
3009
3010
3011
3012
3013
3014
3015
3016
3017
3018
3019
3020
3021
3022
3023
3024
3025
3026
3027
3028
3029
3030
3031
3032
3033
3034
3035
3036
3037
3038
3039
3040
3041
3042
3043
3044
3045
3046
3047
3048
3049
3050
3051
3052
3053
3054
3055
3056
3057
3058
3059
3060
3061
3062
3063
3064
3065
3066
3067
3068
3069
3070
3071
3072
3073
3074
3075
3076
3077
3078
3079
3080
3081
3082
3083
3084
3085
3086
3087
3088
3089
3090
3091
3092
3093
3094
3095
3096
3097
3098
3099
3100
3101
3102
3103
3104
3105
3106
3107
3108
3109
3110
3111
3112
3113
3114
3115
3116
3117
3118
3119
3120
3121
3122
3123
3124
3125
3126
3127
3128
3129
3130
3131
3132
3133
3134
3135
3136
3137
3138
3139
3140
3141
3142
3143
3144
3145
3146
3147
3148
3149
3150
3151
3152
3153
3154
3155
3156
3157
3158
3159
3160
3161
3162
3163
3164
3165
3166
3167
3168
3169
3170
3171
3172
3173
3174
3175
3176
3177
3178
3179
3180
3181
3182
3183
3184
3185
3186
3187
3188
3189
3190
3191
3192
3193
3194
3195
3196
3197
3198
3199
3200
3201
3202
3203
3204
3205
3206
3207
3208
3209
3210
3211
3212
3213
3214
3215
3216
3217
3218
3219
3220
3221
3222
3223
3224
3225
3226
3227
3228
3229
3230
3231
3232
3233
3234
3235
3236
3237
3238
3239
3240
3241
3242
3243
3244
3245
3246
3247
3248
3249
3250
3251
3252
3253
3254
3255
3256
3257
3258
3259
3260
3261
3262
3263
3264
3265
3266
3267
3268
3269
3270
3271
3272
3273
3274
3275
3276
3277
3278
3279
3280
3281
3282
3283
3284
3285
3286
3287
3288
3289
3290
3291
3292
3293
3294
3295
3296
3297
3298
3299
3300
3301
3302
3303
3304
3305
3306
3307
3308
3309
3310
3311
3312
3313
3314
3315
3316
3317
3318
3319
3320
3321
3322
3323
3324
3325
3326
3327
3328
3329
3330
3331
3332
3333
3334
3335
3336
3337
3338
3339
3340
3341
3342
3343
3344
3345
3346
3347
3348
3349
3350
3351
3352
3353
3354
3355
3356
3357
3358
3359
3360
3361
3362
3363
3364
3365
3366
3367
3368
3369
3370
3371
3372
3373
3374
3375
3376
3377
3378
3379
3380
3381
3382
3383
3384
3385
3386
3387
3388
3389
3390
3391
3392
3393
3394
3395
3396
3397
3398
3399
3400
3401
3402
3403
3404
3405
3406
3407
3408
3409
3410
3411
3412
3413
3414
3415
3416
3417
3418
3419
3420
3421
3422
3423
3424
3425
3426
3427
3428
3429
3430
3431
3432
3433
3434
3435
3436
3437
3438
3439
3440
3441
3442
3443
3444
3445
3446
3447
3448
3449
3450
3451
3452
3453
3454
3455
3456
3457
3458
3459
3460
3461
3462
3463
3464
3465
3466
3467
3468
3469
3470
3471
3472
3473
3474
3475
3476
3477
3478
3479
3480
3481
3482
3483
3484
3485
3486
3487
3488
3489
3490
3491
3492
3493
3494
3495
3496
3497
3498
3499
3500
3501
3502
3503
3504
3505
3506
3507
3508
3509
3510
3511
3512
3513
3514
3515
3516
3517
3518
3519
3520
3521
3522
3523
3524
3525
3526
3527
3528
3529
3530
3531
3532
3533
3534
3535
3536
3537
3538
3539
3540
3541
3542
3543
3544
3545
3546
3547
3548
3549
3550
3551
3552
3553
3554
3555
3556
3557
3558
3559
3560
3561
3562
3563
3564
3565
3566
3567
3568
3569
3570
3571
3572
3573
3574
3575
3576
3577
3578
3579
3580
3581
3582
3583
3584
3585
3586
3587
3588
3589
3590
3591
3592
3593
3594
3595
3596
3597
3598
3599
3600
3601
3602
3603
3604
3605
3606
3607
3608
3609
3610
3611
3612
3613
3614
3615
3616
3617
3618
3619
3620
3621
3622
3623
3624
3625
3626
3627
3628
3629
3630
3631
3632
3633
3634
3635
3636
3637
3638
3639
3640
3641
3642
3643
3644
3645
3646
3647
3648
3649
3650
3651
3652
3653
3654
3655
3656
3657
3658
3659
3660
3661
3662
3663
3664
3665
3666
3667
3668
3669
3670
3671
3672
3673
3674
3675
3676
3677
3678
3679
3680
3681
3682
3683
3684
3685
3686
3687
3688
3689
3690
3691
3692
3693
3694
3695
3696
3697
3698
3699
3700
3701
3702
3703
3704
3705
3706
3707
3708
3709
3710
3711
3712
3713
3714
3715
3716
3717
3718
3719
3720
3721
3722
3723
3724
3725
3726
3727
3728
3729
3730
3731
3732
3733
3734
3735
3736
3737
3738
3739
3740
3741
3742
3743
3744
3745
3746
3747
3748
3749
3750
3751
3752
3753
3754
3755
3756
3757
3758
3759
3760
3761
3762
3763
3764
3765
3766
3767
3768
3769
3770
3771
3772
3773
3774
3775
3776
3777
3778
3779
3780
3781
3782
3783
3784
3785
3786
3787
3788
3789
3790
3791
3792
3793
3794
3795
3796
3797
3798
3799
3800
3801
3802
3803
3804
3805
3806
3807
3808
3809
3810
3811
3812
3813
3814
3815
3816
3817
3818
3819
3820
3821
3822
3823
3824
3825
3826
3827
3828
3829
3830
3831
3832
3833
3834
3835
3836
3837
3838
3839
3840
3841
3842
3843
3844
3845
3846
3847
3848
3849
3850
3851
3852
3853
3854
3855
3856
3857
3858
3859
3860
3861
3862
3863
3864
3865
3866
3867
3868
3869
3870
3871
3872
3873
3874
3875
3876
3877
3878
3879
3880
3881
3882
3883
3884
3885
3886
3887
3888
3889
3890
3891
3892
3893
3894
3895
3896
3897
3898
3899
3900
3901
3902
3903
3904
3905
3906
3907
3908
3909
3910
3911
3912
3913
3914
3915
3916
3917
3918
3919
3920
3921
3922
3923
3924
3925
3926
3927
3928
3929
3930
3931
3932
3933
3934
3935
3936
3937
3938
3939
3940
3941
3942
3943
3944
3945
3946
3947
3948
3949
3950
3951
3952
3953
3954
3955
3956
3957
3958
3959
3960
3961
3962
3963
3964
3965
3966
3967
3968
3969
3970
3971
3972
3973
3974
3975
3976
3977
3978
3979
3980
3981
3982
3983
3984
3985
3986
3987
3988
3989
3990
3991
3992
3993
3994
3995
3996
3997
3998
3999
4000
4001
4002
4003
4004
4005
4006
4007
4008
4009
4010
4011
4012
4013
4014
4015
4016
4017
4018
4019
4020
4021
4022
4023
4024
4025
4026
4027
4028
4029
4030
4031
4032
4033
4034
4035
4036
4037
4038
4039
4040
4041
4042
4043
4044
4045
4046
4047
4048
4049
4050
4051
4052
4053
4054
4055
4056
4057
4058
4059
4060
4061
4062
4063
4064
4065
4066
4067
4068
4069
4070
4071
4072
4073
4074
4075
4076
4077
4078
4079
4080
4081
4082
4083
4084
4085
4086
4087
4088
4089
4090
4091
4092
4093
4094
4095
4096
4097
4098
4099
4100
4101
4102
4103
4104
4105
4106
4107
4108
4109
4110
4111
4112
4113
4114
4115
4116
4117
4118
4119
4120
4121
4122
4123
4124
4125
4126
4127
4128
4129
4130
4131
4132
4133
4134
4135
4136
4137
4138
4139
4140
4141
4142
4143
4144
4145
4146
4147
4148
4149
4150
4151
4152
4153
4154
4155
4156
4157
4158
4159
4160
4161
4162
4163
4164
4165
4166
4167
4168
4169
4170
4171
4172
4173
4174
4175
4176
4177
4178
4179
4180
4181
4182
4183
4184
4185
4186
4187
4188
4189
4190
4191
4192
4193
4194
4195
4196
4197
4198
4199
4200
4201
4202
4203
4204
4205
4206
4207
4208
4209
4210
4211
4212
4213
4214
4215
4216
4217
4218
4219
4220
4221
4222
4223
4224
4225
4226
4227
4228
4229
4230
4231
4232
4233
4234
4235
4236
4237
4238
4239
4240
4241
4242
4243
4244
4245
4246
4247
4248
4249
4250
4251
4252
4253
4254
4255
4256
4257
4258
4259
4260
4261
4262
4263
4264
4265
4266
4267
4268
4269
4270
4271
4272
4273
4274
4275
4276
4277
4278
4279
4280
4281
4282
4283
4284
4285
4286
4287
4288
4289
4290
4291
4292
4293
4294
4295
4296
4297
4298
4299
4300
4301
4302
4303
4304
4305
4306
4307
4308
4309
4310
4311
4312
4313
4314
4315
4316
4317
4318
4319
4320
4321
4322
4323
4324
4325
4326
4327
4328
4329
4330
4331
4332
4333
4334
4335
4336
4337
4338
4339
4340
4341
4342
4343
4344
4345
4346
4347
4348
4349
4350
4351
4352
4353
4354
4355
4356
4357
4358
4359
4360
4361
4362
4363
4364
4365
4366
4367
4368
4369
4370
4371
4372
4373
4374
4375
4376
4377
4378
4379
4380
4381
4382
4383
4384
4385
4386
4387
4388
4389
4390
4391
4392
4393
4394
4395
4396
4397
4398
4399
4400
4401
4402
4403
4404
4405
4406
4407
4408
4409
4410
4411
4412
4413
4414
4415
4416
4417
4418
4419
4420
4421
4422
4423
4424
4425
4426
4427
4428
4429
4430
4431
4432
4433
4434
4435
4436
4437
4438
4439
4440
4441
4442
4443
4444
4445
4446
4447
4448
4449
4450
4451
4452
4453
4454
4455
4456
4457
4458
4459
4460
4461
4462
4463
4464
4465
4466
4467
4468
4469
4470
4471
4472
4473
4474
4475
4476
4477
4478
4479
4480
4481
4482
4483
4484
4485
4486
4487
4488
4489
4490
4491
4492
4493
4494
4495
4496
4497
4498
4499
4500
4501
4502
4503
4504
4505
4506
4507
4508
4509
4510
4511
4512
4513
4514
4515
4516
4517
4518
4519
4520
4521
4522
4523
4524
4525
4526
4527
4528
4529
4530
4531
4532
4533
4534
4535
4536
4537
4538
4539
4540
4541
4542
4543
4544
4545
4546
4547
4548
4549
4550
4551
4552
4553
4554
4555
4556
4557
4558
4559
4560
4561
4562
4563
4564
4565
4566
4567
4568
4569
4570
4571
4572
4573
4574
4575
4576
4577
4578
4579
4580
4581
4582
4583
4584
4585
4586
4587
4588
4589
4590
4591
4592
4593
4594
4595
4596
4597
4598
4599
4600
4601
4602
4603
4604
4605
4606
4607
4608
4609
4610
4611
4612
4613
4614
4615
4616
4617
4618
4619
4620
4621
4622
4623
4624
4625
4626
4627
4628
4629
4630
4631
4632
4633
4634
4635
4636
4637
4638
4639
4640
4641
4642
4643
4644
4645
4646
4647
4648
4649
4650
4651
4652
4653
4654
4655
4656
4657
4658
4659
4660
4661
4662
4663
4664
4665
4666
4667
4668
4669
4670
4671
4672
4673
4674
4675
4676
4677
4678
4679
4680
4681
4682
4683
4684
4685
4686
4687
4688
4689
4690
4691
4692
4693
4694
4695
4696
4697
4698
4699
4700
4701
4702
4703
4704
4705
4706
4707
4708
4709
4710
4711
4712
4713
4714
4715
4716
4717
4718
4719
4720
4721
4722
4723
4724
4725
4726
4727
4728
4729
4730
4731
4732
4733
4734
4735
4736
4737
4738
4739
4740
4741
4742
4743
4744
4745
4746
4747
4748
4749
4750
4751
4752
4753
4754
4755
4756
4757
4758
4759
4760
4761
4762
4763
4764
4765
4766
4767
4768
4769
4770
4771
4772
4773
4774
4775
4776
4777
4778
4779
4780
4781
4782
4783
4784
4785
4786
4787
4788
4789
4790
4791
4792
4793
4794
4795
4796
4797
4798
4799
4800
4801
4802
4803
4804
4805
4806
4807
4808
4809
4810
4811
4812
4813
4814
4815
4816
4817
4818
4819
4820
4821
4822
4823
4824
4825
4826
4827
4828
4829
4830
4831
4832
4833
4834
4835
4836
4837
4838
4839
4840
4841
4842
4843
4844
4845
4846
4847
4848
4849
4850
4851
4852
4853
4854
4855
4856
4857
4858
4859
4860
4861
4862
4863
4864
4865
4866
4867
4868
4869
4870
4871
4872
4873
4874
4875
4876
4877
4878
4879
4880
4881
4882
4883
4884
4885
4886
4887
4888
4889
4890
4891
4892
4893
4894
4895
4896
4897
4898
4899
4900
4901
4902
4903
4904
4905
4906
4907
4908
4909
4910
4911
4912
4913
4914
4915
4916
4917
4918
4919
4920
4921
4922
4923
4924
4925
4926
4927
4928
4929
4930
4931
4932
4933
4934
4935
4936
4937
4938
4939
4940
4941
4942
4943
4944
4945
4946
4947
4948
4949
4950
4951
4952
4953
4954
4955
4956
4957
4958
4959
4960
4961
4962
4963
4964
4965
4966
4967
4968
4969
4970
4971
4972
4973
4974
4975
4976
4977
4978
4979
4980
4981
4982
4983
4984
4985
4986
4987
4988
4989
4990
4991
4992
4993
4994
4995
4996
4997
4998
4999
5000
5001
5002
5003
5004
5005
5006
5007
5008
5009
5010
5011
5012
5013
5014
5015
5016
5017
5018
5019
5020
5021
5022
5023
5024
5025
5026
5027
5028
5029
5030
5031
5032
5033
5034
5035
5036
5037
5038
5039
5040
5041
5042
5043
5044
5045
5046
5047
5048
5049
5050
5051
5052
5053
5054
5055
5056
5057
5058
5059
5060
5061
5062
5063
5064
5065
5066
5067
5068
5069
5070
5071
5072
5073
5074
5075
5076
5077
5078
5079
5080
5081
5082
5083
5084
5085
5086
5087
5088
5089
5090
5091
5092
5093
5094
5095
5096
5097
5098
5099
5100
5101
5102
5103
5104
5105
5106
5107
5108
5109
5110
5111
5112
5113
5114
5115
5116
5117
5118
5119
5120
5121
5122
5123
5124
5125
5126
5127
5128
5129
5130
5131
5132
5133
5134
5135
5136
5137
5138
5139
5140
5141
5142
5143
5144
5145
5146
5147
5148
5149
5150
5151
5152
5153
5154
5155
5156
5157
5158
5159
5160
5161
5162
5163
5164
5165
5166
5167
5168
5169
5170
5171
5172
5173
5174
5175
5176
5177
5178
5179
5180
5181
5182
5183
5184
5185
5186
5187
5188
5189
5190
5191
5192
5193
5194
5195
5196
5197
5198
5199
5200
5201
5202
5203
5204
5205
5206
5207
5208
5209
5210
5211
5212
5213
5214
5215
5216
5217
5218
5219
5220
5221
5222
5223
5224
5225
5226
5227
5228
5229
5230
5231
5232
5233
5234
5235
5236
5237
5238
5239
5240
5241
5242
5243
5244
5245
5246
5247
5248
5249
5250
5251
5252
5253
5254
5255
5256
5257
5258
5259
5260
5261
5262
5263
5264
5265
5266
5267
5268
5269
5270
5271
5272
5273
5274
5275
5276
5277
5278
5279
5280
5281
5282
5283
5284
5285
5286
5287
5288
5289
5290
5291
5292
5293
5294
5295
5296
5297
5298
5299
5300
5301
5302
5303
5304
5305
5306
5307
5308
5309
5310
5311
5312
5313
5314
5315
5316
5317
5318
5319
5320
5321
5322
5323
5324
5325
5326
5327
5328
5329
5330
5331
5332
5333
5334
5335
5336
5337
5338
5339
5340
5341
5342
5343
5344
5345
5346
5347
5348
5349
5350
5351
5352
5353
5354
5355
5356
5357
5358
5359
5360
5361
5362
5363
5364
5365
5366
5367
5368
5369
5370
5371
5372
5373
5374
5375
5376
5377
5378
5379
5380
5381
5382
5383
5384
5385
5386
5387
5388
5389
5390
5391
5392
5393
5394
5395
5396
5397
5398
5399
5400
5401
5402
5403
5404
5405
5406
5407
5408
5409
5410
5411
5412
5413
5414
5415
5416
5417
5418
5419
5420
5421
5422
5423
5424
5425
5426
5427
5428
5429
5430
5431
5432
5433
5434
5435
5436
5437
5438
5439
5440
5441
5442
5443
5444
5445
5446
5447
5448
5449
5450
5451
5452
5453
5454
5455
5456
5457
5458
5459
5460
5461
5462
5463
5464
5465
5466
5467
5468
5469
5470
5471
5472
5473
5474
5475
5476
5477
5478
5479
5480
5481
5482
5483
5484
5485
5486
5487
5488
5489
5490
5491
5492
5493
5494
5495
5496
5497
5498
5499
5500
5501
5502
5503
5504
5505
5506
5507
5508
5509
5510
5511
5512
5513
5514
5515
5516
5517
5518
5519
5520
5521
5522
5523
5524
5525
5526
5527
5528
5529
5530
5531
5532
5533
5534
5535
5536
5537
5538
5539
5540
5541
5542
5543
5544
5545
5546
5547
5548
5549
5550
5551
5552
5553
5554
5555
5556
5557
5558
5559
5560
5561
5562
5563
5564
5565
5566
5567
5568
5569
5570
5571
5572
5573
5574
5575
5576
5577
5578
5579
5580
5581
5582
5583
5584
5585
5586
5587
5588
5589
5590
5591
5592
5593
5594
5595
5596
5597
5598
5599
5600
5601
5602
5603
5604
5605
5606
5607
5608
5609
5610
5611
5612
5613
5614
5615
5616
5617
5618
5619
5620
5621
5622
5623
5624
5625
5626
5627
5628
5629
5630
5631
5632
5633
5634
5635
5636
5637
5638
5639
5640
5641
5642
5643
5644
5645
5646
5647
5648
5649
5650
5651
5652
5653
5654
5655
5656
5657
5658
5659
5660
5661
5662
5663
5664
5665
5666
5667
5668
5669
5670
5671
5672
5673
5674
5675
5676
5677
5678
5679
5680
5681
5682
5683
5684
5685
5686
5687
5688
5689
5690
5691
5692
5693
5694
5695
5696
5697
5698
5699
5700
5701
5702
5703
5704
5705
5706
5707
5708
5709
5710
5711
5712
5713
5714
5715
5716
5717
5718
5719
5720
To: vim_dev@googlegroups.com
Subject: Patch 7.4.212
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.4.212 (after 7.4.200)
Problem:    Now that the +visual feature is always enabled the #ifdefs for it
	    are not useful.
Solution:   Remove the checks for FEAT_VISUAL.
Files:	    src/buffer.c, src/charset.c, src/edit.c, src/eval.c,
	    src/ex_cmds.c, src/ex_docmd.c, src/fold.c, src/getchar.c,
	    src/gui.c, src/gui_mac.c, src/gui_w48.c, src/main.c, src/mark.c,
	    src/menu.c, src/misc2.c, src/move.c, src/netbeans.c, src/normal.c,
	    src/ops.c, src/option.c, src/os_msdos.c, src/os_qnx.c,
	    src/quickfix.c, src/regexp.c, src/regexp_nfa.c, src/screen.c,
	    src/search.c, src/spell.c, src/syntax.c, src/term.c, src/ui.c,
	    src/undo.c, src/version.c, src/window.c, src/feature.h,
	    src/globals.h, src/option.h, src/os_win32.h, src/structs.h


*** ../vim-7.4.211/src/buffer.c	2014-03-12 18:55:52.100906804 +0100
--- src/buffer.c	2014-03-23 13:01:39.843144050 +0100
***************
*** 1432,1441 ****
  	curwin->w_alt_fnum = curbuf->b_fnum; /* remember alternate file */
      buflist_altfpos(curwin);			 /* remember curpos */
  
- #ifdef FEAT_VISUAL
      /* Don't restart Select mode after switching to another buffer. */
      VIsual_reselect = FALSE;
- #endif
  
      /* close_windows() or apply_autocmds() may change curbuf */
      prevbuf = curbuf;
--- 1432,1439 ----
*** ../vim-7.4.211/src/charset.c	2013-02-06 16:20:01.000000000 +0100
--- src/charset.c	2014-03-23 13:02:19.467144657 +0100
***************
*** 1380,1389 ****
  		&& (State & NORMAL)
  		&& !wp->w_p_list
  		&& !virtual_active()
! #ifdef FEAT_VISUAL
! 		&& !(VIsual_active
! 				   && (*p_sel == 'e' || ltoreq(*pos, VIsual)))
! #endif
  		)
  	    *cursor = vcol + incr - 1;	    /* cursor at end */
  	else
--- 1380,1386 ----
  		&& (State & NORMAL)
  		&& !wp->w_p_list
  		&& !virtual_active()
! 		&& !(VIsual_active && (*p_sel == 'e' || ltoreq(*pos, VIsual)))
  		)
  	    *cursor = vcol + incr - 1;	    /* cursor at end */
  	else
***************
*** 1463,1469 ****
  }
  #endif
  
- #if defined(FEAT_VISUAL) || defined(PROTO)
  /*
   * Get the leftmost and rightmost virtual column of pos1 and pos2.
   * Used for Visual block mode.
--- 1460,1465 ----
***************
*** 1500,1506 ****
      else
  	*right = to1;
  }
- #endif
  
  /*
   * skipwhite: skip over ' ' and '\t'.
--- 1496,1501 ----
*** ../vim-7.4.211/src/edit.c	2014-02-22 23:03:48.712901208 +0100
--- src/edit.c	2014-03-23 13:03:11.951145462 +0100
***************
*** 220,228 ****
  #ifdef FEAT_RIGHTLEFT
  static void ins_ctrl_ __ARGS((void));
  #endif
- #ifdef FEAT_VISUAL
  static int ins_start_select __ARGS((int c));
- #endif
  static void ins_insert __ARGS((int replaceState));
  static void ins_ctrl_o __ARGS((void));
  static void ins_shift __ARGS((int c, int lastc));
--- 220,226 ----
***************
*** 932,938 ****
  	    }
  #endif
  
- #ifdef FEAT_VISUAL
  	/*
  	 * If 'keymodel' contains "startsel", may start selection.  If it
  	 * does, a CTRL-O and c will be stuffed, we need to get these
--- 930,935 ----
***************
*** 940,946 ****
  	 */
  	if (ins_start_select(c))
  	    continue;
- #endif
  
  	/*
  	 * The big switch to handle a character in insert mode.
--- 937,942 ----
***************
*** 6900,6906 ****
  	    else if (cc != NUL)
  		++curwin->w_cursor.col;	/* put cursor back on the NUL */
  
- #ifdef FEAT_VISUAL
  	    /* <C-S-Right> may have started Visual mode, adjust the position for
  	     * deleted characters. */
  	    if (VIsual_active && VIsual.lnum == curwin->w_cursor.lnum)
--- 6896,6901 ----
***************
*** 6910,6921 ****
  		if (VIsual.col > len)
  		{
  		    VIsual.col = len;
! # ifdef FEAT_VIRTUALEDIT
  		    VIsual.coladd = 0;
! # endif
  		}
  	    }
- #endif
  	}
      }
      did_ai = FALSE;
--- 6905,6915 ----
  		if (VIsual.col > len)
  		{
  		    VIsual.col = len;
! #ifdef FEAT_VIRTUALEDIT
  		    VIsual.coladd = 0;
! #endif
  		}
  	    }
  	}
      }
      did_ai = FALSE;
***************
*** 8112,8120 ****
      int		need_redraw = FALSE;
      int		regname;
      int		literally = 0;
- #ifdef FEAT_VISUAL
      int		vis_active = VIsual_active;
- #endif
  
      /*
       * If we are going to wait for a character, show a '"'.
--- 8106,8112 ----
***************
*** 8218,8228 ****
      if (need_redraw || stuff_empty())
  	edit_unputchar();
  
- #ifdef FEAT_VISUAL
      /* Disallow starting Visual mode here, would get a weird mode. */
      if (!vis_active && VIsual_active)
  	end_visual_mode();
- #endif
  }
  
  /*
--- 8210,8218 ----
***************
*** 8419,8429 ****
  #endif
  	       )
  	    && (restart_edit == NUL
! 		   || (gchar_cursor() == NUL
! #ifdef FEAT_VISUAL
! 		       && !VIsual_active
! #endif
! 		      ))
  #ifdef FEAT_RIGHTLEFT
  	    && !revins_on
  #endif
--- 8409,8415 ----
  #endif
  	       )
  	    && (restart_edit == NUL
! 		   || (gchar_cursor() == NUL && !VIsual_active))
  #ifdef FEAT_RIGHTLEFT
  	    && !revins_on
  #endif
***************
*** 8525,8531 ****
  }
  #endif
  
- #ifdef FEAT_VISUAL
  /*
   * If 'keymodel' contains "startsel", may start selection.
   * Returns TRUE when a CTRL-O and other keys stuffed.
--- 8511,8516 ----
***************
*** 8581,8587 ****
  	}
      return FALSE;
  }
- #endif
  
  /*
   * <Insert> key in Insert mode: toggle insert/replace mode.
--- 8566,8571 ----
*** ../vim-7.4.211/src/eval.c	2014-02-24 03:31:55.816738026 +0100
--- src/eval.c	2014-03-23 13:03:56.419146143 +0100
***************
*** 11833,11844 ****
      {
  	case MLINE: buf[0] = 'V'; break;
  	case MCHAR: buf[0] = 'v'; break;
- #ifdef FEAT_VISUAL
  	case MBLOCK:
  		buf[0] = Ctrl_V;
  		sprintf((char *)buf + 1, "%ld", reglen + 1);
  		break;
- #endif
      }
      rettv->v_type = VAR_STRING;
      rettv->vval.v_string = vim_strsave(buf);
--- 11833,11842 ----
***************
*** 12552,12560 ****
  #ifdef FEAT_VIRTUALEDIT
  	"virtualedit",
  #endif
- #ifdef FEAT_VISUAL
  	"visual",
- #endif
  #ifdef FEAT_VISUALEXTRA
  	"visualextra",
  #endif
--- 12550,12556 ----
***************
*** 14397,14403 ****
      buf[1] = NUL;
      buf[2] = NUL;
  
- #ifdef FEAT_VISUAL
      if (VIsual_active)
      {
  	if (VIsual_select)
--- 14393,14398 ----
***************
*** 14405,14413 ****
  	else
  	    buf[0] = VIsual_mode;
      }
!     else
! #endif
! 	if (State == HITRETURN || State == ASKMORE || State == SETWSIZE
  		|| State == CONFIRM)
      {
  	buf[0] = 'r';
--- 14400,14406 ----
  	else
  	    buf[0] = VIsual_mode;
      }
!     else if (State == HITRETURN || State == ASKMORE || State == SETWSIZE
  		|| State == CONFIRM)
      {
  	buf[0] = 'r';
***************
*** 16756,16762 ****
  		case 'V': case 'l':	/* line-wise selection */
  		    yank_type = MLINE;
  		    break;
- #ifdef FEAT_VISUAL
  		case 'b': case Ctrl_V:	/* block-wise selection */
  		    yank_type = MBLOCK;
  		    if (VIM_ISDIGIT(stropt[1]))
--- 16749,16754 ----
***************
*** 16766,16772 ****
  			--stropt;
  		    }
  		    break;
- #endif
  	    }
      }
  
--- 16758,16763 ----
***************
*** 18769,18775 ****
      typval_T	*argvars UNUSED;
      typval_T	*rettv UNUSED;
  {
- #ifdef FEAT_VISUAL
      char_u	str[2];
  
      rettv->v_type = VAR_STRING;
--- 18760,18765 ----
***************
*** 18780,18786 ****
      /* A non-zero number or non-empty string argument: reset mode. */
      if (non_zero_arg(&argvars[0]))
  	curbuf->b_visual_mode_eval = NUL;
- #endif
  }
  
  /*
--- 18770,18775 ----
***************
*** 19154,19167 ****
  	return NULL;
      if (name[0] == '.')				/* cursor */
  	return &curwin->w_cursor;
- #ifdef FEAT_VISUAL
      if (name[0] == 'v' && name[1] == NUL)	/* Visual start */
      {
  	if (VIsual_active)
  	    return &VIsual;
  	return &curwin->w_cursor;
      }
- #endif
      if (name[0] == '\'')			/* mark */
      {
  	pp = getmark_buf_fnum(curbuf, name[1], FALSE, fnum);
--- 19143,19154 ----
*** ../vim-7.4.211/src/ex_cmds.c	2014-03-19 17:41:20.390105580 +0100
--- src/ex_cmds.c	2014-03-23 13:04:09.359146341 +0100
***************
*** 3274,3286 ****
  	goto theend;
      }
  
- #ifdef FEAT_VISUAL
      /*
       * End Visual mode before switching to another buffer, so the text can be
       * copied into the GUI selection buffer.
       */
      reset_VIsual();
- #endif
  
  #ifdef FEAT_AUTOCMD
      if ((command != NULL || newlnum > (linenr_T)0)
--- 3274,3284 ----
*** ../vim-7.4.211/src/ex_docmd.c	2014-03-12 21:28:09.481046816 +0100
--- src/ex_docmd.c	2014-03-23 13:04:47.975146933 +0100
***************
*** 8577,8586 ****
  	beginline(BL_SOL | BL_FIX);
      }
  
- #if defined(FEAT_VISUAL)
      if (VIsual_active)
  	end_visual_mode();
- #endif
  
      switch (eap->cmdidx)
      {
--- 8577,8584 ----
***************
*** 8991,9001 ****
      RedrawingDisabled = 0;
      p_lz = FALSE;
      update_topline();
!     update_screen(eap->forceit ? CLEAR :
! #ifdef FEAT_VISUAL
! 	    VIsual_active ? INVERTED :
! #endif
! 	    0);
  #ifdef FEAT_TITLE
      if (need_maketitle)
  	maketitle();
--- 8989,8995 ----
      RedrawingDisabled = 0;
      p_lz = FALSE;
      update_topline();
!     update_screen(eap->forceit ? CLEAR : VIsual_active ? INVERTED : 0);
  #ifdef FEAT_TITLE
      if (need_maketitle)
  	maketitle();
***************
*** 9030,9040 ****
  	status_redraw_all();
      else
  	status_redraw_curbuf();
!     update_screen(
! # ifdef FEAT_VISUAL
! 	    VIsual_active ? INVERTED :
! # endif
! 	    0);
      RedrawingDisabled = r;
      p_lz = p;
      out_flush();
--- 9024,9030 ----
  	status_redraw_all();
      else
  	status_redraw_curbuf();
!     update_screen(VIsual_active ? INVERTED : 0);
      RedrawingDisabled = r;
      p_lz = p;
      out_flush();
*** ../vim-7.4.211/src/fold.c	2013-11-05 07:12:59.000000000 +0100
--- src/fold.c	2014-03-23 13:05:14.775147344 +0100
***************
*** 430,440 ****
      }
      if (done == DONE_NOTHING)
  	EMSG(_(e_nofold));
- #ifdef FEAT_VISUAL
      /* Force a redraw to remove the Visual highlighting. */
      if (had_visual)
  	redraw_curbuf_later(INVERTED);
- #endif
  }
  
  /* openFold() {{{2 */
--- 430,438 ----
***************
*** 807,817 ****
      if (!did_one)
      {
  	EMSG(_(e_nofold));
- #ifdef FEAT_VISUAL
  	/* Force a redraw to remove the Visual highlighting. */
  	if (had_visual)
  	    redraw_curbuf_later(INVERTED);
- #endif
      }
      else
  	/* Deleting markers may make cursor column invalid. */
--- 805,813 ----
***************
*** 1065,1071 ****
  }
  
  /* foldAdjustVisual() {{{2 */
- #ifdef FEAT_VISUAL
  /*
   * Adjust the Visual area to include any fold at the start or end completely.
   */
--- 1061,1066 ----
***************
*** 1103,1109 ****
  #endif
      }
  }
- #endif
  
  /* cursor_foldstart() {{{2 */
  /*
--- 1098,1103 ----
*** ../vim-7.4.211/src/getchar.c	2014-03-12 20:17:47.748982126 +0100
--- src/getchar.c	2014-03-23 13:05:45.383147813 +0100
***************
*** 870,876 ****
  	c = read_redo(FALSE, old_redo);
      }
  
- #ifdef FEAT_VISUAL
      if (c == 'v')   /* redo Visual */
      {
  	VIsual = curwin->w_cursor;
--- 870,875 ----
***************
*** 880,886 ****
  	redo_VIsual_busy = TRUE;
  	c = read_redo(FALSE, old_redo);
      }
- #endif
  
      /* try to enter the count (in place of a previous count) */
      if (count)
--- 879,884 ----
***************
*** 1162,1168 ****
      return typebuf.tb_maplen == 0;
  }
  
- #if defined(FEAT_VISUAL) || defined(PROTO)
  /*
   * Return the number of characters that are mapped (or not typed).
   */
--- 1160,1165 ----
***************
*** 1171,1177 ****
  {
      return typebuf.tb_maplen;
  }
- #endif
  
  /*
   * remove "len" characters from typebuf.tb_buf[typebuf.tb_off + offset]
--- 1168,1173 ----
***************
*** 2443,2449 ****
  				idx = get_menu_index(current_menu, local_State);
  				if (idx != MENU_INDEX_INVALID)
  				{
- # ifdef FEAT_VISUAL
  				    /*
  				     * In Select mode and a Visual mode menu
  				     * is used:  Switch to Visual mode
--- 2439,2444 ----
***************
*** 2457,2463 ****
  					(void)ins_typebuf(K_SELECT_STRING,
  						  REMAP_NONE, 0, TRUE, FALSE);
  				    }
- # endif
  				    ins_typebuf(current_menu->strings[idx],
  						current_menu->noremap[idx],
  						0, TRUE,
--- 2452,2457 ----
***************
*** 2516,2522 ****
  			    break;
  			}
  
- #ifdef FEAT_VISUAL
  			/*
  			 * In Select mode and a Visual mode mapping is used:
  			 * Switch to Visual mode temporarily.  Append K_SELECT
--- 2510,2515 ----
***************
*** 2529,2535 ****
  			    (void)ins_typebuf(K_SELECT_STRING, REMAP_NONE,
  							      0, TRUE, FALSE);
  			}
- #endif
  
  #ifdef FEAT_EVAL
  			/* Copy the values from *mp that are used, because
--- 2522,2527 ----
*** ../vim-7.4.211/src/gui.c	2013-06-30 17:41:48.000000000 +0200
--- src/gui.c	2014-03-23 13:05:57.623148000 +0100
***************
*** 3132,3142 ****
       */
      if (!mouse_has(checkfor) || checkfor == MOUSE_COMMAND)
      {
- #ifdef FEAT_VISUAL
  	/* Don't do modeless selection in Visual mode. */
  	if (checkfor != MOUSE_NONEF && VIsual_active && (State & NORMAL))
  	    return;
- #endif
  
  	/*
  	 * When 'mousemodel' is "popup", shift-left is translated to right.
--- 3132,3140 ----
*** ../vim-7.4.211/src/gui_mac.c	2013-05-06 04:06:04.000000000 +0200
--- src/gui_mac.c	2014-03-23 13:06:30.143148498 +0100
***************
*** 1068,1078 ****
      }
   */
  
- 
- #ifdef FEAT_VISUAL
      reset_VIsual();
- #endif
- 
      fnames = new_fnames_from_AEDesc(&theList, &numFiles, &error);
  
      if (error)
--- 1068,1074 ----
***************
*** 1142,1148 ****
  
      /* Update the screen display */
      update_screen(NOT_VALID);
! #ifdef FEAT_VISUAL
      /* Select the text if possible */
      if (gotPosition)
      {
--- 1138,1144 ----
  
      /* Update the screen display */
      update_screen(NOT_VALID);
! 
      /* Select the text if possible */
      if (gotPosition)
      {
***************
*** 1160,1166 ****
  	    VIsual.col = 0;
  	}
      }
! #endif
      setcursor();
      out_flush();
  
--- 1156,1162 ----
  	    VIsual.col = 0;
  	}
      }
! 
      setcursor();
      out_flush();
  
*** ../vim-7.4.211/src/gui_w48.c	2014-03-19 12:37:18.537826062 +0100
--- src/gui_w48.c	2014-03-23 13:06:44.959148725 +0100
***************
*** 3708,3716 ****
      DragQueryPoint(hDrop, &pt);
      MapWindowPoints(s_hwnd, s_textArea, &pt, 1);
  
- # ifdef FEAT_VISUAL
      reset_VIsual();
- # endif
  
      fnames = (char_u **)alloc(cFiles * sizeof(char_u *));
  
--- 3708,3714 ----
*** ../vim-7.4.211/src/main.c	2014-01-14 12:57:00.000000000 +0100
--- src/main.c	2014-03-23 13:07:21.771149289 +0100
***************
*** 1057,1065 ****
      if (!cmdwin && !noexmode && SETJMP(x_jump_env))
      {
  	State = NORMAL;
- # ifdef FEAT_VISUAL
  	VIsual_active = FALSE;
- # endif
  	got_int = TRUE;
  	need_wait_return = FALSE;
  	global_busy = FALSE;
--- 1057,1063 ----
***************
*** 1096,1106 ****
  		check_timestamps(FALSE);
  	    if (need_wait_return)	/* if wait_return still needed ... */
  		wait_return(FALSE);	/* ... call it now */
! 	    if (need_start_insertmode && goto_im()
! #ifdef FEAT_VISUAL
! 		    && !VIsual_active
! #endif
! 		    )
  	    {
  		need_start_insertmode = FALSE;
  		stuffReadbuff((char_u *)"i");	/* start insert mode next */
--- 1094,1100 ----
  		check_timestamps(FALSE);
  	    if (need_wait_return)	/* if wait_return still needed ... */
  		wait_return(FALSE);	/* ... call it now */
! 	    if (need_start_insertmode && goto_im() && !VIsual_active)
  	    {
  		need_start_insertmode = FALSE;
  		stuffReadbuff((char_u *)"i");	/* start insert mode next */
***************
*** 1202,1208 ****
  		diff_need_scrollbind = FALSE;
  	    }
  #endif
! #if defined(FEAT_FOLDING) && defined(FEAT_VISUAL)
  	    /* Include a closed fold completely in the Visual area. */
  	    foldAdjustVisual();
  #endif
--- 1196,1202 ----
  		diff_need_scrollbind = FALSE;
  	    }
  #endif
! #if defined(FEAT_FOLDING)
  	    /* Include a closed fold completely in the Visual area. */
  	    foldAdjustVisual();
  #endif
***************
*** 1228,1239 ****
  	    update_topline();
  	    validate_cursor();
  
- #ifdef FEAT_VISUAL
  	    if (VIsual_active)
  		update_curbuf(INVERTED);/* update inverted part */
! 	    else
! #endif
! 		if (must_redraw)
  		update_screen(0);
  	    else if (redraw_cmdline || clear_cmdline)
  		showmode();
--- 1222,1230 ----
  	    update_topline();
  	    validate_cursor();
  
  	    if (VIsual_active)
  		update_curbuf(INVERTED);/* update inverted part */
! 	    else if (must_redraw)
  		update_screen(0);
  	    else if (redraw_cmdline || clear_cmdline)
  		showmode();
*** ../vim-7.4.211/src/mark.c	2013-11-03 00:20:46.000000000 +0100
--- src/mark.c	2014-03-23 13:08:03.011149921 +0100
***************
*** 98,104 ****
  	return OK;
      }
  
- #ifdef FEAT_VISUAL
      if (c == '<' || c == '>')
      {
  	if (c == '<')
--- 98,103 ----
***************
*** 110,116 ****
  	    curbuf->b_visual.vi_mode = 'v';
  	return OK;
      }
- #endif
  
  #ifndef EBCDIC
      if (c > 'z')	    /* some islower() and isupper() cannot handle
--- 109,114 ----
***************
*** 340,348 ****
      int		*fnum;
  {
      pos_T		*posp;
- #ifdef FEAT_VISUAL
      pos_T		*startp, *endp;
- #endif
      static pos_T	pos_copy;
  
      posp = NULL;
--- 338,344 ----
***************
*** 403,409 ****
  	curwin->w_cursor = pos;
  	listcmd_busy = slcb;
      }
- #ifdef FEAT_VISUAL
      else if (c == '<' || c == '>')	/* start/end of visual area */
      {
  	startp = &buf->b_visual.vi_start;
--- 399,404 ----
***************
*** 428,434 ****
  #endif
  	}
      }
- #endif
      else if (ASCII_ISLOWER(c))		/* normal named mark */
      {
  	posp = &(buf->b_namedm[c - 'a']);
--- 423,428 ----
***************
*** 757,766 ****
      show_one_mark(']', arg, &curbuf->b_op_end, NULL, TRUE);
      show_one_mark('^', arg, &curbuf->b_last_insert, NULL, TRUE);
      show_one_mark('.', arg, &curbuf->b_last_change, NULL, TRUE);
- #ifdef FEAT_VISUAL
      show_one_mark('<', arg, &curbuf->b_visual.vi_start, NULL, TRUE);
      show_one_mark('>', arg, &curbuf->b_visual.vi_end, NULL, TRUE);
- #endif
      show_one_mark(-1, arg, NULL, NULL, FALSE);
  }
  
--- 751,758 ----
***************
*** 892,901 ****
  		    case '.': curbuf->b_last_change.lnum = 0; break;
  		    case '[': curbuf->b_op_start.lnum    = 0; break;
  		    case ']': curbuf->b_op_end.lnum      = 0; break;
- #ifdef FEAT_VISUAL
  		    case '<': curbuf->b_visual.vi_start.lnum = 0; break;
  		    case '>': curbuf->b_visual.vi_end.lnum   = 0; break;
- #endif
  		    case ' ': break;
  		    default:  EMSG2(_(e_invarg2), p);
  			      return;
--- 884,891 ----
***************
*** 1085,1095 ****
  	    one_adjust_nodel(&(curbuf->b_changelist[i].lnum));
  #endif
  
- #ifdef FEAT_VISUAL
  	/* Visual area */
  	one_adjust_nodel(&(curbuf->b_visual.vi_start.lnum));
  	one_adjust_nodel(&(curbuf->b_visual.vi_end.lnum));
- #endif
  
  #ifdef FEAT_QUICKFIX
  	/* quickfix marks */
--- 1075,1083 ----
***************
*** 1136,1149 ****
  		    if (win->w_tagstack[i].fmark.fnum == fnum)
  			one_adjust_nodel(&(win->w_tagstack[i].fmark.mark.lnum));
  
- #ifdef FEAT_VISUAL
  	    /* the displayed Visual area */
  	    if (win->w_old_cursor_lnum != 0)
  	    {
  		one_adjust_nodel(&(win->w_old_cursor_lnum));
  		one_adjust_nodel(&(win->w_old_visual_lnum));
  	    }
- #endif
  
  	    /* topline and cursor position for windows with the same buffer
  	     * other than the current window */
--- 1124,1135 ----
***************
*** 1260,1270 ****
  	col_adjust(&(curbuf->b_changelist[i]));
  #endif
  
- #ifdef FEAT_VISUAL
      /* Visual area */
      col_adjust(&(curbuf->b_visual.vi_start));
      col_adjust(&(curbuf->b_visual.vi_end));
- #endif
  
      /* previous context mark */
      col_adjust(&(curwin->w_pcmark));
--- 1246,1254 ----
*** ../vim-7.4.211/src/menu.c	2011-04-11 15:17:21.000000000 +0200
--- src/menu.c	2014-03-23 13:08:19.091150168 +0100
***************
*** 1640,1646 ****
  	idx = MENU_INDEX_INSERT;
      else if (state & CMDLINE)
  	idx = MENU_INDEX_CMDLINE;
- #ifdef FEAT_VISUAL
      else if (VIsual_active)
      {
  	if (VIsual_select)
--- 1640,1645 ----
***************
*** 1648,1654 ****
  	else
  	    idx = MENU_INDEX_VISUAL;
      }
- #endif
      else if (state == HITRETURN || state == ASKMORE)
  	idx = MENU_INDEX_CMDLINE;
      else if (finish_op)
--- 1647,1652 ----
***************
*** 1811,1824 ****
      static int
  get_menu_mode()
  {
- #ifdef FEAT_VISUAL
      if (VIsual_active)
      {
  	if (VIsual_select)
  	    return MENU_INDEX_SELECT;
  	return MENU_INDEX_VISUAL;
      }
- #endif
      if (State & INSERT)
  	return MENU_INDEX_INSERT;
      if ((State & CMDLINE) || State == ASKMORE || State == HITRETURN)
--- 1809,1820 ----
*** ../vim-7.4.211/src/misc2.c	2014-02-23 23:38:58.824760280 +0100
--- src/misc2.c	2014-03-23 13:08:56.927150748 +0100
***************
*** 31,39 ****
      if (virtual_op != MAYBE)
  	return virtual_op;
      return (ve_flags == VE_ALL
- # ifdef FEAT_VISUAL
  	    || ((ve_flags & VE_BLOCK) && VIsual_active && VIsual_mode == Ctrl_V)
- # endif
  	    || ((ve_flags & VE_INSERT) && (State & INSERT)));
  }
  
--- 31,37 ----
***************
*** 149,157 ****
  
      one_more = (State & INSERT)
  		    || restart_edit != NUL
- #ifdef FEAT_VISUAL
  		    || (VIsual_active && *p_sel != 'o')
- #endif
  #ifdef FEAT_VIRTUALEDIT
  		    || ((ve_flags & VE_ONEMORE) && wcol < MAXCOL)
  #endif
--- 147,153 ----
***************
*** 570,578 ****
  	 * - in Visual mode and 'selection' isn't "old"
  	 * - 'virtualedit' is set */
  	if ((State & INSERT) || restart_edit
- #ifdef FEAT_VISUAL
  		|| (VIsual_active && *p_sel != 'o')
- #endif
  #ifdef FEAT_VIRTUALEDIT
  		|| (ve_flags & VE_ONEMORE)
  #endif
--- 566,572 ----
***************
*** 627,635 ****
  adjust_cursor_col()
  {
      if (curwin->w_cursor.col > 0
- # ifdef FEAT_VISUAL
  	    && (!VIsual_active || *p_sel == 'o')
- # endif
  	    && gchar_cursor() == NUL)
  	--curwin->w_cursor.col;
  }
--- 621,627 ----
***************
*** 3290,3306 ****
  {
      if (State & NORMAL)
      {
- #ifdef FEAT_VISUAL
  	if (VIsual_active)
  	{
  	    if (VIsual_select)
  		return SELECTMODE;
  	    return VISUAL;
  	}
! 	else
! #endif
! 	    if (finish_op)
! 		return OP_PENDING;
      }
      return State;
  }
--- 3282,3295 ----
  {
      if (State & NORMAL)
      {
  	if (VIsual_active)
  	{
  	    if (VIsual_select)
  		return SELECTMODE;
  	    return VISUAL;
  	}
! 	else if (finish_op)
! 	    return OP_PENDING;
      }
      return State;
  }
***************
*** 3738,3744 ****
      }
      if (finish_op)
  	return SHAPE_IDX_O;
- #ifdef FEAT_VISUAL
      if (VIsual_active)
      {
  	if (*p_sel == 'e')
--- 3727,3732 ----
***************
*** 3746,3752 ****
  	else
  	    return SHAPE_IDX_V;
      }
- #endif
      return SHAPE_IDX_N;
  }
  #endif
--- 3734,3739 ----
*** ../vim-7.4.211/src/move.c	2014-02-11 18:58:05.102320947 +0100
--- src/move.c	2014-03-23 13:09:16.535151048 +0100
***************
*** 2857,2873 ****
      win_T	*old_curwin = curwin;
      buf_T	*old_curbuf = curbuf;
      int		restart_edit_save;
- # ifdef FEAT_VISUAL
      int		old_VIsual_select = VIsual_select;
      int		old_VIsual_active = VIsual_active;
- # endif
  
      /*
       * loop through the cursorbound windows
       */
- # ifdef FEAT_VISUAL
      VIsual_select = VIsual_active = 0;
- # endif
      for (curwin = firstwin; curwin; curwin = curwin->w_next)
      {
  	curbuf = curwin->w_buffer;
--- 2857,2869 ----
***************
*** 2916,2925 ****
      /*
       * reset current-window
       */
- # ifdef FEAT_VISUAL
      VIsual_select = old_VIsual_select;
      VIsual_active = old_VIsual_active;
- # endif
      curwin = old_curwin;
      curbuf = old_curbuf;
  }
--- 2912,2919 ----
*** ../vim-7.4.211/src/netbeans.c	2012-06-20 19:56:18.000000000 +0200
--- src/netbeans.c	2014-03-23 13:09:29.163151241 +0100
***************
*** 2232,2242 ****
  
  	    nb_set_curbuf(buf->bufp);
  
- #ifdef FEAT_VISUAL
  	    /* Don't want Visual mode now. */
  	    if (VIsual_active)
  		end_visual_mode();
- #endif
  #ifdef NBDEBUG
  	    s = args;
  #endif
--- 2232,2240 ----
*** ../vim-7.4.211/src/normal.c	2014-03-12 17:41:59.128838878 +0100
--- src/normal.c	2014-03-23 15:07:40.435259900 +0100
***************
*** 14,20 ****
  
  #include "vim.h"
  
- #ifdef FEAT_VISUAL
  /*
   * The Visual area is remembered for reselection.
   */
--- 14,19 ----
***************
*** 24,30 ****
  static int	VIsual_mode_orig = NUL;		/* saved Visual mode */
  
  static int	restart_VIsual_select = 0;
- #endif
  
  #ifdef FEAT_EVAL
  static void	set_vcount_ca __ARGS((cmdarg_T *cap, int *set_prevcount));
--- 23,28 ----
***************
*** 37,43 ****
  static int	find_command __ARGS((int cmdchar));
  static void	op_colon __ARGS((oparg_T *oap));
  static void	op_function __ARGS((oparg_T *oap));
! #if defined(FEAT_MOUSE) && defined(FEAT_VISUAL)
  static void	find_start_of_word __ARGS((pos_T *));
  static void	find_end_of_word __ARGS((pos_T *));
  static int	get_mouse_class __ARGS((char_u *p));
--- 35,41 ----
  static int	find_command __ARGS((int cmdchar));
  static void	op_colon __ARGS((oparg_T *oap));
  static void	op_function __ARGS((oparg_T *oap));
! #if defined(FEAT_MOUSE)
  static void	find_start_of_word __ARGS((pos_T *));
  static void	find_end_of_word __ARGS((pos_T *));
  static int	get_mouse_class __ARGS((char_u *p));
***************
*** 48,56 ****
  static int	checkclearopq __ARGS((oparg_T *oap));
  static void	clearop __ARGS((oparg_T *oap));
  static void	clearopbeep __ARGS((oparg_T *oap));
- #ifdef FEAT_VISUAL
  static void	unshift_special __ARGS((cmdarg_T *cap));
- #endif
  #ifdef FEAT_CMDL_INFO
  static void	del_from_showcmd __ARGS((int));
  #endif
--- 46,52 ----
***************
*** 117,141 ****
  #ifdef FEAT_VREPLACE
  static void	nv_vreplace __ARGS((cmdarg_T *cap));
  #endif
- #ifdef FEAT_VISUAL
  static void	v_swap_corners __ARGS((int cmdchar));
- #endif
  static void	nv_replace __ARGS((cmdarg_T *cap));
  static void	n_swapchar __ARGS((cmdarg_T *cap));
  static void	nv_cursormark __ARGS((cmdarg_T *cap, int flag, pos_T *pos));
- #ifdef FEAT_VISUAL
  static void	v_visop __ARGS((cmdarg_T *cap));
- #endif
  static void	nv_subst __ARGS((cmdarg_T *cap));
  static void	nv_abbrev __ARGS((cmdarg_T *cap));
  static void	nv_optrans __ARGS((cmdarg_T *cap));
  static void	nv_gomark __ARGS((cmdarg_T *cap));
  static void	nv_pcmark __ARGS((cmdarg_T *cap));
  static void	nv_regname __ARGS((cmdarg_T *cap));
- #ifdef FEAT_VISUAL
  static void	nv_visual __ARGS((cmdarg_T *cap));
  static void	n_start_visual_mode __ARGS((int c));
- #endif
  static void	nv_window __ARGS((cmdarg_T *cap));
  static void	nv_suspend __ARGS((cmdarg_T *cap));
  static void	nv_g_cmd __ARGS((cmdarg_T *cap));
--- 113,131 ----
***************
*** 155,165 ****
  static void	nv_wordcmd __ARGS((cmdarg_T *cap));
  static void	nv_beginline __ARGS((cmdarg_T *cap));
  static void	adjust_cursor __ARGS((oparg_T *oap));
- #ifdef FEAT_VISUAL
  static void	adjust_for_sel __ARGS((cmdarg_T *cap));
  static int	unadjust_for_sel __ARGS((void));
  static void	nv_select __ARGS((cmdarg_T *cap));
- #endif
  static void	nv_goto __ARGS((cmdarg_T *cap));
  static void	nv_normal __ARGS((cmdarg_T *cap));
  static void	nv_esc __ARGS((cmdarg_T *oap));
--- 145,153 ----
***************
*** 248,271 ****
      {Ctrl_N,	nv_down,	NV_STS,			FALSE},
      {Ctrl_O,	nv_ctrlo,	0,			0},
      {Ctrl_P,	nv_up,		NV_STS,			FALSE},
- #ifdef FEAT_VISUAL
      {Ctrl_Q,	nv_visual,	0,			FALSE},
- #else
-     {Ctrl_Q,	nv_ignore,	0,			0},
- #endif
      {Ctrl_R,	nv_redo,	0,			0},
      {Ctrl_S,	nv_ignore,	0,			0},
      {Ctrl_T,	nv_tagpop,	NV_NCW,			0},
      {Ctrl_U,	nv_halfpage,	0,			0},
- #ifdef FEAT_VISUAL
      {Ctrl_V,	nv_visual,	0,			FALSE},
      {'V',	nv_visual,	0,			FALSE},
      {'v',	nv_visual,	0,			FALSE},
- #else
-     {Ctrl_V,	nv_error,	0,			0},
-     {'V',	nv_error,	0,			0},
-     {'v',	nv_error,	0,			0},
- #endif
      {Ctrl_W,	nv_window,	0,			0},
      {Ctrl_X,	nv_addsub,	0,			0},
      {Ctrl_Y,	nv_scroll_line,	0,			FALSE},
--- 236,249 ----
***************
*** 427,435 ****
      {K_HELP,	nv_help,	NV_NCW,			0},
      {K_F1,	nv_help,	NV_NCW,			0},
      {K_XF1,	nv_help,	NV_NCW,			0},
- #ifdef FEAT_VISUAL
      {K_SELECT,	nv_select,	0,			0},
- #endif
  #ifdef FEAT_GUI
      {K_VER_SCROLLBAR, nv_ver_scrollbar, 0,		0},
      {K_HOR_SCROLLBAR, nv_hor_scrollbar, 0,		0},
--- 405,411 ----
***************
*** 579,589 ****
  #ifdef FEAT_CMDL_INFO
      int		need_flushbuf;		/* need to call out_flush() */
  #endif
- #ifdef FEAT_VISUAL
      pos_T	old_pos;		/* cursor position before command */
      int		mapped_len;
      static int	old_mapped_len = 0;
- #endif
      int		idx;
  #ifdef FEAT_EVAL
      int		set_prevcount = FALSE;
--- 555,563 ----
***************
*** 643,651 ****
      }
  #endif
  
- #ifdef FEAT_VISUAL
      mapped_len = typebuf_maplen();
- #endif
  
      State = NORMAL_BUSY;
  #ifdef USE_ON_FLY_SCROLL
--- 617,623 ----
***************
*** 666,672 ****
      c = safe_vgetc();
      LANGMAP_ADJUST(c, TRUE);
  
- #ifdef FEAT_VISUAL
      /*
       * If a mapping was started in Visual or Select mode, remember the length
       * of the mapping.  This is used below to not return to Insert mode for as
--- 638,643 ----
***************
*** 677,688 ****
      else if (old_mapped_len
  		|| (VIsual_active && mapped_len == 0 && typebuf_maplen() > 0))
  	old_mapped_len = typebuf_maplen();
- #endif
  
      if (c == NUL)
  	c = K_ZERO;
  
- #ifdef FEAT_VISUAL
      /*
       * In Select mode, typed text replaces the selection.
       */
--- 648,657 ----
***************
*** 703,718 ****
  	msg_nowait = TRUE;	/* don't delay going to insert mode */
  	old_mapped_len = 0;	/* do go to Insert mode */
      }
- #endif
  
  #ifdef FEAT_CMDL_INFO
      need_flushbuf = add_to_showcmd(c);
  #endif
  
  getcount:
- #ifdef FEAT_VISUAL
      if (!(VIsual_active && VIsual_select))
- #endif
      {
  	/*
  	 * Handle a count before a command and compute ca.count0.
--- 672,684 ----
***************
*** 856,862 ****
  	goto normal_end;
  #endif
  
- #ifdef FEAT_VISUAL
      /*
       * In Visual/Select mode, a few keys are handled in a special way.
       */
--- 822,827 ----
***************
*** 892,898 ****
  	    }
  	}
      }
- #endif
  
  #ifdef FEAT_RIGHTLEFT
      if (curwin->w_p_rl && KeyTyped && !KeyStuffed
--- 857,862 ----
***************
*** 930,940 ****
  		    && !Recording
  		    && !Exec_reg)
  		|| ((ca.cmdchar == 'a' || ca.cmdchar == 'i')
! 		    && (oap->op_type != OP_NOP
! #ifdef FEAT_VISUAL
! 			|| VIsual_active
! #endif
! 		       ))))
      {
  	int	*cp;
  	int	repl = FALSE;	/* get character for replace mode */
--- 894,900 ----
  		    && !Recording
  		    && !Exec_reg)
  		|| ((ca.cmdchar == 'a' || ca.cmdchar == 'i')
! 		    && (oap->op_type != OP_NOP || VIsual_active))))
      {
  	int	*cp;
  	int	repl = FALSE;	/* get character for replace mode */
***************
*** 1168,1174 ****
  	msg_col = 0;
      }
  
- #ifdef FEAT_VISUAL
      old_pos = curwin->w_cursor;		/* remember where cursor was */
  
      /* When 'keymodel' contains "startsel" some keys start Select/Visual
--- 1128,1133 ----
***************
*** 1188,1194 ****
  	    mod_mask &= ~MOD_MASK_SHIFT;
  	}
      }
- #endif
  
      /*
       * Execute the command!
--- 1147,1152 ----
***************
*** 1220,1231 ****
  #endif
      }
  
- #ifdef FEAT_VISUAL
      /* Get the length of mapped chars again after typing a count, second
       * character or "z333<cr>". */
      if (old_mapped_len > 0)
  	old_mapped_len = typebuf_maplen();
- #endif
  
      /*
       * If an operation is pending, handle it...
--- 1178,1187 ----
***************
*** 1247,1257 ****
      if (       ((p_smd
  		    && msg_silent == 0
  		    && (restart_edit != 0
- #ifdef FEAT_VISUAL
  			|| (VIsual_active
  			    && old_pos.lnum == curwin->w_cursor.lnum
  			    && old_pos.col == curwin->w_cursor.col)
- #endif
  		       )
  		    && (clear_cmdline
  			|| redraw_cmdline)
--- 1203,1211 ----
***************
*** 1259,1267 ****
  		    && !msg_nowait
  		    && KeyTyped)
  		|| (restart_edit != 0
- #ifdef FEAT_VISUAL
  		    && !VIsual_active
- #endif
  		    && (msg_scroll
  			|| emsg_on_display)))
  	    && oap->regname == 0
--- 1213,1219 ----
***************
*** 1368,1403 ****
       * May switch from Visual to Select mode after CTRL-O command.
       */
      if (       oap->op_type == OP_NOP
- #ifdef FEAT_VISUAL
  	    && ((restart_edit != 0 && !VIsual_active && old_mapped_len == 0)
  		|| restart_VIsual_select == 1)
- #else
- 	    && restart_edit != 0
- #endif
  	    && !(ca.retval & CA_COMMAND_BUSY)
  	    && stuff_empty()
  	    && oap->regname == 0)
      {
- #ifdef FEAT_VISUAL
  	if (restart_VIsual_select == 1)
  	{
  	    VIsual_select = TRUE;
  	    showmode();
  	    restart_VIsual_select = 0;
  	}
! #endif
! 	if (restart_edit != 0
! #ifdef FEAT_VISUAL
! 		&& !VIsual_active && old_mapped_len == 0
! #endif
! 		)
  	    (void)edit(restart_edit, FALSE, 1L);
      }
  
- #ifdef FEAT_VISUAL
      if (restart_VIsual_select == 2)
  	restart_VIsual_select = 1;
- #endif
  
      /* Save count before an operator for next time. */
      opcount = ca.opcount;
--- 1320,1343 ----
       * May switch from Visual to Select mode after CTRL-O command.
       */
      if (       oap->op_type == OP_NOP
  	    && ((restart_edit != 0 && !VIsual_active && old_mapped_len == 0)
  		|| restart_VIsual_select == 1)
  	    && !(ca.retval & CA_COMMAND_BUSY)
  	    && stuff_empty()
  	    && oap->regname == 0)
      {
  	if (restart_VIsual_select == 1)
  	{
  	    VIsual_select = TRUE;
  	    showmode();
  	    restart_VIsual_select = 0;
  	}
! 	if (restart_edit != 0 && !VIsual_active && old_mapped_len == 0)
  	    (void)edit(restart_edit, FALSE, 1L);
      }
  
      if (restart_VIsual_select == 2)
  	restart_VIsual_select = 1;
  
      /* Save count before an operator for next time. */
      opcount = ca.opcount;
***************
*** 1437,1451 ****
      int		empty_region_error;
      int		restart_edit_save;
  
- #ifdef FEAT_VISUAL
      /* The visual area is remembered for redo */
      static int	    redo_VIsual_mode = NUL; /* 'v', 'V', or Ctrl-V */
      static linenr_T redo_VIsual_line_count; /* number of lines */
      static colnr_T  redo_VIsual_vcol;	    /* number of cols or end column */
      static long	    redo_VIsual_count;	    /* count for Visual operator */
! # ifdef FEAT_VIRTUALEDIT
      int		    include_line_break = FALSE;
- # endif
  #endif
  
  #if defined(FEAT_CLIPBOARD)
--- 1377,1389 ----
      int		empty_region_error;
      int		restart_edit_save;
  
      /* The visual area is remembered for redo */
      static int	    redo_VIsual_mode = NUL; /* 'v', 'V', or Ctrl-V */
      static linenr_T redo_VIsual_line_count; /* number of lines */
      static colnr_T  redo_VIsual_vcol;	    /* number of cols or end column */
      static long	    redo_VIsual_count;	    /* count for Visual operator */
! #ifdef FEAT_VIRTUALEDIT
      int		    include_line_break = FALSE;
  #endif
  
  #if defined(FEAT_CLIPBOARD)
***************
*** 1459,1468 ****
      if ((clip_star.available || clip_plus.available)
  	    && oap->op_type != OP_NOP
  	    && !gui_yank
- # ifdef FEAT_VISUAL
  	    && VIsual_active
  	    && !redo_VIsual_busy
- # endif
  	    && oap->regname == 0)
  	clip_auto_select();
  #endif
--- 1397,1404 ----
***************
*** 1471,1483 ****
      /*
       * If an operation is pending, handle it...
       */
!     if ((finish_op
! #ifdef FEAT_VISUAL
! 		|| VIsual_active
! #endif
! 		) && oap->op_type != OP_NOP)
      {
- #ifdef FEAT_VISUAL
  	oap->is_VIsual = VIsual_active;
  	if (oap->motion_force == 'V')
  	    oap->motion_type = MLINE;
--- 1407,1414 ----
      /*
       * If an operation is pending, handle it...
       */
!     if ((finish_op || VIsual_active) && oap->op_type != OP_NOP)
      {
  	oap->is_VIsual = VIsual_active;
  	if (oap->motion_force == 'V')
  	    oap->motion_type = MLINE;
***************
*** 1501,1517 ****
  	    VIsual_select = FALSE;
  	    VIsual_reselect = FALSE;
  	}
- #endif
  
  	/* Only redo yank when 'y' flag is in 'cpoptions'. */
  	/* Never redo "zf" (define fold). */
  	if ((vim_strchr(p_cpo, CPO_YANK) != NULL || oap->op_type != OP_YANK)
- #ifdef FEAT_VISUAL
  		&& ((!VIsual_active || oap->motion_force)
  		    /* Also redo Operator-pending Visual mode mappings */
  		    || (VIsual_active && cap->cmdchar == ':'
  						 && oap->op_type != OP_COLON))
- #endif
  		&& cap->cmdchar != 'D'
  #ifdef FEAT_FOLDING
  		&& oap->op_type != OP_FOLD
--- 1432,1445 ----
***************
*** 1554,1560 ****
  	    }
  	}
  
- #ifdef FEAT_VISUAL
  	if (redo_VIsual_busy)
  	{
  	    /* Redo of an operation on a Visual area. Use the same size from
--- 1482,1487 ----
***************
*** 1639,1645 ****
  	    if (VIsual_mode == 'V')
  		oap->start.col = 0;
  	}
- #endif /* FEAT_VISUAL */
  
  	/*
  	 * Set oap->start to the first position of the operated text, oap->end
--- 1566,1571 ----
***************
*** 1690,1696 ****
  	virtual_op = virtual_active();
  #endif
  
- #ifdef FEAT_VISUAL
  	if (VIsual_active || redo_VIsual_busy)
  	{
  	    if (VIsual_mode == Ctrl_V)	/* block mode */
--- 1616,1621 ----
***************
*** 1826,1834 ****
  	    {
  		oap->motion_type = MCHAR;
  		if (VIsual_mode != Ctrl_V && *ml_get_pos(&(oap->end)) == NUL
! # ifdef FEAT_VIRTUALEDIT
  			&& (include_line_break || !virtual_op)
! # endif
  			)
  		{
  		    oap->inclusive = FALSE;
--- 1751,1759 ----
  	    {
  		oap->motion_type = MCHAR;
  		if (VIsual_mode != Ctrl_V && *ml_get_pos(&(oap->end)) == NUL
! #ifdef FEAT_VIRTUALEDIT
  			&& (include_line_break || !virtual_op)
! #endif
  			)
  		{
  		    oap->inclusive = FALSE;
***************
*** 1840,1848 ****
  			{
  			    ++oap->end.lnum;
  			    oap->end.col = 0;
! # ifdef FEAT_VIRTUALEDIT
  			    oap->end.coladd = 0;
! # endif
  			    ++oap->line_count;
  			}
  			else
--- 1765,1773 ----
  			{
  			    ++oap->end.lnum;
  			    oap->end.col = 0;
! #ifdef FEAT_VIRTUALEDIT
  			    oap->end.coladd = 0;
! #endif
  			    ++oap->line_count;
  			}
  			else
***************
*** 1868,1877 ****
  	    if (!gui_yank)
  	    {
  		VIsual_active = FALSE;
! # ifdef FEAT_MOUSE
  		setmouse();
  		mouse_dragging = 0;
! # endif
  		if (mode_displayed)
  		    clear_cmdline = TRUE;   /* unshow visual mode later */
  #ifdef FEAT_CMDL_INFO
--- 1793,1802 ----
  	    if (!gui_yank)
  	    {
  		VIsual_active = FALSE;
! #ifdef FEAT_MOUSE
  		setmouse();
  		mouse_dragging = 0;
! #endif
  		if (mode_displayed)
  		    clear_cmdline = TRUE;   /* unshow visual mode later */
  #ifdef FEAT_CMDL_INFO
***************
*** 1886,1892 ****
  		    redraw_curbuf_later(INVERTED);
  	    }
  	}
- #endif
  
  #ifdef FEAT_MBYTE
  	/* Include the trailing byte of a multi-byte char. */
--- 1811,1816 ----
***************
*** 1921,1936 ****
  	empty_region_error = (oap->empty
  				&& vim_strchr(p_cpo, CPO_EMPTYREGION) != NULL);
  
- #ifdef FEAT_VISUAL
  	/* Force a redraw when operating on an empty Visual region, when
  	 * 'modifiable is off or creating a fold. */
  	if (oap->is_VIsual && (oap->empty || !curbuf->b_p_ma
! # ifdef FEAT_FOLDING
  		    || oap->op_type == OP_FOLD
! # endif
  		    ))
  	    redraw_curbuf_later(INVERTED);
- #endif
  
  	/*
  	 * If the end of an operator is in column one while oap->motion_type
--- 1845,1858 ----
  	empty_region_error = (oap->empty
  				&& vim_strchr(p_cpo, CPO_EMPTYREGION) != NULL);
  
  	/* Force a redraw when operating on an empty Visual region, when
  	 * 'modifiable is off or creating a fold. */
  	if (oap->is_VIsual && (oap->empty || !curbuf->b_p_ma
! #ifdef FEAT_FOLDING
  		    || oap->op_type == OP_FOLD
! #endif
  		    ))
  	    redraw_curbuf_later(INVERTED);
  
  	/*
  	 * If the end of an operator is in column one while oap->motion_type
***************
*** 1943,1952 ****
  		&& oap->inclusive == FALSE
  		&& !(cap->retval & CA_NO_ADJ_OP_END)
  		&& oap->end.col == 0
- #ifdef FEAT_VISUAL
  		&& (!oap->is_VIsual || *p_sel == 'o')
  		&& !oap->block_mode
- #endif
  		&& oap->line_count > 1)
  	{
  	    oap->end_adjusted = TRUE;	    /* remember that we did this */
--- 1865,1872 ----
***************
*** 1971,1981 ****
  	{
  	case OP_LSHIFT:
  	case OP_RSHIFT:
! 	    op_shift(oap, TRUE,
! #ifdef FEAT_VISUAL
! 		    oap->is_VIsual ? (int)cap->count1 :
! #endif
! 		    1);
  	    auto_format(FALSE, TRUE);
  	    break;
  
--- 1891,1897 ----
  	{
  	case OP_LSHIFT:
  	case OP_RSHIFT:
! 	    op_shift(oap, TRUE, oap->is_VIsual ? (int)cap->count1 : 1);
  	    auto_format(FALSE, TRUE);
  	    break;
  
***************
*** 1988,2002 ****
  		beep_flush();
  	    else
  	    {
! 		(void)do_join(oap->line_count, oap->op_type == OP_JOIN, TRUE, TRUE);
  		auto_format(FALSE, TRUE);
  	    }
  	    break;
  
  	case OP_DELETE:
- #ifdef FEAT_VISUAL
  	    VIsual_reselect = FALSE;	    /* don't reselect now */
- #endif
  	    if (empty_region_error)
  	    {
  		vim_beep();
--- 1904,1917 ----
  		beep_flush();
  	    else
  	    {
! 		(void)do_join(oap->line_count, oap->op_type == OP_JOIN,
! 								  TRUE, TRUE);
  		auto_format(FALSE, TRUE);
  	    }
  	    break;
  
  	case OP_DELETE:
  	    VIsual_reselect = FALSE;	    /* don't reselect now */
  	    if (empty_region_error)
  	    {
  		vim_beep();
***************
*** 2026,2034 ****
  	    break;
  
  	case OP_CHANGE:
- #ifdef FEAT_VISUAL
  	    VIsual_reselect = FALSE;	    /* don't reselect now */
- #endif
  	    if (empty_region_error)
  	    {
  		vim_beep();
--- 1941,1947 ----
***************
*** 2126,2134 ****
  
  	case OP_INSERT:
  	case OP_APPEND:
- #ifdef FEAT_VISUAL
  	    VIsual_reselect = FALSE;	/* don't reselect now */
- #endif
  #ifdef FEAT_VISUALEXTRA
  	    if (empty_region_error)
  	    {
--- 2039,2045 ----
***************
*** 2158,2166 ****
  	    break;
  
  	case OP_REPLACE:
- #ifdef FEAT_VISUAL
  	    VIsual_reselect = FALSE;	/* don't reselect now */
- #endif
  #ifdef FEAT_VISUALEXTRA
  	    if (empty_region_error)
  #endif
--- 2069,2075 ----
***************
*** 2220,2228 ****
  	{
  	    curwin->w_cursor = old_cursor;
  	}
- #ifdef FEAT_VISUAL
  	oap->block_mode = FALSE;
- #endif
  	clearop(oap);
      }
  }
--- 2129,2135 ----
***************
*** 2235,2245 ****
      oparg_T	*oap;
  {
      stuffcharReadbuff(':');
- #ifdef FEAT_VISUAL
      if (oap->is_VIsual)
  	stuffReadbuff((char_u *)"'<,'>");
      else
- #endif
      {
  	/*
  	 * Make the range look nice, so it can be repeated.
--- 2142,2150 ----
***************
*** 2404,2417 ****
      pos_T	save_cursor;
  #endif
      win_T	*old_curwin = curwin;
- #ifdef FEAT_VISUAL
      static pos_T orig_cursor;
      colnr_T	leftcol, rightcol;
      pos_T	end_visual;
      int		diff;
      int		old_active = VIsual_active;
      int		old_mode = VIsual_mode;
- #endif
      int		regname;
  
  #if defined(FEAT_FOLDING)
--- 2309,2320 ----
***************
*** 2432,2446 ****
  	if (!gui.in_use)
  #endif
  	{
- #ifdef FEAT_VISUAL
  	    if (VIsual_active)
  	    {
  		if (!mouse_has(MOUSE_VISUAL))
  		    return FALSE;
  	    }
! 	    else
! #endif
! 		if (State == NORMAL && !mouse_has(MOUSE_NORMAL))
  		return FALSE;
  	}
  
--- 2335,2346 ----
  	if (!gui.in_use)
  #endif
  	{
  	    if (VIsual_active)
  	    {
  		if (!mouse_has(MOUSE_VISUAL))
  		    return FALSE;
  	    }
! 	    else if (State == NORMAL && !mouse_has(MOUSE_NORMAL))
  		return FALSE;
  	}
  
***************
*** 2509,2522 ****
  	}
      }
  
- #ifndef FEAT_VISUAL
-     /*
-      * ALT is only used for starting/extending Visual mode.
-      */
-     if ((mod_mask & MOD_MASK_ALT))
- 	return FALSE;
- #endif
- 
      /*
       * CTRL right mouse button does CTRL-T
       */
--- 2409,2414 ----
***************
*** 2586,2592 ****
  		return FALSE;
  	    }
  
- #ifdef FEAT_VISUAL
  	    /*
  	     * If visual was active, yank the highlighted text and put it
  	     * before the mouse pointer position.
--- 2478,2483 ----
***************
*** 2607,2613 ****
  		do_always = TRUE;	/* ignore 'mouse' setting next time */
  		return FALSE;
  	    }
- #endif
  	    /*
  	     * The rest is below jump_to_mouse()
  	     */
--- 2498,2503 ----
***************
*** 2761,2767 ****
  		{
  		    /* First set the cursor position before showing the popup
  		     * menu. */
- #ifdef FEAT_VISUAL
  		    if (VIsual_active)
  		    {
  			pos_T    m_pos;
--- 2651,2656 ----
***************
*** 2800,2815 ****
  		    }
  		    else
  			jump_flags = MOUSE_MAY_STOP_VIS;
- #endif
  		}
  		if (jump_flags)
  		{
  		    jump_flags = jump_to_mouse(jump_flags, NULL, which_button);
! 		    update_curbuf(
! #ifdef FEAT_VISUAL
! 			    VIsual_active ? INVERTED :
! #endif
! 			    VALID);
  		    setcursor();
  		    out_flush();    /* Update before showing popup menu */
  		}
--- 2689,2699 ----
  		    }
  		    else
  			jump_flags = MOUSE_MAY_STOP_VIS;
  		}
  		if (jump_flags)
  		{
  		    jump_flags = jump_to_mouse(jump_flags, NULL, which_button);
! 		    update_curbuf(VIsual_active ? INVERTED : VALID);
  		    setcursor();
  		    out_flush();    /* Update before showing popup menu */
  		}
***************
*** 2832,2838 ****
  	}
      }
  
- #ifdef FEAT_VISUAL
      if ((State & (NORMAL | INSERT))
  			    && !(mod_mask & (MOD_MASK_SHIFT | MOD_MASK_CTRL)))
      {
--- 2716,2721 ----
***************
*** 2872,2878 ****
  		jump_flags |= MOUSE_MAY_VIS;
  	}
      }
- #endif
  
      /*
       * If an operator is pending, ignore all drags and releases until the
--- 2755,2760 ----
***************
*** 2941,2947 ****
      }
  #endif
  
- #ifdef FEAT_VISUAL
      /* Set global flag that we are extending the Visual area with mouse
       * dragging; temporarily minimize 'scrolloff'. */
      if (VIsual_active && is_drag && p_so)
--- 2823,2828 ----
***************
*** 3040,3046 ****
       */
      else if ((State & INSERT) && VIsual_active)
  	stuffcharReadbuff(Ctrl_O);
- #endif
  
      /*
       * Middle mouse click: Put text before cursor.
--- 2921,2926 ----
***************
*** 3118,3128 ****
       */
      else if ((mod_mask & MOD_MASK_SHIFT))
      {
! 	if (State & INSERT
! #ifdef FEAT_VISUAL
! 		|| (VIsual_active && VIsual_select)
! #endif
! 		)
  	    stuffcharReadbuff(Ctrl_O);
  	if (which_button == MOUSE_LEFT)
  	    stuffcharReadbuff('*');
--- 2998,3004 ----
       */
      else if ((mod_mask & MOD_MASK_SHIFT))
      {
! 	if ((State & INSERT) || (VIsual_active && VIsual_select))
  	    stuffcharReadbuff(Ctrl_O);
  	if (which_button == MOUSE_LEFT)
  	    stuffcharReadbuff('*');
***************
*** 3153,3159 ****
  # endif
      }
  #endif
- #ifdef FEAT_VISUAL
      else if ((mod_mask & MOD_MASK_MULTI_CLICK) && (State & (NORMAL | INSERT))
  	     && mouse_has(MOUSE_VISUAL))
      {
--- 3029,3034 ----
***************
*** 3267,3278 ****
  	    || (VIsual_active && p_smd && msg_silent == 0
  				 && (!old_active || VIsual_mode != old_mode)))
  	redraw_cmdline = TRUE;
- #endif
  
      return moved;
  }
  
- #ifdef FEAT_VISUAL
  /*
   * Move "pos" back to the start of the word it's in.
   */
--- 3142,3151 ----
***************
*** 3372,3381 ****
  	return 1;
      return c;
  }
- #endif /* FEAT_VISUAL */
  #endif /* FEAT_MOUSE */
  
- #if defined(FEAT_VISUAL) || defined(PROTO)
  /*
   * Check if  highlighting for visual mode is possible, give a warning message
   * if not.
--- 3245,3252 ----
***************
*** 3468,3474 ****
  	VIsual_reselect = FALSE;
      }
  }
- #endif /* FEAT_VISUAL */
  
  #if defined(FEAT_BEVAL)
  static int find_is_eval_item __ARGS((char_u *ptr, int *colp, int *nbp, int dir));
--- 3339,3344 ----
***************
*** 3802,3812 ****
  checkclearopq(oap)
      oparg_T	*oap;
  {
!     if (oap->op_type == OP_NOP
! #ifdef FEAT_VISUAL
! 	    && !VIsual_active
! #endif
! 	    )
  	return FALSE;
      clearopbeep(oap);
      return TRUE;
--- 3672,3678 ----
  checkclearopq(oap)
      oparg_T	*oap;
  {
!     if (oap->op_type == OP_NOP && !VIsual_active)
  	return FALSE;
      clearopbeep(oap);
      return TRUE;
***************
*** 3830,3836 ****
      beep_flush();
  }
  
- #ifdef FEAT_VISUAL
  /*
   * Remove the shift modifier from a special key.
   */
--- 3696,3701 ----
***************
*** 3849,3866 ****
      }
      cap->cmdchar = simplify_key(cap->cmdchar, &mod_mask);
  }
- #endif
  
  #if defined(FEAT_CMDL_INFO) || defined(PROTO)
  /*
   * Routines for displaying a partly typed command
   */
  
! #ifdef FEAT_VISUAL	/* need room for size of Visual area */
! # define SHOWCMD_BUFLEN SHOWCMD_COLS + 1 + 30
! #else
! # define SHOWCMD_BUFLEN SHOWCMD_COLS + 1
! #endif
  static char_u	showcmd_buf[SHOWCMD_BUFLEN];
  static char_u	old_showcmd_buf[SHOWCMD_BUFLEN];  /* For push_showcmd() */
  static int	showcmd_is_clear = TRUE;
--- 3714,3726 ----
      }
      cap->cmdchar = simplify_key(cap->cmdchar, &mod_mask);
  }
  
  #if defined(FEAT_CMDL_INFO) || defined(PROTO)
  /*
   * Routines for displaying a partly typed command
   */
  
! #define SHOWCMD_BUFLEN SHOWCMD_COLS + 1 + 30
  static char_u	showcmd_buf[SHOWCMD_BUFLEN];
  static char_u	old_showcmd_buf[SHOWCMD_BUFLEN];  /* For push_showcmd() */
  static int	showcmd_is_clear = TRUE;
***************
*** 3874,3880 ****
      if (!p_sc)
  	return;
  
- #ifdef FEAT_VISUAL
      if (VIsual_active && !char_avail())
      {
  	int		cursor_bot = lt(VIsual, curwin->w_cursor);
--- 3734,3739 ----
***************
*** 3960,3966 ****
  	showcmd_visual = TRUE;
      }
      else
- #endif
      {
  	showcmd_buf[0] = NUL;
  	showcmd_visual = FALSE;
--- 3819,3824 ----
***************
*** 4203,4212 ****
      int		want_hor;
      win_T	*old_curwin = curwin;
      buf_T	*old_curbuf = curbuf;
- #ifdef FEAT_VISUAL
      int		old_VIsual_select = VIsual_select;
      int		old_VIsual_active = VIsual_active;
- #endif
      colnr_T	tgt_leftcol = curwin->w_leftcol;
      long	topline;
      long	y;
--- 4061,4068 ----
***************
*** 4223,4231 ****
      /*
       * loop through the scrollbound windows and scroll accordingly
       */
- #ifdef FEAT_VISUAL
      VIsual_select = VIsual_active = 0;
- #endif
      for (curwin = firstwin; curwin; curwin = curwin->w_next)
      {
  	curbuf = curwin->w_buffer;
--- 4079,4085 ----
***************
*** 4280,4289 ****
      /*
       * reset current-window
       */
- #ifdef FEAT_VISUAL
      VIsual_select = old_VIsual_select;
      VIsual_active = old_VIsual_active;
- #endif
      curwin = old_curwin;
      curbuf = old_curbuf;
  }
--- 4134,4141 ----
***************
*** 5239,5249 ****
  
  		    if (checkclearop(cap->oap))
  			break;
- # ifdef FEAT_VISUAL
  		    if (VIsual_active && get_visual_text(cap, &ptr, &len)
  								      == FAIL)
  			return;
- # endif
  		    if (ptr == NULL)
  		    {
  			pos_T	pos = curwin->w_cursor;
--- 5091,5099 ----
***************
*** 5411,5422 ****
      /*
       * Ignore 'Q' in Visual mode, just give a beep.
       */
- #ifdef FEAT_VISUAL
      if (VIsual_active)
  	vim_beep();
!     else
! #endif
! 	if (!checkclearop(cap->oap))
  	do_exmode(FALSE);
  }
  
--- 5261,5269 ----
      /*
       * Ignore 'Q' in Visual mode, just give a beep.
       */
      if (VIsual_active)
  	vim_beep();
!     else if (!checkclearop(cap->oap))
  	do_exmode(FALSE);
  }
  
***************
*** 5430,5440 ****
      int	    old_p_im;
      int	    cmd_result;
  
- #ifdef FEAT_VISUAL
      if (VIsual_active)
  	nv_operator(cap);
      else
- #endif
      {
  	if (cap->oap->op_type != OP_NOP)
  	{
--- 5277,5285 ----
***************
*** 5494,5508 ****
  nv_ctrlg(cap)
      cmdarg_T *cap;
  {
- #ifdef FEAT_VISUAL
      if (VIsual_active)	/* toggle Selection/Visual mode */
      {
  	VIsual_select = !VIsual_select;
  	showmode();
      }
!     else
! #endif
! 	if (!checkclearop(cap->oap))
  	/* print full name if count given or :cd used */
  	fileinfo((int)cap->count0, FALSE, TRUE);
  }
--- 5339,5350 ----
  nv_ctrlg(cap)
      cmdarg_T *cap;
  {
      if (VIsual_active)	/* toggle Selection/Visual mode */
      {
  	VIsual_select = !VIsual_select;
  	showmode();
      }
!     else if (!checkclearop(cap->oap))
  	/* print full name if count given or :cd used */
  	fileinfo((int)cap->count0, FALSE, TRUE);
  }
***************
*** 5514,5527 ****
  nv_ctrlh(cap)
      cmdarg_T *cap;
  {
- #ifdef FEAT_VISUAL
      if (VIsual_active && VIsual_select)
      {
  	cap->cmdchar = 'x';	/* BS key behaves like 'x' in Select mode */
  	v_visop(cap);
      }
      else
- #endif
  	nv_left(cap);
  }
  
--- 5356,5367 ----
***************
*** 5558,5564 ****
  nv_ctrlo(cap)
      cmdarg_T	*cap;
  {
- #ifdef FEAT_VISUAL
      if (VIsual_active && VIsual_select)
      {
  	VIsual_select = FALSE;
--- 5398,5403 ----
***************
*** 5566,5572 ****
  	restart_VIsual_select = 2;	/* restart Select mode later */
      }
      else
- #endif
      {
  	cap->count1 = -cap->count1;
  	nv_pcmark(cap);
--- 5405,5410 ----
***************
*** 5675,5684 ****
       */
      if (cmdchar == ']' || cmdchar == Ctrl_RSB || cmdchar == 'K')
      {
- #ifdef FEAT_VISUAL
  	if (VIsual_active && get_visual_text(cap, &ptr, &n) == FAIL)
  	    return;
- #endif
  	if (checkclearopq(cap->oap))
  	    return;
      }
--- 5513,5520 ----
***************
*** 5872,5878 ****
      vim_free(buf);
  }
  
- #if defined(FEAT_VISUAL) || defined(PROTO)
  /*
   * Get visually selected text, within one line only.
   * Returns FAIL if more than one line selected.
--- 5708,5713 ----
***************
*** 5917,5923 ****
      reset_VIsual_and_resel();
      return OK;
  }
- #endif
  
  /*
   * CTRL-T: backwards in tag stack
--- 5752,5757 ----
***************
*** 6040,6050 ****
      cmdarg_T	*cap;
  {
      long	n;
! #ifdef FEAT_VISUAL
!     int		PAST_LINE;
! #else
! # define PAST_LINE 0
! #endif
  
      if (mod_mask & (MOD_MASK_SHIFT | MOD_MASK_CTRL))
      {
--- 5874,5880 ----
      cmdarg_T	*cap;
  {
      long	n;
!     int		past_line;
  
      if (mod_mask & (MOD_MASK_SHIFT | MOD_MASK_CTRL))
      {
***************
*** 6057,6081 ****
  
      cap->oap->motion_type = MCHAR;
      cap->oap->inclusive = FALSE;
! #ifdef FEAT_VISUAL
!     PAST_LINE = (VIsual_active && *p_sel != 'o');
  
! # ifdef FEAT_VIRTUALEDIT
      /*
!      * In virtual mode, there's no such thing as "PAST_LINE", as lines are
!      * (theoretically) infinitely long.
       */
      if (virtual_active())
! 	PAST_LINE = 0;
! # endif
  #endif
  
      for (n = cap->count1; n > 0; --n)
      {
! 	if ((!PAST_LINE && oneright() == FAIL)
! #ifdef FEAT_VISUAL
! 		|| (PAST_LINE && *ml_get_cursor() == NUL)
! #endif
  		)
  	{
  	    /*
--- 5887,5907 ----
  
      cap->oap->motion_type = MCHAR;
      cap->oap->inclusive = FALSE;
!     past_line = (VIsual_active && *p_sel != 'o');
  
! #ifdef FEAT_VIRTUALEDIT
      /*
!      * In virtual edit mode, there's no such thing as "past_line", as lines
!      * are (theoretically) infinitely long.
       */
      if (virtual_active())
! 	past_line = 0;
  #endif
  
      for (n = cap->count1; n > 0; --n)
      {
! 	if ((!past_line && oneright() == FAIL)
! 		|| (past_line && *ml_get_cursor() == NUL)
  		)
  	{
  	    /*
***************
*** 6123,6148 ****
  	    }
  	    break;
  	}
! #ifdef FEAT_VISUAL
! 	else if (PAST_LINE)
  	{
  	    curwin->w_set_curswant = TRUE;
! # ifdef FEAT_VIRTUALEDIT
  	    if (virtual_active())
  		oneright();
  	    else
! # endif
  	    {
! # ifdef FEAT_MBYTE
  		if (has_mbyte)
  		    curwin->w_cursor.col +=
  					 (*mb_ptr2len)(ml_get_cursor());
  		else
! # endif
  		    ++curwin->w_cursor.col;
  	    }
  	}
- #endif
      }
  #ifdef FEAT_FOLDING
      if (n != cap->count1 && (fdo_flags & FDO_HOR) && KeyTyped
--- 5949,5972 ----
  	    }
  	    break;
  	}
! 	else if (past_line)
  	{
  	    curwin->w_set_curswant = TRUE;
! #ifdef FEAT_VIRTUALEDIT
  	    if (virtual_active())
  		oneright();
  	    else
! #endif
  	    {
! #ifdef FEAT_MBYTE
  		if (has_mbyte)
  		    curwin->w_cursor.col +=
  					 (*mb_ptr2len)(ml_get_cursor());
  		else
! #endif
  		    ++curwin->w_cursor.col;
  	    }
  	}
      }
  #ifdef FEAT_FOLDING
      if (n != cap->count1 && (fdo_flags & FDO_HOR) && KeyTyped
***************
*** 6503,6511 ****
  	else
  	    curwin->w_cursor.coladd = 0;
  #endif
- #ifdef FEAT_VISUAL
  	adjust_for_sel(cap);
- #endif
  #ifdef FEAT_FOLDING
  	if ((fdo_flags & FDO_HOR) && KeyTyped && cap->oap->op_type == OP_NOP)
  	    foldOpenCursor();
--- 6327,6333 ----
***************
*** 6754,6760 ****
  	    int	    dir = (cap->cmdchar == ']' && cap->nchar == 'p')
  							 ? FORWARD : BACKWARD;
  	    int	    regname = cap->oap->regname;
- #ifdef FEAT_VISUAL
  	    int	    was_visual = VIsual_active;
  	    int	    line_count = curbuf->b_ml.ml_line_count;
  	    pos_T   start, end;
--- 6576,6581 ----
***************
*** 6766,6779 ****
  		end =  equalpos(start,VIsual) ? curwin->w_cursor : VIsual;
  		curwin->w_cursor = (dir == BACKWARD ? start : end);
  	    }
- #endif
  # ifdef FEAT_CLIPBOARD
  	    adjust_clip_reg(&regname);
  # endif
  	    prep_redo_cmd(cap);
  
  	    do_put(regname, dir, cap->count1, PUT_FIXINDENT);
- #ifdef FEAT_VISUAL
  	    if (was_visual)
  	    {
  		VIsual = start;
--- 6587,6598 ----
***************
*** 6802,6808 ****
  		    redraw_later(SOME_VALID);
  		}
  	    }
- #endif
  	}
      }
  
--- 6621,6626 ----
***************
*** 6936,6944 ****
  #ifdef FEAT_VIRTUALEDIT
  	    curwin->w_cursor.coladd = 0;
  #endif
- #ifdef FEAT_VISUAL
  	    adjust_for_sel(cap);
- #endif
  	}
      }
  #ifdef FEAT_FOLDING
--- 6754,6760 ----
***************
*** 7027,7037 ****
  nv_undo(cap)
      cmdarg_T	*cap;
  {
!     if (cap->oap->op_type == OP_LOWER
! #ifdef FEAT_VISUAL
! 	    || VIsual_active
! #endif
! 	    )
      {
  	/* translate "<Visual>u" to "<Visual>gu" and "guu" to "gugu" */
  	cap->cmdchar = 'g';
--- 6843,6849 ----
  nv_undo(cap)
      cmdarg_T	*cap;
  {
!     if (cap->oap->op_type == OP_LOWER || VIsual_active)
      {
  	/* translate "<Visual>u" to "<Visual>gu" and "guu" to "gugu" */
  	cap->cmdchar = 'g';
***************
*** 7089,7095 ****
  	return;
      }
  
- #ifdef FEAT_VISUAL
      /* Visual mode "r" */
      if (VIsual_active)
      {
--- 6901,6906 ----
***************
*** 7105,7111 ****
  	nv_operator(cap);
  	return;
      }
- #endif
  
  #ifdef FEAT_VIRTUALEDIT
      /* Break tabs, etc. */
--- 6916,6921 ----
***************
*** 7273,7279 ****
      }
  }
  
- #ifdef FEAT_VISUAL
  /*
   * 'o': Exchange start and end of Visual area.
   * 'O': same, but in block mode exchange left and right corners.
--- 7083,7088 ----
***************
*** 7326,7332 ****
  	curwin->w_set_curswant = TRUE;
      }
  }
- #endif /* FEAT_VISUAL */
  
  /*
   * "R" (cap->arg is FALSE) and "gR" (cap->arg is TRUE).
--- 7135,7140 ----
***************
*** 7335,7341 ****
  nv_Replace(cap)
      cmdarg_T	    *cap;
  {
- #ifdef FEAT_VISUAL
      if (VIsual_active)		/* "R" is replace lines */
      {
  	cap->cmdchar = 'c';
--- 7143,7148 ----
***************
*** 7344,7352 ****
  	VIsual_mode = 'V';
  	nv_operator(cap);
      }
!     else
! #endif
! 	if (!checkclearopq(cap->oap))
      {
  	if (!curbuf->b_p_ma)
  	    EMSG(_(e_modifiable));
--- 7151,7157 ----
  	VIsual_mode = 'V';
  	nv_operator(cap);
      }
!     else if (!checkclearopq(cap->oap))
      {
  	if (!curbuf->b_p_ma)
  	    EMSG(_(e_modifiable));
***************
*** 7369,7384 ****
  nv_vreplace(cap)
      cmdarg_T	*cap;
  {
- # ifdef FEAT_VISUAL
      if (VIsual_active)
      {
  	cap->cmdchar = 'r';
  	cap->nchar = cap->extra_char;
  	nv_replace(cap);	/* Do same as "r" in Visual mode for now */
      }
!     else
! # endif
! 	if (!checkclearopq(cap->oap))
      {
  	if (!curbuf->b_p_ma)
  	    EMSG(_(e_modifiable));
--- 7174,7186 ----
  nv_vreplace(cap)
      cmdarg_T	*cap;
  {
      if (VIsual_active)
      {
  	cap->cmdchar = 'r';
  	cap->nchar = cap->extra_char;
  	nv_replace(cap);	/* Do same as "r" in Visual mode for now */
      }
!     else if (!checkclearopq(cap->oap))
      {
  	if (!curbuf->b_p_ma)
  	    EMSG(_(e_modifiable));
***************
*** 7525,7531 ****
      curwin->w_set_curswant = TRUE;
  }
  
- #ifdef FEAT_VISUAL
  /*
   * Handle commands that are operators in Visual mode.
   */
--- 7327,7332 ----
***************
*** 7550,7556 ****
      cap->cmdchar = *(vim_strchr(trans, cap->cmdchar) + 1);
      nv_operator(cap);
  }
- #endif
  
  /*
   * "s" and "S" commands.
--- 7351,7356 ----
***************
*** 7559,7565 ****
  nv_subst(cap)
      cmdarg_T	*cap;
  {
- #ifdef FEAT_VISUAL
      if (VIsual_active)	/* "vs" and "vS" are the same as "vc" */
      {
  	if (cap->cmdchar == 'S')
--- 7359,7364 ----
***************
*** 7571,7577 ****
  	nv_operator(cap);
      }
      else
- #endif
  	nv_optrans(cap);
  }
  
--- 7370,7375 ----
***************
*** 7585,7596 ****
      if (cap->cmdchar == K_DEL || cap->cmdchar == K_KDEL)
  	cap->cmdchar = 'x';		/* DEL key behaves like 'x' */
  
- #ifdef FEAT_VISUAL
      /* in Visual mode these commands are operators */
      if (VIsual_active)
  	v_visop(cap);
      else
- #endif
  	nv_optrans(cap);
  }
  
--- 7383,7392 ----
***************
*** 7758,7764 ****
  	clearopbeep(cap->oap);
  }
  
- #ifdef FEAT_VISUAL
  /*
   * Handle "v", "V" and "CTRL-V" commands.
   * Also for "gh", "gH" and "g^H" commands: Always start Select mode, cap->arg
--- 7554,7559 ----
***************
*** 7950,7956 ****
      }
  }
  
- #endif /* FEAT_VISUAL */
  
  /*
   * CTRL-W: Window commands
--- 7745,7750 ----
***************
*** 7975,7984 ****
      cmdarg_T	*cap;
  {
      clearop(cap->oap);
- #ifdef FEAT_VISUAL
      if (VIsual_active)
  	end_visual_mode();		/* stop Visual mode */
- #endif
      do_cmdline_cmd((char_u *)"st");
  }
  
--- 7769,7776 ----
***************
*** 7990,7998 ****
      cmdarg_T	*cap;
  {
      oparg_T	*oap = cap->oap;
- #ifdef FEAT_VISUAL
      pos_T	tpos;
- #endif
      int		i;
      int		flag = FALSE;
  
--- 7782,7788 ----
***************
*** 8025,8031 ****
  	do_cmdline_cmd((char_u *)"%s//~/&");
  	break;
  
- #ifdef FEAT_VISUAL
      /*
       * "gv": Reselect the previous Visual area.  If Visual already active,
       *	     exchange previous and current Visual area.
--- 7815,7820 ----
***************
*** 8126,8132 ****
  	cap->arg = TRUE;
  	nv_visual(cap);
  	break;
- #endif /* FEAT_VISUAL */
  
      /* "gn", "gN" visually select next/previous search match
       * "gn" selects next match
--- 7915,7920 ----
***************
*** 8134,8142 ****
       */
      case 'N':
      case 'n':
- #ifdef FEAT_VISUAL
  	if (!current_search(cap->count1, cap->nchar == 'n'))
- #endif
  	    clearopbeep(oap);
  	break;
  
--- 7922,7928 ----
***************
*** 8258,8266 ****
  				    && vim_iswhite(ptr[curwin->w_cursor.col]))
  		--curwin->w_cursor.col;
  	    curwin->w_set_curswant = TRUE;
- #ifdef FEAT_VISUAL
  	    adjust_for_sel(cap);
- #endif
  	}
  	break;
  
--- 8044,8050 ----
***************
*** 8657,8667 ****
      cmdarg_T	*cap;
  {
      /* In Visual mode and typing "gUU" triggers an operator */
!     if (cap->oap->op_type == OP_UPPER
! #ifdef FEAT_VISUAL
! 	    || VIsual_active
! #endif
! 	    )
      {
  	/* translate "gUU" to "gUgU" */
  	cap->cmdchar = 'g';
--- 8441,8447 ----
      cmdarg_T	*cap;
  {
      /* In Visual mode and typing "gUU" triggers an operator */
!     if (cap->oap->op_type == OP_UPPER || VIsual_active)
      {
  	/* translate "gUU" to "gUgU" */
  	cap->cmdchar = 'g';
***************
*** 8683,8693 ****
  nv_tilde(cap)
      cmdarg_T	*cap;
  {
!     if (!p_to
! #ifdef FEAT_VISUAL
! 	    && !VIsual_active
! #endif
! 	    && cap->oap->op_type != OP_TILDE)
  	n_swapchar(cap);
      else
  	nv_operator(cap);
--- 8463,8469 ----
  nv_tilde(cap)
      cmdarg_T	*cap;
  {
!     if (!p_to && !VIsual_active && cap->oap->op_type != OP_TILDE)
  	n_swapchar(cap);
      else
  	nv_operator(cap);
***************
*** 8906,8914 ****
  	clearopbeep(cap->oap);
      else
      {
- #ifdef FEAT_VISUAL
  	adjust_for_sel(cap);
- #endif
  #ifdef FEAT_FOLDING
  	if ((fdo_flags & FDO_HOR) && KeyTyped && cap->oap->op_type == OP_NOP)
  	    foldOpenCursor();
--- 8682,8688 ----
***************
*** 8931,8939 ****
       * - 'virtualedit' is not "all" and not "onemore".
       */
      if (curwin->w_cursor.col > 0 && gchar_cursor() == NUL
- #ifdef FEAT_VISUAL
  		&& (!VIsual_active || *p_sel == 'o')
- #endif
  #ifdef FEAT_VIRTUALEDIT
  		&& !virtual_active() && (ve_flags & VE_ONEMORE) == 0
  #endif
--- 8705,8711 ----
***************
*** 8968,8974 ****
  			       one-character line). */
  }
  
- #ifdef FEAT_VISUAL
  /*
   * In exclusive Visual mode, may include the last character.
   */
--- 8740,8745 ----
***************
*** 8979,8989 ****
      if (VIsual_active && cap->oap->inclusive && *p_sel == 'e'
  	    && gchar_cursor() != NUL && lt(VIsual, curwin->w_cursor))
      {
! # ifdef FEAT_MBYTE
  	if (has_mbyte)
  	    inc_cursor();
  	else
! # endif
  	    ++curwin->w_cursor.col;
  	cap->oap->inclusive = FALSE;
      }
--- 8750,8760 ----
      if (VIsual_active && cap->oap->inclusive && *p_sel == 'e'
  	    && gchar_cursor() != NUL && lt(VIsual, curwin->w_cursor))
      {
! #ifdef FEAT_MBYTE
  	if (has_mbyte)
  	    inc_cursor();
  	else
! #endif
  	    ++curwin->w_cursor.col;
  	cap->oap->inclusive = FALSE;
      }
***************
*** 9044,9050 ****
      }
  }
  
- #endif
  
  /*
   * "G", "gg", CTRL-END, CTRL-HOME.
--- 8815,8820 ----
***************
*** 9095,9107 ****
  	if (cmdwin_type != 0)
  	    cmdwin_result = Ctrl_C;
  #endif
- #ifdef FEAT_VISUAL
  	if (VIsual_active)
  	{
  	    end_visual_mode();		/* stop Visual */
  	    redraw_curbuf_later(INVERTED);
  	}
- #endif
  	/* CTRL-\ CTRL-G restarts Insert mode when 'insertmode' is set. */
  	if (cap->nchar == Ctrl_G && p_im)
  	    restart_edit = 'a';
--- 8865,8875 ----
***************
*** 9132,9140 ****
  #ifdef FEAT_CMDWIN
  		&& cmdwin_type == 0
  #endif
- #ifdef FEAT_VISUAL
  		&& !VIsual_active
- #endif
  		&& no_reason)
  	    MSG(_("Type  :quit<Enter>  to exit Vim"));
  
--- 8900,8906 ----
***************
*** 9152,9158 ****
  #endif
      }
  
- #ifdef FEAT_VISUAL
      if (VIsual_active)
      {
  	end_visual_mode();	/* stop Visual */
--- 8918,8923 ----
***************
*** 9160,9169 ****
  	curwin->w_set_curswant = TRUE;
  	redraw_curbuf_later(INVERTED);
      }
!     else
! #endif
! 	if (no_reason)
! 	    vim_beep();
      clearop(cap->oap);
  
      /* A CTRL-C is often used at the start of a menu.  When 'insertmode' is
--- 8925,8932 ----
  	curwin->w_set_curswant = TRUE;
  	redraw_curbuf_later(INVERTED);
      }
!     else if (no_reason)
! 	vim_beep();
      clearop(cap->oap);
  
      /* A CTRL-C is often used at the start of a menu.  When 'insertmode' is
***************
*** 9187,9206 ****
      if (cap->cmdchar == K_INS || cap->cmdchar == K_KINS)
  	cap->cmdchar = 'i';
  
- #ifdef FEAT_VISUAL
      /* in Visual mode "A" and "I" are an operator */
      if (VIsual_active && (cap->cmdchar == 'A' || cap->cmdchar == 'I'))
  	v_visop(cap);
  
      /* in Visual mode and after an operator "a" and "i" are for text objects */
!     else
! #endif
! 	if ((cap->cmdchar == 'a' || cap->cmdchar == 'i')
! 	    && (cap->oap->op_type != OP_NOP
! #ifdef FEAT_VISUAL
! 		|| VIsual_active
! #endif
! 		))
      {
  #ifdef FEAT_TEXTOBJ
  	nv_object(cap);
--- 8950,8962 ----
      if (cap->cmdchar == K_INS || cap->cmdchar == K_KINS)
  	cap->cmdchar = 'i';
  
      /* in Visual mode "A" and "I" are an operator */
      if (VIsual_active && (cap->cmdchar == 'A' || cap->cmdchar == 'I'))
  	v_visop(cap);
  
      /* in Visual mode and after an operator "a" and "i" are for text objects */
!     else if ((cap->cmdchar == 'a' || cap->cmdchar == 'i')
! 	    && (cap->oap->op_type != OP_NOP || VIsual_active))
      {
  #ifdef FEAT_TEXTOBJ
  	nv_object(cap);
***************
*** 9467,9478 ****
  nv_join(cap)
      cmdarg_T *cap;
  {
- #ifdef FEAT_VISUAL
      if (VIsual_active)	/* join the visual lines */
  	nv_operator(cap);
!     else
! #endif
! 	if (!checkclearop(cap->oap))
      {
  	if (cap->count0 <= 1)
  	    cap->count0 = 2;	    /* default for join is two lines! */
--- 9223,9231 ----
  nv_join(cap)
      cmdarg_T *cap;
  {
      if (VIsual_active)	/* join the visual lines */
  	nv_operator(cap);
!     else if (!checkclearop(cap->oap))
      {
  	if (cap->count0 <= 1)
  	    cap->count0 = 2;	    /* default for join is two lines! */
***************
*** 9495,9506 ****
  nv_put(cap)
      cmdarg_T  *cap;
  {
- #ifdef FEAT_VISUAL
      int		regname = 0;
      void	*reg1 = NULL, *reg2 = NULL;
      int		empty = FALSE;
      int		was_visual = FALSE;
- #endif
      int		dir;
      int		flags = 0;
  
--- 9248,9257 ----
***************
*** 9526,9532 ****
  	if (cap->cmdchar == 'g')
  	    flags |= PUT_CURSEND;
  
- #ifdef FEAT_VISUAL
  	if (VIsual_active)
  	{
  	    /* Putting in Visual mode: The put text replaces the selected
--- 9277,9282 ----
***************
*** 9536,9549 ****
  	     */
  	    was_visual = TRUE;
  	    regname = cap->oap->regname;
! # ifdef FEAT_CLIPBOARD
  	    adjust_clip_reg(&regname);
! # endif
  	   if (regname == 0 || regname == '"'
  				     || VIM_ISDIGIT(regname) || regname == '-'
! # ifdef FEAT_CLIPBOARD
  		    || (clip_unnamed && (regname == '*' || regname == '+'))
! # endif
  
  		    )
  	    {
--- 9286,9299 ----
  	     */
  	    was_visual = TRUE;
  	    regname = cap->oap->regname;
! #ifdef FEAT_CLIPBOARD
  	    adjust_clip_reg(&regname);
! #endif
  	   if (regname == 0 || regname == '"'
  				     || VIM_ISDIGIT(regname) || regname == '-'
! #ifdef FEAT_CLIPBOARD
  		    || (clip_unnamed && (regname == '*' || regname == '+'))
! #endif
  
  		    )
  	    {
***************
*** 9591,9600 ****
  	    /* May have been reset in do_put(). */
  	    VIsual_active = TRUE;
  	}
- #endif
  	do_put(cap->oap->regname, dir, cap->count1, flags);
  
- #ifdef FEAT_VISUAL
  	/* If a register was saved, put it back now. */
  	if (reg2 != NULL)
  	    put_register(regname, reg2);
--- 9341,9348 ----
***************
*** 9621,9627 ****
  		coladvance((colnr_T)MAXCOL);
  	    }
  	}
- #endif
  	auto_format(FALSE, TRUE);
      }
  }
--- 9369,9374 ----
***************
*** 9642,9652 ****
      }
      else
  #endif
- #ifdef FEAT_VISUAL
      if (VIsual_active)  /* switch start and end of visual */
  	v_swap_corners(cap->cmdchar);
      else
- #endif
  	n_opencmd(cap);
  }
  
--- 9389,9397 ----
*** ../vim-7.4.211/src/ops.c	2014-03-19 18:57:27.730175565 +0100
--- src/ops.c	2014-03-23 15:08:16.095260447 +0100
***************
*** 57,65 ****
      char_u	**y_array;	/* pointer to array of line pointers */
      linenr_T	y_size;		/* number of lines in y_array */
      char_u	y_type;		/* MLINE, MCHAR or MBLOCK */
- #ifdef FEAT_VISUAL
      colnr_T	y_width;	/* only set if y_type == MBLOCK */
- #endif
  } y_regs[NUM_REGISTERS];
  
  static struct yankreg	*y_current;	    /* ptr to current yankreg */
--- 57,63 ----
***************
*** 107,123 ****
  static int	yank_copy_line __ARGS((struct block_def *bd, long y_idx));
  #ifdef FEAT_CLIPBOARD
  static void	copy_yank_reg __ARGS((struct yankreg *reg));
- # if defined(FEAT_VISUAL) || defined(FEAT_EVAL)
  static void	may_set_selection __ARGS((void));
- # endif
  #endif
  static void	dis_msg __ARGS((char_u *p, int skip_esc));
  #if defined(FEAT_COMMENTS) || defined(PROTO)
  static char_u	*skip_comment __ARGS((char_u *line, int process, int include_space, int *is_comment));
  #endif
- #ifdef FEAT_VISUAL
  static void	block_prep __ARGS((oparg_T *oap, struct block_def *, linenr_T, int));
- #endif
  #if defined(FEAT_CLIPBOARD) || defined(FEAT_EVAL)
  static void	str_to_reg __ARGS((struct yankreg *y_ptr, int type, char_u *str, long len, long blocklen));
  #endif
--- 105,117 ----
***************
*** 187,193 ****
      return i;
  }
  
- #if defined(FEAT_VISUAL) || defined(PROTO)
  /*
   * Return TRUE if operator "op" always works on whole lines.
   */
--- 181,186 ----
***************
*** 197,203 ****
  {
      return opchars[op][2];
  }
- #endif
  
  /*
   * Get first operator command character.
--- 190,195 ----
***************
*** 232,249 ****
      long	    i;
      int		    first_char;
      char_u	    *s;
- #ifdef FEAT_VISUAL
      int		    block_col = 0;
- #endif
  
      if (u_save((linenr_T)(oap->start.lnum - 1),
  				       (linenr_T)(oap->end.lnum + 1)) == FAIL)
  	return;
  
- #ifdef FEAT_VISUAL
      if (oap->block_mode)
  	block_col = curwin->w_cursor.col;
- #endif
  
      for (i = oap->line_count; --i >= 0; )
      {
--- 224,237 ----
***************
*** 272,286 ****
      foldOpenCursor();
  #endif
  
- #ifdef FEAT_VISUAL
      if (oap->block_mode)
      {
  	curwin->w_cursor.lnum = oap->start.lnum;
  	curwin->w_cursor.col = block_col;
      }
!     else
! #endif
! 	if (curs_top)	    /* put cursor on first line, for ">>" */
      {
  	curwin->w_cursor.lnum = oap->start.lnum;
  	beginline(BL_SOL | BL_FIX);   /* shift_line() may have set cursor.col */
--- 260,271 ----
      foldOpenCursor();
  #endif
  
      if (oap->block_mode)
      {
  	curwin->w_cursor.lnum = oap->start.lnum;
  	curwin->w_cursor.col = block_col;
      }
!     else if (curs_top)	    /* put cursor on first line, for ">>" */
      {
  	curwin->w_cursor.lnum = oap->start.lnum;
  	beginline(BL_SOL | BL_FIX);   /* shift_line() may have set cursor.col */
***************
*** 733,746 ****
       * there is no change still need to remove the Visual highlighting. */
      if (last_changed != 0)
  	changed_lines(first_changed, 0,
- #ifdef FEAT_VISUAL
  		oap->is_VIsual ? start_lnum + oap->line_count :
- #endif
  		last_changed + 1, 0L);
- #ifdef FEAT_VISUAL
      else if (oap->is_VIsual)
  	redraw_curbuf_later(INVERTED);
- #endif
  
      if (oap->line_count > p_report)
      {
--- 718,727 ----
***************
*** 948,954 ****
  }
  #endif
  
- #if defined(FEAT_VISUAL) || defined(PROTO)
  /*
   * Obtain the contents of a "normal" register. The register is made empty.
   * The returned pointer has allocated memory, use put_register() later.
--- 929,934 ----
***************
*** 1016,1025 ****
      *y_current = *(struct yankreg *)reg;
      vim_free(reg);
  
! # ifdef FEAT_CLIPBOARD
      /* Send text written to clipboard register to the clipboard. */
      may_set_selection();
! # endif
  }
  
      void
--- 996,1005 ----
      *y_current = *(struct yankreg *)reg;
      vim_free(reg);
  
! #ifdef FEAT_CLIPBOARD
      /* Send text written to clipboard register to the clipboard. */
      may_set_selection();
! #endif
  }
  
      void
***************
*** 1034,1040 ****
      vim_free(reg);
      *y_current = tmp;
  }
- #endif
  
  #if defined(FEAT_MOUSE) || defined(PROTO)
  /*
--- 1014,1019 ----
***************
*** 1634,1643 ****
      int			n;
      linenr_T		lnum;
      char_u		*ptr;
- #ifdef FEAT_VISUAL
      char_u		*newp, *oldp;
      struct block_def	bd;
- #endif
      linenr_T		old_lcount = curbuf->b_ml.ml_line_count;
      int			did_yank = FALSE;
      int			orig_regname = oap->regname;
--- 1613,1620 ----
***************
*** 1670,1679 ****
       * delete linewise.  Don't do this for the change command or Visual mode.
       */
      if (       oap->motion_type == MCHAR
- #ifdef FEAT_VISUAL
  	    && !oap->is_VIsual
  	    && !oap->block_mode
- #endif
  	    && oap->line_count > 1
  	    && oap->motion_force == NUL
  	    && oap->op_type == OP_DELETE)
--- 1647,1654 ----
***************
*** 1787,1793 ****
  	}
      }
  
- #ifdef FEAT_VISUAL
      /*
       * block mode delete
       */
--- 1762,1767 ----
***************
*** 1838,1846 ****
  						       oap->end.lnum + 1, 0L);
  	oap->line_count = 0;	    /* no lines deleted */
      }
!     else
! #endif
! 	if (oap->motion_type == MLINE)
      {
  	if (oap->op_type == OP_CHANGE)
  	{
--- 1812,1818 ----
  						       oap->end.lnum + 1, 0L);
  	oap->line_count = 0;	    /* no lines deleted */
      }
!     else if (oap->motion_type == MLINE)
      {
  	if (oap->op_type == OP_CHANGE)
  	{
***************
*** 1924,1936 ****
  		return FAIL;
  
  	    /* if 'cpoptions' contains '$', display '$' at end of change */
! 	    if (	   vim_strchr(p_cpo, CPO_DOLLAR) != NULL
  		    && oap->op_type == OP_CHANGE
  		    && oap->end.lnum == curwin->w_cursor.lnum
! #ifdef FEAT_VISUAL
! 		    && !oap->is_VIsual
! #endif
! 		    )
  		display_dollar(oap->end.col - !oap->inclusive);
  
  	    n = oap->end.col - oap->start.col + 1 - !oap->inclusive;
--- 1896,1905 ----
  		return FAIL;
  
  	    /* if 'cpoptions' contains '$', display '$' at end of change */
! 	    if (       vim_strchr(p_cpo, CPO_DOLLAR) != NULL
  		    && oap->op_type == OP_CHANGE
  		    && oap->end.lnum == curwin->w_cursor.lnum
! 		    && !oap->is_VIsual)
  		display_dollar(oap->end.col - !oap->inclusive);
  
  	    n = oap->end.col - oap->start.col + 1 - !oap->inclusive;
***************
*** 1967,1977 ****
  	    }
  	    else
  	    {
! 		(void)del_bytes((long)n, !virtual_op, oap->op_type == OP_DELETE
! #ifdef FEAT_VISUAL
! 				    && !oap->is_VIsual
! #endif
! 							);
  	    }
  	}
  	else				/* delete characters between lines */
--- 1936,1943 ----
  	    }
  	    else
  	    {
! 		(void)del_bytes((long)n, !virtual_op,
! 				oap->op_type == OP_DELETE && !oap->is_VIsual);
  	    }
  	}
  	else				/* delete characters between lines */
***************
*** 2008,2018 ****
  	    {
  		/* delete from start of line until op_end */
  		curwin->w_cursor.col = 0;
! 		(void)del_bytes((long)n, !virtual_op, oap->op_type == OP_DELETE
! #ifdef FEAT_VISUAL
! 					&& !oap->is_VIsual
! #endif
! 							    );
  		curwin->w_cursor = curpos;	/* restore curwin->w_cursor */
  	    }
  	    if (curwin->w_cursor.lnum < curbuf->b_ml.ml_line_count)
--- 1974,1981 ----
  	    {
  		/* delete from start of line until op_end */
  		curwin->w_cursor.col = 0;
! 		(void)del_bytes((long)n, !virtual_op,
! 				oap->op_type == OP_DELETE && !oap->is_VIsual);
  		curwin->w_cursor = curpos;	/* restore curwin->w_cursor */
  	    }
  	    if (curwin->w_cursor.lnum < curbuf->b_ml.ml_line_count)
***************
*** 2025,2038 ****
  #ifdef FEAT_VIRTUALEDIT
  setmarks:
  #endif
- #ifdef FEAT_VISUAL
      if (oap->block_mode)
      {
  	curbuf->b_op_end.lnum = oap->end.lnum;
  	curbuf->b_op_end.col = oap->start.col;
      }
      else
- #endif
  	curbuf->b_op_end = oap->start;
      curbuf->b_op_start = oap->start;
  
--- 1988,1999 ----
***************
*** 2318,2326 ****
      oparg_T	*oap;
  {
      pos_T		pos;
- #ifdef FEAT_VISUAL
      struct block_def	bd;
- #endif
      int			did_change = FALSE;
  
      if (u_save((linenr_T)(oap->start.lnum - 1),
--- 2279,2285 ----
***************
*** 2328,2334 ****
  	return;
  
      pos = oap->start;
- #ifdef FEAT_VISUAL
      if (oap->block_mode)		    /* Visual block mode */
      {
  	for (; pos.lnum <= oap->end.lnum; ++pos.lnum)
--- 2287,2292 ----
***************
*** 2340,2346 ****
  	    one_change = swapchars(oap->op_type, &pos, bd.textlen);
  	    did_change |= one_change;
  
! # ifdef FEAT_NETBEANS_INTG
  	    if (netbeans_active() && one_change)
  	    {
  		char_u *ptr = ml_get_buf(curbuf, pos.lnum, FALSE);
--- 2298,2304 ----
  	    one_change = swapchars(oap->op_type, &pos, bd.textlen);
  	    did_change |= one_change;
  
! #ifdef FEAT_NETBEANS_INTG
  	    if (netbeans_active() && one_change)
  	    {
  		char_u *ptr = ml_get_buf(curbuf, pos.lnum, FALSE);
***************
*** 2350,2362 ****
  		netbeans_inserted(curbuf, pos.lnum, bd.textcol,
  						&ptr[bd.textcol], bd.textlen);
  	    }
! # endif
  	}
  	if (did_change)
  	    changed_lines(oap->start.lnum, 0, oap->end.lnum + 1, 0L);
      }
      else				    /* not block mode */
- #endif
      {
  	if (oap->motion_type == MLINE)
  	{
--- 2308,2319 ----
  		netbeans_inserted(curbuf, pos.lnum, bd.textcol,
  						&ptr[bd.textcol], bd.textlen);
  	    }
! #endif
  	}
  	if (did_change)
  	    changed_lines(oap->start.lnum, 0, oap->end.lnum + 1, 0L);
      }
      else				    /* not block mode */
      {
  	if (oap->motion_type == MLINE)
  	{
***************
*** 2412,2422 ****
  	}
      }
  
- #ifdef FEAT_VISUAL
      if (!did_change && oap->is_VIsual)
  	/* No change: need to remove the Visual selection */
  	redraw_curbuf_later(INVERTED);
- #endif
  
      /*
       * Set '[ and '] marks.
--- 2369,2377 ----
***************
*** 3018,3027 ****
      if (       oap->motion_type == MCHAR
  	    && oap->start.col == 0
  	    && !oap->inclusive
- #ifdef FEAT_VISUAL
  	    && (!oap->is_VIsual || *p_sel == 'o')
  	    && !oap->block_mode
- #endif
  	    && oap->end.col == 0
  	    && yanklines > 1)
      {
--- 2973,2980 ----
***************
*** 3032,3040 ****
  
      y_current->y_size = yanklines;
      y_current->y_type = yanktype;   /* set the yank register type */
- #ifdef FEAT_VISUAL
      y_current->y_width = 0;
- #endif
      y_current->y_array = (char_u **)lalloc_clear((long_u)(sizeof(char_u *) *
  							    yanklines), TRUE);
  
--- 2985,2991 ----
***************
*** 3047,3053 ****
      y_idx = 0;
      lnum = oap->start.lnum;
  
- #ifdef FEAT_VISUAL
      if (oap->block_mode)
      {
  	/* Visual block mode */
--- 2998,3003 ----
***************
*** 3057,3075 ****
  	if (curwin->w_curswant == MAXCOL && y_current->y_width > 0)
  	    y_current->y_width--;
      }
- #endif
  
      for ( ; lnum <= yankendlnum; lnum++, y_idx++)
      {
  	switch (y_current->y_type)
  	{
- #ifdef FEAT_VISUAL
  	    case MBLOCK:
  		block_prep(oap, &bd, lnum, FALSE);
  		if (yank_copy_line(&bd, y_idx) == FAIL)
  		    goto fail;
  		break;
- #endif
  
  	    case MLINE:
  		if ((y_current->y_array[y_idx] =
--- 3007,3022 ----
***************
*** 3206,3214 ****
      if (mess)			/* Display message about yank? */
      {
  	if (yanktype == MCHAR
- #ifdef FEAT_VISUAL
  		&& !oap->block_mode
- #endif
  		&& yanklines == 1)
  	    yanklines = 0;
  	/* Some versions of Vi use ">=" here, some don't...  */
--- 3153,3159 ----
***************
*** 3218,3234 ****
  	    update_topline_redraw();
  	    if (yanklines == 1)
  	    {
- #ifdef FEAT_VISUAL
  		if (oap->block_mode)
  		    MSG(_("block of 1 line yanked"));
  		else
- #endif
  		    MSG(_("1 line yanked"));
  	    }
- #ifdef FEAT_VISUAL
  	    else if (oap->block_mode)
  		smsg((char_u *)_("block of %ld lines yanked"), yanklines);
- #endif
  	    else
  		smsg((char_u *)_("%ld lines yanked"), yanklines);
  	}
--- 3163,3175 ----
***************
*** 3239,3249 ****
       */
      curbuf->b_op_start = oap->start;
      curbuf->b_op_end = oap->end;
!     if (yanktype == MLINE
! #ifdef FEAT_VISUAL
! 		&& !oap->block_mode
! #endif
!        )
      {
  	curbuf->b_op_start.col = 0;
  	curbuf->b_op_end.col = MAXCOL;
--- 3180,3186 ----
       */
      curbuf->b_op_start = oap->start;
      curbuf->b_op_end = oap->end;
!     if (yanktype == MLINE && !oap->block_mode)
      {
  	curbuf->b_op_start.col = 0;
  	curbuf->b_op_end.col = MAXCOL;
***************
*** 3380,3386 ****
      long	i;			/* index in y_array[] */
      int		y_type;
      long	y_size;
- #ifdef FEAT_VISUAL
      int		oldlen;
      long	y_width = 0;
      colnr_T	vcol;
--- 3317,3322 ----
***************
*** 3388,3394 ****
      int		incr = 0;
      long	j;
      struct block_def bd;
- #endif
      char_u	**y_array = NULL;
      long	nr_lines = 0;
      pos_T	new_cursor;
--- 3324,3329 ----
***************
*** 3497,3510 ****
  	get_yank_register(regname, FALSE);
  
  	y_type = y_current->y_type;
- #ifdef FEAT_VISUAL
  	y_width = y_current->y_width;
- #endif
  	y_size = y_current->y_size;
  	y_array = y_current->y_array;
      }
  
- #ifdef FEAT_VISUAL
      if (y_type == MLINE)
      {
  	if (flags & PUT_LINE_SPLIT)
--- 3432,3442 ----
***************
*** 3535,3541 ****
  	curbuf->b_op_start = curwin->w_cursor;	/* default for '[ mark */
  	curbuf->b_op_end = curwin->w_cursor;	/* default for '] mark */
      }
- #endif
  
      if (flags & PUT_LINE)	/* :put command or "p" in Visual line mode. */
  	y_type = MLINE;
--- 3467,3472 ----
***************
*** 3547,3553 ****
  	goto end;
      }
  
- #ifdef FEAT_VISUAL
      if (y_type == MBLOCK)
      {
  	lnum = curwin->w_cursor.lnum + y_size + 1;
--- 3478,3483 ----
***************
*** 3556,3564 ****
  	if (u_save(curwin->w_cursor.lnum - 1, lnum) == FAIL)
  	    goto end;
      }
!     else
! #endif
! 	if (y_type == MLINE)
      {
  	lnum = curwin->w_cursor.lnum;
  #ifdef FEAT_FOLDING
--- 3486,3492 ----
  	if (u_save(curwin->w_cursor.lnum - 1, lnum) == FAIL)
  	    goto end;
      }
!     else if (y_type == MLINE)
      {
  	lnum = curwin->w_cursor.lnum;
  #ifdef FEAT_FOLDING
***************
*** 3610,3616 ****
      lnum = curwin->w_cursor.lnum;
      col = curwin->w_cursor.col;
  
- #ifdef FEAT_VISUAL
      /*
       * Block mode
       */
--- 3538,3543 ----
***************
*** 3792,3798 ****
  	    curwin->w_cursor.lnum = lnum;
      }
      else
- #endif
      {
  	/*
  	 * Character or Line mode
--- 3719,3724 ----
***************
*** 3866,3882 ****
  			curwin->w_cursor.col += (colnr_T)(totlen - 1);
  		    }
  		}
- #ifdef FEAT_VISUAL
  		if (VIsual_active)
  		    lnum++;
! #endif
! 	    } while (
! #ifdef FEAT_VISUAL
! 		    VIsual_active && lnum <= curbuf->b_visual.vi_end.lnum
! #else
! 		    FALSE /* stop after 1 paste */
! #endif
! 		    );
  
  	    curbuf->b_op_end = curwin->w_cursor;
  	    /* For "CTRL-O p" in Insert mode, put cursor after last char */
--- 3792,3800 ----
  			curwin->w_cursor.col += (colnr_T)(totlen - 1);
  		    }
  		}
  		if (VIsual_active)
  		    lnum++;
! 	    } while (VIsual_active && lnum <= curbuf->b_visual.vi_end.lnum);
  
  	    curbuf->b_op_end = curwin->w_cursor;
  	    /* For "CTRL-O p" in Insert mode, put cursor after last char */
***************
*** 4038,4046 ****
      if (regname == '=')
  	vim_free(y_array);
  
- #ifdef FEAT_VISUAL
      VIsual_active = FALSE;
- #endif
  
      /* If the cursor is past the end of the line put it at the end. */
      adjust_cursor_eol();
--- 3956,3962 ----
***************
*** 4729,4739 ****
  	return;
      curwin->w_cursor = oap->start;
  
- #ifdef FEAT_VISUAL
      if (oap->is_VIsual)
  	/* When there is no change: need to remove the Visual selection */
  	redraw_curbuf_later(INVERTED);
- #endif
  
      /* Set '[ mark at the start of the formatted area */
      curbuf->b_op_start = oap->start;
--- 4645,4653 ----
***************
*** 4765,4771 ****
  	saved_cursor.lnum = 0;
      }
  
- #ifdef FEAT_VISUAL
      if (oap->is_VIsual)
      {
  	win_T	*wp;
--- 4679,4684 ----
***************
*** 4783,4789 ****
  	    }
  	}
      }
- #endif
  }
  
  #if defined(FEAT_EVAL) || defined(PROTO)
--- 4696,4701 ----
***************
*** 4794,4804 ****
  op_formatexpr(oap)
      oparg_T	*oap;
  {
- # ifdef FEAT_VISUAL
      if (oap->is_VIsual)
  	/* When there is no change: need to remove the Visual selection */
  	redraw_curbuf_later(INVERTED);
- # endif
  
      if (fex_format(oap->start.lnum, oap->line_count, NUL) != 0)
  	/* As documented: when 'formatexpr' returns non-zero fall back to
--- 4706,4714 ----
***************
*** 5238,5244 ****
      return FALSE;
  }
  
- #ifdef FEAT_VISUAL
  /*
   * prepare a few things for block mode yank/delete/tilde
   *
--- 5148,5153 ----
***************
*** 5397,5403 ****
      bdp->textcol = (colnr_T) (pstart - line);
      bdp->textstart = pstart;
  }
- #endif /* FEAT_VISUAL */
  
  #ifdef FEAT_RIGHTLEFT
  static void reverse_line __ARGS((char_u *s));
--- 5306,5311 ----
***************
*** 5748,5766 ****
  	str = skipwhite(skiptowhite(str));
  	if (STRNCMP(str, "CHAR", 4) == 0)
  	    y_current->y_type = MCHAR;
- #ifdef FEAT_VISUAL
  	else if (STRNCMP(str, "BLOCK", 5) == 0)
  	    y_current->y_type = MBLOCK;
- #endif
  	else
  	    y_current->y_type = MLINE;
  	/* get the block width; if it's missing we get a zero, which is OK */
  	str = skipwhite(skiptowhite(str));
- #ifdef FEAT_VISUAL
  	y_current->y_width = getdigits(&str);
- #else
- 	(void)getdigits(&str);
- #endif
      }
  
      while (!(eof = viminfo_readline(virp))
--- 5656,5668 ----
***************
*** 5868,5878 ****
  	    case MCHAR:
  		type = (char_u *)"CHAR";
  		break;
- #ifdef FEAT_VISUAL
  	    case MBLOCK:
  		type = (char_u *)"BLOCK";
  		break;
- #endif
  	    default:
  		sprintf((char *)IObuff, _("E574: Unknown register type %d"),
  							    y_regs[i].y_type);
--- 5770,5778 ----
***************
*** 5886,5898 ****
  	fprintf(fp, "\"%c", c);
  	if (c == execreg_lastc)
  	    fprintf(fp, "@");
! 	fprintf(fp, "\t%s\t%d\n", type,
! #ifdef FEAT_VISUAL
! 		    (int)y_regs[i].y_width
! #else
! 		    0
! #endif
! 		    );
  
  	/* If max_num_lines < 0, then we save ALL the lines in the register */
  	if (max_num_lines > 0 && num_lines > max_num_lines)
--- 5786,5792 ----
  	fprintf(fp, "\"%c", c);
  	if (c == execreg_lastc)
  	    fprintf(fp, "@");
! 	fprintf(fp, "\t%s\t%d\n", type, (int)y_regs[i].y_width);
  
  	/* If max_num_lines < 0, then we save ALL the lines in the register */
  	if (max_num_lines > 0 && num_lines > max_num_lines)
***************
*** 6039,6048 ****
  {
      struct yankreg *old_y_previous, *old_y_current;
      pos_T	old_cursor;
- #ifdef FEAT_VISUAL
      pos_T	old_visual;
      int		old_visual_mode;
- #endif
      colnr_T	old_curswant;
      int		old_set_curswant;
      pos_T	old_op_start, old_op_end;
--- 5933,5940 ----
***************
*** 6063,6072 ****
  	old_set_curswant = curwin->w_set_curswant;
  	old_op_start = curbuf->b_op_start;
  	old_op_end = curbuf->b_op_end;
- #ifdef FEAT_VISUAL
  	old_visual = VIsual;
  	old_visual_mode = VIsual_mode;
- #endif
  	clear_oparg(&oa);
  	oa.regname = (cbd == &clip_plus ? '+' : '*');
  	oa.op_type = OP_YANK;
--- 5955,5962 ----
***************
*** 6084,6093 ****
  	curwin->w_set_curswant = old_set_curswant;
  	curbuf->b_op_start = old_op_start;
  	curbuf->b_op_end = old_op_end;
- #ifdef FEAT_VISUAL
  	VIsual = old_visual;
  	VIsual_mode = old_visual_mode;
- #endif
      }
      else
      {
--- 5974,5981 ----
***************
*** 6190,6196 ****
  }
  
  
- # if defined(FEAT_VISUAL) || defined(FEAT_EVAL)
  /*
   * If we have written to a clipboard register, send the text to the clipboard.
   */
--- 6078,6083 ----
***************
*** 6208,6214 ****
  	clip_gen_set_selection(&clip_plus);
      }
  }
- # endif
  
  #endif /* FEAT_CLIPBOARD || PROTO */
  
--- 6095,6100 ----
***************
*** 6273,6282 ****
  
      if (y_current->y_array != NULL)
      {
- #ifdef FEAT_VISUAL
  	if (reglen != NULL && y_current->y_type == MBLOCK)
  	    *reglen = y_current->y_width;
- #endif
  	return y_current->y_type;
      }
      return MAUTO;
--- 6159,6166 ----
***************
*** 6454,6464 ****
      get_yank_register(name, TRUE);
      if (!y_append && !must_append)
  	free_yank_all();
- #ifndef FEAT_VISUAL
-     /* Just in case - make sure we don't use MBLOCK */
-     if (yank_type == MBLOCK)
- 	yank_type = MAUTO;
- #endif
      str_to_reg(y_current, yank_type, str, len, block_len);
  
  # ifdef FEAT_CLIPBOARD
--- 6338,6343 ----
***************
*** 6496,6504 ****
      int		append = FALSE;		/* append to last line in register */
      char_u	*s;
      char_u	**pp;
- #ifdef FEAT_VISUAL
      long	maxlen;
- #endif
  
      if (y_ptr->y_array == NULL)		/* NULL means empty register */
  	y_ptr->y_size = 0;
--- 6375,6381 ----
***************
*** 6539,6547 ****
  	pp[lnum] = y_ptr->y_array[lnum];
      vim_free(y_ptr->y_array);
      y_ptr->y_array = pp;
- #ifdef FEAT_VISUAL
      maxlen = 0;
- #endif
  
      /*
       * Find the end of each line and save it into the array.
--- 6416,6422 ----
***************
*** 6552,6561 ****
  	    if (str[i] == '\n')
  		break;
  	i -= start;			/* i is now length of line */
- #ifdef FEAT_VISUAL
  	if (i > maxlen)
  	    maxlen = i;
- #endif
  	if (append)
  	{
  	    --lnum;
--- 6427,6434 ----
***************
*** 6585,6596 ****
      }
      y_ptr->y_type = type;
      y_ptr->y_size = lnum;
- # ifdef FEAT_VISUAL
      if (type == MBLOCK)
  	y_ptr->y_width = (blocklen < 0 ? maxlen - 1 : blocklen);
      else
  	y_ptr->y_width = 0;
- # endif
  }
  #endif /* FEAT_CLIPBOARD || FEAT_EVAL || PROTO */
  
--- 6458,6467 ----
***************
*** 6684,6695 ****
      long	word_count_cursor = 0;
      int		eol_size;
      long	last_check = 100000L;
- #ifdef FEAT_VISUAL
      long	line_count_selected = 0;
      pos_T	min_pos, max_pos;
      oparg_T	oparg;
      struct block_def	bd;
- #endif
  
      /*
       * Compute the length of the file in characters.
--- 6555,6564 ----
***************
*** 6705,6711 ****
  	else
  	    eol_size = 1;
  
- #ifdef FEAT_VISUAL
  	if (VIsual_active)
  	{
  	    if (lt(VIsual, curwin->w_cursor))
--- 6574,6579 ----
***************
*** 6749,6755 ****
  	    }
  	    line_count_selected = max_pos.lnum - min_pos.lnum + 1;
  	}
- #endif
  
  	for (lnum = 1; lnum <= curbuf->b_ml.ml_line_count; ++lnum)
  	{
--- 6617,6622 ----
***************
*** 6762,6768 ****
  		last_check = byte_count + 100000L;
  	    }
  
- #ifdef FEAT_VISUAL
  	    /* Do extra processing for VIsual mode. */
  	    if (VIsual_active
  		    && lnum >= min_pos.lnum && lnum <= max_pos.lnum)
--- 6629,6634 ----
***************
*** 6773,6785 ****
  		switch (VIsual_mode)
  		{
  		    case Ctrl_V:
! # ifdef FEAT_VIRTUALEDIT
  			virtual_op = virtual_active();
! # endif
  			block_prep(&oparg, &bd, lnum, 0);
! # ifdef FEAT_VIRTUALEDIT
  			virtual_op = MAYBE;
! # endif
  			s = bd.textstart;
  			len = (long)bd.textlen;
  			break;
--- 6639,6651 ----
  		switch (VIsual_mode)
  		{
  		    case Ctrl_V:
! #ifdef FEAT_VIRTUALEDIT
  			virtual_op = virtual_active();
! #endif
  			block_prep(&oparg, &bd, lnum, 0);
! #ifdef FEAT_VIRTUALEDIT
  			virtual_op = MAYBE;
! #endif
  			s = bd.textstart;
  			len = (long)bd.textlen;
  			break;
***************
*** 6811,6817 ****
  		}
  	    }
  	    else
- #endif
  	    {
  		/* In non-visual mode, check for the line the cursor is on */
  		if (lnum == curwin->w_cursor.lnum)
--- 6677,6682 ----
***************
*** 6833,6839 ****
  	if (!curbuf->b_p_eol && curbuf->b_p_bin)
  	    byte_count -= eol_size;
  
- #ifdef FEAT_VISUAL
  	if (VIsual_active)
  	{
  	    if (VIsual_mode == Ctrl_V && curwin->w_curswant < MAXCOL)
--- 6698,6703 ----
***************
*** 6864,6870 ****
  			byte_count_cursor, byte_count);
  	}
  	else
- #endif
  	{
  	    p = ml_get_curline();
  	    validate_virtcol();
--- 6728,6733 ----
*** ../vim-7.4.211/src/option.c	2014-03-12 18:55:52.100906804 +0100
--- src/option.c	2014-03-23 13:28:12.359168452 +0100
***************
*** 1629,1639 ****
  #endif
  			    SCRIPTID_INIT},
      {"keymodel",    "km",   P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
- #ifdef FEAT_VISUAL
  			    (char_u *)&p_km, PV_NONE,
- #else
- 			    (char_u *)NULL, PV_NONE,
- #endif
  			    {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
      {"keywordprg",  "kp",   P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
  			    (char_u *)&p_kp, PV_KP,
--- 1629,1635 ----
***************
*** 2190,2208 ****
  			    (char_u *)&p_secure, PV_NONE,
  			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
      {"selection",   "sel",  P_STRING|P_VI_DEF,
- #ifdef FEAT_VISUAL
  			    (char_u *)&p_sel, PV_NONE,
- #else
- 			    (char_u *)NULL, PV_NONE,
- #endif
  			    {(char_u *)"inclusive", (char_u *)0L}
  			    SCRIPTID_INIT},
      {"selectmode",  "slm",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
- #ifdef FEAT_VISUAL
  			    (char_u *)&p_slm, PV_NONE,
- #else
- 			    (char_u *)NULL, PV_NONE,
- #endif
  			    {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
      {"sessionoptions", "ssop", P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
  #ifdef FEAT_SESSION
--- 2186,2196 ----
***************
*** 2979,2991 ****
  static char *(p_wak_values[]) = {"yes", "menu", "no", NULL};
  #endif
  static char *(p_mousem_values[]) = {"extend", "popup", "popup_setpos", "mac", NULL};
- #ifdef FEAT_VISUAL
  static char *(p_sel_values[]) = {"inclusive", "exclusive", "old", NULL};
  static char *(p_slm_values[]) = {"mouse", "key", "cmd", NULL};
- #endif
- #ifdef FEAT_VISUAL
  static char *(p_km_values[]) = {"startsel", "stopsel", NULL};
- #endif
  #ifdef FEAT_BROWSE
  static char *(p_bsdir_values[]) = {"current", "last", "buffer", NULL};
  #endif
--- 2967,2975 ----
***************
*** 6578,6584 ****
      }
  #endif
  
- #ifdef FEAT_VISUAL
      /* 'selection' */
      else if (varp == &p_sel)
      {
--- 6562,6567 ----
***************
*** 6593,6599 ****
  	if (check_opt_strings(p_slm, p_slm_values, TRUE) != OK)
  	    errmsg = e_invarg;
      }
- #endif
  
  #ifdef FEAT_BROWSE
      /* 'browsedir' */
--- 6576,6581 ----
***************
*** 6605,6611 ****
      }
  #endif
  
- #ifdef FEAT_VISUAL
      /* 'keymodel' */
      else if (varp == &p_km)
      {
--- 6587,6592 ----
***************
*** 6617,6623 ****
  	    km_startsel = (vim_strchr(p_km, 'a') != NULL);
  	}
      }
- #endif
  
      /* 'mousemodel' */
      else if (varp == &p_mousem)
--- 6598,6603 ----
*** ../vim-7.4.211/src/os_msdos.c	2013-05-06 04:06:04.000000000 +0200
--- src/os_msdos.c	2014-03-23 13:28:24.855168644 +0100
***************
*** 2270,2278 ****
  		default:
  		case 'L':	type = MLINE;	break;
  		case 'C':	type = MCHAR;	break;
- #ifdef FEAT_VISUAL
  		case 'B':	type = MBLOCK;	break;
- #endif
  	    }
  	}
  
--- 2270,2276 ----
***************
*** 2799,2807 ****
  	    default:
  	    case MLINE:	    clip_sel_type = "L";	break;
  	    case MCHAR:	    clip_sel_type = "C";	break;
- #ifdef FEAT_VISUAL
  	    case MBLOCK:    clip_sel_type = "B";	break;
- #endif
  	}
  
  	movedata(
--- 2797,2803 ----
*** ../vim-7.4.211/src/os_qnx.c	2011-09-21 19:48:08.000000000 +0200
--- src/os_qnx.c	2014-03-23 13:28:38.815168858 +0100
***************
*** 78,86 ****
  		default: /* fallthrough to line type */
  		case 'L': type = MLINE; break;
  		case 'C': type = MCHAR; break;
- #ifdef FEAT_VISUAL
  		case 'B': type = MBLOCK; break;
- #endif
  	    }
  	    is_type_set = TRUE;
  	}
--- 78,84 ----
***************
*** 143,151 ****
  		default: /* fallthrough to MLINE */
  		case MLINE:	*vim_clip = 'L'; break;
  		case MCHAR:	*vim_clip = 'C'; break;
- #ifdef FEAT_VISUAL
  		case MBLOCK:	*vim_clip = 'B'; break;
- #endif
  	    }
  
  	    vim_strncpy(text_clip, str, len);
--- 141,147 ----
*** ../vim-7.4.211/src/quickfix.c	2014-03-12 19:41:37.096948866 +0100
--- src/quickfix.c	2014-03-23 13:28:50.907169043 +0100
***************
*** 2347,2355 ****
      else
  	height = QF_WINHEIGHT;
  
- #ifdef FEAT_VISUAL
      reset_VIsual_and_resel();			/* stop Visual mode */
- #endif
  #ifdef FEAT_GUI
      need_mouse_correct = TRUE;
  #endif
--- 2347,2353 ----
*** ../vim-7.4.211/src/regexp.c	2013-11-21 17:12:55.000000000 +0100
--- src/regexp.c	2014-03-23 13:29:14.495169404 +0100
***************
*** 4179,4187 ****
  			    - (*mb_head_off)(regline, reginput - 1), reg_buf);
      return -1;
  }
- 
  #endif
! #ifdef FEAT_VISUAL
  static int reg_match_visual __ARGS((void));
  
  /*
--- 4179,4186 ----
  			    - (*mb_head_off)(regline, reginput - 1), reg_buf);
      return -1;
  }
  #endif
! 
  static int reg_match_visual __ARGS((void));
  
  /*
***************
*** 4258,4264 ****
      }
      return TRUE;
  }
- #endif
  
  #define ADVANCE_REGINPUT() mb_ptr_adv(reginput)
  
--- 4257,4262 ----
***************
*** 4440,4448 ****
  	    break;
  
  	  case RE_VISUAL:
- #ifdef FEAT_VISUAL
  	    if (!reg_match_visual())
- #endif
  		status = RA_NOMATCH;
  	    break;
  
--- 4438,4444 ----
*** ../vim-7.4.211/src/regexp_nfa.c	2013-11-28 14:20:11.000000000 +0100
--- src/regexp_nfa.c	2014-03-23 13:29:31.367169663 +0100
***************
*** 6403,6416 ****
  		break;
  
  	    case NFA_VISUAL:
- #ifdef FEAT_VISUAL
  		result = reg_match_visual();
  		if (result)
  		{
  		    add_here = TRUE;
  		    add_state = t->state->out;
  		}
- #endif
  		break;
  
  	    case NFA_MOPEN1:
--- 6403,6414 ----
*** ../vim-7.4.211/src/screen.c	2013-12-11 15:51:54.000000000 +0100
--- src/screen.c	2014-03-23 13:32:10.787172106 +0100
***************
*** 446,453 ****
  #endif
  }
  
- #if defined(FEAT_RUBY) || defined(FEAT_PERL) || defined(FEAT_VISUAL) || \
-     (defined(FEAT_CLIPBOARD) && defined(FEAT_X11)) || defined(PROTO)
  /*
   * update all windows that are editing the current buffer
   */
--- 446,451 ----
***************
*** 458,464 ****
      redraw_curbuf_later(type);
      update_screen(type);
  }
- #endif
  
  /*
   * update_screen()
--- 456,461 ----
***************
*** 596,609 ****
  		    && curwin->w_botfill == curwin->w_old_botfill
  #endif
  		    && curwin->w_topline == curwin->w_lines[0].wl_lnum)
- #ifdef FEAT_VISUAL
  		|| (type == INVERTED
  		    && VIsual_active
  		    && curwin->w_old_cursor_lnum == curwin->w_cursor.lnum
  		    && curwin->w_old_visual_mode == VIsual_mode
  		    && (curwin->w_valid & VALID_VIRTCOL)
  		    && curwin->w_old_curswant == curwin->w_curswant)
- #endif
  		))
  	curwin->w_redr_type = type;
  
--- 593,604 ----
***************
*** 1030,1039 ****
  				   updating.  0 when no mid area updating. */
      int		bot_start = 999;/* first row of the bot area that needs
  				   updating.  999 when no bot area updating */
- #ifdef FEAT_VISUAL
      int		scrolled_down = FALSE;	/* TRUE when scrolled down when
  					   w_topline got smaller a bit */
- #endif
  #ifdef FEAT_SEARCH_EXTRA
      matchitem_T *cur;		/* points to the match list */
      int		top_to_mod = FALSE;    /* redraw above mod_top */
--- 1025,1032 ----
***************
*** 1354,1362 ****
  			    /* Need to update rows that are new, stop at the
  			     * first one that scrolled down. */
  			    top_end = i;
- #ifdef FEAT_VISUAL
  			    scrolled_down = TRUE;
- #endif
  
  			    /* Move the entries that were scrolled, disable
  			     * the entries for the lines to be redrawn. */
--- 1347,1353 ----
***************
*** 1513,1519 ****
  	type = NOT_VALID;
      }
  
- #ifdef FEAT_VISUAL
      /* check if we are updating or removing the inverted part */
      if ((VIsual_active && buf == curwin->w_buffer)
  	    || (wp->w_old_cursor_lnum != 0 && type != NOT_VALID))
--- 1504,1509 ----
***************
*** 1708,1714 ****
  	wp->w_old_visual_lnum = 0;
  	wp->w_old_visual_col = 0;
      }
- #endif /* FEAT_VISUAL */
  
  #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA)
      /* reset got_int, otherwise regexp won't work */
--- 1698,1703 ----
***************
*** 2670,2676 ****
       * 6. set highlighting for the Visual area an other text.
       * If all folded lines are in the Visual area, highlight the line.
       */
- #ifdef FEAT_VISUAL
      if (VIsual_active && wp->w_buffer == curwin->w_buffer)
      {
  	if (ltoreq(curwin->w_cursor, VIsual))
--- 2659,2664 ----
***************
*** 2718,2724 ****
  	    }
  	}
      }
- #endif
  
  #ifdef FEAT_SYN_HL
      /* Show 'cursorcolumn' in the fold line. */
--- 2706,2711 ----
***************
*** 2876,2885 ****
      int		fromcol, tocol;		/* start/end of inverting */
      int		fromcol_prev = -2;	/* start of inverting after cursor */
      int		noinvcur = FALSE;	/* don't invert the cursor */
- #ifdef FEAT_VISUAL
      pos_T	*top, *bot;
      int		lnum_in_visual_area = FALSE;
- #endif
      pos_T	pos;
      long	v;
  
--- 2863,2870 ----
***************
*** 3090,3096 ****
       */
      fromcol = -10;
      tocol = MAXCOL;
- #ifdef FEAT_VISUAL
      if (VIsual_active && wp->w_buffer == curwin->w_buffer)
      {
  					/* Visual is after curwin->w_cursor */
--- 3075,3080 ----
***************
*** 3183,3191 ****
      /*
       * handle 'incsearch' and ":s///c" highlighting
       */
!     else
! #endif /* FEAT_VISUAL */
! 	if (highlight_match
  	    && wp == curwin
  	    && lnum >= curwin->w_cursor.lnum
  	    && lnum <= curwin->w_cursor.lnum + search_match_lines)
--- 3167,3173 ----
      /*
       * handle 'incsearch' and ":s///c" highlighting
       */
!     else if (highlight_match
  	    && wp == curwin
  	    && lnum >= curwin->w_cursor.lnum
  	    && lnum <= curwin->w_cursor.lnum + search_match_lines)
***************
*** 3324,3330 ****
  	    mb_ptr_adv(ptr);
  	}
  
- #if defined(FEAT_SYN_HL) || defined(FEAT_VIRTUALEDIT) || defined(FEAT_VISUAL)
  	/* When:
  	 * - 'cuc' is set, or
  	 * - 'colorcolumn' is set, or
--- 3306,3311 ----
***************
*** 3333,3359 ****
  	 * the end of the line may be before the start of the displayed part.
  	 */
  	if (vcol < v && (
! # ifdef FEAT_SYN_HL
! 	     wp->w_p_cuc
! 	     || draw_color_col
! #  if defined(FEAT_VIRTUALEDIT) || defined(FEAT_VISUAL)
! 	     ||
! #  endif
! # endif
! # ifdef FEAT_VIRTUALEDIT
! 	     virtual_active()
! #  ifdef FEAT_VISUAL
! 	     ||
! #  endif
! # endif
! # ifdef FEAT_VISUAL
! 	     (VIsual_active && wp->w_buffer == curwin->w_buffer)
! # endif
! 	     ))
  	{
  	    vcol = v;
  	}
- #endif
  
  	/* Handle a character that's not completely on the screen: Put ptr at
  	 * that character but skip the first few screen characters. */
--- 3314,3329 ----
  	 * the end of the line may be before the start of the displayed part.
  	 */
  	if (vcol < v && (
! #ifdef FEAT_SYN_HL
! 	     wp->w_p_cuc || draw_color_col ||
! #endif
! #ifdef FEAT_VIRTUALEDIT
! 	     virtual_active() ||
! #endif
! 	     (VIsual_active && wp->w_buffer == curwin->w_buffer)))
  	{
  	    vcol = v;
  	}
  
  	/* Handle a character that's not completely on the screen: Put ptr at
  	 * that character but skip the first few screen characters. */
***************
*** 4500,4508 ****
  			&& ((wp->w_p_list && lcs_eol > 0)
  			    || ((fromcol >= 0 || fromcol_prev >= 0)
  				&& tocol > vcol
- #ifdef FEAT_VISUAL
  				&& VIsual_mode != Ctrl_V
- #endif
  				&& (
  # ifdef FEAT_RIGHTLEFT
  				    wp->w_p_rl ? (col >= 0) :
--- 4470,4476 ----
***************
*** 4854,4864 ****
  #endif
  	    if (lcs_eol == lcs_eol_one
  		    && ((area_attr != 0 && vcol == fromcol
- #ifdef FEAT_VISUAL
  			    && (VIsual_mode != Ctrl_V
  				|| lnum == VIsual.lnum
  				|| lnum == curwin->w_cursor.lnum)
- #endif
  			    && c == NUL)
  #ifdef FEAT_SEARCH_EXTRA
  			/* highlight 'hlsearch' match at end of line */
--- 4822,4830 ----
***************
*** 9659,9668 ****
      do_mode = ((p_smd && msg_silent == 0)
  	    && ((State & INSERT)
  		|| restart_edit
! #ifdef FEAT_VISUAL
! 		|| VIsual_active
! #endif
! 		));
      if (do_mode || Recording)
      {
  	/*
--- 9625,9631 ----
      do_mode = ((p_smd && msg_silent == 0)
  	    && ((State & INSERT)
  		|| restart_edit
! 		|| VIsual_active));
      if (do_mode || Recording)
      {
  	/*
***************
*** 9790,9796 ****
  		if ((State & INSERT) && p_paste)
  		    MSG_PUTS_ATTR(_(" (paste)"), attr);
  
- #ifdef FEAT_VISUAL
  		if (VIsual_active)
  		{
  		    char *p;
--- 9753,9758 ----
***************
*** 9810,9816 ****
  		    }
  		    MSG_PUTS_ATTR(_(p), attr);
  		}
- #endif
  		MSG_PUTS_ATTR(" --", attr);
  	    }
  
--- 9772,9777 ----
***************
*** 9839,9849 ****
  	msg_clr_cmdline();
  
  #ifdef FEAT_CMDL_INFO
- # ifdef FEAT_VISUAL
      /* In Visual mode the size of the selected area must be redrawn. */
      if (VIsual_active)
  	clear_showcmd();
- # endif
  
      /* If the last window has no status line, the ruler is after the mode
       * message and must be redrawn */
--- 9800,9808 ----
*** ../vim-7.4.211/src/search.c	2014-01-14 21:31:30.000000000 +0100
--- src/search.c	2014-03-23 13:34:46.351174489 +0100
***************
*** 506,512 ****
  #endif
  
  /*
!  * lowest level search function.
   * Search for 'count'th occurrence of pattern 'pat' in direction 'dir'.
   * Start at position 'pos' and return the found position in 'pos'.
   *
--- 506,512 ----
  #endif
  
  /*
!  * Lowest level search function.
   * Search for 'count'th occurrence of pattern 'pat' in direction 'dir'.
   * Start at position 'pos' and return the found position in 'pos'.
   *
***************
*** 3198,3204 ****
      cls_bigword = bigword;
      clearpos(&start_pos);
  
- #ifdef FEAT_VISUAL
      /* Correct cursor when 'selection' is exclusive */
      if (VIsual_active && *p_sel == 'e' && lt(VIsual, curwin->w_cursor))
  	dec_cursor();
--- 3198,3203 ----
***************
*** 3208,3214 ****
       * character, select the word and/or white space under the cursor.
       */
      if (!VIsual_active || equalpos(curwin->w_cursor, VIsual))
- #endif
      {
  	/*
  	 * Go to start of current word or white space.
--- 3207,3212 ----
***************
*** 3245,3251 ****
  		include_white = TRUE;
  	}
  
- #ifdef FEAT_VISUAL
  	if (VIsual_active)
  	{
  	    /* should do something when inclusive == FALSE ! */
--- 3243,3248 ----
***************
*** 3253,3259 ****
  	    redraw_curbuf_later(INVERTED);	/* update the inversion */
  	}
  	else
- #endif
  	{
  	    oap->start = start_pos;
  	    oap->motion_type = MCHAR;
--- 3250,3255 ----
***************
*** 3267,3273 ****
      while (count > 0)
      {
  	inclusive = TRUE;
- #ifdef FEAT_VISUAL
  	if (VIsual_active && lt(curwin->w_cursor, VIsual))
  	{
  	    /*
--- 3263,3268 ----
***************
*** 3288,3294 ****
  	    }
  	}
  	else
- #endif
  	{
  	    /*
  	     * Move cursor forward one word and/or white area.
--- 3283,3288 ----
***************
*** 3334,3351 ****
  	    back_in_line();
  	    if (cls() == 0 && curwin->w_cursor.col > 0)
  	    {
- #ifdef FEAT_VISUAL
  		if (VIsual_active)
  		    VIsual = curwin->w_cursor;
  		else
- #endif
  		    oap->start = curwin->w_cursor;
  	    }
  	}
  	curwin->w_cursor = pos;	/* put cursor back at end */
      }
  
- #ifdef FEAT_VISUAL
      if (VIsual_active)
      {
  	if (*p_sel == 'e' && inclusive && ltoreq(VIsual, curwin->w_cursor))
--- 3328,3342 ----
***************
*** 3357,3363 ****
  	}
      }
      else
- #endif
  	oap->inclusive = inclusive;
  
      return OK;
--- 3348,3353 ----
***************
*** 3384,3390 ****
      pos = start_pos;
      findsent(FORWARD, 1L);	/* Find start of next sentence. */
  
- #ifdef FEAT_VISUAL
      /*
       * When the Visual area is bigger than one character: Extend it.
       */
--- 3374,3379 ----
***************
*** 3471,3477 ****
  	}
  	return OK;
      }
- #endif
  
      /*
       * If the cursor started on a blank, check if it is just before the start
--- 3460,3465 ----
***************
*** 3521,3527 ****
  	    find_first_blank(&start_pos);
      }
  
- #ifdef FEAT_VISUAL
      if (VIsual_active)
      {
  	/* Avoid getting stuck with "is" on a single space before a sentence. */
--- 3509,3514 ----
***************
*** 3534,3540 ****
  	redraw_curbuf_later(INVERTED);	/* update the inversion */
      }
      else
- #endif
      {
  	/* include a newline after the sentence, if there is one */
  	if (incl(&curwin->w_cursor) == -1)
--- 3521,3526 ----
***************
*** 3574,3582 ****
      /*
       * If we start on '(', '{', ')', '}', etc., use the whole block inclusive.
       */
- #ifdef FEAT_VISUAL
      if (!VIsual_active || equalpos(VIsual, curwin->w_cursor))
- #endif
      {
  	setpcmark();
  	if (what == '{')		/* ignore indent */
--- 3560,3566 ----
***************
*** 3587,3593 ****
  	    /* cursor on '(' or '{', move cursor just after it */
  	    ++curwin->w_cursor.col;
      }
- #ifdef FEAT_VISUAL
      else if (lt(VIsual, curwin->w_cursor))
      {
  	old_start = VIsual;
--- 3571,3576 ----
***************
*** 3595,3601 ****
      }
      else
  	old_end = VIsual;
- #endif
  
      /*
       * Search backwards for unclosed '(', '{', etc..
--- 3578,3583 ----
***************
*** 3641,3647 ****
  		if (decl(&curwin->w_cursor) != 0)
  		    break;
  	    }
- #ifdef FEAT_VISUAL
  	/*
  	 * In Visual mode, when the resulting area is not bigger than what we
  	 * started with, extend it to the next block, and then exclude again.
--- 3623,3628 ----
***************
*** 3666,3676 ****
  	    curwin->w_cursor = *end_pos;
  	}
  	else
- #endif
  	    break;
      }
  
- #ifdef FEAT_VISUAL
      if (VIsual_active)
      {
  	if (*p_sel == 'e')
--- 3647,3655 ----
***************
*** 3683,3689 ****
  	showmode();
      }
      else
- #endif
      {
  	oap->start = start_pos;
  	oap->motion_type = MCHAR;
--- 3662,3667 ----
***************
*** 3807,3823 ****
      old_pos = curwin->w_cursor;
      old_end = curwin->w_cursor;		    /* remember where we started */
      old_start = old_end;
- #ifdef FEAT_VISUAL
      if (!VIsual_active || *p_sel == 'e')
- #endif
  	decl(&old_end);			    /* old_end is inclusive */
  
      /*
       * If we start on "<aaa>" select that block.
       */
- #ifdef FEAT_VISUAL
      if (!VIsual_active || equalpos(VIsual, curwin->w_cursor))
- #endif
      {
  	setpcmark();
  
--- 3785,3797 ----
***************
*** 3843,3849 ****
  	    old_end = curwin->w_cursor;
  	}
      }
- #ifdef FEAT_VISUAL
      else if (lt(VIsual, curwin->w_cursor))
      {
  	old_start = VIsual;
--- 3817,3822 ----
***************
*** 3851,3857 ****
      }
      else
  	old_end = VIsual;
- #endif
  
  again:
      /*
--- 3824,3829 ----
***************
*** 3951,3957 ****
  	}
      }
  
- #ifdef FEAT_VISUAL
      if (VIsual_active)
      {
  	/* If the end is before the start there is no text between tags, select
--- 3923,3928 ----
***************
*** 3966,3972 ****
  	showmode();
      }
      else
- #endif
      {
  	oap->start = start_pos;
  	oap->motion_type = MCHAR;
--- 3937,3942 ----
***************
*** 4010,4016 ****
  
      start_lnum = curwin->w_cursor.lnum;
  
- #ifdef FEAT_VISUAL
      /*
       * When visual area is more than one line: extend it.
       */
--- 3980,3985 ----
***************
*** 4064,4070 ****
  	curwin->w_cursor.col = 0;
  	return retval;
      }
- #endif
  
      /*
       * First move back to the start_lnum of the paragraph or white lines
--- 4033,4038 ----
***************
*** 4136,4142 ****
  	while (start_lnum > 1 && linewhite(start_lnum - 1))
  	    --start_lnum;
  
- #ifdef FEAT_VISUAL
      if (VIsual_active)
      {
  	/* Problem: when doing "Vipipip" nothing happens in a single white
--- 4104,4109 ----
***************
*** 4149,4155 ****
  	showmode();
      }
      else
- #endif
      {
  	oap->start.lnum = start_lnum;
  	oap->start.col = 0;
--- 4116,4121 ----
***************
*** 4247,4253 ****
      int		col_end;
      int		col_start = curwin->w_cursor.col;
      int		inclusive = FALSE;
- #ifdef FEAT_VISUAL
      int		vis_empty = TRUE;	/* Visual selection <= 1 char */
      int		vis_bef_curs = FALSE;	/* Visual starts before cursor */
      int		inside_quotes = FALSE;	/* Looks like "i'" done before */
--- 4213,4218 ----
***************
*** 4331,4347 ****
  	}
      }
      else
- #endif
  
!     if (line[col_start] == quotechar
! #ifdef FEAT_VISUAL
! 	    || !vis_empty
! #endif
! 	    )
      {
  	int	first_col = col_start;
  
- #ifdef FEAT_VISUAL
  	if (!vis_empty)
  	{
  	    if (vis_bef_curs)
--- 4296,4306 ----
  	}
      }
      else
  
!     if (line[col_start] == quotechar || !vis_empty)
      {
  	int	first_col = col_start;
  
  	if (!vis_empty)
  	{
  	    if (vis_bef_curs)
***************
*** 4349,4355 ****
  	    else
  		first_col = find_prev_quote(line, col_start, quotechar, NULL);
  	}
! #endif
  	/* The cursor is on a quote, we don't know if it's the opening or
  	 * closing quote.  Search from the start of the line to find out.
  	 * Also do this when there is a Visual area, a' may leave the cursor
--- 4308,4314 ----
  	    else
  		first_col = find_prev_quote(line, col_start, quotechar, NULL);
  	}
! 
  	/* The cursor is on a quote, we don't know if it's the opening or
  	 * closing quote.  Search from the start of the line to find out.
  	 * Also do this when there is a Visual area, a' may leave the cursor
***************
*** 4406,4419 ****
  
      /* Set start position.  After vi" another i" must include the ".
       * For v2i" include the quotes. */
!     if (!include && count < 2
! #ifdef FEAT_VISUAL
! 	    && (vis_empty || !inside_quotes)
! #endif
! 	    )
  	++col_start;
      curwin->w_cursor.col = col_start;
- #ifdef FEAT_VISUAL
      if (VIsual_active)
      {
  	/* Set the start of the Visual area when the Visual area was empty, we
--- 4365,4373 ----
  
      /* Set start position.  After vi" another i" must include the ".
       * For v2i" include the quotes. */
!     if (!include && count < 2 && (vis_empty || !inside_quotes))
  	++col_start;
      curwin->w_cursor.col = col_start;
      if (VIsual_active)
      {
  	/* Set the start of the Visual area when the Visual area was empty, we
***************
*** 4433,4439 ****
  	}
      }
      else
- #endif
      {
  	oap->start = curwin->w_cursor;
  	oap->motion_type = MCHAR;
--- 4387,4392 ----
***************
*** 4441,4454 ****
  
      /* Set end position. */
      curwin->w_cursor.col = col_end;
!     if ((include || count > 1
! #ifdef FEAT_VISUAL
! 		/* After vi" another i" must include the ". */
  		|| (!vis_empty && inside_quotes)
- #endif
  	) && inc_cursor() == 2)
  	inclusive = TRUE;
- #ifdef FEAT_VISUAL
      if (VIsual_active)
      {
  	if (vis_empty || vis_bef_curs)
--- 4394,4403 ----
  
      /* Set end position. */
      curwin->w_cursor.col = col_end;
!     if ((include || count > 1 /* After vi" another i" must include the ". */
  		|| (!vis_empty && inside_quotes)
  	) && inc_cursor() == 2)
  	inclusive = TRUE;
      if (VIsual_active)
      {
  	if (vis_empty || vis_bef_curs)
***************
*** 4480,4486 ****
  	}
      }
      else
- #endif
      {
  	/* Set inclusive and other oap's flags. */
  	oap->inclusive = inclusive;
--- 4429,4434 ----
***************
*** 4491,4497 ****
  
  #endif /* FEAT_TEXTOBJ */
  
- #if defined(FEAT_VISUAL) || defined(PROTO)
  static int is_one_char __ARGS((char_u *pattern));
  
  /*
--- 4439,4444 ----
***************
*** 4690,4696 ****
      vim_regfree(regmatch.regprog);
      return result;
  }
- #endif /* FEAT_VISUAL */
  
  #if defined(FEAT_LISP) || defined(FEAT_CINDENT) || defined(FEAT_TEXTOBJ) \
  	|| defined(PROTO)
--- 4637,4642 ----
*** ../vim-7.4.211/src/spell.c	2014-03-08 16:13:39.123462070 +0100
--- src/spell.c	2014-03-23 13:35:15.195174931 +0100
***************
*** 10191,10197 ****
      if (no_spell_checking(curwin))
  	return;
  
- #ifdef FEAT_VISUAL
      if (VIsual_active)
      {
  	/* Use the Visually selected text as the bad word.  But reject
--- 10191,10196 ----
***************
*** 10209,10218 ****
  	++badlen;
  	end_visual_mode();
      }
!     else
! #endif
! 	/* Find the start of the badly spelled word. */
! 	if (spell_move_to(curwin, FORWARD, TRUE, TRUE, NULL) == 0
  	    || curwin->w_cursor.col > prev_cursor.col)
      {
  	/* No bad word or it starts after the cursor: use the word under the
--- 10208,10215 ----
  	++badlen;
  	end_visual_mode();
      }
!     /* Find the start of the badly spelled word. */
!     else if (spell_move_to(curwin, FORWARD, TRUE, TRUE, NULL) == 0
  	    || curwin->w_cursor.col > prev_cursor.col)
      {
  	/* No bad word or it starts after the cursor: use the word under the
*** ../vim-7.4.211/src/syntax.c	2013-11-28 18:53:47.000000000 +0100
--- src/syntax.c	2014-03-23 13:35:30.379175164 +0100
***************
*** 6837,6846 ****
  	CENT("SignColumn term=standout ctermbg=Grey ctermfg=DarkBlue",
  	     "SignColumn term=standout ctermbg=Grey ctermfg=DarkBlue guibg=Grey guifg=DarkBlue"),
  #endif
- #ifdef FEAT_VISUAL
  	CENT("Visual term=reverse",
  	     "Visual term=reverse guibg=LightGrey"),
- #endif
  #ifdef FEAT_DIFF
  	CENT("DiffAdd term=bold ctermbg=LightBlue",
  	     "DiffAdd term=bold ctermbg=LightBlue guibg=LightBlue"),
--- 6837,6844 ----
***************
*** 6927,6936 ****
  	CENT("SignColumn term=standout ctermbg=DarkGrey ctermfg=Cyan",
  	     "SignColumn term=standout ctermbg=DarkGrey ctermfg=Cyan guibg=Grey guifg=Cyan"),
  #endif
- #ifdef FEAT_VISUAL
  	CENT("Visual term=reverse",
  	     "Visual term=reverse guibg=DarkGrey"),
- #endif
  #ifdef FEAT_DIFF
  	CENT("DiffAdd term=bold ctermbg=DarkBlue",
  	     "DiffAdd term=bold ctermbg=DarkBlue guibg=DarkBlue"),
--- 6925,6932 ----
*** ../vim-7.4.211/src/term.c	2014-03-19 14:01:53.153903819 +0100
--- src/term.c	2014-03-23 13:35:43.519175365 +0100
***************
*** 3456,3467 ****
  	return;
      }
  
- #  ifdef FEAT_VISUAL
      if (VIsual_active)
  	checkfor = MOUSE_VISUAL;
!     else
! #  endif
! 	if (State == HITRETURN || State == ASKMORE || State == SETWSIZE)
  	checkfor = MOUSE_RETURN;
      else if (State & INSERT)
  	checkfor = MOUSE_INSERT;
--- 3456,3464 ----
  	return;
      }
  
      if (VIsual_active)
  	checkfor = MOUSE_VISUAL;
!     else if (State == HITRETURN || State == ASKMORE || State == SETWSIZE)
  	checkfor = MOUSE_RETURN;
      else if (State & INSERT)
  	checkfor = MOUSE_INSERT;
*** ../vim-7.4.211/src/ui.c	2013-07-13 20:57:08.000000000 +0200
--- src/ui.c	2014-03-23 13:36:15.459175855 +0100
***************
*** 2610,2622 ****
  	if (on_sep_line)
  	    return IN_SEP_LINE;
  #endif
- #ifdef FEAT_VISUAL
  	if (flags & MOUSE_MAY_STOP_VIS)
  	{
  	    end_visual_mode();
  	    redraw_curbuf_later(INVERTED);	/* delete the inversion */
  	}
- #endif
  #if defined(FEAT_CMDWIN) && defined(FEAT_CLIPBOARD)
  	/* Continue a modeless selection in another window. */
  	if (cmdwin_type != 0 && row < W_WINROW(curwin))
--- 2610,2620 ----
***************
*** 2686,2717 ****
  	}
  #endif
  
- #ifdef FEAT_VISUAL
  	/* Before jumping to another buffer, or moving the cursor for a left
  	 * click, stop Visual mode. */
  	if (VIsual_active
  		&& (wp->w_buffer != curwin->w_buffer
  		    || (!on_status_line
! # ifdef FEAT_VERTSPLIT
  			&& !on_sep_line
! # endif
! # ifdef FEAT_FOLDING
  			&& (
! #  ifdef FEAT_RIGHTLEFT
  			    wp->w_p_rl ? col < W_WIDTH(wp) - wp->w_p_fdc :
! #  endif
  			    col >= wp->w_p_fdc
! #  ifdef FEAT_CMDWIN
  				  + (cmdwin_type == 0 && wp == curwin ? 0 : 1)
- #  endif
- 			    )
  # endif
  			&& (flags & MOUSE_MAY_STOP_VIS))))
  	{
  	    end_visual_mode();
  	    redraw_curbuf_later(INVERTED);	/* delete the inversion */
  	}
- #endif
  #ifdef FEAT_CMDWIN
  	if (cmdwin_type != 0 && wp != curwin)
  	{
--- 2684,2713 ----
  	}
  #endif
  
  	/* Before jumping to another buffer, or moving the cursor for a left
  	 * click, stop Visual mode. */
  	if (VIsual_active
  		&& (wp->w_buffer != curwin->w_buffer
  		    || (!on_status_line
! #ifdef FEAT_VERTSPLIT
  			&& !on_sep_line
! #endif
! #ifdef FEAT_FOLDING
  			&& (
! # ifdef FEAT_RIGHTLEFT
  			    wp->w_p_rl ? col < W_WIDTH(wp) - wp->w_p_fdc :
! # endif
  			    col >= wp->w_p_fdc
! # ifdef FEAT_CMDWIN
  				  + (cmdwin_type == 0 && wp == curwin ? 0 : 1)
  # endif
+ 			    )
+ #endif
  			&& (flags & MOUSE_MAY_STOP_VIS))))
  	{
  	    end_visual_mode();
  	    redraw_curbuf_later(INVERTED);	/* delete the inversion */
  	}
  #ifdef FEAT_CMDWIN
  	if (cmdwin_type != 0 && wp != curwin)
  	{
***************
*** 2801,2814 ****
  #endif
      else /* keep_window_focus must be TRUE */
      {
- #ifdef FEAT_VISUAL
  	/* before moving the cursor for a left click, stop Visual mode */
  	if (flags & MOUSE_MAY_STOP_VIS)
  	{
  	    end_visual_mode();
  	    redraw_curbuf_later(INVERTED);	/* delete the inversion */
  	}
- #endif
  
  #if defined(FEAT_CMDWIN) && defined(FEAT_CLIPBOARD)
  	/* Continue a modeless selection in another window. */
--- 2797,2808 ----
***************
*** 2933,2939 ****
      if (mouse_comp_pos(curwin, &row, &col, &curwin->w_cursor.lnum))
  	mouse_past_bottom = TRUE;
  
- #ifdef FEAT_VISUAL
      /* Start Visual mode before coladvance(), for when 'sel' != "old" */
      if ((flags & MOUSE_MAY_VIS) && !VIsual_active)
      {
--- 2927,2932 ----
***************
*** 2947,2953 ****
  	if (p_smd && msg_silent == 0)
  	    redraw_cmdline = TRUE;	/* show visual mode later */
      }
- #endif
  
      curwin->w_curswant = col;
      curwin->w_set_curswant = FALSE;	/* May still have been TRUE */
--- 2940,2945 ----
*** ../vim-7.4.211/src/undo.c	2014-03-12 16:51:35.060792541 +0100
--- src/undo.c	2014-03-23 13:37:05.435176620 +0100
***************
*** 532,540 ****
  
  	/* save named marks and Visual marks for undo */
  	mch_memmove(uhp->uh_namedm, curbuf->b_namedm, sizeof(pos_T) * NMARKS);
- #ifdef FEAT_VISUAL
  	uhp->uh_visual = curbuf->b_visual;
- #endif
  
  	curbuf->b_u_newhead = uhp;
  	if (curbuf->b_u_oldhead == NULL)
--- 532,538 ----
***************
*** 1014,1029 ****
      /* Assume NMARKS will stay the same. */
      for (i = 0; i < NMARKS; ++i)
  	serialize_pos(uhp->uh_namedm[i], fp);
- #ifdef FEAT_VISUAL
      serialize_visualinfo(&uhp->uh_visual, fp);
- #else
-     {
- 	visualinfo_T info;
- 
- 	memset(&info, 0, sizeof(visualinfo_T));
- 	serialize_visualinfo(&info, fp);
-     }
- #endif
      put_time(fp, uhp->uh_time);
  
      /* Optional fields. */
--- 1012,1018 ----
***************
*** 1082,1095 ****
      uhp->uh_flags = get2c(fp);
      for (i = 0; i < NMARKS; ++i)
  	unserialize_pos(&uhp->uh_namedm[i], fp);
- #ifdef FEAT_VISUAL
      unserialize_visualinfo(&uhp->uh_visual, fp);
- #else
-     {
- 	visualinfo_T info;
- 	unserialize_visualinfo(&info, fp);
-     }
- #endif
      uhp->uh_time = get8ctime(fp);
  
      /* Optional fields. */
--- 1071,1077 ----
***************
*** 2406,2414 ****
      int		old_flags;
      int		new_flags;
      pos_T	namedm[NMARKS];
- #ifdef FEAT_VISUAL
      visualinfo_T visualinfo;
- #endif
      int		empty_buffer;		    /* buffer became empty */
      u_header_T	*curhead = curbuf->b_u_curhead;
  
--- 2388,2394 ----
***************
*** 2430,2438 ****
       * save marks before undo/redo
       */
      mch_memmove(namedm, curbuf->b_namedm, sizeof(pos_T) * NMARKS);
- #ifdef FEAT_VISUAL
      visualinfo = curbuf->b_visual;
- #endif
      curbuf->b_op_start.lnum = curbuf->b_ml.ml_line_count;
      curbuf->b_op_start.col = 0;
      curbuf->b_op_end.lnum = 0;
--- 2410,2416 ----
***************
*** 2602,2614 ****
  	    curbuf->b_namedm[i] = curhead->uh_namedm[i];
  	    curhead->uh_namedm[i] = namedm[i];
  	}
- #ifdef FEAT_VISUAL
      if (curhead->uh_visual.vi_start.lnum != 0)
      {
  	curbuf->b_visual = curhead->uh_visual;
  	curhead->uh_visual = visualinfo;
      }
- #endif
  
      /*
       * If the cursor is only off by one line, put it at the same position as
--- 2580,2590 ----
*** ../vim-7.4.211/src/version.c	2014-03-22 13:29:57.693846167 +0100
--- src/version.c	2014-03-23 15:01:49.719254526 +0100
***************
*** 642,656 ****
  #else
  	"-virtualedit",
  #endif
- #ifdef FEAT_VISUAL
  	"+visual",
! # ifdef FEAT_VISUALEXTRA
  	"+visualextra",
- # else
- 	"-visualextra",
- # endif
  #else
! 	"-visual",
  #endif
  #ifdef FEAT_VIMINFO
  	"+viminfo",
--- 642,652 ----
  #else
  	"-virtualedit",
  #endif
  	"+visual",
! #ifdef FEAT_VISUALEXTRA
  	"+visualextra",
  #else
! 	"-visualextra",
  #endif
  #ifdef FEAT_VIMINFO
  	"+viminfo",
*** ../vim-7.4.211/src/window.c	2014-01-10 15:53:09.000000000 +0100
--- src/window.c	2014-03-23 13:38:17.767177729 +0100
***************
*** 130,138 ****
      case Ctrl_S:
      case 's':
  		CHECK_CMDWIN
- #ifdef FEAT_VISUAL
  		reset_VIsual_and_resel();	/* stop Visual mode */
- #endif
  #ifdef FEAT_QUICKFIX
  		/* When splitting the quickfix window open a new buffer in it,
  		 * don't replicate the quickfix buffer. */
--- 130,136 ----
***************
*** 150,158 ****
      case Ctrl_V:
      case 'v':
  		CHECK_CMDWIN
- # ifdef FEAT_VISUAL
  		reset_VIsual_and_resel();	/* stop Visual mode */
- # endif
  # ifdef FEAT_QUICKFIX
  		/* When splitting the quickfix window open a new buffer in it,
  		 * don't replicate the quickfix buffer. */
--- 148,154 ----
***************
*** 170,178 ****
      case Ctrl_HAT:
      case '^':
  		CHECK_CMDWIN
- #ifdef FEAT_VISUAL
  		reset_VIsual_and_resel();	/* stop Visual mode */
- #endif
  		STRCPY(cbuf, "split #");
  		if (Prenum)
  		    vim_snprintf((char *)cbuf + 7, sizeof(cbuf) - 7,
--- 166,172 ----
***************
*** 184,192 ****
      case Ctrl_N:
      case 'n':
  		CHECK_CMDWIN
- #ifdef FEAT_VISUAL
  		reset_VIsual_and_resel();	/* stop Visual mode */
- #endif
  #ifdef FEAT_QUICKFIX
  newwindow:
  #endif
--- 178,184 ----
***************
*** 206,223 ****
  /* quit current window */
      case Ctrl_Q:
      case 'q':
- #ifdef FEAT_VISUAL
  		reset_VIsual_and_resel();	/* stop Visual mode */
- #endif
  		do_cmdline_cmd((char_u *)"quit");
  		break;
  
  /* close current window */
      case Ctrl_C:
      case 'c':
- #ifdef FEAT_VISUAL
  		reset_VIsual_and_resel();	/* stop Visual mode */
- #endif
  		do_cmdline_cmd((char_u *)"close");
  		break;
  
--- 198,211 ----
***************
*** 226,234 ****
      case Ctrl_Z:
      case 'z':
  		CHECK_CMDWIN
- #ifdef FEAT_VISUAL
  		reset_VIsual_and_resel();	/* stop Visual mode */
- #endif
  		do_cmdline_cmd((char_u *)"pclose");
  		break;
  
--- 214,220 ----
***************
*** 248,256 ****
      case Ctrl_O:
      case 'o':
  		CHECK_CMDWIN
- #ifdef FEAT_VISUAL
  		reset_VIsual_and_resel();	/* stop Visual mode */
- #endif
  		do_cmdline_cmd((char_u *)"only");
  		break;
  
--- 234,240 ----
***************
*** 399,416 ****
      case Ctrl_R:
      case 'r':
  		CHECK_CMDWIN
- #ifdef FEAT_VISUAL
  		reset_VIsual_and_resel();	/* stop Visual mode */
- #endif
  		win_rotate(FALSE, (int)Prenum1);    /* downwards */
  		break;
  
  /* rotate windows upwards */
      case 'R':
  		CHECK_CMDWIN
- #ifdef FEAT_VISUAL
  		reset_VIsual_and_resel();	/* stop Visual mode */
- #endif
  		win_rotate(TRUE, (int)Prenum1);	    /* upwards */
  		break;
  
--- 383,396 ----
***************
*** 499,507 ****
      case ']':
      case Ctrl_RSB:
  		CHECK_CMDWIN
- #ifdef FEAT_VISUAL
  		reset_VIsual_and_resel();	/* stop Visual mode */
- #endif
  		if (Prenum)
  		    postponed_split = Prenum;
  		else
--- 479,485 ----
***************
*** 612,620 ****
  #endif
  		    case ']':
  		    case Ctrl_RSB:
- #ifdef FEAT_VISUAL
  			reset_VIsual_and_resel();	/* stop Visual mode */
- #endif
  			if (Prenum)
  			    postponed_split = Prenum;
  			else
--- 590,596 ----
***************
*** 3726,3734 ****
  {
      tabpage_T	*tp = curtab;
  
- #ifdef FEAT_VISUAL
      reset_VIsual_and_resel();	/* stop Visual mode */
- #endif
  #ifdef FEAT_AUTOCMD
      if (trigger_leave_autocmds)
      {
--- 3702,3708 ----
***************
*** 4029,4040 ****
  	return;
  #endif
  
- #ifdef FEAT_VISUAL
      if (wp->w_buffer != curbuf)
  	reset_VIsual_and_resel();
      else if (VIsual_active)
  	wp->w_cursor = curwin->w_cursor;
- #endif
  
  #ifdef FEAT_GUI
      need_mouse_correct = TRUE;
--- 4003,4012 ----
***************
*** 6037,6043 ****
      long	count;
      linenr_T	*file_lnum;
  {
- # ifdef FEAT_VISUAL
      if (VIsual_active)
      {
  	int	len;
--- 6009,6014 ----
***************
*** 6048,6054 ****
  	return find_file_name_in_path(ptr, len,
  		     FNAME_MESS|FNAME_EXP|FNAME_REL, count, curbuf->b_ffname);
      }
- # endif
      return file_name_at_cursor(FNAME_MESS|FNAME_HYP|FNAME_EXP|FNAME_REL, count,
  			       file_lnum);
  
--- 6019,6024 ----
*** ../vim-7.4.211/src/feature.h	2014-03-12 17:56:42.960852421 +0100
--- src/feature.h	2014-03-23 13:39:02.003178407 +0100
***************
*** 214,220 ****
   * +visual		Visual mode - now always included.
   * +visualextra		Extra features for Visual mode (mostly block operators).
   */
- #define FEAT_VISUAL
  #ifdef FEAT_NORMAL
  # define FEAT_VISUALEXTRA
  #endif
--- 214,219 ----
***************
*** 1138,1150 ****
  #ifdef FEAT_GUI
  # ifndef FEAT_CLIPBOARD
  #  define FEAT_CLIPBOARD
- #  ifndef FEAT_VISUAL
- #   define FEAT_VISUAL
- #  endif
  # endif
  #endif
  
! #if defined(FEAT_NORMAL) && defined(FEAT_VISUAL) \
  	&& (defined(UNIX) || defined(VMS)) \
  	&& defined(WANT_X11) && defined(HAVE_X11)
  # define FEAT_XCLIPBOARD
--- 1137,1146 ----
  #ifdef FEAT_GUI
  # ifndef FEAT_CLIPBOARD
  #  define FEAT_CLIPBOARD
  # endif
  #endif
  
! #if defined(FEAT_NORMAL) \
  	&& (defined(UNIX) || defined(VMS)) \
  	&& defined(WANT_X11) && defined(HAVE_X11)
  # define FEAT_XCLIPBOARD
*** ../vim-7.4.211/src/globals.h	2014-02-22 23:03:48.712901208 +0100
--- src/globals.h	2014-03-23 13:39:17.407178643 +0100
***************
*** 662,668 ****
  				/* set to TRUE when "-s" commandline argument
  				 * used for ex */
  
- #ifdef FEAT_VISUAL
  EXTERN pos_T	VIsual;		/* start position of active Visual selection */
  EXTERN int	VIsual_active INIT(= FALSE);
  				/* whether Visual mode is active */
--- 662,667 ----
***************
*** 677,683 ****
  
  EXTERN int	redo_VIsual_busy INIT(= FALSE);
  				/* TRUE when redoing Visual */
- #endif
  
  #ifdef FEAT_MOUSE
  /*
--- 676,681 ----
***************
*** 1178,1188 ****
  EXTERN int	fill_diff INIT(= '-');
  #endif
  
- #ifdef FEAT_VISUAL
  /* Whether 'keymodel' contains "stopsel" and "startsel". */
  EXTERN int	km_stopsel INIT(= FALSE);
  EXTERN int	km_startsel INIT(= FALSE);
- #endif
  
  #ifdef FEAT_CMDWIN
  EXTERN int	cedit_key INIT(= -1);	/* key value of 'cedit' option */
--- 1176,1184 ----
*** ../vim-7.4.211/src/option.h	2014-03-12 18:55:52.104906804 +0100
--- src/option.h	2014-03-23 13:39:30.991178851 +0100
***************
*** 572,580 ****
  EXTERN char_u	*p_isp;		/* 'isprint' */
  EXTERN int	p_js;		/* 'joinspaces' */
  EXTERN char_u	*p_kp;		/* 'keywordprg' */
- #ifdef FEAT_VISUAL
  EXTERN char_u	*p_km;		/* 'keymodel' */
- #endif
  #ifdef FEAT_LANGMAP
  EXTERN char_u	*p_langmap;	/* 'langmap'*/
  #endif
--- 572,578 ----
***************
*** 681,690 ****
  #endif
  EXTERN char_u	*p_sections;	/* 'sections' */
  EXTERN int	p_secure;	/* 'secure' */
- #ifdef FEAT_VISUAL
  EXTERN char_u	*p_sel;		/* 'selection' */
  EXTERN char_u	*p_slm;		/* 'selectmode' */
- #endif
  #ifdef FEAT_SESSION
  EXTERN char_u	*p_ssop;	/* 'sessionoptions' */
  EXTERN unsigned	ssop_flags;
--- 679,686 ----
*** ../vim-7.4.211/src/os_win32.h	2013-09-25 19:13:32.000000000 +0200
--- src/os_win32.h	2014-03-23 13:39:49.819179139 +0100
***************
*** 68,74 ****
  #endif
  
  #define USE_FNAME_CASE		/* adjust case of file names */
! #if !defined(FEAT_CLIPBOARD) && defined(FEAT_VISUAL) && defined(FEAT_MOUSE)
  # define FEAT_CLIPBOARD		/* include clipboard support */
  #endif
  #if defined(__DATE__) && defined(__TIME__)
--- 68,74 ----
  #endif
  
  #define USE_FNAME_CASE		/* adjust case of file names */
! #if !defined(FEAT_CLIPBOARD) && defined(FEAT_MOUSE)
  # define FEAT_CLIPBOARD		/* include clipboard support */
  #endif
  #if defined(__DATE__) && defined(__TIME__)
*** ../vim-7.4.211/src/structs.h	2014-03-12 18:55:52.104906804 +0100
--- src/structs.h	2014-03-23 13:40:19.175179589 +0100
***************
*** 346,354 ****
  #endif
      int		uh_flags;	/* see below */
      pos_T	uh_namedm[NMARKS];	/* marks before undo/after redo */
- #ifdef FEAT_VISUAL
      visualinfo_T uh_visual;	/* Visual areas before undo/after redo */
- #endif
      time_t	uh_time;	/* timestamp when the change was made */
      long	uh_save_nr;	/* set when the file was saved after the
  				   changes in this block */
--- 346,352 ----
***************
*** 1406,1417 ****
  
      pos_T	b_namedm[NMARKS]; /* current named marks (mark.c) */
  
- #ifdef FEAT_VISUAL
      /* These variables are set when VIsual_active becomes FALSE */
      visualinfo_T b_visual;
! # ifdef FEAT_EVAL
      int		b_visual_mode_eval;  /* b_visual.vi_mode for visualmode() */
- # endif
  #endif
  
      pos_T	b_last_cursor;	/* cursor position when last unloading this
--- 1404,1413 ----
  
      pos_T	b_namedm[NMARKS]; /* current named marks (mark.c) */
  
      /* These variables are set when VIsual_active becomes FALSE */
      visualinfo_T b_visual;
! #ifdef FEAT_EVAL
      int		b_visual_mode_eval;  /* b_visual.vi_mode for visualmode() */
  #endif
  
      pos_T	b_last_cursor;	/* cursor position when last unloading this
***************
*** 1980,1986 ****
  				       time through cursupdate() to the
  				       current virtual column */
  
- #ifdef FEAT_VISUAL
      /*
       * the next six are used to update the visual part
       */
--- 1976,1981 ----
***************
*** 1991,1997 ****
      linenr_T	w_old_visual_lnum;  /* last known start of visual part */
      colnr_T	w_old_visual_col;   /* last known start of visual part */
      colnr_T	w_old_curswant;	    /* last known value of Curswant */
- #endif
  
      /*
       * "w_topline", "w_leftcol" and "w_skipcol" specify the offsets for
--- 1986,1991 ----
***************
*** 2293,2302 ****
  				   (inclusive) */
      int		empty;		/* op_start and op_end the same (only used by
  				   do_change()) */
- #ifdef FEAT_VISUAL
      int		is_VIsual;	/* operator on Visual area */
      int		block_mode;	/* current operator is Visual block mode */
- #endif
      colnr_T	start_vcol;	/* start col for block mode operator */
      colnr_T	end_vcol;	/* end col for block mode operator */
  #ifdef FEAT_AUTOCMD
--- 2287,2294 ----
*** ../vim-7.4.211/src/version.c	2014-03-22 13:29:57.693846167 +0100
--- src/version.c	2014-03-23 15:01:49.719254526 +0100
***************
*** 740,741 ****
--- 736,739 ----
  {   /* Add new patch number below this line */
+ /**/
+     212,
  /**/

-- 
If all you have is a hammer, everything looks like a nail.
When your hammer is C++, everything begins to look like a thumb.
			-- Steve Hoflich, comp.lang.c++

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///