Source

emacs / src / ChangeLog.8

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
5721
5722
5723
5724
5725
5726
5727
5728
5729
5730
5731
5732
5733
5734
5735
5736
5737
5738
5739
5740
5741
5742
5743
5744
5745
5746
5747
5748
5749
5750
5751
5752
5753
5754
5755
5756
5757
5758
5759
5760
5761
5762
5763
5764
5765
5766
5767
5768
5769
5770
5771
5772
5773
5774
5775
5776
5777
5778
5779
5780
5781
5782
5783
5784
5785
5786
5787
5788
5789
5790
5791
5792
5793
5794
5795
5796
5797
5798
5799
5800
5801
5802
5803
5804
5805
5806
5807
5808
5809
5810
5811
5812
5813
5814
5815
5816
5817
5818
5819
5820
5821
5822
5823
5824
5825
5826
5827
5828
5829
5830
5831
5832
5833
5834
5835
5836
5837
5838
5839
5840
5841
5842
5843
5844
5845
5846
5847
5848
5849
5850
5851
5852
5853
5854
5855
5856
5857
5858
5859
5860
5861
5862
5863
5864
5865
5866
5867
5868
5869
5870
5871
5872
5873
5874
5875
5876
5877
5878
5879
5880
5881
5882
5883
5884
5885
5886
5887
5888
5889
5890
5891
5892
5893
5894
5895
5896
5897
5898
5899
5900
5901
5902
5903
5904
5905
5906
5907
5908
5909
5910
5911
5912
5913
5914
5915
5916
5917
5918
5919
5920
5921
5922
5923
5924
5925
5926
5927
5928
5929
5930
5931
5932
5933
5934
5935
5936
5937
5938
5939
5940
5941
5942
5943
5944
5945
5946
5947
5948
5949
5950
5951
5952
5953
5954
5955
5956
5957
5958
5959
5960
5961
5962
5963
5964
5965
5966
5967
5968
5969
5970
5971
5972
5973
5974
5975
5976
5977
5978
5979
5980
5981
5982
5983
5984
5985
5986
5987
5988
5989
5990
5991
5992
5993
5994
5995
5996
5997
5998
5999
6000
6001
6002
6003
6004
6005
6006
6007
6008
6009
6010
6011
6012
6013
6014
6015
6016
6017
6018
6019
6020
6021
6022
6023
6024
6025
6026
6027
6028
6029
6030
6031
6032
6033
6034
6035
6036
6037
6038
6039
6040
6041
6042
6043
6044
6045
6046
6047
6048
6049
6050
6051
6052
6053
6054
6055
6056
6057
6058
6059
6060
6061
6062
6063
6064
6065
6066
6067
6068
6069
6070
6071
6072
6073
6074
6075
6076
6077
6078
6079
6080
6081
6082
6083
6084
6085
6086
6087
6088
6089
6090
6091
6092
6093
6094
6095
6096
6097
6098
6099
6100
6101
6102
6103
6104
6105
6106
6107
6108
6109
6110
6111
6112
6113
6114
6115
6116
6117
6118
6119
6120
6121
6122
6123
6124
6125
6126
6127
6128
6129
6130
6131
6132
6133
6134
6135
6136
6137
6138
6139
6140
6141
6142
6143
6144
6145
6146
6147
6148
6149
6150
6151
6152
6153
6154
6155
6156
6157
6158
6159
6160
6161
6162
6163
6164
6165
6166
6167
6168
6169
6170
6171
6172
6173
6174
6175
6176
6177
6178
6179
6180
6181
6182
6183
6184
6185
6186
6187
6188
6189
6190
6191
6192
6193
6194
6195
6196
6197
6198
6199
6200
6201
6202
6203
6204
6205
6206
6207
6208
6209
6210
6211
6212
6213
6214
6215
6216
6217
6218
6219
6220
6221
6222
6223
6224
6225
6226
6227
6228
6229
6230
6231
6232
6233
6234
6235
6236
6237
6238
6239
6240
6241
6242
6243
6244
6245
6246
6247
6248
6249
6250
6251
6252
6253
6254
6255
6256
6257
6258
6259
6260
6261
6262
6263
6264
6265
6266
6267
6268
6269
6270
6271
6272
6273
6274
6275
6276
6277
6278
6279
6280
6281
6282
6283
6284
6285
6286
6287
6288
6289
6290
6291
6292
6293
6294
6295
6296
6297
6298
6299
6300
6301
6302
6303
6304
6305
6306
6307
6308
6309
6310
6311
6312
6313
6314
6315
6316
6317
6318
6319
6320
6321
6322
6323
6324
6325
6326
6327
6328
6329
6330
6331
6332
6333
6334
6335
6336
6337
6338
6339
6340
6341
6342
6343
6344
6345
6346
6347
6348
6349
6350
6351
6352
6353
6354
6355
6356
6357
6358
6359
6360
6361
6362
6363
6364
6365
6366
6367
6368
6369
6370
6371
6372
6373
6374
6375
6376
6377
6378
6379
6380
6381
6382
6383
6384
6385
6386
6387
6388
6389
6390
6391
6392
6393
6394
6395
6396
6397
6398
6399
6400
6401
6402
6403
6404
6405
6406
6407
6408
6409
6410
6411
6412
6413
6414
6415
6416
6417
6418
6419
6420
6421
6422
6423
6424
6425
6426
6427
6428
6429
6430
6431
6432
6433
6434
6435
6436
6437
6438
6439
6440
6441
6442
6443
6444
6445
6446
6447
6448
6449
6450
6451
6452
6453
6454
6455
6456
6457
6458
6459
6460
6461
6462
6463
6464
6465
6466
6467
6468
6469
6470
6471
6472
6473
6474
6475
6476
6477
6478
6479
6480
6481
6482
6483
6484
6485
6486
6487
6488
6489
6490
6491
6492
6493
6494
6495
6496
6497
6498
6499
6500
6501
6502
6503
6504
6505
6506
6507
6508
6509
6510
6511
6512
6513
6514
6515
6516
6517
6518
6519
6520
6521
6522
6523
6524
6525
6526
6527
6528
6529
6530
6531
6532
6533
6534
6535
6536
6537
6538
6539
6540
6541
6542
6543
6544
6545
6546
6547
6548
6549
6550
6551
6552
6553
6554
6555
6556
6557
6558
6559
6560
6561
6562
6563
6564
6565
6566
6567
6568
6569
6570
6571
6572
6573
6574
6575
6576
6577
6578
6579
6580
6581
6582
6583
6584
6585
6586
6587
6588
6589
6590
6591
6592
6593
6594
6595
6596
6597
6598
6599
6600
6601
6602
6603
6604
6605
6606
6607
6608
6609
6610
6611
6612
6613
6614
6615
6616
6617
6618
6619
6620
6621
6622
6623
6624
6625
6626
6627
6628
6629
6630
6631
6632
6633
6634
6635
6636
6637
6638
6639
6640
6641
6642
6643
6644
6645
6646
6647
6648
6649
6650
6651
6652
6653
6654
6655
6656
6657
6658
6659
6660
6661
6662
6663
6664
6665
6666
6667
6668
6669
6670
6671
6672
6673
6674
6675
6676
6677
6678
6679
6680
6681
6682
6683
6684
6685
6686
6687
6688
6689
6690
6691
6692
6693
6694
6695
6696
6697
6698
6699
6700
6701
6702
6703
6704
6705
6706
6707
6708
6709
6710
6711
6712
6713
6714
6715
6716
6717
6718
6719
6720
6721
6722
6723
6724
6725
6726
6727
6728
6729
6730
6731
6732
6733
6734
6735
6736
6737
6738
6739
6740
6741
6742
6743
6744
6745
6746
6747
6748
6749
6750
6751
6752
6753
6754
6755
6756
6757
6758
6759
6760
6761
6762
6763
6764
6765
6766
6767
6768
6769
6770
6771
6772
6773
6774
6775
6776
6777
6778
6779
6780
6781
6782
6783
6784
6785
6786
6787
6788
6789
6790
6791
6792
6793
6794
6795
6796
6797
6798
6799
6800
6801
6802
6803
6804
6805
6806
6807
6808
6809
6810
6811
6812
6813
6814
6815
6816
6817
6818
6819
6820
6821
6822
6823
6824
6825
6826
6827
6828
6829
6830
6831
6832
6833
6834
6835
6836
6837
6838
6839
6840
6841
6842
6843
6844
6845
6846
6847
6848
6849
6850
6851
6852
6853
6854
6855
6856
6857
6858
6859
6860
6861
6862
6863
6864
6865
6866
6867
6868
6869
6870
6871
6872
6873
6874
6875
6876
6877
6878
6879
6880
6881
6882
6883
6884
6885
6886
6887
6888
6889
6890
6891
6892
6893
6894
6895
6896
6897
6898
6899
6900
6901
6902
6903
6904
6905
6906
6907
6908
6909
6910
6911
6912
6913
6914
6915
6916
6917
6918
6919
6920
6921
6922
6923
6924
6925
6926
6927
6928
6929
6930
6931
6932
6933
6934
6935
6936
6937
6938
6939
6940
6941
6942
6943
6944
6945
6946
6947
6948
6949
6950
6951
6952
6953
6954
6955
6956
6957
6958
6959
6960
6961
6962
6963
6964
6965
6966
6967
6968
6969
6970
6971
6972
6973
6974
6975
6976
6977
6978
6979
6980
6981
6982
6983
6984
6985
6986
6987
6988
6989
6990
6991
6992
6993
6994
6995
6996
6997
6998
6999
7000
7001
7002
7003
7004
7005
7006
7007
7008
7009
7010
7011
7012
7013
7014
7015
7016
7017
7018
7019
7020
7021
7022
7023
7024
7025
7026
7027
7028
7029
7030
7031
7032
7033
7034
7035
7036
7037
7038
7039
7040
7041
7042
7043
7044
7045
7046
7047
7048
7049
7050
7051
7052
7053
7054
7055
7056
7057
7058
7059
7060
7061
7062
7063
7064
7065
7066
7067
7068
7069
7070
7071
7072
7073
7074
7075
7076
7077
7078
7079
7080
7081
7082
7083
7084
7085
7086
7087
7088
7089
7090
7091
7092
7093
7094
7095
7096
7097
7098
7099
7100
7101
7102
7103
7104
7105
7106
7107
7108
7109
7110
7111
7112
7113
7114
7115
7116
7117
7118
7119
7120
7121
7122
7123
7124
7125
7126
7127
7128
7129
7130
7131
7132
7133
7134
7135
7136
7137
7138
7139
7140
7141
7142
7143
7144
7145
7146
7147
7148
7149
7150
7151
7152
7153
7154
7155
7156
7157
7158
7159
7160
7161
7162
7163
7164
7165
7166
7167
7168
7169
7170
7171
7172
7173
7174
7175
7176
7177
7178
7179
7180
7181
7182
7183
7184
7185
7186
7187
7188
7189
7190
7191
7192
7193
7194
7195
7196
7197
7198
7199
7200
7201
7202
7203
7204
7205
7206
7207
7208
7209
7210
7211
7212
7213
7214
7215
7216
7217
7218
7219
7220
7221
7222
7223
7224
7225
7226
7227
7228
7229
7230
7231
7232
7233
7234
7235
7236
7237
7238
7239
7240
7241
7242
7243
7244
7245
7246
7247
7248
7249
7250
7251
7252
7253
7254
7255
7256
7257
7258
7259
7260
7261
7262
7263
7264
7265
7266
7267
7268
7269
7270
7271
7272
7273
7274
7275
7276
7277
7278
7279
7280
7281
7282
7283
7284
7285
7286
7287
7288
7289
7290
7291
7292
7293
7294
7295
7296
7297
7298
7299
7300
7301
7302
7303
7304
7305
7306
7307
7308
7309
7310
7311
7312
7313
7314
7315
7316
7317
7318
7319
7320
7321
7322
7323
7324
7325
7326
7327
7328
7329
7330
7331
7332
7333
7334
7335
7336
7337
7338
7339
7340
7341
7342
7343
7344
7345
7346
7347
7348
7349
7350
7351
7352
7353
7354
7355
7356
7357
7358
7359
7360
7361
7362
7363
7364
7365
7366
7367
7368
7369
7370
7371
7372
7373
7374
7375
7376
7377
7378
7379
7380
7381
7382
7383
7384
7385
7386
7387
7388
7389
7390
7391
7392
7393
7394
7395
7396
7397
7398
7399
7400
7401
7402
7403
7404
7405
7406
7407
7408
7409
7410
7411
7412
7413
7414
7415
7416
7417
7418
7419
7420
7421
7422
7423
7424
7425
7426
7427
7428
7429
7430
7431
7432
7433
7434
7435
7436
7437
7438
7439
7440
7441
7442
7443
7444
7445
7446
7447
7448
7449
7450
7451
7452
7453
7454
7455
7456
7457
7458
7459
7460
7461
7462
7463
7464
7465
7466
7467
7468
7469
7470
7471
7472
7473
7474
7475
7476
7477
7478
7479
7480
7481
7482
7483
7484
7485
7486
7487
7488
7489
7490
7491
7492
7493
7494
7495
7496
7497
7498
7499
7500
7501
7502
7503
7504
7505
7506
7507
7508
7509
7510
7511
7512
7513
7514
7515
7516
7517
7518
7519
7520
7521
7522
7523
7524
7525
7526
7527
7528
7529
7530
7531
7532
7533
7534
7535
7536
7537
7538
7539
7540
7541
7542
7543
7544
7545
7546
7547
7548
7549
7550
7551
7552
7553
7554
7555
7556
7557
7558
7559
7560
7561
7562
7563
7564
7565
7566
7567
7568
7569
7570
7571
7572
7573
7574
7575
7576
7577
7578
7579
7580
7581
7582
7583
7584
7585
7586
7587
7588
7589
7590
7591
7592
7593
7594
7595
7596
7597
7598
7599
7600
7601
7602
7603
7604
7605
7606
7607
7608
7609
7610
7611
7612
7613
7614
7615
7616
7617
7618
7619
7620
7621
7622
7623
7624
7625
7626
7627
7628
7629
7630
7631
7632
7633
7634
7635
7636
7637
7638
7639
7640
7641
7642
7643
7644
7645
7646
7647
7648
7649
7650
7651
7652
7653
7654
7655
7656
7657
7658
7659
7660
7661
7662
7663
7664
7665
7666
7667
7668
7669
7670
7671
7672
7673
7674
7675
7676
7677
7678
7679
7680
7681
7682
7683
7684
7685
7686
7687
7688
7689
7690
7691
7692
7693
7694
7695
7696
7697
7698
7699
7700
7701
7702
7703
7704
7705
7706
7707
7708
7709
7710
7711
7712
7713
7714
7715
7716
7717
7718
7719
7720
7721
7722
7723
7724
7725
7726
7727
7728
7729
7730
7731
7732
7733
7734
7735
7736
7737
7738
7739
7740
7741
7742
7743
7744
7745
7746
7747
7748
7749
7750
7751
7752
7753
7754
7755
7756
7757
7758
7759
7760
7761
7762
7763
7764
7765
7766
7767
7768
7769
7770
7771
7772
7773
7774
7775
7776
7777
7778
7779
7780
7781
7782
7783
7784
7785
7786
7787
7788
7789
7790
7791
7792
7793
7794
7795
7796
7797
7798
7799
7800
7801
7802
7803
7804
7805
7806
7807
7808
7809
7810
7811
7812
7813
7814
7815
7816
7817
7818
7819
7820
7821
7822
7823
7824
7825
7826
7827
7828
7829
7830
7831
7832
7833
7834
7835
7836
7837
7838
7839
7840
7841
7842
7843
7844
7845
7846
7847
7848
7849
7850
7851
7852
7853
7854
7855
7856
7857
7858
7859
7860
7861
7862
7863
7864
7865
7866
7867
7868
7869
7870
7871
7872
7873
7874
7875
7876
7877
7878
7879
7880
7881
7882
7883
7884
7885
7886
7887
7888
7889
7890
7891
7892
7893
7894
7895
7896
7897
7898
7899
7900
7901
7902
7903
7904
7905
7906
7907
7908
7909
7910
7911
7912
7913
7914
7915
7916
7917
7918
7919
7920
7921
7922
7923
7924
7925
7926
7927
7928
7929
7930
7931
7932
7933
7934
7935
7936
7937
7938
7939
7940
7941
7942
7943
7944
7945
7946
7947
7948
7949
7950
7951
7952
7953
7954
7955
7956
7957
7958
7959
7960
7961
7962
7963
7964
7965
7966
7967
7968
7969
7970
7971
7972
7973
7974
7975
7976
7977
7978
7979
7980
7981
7982
7983
7984
7985
7986
7987
7988
7989
7990
7991
7992
7993
7994
7995
7996
7997
7998
7999
8000
8001
8002
8003
8004
8005
8006
8007
8008
8009
8010
8011
8012
8013
8014
8015
8016
8017
8018
8019
8020
8021
8022
8023
8024
8025
8026
8027
8028
8029
8030
8031
8032
8033
8034
8035
8036
8037
8038
8039
8040
8041
8042
8043
8044
8045
8046
8047
8048
8049
8050
8051
8052
8053
8054
8055
8056
8057
8058
8059
8060
8061
8062
8063
8064
8065
8066
8067
8068
8069
8070
8071
8072
8073
8074
8075
8076
8077
8078
8079
8080
8081
8082
8083
8084
8085
8086
8087
8088
8089
8090
8091
8092
8093
8094
8095
8096
8097
8098
8099
8100
8101
8102
8103
8104
8105
8106
8107
8108
8109
8110
8111
8112
8113
8114
8115
8116
8117
8118
8119
8120
8121
8122
8123
8124
8125
8126
8127
8128
8129
8130
8131
8132
8133
8134
8135
8136
8137
8138
8139
8140
8141
8142
8143
8144
8145
8146
8147
8148
8149
8150
8151
8152
8153
8154
8155
8156
8157
8158
8159
8160
8161
8162
8163
8164
8165
8166
8167
8168
8169
8170
8171
8172
8173
8174
8175
8176
8177
8178
8179
8180
8181
8182
8183
8184
8185
8186
8187
8188
8189
8190
8191
8192
8193
8194
8195
8196
8197
8198
8199
8200
8201
8202
8203
8204
8205
8206
8207
8208
8209
8210
8211
8212
8213
8214
8215
8216
8217
8218
8219
8220
8221
8222
8223
8224
8225
8226
8227
8228
8229
8230
8231
8232
8233
8234
8235
8236
8237
8238
8239
8240
8241
8242
8243
8244
8245
8246
8247
8248
8249
8250
8251
8252
8253
8254
8255
8256
8257
8258
8259
8260
8261
8262
8263
8264
8265
8266
8267
8268
8269
8270
8271
8272
8273
8274
8275
8276
8277
8278
8279
8280
8281
8282
8283
8284
8285
8286
8287
8288
8289
8290
8291
8292
8293
8294
8295
8296
8297
8298
8299
8300
8301
8302
8303
8304
8305
8306
8307
8308
8309
8310
8311
8312
8313
8314
8315
8316
8317
8318
8319
8320
8321
8322
8323
8324
8325
8326
8327
8328
8329
8330
8331
8332
8333
8334
8335
8336
8337
8338
8339
8340
8341
8342
8343
8344
8345
8346
8347
8348
8349
8350
8351
8352
8353
8354
8355
8356
8357
8358
8359
8360
8361
8362
8363
8364
8365
8366
8367
8368
8369
8370
8371
8372
8373
8374
8375
8376
8377
8378
8379
8380
8381
8382
8383
8384
8385
8386
8387
8388
8389
8390
8391
8392
8393
8394
8395
8396
8397
8398
8399
8400
8401
8402
8403
8404
8405
8406
8407
8408
8409
8410
8411
8412
8413
8414
8415
8416
8417
8418
8419
8420
8421
8422
8423
8424
8425
8426
8427
8428
8429
8430
8431
8432
8433
8434
8435
8436
8437
8438
8439
8440
8441
8442
8443
8444
8445
8446
8447
8448
8449
8450
8451
8452
8453
8454
8455
8456
8457
8458
8459
8460
8461
8462
8463
8464
8465
8466
8467
8468
8469
8470
8471
8472
8473
8474
8475
8476
8477
8478
8479
8480
8481
8482
8483
8484
8485
8486
8487
8488
8489
8490
8491
8492
8493
8494
8495
8496
8497
8498
8499
8500
8501
8502
8503
8504
8505
8506
8507
8508
8509
8510
8511
8512
8513
8514
8515
8516
8517
8518
8519
8520
8521
8522
8523
8524
8525
8526
8527
8528
8529
8530
8531
8532
8533
8534
8535
8536
8537
8538
8539
8540
8541
8542
8543
8544
8545
8546
8547
8548
8549
8550
8551
8552
8553
8554
8555
8556
8557
8558
8559
8560
8561
8562
8563
8564
8565
8566
8567
8568
8569
8570
8571
8572
8573
8574
8575
8576
8577
8578
8579
8580
8581
8582
8583
8584
8585
8586
8587
8588
8589
8590
8591
8592
8593
8594
8595
8596
8597
8598
8599
8600
8601
8602
8603
8604
8605
8606
8607
8608
8609
8610
8611
8612
8613
8614
8615
8616
8617
8618
8619
8620
8621
8622
8623
8624
8625
8626
8627
8628
8629
8630
8631
8632
8633
8634
8635
8636
8637
8638
8639
8640
8641
8642
8643
8644
8645
8646
8647
8648
8649
8650
8651
8652
8653
8654
8655
8656
8657
8658
8659
8660
8661
8662
8663
8664
8665
8666
8667
8668
8669
8670
8671
8672
8673
8674
8675
8676
8677
8678
8679
8680
8681
8682
8683
8684
8685
8686
8687
8688
8689
8690
8691
8692
8693
8694
8695
8696
8697
8698
8699
8700
8701
8702
8703
8704
8705
8706
8707
8708
8709
8710
8711
8712
8713
8714
8715
8716
8717
8718
8719
8720
8721
8722
8723
8724
8725
8726
8727
8728
8729
8730
8731
8732
8733
8734
8735
8736
8737
8738
8739
8740
8741
8742
8743
8744
8745
8746
8747
8748
8749
8750
8751
8752
8753
8754
8755
8756
8757
8758
8759
8760
8761
8762
8763
8764
8765
8766
8767
8768
8769
8770
8771
8772
8773
8774
8775
8776
8777
8778
8779
8780
8781
8782
8783
8784
8785
8786
8787
8788
8789
8790
8791
8792
8793
8794
8795
8796
8797
8798
8799
8800
8801
8802
8803
8804
8805
8806
8807
8808
8809
8810
8811
8812
8813
8814
8815
8816
8817
8818
8819
8820
8821
8822
8823
8824
8825
8826
8827
8828
8829
8830
8831
8832
8833
8834
8835
8836
8837
8838
8839
8840
8841
8842
8843
8844
8845
8846
8847
8848
8849
8850
8851
8852
8853
8854
8855
8856
8857
8858
8859
8860
8861
8862
8863
8864
8865
8866
8867
8868
8869
8870
8871
8872
8873
8874
8875
8876
8877
8878
8879
8880
8881
8882
8883
8884
8885
8886
8887
8888
8889
8890
8891
8892
8893
8894
8895
8896
8897
8898
8899
8900
8901
8902
8903
8904
8905
8906
8907
8908
8909
8910
8911
8912
8913
8914
8915
8916
8917
8918
8919
8920
8921
8922
8923
8924
8925
8926
8927
8928
8929
8930
8931
8932
8933
8934
8935
8936
8937
8938
8939
8940
8941
8942
8943
8944
8945
8946
8947
8948
8949
8950
8951
8952
8953
8954
8955
8956
8957
8958
8959
8960
8961
8962
8963
8964
8965
8966
8967
8968
8969
8970
8971
8972
8973
8974
8975
8976
8977
8978
8979
8980
8981
8982
8983
8984
8985
8986
8987
8988
8989
8990
8991
8992
8993
8994
8995
8996
8997
8998
8999
9000
9001
9002
9003
9004
9005
9006
9007
9008
9009
9010
9011
9012
9013
9014
9015
9016
9017
9018
9019
9020
9021
9022
9023
9024
9025
9026
9027
9028
9029
9030
9031
9032
9033
9034
9035
9036
9037
9038
9039
9040
9041
9042
9043
9044
9045
9046
9047
9048
9049
9050
9051
9052
9053
9054
9055
9056
9057
9058
9059
9060
9061
9062
9063
9064
9065
9066
9067
9068
9069
9070
9071
9072
9073
9074
9075
9076
9077
9078
9079
9080
9081
9082
9083
9084
9085
9086
9087
9088
9089
9090
9091
9092
9093
9094
9095
9096
9097
9098
9099
9100
9101
9102
9103
9104
9105
9106
9107
9108
9109
9110
9111
9112
9113
9114
9115
9116
9117
9118
9119
9120
9121
9122
9123
9124
9125
9126
9127
9128
9129
9130
9131
9132
9133
9134
9135
9136
9137
9138
9139
9140
9141
9142
9143
9144
9145
9146
9147
9148
9149
9150
9151
9152
9153
9154
9155
9156
9157
9158
9159
9160
9161
9162
9163
9164
9165
9166
9167
9168
9169
9170
9171
9172
9173
9174
9175
9176
9177
9178
9179
9180
9181
9182
9183
9184
9185
9186
9187
9188
9189
9190
9191
9192
9193
9194
9195
9196
9197
9198
9199
9200
9201
9202
9203
9204
9205
9206
9207
9208
9209
9210
9211
9212
9213
9214
9215
9216
9217
9218
9219
9220
9221
9222
9223
9224
9225
9226
9227
9228
9229
9230
9231
9232
9233
9234
9235
9236
9237
9238
9239
9240
9241
9242
9243
9244
9245
9246
9247
9248
9249
9250
9251
9252
9253
9254
9255
9256
9257
9258
9259
9260
9261
9262
9263
9264
9265
9266
9267
9268
9269
9270
9271
9272
9273
9274
9275
9276
9277
9278
9279
9280
9281
9282
9283
9284
9285
9286
9287
9288
9289
9290
9291
9292
9293
9294
9295
9296
9297
9298
9299
9300
9301
9302
9303
9304
9305
9306
9307
9308
9309
9310
9311
9312
9313
9314
9315
9316
9317
9318
9319
9320
9321
9322
9323
9324
9325
9326
9327
9328
9329
9330
9331
9332
9333
9334
9335
9336
9337
9338
9339
9340
9341
9342
9343
9344
9345
9346
9347
9348
9349
9350
9351
9352
9353
9354
9355
9356
9357
9358
9359
9360
9361
9362
9363
9364
9365
9366
9367
9368
9369
9370
9371
9372
9373
9374
9375
9376
9377
9378
9379
9380
9381
9382
9383
9384
9385
9386
9387
9388
9389
9390
9391
9392
9393
9394
9395
9396
9397
9398
9399
9400
9401
9402
9403
9404
9405
9406
9407
9408
9409
9410
9411
9412
9413
9414
9415
9416
9417
9418
9419
9420
9421
9422
9423
9424
9425
9426
9427
9428
9429
9430
9431
9432
9433
9434
9435
9436
9437
9438
9439
9440
9441
9442
9443
9444
9445
9446
9447
9448
9449
9450
9451
9452
9453
9454
9455
9456
9457
9458
9459
9460
9461
9462
9463
9464
9465
9466
9467
9468
9469
9470
9471
9472
9473
9474
9475
9476
9477
9478
9479
9480
9481
9482
9483
9484
9485
9486
9487
9488
9489
9490
9491
9492
9493
9494
9495
9496
9497
9498
9499
9500
9501
9502
9503
9504
9505
9506
9507
9508
9509
9510
9511
9512
9513
9514
9515
9516
9517
9518
9519
9520
9521
9522
9523
9524
9525
9526
9527
9528
9529
9530
9531
9532
9533
9534
9535
9536
9537
9538
9539
9540
9541
9542
9543
9544
9545
9546
9547
9548
9549
9550
9551
9552
9553
9554
9555
9556
9557
9558
9559
9560
9561
9562
9563
9564
9565
9566
9567
9568
9569
9570
9571
9572
9573
9574
9575
9576
9577
9578
9579
9580
9581
9582
9583
9584
9585
9586
9587
9588
9589
9590
9591
9592
9593
9594
9595
9596
9597
9598
9599
9600
9601
9602
9603
9604
9605
9606
9607
9608
9609
9610
9611
9612
9613
9614
9615
9616
9617
9618
9619
9620
9621
9622
9623
9624
9625
9626
9627
9628
9629
9630
9631
9632
9633
9634
9635
9636
9637
9638
9639
9640
9641
9642
9643
9644
9645
9646
9647
9648
9649
9650
9651
9652
9653
9654
9655
9656
9657
9658
9659
9660
9661
9662
9663
9664
9665
9666
9667
9668
9669
9670
9671
9672
9673
9674
9675
9676
9677
9678
9679
9680
9681
9682
9683
9684
9685
9686
9687
9688
9689
9690
9691
9692
9693
9694
9695
9696
9697
9698
9699
9700
9701
9702
9703
9704
9705
9706
9707
9708
9709
9710
9711
9712
9713
9714
9715
9716
9717
9718
9719
9720
9721
9722
9723
9724
9725
9726
9727
9728
9729
9730
9731
9732
9733
9734
9735
9736
9737
9738
9739
9740
9741
9742
9743
9744
9745
9746
9747
9748
9749
9750
9751
9752
9753
9754
9755
9756
9757
9758
9759
9760
9761
9762
9763
9764
9765
9766
9767
9768
9769
9770
9771
9772
9773
9774
9775
9776
9777
9778
9779
9780
9781
9782
9783
9784
9785
9786
9787
9788
9789
9790
9791
9792
9793
9794
9795
9796
9797
9798
9799
9800
9801
9802
9803
9804
9805
9806
9807
9808
9809
9810
9811
9812
9813
9814
9815
9816
9817
9818
9819
9820
9821
9822
9823
9824
9825
9826
9827
9828
9829
9830
9831
9832
9833
9834
9835
9836
9837
9838
9839
9840
9841
9842
9843
9844
9845
9846
9847
9848
9849
9850
9851
9852
9853
9854
9855
9856
9857
9858
9859
9860
9861
9862
9863
9864
9865
9866
9867
9868
9869
9870
9871
9872
9873
9874
9875
9876
9877
9878
9879
9880
9881
9882
9883
9884
9885
9886
9887
9888
9889
9890
9891
9892
9893
9894
9895
9896
9897
9898
9899
9900
9901
9902
9903
9904
9905
9906
9907
9908
9909
9910
9911
9912
9913
9914
9915
9916
9917
9918
9919
9920
9921
9922
9923
9924
9925
9926
9927
9928
9929
9930
9931
9932
9933
9934
9935
9936
9937
9938
9939
9940
9941
9942
9943
9944
9945
9946
9947
9948
9949
9950
9951
9952
9953
9954
9955
9956
9957
9958
9959
9960
9961
9962
9963
9964
9965
9966
9967
9968
9969
9970
9971
9972
9973
9974
9975
9976
9977
9978
9979
9980
9981
9982
9983
9984
9985
9986
9987
9988
9989
9990
9991
9992
9993
9994
9995
9996
9997
9998
9999
10000
10001
10002
10003
10004
10005
10006
10007
10008
10009
10010
10011
10012
10013
10014
10015
10016
10017
10018
10019
10020
10021
10022
10023
10024
10025
10026
10027
10028
10029
10030
10031
10032
10033
10034
10035
10036
10037
10038
10039
10040
10041
10042
10043
10044
10045
10046
10047
10048
10049
10050
10051
10052
10053
10054
10055
10056
10057
10058
10059
10060
10061
10062
10063
10064
10065
10066
10067
10068
10069
10070
10071
10072
10073
10074
10075
10076
10077
10078
10079
10080
10081
10082
10083
10084
10085
10086
10087
10088
10089
10090
10091
10092
10093
10094
10095
10096
10097
10098
10099
10100
10101
10102
10103
10104
10105
10106
10107
10108
10109
10110
10111
10112
10113
10114
10115
10116
10117
10118
10119
10120
10121
10122
10123
10124
10125
10126
10127
10128
10129
10130
10131
10132
10133
10134
10135
10136
10137
10138
10139
10140
10141
10142
10143
10144
10145
10146
10147
10148
10149
10150
10151
10152
10153
10154
10155
10156
10157
10158
10159
10160
10161
10162
10163
10164
10165
10166
10167
10168
10169
10170
10171
10172
10173
10174
10175
10176
10177
10178
10179
10180
10181
10182
10183
10184
10185
10186
10187
10188
10189
10190
10191
10192
10193
10194
10195
10196
10197
10198
10199
10200
10201
10202
10203
10204
10205
10206
10207
10208
10209
10210
10211
10212
10213
10214
10215
10216
10217
10218
10219
10220
10221
10222
10223
10224
10225
10226
10227
10228
10229
10230
10231
10232
10233
10234
10235
10236
10237
10238
10239
10240
10241
10242
10243
10244
10245
10246
10247
10248
10249
10250
10251
10252
10253
10254
10255
10256
10257
10258
10259
10260
10261
10262
10263
10264
10265
10266
10267
10268
10269
10270
10271
10272
10273
10274
10275
10276
10277
10278
10279
10280
10281
10282
10283
10284
10285
10286
10287
10288
10289
10290
10291
10292
10293
10294
10295
10296
10297
10298
10299
10300
10301
10302
10303
10304
10305
10306
10307
10308
10309
10310
10311
10312
10313
10314
10315
10316
10317
10318
10319
10320
10321
10322
10323
10324
10325
10326
10327
10328
10329
10330
10331
10332
10333
10334
10335
10336
10337
10338
10339
10340
10341
10342
10343
10344
10345
10346
10347
10348
10349
10350
10351
10352
10353
10354
10355
10356
10357
10358
10359
10360
10361
10362
10363
10364
10365
10366
10367
10368
10369
10370
10371
10372
10373
10374
10375
10376
10377
10378
10379
10380
10381
10382
10383
10384
10385
10386
10387
10388
10389
10390
10391
10392
10393
10394
10395
10396
10397
10398
10399
10400
10401
10402
10403
10404
10405
10406
10407
10408
10409
10410
10411
10412
10413
10414
10415
10416
10417
10418
10419
10420
10421
10422
10423
10424
10425
10426
10427
10428
10429
10430
10431
10432
10433
10434
10435
10436
10437
10438
10439
10440
10441
10442
10443
10444
10445
10446
10447
10448
10449
10450
10451
10452
10453
10454
10455
10456
10457
10458
10459
10460
10461
10462
10463
10464
10465
10466
10467
10468
10469
10470
10471
10472
10473
10474
10475
10476
10477
10478
10479
10480
10481
10482
10483
10484
10485
10486
10487
10488
10489
10490
10491
10492
10493
10494
10495
10496
10497
10498
10499
10500
10501
10502
10503
10504
10505
10506
10507
10508
10509
10510
10511
10512
10513
10514
10515
10516
10517
10518
10519
10520
10521
10522
10523
10524
10525
10526
10527
10528
10529
10530
10531
10532
10533
10534
10535
10536
10537
10538
10539
10540
10541
10542
10543
10544
10545
10546
10547
10548
10549
10550
10551
10552
10553
10554
10555
10556
10557
10558
10559
10560
10561
10562
10563
10564
10565
10566
10567
10568
10569
10570
10571
10572
10573
10574
10575
10576
10577
10578
10579
10580
10581
10582
10583
10584
10585
10586
10587
10588
10589
10590
10591
10592
10593
10594
10595
10596
10597
10598
10599
10600
10601
10602
10603
10604
10605
10606
10607
10608
10609
10610
10611
10612
10613
10614
10615
10616
10617
10618
10619
10620
10621
10622
10623
10624
10625
10626
10627
10628
10629
10630
10631
10632
10633
10634
10635
10636
10637
10638
10639
10640
10641
10642
10643
10644
10645
10646
10647
10648
10649
10650
10651
10652
10653
10654
10655
10656
10657
10658
10659
10660
10661
10662
10663
10664
10665
10666
10667
10668
10669
10670
10671
10672
10673
10674
10675
10676
10677
10678
10679
10680
10681
10682
10683
10684
10685
10686
10687
10688
10689
10690
10691
10692
10693
10694
10695
10696
10697
10698
10699
10700
10701
10702
10703
10704
10705
10706
10707
10708
10709
10710
10711
10712
10713
10714
10715
10716
10717
10718
10719
10720
10721
10722
10723
10724
10725
10726
10727
10728
10729
10730
10731
10732
10733
10734
10735
10736
10737
10738
10739
10740
10741
10742
10743
10744
10745
10746
10747
10748
10749
10750
10751
10752
10753
10754
10755
10756
10757
10758
10759
10760
10761
10762
10763
10764
10765
10766
10767
10768
10769
10770
10771
10772
10773
10774
10775
10776
10777
10778
10779
10780
10781
10782
10783
10784
10785
10786
10787
10788
10789
10790
10791
10792
10793
10794
10795
10796
10797
10798
10799
10800
10801
10802
10803
10804
10805
10806
10807
10808
10809
10810
10811
10812
10813
10814
10815
10816
10817
10818
10819
10820
10821
10822
10823
10824
10825
10826
10827
10828
10829
10830
10831
10832
10833
10834
10835
10836
10837
10838
10839
10840
10841
10842
10843
10844
10845
10846
10847
10848
10849
10850
10851
10852
10853
10854
10855
10856
10857
10858
10859
10860
10861
10862
10863
10864
10865
10866
10867
10868
10869
10870
10871
10872
10873
10874
10875
10876
10877
10878
10879
10880
10881
10882
10883
10884
10885
10886
10887
10888
10889
10890
10891
10892
10893
10894
10895
10896
10897
10898
10899
10900
10901
10902
10903
10904
10905
10906
10907
10908
10909
10910
10911
10912
10913
10914
10915
10916
10917
10918
10919
10920
10921
10922
10923
10924
10925
10926
10927
10928
10929
10930
10931
10932
10933
10934
10935
10936
10937
10938
10939
10940
10941
10942
10943
10944
10945
10946
10947
10948
10949
10950
10951
10952
10953
10954
10955
10956
10957
10958
10959
10960
10961
10962
10963
10964
10965
10966
10967
10968
10969
10970
10971
10972
10973
10974
10975
10976
10977
10978
10979
10980
10981
10982
10983
10984
10985
10986
10987
10988
10989
10990
10991
10992
10993
10994
10995
10996
10997
10998
10999
11000
11001
11002
11003
11004
11005
11006
11007
11008
11009
11010
11011
11012
11013
11014
11015
11016
11017
11018
11019
11020
11021
11022
11023
11024
11025
11026
11027
11028
11029
11030
11031
11032
11033
11034
11035
11036
11037
11038
11039
11040
11041
11042
11043
11044
11045
11046
11047
11048
11049
11050
11051
11052
11053
11054
11055
11056
11057
11058
11059
11060
11061
11062
11063
11064
11065
11066
11067
11068
11069
11070
11071
11072
11073
11074
11075
11076
11077
11078
11079
11080
11081
11082
11083
11084
11085
11086
11087
11088
11089
11090
11091
11092
11093
11094
11095
11096
11097
11098
11099
11100
11101
11102
11103
11104
11105
11106
11107
11108
11109
11110
11111
11112
11113
11114
11115
11116
11117
11118
11119
11120
11121
11122
11123
11124
11125
11126
11127
11128
11129
11130
11131
11132
11133
11134
11135
11136
11137
11138
11139
11140
11141
11142
11143
11144
11145
11146
11147
11148
11149
11150
11151
11152
11153
11154
11155
11156
11157
11158
11159
11160
11161
11162
11163
11164
11165
11166
11167
11168
11169
11170
11171
11172
11173
11174
11175
11176
11177
11178
11179
11180
11181
11182
11183
11184
11185
11186
11187
11188
11189
11190
11191
11192
11193
11194
11195
11196
11197
11198
11199
11200
11201
11202
11203
11204
11205
11206
11207
11208
11209
11210
11211
11212
11213
11214
11215
11216
11217
11218
11219
11220
11221
11222
11223
11224
11225
11226
11227
11228
11229
11230
11231
11232
11233
11234
11235
11236
11237
11238
11239
11240
11241
11242
11243
11244
11245
11246
11247
11248
11249
11250
11251
11252
11253
11254
11255
11256
11257
11258
11259
11260
11261
11262
11263
11264
11265
11266
11267
11268
11269
11270
11271
11272
11273
11274
11275
11276
11277
11278
11279
11280
11281
11282
11283
11284
11285
11286
11287
11288
11289
11290
11291
11292
11293
11294
11295
11296
11297
11298
11299
11300
11301
11302
11303
11304
11305
11306
11307
11308
11309
11310
11311
11312
11313
11314
11315
11316
11317
11318
11319
11320
11321
11322
11323
11324
11325
11326
11327
11328
11329
11330
11331
11332
11333
11334
11335
11336
11337
11338
11339
11340
11341
11342
11343
11344
11345
11346
11347
11348
11349
11350
11351
11352
11353
11354
11355
11356
11357
11358
11359
11360
11361
11362
11363
11364
11365
11366
11367
11368
11369
11370
11371
11372
11373
11374
11375
11376
11377
11378
11379
11380
11381
11382
11383
11384
11385
11386
11387
11388
11389
11390
11391
11392
11393
11394
11395
11396
11397
11398
11399
11400
11401
11402
11403
11404
11405
11406
11407
11408
11409
11410
11411
11412
11413
11414
11415
11416
11417
11418
11419
11420
11421
11422
11423
11424
11425
11426
11427
11428
11429
11430
11431
11432
11433
11434
11435
11436
11437
11438
11439
11440
11441
11442
11443
11444
11445
11446
11447
11448
11449
11450
11451
11452
11453
11454
11455
11456
11457
11458
11459
11460
11461
11462
11463
11464
11465
11466
11467
11468
11469
11470
11471
11472
11473
11474
11475
11476
11477
11478
11479
11480
11481
11482
11483
11484
11485
11486
11487
11488
11489
11490
11491
11492
11493
11494
11495
11496
11497
11498
11499
11500
11501
11502
11503
11504
11505
11506
11507
11508
11509
11510
11511
11512
11513
11514
11515
11516
11517
11518
11519
11520
11521
11522
11523
11524
11525
11526
11527
11528
11529
11530
11531
11532
11533
11534
11535
11536
11537
11538
11539
11540
11541
11542
11543
11544
11545
11546
11547
11548
11549
11550
11551
11552
11553
11554
11555
11556
11557
11558
11559
11560
11561
11562
11563
11564
11565
11566
11567
11568
11569
11570
11571
11572
11573
11574
11575
11576
11577
11578
11579
11580
11581
11582
11583
11584
11585
11586
11587
11588
11589
11590
11591
11592
11593
11594
11595
11596
11597
11598
11599
11600
11601
11602
11603
11604
11605
11606
11607
11608
11609
11610
11611
11612
11613
11614
11615
11616
11617
11618
11619
11620
11621
11622
11623
11624
11625
11626
11627
11628
11629
11630
11631
11632
11633
11634
11635
11636
11637
11638
11639
11640
11641
11642
11643
11644
11645
11646
11647
11648
11649
11650
11651
11652
11653
11654
11655
11656
11657
11658
11659
11660
11661
11662
11663
11664
11665
11666
11667
11668
11669
11670
11671
11672
11673
11674
11675
11676
11677
11678
11679
11680
11681
11682
11683
11684
11685
11686
11687
11688
11689
11690
11691
11692
11693
11694
11695
11696
11697
11698
11699
11700
11701
11702
11703
11704
11705
11706
11707
11708
11709
11710
11711
11712
11713
11714
11715
11716
11717
11718
11719
11720
11721
11722
11723
11724
11725
11726
11727
11728
11729
11730
11731
11732
11733
11734
11735
11736
11737
11738
11739
11740
11741
11742
11743
11744
11745
11746
11747
11748
11749
11750
11751
11752
11753
11754
11755
11756
11757
11758
11759
11760
11761
11762
11763
11764
11765
11766
11767
11768
11769
11770
11771
11772
11773
11774
11775
11776
11777
11778
11779
11780
11781
11782
11783
11784
11785
11786
11787
11788
11789
11790
11791
11792
11793
11794
11795
11796
11797
11798
11799
11800
11801
11802
11803
11804
11805
11806
11807
11808
11809
11810
11811
11812
11813
11814
11815
11816
11817
11818
11819
11820
11821
11822
11823
11824
11825
11826
11827
11828
11829
11830
11831
11832
11833
11834
11835
11836
11837
11838
11839
11840
11841
11842
11843
11844
11845
11846
11847
11848
11849
11850
11851
11852
11853
11854
11855
11856
11857
11858
11859
11860
11861
11862
11863
11864
11865
11866
11867
11868
11869
11870
11871
11872
11873
11874
11875
11876
11877
11878
11879
11880
11881
11882
11883
11884
11885
11886
11887
11888
11889
11890
11891
11892
11893
11894
11895
11896
11897
11898
11899
11900
11901
11902
11903
11904
11905
11906
11907
11908
11909
11910
11911
11912
11913
11914
11915
11916
11917
11918
11919
11920
11921
11922
11923
11924
11925
11926
11927
11928
11929
11930
11931
11932
11933
11934
11935
11936
11937
11938
11939
11940
11941
11942
11943
11944
11945
11946
11947
11948
11949
11950
11951
11952
11953
11954
11955
11956
11957
11958
11959
11960
11961
11962
11963
11964
11965
11966
11967
11968
11969
11970
11971
11972
11973
11974
11975
11976
11977
11978
11979
11980
11981
11982
11983
11984
11985
11986
11987
11988
11989
11990
11991
11992
11993
11994
11995
11996
11997
11998
11999
12000
12001
12002
12003
12004
12005
12006
12007
12008
12009
12010
12011
12012
12013
12014
12015
12016
12017
12018
12019
12020
12021
12022
12023
12024
12025
12026
12027
12028
12029
12030
12031
12032
12033
12034
12035
12036
12037
12038
12039
12040
12041
12042
12043
12044
12045
12046
12047
12048
12049
12050
12051
12052
12053
12054
12055
12056
12057
12058
12059
12060
12061
12062
12063
12064
12065
12066
12067
12068
12069
12070
12071
12072
12073
12074
12075
12076
12077
12078
12079
12080
12081
12082
12083
12084
12085
12086
12087
12088
12089
12090
12091
12092
12093
12094
12095
12096
12097
12098
12099
12100
12101
12102
12103
12104
12105
12106
12107
12108
12109
12110
12111
12112
12113
12114
12115
12116
12117
12118
12119
12120
12121
12122
12123
12124
12125
12126
12127
12128
12129
12130
12131
12132
12133
12134
12135
12136
12137
12138
12139
12140
12141
12142
12143
12144
12145
12146
12147
12148
12149
12150
12151
12152
12153
12154
12155
12156
12157
12158
12159
12160
12161
12162
12163
12164
12165
12166
12167
12168
12169
12170
12171
12172
12173
12174
12175
12176
12177
12178
12179
12180
12181
12182
12183
12184
12185
12186
12187
12188
12189
12190
12191
12192
12193
12194
12195
12196
12197
12198
12199
12200
12201
12202
12203
12204
12205
12206
12207
12208
12209
12210
12211
12212
12213
12214
12215
12216
12217
12218
12219
12220
12221
12222
12223
12224
12225
12226
12227
12228
12229
12230
12231
12232
12233
12234
12235
12236
12237
12238
12239
12240
12241
12242
12243
12244
12245
12246
12247
12248
12249
12250
12251
12252
12253
12254
12255
12256
12257
12258
12259
12260
12261
12262
12263
12264
12265
12266
12267
12268
12269
12270
12271
12272
12273
12274
12275
12276
12277
12278
12279
12280
12281
12282
12283
12284
12285
12286
12287
12288
12289
12290
12291
12292
12293
12294
12295
12296
12297
12298
12299
12300
12301
12302
12303
12304
12305
12306
12307
12308
12309
12310
12311
12312
12313
12314
12315
12316
12317
12318
12319
12320
12321
12322
12323
12324
12325
12326
12327
12328
12329
12330
12331
12332
12333
12334
12335
12336
12337
12338
12339
12340
12341
12342
12343
12344
12345
12346
12347
12348
12349
12350
12351
12352
12353
12354
12355
12356
12357
12358
12359
12360
12361
12362
12363
12364
12365
12366
12367
12368
12369
12370
12371
12372
12373
12374
12375
12376
12377
12378
12379
12380
12381
12382
12383
12384
12385
12386
12387
12388
12389
12390
12391
12392
12393
12394
12395
12396
12397
12398
12399
12400
12401
12402
12403
12404
12405
12406
12407
12408
12409
12410
12411
12412
12413
12414
12415
12416
12417
12418
12419
12420
12421
12422
12423
12424
12425
12426
12427
12428
12429
12430
12431
12432
12433
12434
12435
12436
12437
12438
12439
12440
12441
12442
12443
12444
12445
12446
12447
12448
12449
12450
12451
12452
12453
12454
12455
12456
12457
12458
12459
12460
12461
12462
12463
12464
12465
12466
12467
12468
12469
12470
12471
12472
12473
12474
12475
12476
12477
12478
12479
12480
12481
12482
12483
12484
12485
12486
12487
12488
12489
12490
12491
12492
12493
12494
12495
12496
12497
12498
12499
12500
12501
12502
12503
12504
12505
12506
12507
12508
12509
12510
12511
12512
12513
12514
12515
12516
12517
12518
12519
12520
12521
12522
12523
12524
12525
12526
12527
12528
12529
12530
12531
12532
12533
12534
12535
12536
12537
12538
12539
12540
12541
12542
12543
12544
12545
12546
12547
12548
12549
12550
12551
12552
12553
12554
12555
12556
12557
12558
12559
12560
12561
12562
12563
12564
12565
12566
12567
12568
12569
12570
12571
12572
12573
12574
12575
12576
12577
12578
12579
12580
12581
12582
12583
12584
12585
12586
12587
12588
12589
12590
12591
12592
12593
12594
12595
12596
12597
12598
12599
12600
12601
12602
12603
12604
12605
12606
12607
12608
12609
12610
12611
12612
12613
12614
12615
12616
12617
12618
12619
12620
12621
12622
12623
12624
12625
12626
12627
12628
12629
12630
12631
12632
12633
12634
12635
12636
12637
12638
12639
12640
12641
12642
12643
12644
12645
12646
12647
12648
12649
12650
12651
12652
12653
12654
12655
12656
12657
12658
12659
12660
12661
12662
12663
12664
12665
12666
12667
12668
12669
12670
12671
12672
12673
12674
12675
12676
12677
12678
12679
12680
12681
12682
12683
12684
12685
12686
12687
12688
12689
12690
12691
12692
12693
12694
12695
12696
12697
12698
12699
12700
12701
12702
12703
12704
12705
12706
12707
12708
12709
12710
12711
12712
12713
12714
12715
12716
12717
12718
12719
12720
12721
12722
12723
12724
12725
12726
12727
12728
12729
12730
12731
12732
12733
12734
12735
12736
12737
12738
12739
12740
12741
12742
12743
12744
12745
12746
12747
12748
12749
12750
12751
12752
12753
12754
12755
12756
12757
12758
12759
12760
12761
12762
12763
12764
12765
12766
12767
12768
12769
12770
12771
12772
12773
12774
12775
12776
12777
12778
12779
12780
12781
12782
12783
12784
12785
12786
12787
12788
12789
12790
12791
12792
12793
12794
12795
12796
12797
12798
12799
12800
12801
12802
12803
12804
12805
12806
12807
12808
12809
12810
12811
12812
12813
12814
12815
12816
12817
12818
12819
12820
12821
12822
12823
12824
12825
12826
12827
12828
12829
12830
12831
12832
12833
12834
12835
12836
12837
12838
12839
12840
12841
12842
12843
12844
12845
12846
12847
12848
12849
12850
12851
12852
12853
12854
12855
12856
12857
12858
12859
12860
12861
12862
12863
12864
12865
12866
12867
12868
12869
12870
12871
12872
12873
12874
12875
12876
12877
12878
12879
12880
12881
12882
12883
12884
12885
12886
12887
12888
12889
12890
12891
12892
12893
12894
12895
12896
12897
12898
12899
12900
12901
12902
12903
12904
12905
12906
12907
12908
12909
12910
12911
12912
12913
12914
12915
12916
12917
12918
12919
12920
12921
12922
12923
12924
12925
12926
12927
12928
12929
12930
12931
12932
12933
12934
12935
12936
12937
12938
12939
12940
12941
12942
12943
12944
12945
12946
12947
12948
12949
12950
12951
12952
12953
12954
12955
12956
12957
12958
12959
12960
12961
12962
12963
12964
12965
12966
12967
12968
12969
12970
12971
12972
12973
12974
12975
12976
12977
12978
12979
12980
12981
12982
12983
12984
12985
12986
12987
12988
12989
12990
12991
12992
12993
12994
12995
12996
12997
12998
12999
13000
13001
13002
13003
13004
13005
13006
13007
13008
13009
13010
13011
13012
13013
13014
13015
13016
13017
13018
13019
13020
13021
13022
13023
13024
13025
13026
13027
13028
13029
13030
13031
13032
13033
13034
13035
13036
13037
13038
13039
13040
13041
13042
13043
13044
13045
13046
13047
13048
13049
13050
13051
13052
13053
13054
13055
13056
13057
13058
13059
13060
13061
13062
13063
13064
13065
13066
13067
13068
13069
13070
13071
13072
13073
13074
13075
13076
13077
13078
13079
13080
13081
13082
13083
13084
13085
13086
13087
13088
13089
13090
13091
13092
13093
13094
13095
13096
13097
13098
13099
13100
13101
13102
13103
13104
13105
13106
13107
13108
13109
13110
13111
13112
13113
13114
13115
13116
13117
13118
13119
13120
13121
13122
13123
13124
13125
13126
13127
13128
13129
13130
13131
13132
13133
13134
13135
13136
13137
13138
13139
13140
13141
13142
13143
13144
13145
13146
13147
13148
13149
13150
13151
13152
13153
13154
13155
13156
13157
13158
13159
13160
13161
13162
13163
13164
13165
13166
13167
13168
13169
13170
13171
13172
13173
13174
13175
13176
13177
13178
13179
13180
13181
13182
13183
13184
13185
13186
13187
13188
13189
13190
13191
13192
13193
13194
13195
13196
13197
13198
13199
13200
13201
13202
13203
13204
13205
13206
13207
13208
13209
13210
13211
13212
13213
13214
13215
13216
13217
13218
13219
13220
13221
13222
13223
13224
13225
13226
13227
13228
13229
13230
13231
13232
13233
13234
13235
13236
13237
13238
13239
13240
13241
13242
13243
13244
13245
13246
13247
13248
13249
13250
13251
13252
13253
13254
13255
13256
13257
13258
13259
13260
13261
13262
13263
13264
13265
13266
13267
13268
13269
13270
13271
13272
13273
13274
13275
13276
13277
13278
13279
13280
13281
13282
13283
13284
13285
13286
13287
13288
13289
13290
13291
13292
13293
13294
13295
13296
13297
13298
13299
13300
13301
13302
13303
13304
13305
13306
13307
13308
13309
13310
13311
13312
13313
13314
13315
13316
13317
13318
13319
13320
13321
13322
13323
13324
13325
13326
13327
13328
13329
13330
13331
13332
13333
13334
13335
13336
13337
13338
13339
13340
13341
13342
13343
13344
13345
13346
13347
13348
13349
13350
13351
13352
13353
13354
13355
13356
13357
13358
13359
13360
13361
13362
13363
13364
13365
13366
13367
13368
13369
13370
13371
13372
13373
13374
13375
13376
13377
13378
13379
13380
13381
13382
13383
13384
13385
13386
13387
13388
13389
13390
13391
13392
13393
13394
13395
13396
13397
13398
13399
13400
13401
13402
13403
13404
13405
13406
13407
13408
13409
13410
13411
13412
13413
13414
13415
13416
13417
13418
13419
13420
13421
13422
13423
13424
13425
13426
13427
13428
13429
13430
13431
13432
13433
13434
13435
13436
13437
13438
13439
13440
13441
13442
13443
13444
13445
13446
13447
13448
13449
13450
13451
13452
13453
13454
13455
13456
13457
13458
13459
13460
13461
13462
13463
13464
13465
13466
13467
13468
13469
13470
13471
13472
13473
13474
13475
13476
13477
13478
13479
13480
13481
13482
13483
13484
13485
13486
13487
13488
13489
13490
13491
13492
13493
13494
13495
13496
13497
13498
13499
13500
13501
13502
13503
13504
13505
13506
13507
13508
13509
13510
13511
13512
13513
13514
13515
13516
13517
13518
13519
13520
13521
13522
13523
13524
13525
13526
13527
13528
13529
13530
13531
13532
13533
13534
13535
13536
13537
13538
13539
13540
13541
13542
13543
13544
13545
13546
13547
13548
13549
13550
13551
13552
13553
13554
13555
13556
13557
13558
13559
13560
13561
13562
13563
13564
13565
13566
13567
13568
13569
13570
13571
13572
13573
13574
13575
13576
13577
13578
13579
13580
13581
13582
13583
13584
13585
13586
13587
13588
13589
13590
13591
13592
13593
13594
13595
13596
13597
13598
13599
13600
13601
13602
13603
13604
13605
13606
13607
13608
13609
13610
13611
13612
13613
13614
13615
13616
13617
13618
13619
13620
13621
13622
13623
13624
13625
13626
13627
13628
13629
13630
13631
13632
13633
13634
13635
13636
13637
13638
13639
13640
13641
13642
13643
13644
13645
13646
13647
13648
13649
13650
13651
13652
13653
13654
13655
13656
13657
13658
13659
13660
13661
13662
13663
13664
13665
13666
13667
13668
13669
13670
13671
13672
13673
13674
13675
13676
13677
13678
13679
13680
13681
13682
13683
13684
13685
13686
13687
13688
13689
13690
13691
13692
13693
13694
13695
13696
13697
13698
13699
13700
13701
13702
13703
13704
13705
13706
13707
13708
13709
13710
13711
13712
13713
13714
13715
13716
13717
13718
13719
13720
13721
13722
13723
13724
13725
13726
13727
13728
13729
13730
13731
13732
13733
13734
13735
13736
13737
13738
13739
13740
13741
13742
13743
13744
13745
13746
13747
13748
13749
13750
13751
13752
13753
13754
13755
13756
13757
13758
13759
13760
13761
13762
13763
13764
13765
13766
13767
13768
13769
13770
13771
13772
13773
13774
13775
13776
13777
13778
13779
13780
13781
13782
13783
13784
13785
13786
13787
13788
13789
13790
13791
13792
13793
13794
13795
13796
13797
13798
13799
13800
13801
13802
13803
13804
13805
13806
13807
13808
13809
13810
13811
13812
13813
13814
13815
13816
13817
13818
13819
13820
13821
13822
13823
13824
13825
13826
13827
13828
13829
13830
13831
13832
13833
13834
13835
13836
13837
13838
13839
13840
13841
13842
13843
13844
13845
13846
13847
13848
13849
13850
13851
13852
13853
13854
13855
13856
13857
13858
13859
13860
13861
13862
13863
13864
13865
13866
13867
13868
13869
13870
13871
13872
13873
13874
13875
13876
13877
13878
13879
13880
13881
13882
13883
13884
13885
13886
13887
13888
13889
13890
13891
13892
13893
13894
13895
13896
13897
13898
13899
13900
13901
13902
13903
13904
13905
13906
13907
13908
13909
13910
13911
13912
13913
13914
13915
13916
13917
13918
13919
13920
13921
13922
13923
13924
13925
13926
13927
13928
13929
13930
13931
13932
13933
13934
13935
13936
13937
13938
13939
13940
13941
13942
13943
13944
13945
13946
13947
13948
13949
13950
13951
13952
13953
13954
13955
13956
13957
13958
13959
13960
13961
13962
13963
13964
13965
13966
13967
13968
13969
13970
13971
13972
13973
13974
13975
13976
13977
13978
13979
13980
13981
13982
13983
13984
13985
13986
13987
13988
13989
13990
13991
13992
13993
13994
13995
13996
13997
13998
13999
14000
14001
1999-12-31  Gerd Moellmann  <gerd@gnu.org>

	* xfns.c: New image functions adapted to Emacs conventions.
	(png_load, tiff_load, jpeg_load, gif_load): Always GCPRO local
	variable `file'.

1999-12-31  William M. Perry  <wmperry@aventail.com>

	* xfns.c (jpeg_format): Added the :data keyword
	(jpeg_image_p): JPEG is valid with :file _or_ :data
	(jpeg_memory_src): Defined new JPEG image source to read from a
	memory buffer.
	(jpeg_load): Pay attention to the :data keyword if specified.
	Instantiates a jpeg_memory_src instead of jpeg_stdio_src if found.
	(png_format): Added the :data keyword
	(png_image_p): PNG is valid with :file _or_ :data
	(png_read_from_memory): New PNG read function to read from a
	memory buffer.
	(png_load): Pay attention to the :data keyword if specified.
	Use png_set_read_fn() instead of png_init_io() if specified.
	(tiff_format): Added the :data keyword for TIFF images.
	(tiff_image_p): TIFF is valid with :file _or_ :data
	(tiff_read_from_memory): Defined new TIFF I/O functions to read
	from a memory buffer.
	(tiff_load): Pay attention to the :data keyword if specified.
	Uses TIFFClientOpen() instead of TIFFOpen() if specified.
	(gif_format): Added the :data keyword
	(gif_image_p): GIF is valid with :file _or_ :data
	(gif_read_from_memory): New GIF input function to read from a
	memory buffer.
	(gif_load): Pay attention to the :data keyword.  Uses DGifOpen()
	instead of DGifOpenFileName() if specified.

1999-12-31  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (next_element_from_buffer): Change assertion at the end
	because it doesn't hold when there's an overlay string at the end
	from which we deliver an image.

1999-12-30  Eli Zaretskii  <eliz@is.elta.co.il>

	* msdos.c (IT_update_begin): Don't dereference members of struct
	window for deleted windows.

1999-12-30  Gerd Moellmann  <gerd@gnu.org>

	* abbrev.c (Fexpand_abbrev): If expanding an abbrev which has only
	a hook, and the hook has a non-nil `no-self-insert' property, let
	the return value of the hook specify whether an expansion took
	place.  If it returns nil, no expansion has been performed.

	* xterm.c (x_make_frame_visible): Wait for frame becoming visible
	differently.

1999-12-30  Eli Zaretskii  <eliz@is.elta.co.il>

	* msdos.c (IT_write_glyphs): Track last changes to struct glyph.

1999-12-29  Eli Zaretskii  <eliz@is.elta.co.il>

	* dispnew.c (mode_line_string): Support MS-DOS frames.

1999-12-29  Gerd Moellmann  <gerd@gnu.org>

	* eval.c (syms_of_eval): Initialize debugger_may_continue.

1999-12-29  Kenichi Handa  <handa@etl.go.jp>

	* process.c (read_process_output): Fix the args CHARPOS and LENINS
	to signal_after_change.

1999-12-28  Eli Zaretskii  <eliz@is.elta.co.il>

	* msdos.c (dos_set_window_size) [__DJGPP__ > 1]: If the frame
	dimensions changed, invalidate the mouse highlight info.
	(disable_mouse_highlight, help_echo, previous_help_echo): New
	variables.
	(IT_set_mouse_pointer, show_mouse_face, clear_mouse_face)
	(fast_find_position, IT_note_mode_line_highlight)
	(IT_note_mouse_highlight): New functions.
	(IT_update_begin): If the redisplay affects the window where the
	mouse highlight is, clear the highlight.  If the frame where the
	highlight was displayed was killed, invalidate the highlight
	info.
	(IT_update_end): Reset the highlight flag.  Reset the mouse
	highlight-defer flag.
	(IT_frame_up_to_date): New function, if mouse highlight was
	deferred due to GC, do it now.
	(internal_terminal_init): Initialize mouse-highlight related
	members of the_only_x_display.  Assign IT_frame_up_to_date to
	frame_up_to_date_hook.
	(dos_rawgetc): If the mouse moved, update mouse highlight.  If
	help_echo changed value, generate a HELP_EVENT event.
	(syms_of_msdos): Staticpro help_echo and previous_help_echo.

	* msdos.h (struct display_info): New.
	(struct x_output): Add the display_info member.
	(FRAME_X_DISPLAY_INFO): New macro.

1999-12-28  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (try_window_id): Compute BEG_UNCHANGED and END_UNCHANGED
	if MODIFF > 1.
	(dump_glyph_row): Adapt to changes in struct glyph.

	* buffer.c (modify_overlay): Always compute unchanged info.

1999-12-27  Kenichi Handa  <handa@etl.go.jp>

	* dispextern.h (FACE_FROM_ID): Cast the arg ID to `unsigned'.

1999-12-27  Kenichi Handa  <handa@etl.go.jp>

	The following changes are to use more bits for face IDs.

	* lisp.h (GLYPH): Defined as `int', not `unsigned int'.  Now the
	lowest 8 bits are single byte character code, the bits above are
	face ID.
	(GLYPH_MASK_FACE, GLYPH_MASK_CHAR): Adjusted for the change
	above.
	(FAST_MAKE_GLYPH, FSST_GLYPH_FACE): Likewise.
	(GLYPH_MASK_REV_DIR, GLYPH_MASK_PADDING): Macros deleted.

	* charset.h (CHAR_BYTES): Use ((1 << CHARACTERBITS) - 1) instead
	of GLYPH_MASK_CHAR.

	* charset.c (char_bytes): Use ((1 << CHARACTERBITS) - 1) instead
	of GLYPH_MASK_CHAR.

	* dispextern.h (struct glyph): Make face_id and padding_p the top
	level members.  Change members in union `u'.
	(GLYPH_EQUAL_P): Check also members face_id and padding_p.
	(GLYPH_CHAR_AND_FACE_EQUAL_P): New macro.
	(SET_CHAR_GLYPH): Adjusted for the change of struct glyph.
	(CHAR_GLYPH_PADDING_P): Likewise.
	(GLYPH_FROM_CHAR_GLYPH): Likewise.  Always return -1 for multibyte
	characters.

	* dispnew.c (line_hash_code, direct_output_for_insert): Adjusted
	for the change of struct glyph.
	(line_draw_cost): Adjusted for the change of
	GLYPH_FROM_CHAR_GLYPH.
	(count_match): Use macro GLYPH_CHAR_AND_FACE_EQUAL_P.

	* term.c (encode_terminal_code): Adjusted for the change of struct
	glyph and GLYPH_FROM_CHAR_GLYPH.
	(write_glyphs, insert_glyphs, append_glyph): Adjusted for the
	change of struct glyph.

	* xdisp.c: All codes adjusted for the change of struct glyph.

	* xterm.c: All codes adjusted for the change of struct glyph.

1999-12-27  Kenichi Handa  <handa@etl.go.jp>

	* composite.h (struct composition): Change the order of declaring
	members to reduce the byte size of the structure.

1999-12-25  Gerd Moellmann  <gerd@gnu.org>

	* search.c (looking_at_1): Reset immediate_quit before modifying
	global data.

1999-12-24  Kenichi Handa  <handa@etl.go.jp>

	* process.c (read_process_output): Fix the arg FROM to
	update_compositions.

1999-12-22  Richard M. Stallman  <rms@gnu.org>

	* search.c (Freplace_match): For nonliteral replacement in buffer,
	construct all the new text first, then insert all at once.

1999-12-22  Dave Love  <fx@gnu.org>

	* xfns.c (Fx_show_tip): Gcpro `timeout' too.

1999-12-22  Gerd Moellmann  <gerd@gnu.org>

	* xfns.c (Fx_create_frame): Move x_default_parameter calls that
	lead to size changes to after the X window has been created.

	* xfaces.c (realize_x_face): Don't use uninitialized local
	variable in xassert.

1999-12-22  Kenichi Handa  <handa@etl.go.jp>

	* xfaces.c (face_color_supported_p): Check by tty_defined_color
	only when the frame is not for a window system.

1999-12-22  Gerd Moellmann  <gerd@gnu.org>

	* buffer.c (Fset_buffer_multibyte): Arrange for a thorough
	redisplay after changing the multibyteness of a buffer.

	* xterm.c (XTread_socket): At the beginning of the loop, pass the
	frame's X window to XFilterEvent instead of None because that's
	the X window for which the IC was created.  This makes dead
	accents work when the pointer is not in Emacs' frame.
	(XTread_socket) <KeyPress>: Don't call XFilterEvent here.

1999-12-20  Dave Love  <fx@gnu.org>

	* xfns.c (Fx_show_tip): Add missing UNGCPRO.

1999-12-19  Gerd Moellmann  <gerd@gnu.org>

	* eval.c (debugger_may_continue): New variable.
	(syms_of_eval): Add a DEFVAR_BOOL for it.
	(call_debugger): Bind it.

1999-12-19  Eli Zaretskii  <eliz@is.elta.co.il>

	* msdos.c (IT_set_face): Don't swap face colors when highlight or
	fp->tty_reverse_p is set, unless the computed colors are identical
	to frame colors.  Print both original and computed colors to
	termscript file.
	(IT_write_glyphs): Track the changes in handling of composite
	characters.
	(IT_set_frame_parameters): Don't set frame colors from
	unspecified-fg and unspecified-bg pseudo-colors.

1999-12-17  Dave Love  <fx@gnu.org>

	* data.c (Fkeywordp): New function.
	(syms_of_data): Install it.

1999-12-16  Eli Zaretskii  <eliz@is.elta.co.il>

	* xfaces.c (tty_defined_color): Fix last change.

1999-12-15  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (redisplay_window) <optional new window start>: Check
	that window start is in [BEGV..ZV].

1999-12-15  Eli Zaretskii  <eliz@is.elta.co.il>

	* dispextern.h (FACE_TTY_DEFAULT_FG_COLOR)
	(FACE_TTY_DEFAULT_BG_COLOR):  New macros.

	* xfaces.c (Qunspecified_fg, Qunspecified_bg): New variables.
	(syms_of_xfaces): Initialize and staticpro them.
	(tty_defined_color): If the color name is unspecified-fg or
	unspecified-bg, return FACE_TTY_DEFAULT_FG_COLOR and
	FACE_TTY_DEFAULT_BG_COLOR, respectively, as the pixel value.
	(tty_color_name): If the color pixel value is either
	FACE_TTY_DEFAULT_FG_COLOR or FACE_TTY_DEFAULT_BG_COLOR, return
	Qunspecified_fg or Qunspecified_bg, respectively.
	(Finternal_set_lisp_face_attribute): Allow values Qunspecified_fg
	and Qunspecified_bg for foreground and background colors.
	(realize_default_face): If the foreground and background colors
	are not specified, default to Qunspecified_fg and Qunspecified_bg.
	(realize_tty_face): By default, set the face colors to
	FACE_TTY_DEFAULT_FG_COLOR and FACE_TTY_DEFAULT_BG_COLOR.
	[MSDOS]: Handle FACE_TTY_DEFAULT_FG_COLOR and
	FACE_TTY_DEFAULT_BG_COLOR when face colors are not defined.
	Reverse the colors if the default colors were reversed.

	* dispnew.c (init_display): Initialize the frame pixels of the
	initial frame to FACE_TTY_DEFAULT_FG_COLOR and
	FACE_TTY_DEFAULT_BG_COLOR.

	* term.c (turn_on_face): If the default fore- and background
	colors are reversed, enter inverse video mode.  Don't send color
	escape sequences for unspecified foreground and background colors.
	(turn_off_face): Handle unspecified-fg and unspecified-bg colors.

	* dosfns.c (unspecified_colors): New variable.
	(msdos_stdcolor_idx): Handle unspecified-fg and unspecified-bg
	color names, return FACE_TTY_DEFAULT_FG_COLOR and
	FACE_TTY_DEFAULT_BG_COLOR, respectively.
	(msdos_stdcolor_name): Handle FACE_TTY_DEFAULT_FG_COLOR and
	FACE_TTY_DEFAULT_BG_COLOR, return Qunspecified_fg and
	Qunspecified_bg, respectively.

	* msdos.c (IT_set_face): Support FACE_TTY_DEFAULT_FG_COLOR and
	FACE_TTY_DEFAULT_BG_COLOR as pixel values.

1999-12-15  Kenichi Handa  <handa@etl.go.jp>

	* coding.c (code_convert_region): Fix the secoding arg to
	update_compositions.

1999-12-15  Kenichi Handa  <handa@etl.go.jp>

	The following changes are for the new composition mechanism.  We
	have deleted `composition' charset and composite characters,
	instead introduced a special text property `composition'.

	* Makefile.in (INTERVAL_SRC): Include composite.h.
	(INTERVAL_OBJ): Include composite.o.
	(SOME_MACHINE_OBJECTS): Include composite.o.
	(casefiddle.o) (dispnew.o) (indent.o) (process.o) (search.o)
	(syntax.o) (window.o) (xdisp.o) (xfaces.o) (xterm.o) (print.o):
	Depend on composite.h.
	(doc.o): Depend on charset.h.
	(keyboard.o) (textprop.o) (intervals.o): Depend on INTERVAL_SRC.
	(composite.o): New target.

	* alloc.c (Fmake_string): Adjusted for the change of CHAR_STRING.

	* callproc.c (Fcall_process): Call code_convert_string to encode
	arguments.  Use CODING_REQUIRE_DECODING to check if the process
	output should be decoded.

	* casefiddle.c: Include composite.h.
	(casify_object): Use MAX_MULTIBYTE_LENGTH to allocate memory for a
	multibyte character.  Adjusted for the change of CHAR_STRING.
	(casify_region): Likewise.  Call update_compositions.

	* category.h (CATEGORY_SET): Delete codes for a composite
	character.

	* category.c (word_boundary_p): Delete codes for a composite
	character.
	(Fmake_category_table): New function.
	(syms_of_category): Defsubr it.

	* ccl.c (CCL_WRITE_CHAR): Adjusted for the change of CHAR_STRING.
	(ccl_driver): Delete codes for a composite character.

	* charset.h: In this entry, just `Modified' means that codes for a
	composite character is deleted.
	(LEADING_CODE_COMPOSITION) (CHARSET_COMPOSITION)
	(charset_composition) (MIN_CHAR_COMPOSITION)
	(MAX_CHAR_COMPOSITION) (GENERIC_COMPOSITION_CHAR)
	(COMPOSITE_CHAR_P) (MAKE_COMPOSITE_CHAR) (COMPOSITE_CHAR_ID)
	(PARSE_COMPOSITE_SEQ) (PARSE_CHARACTER_SEQ): Deleted.
	(MAX_CHAR) (CHARSET_VALID_P) (CHARSET_DEFINED_P) (CHARSET_AT)
	(FIRST_CHARSET_AT) (SAME_CHARSET_P) (MAKE_NON_ASCII_CHAR)
	(PARSE_MULTIBYTE_SEQ) (SPLIT_NON_ASCII_CHAR) (CHAR_PRINTABLE_P):
	Modified.
	(SPLIT_STRING): Call split_string, not split_non_ascii_string.
	(CHAR_STRING): Delete WORKBUF argument.  Call char_string, not
	non_ascii_char_to_string.
	(STRING_CHAR): Call string_to_char, not string_to_non_ascii_char.
	(STRING_CHAR_AND_LENGTH): Likewise.
	(FETCH_CHAR_ADVANCE): New macro.
	(MAX_COMPONENT_COUNT) (struct cmpchar_info): Deleted.
	(MAX_MULTIBYTE_LENGTH): New macro.
	(MAX_LENGTH_OF_MULTI_BYTE_FORM): Deleted.
	(find_charset_in_str): Argument adjusted.
	(CHAR_LEN): Modified.

	* charset.c: In this entry, just `Modified' means that codes for a
	composite character is deleted.
	(Qcomposition) (leading_code_composition)
	(charset_composition) (min_composite_char) (cmpchar_table)
	(cmpchar_table_size) (n_cmpchars): Deleted.
	(SPLIT_COMPOSITE_SEQ): Deleted.
	(SPLIT_MULTIBYTE_SEQ): Modified.
	(char_to_string): Renamed from non_ascii_char_to_string.
	Modified.
	(string_to_char): Renamed from string_to_non_ascii_char.
	(split_string): Renamed from split_non_ascii_string.
	(char_printable_p) (Fsplit_char)
	(Ffind_charset_region) (Ffind_charset_string) (char_valid_p)
	(char_bytes) (Fchar_width) (strwidth): Modified.
	(find_charset_in_str): Argument CMPCHARP deleted.  Modified.
	(Fstring): Adjusted for the change of CHAR_STRING.  Modified.
	(hash_string) (CMPCHAR_HASH_TABLE_SIZE) (cmpchar_hash_table)
	(CMPCHAR_HASH_SIZE) (CMPCHAR_HASH_USED) (CMPCHAR_HASH_CMPCHAR_ID)
	(str_cmpchar_id) (cmpchar_component) (Fcmpcharp)
	(Fcmpchar_component) (Fcmpchar_cmp_rule) (Fcmpchar_cmp_rule_p)
	(Fcmpchar_cmp_count): Deleted.
	(Fcompose_string): Implemented by Emacs Lisp in composite.el.
	(init_charset_once): Modified.
	(syms_of_charset): Modified.

	* cmds.c (internal_self_insert): Adjusted for the change of
	CHAR_STRING.

	* coding.h (emacs_code_class_type): Delete the member
	EMACS_leading_code_composition.
	(COMPOSING_NO) (COMPOSING_WITH_RULE_HEAD) (COMPOSING_NO_RULE_HEAD)
	(COMPOSING_WITH_RULE_TAIL) (COMPOSING_NO_RULE_TAIL)
	(COMPOSING_WITH_RULE_RULE) (COMPOSING_HEAD_P)
	(COMPOSING_WITH_RULE_P): Macros deleted.
	(COMPOSITION_DATA_SIZE) (COMPOSITION_DATA_MAX_BUNCH_LENGTH): New
	macros.
	(struct composition_data): New structure.
	(CODING_FINISH_INSUFFICIENT_CMP): New macro.
	(struct coding_system): New members composition_rule_follows,
	cmp_data, cmp_data_start, cmp_data_index.
	(coding_save_composition) (coding_free_composition_data)
	(coding_adjust_composition_offset): Extern them.

	* coding.c: Include composite.h.
	(DECODE_CHARACTER_ASCII): Don't handle composition here.
	(DECODE_CHARACTER_DIMENSION1): Likewise.  Don't check the validity
	of multibyte code here.
	(DECODE_CHARACTER_DIMENSION2): Likewise.
	(detect_coding_emacs_mule): Change the case label from
	EMACS_leading_code_composition to 0x80.
	(detect_coding_iso2022): Handle new composition sequence.
	(DECODE_ISO_CHARACTER): Likewise.
	(check_composing_code): Deleted.
	(coding_allocate_composition_data): New function.
	(CODING_ADD_COMPOSITION_START) (CODING_ADD_COMPOSITION_END)
	(CODING_ADD_COMPOSITION_COMPONENT) (DECODE_COMPOSITION_START)
	(DECODE_COMPOSITION_END) (DECODE_COMPOSITION_RULE): New macros.
	(decode_coding_iso2022): Handle new composition sequence.
	(ENCODE_ISO_CHARACTER): Don't check composition here.
	(ENCODE_COMPOSITION_RULE) (ENCODE_COMPOSITION_START): New macros.
	(ENCODE_COMPOSITION_NO_RULE_START)
	(ENCODE_COMPOSITION_WITH_RULE_START): Deleted.
	(ENCODE_COMPOSITION_END): Handle new composition sequence.
	(ENCODE_COMPOSITION_FAKE_START): New macro.
	(encode_coding_iso2022): Handle new composition sequence.
	(ENCODE_SJIS_BIG5_CHARACTER): Delete superfluous `;' at the tail.
	(encode_coding_sjis_big5): Ignore composition.
	(setup_coding_system): Initialize new members of struct
	coding_system.  Enable composition only when the coding system has
	`composition' property t.
	(coding_free_composition_data) (coding_adjust_composition_offset)
	(coding_save_composition) (coding_restore_composition): New
	functions.
	(code_convert_region): Call coding_save_composition for encoding
	and coding_allocate_composition_data for decoding.  Don't skip
	ASCII characters if we handle composition on encoding.  Call
	signal_after_change with Check_BORDER.
	(code_convert_string): Call coding_save_composition for encoding
	and coding_allocate_composition_data for decoding.  Don't skip
	ASCII characters if we handle composition on encoding.
	(code_convert_string1): Set Vlast_coding_system_used after calling
	code_convert_string.
	(code_convert_string_norecord): Disable composition.
	(Fset_terminal_coding_system_internal): Likewise.
	(Fset_safe_terminal_coding_system_internal): Likewise.
	(Fset_keyboard_coding_system_internal): Likewise.
	(init_coding_once): Set emacs_code_class[0x80] to
	EMACS_invalid_code.

	* composite.h: New file.

	* composite.c: New file.

	* data.c (Faref): Delete codes for a composite character..
	(Faset): Likewise.  Adjusted for the change of CHAR_STRING.

	* dispextern.h (enum glyph_type): New member COMPOSITE_GLYPH.
	(struct glyph): Add new sub-structure cmp to the union `u'.
	(enum display_element_type): New member IT_COMPOSITION.
	(enum prop_idx): New member COMPOSITION_PROP_IDX.
	(struct it): New members cmp_id, cmp_len.

	* dispnew.c (direct_output_forward_char): Check point moving into
	or out of a composition.  If so, give up direct method.

	* doprnt.c (doprnt1): Adjusted for the change of CHAR_STRING.

	* editfns.c (Fchar_to_string): Adjusted for the change of
	CHAR_STRING.
	(general_insert_function): Likewise.
	(Finsert_char): Likewise.
	(Fsubst_char_in_region): Likewise.  Call update_compositions.
	(Ftranslate_region): Call update_compositions.
	(Ftranspose_regions): Call update_compositions.

	* emacs.c (main): Call syms_of_composite.

	* fileio.c (Fsubstitute_in_file_name): Adjusted for the change of
	CHAR_STRING.
	(Finsert_file_contents): Set Vlast_coding_system_used before
	calling signal_after_change.  Call update_compositions if some
	texts are inserted..
	(Fwrite_region): Adjusted for the change of a_write and e_write.
	(a_write): Argument changed.  Work based on character position,
	not byte position.
	(e_write): Argument changed.  Handle new way of composition.

	* fns.c (Flength): The length of char-table is MAX_CHAR.
	(concat): Adjusted for the change of CHAR_STRING.
	(Ffillarray): Adjusted for the change of CHAR_STRING.
	(Fset_char_table_default): Delete codes for a composite character.
	(hash_put): Return hash index.

	* fontset.h (struct font_info): New member vertical_centering.
	(Vvertical_centering_font_regexp): Extern it.

	* fontset.c (Vvertical_centering_font_regexp): New variable.
	(syms_of_fontset): Declare it as a Lisp variable and initialize.
	Set Vignore_relative_composition to nil.
	(fs_load_font): Initialize `vertical_centering' of struct
	font_info.

	* indent.c (check_composition): New function.
	(MULTIBYTE_BYTES_WIDTH): Call STRING_CHAR_AND_LENGTH with
	MAX_MULTIBYTE_LENGTH, not MAX_LENGTH_OF_MULTI_BYTE_FORM.
	(current_column_1): Handle new way of composition.
	(Fmove_to_column): Likewise.
	(compute_motion): Likewise.

	* insdel.c (copy_text): Adjusted for the change of CHAR_STRING.
	(insert_char): Likewise.
	(insert): Call update_compositions.
	(insert_and_inherit): Likewise.
	(insert_before_markers): Likewise.
	(insert_before_markers_and_inherit): Likewise.
	(insert_from_string): Likewise.
	(insert_from_string_before_markers): Likewise.
	(insert_from_buffer): Likewise.
	(replace_range): Likewise.
	(count_combining_composition): Deleted.
	(count_combining_before): Delete codes for a composite character.
	(count_combining_after): Likewise.
	(del_range_1): Call update_compositions.
	(del_range_byte): Likewise.
	(del_range_both): Likewise.
	(Fcombine_after_change_execute): Likewise.

	* intervals.h: Include composite.h.
	(get_property_and_range): Extern it.
	(Vtext_property_default_nonsticky): Extern it.

	* intervals.c (adjust_intervals_for_insertion): To check stickines
	of properties, pay attention to text-property-default-nonsticky.
	(merge_properties_sticky): Likewise.
	(get_property_and_range): New function.

	* keyboard.c (Vdisable_point_adjustment): New variable.
	(Vglobal_disable_point_adjustment): New variable.
	(syms_of_keyboard): Declare them as Lisp variables.
	(command_loop_1): Check them and call adjust_point_for_property if
	necessary.
	(adjust_point_for_property): New function.

	* keymap.c (push_key_description): Adjusted for the change of
	CHAR_STRING.
	(Ftext_char_description): Likewise.

	* lisp.h (QCtest, QCweakness, Qequal): Extern them.
	(hash_put): Adjusted for the change of the definition.
	(signal_after_change): Likewise.
	(check_point_in_composition): Extern it.

	* lread.c (readchar): Adjusted for the change of CHAR_STRING.
	Delete a code that handles an invalid too-long multibyte sequence
	because we are now sure that we never encounter with such a
	sequence.
	(read_multibyte): Use macro MAX_MULTIBYTE_LENGTH, not
	MAX_LENGTH_OF_MULTI_BYTE_FORM.
	(init_obarray): Likewise.
	(read1): Likewise.  Adjusted for the change of CHAR_STRING.

	* print.c (printchar): Adjusted for the change of CHAR_STRING.

	* process.c: Include composite.h.
	(read_process_output): Call update_compositions.

	* regex.c (regex_compile): Adjusted for the change of CHAR_STRING.

	* search.c (search_buffer): Adjusted for the change of CHAR_STRING.

	* syntax.h (SYNTAX_ENTRY_INT): Delete codes for a composite
	character.

	* term.c (encode_terminal_code): Delete codes for a composite
	character.  Adjusted for the change of CHAR_STRING.
	(produce_glyphs): When called, it->what can be IT_COMPOSITION.
	Delete codes for a composite character.

	* textprop.c (Vtext_property_default_nonsticky): New variable
	(syms_of_textprop): Declare it as a Lisp variable.

	* window.c (Frecenter): Clear all caches of compositions.

	* xdisp.c (it_props): Add an entry for composition.
	(face_before_or_after_it_pos): For composition, check face of a
	character after the composition.
	(handle_composition_prop): New function.
	(get_next_display_element): Adjusted for the change of
	CHAR_STRING.
	(set_iterator_to_next): Handle the case that it->method ==
	next_element_from_composition.
	(next_element_from_composition): New function.
	(message_dolog): Adjusted for the change of CHAR_STRING.
	(set_message_1): Likewise.
	(check_point_in_composition): New function.
	(reconsider_clip_changes): If point moved into or out of
	composition, set b->clip_changed to 1 to force updating of the
	screen.
	(disp_char_vector): Delete codes for a composite character.
	(decode_mode_spec_coding): Adjusted for the change of CHAR_STRING.

	* xfaces.c (choose_face_fontset_font): Delete codes for a
	composite character.
	(realize_x_face): Likewise.  Change a place to set local variable
	`f' to avoid a bug of GCC 2.8.1 on Solaris.

	* xfns.c: Include intervals.h.
	(syms_of_xfns): Make `display' property nonsticky by default.

	* xselect.c (lisp_data_to_selection_data): Adjusted for the change
	for find_charset_in_str.

	* xterm.h (struct x_output): Change member font_baseline to
	baseline_offset.

	* xterm.c (x_append_glyph): Setup members of struct glyph properly
	for composition.
	(x_append_composite_glyph): New function.
	(VCENTER_BASELINE_OFFSET): New macro.
	(x_produce_glyphs): If it->what == IT_COMPOSITION, setup members
	of struct it for the composition.  Cache pixel offsets in the
	struct composition.  Delete codes for a composite character.
	Handle Vignore_relative_composition in composition code.
	(struct glyph_string): Delete member cmpcharp, add new member cmp.
	(x_set_cursor_gc): Check s->cmp, not s->cmpcharp.
	(x_compute_glyph_string_overhangs): Likewise.
	(x_get_glyph_overhangs): Delete codes for a composite character.
	(x_right_overwritten): Check s->cmp, not s->cmpcharp.
	(x_draw_glyph_string_background): Likewise.  Delete codes for
	checking s->gidx for a composition.
	(x_draw_glyph_string_foreground): Delete code for a composite
	character.
	(x_draw_composite_glyph_string_foreground): New function.
	(x_draw_glyph_string_box): Check s->cmp, not s->cmpcharp.
	(x_draw_glyph_string): Handle the case of COMPOSITE_GLYPH.
	(struct work): Deleted.
	(x_fill_composite_glyph_string): Argument changed.  Mostly
	rewritten for that.
	(x_fill_glyph_string): Don't check CHARSET_COMPOSITION.
	(BUILD_CHAR_GLYPH_STRINGS): Don't handle composition here.
	(BUILD_COMPOSITE_GLYPH_STRING): New macro.
	(BUILD_GLYPH_STRINGS): For composition, call
	BUILD_COMPOSITE_GLYPH_STRING.
	(x_new_font): Initialize f->output_data.x->baseline_offset, not
	f->output_data.x->font_baseline.

1999-12-14  Gerd Moellmann  <gerd@gnu.org>

	* xterm.c (show_mouse_face): Don't use updated_area, use
	TEXT_AREA.

1999-12-12  Richard M. Stallman  <rms@gnu.org>

	* minibuf.c (Fall_completions): Doc fix.

1999-12-12  Richard M. Stallman  <rms@gnu.org>

	* macros.c (Fstart_kbd_macro): Handle case where last-kbd-macro
	has been changed by the Lisp code.

1999-12-12  Gerd Moellmann  <gerd@gnu.org>

	* xfns.c: Indentation fixes.

1999-12-10  Stefan Monnier  <monnier@cs.yale.edu>

	* xterm.c (x_initialize): Only setup xaw3d_* if they've been declared.

1999-12-10  Gerd Moellmann  <gerd@gnu.org>

	* frame.h (FRAME_FOREGROUND_PIXEL, FRAME_BACKGROUND_PIXEL)
	[!MSDOS && !WINDOWSNT && !macintosh]: Moved here from xterm.h.

	* xterm.h (FRAME_FOREGROUND_PIXEL, FRAME_BACKGROUND_PIXEL): Moved
	to frame.h.

1999-12-09  Stefan Monnier  <monnier@cs.yale.edu>

	* keyboard.c (Qratio): New symbol.
	(scroll_bar_parts): Add `Qratio' to it.
	(syms_of_keyboard): Init `Qratio'.
	* termhooks.h (scroll_bar_part): Add `scroll_bar_move_ratio'.
	* xterm.c (#includes): Allow compilation with only Xaw.
	(xaw3d_arrow_scroll, xaw3d_pick_top): New variables.
	(xt_action_hook): Replace XAW3D by XAW.
	(xaw3d_jump_callback): Renamed to xaw_jump_callback.
	(xaw_jump_callback): Renamed from xaw3d_jump_callback.
	Determine epsilon dynamically and don't try to be too clever.
	(xaw3d_scroll_callback): Renamed to xaw_scroll_callback.
	(xaw_scroll_callback): Renamed from xaw3d_scroll_callback.
	Handle both Xaw3d with arrow-scrollbars and with Xaw-style
	scrollbar (using `ratio').
	(x_create_toolkit_scroll_bar): Try to detect which style of Xaw3d
	scrollbar we have so as to set it up more optimally and to fix
	xaw3d_arrow_scroll and xaw3d_pick_top.
	(x_set_toolkit_scroll_bar_thumb): Try to maintain 2 spare pixels at the
	bottom of the Xaw3d scrollbar, to work around its tendency to refuse
	shrinking the thumb.  Also make sure that `XawScrollbarSetThumb'
	is not ignored, using a major gross hack.
	(x_initialize): Init default values for xaw3d_arrow_scroll and
	xaw3d_pick_top.

1999-12-09  Dave Love  <fx@gnu.org>

	* frame.h: (PIX_TYPE) [! HAVE_X_WINDOWS]: Define PIX_TYPE.

1999-12-08  Gerd Moellmann  <gerd@gnu.org>

	* eval.c: Remove conditional compilation on `standalone'.
	(call_debugger): When entering the debugger while redisplaying,
	reset redisplaying_p, and go back to the top-level if the debugger
	returns.

1999-12-07  Gerd Moellmann  <gerd@gnu.org>

	* xfaces.c (x_set_menu_resources_from_menu_face): Make sure
	basic faces are realized before trying to use face `menu'.

	* window.c (delete_window): Block input for the time window
	matrices are being changed.

1999-12-07  Dave Love  <fx@gnu.org>

	* lread.c (Fintern_soft): Fix newlines in doc string.

1999-12-07  Alexandre Oliva  <oliva@dcc.unicamp.br>

	* unexelf.c: Include <syms.h>, not <sym.h> on IRIX.  Removed
	duplicate definition of ElfW.
	(find_section): Copied from unexsgi.c.
	(unexec): Use find_section.  Adjust whitespace.  Initialize
	new_data2_offset based on old_data, not sbss (this fixes a bug on
	IRIX6).  Change #ifdef __mips to __sgi, since it's IRIX-specific.
	Adjust test for presence of .mdebug section to the new return
	value of find_section.

1999-12-07  Gerd Moellmann  <gerd@gnu.org>

	* unexelf.c: Merge changes from 20.5.
	(unexec): Handle .lit4 and .lit8 unconditionally.

	* m/iris4d.h (UNEXEC) [USG5_4]: Use unexelf.o instead of
	unexsgi.o again.

	* m/iris5d.h (UNEXEC): Likewise.

1999-12-06  Stefan Monnier  <monnier@cs.yale.edu>

	* editfns.c (Fdelete_and_extract_region): New function.
	(syms_of_editfns): Register it.
	* insdel.c (del_range): Update del_range_1 call.
	(del_range_1, del_range_2): Add a ret_string argument to
	request that the deleted text be returned.
	(del_range_byte, del_range_both): Update del_range_2 call.
	* lisp.h (del_range_1, del_range_2): Change prototype
	* casefiddle.c (casify_region): Update del_range_1 call.
	* coding.c (code_convert_region): Update del_range_2 call.
	* fileio.c (Finsert_file_contents): Update del_range_2 call.

1999-12-06  Gerd Moellmann  <gerd@gnu.org>

	* xfaces.c (set_lface_from_font_name): Fix incomplete merge.

1999-12-04  Hrvoje Niksic  <hniksic@iskon.hr>

	* lread.c (Fintern_soft): Accept a symbol argument.

1999-12-06  Eli Zaretskii  <eliz@is.elta.co.il>

	* s/msdos.h (SYSTEM_PURESIZE_EXTRA): Reduce to 40000.

	* insdel.c (adjust_markers_for_delete): Fix last change.

1999-12-06  Eli Zaretskii  <eliz@is.elta.co.il>

	Changes for automatic remapping of X colors on terminal frames:

	* xfaces.c (XColor) [!HAVE_X_WINDOWS]: Provide a typedef for non-X
	frames.
	(Vface_tty_color_alist): Remove.
	(tty_defined_color): New function.
	(defined_color): Rewrite to support any type of frame.
	(tty_color_name): New function.
	(face_color_supported_p, Fface_color_gray_p,
	Fface_color_supported_p): Support non-X frames.
	(load_color): Enclose the color name in quotes, in the log
	messages.  Remove DOS-specific version of load_color.
	(realize_tty_face): Take the supported colors from
	tty-color-alist.  Support translation of X colors to the closest
	tty color, for both MSDOS and tty frames.
	[MSDOS]: Don't invert face colors if they were taken from the
	frame colors.
	(Fface_register_tty_color, Fface_clear_tty_colors): Remove.

	* frame.h (struct x_output) [!MSDOS, !WINDOWSNT, !HAVE_X_WINDOWS]:
	Define a mostly empty surrogate.
	(tty_display): Declare.

	* frame.c (make_terminal_frame) [!macintosh]: Don't use
	tty_display.
	(Fframe_parameters): Don't invert colors of non-FRAME_WINDOW_P
	frames when the frame's param_alist includes 'reverse.
	(tty_display): Define.
	(make_terminal_frame) [!MSDOS]: Assign &tty_display to the
	output_data.x member.
	(Fframe_parameters): Return foreground and background color names
	on tty frames as well, in addition to MSDOS frames.

	* msdos.h (DisplayWidth, DisplayHeight): Changes for Lisp_Object
	selected_frame.
	(struct x_output): Remove unused members; document who uses each
	member.
	(FRAME_PARAM_FACES, FRAME_N_PARAM_FACES, FRAME_DEFAULT_PARAM_FACE,
	FRAME_MODE_LINE_PARAM_FACE, FRAME_COMPUTED_FACES,
	FRAME_N_COMPUTED_FACES, FRAME_SIZE_COMPUTED_FACES,
	FRAME_DEFAULT_FACE, FRAME_MODE_LINE_FACE, unload_color): Remove
	unused macro definintions.

	* msdos.c (IT_set_frame_parameters): Don't call
	recompute_basic_faces, the next redisplay will, anyway.
	(x_current_display): Remove unused variable.
	Many functions: changes for Lisp_object selected_frame.
	(IT_set_face): If the tty_reverse_p flag is set for the face,
	reverse the foreground and background colors.
	(Fmsdos_remember_default_colors): New function.
	(syms_of_msdos): Defsubr it.
	(IT_set_frame_parameters): Use initial_screen_colors[] when
	creating a new frame.  If the frame parameters include 'reverse,
	swap the foreground and background colors.
	(internal_terminal_init): Initialize initial_screen_colors to -1.
	(syms_of_msdos): Add DEFVAR_BOOL for x-stretch-cursor, to shut up
	cus-start.el.

	* Makefile.in (lisp, shortlisp): Add lisp/term/tty-colors.elc.

	* xfns.c (x_defined_color): Rename from defined_color.  All
	callers changed.
	(Fxw_color_defined_p): Renamed from Fx_color_defined_p;
	all callers changed.
	(Fxw_color_values): Renamed from Fx_color_values; all callers
	changed.
	(Fxw_display_color_p): Renamed from Fx_display_color_p; all
	callers changed.
	(x_window_to_frame, x_any_window_to_frame,
	x_non_menubar_window_to_frame, x_menubar_window_to_frame,
	x_top_window_to_frame): Use !FRAME_X_P instead of
	f->output_data.nothing.
	* xterm.h (x_defined_color): Rename from defined_color.

	* w32fns.c (x_window_to_frame): Use FRAME_W32_P instead of
	f->output_data.nothing.
	(Fxw_color_defined_p): Renamed from Fx_color_defined_p;
	all callers changed.
	(Fxw_color_values): Renamed from Fx_color_values; all callers
	changed.
	(Fxw_display_color_p): Renamed from Fx_display_color_p; all
	callers changed.

	* dispextern.h (tty_color_name): Add prototype.

	* xmenu.c (menubar_id_to_frame): Use FRAME_WINDOW_P instead of
	f->output_data.nothing.
	* w32menu.c (menubar_id_to_frame): Likewise.
	* w32term.h (w32_output): Declare.

	* dosfns.c (Qmsdos_color_translate): Remove.
	(msdos_stdcolor_name): Now returns a Lisp_Object.
	* dosfns.h (Qmsdos_color_translate): Remove.

	* s/msdos.h (INTERNAL_TERMINAL): Add entries for color support.

1999-12-06  Kenichi Handa  <handa@etl.go.jp>

	* fileio.c (decide_coding_unwind): Renamed from
	set_auto_coding_unwind.
	(Finsert_file_contents): Make single unwind protect to call both
	Vset_auto_coding_function and Ffind_operation_coding_system.

	* insdel.c (adjust_markers_for_delete): Make it non-static.

1999-12-04  Stefan Monnier  <monnier@cs.yale.edu>

	* regex.c (regex_compile): Recognize *?, +? and ?? as non-greedy
	operators and handle them properly.
	* regex.h (RE_ALL_GREEDY): New option.
	(RE_UNMATCHED_RIGHT_PAREN_ORD): Moved to the end where alphabetic
	sorting would put it.
	(RE_SYNTAX_AWK, RE_SYNTAX_GREP, RE_SYNTAX_EGREP)
	(_RE_SYNTAX_POSIX_COMMON): Use the new option to keep old behavior.

1999-12-04  Dave Love  <d.love@dl.ac.uk>

	* m/arm.h: New file.

1999-12-03  Dave Love  <fx@gnu.org>

	* editfns.c (Fmessage_or_box): Use use_dialog_box.

1999-12-02  Gerd Moellmann  <gerd@gnu.org>

	* s/usg5-4.h (LIBS_SYSTEM): Add -lgen because that's needed
	for building with Motif.

	* m/iris4d.h (UNEXEC) [USG5_4]: Use unexsgi.o instead of
	unexelf.o.

	* m/iris5d.h (UNEXEC): Use unexsgi.o instead of unexelf.o.

1999-12-01  Dave Love  <fx@gnu.org>

	* emacs.c (main): Set LANG=C iff AX3_2 defined.

1999-11-28  Gerd Moellmann  <gerd@gnu.org>

	* systime.h (EMACS_TIME_CMP, EMACS_TIME_EQ, EMACS_TIME_NE)
	(EMACS_TIME_GT, EMACS_TIME_GE, EMACS_TIME_LT,EMACS_TIME_LE): New
	macros.

	* config.in (HAVE_SETITIMER, HAVE_UALARM): New.

1999-11-28  eliz  <eliz@dlpx1>

	* emacs.c (synchronize_locale): Avoid compiler warnings about
	pointer type mismatch.

1999-11-28  Gerd Moellmann  <gerd@gnu.org>

	* window.c (Fwindow_end): Don't call temp_set_pt_both with
	out of range position.

	* xterm.c (XTread_socket) <ClientMessage, Xatom_Scrollbar>:
	Switch off busy-cursor by setting inhibit_busy_cursor to 2.

1999-11-28  Eli Zaretskii  <eliz@is.elta.co.il>

	* charset.c (Fmake_char_internal): Print the charset ID when
	signalling an error.

	* emacs.c (synchronize_locale): Avoid compiler warnings about
	pointer type mismatch.

1999-11-26  Richard M. Stallman  <rms@gnu.org>

	* editfns.c (Fdelete_field): Make it noninteractive.  Return nil.

1999-11-26  Gerd Moellmann  <gerd@gnu.org>

	* puresize.h (BASE_PURESIZE): Increase to 550000.

	* textprop.c (set_text_properties): New function.  Like
	Fset_text_properties, but with additional parameter
	SIGNAL_AFTER_CHANGE_P.  If that is nil, don't signal after
	changes.
	(Fset_text_properties): Use it.

	* insdel.c (insert_1_both): Call set_text_properties with last
	parameter nil so that no after changes will be signaled.

	* lisp.h: Add prototype for set_text_properties.

	* xfaces.c (set_lface_from_font_name): Fix previous change.
	(recompute_basic_faces): Change assert to abort.

1999-11-25  Dave Love  <fx@gnu.org>

	* fns.c (Fnthcdr, Fnreverse): Inline cdr.
	(Fmember, Fdelq, Fdelete): Inline car.
	(Fy_or_n_p): Doc fix.

1999-11-25  Gerd Moellmann  <gerd@gnu.org>

	* xfaces.c (set_lface_from_font_name): New parameter may_fail_p.
	Callers changed.  If specified font name is bogus, and may_fail_p
	is not set, try to use a reasonable default.

	* dispnew.c (direct_output_for_insert): Set glyph row's
	displays_text_p flag.  Correct window's window_end_vpos if
	necessary.

1999-11-25  Paul Eggert  <eggert@twinsun.com>

	* emacs.c (fixup_locale): Don't bother to record initial locale.
	(synchronize_locale): If the desired locale is nil,
	treat it as if it were the empty string,
	so that we set the locale from the environment.

1999-11-25  Kenichi Handa  <handa@etl.go.jp>

	* fileio.c (Finsert_file_contents): Set buffer-file-coding-system
	of the current buffer via Fset.

1999-11-24  Dave Love  <fx@gnu.org>

	* xfaces.c: Don't duplicate Qmode_line definition done elsewhere.

	* xfns.c: Don't duplicate Qdisplay definition done elsewhere.

1999-11-24  Gerd Moellmann  <gerd@gnu.org>

	* lisp.h (enum pvec_type): Put PVEC_FLAG in #if 0.

	* emacs.c (PVEC_FLAG): New variable.

1999-11-23  Gerd Moellmann  <gerd@gnu.org>

	* unexaix.c (unexec): Use unsigned instead of uintptr_t because
	that fails on IBM PowerPC, AIX 4.2.

1999-11-22  Eli Zaretskii  <eliz@is.elta.co.il>

	* buffer.c (syms_of_buffer): Add %z, %Z, %m and %& to the doc
	string of mode-line-format.  Remove the obsolete %t.

1999-11-22  Gerd Moellmann  <gerd@gnu.org>

	* dispnew.c (direct_output_for_insert): Increment glyph positions
	for glyphs from buffer text only.

	* emacs.c (gdb_valbits, gdb_gctypebits, gdb_emacs_intbits)
	(gdb_data_seg_bits): New variables.

	* lisp.h (enum gdb_lisp_params): Put in #if 0, since it doesn't
	work on systems not allowing enumerators > INT_MAX, and it
	won't work if EMACS_INT is long long.

1999-11-22  Paul Eggert  <eggert@twinsun.com>

	Port to SunOS 4.1.x again.  Help out with Alpha port.
	Rename messages-locale to system-messages-locale,
	and likewise for time-locale.

	* callproc.c (strerror): Remove decl.
	* fileio.c (strerror): Likewise.
	* process.c (strerror): Likewise.
	* emacs.c (strerror): Likewise.
	(Vsystem_messages_locale): Renamed from Vmessages_locale.
	All uses changed.
	(Vprevious_system_messages_locale): Likewise, from
	Vprevious_messages_locale.
	(Vsystem_time_locale): Likewise, from Vtime_locale.
	(Vprevious_system_time_locale): Likewise, from Vprevious_time_locale.
	(ABORT_RETURN_TYPE): New macro.
	(abort): Return type is now ABORT_RETURN_TYPE.
	(main): Always invoke init_signals, even if POSIX_SIGNALS is not
	defined.
	(syms_of_emacs): messages-locale -> system-messages-locale,
	previous-messages-locale -> previous-system-messages-locale,
	time-locale -> system-time-locale,
	previous-time-locale -> previous-system-time-locale.

	* gmalloc.c (PP, __ptr_t): Assume ANSI C if STDC_HEADERS is defined.
	(const): Do not define; that's config.h's job.
	(<limits.h>): Include if HAVE_LIMITS_H is defined.
	(CHAR_BIT): Move test for definedness outside of limits.h condition.
	(<stddef.h>): Include if STDC_HEADERS is defined.
	(FREE_RETURN_TYPE): New macro.
	(free): Return type is now FREE_RETURN_TYPE.

	* lisp.h (synchronize_system_time_locale): Renamed from
	synchronize_time_locale.  All uses changed.
	(synchronize_system_messages_locale): Likewise, from
	synchronize_messages_locale.

	* m/alpha.h (malloc, realloc, calloc): Remove decls;
	stdlib.h now does this.

	* process.c (sys_siglist): Remove.

	* s/sunos4-0.h (ABORT_RETURN_TYPE, FREE_RETURN_TYPE):
	New macros.

	* syntax.c (scan_sexps_forward): Use abort, not assert.

	* sysdep.c (my_sys_siglist): New var.
	(sys_siglist): New macro.  Remove old initialized vars of same name.
	(init_signals): Initialize sys_siglist.

	* xfns.c (abort): Remove decl; stdlib.h now does this.

1999-11-18  Dave Love  <fx@gnu.org>

	* filelock.c: Add forward declaration for get_boot_time_1.

	* dispnew.c (Finternal_show_cursor_p): Fix doc string.

1999-11-18  Gerd Moellmann  <gerd@gnu.org>

	* buffer.h (struct buffer_text): Add comment about moving
	buffer text if REL_ALLOC is defined.

1999-11-18  Kenichi Handa  <handa@etl.go.jp>

	* lisp.h (KEY_DESCRIPTION_SIZE): New macro.

	* keyboard.c (echo_char): Use KEY_DESCRIPTION_SIZE to check free
	memory for push_key_description.

	* keymap.c (Fsingle_key_description): Use KEY_DESCRIPTION_SIZE to
	allocate memory for push_key_description.
	(describe_buffer_bindings): Likewise.

1999-11-17  Gerd Moellmann  <gerd@gnu.org>

	* xfns.c (Fx_show_busy_cursor): Doc-fix.
	(Fx_hide_busy_cursor): Ditto.

1999-11-17  Marco Walther <walther@siemens-pyramid.com>

	* unexsni.c (unexec): Handle .rel.dyn section.

1999-11-16  Dave Love  <fx@gnu.org>

	* doc.c (Fdocumentation): Remove gcpro here too.

1999-11-16  Gerd Moellmann  <gerd@gnu.org>

	* keyboard.c (command_loop_1): Remove no_redisplay.

1999-11-16  Richard M. Stallman  <rms@gnu.org>

	* print.c (PRINTPREPARE): Don't call setup_echo_area_for_printing
	in noninteractive.

1999-11-14  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (ensure_echo_area_buffers): New.
	(with_echo_area_buffer): Use it.
	(setup_echo_area_for_printing): Ditto.

	* buffer.c (indicate-empty-lines): Doc-fix.

1999-11-12  Gerd Moellmann  <gerd@gnu.org>

	* term.c (term_init): If "op" isn't available, don't support color
	because we can't switch back to the default foreground and
	background.

	* doc.c (Fdocumentation_property): Remove GCPRO because
	Fsubstitute_command_keys gcpro's the string.

1999-11-12  Kenichi Handa  <handa@etl.go.jp>

	* editfns.c (Ftranslate_region): Check the buffer multibyteness.

1999-11-11  Gerd Moellmann  <gerd@gnu.org>

	* print.c, keymap.c, indent.c, insdel.c, keyboard.c, intervals.c,
	lread.c, textprop.c, undo.c, emacs.c, lisp.h, intervals.h,
	buffer.h, config.in, Makefile.in: Remove USE_TEXT_PROPERTIES.

1999-11-10  Gerd Moellmann  <gerd@gnu.org>

	* xfns.c (QCuser_data): Removed.
	(syms_of_xfns): Initialization of QCuser_data removed.
	(parse_image_spec): Don't handle :user-data specially.  Allow
	unknown keys.  Remove parameter ALLOW_OTHER_KEYS.
	(xbm_image_p, xbm_load, xpm_image_p, pbm_image_p, png_image_p)
	(tiff_image_p, jpeg_image_p, gif_image_p, gs_image_p): Call
	parse_image_spec accordingly.

1999-11-09  Richard M. Stallman  <rms@gnu.org>

	* cmds.c (Fbeginning_of_line): Doc fix.
	(Fend_of_line): Doc fix.

	* editfns.c (Fline_beginning_position): If N is not 1,
	pass t to Fconstrain_to_field for ESCAPE-FROM-EDGE.

	* syntax.c (Fforward_word): Handle fields even if would have hit
	an edge of the buffer.  Return nil if affected by fields.

1999-11-09  Richard M. Stallman  <rms@gnu.org>

	* editfns.c (preceding_pos): Function deleted.
	(text_property_stickiness): Decrement POS directly.
	Fix a confusion that used PT instead of POS.

	* editfns.c (find_field): Properly handle the case
	of a field boundary where `field' inherits from neither side.

	* editfns.c (Ffield_beginning, Ffield_end): Doc fixes.
	(Ferase_field, Ffield_string, Ffield_string_no_properties): Doc fixes.

1999-11-08  Gerd Moellmann  <gerd@gnu.org>

	* bytecode.c (Fbyte_code) <BinsertN, Bcall>: Do the
	BEFORE_POTENTIAL_GC before DISCARD.

1999-11-07  Gerd Moellmann  <gerd@gnu.org>

	* alloc.c (Fgarbage_collect): Call unmark_byte_stack.

	* lisp.h: Add prototype for unmark_byte_stack.

	* bytecode.c (mark_byte_stack): Use XMARKBIT and XMARK.
	(unmark_byte_stack): Renamed from relocate_byte_pcs.  Use
	XUNMARK.

	* xdisp.c (resize_mini_window): Fix computation of needed
	mini-window height.

	* alloc.c, buffer.c, editfns.c, xdisp.c: Remove conditional
	compilation on USE_TEXT_PROPERTIES.

	* Fbyte_code: Use block statements in cases and declare v1 and v2
	locally there.  Rearrange case statements so that those most
	frequently executed come first.  Avoid goto's in frequently
	executed cases.

1999-11-05  Gerd Moellmann  <gerd@gnu.org>

	* bytecode.c (Fbyte_code): Use BEFORE_POTENTIAL_GC and
	AFTER_POTENTIAL_GC around internal_catch.

	* alloc.c (Fgarbage_collect): Call mark_byte_stack and
	relocate_byte_pcs.
	(init_alloc_once, init_alloc): Set byte_stack_list to null.

	* eval.c (struct catchtag): Add member byte_stack.
	(internal_catch, Fcondition_case, internal_condition_case)
	(internal_condition_case_1): Save value of byte_stack_list in
	catchtag.
	(unwind_to_catch): Restore byte_stack_list from catchtag.

	* lisp.h: Add prototypes for new functions in bytecode.c.
	Add extern declaration for byte_stack_list.

	* bytecode.c (struct byte_stack): New.
	(byte_stack_list, mark_byte_stack, relocate_byte_pcs): New
	(BEFORE_POTENTIAL_GC, AFTER_POTENTIAL_GC): New.
	(FETCH, PUSH, POP, DISCARD, TOP, MAYBE_GC): Rewritten.
	(HANDLE_RELOCATION): Removed.
	(Fbyte_code): Use byte_stack structures.

	* filelock.c (Ffile_locked_p): Make FILENAME a required argument.

	* buffer.c (syms_of_buffer): Extend documentation of
	mode-line-format.

1999-11-04  Gerd Moellmann  <gerd@gnu.org>

	* editfns.c (Fdelete_field): Renamed from Ferase_field.

	* minibuf.c (do_completion, Fminibuffer_complete_word): Use
	Ferase_field instead of Fdelete_field.

1999-11-03  Gerd Moellmann  <gerd@gnu.org>

	* dispnew.c (Finternal_show_cursor): Change it to set the
	cursor on/off, not toggle its state.
	(Finternal_show_cursor_p): New.
	(syms_of_display): Defsubr Sinternal_show_cursor_p.

1999-11-03  Dave Love  <fx@gnu.org>

	* charset.c (split_non_ascii_string): Define return value.

1999-11-03  Gerd Moellmann  <gerd@gnu.org>

	* minibuf.c (string_to_object): New.
	(read_minibuf_noninteractive): New.
	(read_minibuf): Call read_minibuf_noninteractive if
	noninteractive.  Use string_to_object.

	* doc.c (Fdocumentation_property): Fix bug bypassing UNGCPRO.

1999-11-02  Dave Love  <fx@gnu.org>

	* gnu-linux.h: Use SIGCHLD, not SIGCLD (not in glibc 2.1).

	* process.c: Define _GNU_SOURCE before config.h to get strsignal
	declared with glibc2.

1999-11-02  Gerd Moellmann  <gerd@gnu.org>

	* lisp.h (QUIT): Give it statement form.

1999-11-02  Dave Love  <fx@gnu.org>

	* eval.c (init_eval): Conditionalize declaration of gcpro_level.

1999-11-02  Gerd Moellmann  <gerd@gnu.org>

	* xfns.c (QCuser_data): New.
	(syms_of_xfns): Initialize QCuser_data.
	(parse_image_spec): Ignore :user-data DATA properties.

	* xdisp.c (display_line): Set charpos of first glyph in blank
	lines not corresponding to any text to -1, even if no glyphs are
	filled in in that line.

1999-11-01  Gerd Moellmann  <gerd@gnu.org>

	* xfns.c (png_load) [PNG_READ_sRGB_SUPPORTED]: Put code using
	png_get_sRGB in #ifdef.

	* dispnew.c (Finternal_show_cursor): Renamed from Fshow_cursor.
	(syms_of_display): Use the new name.

	* textprop.c (verify_interval_modification): Signal text-read-only
	instead of calling error.

	* data.c (Qtext_read_only): New built-in error.
	(syms_of_data): Initialize it.

	* lisp.h: Add extern declaration for Qtext_read_only.

	* syntax.c: Remove whitespace after open or in front of closing
	parentheses.

1999-11-01  Richard M. Stallman  <rms@gnu.org>

	* Makefile.in (w16select.o, sound.o): Don't depend on lisp.h.

1999-10-31  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (resize_mini_window): Compute needed height differently.

	* fns.c (Flength): Unroll loop over lists.

	* xdisp.c (append_space): Return non-zero if space was appended.
	(display_line): Set charpos of first glyph to -1 only if that
	glyph is the space added by append_glyph.

1999-10-30  Richard M. Stallman  <rms@gnu.org>

	* print.c (strout): Consider `noninteractive' and use stdout
	only when PRINTCHARFUN is t.

	* lisp.h (struct gcpro) [DEBUG_GCPRO]: New field `level'.
	(gcpro_level): Declare it extern.
	[DEBUG_GCPRO] (GCPRO1, GCPRO2, GCPRO3, GCPRO4, GCPRO5):
	Alternate definitions that set `level' and increment `gcpro_level'.
	[DEBUG_GCPRO] (UNGCPRO): Alternate definition that checks gcpro_level.

	* eval.c [DEBUG_GCPRO] (gcpro_level): New variable.
	(init_eval) [DEBUG_GCPRO]: Initialize it.
	(unwind_to_catch) [DEBUG_GCPRO]: Set gcpro_level
	from remaining gcprolist.

1999-10-29  Kenichi Handa  <handa@etl.go.jp>

	* coding.c (code_convert_region): Update `dst' correctly.

1999-10-28  Gerd Moellmann  <gerd@gnu.org>

	* fns.c (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
	(Frassoc): Rewritten.

1999-10-27  Noah Friedman  <friedman@splode.com>

	* s/gnu-linux.h [HAVE_DEV_PTMX]: Redefine FIRST_PTY_LETTER to 'z'.
	Define PTY_NAME_SPRINTF.
	Redefine PTY_TTY_NAME_SPRINTF.
	* config.in: Add undef for HAVE_DEV_PTMX.

1999-10-26  Richard M. Stallman  <rms@gnu.org>

	* regex.c (POP_FAILURE_POINT): Use failure_id.integer
	as arg to DEBUG_POP and DEBUG_PRINT.

1999-10-27  Richard M. Stallman  <rms@gnu.org>

	* data.c (Qad_activate_internal): Renamed from Qad_activate.
	(Ffset): Call Qad_activate_internal.
	(syms_of_data): Initialize Qad_activate_internal.

1999-10-27  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (echo_area_display) [HAVE_X_WINDOWS]: Do nothing if
	Vterminal_frame is selected and Vwindow_system is non-nil.

1999-10-26  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (echo_area_display): Put previous change in #if 0.

	* emacs.c (standard_args): Add `file' as synonym for `visit',
	`execute' as synonym for `eval'.
	(main): Add new options to usage message.

1999-10-25  Gerd Moellmann  <gerd@gnu.org>

	* data.c (Qhash_table): New.
	(Ftype_of): Return it for hash tables.
	(syms_of_data): Initialize Qhash_table.

1999-10-25  Richard M. Stallman  <rms@gnu.org>

	* regex.c (POP_FAILURE_POINT): Extract failure_id as an integer.

1999-10-24  Ken Raeburn  <raeburn@gnu.org>

	* alloc.c: Undef HIDE_LISP_IMPLEMENTATION before including
	lisp.h.

	* buffer.c (Fbuffer_list, Fget_file_buffer, get_truename_buffer,
	Fbuffer_local_variables, Fother_buffer, record_buffer,
	set_buffer_internal_1, Fbury_buffer, Fkill_all_local_variables,
	swap_out_buffer_local_variables, overlays_at, overlays_in,
	overlay_touches_p, overlay_strings, recenter_overlay_lists,
	fix_overlays_in_range, fix_overlays_before, Foverlay_get,
	Foverlay_put, report_overlay_modification, evaporate_overlays):
	Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member
	references.
	* data.c (Fcar, Fcar_safe, Fcdr, Fcdr_safe, Fsetcar, Fsetcdr,
	swap_in_symval_forwarding, set_internal, default_value,
	Fset_default, Fmake_variable_buffer_local, Fmake_local_variable,
	Fmake_variable_frame_local, Flocal_variable_p,
	Flocal_variable_if_set_p, arithcompare, Fzerop, cons_to_long,
	Fnumber_to_string, float_arith_driver, Fadd1, Fsub1): Likewise.
	* dispnew.c (Fframe_or_buffer_changed_p): Likewise.
	* emacs.c (main): Likewise.
	* fontset.c (fs_load_font, fs_register_fontset,
	CACHED_FONTSET_NAME, CACHED_FONTSET_REGEX, Fquery_fontset,
	Fnew_fontset, Fset_fontset_font): Likewise.
	* frame.c (do_switch_frame, next_frame, prev_frame,
	other_visible_frames, Fdelete_frame, Fvisible_frame_list):
	Likewise.
	* keyboard.c (read_char, help_char_p, event_to_kboard,
	kbd_buffer_get_event, timer_start_idle, timer_check,
	make_lispy_event, apply_modifiers, reorder_modifiers,
	Fevent_convert_list, lucid_event_type_list_p, menu_bar_items,
	menu_bar_one_keymap, menu_item_eval_property_1, parse_menu_item,
	tool_bar_items, read_char_x_menu_prompt, read_key_sequence,
	Fcommand_execute, Fexecute_extended_command): Likewise.
	* minibuf.c (read_minibuf, get_minibuffer, Ftry_completion,
	Fall_completions): Likewise.
	* window.c (Fset_window_margins): Likewise.

	* callint.c (quotify_args): Don't explicitly use struct
	Lisp_Cons, use Lisp_Object and XCAR/XCDR instead.

	* s/netbsd.h (HAVE_GETLOADAVG): Define as 1.
	(UNEXEC, START_FILES, LIB_STANDARD, LIB_GCC): Define ELF versions,
	if __ELF__ is defined.

1999-10-24  Gerd Moellmann  <gerd@gnu.org>

	* window.c (Fnext_window): Add a QUIT in the loop.

1999-10-23  Gerd Moellmann  <gerd@gnu.org>

	* Makefile.in (bootstrap, bootstrap-emacs, bootstrap-temacs):
	New targets.

1999-10-22  Dave Love  <fx@gnu.org>

	* emacs.c (main): Enable profiling conditional on __linux also.

1999-10-20  Gerd Moellmann  <gerd@gnu.org>

	* xrdb.c (x_load_resources): Set default resources for resource
	classes instead of for the specific Emacs.

1999-10-19  Gerd Moellmann  <gerd@gnu.org>

	* s/freebsd.h (HAVE_GETLOADAVG): Define as 1 because config.h
	defines it that way.

	* xdisp.c (echo_area_display) [HAVE_X_WINDOWS]: Do nothing
	if selected_frame is equal to Vterminal_frame.

1999-10-19  Paul Eggert  <eggert@twinsun.com>

	Add support for large files, 64-bit Solaris, system locale codings.

	* Makefile.in (emacs): Set the LC_ALL environment variable to "C"
	when dumping, so that the dumped Emacs doesn't have stray locale info.
	(dired.o): Depend on systime.h.
	(editfns.o): Depend on coding.h.

	* alloc.c, buffer.c, callproc.c, ccl.c, charset.c, coding.c, data.c,
	dispnew.c, editfns.c, emacs.c, filelock.c, floatfns.c, hftctl.c,
	keyboard.c, process.c, sysdep.c, unexelf.c, unexhp9k800.c,
	unexsunos4.c, vmsfns.c, vmsgmalloc.c, w32faces.c, w32menu.c, w32term.c,
	w32xfns.c, xfaces.c, xfns.c, xmenu.c, xterm.c:
	Include <config.h> before any system include files.

	* alloc.c, buffer.c, ccl.c, data.c, editfns.c, emacs.c, eval.c,
	fileio.c, filelock.c, frame.c, insdel.c, keymap.c, lread.c,
	m/alpha.h, print.c, search.c, sysdep.c, xdisp.c, xfaces.c, xfns.c,
	xmenu.c, xterm.c:
	Do not include <stdlib.h>, as <config.h> does this now.

	* callproc.c (Fcall_process):
	Synchronize messages locale before invoking strerror.
	Decode resulting string with locale-coding-system.

	* coding.c (Vlocale_coding_system): New var.
	(syms_of_coding): Adjust to above change.
	(emacs_strerror): New function.

	* coding.h (emacs_strerror, Vlocale_coding_system): New decls.

	* config.in (HAVE_STDIO_EXT_H, HAVE_TM_GMTOFF, HAVE___FPENDING,
	HAVE_FTELLO, HAVE_GETLOADAVG, HAVE_MBLEN, HAVE_MBRLEN,
	HAVE_STRSIGNAL): New macros.
	(BITS_PER_LONG): Default to 64 if _LP64 is defined.
	<stdlib.h>: Include if HAVE_STDLIB_H is defined and NOT_C_CODE isn't.

	* dired.c: Include "systime.h".
	(Ffile_attributes): Do not cast s.st_size to int; this loses
	information if int is 32 bits but st_size and EMACS_INT are larger.
	Treat large device numbers like large inode numbers.

	* dispnew.c (PENDING_OUTPUT_COUNT): Use __fpending if available.

	* editfns.c: Include coding.h.
	(emacs_strftime): Remove decl.
	(emacs_strftimeu): New decl.
	(emacs_memftimeu): Renamed from emacs_memftime; new arg UT.
	Use emacs_strftimeu instead of emacs_strftime.
	(Fformat_time_string): Convert format string using
	Vlocale_coding_system, and convert result back.  Synchronize time
	locale before invoking lower level function.  Invoke
	emacs_memftimeu, passing ut, instead of emacs_memftime.

	* emacs.c: Include <locale.h> if HAVE_SETLOCALE is defined.
	(Vmessages_locale, Vprevious_messages_locale, Vtime_locale,
	Vprevious_time_locale): New variables.
	(main): Invoke setlocale early, so that initial error messages are
	localized properly.  But skip locale-setting if LC_ALL is "C".
	Fix up locale when it's safe to do so.
	(fixup_locale): Moved here from xterm.c.
	(synchronize_locale, synchronize_time_locale,
	synchronize_messages_locale): New functions.
	(syms_of_emacs): Accommodate above changes.

	* fileio.c (report_file_error): Convert strerror output according
	to Vlocale_coding_system.
	(Finsert_file_contents): Check for arithmetic overflow in
	computations that depend on file size.  Report IO errors
	with emacs_strerror, not strerror.

	* fns.c (Fgethash): Declare dflt parameter.

	* gmalloc.c: Do not define const to nothing if HAVE_CONFIG_H
	is defined; that's config.h's job.

	* lisp.h (EMACS_INT, BITS_PER_EMACS_INT, EMACS_UINT): If _LP64,
	default these values to long, BITS_PER_LONG, and unsigned long.
	(VALBITS, MARKBIT, XINT): Do not assume 32-bit EMACS_INT.
	(PNTR_COMPARISON_TYPE): Default to EMACS_UINT, not to unsigned int.
	(code_convert_string_norecord, fixup_locale,
	synchronize_messages_locale, synchronize_time_locale,
	emacs_open, emacs_close, emacs_read, emacs_write): New decls.
	All Emacs callers of open, close, read, write changed to use
	emacs_open, emacs_close, emacs_read, emacs_write.

	* lread.c (file_offset, file_tell): New macros.  All uses of ftell
	changed to file_tell.
	(saved_doc_string_position, prev_saved_doc_string_position): Now
	of type file_offset.
	(init_lread): Do not fix locale here; fixup_locale now does this.

	* m/amdahl.h, s/usg5-4.h:
	(NSIG): Remove.
	(NSIG_MINIMUM): New macro.

	* m/cydra5.h, m/dpx2.h, m/mips.h, m/pfa50.h, m/sps7.h, m/stride.h,
	m/ustation.h, s/gnu-linux.h, s/hpux.h, s/iris3-5.h, s/iris3-6.h,
	s/umips.h, s/usg5-4.h:
	(SIGIO): Do not undef.
	(BROKEN_SIGIO): New macro.

	* m/ustation.h:
	(SIGTSTP): Do not undef.
	(BROKEN_SIGTSTP): New macro.

	* s/gnu-linux.h:
	(SIGPOLL, SIGURG): Do not undef.
	(BROKEN_SIGPOLL, BROKEN_SIGURG): New macros.

	* s/ptx4.h:
	(SIGINFO): Do not undef.
	(BROKEN_SIGINFO): New macros.

	* m/delta.h, s/ptx.h, s/template.h: Doc fix.

	* mktime.c, strftime.c: Update to glibc 2.1.2 version, with
	some Emacs-related changes merged.

	* print.c (float_to_string): Prepend "-" to representation of a
	NaN if the NaN is negative.

	* process.c (sys_siglist): Omit if HAVE_STRSIGNAL.
	(wait_reading_process_input): Use emacs_strerror, not strerror.

	* process.c (status_message, sigchld_handler): Synchronize locale,
	then use strsignal istead of sys_siglist.
	* w32proc.c (sys_wait): Likewise.

	* s/aix3-1.h, s/bsd4-1.h, s/dgux.h, s/gnu-linux.h, s/hiuxmpp.h,
	s/hpux.h, s/iris3-5.h, s/iris3-6.h, s/irix3-3.h, s/osf1.h, s/rtu.h,
	s/sunos4-1.h, s/unipl5-0.h, s/unipl5-2.h, s/usg5-0.h, s/usg5-2-2.h,
	s/usg5-2.h, s/usg5-3.h, s/xenix.h:
	(open, close, read, write, INTERRUPTIBLE_OPEN,
	INTERRUPTIBLE_CLOSE, INTERRUPTIBLE_IO): Remove.

	* s/sol2-5.h (_LARGEFILE_SOURCE, _FILE_OFFSET_BITS): New macros.

	* sysdep.c (sys_read, sys_write, read, write, sys_close, close,
	sys_open, open): Remove.
	(emacs_open, emacs_close, emacs_read, emacs_write): Always define;
	the old INTERRUPTIBLE_OPEN, INTERRUPTIBLE_CLOSE, and INTERRUPTIBLE_IO
	macros are no longer used.
	(emacs_open): Renamed from sys_open.  Merge BSD4_1 version.
	(emacs_close): Renamed from sys_close.
	(emacs_read): Renamed from sys_read.
	(emacs_write): Renamed from sys_write.
	(sys_siglist): Do not declare if HAVE_STRSIGNAL.
	(dup2): Do not print error on failure; the real dup2 doesn't.
	(strsignal): New function, defined if !HAVE_STRSIGNAL.

	* syssignal.h (SIGINFO): Undef if defined and if BROKEN_SIGINFO
	is defined.
	(SIGIO, SIGPOLL, SIGTSTP, SIGURG): Likewise.
	(NSIG): If less than NSIG_MINIMUM, define to NSIG_MINIMUM.
	(strsignal): Declare if !HAVE_STRSIGNAL.

	* unexelf.c (ElfBitsW, ELFSIZE, ElfExpandBitsW): New macros.
	(ElfW): Define in terms of ElfExpandBitsW.

	* w32proc.c (sys_siglist): Remove decl.

	* xdisp.c (decode_mode_spec): 3rd arg is int, not char, to comply
	with ANSI C.
	(display_string): Declare face_string_pos arg.

	* xfns.c (Fx_show_tip): Declare timeout param.

	* xterm.c: No need to include locale.h.
	(x_alloc_lighter_color, x_setup_relief_color):
	Pass arg as double, not float, for compatibility with ANSI C.
	(fixup_locale): Move to emacs.c.
	(x_term_init): Do not setlocale or fixup locale; the main program
	does this now.

1999-10-18  Dave Love  <fx@gnu.org>

	* doc.c (Fdocumentation_property): Gcpro `tem'.

1999-10-18  Kenichi Handa  <handa@etl.go.jp>

	* lread.c (Fload): Calculate bytes of filename correctly.
	(openp): Likewise.

1999-10-18  Keisuke Nishida  <kxn30@po.cwru.edu>

	* print.c (print_preprocess): In case print-circle is nil,
	add OBJ to Vprint_number_table only when OBJ is a symbol.

1999-10-18  Kenichi Handa  <handa@etl.go.jp>

	* coding.c (code_convert_string): Add record_unwind_protect to
	assure setting inhibit_pre_post_conversion back to zero.  Take
	care of the multibyteness of the working buffer.

	* coding.c (inhibit_pre_post_conversion): New variable.
	(setup_coding_system): If inhibit_pre_post_conversion is nonzero,
	ignore post-read-conversion and pre-write-conversion property of
	the coding system.
	(code_convert_region_unwind): New function.
	(code_convert_region): Set inhibit_pre_post_conversion to 1 while
	running pre-write-conversion and post-read-conversion.
	(code_convert_string): Likewise.

1999-10-17  Miles Bader  <miles@gnu.org>

	* editfns.c: Doc fix.

1999-10-17  Miles Bader  <miles@gnu.org>

	* editfns.c (Fconstrain_to_field): Make sure we don't violate the
	argument preconditions of find_before_next_newline in the case
	where both ONLY_IN_LINE and ESCAPE_FROM_EDGE are set and OLD_POS
	was indeed at the edge.

1999-10-17  Miles Bader  <miles@gnu.org>

	* minibuf.c (Fminibuffer_complete_and_exit): Supply value for new
	ESCAPE_FROM_EDGE parameter to Ffield_beginning.

	* editfns.c (text_property_eq, text_property_stickiness): Don't
	use initializers for auto variables of type Lisp_Object.
	(find_field): Likewise.  Use braces around nested ifs.
	(Fline_end_position): Store the raw eol in a variable, so that the
	final expression doesn't look so ugly.
	(Fconstrain_to_field): Doc fix.
	(preceding_pos): Renamed from `preceeding_pos'.
	(text_property_stickiness, find_field): Call preceding_pos,
	not preceeding_pos.

1999-10-17  Miles Bader  <miles@gnu.org>

	* editfns.c (Ffield_string_no_properties): New function.
	(text_property_stickiness, preceeding_pos): New functions.
	(Ffield_string): Remove PROPS parameter.
	(find_field): Add MERGE_AT_BOUNDARY parameter.
	Rewrite to use stickiness of `field' property to resolve
	ambiguous cases.
	(Ffield_beginning, Ffield_end): Add ESCAPE_FROM_EDGE parameter.
	(Fconstrain_to_field): Likewise.
	(syms_of_editfns): Init Sfield_string_no_properties.
	(Ffield_string, Ferase_field, Ffield_end):
	Supply new MERGE_AT_BOUNDARY argument to find_field.
	(Fline_beginning_position, Fline_end_position): Supply new
	ESCAPE_FROM_EDGE parameter to Fconstrain_to_field.
	Pass a value of Qt for the ONLY_IN_LINE argument to
	Fconstrain_to_field (only matters if N != 1).
	* syntax.c (Fforward_word): Supply new ESCAPE_FROM_EDGE parameter
	to Fconstrain_to_field.

	* minibuf.c (Fminibuffer_complete_word): Use
	Ffield_beginning to find the prompt end.

1999-10-17  Miles Bader  <miles@gnu.org>

	* editfns.c (Fconstrain_to_field): Add get/set-current-point
	behavior when NEW_POS is nil.
	(find_field): Use XSETFASTINT instead of make_number.
	* minibuf.c (Fminibuffer_complete_and_exit): Test for an empty
	input string by seeing where the field begins, instead of
	looking at text-properties.

1999-10-17  Miles Bader  <miles@gnu.org>

	* editfns.c (Qfield): New variable.
	(find_field, Ferase_field, Ffield_string,
	Ffield_beginning, Ffield_end, Fconstrain_to_field): New functions.
	(Fline_beginning_position, Fline_end_position): Constrain to any field.
	(make_buffer_string_both): Remove minibuffer-prompt hack.
	(syms_of_editfns): Initialize Qfield, and subr entries for
	field functions above.
	* minibuf.c (read_minibuf): Don't save minibuffer prompt length on
	minibuf_save_list.
	Don't initialize minibuffer prompt length.
	Wrap prompt text-properties around the entire prompt.
	Add 'prompt text-property to prompt.
	Get final value with Ffield_string instead of make_buffer_string.
	(read_minibuf_unwind): Don't restore minibuffer prompt length from
	minibuf_save_list.
	(do_completion): Get minibuffer input with Ffield_string
	instead of Fbuffer_string.
	Erase minibuffer input with Ferase_field instead of erase_buffer.
	(Fminibuffer_complete_and_exit): Likewise.
	Test whether buffer is empty by looking for the 'prompt text
	property at the end.
	Set prompt length by looking for the end of the prompt text property,
	and save prompt length for later use (since there is no longer a
	buffer variable to get it from).
	(Fminibuffer_prompt_width, Fminibuffer_prompt_end): Functions removed.
	(syms_of_minibuf): Remove initializations of
	Sminibuffer_prompt_width and Sminibuffer_prompt_end.
	* buffer.h (struct buffer): Remove prompt_end_charpos field.
	* buffer.c (Fget_buffer_create, Fmake_indirect_buffer, Fkill_buffer):
	Don't initialize prompt_end_charpos field.
	* syntax.c (Fforward_word): Likewise.
	Constrain to any field.

1999-10-16  Gerd Moellmann  <gerd@gnu.org>

	* window.c (enum save_restore_action): New.
	(save_restore_orig_size): Change parameter list.  Add
	functionality to check for valid orig_top and orig_height members
	in a window tree.
	(grow_mini_window): Call save_restore_orig_size with new parameter
	list.
	(shrink_mini_window): Restore old window sizes only if old
	size information is valid in all windows in a window tree.

1999-10-15  Gerd Moellmann  <gerd@gnu.org>

	* xmenu.c (set_frame_menubar): Don't call
	x_set_menu_resources_from_menu_face here.
	(update_frame_menubar): Call x_set_menu_resources_from_menu_face.

	* xfns.c (gif_load): Fix handling of interlaced GIFs.

1999-10-14  Dave Love  <fx@gnu.org>

	* xdisp.c (handle_fontified_prop): GCPRO `pos'.

1999-10-14  Gerd Moellmann  <gerd@gnu.org>

	* process.c (Fopen_network_stream): Don't loop if gethostbyname
	fails and h_errno is TRY_AGAIN.

1999-10-13  Dave Love  <fx@gnu.org>

	* filelock.c (lock_file): Move gcpro of `fn'.

1999-10-10  Gerd Moellmann  <gerd@gnu.org>

	* keyboard.c (auto-save-interval): Fix documentation.

1999-10-09  Richard M. Stallman  <rms@gnu.org>

	* print.c (print): When removing objects from Vprint_number_table,
	only scan the newly added objects.
	(print_preprocess): If OBJ is a gensym, and print-continuous-numbering,
	unconditionally force it to stay in the table.

1999-10-09  Gerd Moellmann  <gerd@gnu.org>

	* xfns.c (prepare_image_for_display): Don't try to load image if
	loading it failed before.
	(lookup_image, prepare_image_for_display): Remember if loading the
	image failed.
	(xpm_load): Add missing UNBLOCK_INPUT.

	* dispextern.h (struct image): New member load_failed_p.

1999-10-08  Stefan Monnier  <monnier@cs.yale.edu>

	* fileio.c (Fmake_temp_name): Add a reference to `make-temp-file'
	in the docstring.

1999-10-08  Gerd Moellmann  <gerd@gnu.org>

	* xterm.c (XTread_socket) <ClientMessage, WM_TAKE_FOCUS>:
	Don't call XSetInputFocus because that can generate additional
	FocusIn events.

1999-10-07  Jeffrey C Honig <jch@bsdi.com>

	* bsdos4.h [HAVE_LIBNCURSES]: Define TERMINFO and LIBS_TERMCAP.

1999-10-07  Richard M. Stallman  <rms@gnu.org>

	* process.c (wait_reading_process_input): When trying to suck
	input from one process, for accept-process-output,
	exit that loop if we get EAGAIN or EWOULDBLOCK.

1999-10-07  Gerd Moellmann  <gerd@gnu.org>

	* xfaces.c (Qbitmap_spec_p): Replaces Qpixmap_spec_p.
	(Fbitmap_spec_p): Replaces Fpixmap_spec_p.
	(load_pixmap): Use Fbitmap_spec_p and Qbitmap_spec_p instead of
	Fpixmap_spec_p and Qpixmap_spec_p.
	(load_face_colors, check_lface_attrs,
	merge_face_vector_with_property,
	Finternal_set_lisp_face_attribute): Use Fbitmap_spec_p.
	(syms_of_xfaces): Initialize Qbitmap_spec_p, defsubr
	Fbitmap_spec_p.

1999-10-07  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (display_menu_bar): Use MENU_FACE_ID instead of
	MODE_LINE_FACE_ID.

	* xfaces.c (toplevel) [USE_MOTIF]: Include some Motif headers.
	(struct x_resources) [USE_X_TOOLKIT]: New.
	(xm_apply_resources, xm_set_menu_resources_from_menu_face)
	[USE_MOTIF]: New.
	(xl_apply_resources, xl_set_menu_resources_from_menu_face)
	[USE_LUCID]: New.
	(x_set_menu_resources_from_menu_face) [USE_X_TOOLKIT]: New.
	(Qmenu): New.
	(syms_of_xfaces): Initialize Qmenu.
	(realize_basic_faces): Realize face `menu'.
	(resolve_face_name): New.
	(lface_from_face_name): Use it.
	(Finternal_set_lisp_face_attribute): Ditto.
	(Fpixmap_spec_p): Rewritten.  Extend doc string.

	* xmenu.c (set_frame_menubar, xmenu_show): Call
	x_set_menu_resources_from_menu_face.

	* dispextern.h (enum face_id): Add MENU_FACE_ID.
	(toplevel): Include X11/Intrinsic.h.

1999-10-03  Ken'ichi Handa  <handa@gnu.org>

	* coding.c (DECODE_CHARACTER_ASCII): Decode ASCII invocated to GR
	correctly.

1999-09-30  Kenichi Handa  <handa@etl.go.jp>

	* category.c (modify_lower_category_set): Set default value of
	TABLE correctly.

	* minibuf.c (Fminibuffer_complete_word): Calculate string byte
	size correctly.

1999-09-29  Gerd Moellmann  <gerd@gnu.org>

	* editfns.c (Fpropertize): Renamed from Fproperties.

1999-09-29  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (resize_mini_window): Do nothing if frame is an X
	frame that hasn't been initialized yet.

1999-09-28  Richard M. Stallman  <rms@gnu.org>

	* keymap.c (Fsingle_key_description): Make tem big enough.
	(describe_buffer_bindings): Make buf big enough.

1999-09-27  Richard M. Stallman  <rms@gnu.org>

	* intervals.c (get_local_map): Use indirect_function,
	not Findirect_function.

1999-09-27  Dave Love  <fx@gnu.org>

	* cm.h: Remove unneeded declaration of ospeed.

1999-09-26  Gerd Moellmann  <gerd@gnu.org>

	* lisp.h (toplevel): Add prototype for
	next_single_char_property_change.

	* textprop.c (next_single_char_property_change): New.

	* xdisp.c (display_prop_end, invisible_text_between_p): Use
	next_single_char_property_change.

1999-09-25  Gerd Moellmann  <gerd@gnu.org>

	* editfns.c (Fproperties): New.
	(syms_of_editfns): Defsubr it.

	* xfns.c (lookup_image): Set image's timestamp because it's
	used when we look it up.

1999-09-23  Gerd Moellmann  <gerd@gnu.org>

	* window.c (enlarge_window): Add window parameter instead of using
	selected_window.
	(Fdisplay_buffer): Call it with window parameter instead of
	setting selected_window.
	(Fenlarge_window, Fshrink_window): Ditto.
	(shrink_mini_window): If there is no recorded height and position
	info, resize mini-window to height 1.

	* xfns.c (image_error): Use add_to_log.

	* xfaces.c (load_pixmap): Call add_to_log without frame parameter.
	(load_face_font_or_fontset, load_color,
	merge_face_vector_with_property): Ditto.

	* dispextern.h: Add prototype for add_to_log.

	* xfaces.c (add_to_log): Move to xdisp.c.

	* xdisp.c (add_to_log): Moved from xfaces.c.  Remove frame
	parameter.

1999-09-23  Gerd Moellmann  <gerd@gnu.org>

	* xterm.c (XTread_socket) <MotionNotify>: Change #ifdef
	USE_X_TOOLKIT to #ifdef USE_TOOLKIT_SCROLL_BARS.

	* xdisp.c (resize_mini_window): Use grow_mini_window and
	shrink_mini_window.

	* window.c (window_min_size): Add parameter ignore_fixed_p.
	(change_window_height): Call window_min_size with new parameter.
	(shrink_window_lowest_first, save_restore_orig_size,
	grow_mini_window, shrink_mini_window): New.
	(make_window, replace_window): Initialize orig_top and
	orig_height.
	(enlarge_window): Renamed from change_window_height.  Make it
	static.
	(Fdisplay_buffer, Fenlage_window, Fshrink_window): Call
	enlarge_window instead of change_window_height.

	* window.h (struct window): New members orig_top, orig_height.
	(toplevel): Add prototypes for grow_mini_window and
	shrink_mini_window.  Remove prototype for change_window_height.

1999-09-21  Eli Zaretskii  <eliz@gnu.org>

	* frame.c (frame_name_fnn_p): Fix previous change.

1999-09-20  Gerd Moellmann  <gerd@gnu.org>

	* minibuf.c (toplevel): Move include of stdio.h to other includes.

	* dispnew.c (direct_output_for_insert): Cast arguments to
	safe_bcopy to char *.

	* lread.c (readchar): Remove unused variables.
	(read_filtered_event, read1, Fmapatoms): Ditto.
	(toplevel): Include intervals.h.

	* eval.c (Fsignal): Remove unused variables.
	(Fcommandp, do_autoload): Ditto.

	* lisp.h: Add prototype for safe_bcopy, fatal.

	* editfns.c (init_editfns): Remove unused variables.
	(Fgoto_char, Fchar_after, Fformat): Ditto.
	(message_text, message_length): Put in #ifndef HAVE_MENUS.

	* data.c (find_symbol_value): Remove unused variables.
	(Faref, Fstring_to_number): Ditto.
	(toplevel): Include stdio.h.
	(Fnumber_to_string): Cast XINT to long for %ld.

	* casefiddle.c (casify_object): Remove unused variables.
	(casify_region): Ditto.

	* filelock.c (get_boot_time): Put local variable used in
	conditinally compiled section in #ifdef.
	(toplevel): Include stdio.h.

	* keymap.c (Flookup_key, Faccessible_keymaps, describe_vector,
	keys_of_keymap, syms_of_keymap): Remove unused variables.

1999-09-20  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (sync_frame_with_window_matrix_rows): Disable frame rows
	whose corresponding window rows have been disabled in
	try_window_id.

1999-09-20  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (compute_window_start_on_continuation_line): Handle case
	that window start is out of range.
	(handle_display_prop, handle_single_display_prop): Replace
	marginal area specifications like `left-margin' with `(margin
	left-margin)'.
	(Qmargin): New.
	(syms_of_xdisp): Initialize Qmargin.

1999-09-19  Gerd Moellmann  <gerd@gnu.org>

	* syntax.c (update_syntax_table, find_defun_start, back_comment,
	describe_syntax, skip_chars): Remove unused variables.
	(back_comment, forw_comment): Add braces to if-statement with
	if-else as dependent statement.

	* process.c (list_processes_1): Remove unused variables.
	(Fopen_network_stream, create_process): Add parentheses to
	conditional expressions.
	(create_process): Put declaration of sigchld in #if 0.
	(Fopen_network_stream): Removed unused variables.
	(Fopen_network_stream, wait_reading_process_input,
	wait_reading_process_input, send_process, send_process): Ditto.
	(toplevel): Add prototypes for set_waiting_for_input and
	keyboard_bit_set.

	* abbrev.c (Fexpand_abbrev): Remove unused variables.

	* textprop.c (Fset_text_properties): Remove unused variables.
	(text_property_list, verify_interval_modification,
	interval_has_all_properties): Ditto.

	* callproc.c (toplevel) [HAVE_UNISTD_H]: Include unistd.h.
	(Fcall_process): Remove unused variable.

	* keyboard.c (Frecursive_edit): Remove unused variable.
	(command_loop_1, safe_run_hooks, kbd_buffer_get_event,
	timer_check, make_lispy_event, menu_bar_items,
	menu_bar_one_keymap, menu_bar_item, parse_menu_item,
	parse_tool_bar_item, read_char_x_menu_prompt, read_key_sequence,
	kbd_buffer_get_event, make_lispy_event, read_char_x_menu_prompt,
	read_key_sequence): Ditto.  Fread_key_sequence,
	Fread_key_sequence_vector, Fsuspend_emacs): Ditto.
	(read_key_sequence) [GOBBLE_FIRST_EVENT]: Put local variables only
	used when GOBBLE_FIRST_EVENT is defined in #ifdef
	(Fexecute_extended_command): Cast XINT to long for %ld.
	(toplevel) [HAVE_UNISTD_H]: Include unistd.h.
	(toplevel): Include sys/types.h.

	* lisp.h (RETURN_UNGCPRO): Use do-while (0) idiom.
	(toplevel): Add prototypes for stuff_char, and
	code_convert_string_norecord.

1999-09-19  Gerd Moellmann  <gerd@gnu.org>

	* buffer.h: Add prototype for r_re_alloc.

	* insdel.c (copy_text): Removed unused variables.
	(count_combining_after, count_combining_after, insert_1_both,
	insert_from_string_1, insert_from_buffer_1, check_markers): Ditto.
	(adjust_after_replace, replace_range): Add parentheses to logical
	expressions.  Remove unused variables.
	(CHECK_BYTE_COMBINING_FOR_INSERT): Add parentheses to logical
	expression.

	* alloc.c (Fgarbage_collect): Remove unused variable.
	(compact_strings): Add parentheses around assignments in
	conditional context.
	(toplevel): Put declaration of unused function clear_marks
	in #if 0 like its definition.

	* lisp.h: Add prototype for shrink_regexp_cache,
	sweep_weak_hash_tables.

1999-09-19  Dave Love  <fx@gnu.org>

	* process.c (Fopen_network_stream): Use strerror, not gai_strerror.

	* doc.c (read_bytecode_char): Declare arg.

	* lisp.h: Declare Fcurrent_message, Fmake_temp_name,
	read_bytecode_char, Fx_hide_busy_cursor, getloadavg.

1999-09-18  Richard Stallman  <rms@gnu.org>

	* xdisp.c (echo_area_display): Turn off code that returned
	without doing anything when using a terminal frame.

1999-09-17  Richard M. Stallman  <rms@gnu.org>

	* unexelf.c (unexec): Don't get confused by a short section
	just before the bss section.

1999-09-16  Gerd Moellmann  <gerd@gnu.org>

	* emacs.c (main): Remove unused variables.
	(sort_args, Fkill_emacs, Fkill_emacs): Ditto.

	* lisp.h: Add prototype for uninterrupt_malloc, memory_warnings,
	init_fileio_once, syms_of_sound, init_xfns, init_fns
	init_sound, check_message_stack.

	* emacs.c (toplevel) [HAVE_UNISTD_H]: Include unistd.h.

	* intervals.c (rotate_right, rotate_left): Add braces to avoid
	ambiguous else warning.
	(split_interval_left): Remove unused variables.
	(previous_interval, adjust_intervals_for_deletion,
	set_point_both, set_point_both, set_intervals_multibyte_1): Ditto.
	(icount, idepth, zero_length): Move into #if 0 section below
	original position where these are used.

	* buffer.h [REL_ALLOC]: Add prototypes for r_alloc and r_alloc_free.

	* buffer.c (Fkill_buffer): Remove unused variables.
	(Fkill_buffer, overlays_at, overlays_in, recenter_overlay_lists,
	fix_overlays_in_range, Fmove_overlay, Fprevious_overlay_change,
	init_buffer_once, (syms_of_buffer): Ditto.

	* xrdb.c (get_fallback): Remove unused variable.
	(x_load_resources): Ditto.  Put local variable used for Motif only
	in #ifdef USE_MOTIF.

1999-09-16  Gerd Moellmann  <gerd@gnu.org>

	* minibuf.c (read_minibuf): Remove unused variables.
	(read_minibuf, Fread_buffer, scmp, Fcompleting_read): Ditto.
	(do_completion): Move assignment out of conditional context.
	(Fdisplay_completion_list): Add parentheses to conditional expression.

	* cm.c (toplevel) [HAVE_TERMCAP_H]: Include termcap.h.

	* lisp.h: Add prototype for no_switch_window.

	* window.c (Fset_window_buffer): Remove unused variables.
	(Fset_window_margins): Ditto.

	* xdisp.c (resize_mini_window): Temporarily set the selected
	window's or Vminibuf_scroll_window's height to "fixed" around
	the call the change_window_height.

	* window.c (window_fixed_size_p): Check window's height_fixed_p
	flag.

	* window.h (struct window): New member height_fixed_p.

	* dispnew.c (direct_output_forward_char): Don't use this method
	if showing a message or a message was just cleared because we
	might need to resize the mini-window.

1999-09-16  Gerd Moellmann  <gerd@gnu.org>

	* frame.c (Fdelete_frame): Correct local variable pointing to
	selected frame after selecting new frame.

1999-09-15  Richard Stallman  <rms@gnu.org>

	* puresize.h (BASE_PURESIZE): Increase to 525000.

	* filelock.c (Vtemporary_file_directory): New variable.
	(syms_of_filelock): Set up Lisp variable.

1999-09-15  Gerd Moellmann  <gerd@gnu.org>

	* term.c (OUTPUT_IF, OUTPUT1_IF): Use do-while.
	(encode_terminal_code): Remove unused variables.
	(turn_off_face): Ditto.
	(toplevel): Include termcap.h if HAVE_TERMCAP_H.

	* dispnew.c (update_frame_line): If writing whole desired line,
	don't clear to end of line if already at the end.

1999-09-15  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (resize_mini_window): Don't report changed window
	height if it actually hasn't changed.

	* widget.c (set_frame_size, EmacsFrameSetCharSize):  Remove
	unused variables.
	(mark_shell_size_user_specified): Put in #if 0 because not used.
	(create_frame_gcs): Put in #if 0 because currently unused.
	(first_frame_p): Ditto.

	* xmenu.c (single_menu_item, Fx_popup_menu, Fx_popup_menu,
	single_submenu, update_frame_menubar, set_frame_menubar,
	free_frame_menubar, xmenu_show, xdialog_show): Remove unused
	variables.

	* print.c (PRINTFULLP): Removed because it is no longer used and
	is misleading.
	(Ferror_message_string): Remove unused variables.
	(print_object): Cast argument of sprintf to long for `%ld'
	specifier.  Remove unused variable.

1999-09-14  Gerd Moellmann  <gerd@gnu.org>

	* sound.c (Fplay_sound): Remove usused variables.
	(be2hs): Put in #if 0 because it's currently not used.

1999-09-14  Ken Raeburn  <raeburn@gnu.org>

	* print.c (Ferror_message_string, print_error_message,
	print_object): Use XCAR, XCDR and XFLOAT_DATA instead of explicit
	member access.

1999-09-14  Gerd Moellmann  <gerd@gnu.org>

	* frame.h (CHECK_FRAME, CHECK_LIVE_FRAME): Put code in do-while.

	* frame.c (Fnext_frame): Remove unused variable(s).
	(Fprevious_frame, Fmouse_pixel_position, frame_name_fnn_p): Ditto.
	(store_frame_param): Add parentheses to conditional expression.
	(Fmodify_frame_parameters): Remove unused variables.
	(Fmodify_frame_parameters, Fset_frame_size, Fset_frame_position):
	Ditto.

	* xfns.c (x_set_background_color): Remove unused variable(s).
	(x_set_border_pixel): Ditto.
	(x_set_menu_bar_lines): Put local variable used only for
	non-toolkit case in #ifdef/#endif.
	(x_figure_window_size): Remove unused variable(s).
	(x_figure_window_size, x_window, lookup_image,
	xbm_read_bitmap_file_data, x_build_heuristic_mask, pbm_load,
	png_load, jpeg_load, gif_load, x_create_tip_frame,
	x_create_tip_frame, Fx_show_tip, x_set_border_pixel): Ditto.

	* xterm.c (x_scroll_bar_handle_click): Compile only if
	not USE_TOOLKIT_SCROLL_BARS.
	(x_scroll_bar_set_handle, x_scroll_bar_note_movement): Ditto.

	* dispextern.h: Add prototypes for gamma_correct and
	x_kill_gs_process.

	* xterm.c (x_produce_glyphs): Remove unused variable(s).
	(x_alloc_nearest_color_for_widget, note_tool_bar_highlight,
	x_set_toolkit_scroll_bar_thumb): Ditto.
	(x_scroll_bar_create): Move local variable to the
	conditionally compiled section of code where it is used.
	(x_scroll_bar_create): Remove unused variable(s).
	(x_scroll_bar_remove, XTread_socket): Ditto.
	(XTread_socket) <ConfigureNotify>: Move variables used for
	non-toolkit case into conditionally compiled section of code.

	* window.h (freeze_window_starts): Fix typo in prototype.

	* xdisp.c (display_echo_area_1, try_window_id): Remove unused
	variable(s).

	* lisp.h: Add prototype for debug_print.

	* dispextern.h (xassert) [GLYPH_DEBUG]: Change definition
	to use do-while.

	* fns.c (SXHASH_COMBINE): Add missing parentheses.
	(Fchar_table_range, Fset_char_table_default, mapcar1,
	Fyes_or_no_p, sweep_weak_hash_tables): Remove unused variable(s).

	* lisp.h: Add prototype for getloadavg.

1999-09-14  Andreas Schwab  <schwab@gnu.org>

	* process.c (Fopen_network_stream): Avoid socket decriptor leak.

	* lisp.h: Declare close_file_unwind.

1999-09-14  Richard Stallman  <rms@gnu.org>

	* filelock.c (get_boot_time): Make the temp name in the proper dir.

1999-09-13  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (redisplay_window): Make sure start_at_line_beg
	is always set correctly.

1999-09-13  Dave Love  <fx@gnu.org>

	* xdisp.c (move_it_in_display_line_to): Make type consistent with
	declaration.

1999-09-13  Gerd Moellmann  <gerd@delysid.gnu.org>

	* xdisp.c (QCfile): Move here from xfns.c.
	(syms_of_xdisp): Initialize it.
	(message2_nolog): Change for Lisp_Object selected_frame.
	(message3_nolog, message_with_string, message,
	setup_echo_area_for_printing, truncate_echo_area,
	prepare_menu_bars, redisplay_internal, Fdump_tool_bar_row): Ditto.

1999-09-13  Dave Love  <fx@gnu.org>

	* xterm.c: Don't continue #define args for benefit of old cc.
	(xt_action_hook): Indent #error for benefit of K&R cc.

1999-09-13  Gerd Moellmann  <gerd@delysid.gnu.org>

	* xterm.c (XTcursor_to): Change for Lisp_Object selected_frame.
	(x_clear_frame, XTring_bell, XTmouse_position, XTread_socket): Ditto.
	(XRINGBELL): Removed.

1999-09-13  Dave Love  <fx@gnu.org>

	* xfns.c (x_put_x_image): Make type consistent with declaration.

	* fns.c (Fmake_hash_table): Fix string continuation.

1999-09-13  Gerd Moellmann  <gerd@delysid.gnu.org>

	* xfns.c (QCfile): Moved to xdisp.c.
	(syms_of_xfns): Don't initialize QCfile.
	(check_x_frame): Change for Lisp_Object selected_frame.
	(check_x_display_info, x_get_resource_string): Ditto.

1999-09-13  Gerd Moellmann  <gerd@gnu.org>

	* minibuf.c (choose_minibuf_frame): Don't try to set the
	mini-buffer window's buffer, if the buffer is invalid.

	* xfns.c (QCfile): Moved to xdisp.c.
	(syms_of_xfns): Don't initialize QCfile.

	* xdisp.c (QCfile): Move here from xfns.c.
	(syms_of_xdisp): Initialize it.

	* lisp.h (selected_frame): Add external declaration.

	* xselect.c (x_own_selection): Change for Lisp_Object selected_frame.
	(Fx_store_cut_buffer_internal): Ditto.
	(Fx_rotate_cut_buffers_internal): Ditto.

	* xfaces.c (frame_or_selected_frame): Change for Lisp_Object
	selected_frame.
	(Finternal_set_lisp_face_attribute): Ditto.
	(Finternal_get_lisp_face_attribute): Ditto.
	(Finternal_lisp_face_empty_p): Ditto.
	(Fdump_face): Ditto.

	* term.c (OUTPUT): Change for Lisp_Object selected_frame.
	(OUTPUT_IF, ring_bell, set_terminal_modes, reset_terminal_modes,
	set_terminal_window, set_scroll_region, reassert_line_highlight,
	change_line_highlight, cursor_to, raw_cursor_to, clear_to_end,
	clear_end_of_line, clear_end_of_line_raw, clear_end_of_line_raw,
	encode_terminal_code, write_glyphs, term_init): Ditto.

	* sysdep.c (reset_sys_modes): Change for Lisp_Object selected_frame.
	(kbd_input_ast, read_input_waiting): Ditto.

	* minibuf.c (choose_minibuf_frame): Change for Lisp_Object
	selected_frame.
	(read_minibuf): Ditto.

	* keyboard.c (command_loop_1): Change for Lisp_Object
	selected_frame.
	(cmd_error_internal, command_loop_1, read_char,
	kbd_buffer_get_event, read_avail_input,
	read_char_minibuf_menu_prompt, read_key_sequence, Fsuspend_emacs,
	interrupt_signal, quit_throw_to_read_char): Ditto.

	* fontset.c (Ffont_info): Change for Lisp_Object selected_frame.
	(Ffontset_info): DItto.

	* emacs.c (handle_USR1_signal): Change for Lisp_Object selected_frame.

	* dispnew.c (selected_frame): Make it a Lisp_Object.
	(adjust_frame_glyphs_initially): Change for Lisp_Object selected_frame.
	(direct_output_for_insert, direct_output_forward_char,
	init_display): Ditto.

	* data.c (swap_in_symval_forwarding): Change for Lisp_Object
	selected_frame.
	(set_internal): Ditto.

	* buffer.c (Fother_buffer): Change for Lisp_Object selected_frame.
	(record_buffer): Ditto.

	* frame.c (Fmake_terminal_frame): Use SELECTED_FRAME.
	(do_switch_frame): Change for Lisp_Object selected_frame.
	(Fselected_frame): Ditto.
	(Fframe_first_window): Use SELECTED_FRAME.
	(Fframe_root_window): Change for Lisp_Object selected_frame.
	(Fframe_selected_window, Fset_frame_selected_window, Fnext_frame,
	Fprevious_frame, other_visible_frames, Fdelete_frame,
	Fmouse_position, Fmouse_pixel_position, Fmake_frame_visible,
	Fmake_frame_invisible, Ficonify_frame, Fraise_frame, Flower_frame,
	Fframe_parameters, Fmodify_frame_parameters, Fframe_char_height,
	Fframe_char_width, Fframe_pixel_height, Fframe_pixel_width,
	Fset_frame_height, Fset_frame_width): Ditto.

1999-09-13  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (message2_nolog): Change for Lisp_Object selected_frame.
	(message3_nolog, message_with_string, message,
	setup_echo_area_for_printing, truncate_echo_area,
	prepare_menu_bars, redisplay_internal, Fdump_tool_bar_row): Ditto.

	* xmenu.c (Fx_popup_menu): Change for Lisp_Object selected_frame.
	(Fx_popup_dialog): Ditto.

	* xfns.c (check_x_frame): Change for Lisp_Object selected_frame.
	(check_x_display_info, x_get_resource_string): Ditto.

	* xterm.c (XTcursor_to): Change for Lisp_Object selected_frame.
	(x_clear_frame, XTring_bell, XTmouse_position, XTread_socket): Ditto.
	(XRINGBELL): Removed.

	* window.c (Fminibuffer_window): Change for Lisp_Object
	selected_frame.
	(Fwindow_at, Fprevious_window, window_loop, select_window_1,
	display_buffer_1, Fdisplay_buffer, temp_output_buffer_show,
	Fcurrent_window_configuration, init_window_once): Ditto.

	* frame.h (SELECTED_FRAME): New.

1999-09-12  Ken Raeburn  <raeburn@gnu.org>

	* category.c (word_boundary_p): Use XCAR and XCDR.
	* ccl.c (ccl_driver, resolve_symbol_ccl_program,
	Fregister_code_conversion_map): Likewise.
	* coding.c (setup_coding_system, detect_coding_system,
	Ffind_operation_coding_system, Fset_coding_priority_internal):
	Likewise.
	* doc.c (get_doc_string, Fdocumentation,
	store_function_docstring): Likewise.
	* editfns.c (save_restriction_restore): Likewise.
	* eval.c (Fcond, Fmacroexpand, Fcondition_case, wants_debugger,
	skip_debugger, find_handler_clause, Fautoload, Fapply,
	run_hook_with_args, run_hook_list_with_args, Ffetch_bytecode):
	Likewise.
	* fileio.c (Ffind_file_name_handler, Finsert_file_contents,
	Fwrite_region, do_auto_save_unwind, Fdo_auto_save,
	Fread_file_name): Likewise.
	* filelock.c (unlock_all_files): Likewise.
	* insdel.c (Fcombine_after_change_execute): Likewise.
	* intervals.c (adjust_intervals_for_insertion): Likewise.
	* keymap.c (get_keymap_1, Fkeymap_parent, Fset_keymap_parent,
	Fset_keymap_parent, fix_submap_inheritance, access_keymap,
	store_in_keymap, Fcopy_keymap, define_as_prefix,
	current_minor_maps, Faccessible_keymaps,
	accessible_keymaps_char_table, Fkey_description,
	Fwhere_is_internal, where_is_internal_2, where_is_internal_1,
	describe_buffer_bindings, describe_map_tree, shadow_lookup,
	describe_map): Likewise.
	* lread.c (Fload, load_unwind, close_load_descs, read_vector,
	read_list, init_lread): Likewise.
	* search.c (Fmatch_data): Likewise.
	* sunfns.c (Fsun_menu_internal): Likewise.
	* syntax.c (describe_syntax): Likewise.
	* undo.c (record_insert, record_delete, Fundo_boundary,
	truncate_undo_list): Likewise.
	* vmsproc.c (child_sig): Likewise.

	* editfns.c (Fformat): Use XFLOAT_DATA.

1999-09-12  Gerd Moellmann  <gerd@gnu.org>

	* keyboard.c (command_loop_1): Resize mini-window to the
	exact size of a message displayed, if any.

	* xdisp.c (resize_mini_window): Add parameter exact_p.  Resize
	to exact size if exact_p is non-zero.
	(display_echo_area_1): Call resize_mini_window with
	new parameter.
	(redisplay_internal): Ditto.
	(resize_echo_area_axactly): New.

	* minibuf.c (read_minibuf_unwind): Call resize_mini_window with
	new parameter.

	* dispextern.h: Change prototype of resize_mini_window.
	Add prototype for resize_echo_area_axactly.

	* xfaces.c (Fx_family_fonts): Replaces Fx_font_list.
	(syms_of_xfaces): Defsubr accordingly.

	* xdisp.c (hscroll_window_tree): Choose cursor row from
	desired or current matrix.
	(redisplay_internal): Hscroll before updating.

1999-09-12  Gerd Moellmann  <gerd@gnu.org>

	* syntax.c (Fforward_word): Use prompt_end_charpos instead
	of minibuffer_prompt_length.

	* minibuf.c (read_minibuf): Use prompt_end_charpos instead
	of minibuffer_prompt_length.
	(read_minibuf_unwind): Ditto.
	(Fminibuffer_complete_and_exit): Ditto.
	(Fminibuffer_complete_word): Ditto.
	(Fminibuffer_prompt_end): Ditto.

	* editfns.c (Fbuffer_string): Use prompt_end_charpos instead
	of minibuffer_prompt_length.
	(Fline_beginning_position): Ditto.

	* buffer.c (Fget_buffer_create): Use prompt_end_charpos instead
	of minibuffer_prompt_length.
	(Fmake_indirect_buffer): Ditto.
	(Fkill_buffer): Ditto.
	(Ferase_buffer): Ditto.

	* buffer.h (prompt_end_charpos): Replaces
	minibuffer_prompt_length.

	* minibuf.c (read_minibuf): Return mini-buffer contents
	without the prompt.

	* editfns.c (make_buffer_string_both): Take out the code
	to handle mini-buffer prompts.
	(Fbuffer_string): Handle the prompt here, instead.

	* xfaces.c (lface_from_face_name): Resolve face aliases.
	(Qmode_line): Replaces Qmodeline.
	(realize_basic_faces): Use Qmode_line.
	(syms_of_xfaces): Initialize Qmode_line.

1999-09-12  Gerd Moellmann  <gerd@gnu.org>

	* minibuf.c (read_minibuf): Set minibuf_prompt_width to the
	current column after inserting prompt.
	(Fminibuffer_prompt_width): Return minibuf_prompt_width.

	* xfaces.c (Qframe_update_face_colors): New.
	(syms_of_xfaces): Initialize call.
	(update_face_from_frame_parameter): Call that function when
	the frame's background changes.

1999-09-12  Richard Stallman  <rms@gnu.org>

	* insdel.c (del_range_1): Don't treat minibuffer prompt specially.

1999-09-12  Ken Raeburn  <raeburn@gnu.org>

	* alloc.c (Fcons, pure_cons, Fpurecopy, Fgarbage_collect,
	mark_object, mark_buffer): Use XCAR and XCDR.
	* bytecode.c (Fbyte_code): Likewise.
	* callint.c (Fcall_interactively, Fprefix_numeric_value):
	Likewise.
	* callproc.c (Fcall_process, Fcall_process_region, child_setup,
	getenv_internal): Likewise.
	* dired.c (file_name_completion): Likewise.
	* fns.c (Fsafe_length, concat, Fcopy_alist, Fmember, Fmemq, Fassq,
	assq_no_quit, Fassoc, Frassq, Frassoc, Fdelq, Fdelete, Freverse,
	Fplist_get, Fplist_put, internal_equal, mapcar1): Likewise.
	* indent.c (Fcompute_motion): Likewise.
	* process.c (decode_status, Fprocess_status, Fprocess_exit_status,
	list_processes_1, Fstart_process, Fopen_network_stream,
	wait_reading_process_input, read_process_output_call,
	kill_buffer_processes, sigchld_handler, exec_sentinel_unwind,
	status_notify, wait_reading_process_input): Likewise.
	* textprop.c (PLIST_ELT_P, property_value, set_properties,
	extend_property_ranges): Likewise.
	* w32faces.c (Fpixmap_spec_p, merge_face_list): Likewise.
	* w32fns.c (x_window_to_frame, x_set_frame_parameters,
	x_report_frame_params, x_set_cursor_type, x_icon_type,
	x_figure_window_size, Fx_create_frame, w32_load_system_font,
	w32_load_font, enum_font_cb2, w32_list_bdf_fonts, w32_list_fonts,
	w32_list_synthesized_fonts, w32_find_ccl_program, Fx_list_fonts,
	Fw32_find_bdf_fonts, w32_find_bdf_fonts_in_dir,
	x_display_info_for_name, Fx_display_list): Likewise.
	* w32menu.c (menubar_id_to_frame, single_keymap_panes,
	Fx_popup_menu, Fx_popup_dialog): Likewise.
	* w32proc.c (Fw32_set_keyboard_layout): Likewise.
	* w32term.c (x_window_to_scroll_bar, w32_read_socket,
	w32_term_init, x_delete_display): Likewise.
	* xfns.c (x_window_to_frame, x_any_window_to_frame,
	x_non_menubar_window_to_frame, x_menubar_window_to_frame,
	x_top_window_to_frame, x_set_frame_parameters,
	x_report_frame_params, x_set_cursor_type, x_icon_type,
	x_figure_window_size, Fx_create_frame, x_display_info_for_name,
	Fx_display_list, x_create_tip_frame): Likewise.
	* xmenu.c (menubar_id_to_frame, single_keymap_panes,
	Fx_popup_menu, Fx_popup_dialog): Likewise.
	* xselect.c (x_own_selection, x_get_local_selection,
	x_handle_selection_request, x_handle_selection_clear,
	x_clear_frame_selections, wait_for_property_change_unwind,
	wait_for_property_change, x_handle_property_notify,
	copy_multiple_data, x_get_foreign_selection,
	lisp_data_to_selection_data, clean_local_selection_data,
	x_handle_selection_notify, Fx_get_selection_internal,
	x_disown_buffer_selections): Likewise.
	* xterm.c (x_window_to_scroll_bar, XTread_socket, x_list_fonts,
	x_load_font, x_find_ccl_program, x_term_init, x_delete_display):
	Likewise.

	* alloc.c (make_float, make_pure_float, Fpurecopy): Use
	XFLOAT_DATA.
	* bytecode.c (Fbyte_code): Likewise.
	* floatfns.c (extract_float, Fexpt, Fabs, rounding_driver,
	fmod_float): Likewise.

1999-09-11  Richard Stallman  <rms@gnu.org>

	* xdisp.c (run_window_scroll_functions): If hook functions switch
	buffers, switch back after.

1999-09-11  Ken Raeburn  <raeburn@gnu.org>

	* charset.h (GET_TRANSLATION_TABLE): Use XCDR.
	* frame.h (FOR_EACH_FRAME): Use XCAR and XCDR.
	(PIXEL_X_FROM_CANON_X, PIXEL_Y_FROM_CANON_Y): Use XFLOAT_DATA.
	* keyboard.h (EVENT_HEAD, EVENT_START, EVENT_END, POSN_WINDOW,
	POSN_BUFFER_POSN, POSN_WINDOW_POSN, POSN_TIMESTAMP): Use XCAR and
	XCDR.
	* syntax.h (SYNTAX, SYNTAX_WITH_FLAGS, SYNTAX_MATCH): Use XCAR and
	XCDR.

1999-09-10  Richard Stallman  <rms@gnu.org>

	* xterm.c (XTread_socket): In XSetInputFocus, use RevertToParent,
	not RevertToPointerRoot.
	(XTset_vertical_scroll_bar) [!USE_TOOLKIT_SCROLL_BARS]:
	Fix the code to clear around the scroll bar.

1999-09-10  Keisuke Nishida  <kxn30@po.cwru.edu>

	* print.c: Support print-circle and related features.
	(Vprint_gensym_alist): Removed.
	(Vprint_circle, Vprint_continuous_numbering, print_number_index
	Vprint_number_table): New variables.
	(PRINT_NUMBER_OBJECT, PRINT_NUMBER_STATUS): New macros.
	(PRINTPREPARE, PRINTFINISH): Don't set Vprint_gensym_alist.
	(print, print_preprocess, print_preprocess_string, print_object):
	New/modified functions with print-circle feature.  Use
	Vprint_number_table instead of Vprint_gensym_alist for print-gensym.
	(syms_of_print): Defined new Lisp variables `print-circle',
	`print-continuous-numbering', `print-number-table'.

1999-09-10  Gerd Moellmann  <gerd@gnu.org>

	* xfns.c (x_build_heuristic_mask): Accept a list `(R G B)'
	as background color specification instead of an integer.
	(image-cache-eviction-delay): Replaces image-eviction-seconds.
	(Vimage_cache_eviction_delay): Replaces Vimage_eviction_seconds.
	(clear_image_cache, syms_of_xfns): Use it.
	(Qpostscript): Replaces Qghostscript.
	(gs_type): Use it.
	(gs_image_p): Ditto.
	(syms_of_xfns): Initialize Qpostscript.

1999-09-10  Richard Stallman  <rms@gnu.org>

	* buffer.c (Ferase_buffer): Don't erase the minibuffer prompt.

1999-09-09  Richard Stallman  <rms@gnu.org>

	* editfns.c (Fline_beginning_position): Handle minibuffer prompt here.

	* cmds.c (Fbeginning_of_line): Don't handle minibuffer prompt here.

1999-09-09  Gerd Moellmann  <gerd@gnu.org>

	* fns.c (Fmakehash): Accept just one optional argument TEST.

	* xfns.c (QCindex): New.
	(syms_of_xfns): Initialize QCindex.
	(gif_load): Use it instead of `:image'.

1999-09-09  Richard Stallman  <rms@gnu.org>

	* fileio.c (Fwrite_region): Finish renaming CONFIRM to MUSTBENEW.
	(Fwrite_region) [DOS_NT]: Handle `excl' here too.

1999-09-08  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (Qwhen): Replaces QCwhen.
	(syms_of_xdisp): Initialized it instead of QCwhen.
	(handle_single_display_prop): Use it instead of QCwhen.

1999-09-08  Ken'ichi Handa  <handa@gnu.org>

	* charset.c (translate_char): Reset MSBs of arguments of
	MAKE_CHAR.
	(CHAR_COMPONENTS_VALID_P): Fix for ASCII.

1999-09-08  Lars Magne Ingebrigtsen  <larsi@gnus.org>

	* editfns.c (Fbufsize): Accept an extra BUFFER parameter.

	* fns.c (Fbase64_decode_region): Don't place point outside of the
	current accessible portion.

1999-09-07  Richard Stallman  <rms@gnu.org>

	* keymap.c (fix_submap_inheritance): Do nothing if the proper
	parent is an ancestor of SUBMAP; otherwise, add it as the
	ultimate ancestor.

1999-09-07  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (handle_single_display_prop): Change conditional
	display property to `:when FORM . VALUE'.

1999-09-07  Richard Stallman  <rms@gnu.org>

	* fileio.c (Fwrite_region): Doc fix.

1999-09-07  Stefan Monnier  <monnier@cs.yale.edu>

	* fileio.c (Qexcl): New variable.
	(report_file_error): Handle EEXIST specially.
	(Fwrite_region): Special handling for CONFIRM = `excl'.
	(syms_of_fileio): Initialize Qexcl.

1999-09-07  Gerd Moellmann  <gerd@gnu.org>

	* xfns.c (x_set_foreground_color): Call
	update_face_from_frame_parameter.
	(x_set_background_color): Ditto.
	(x_set_mouse_color): Ditto.
	(x_set_cursor_color): Ditto.
	(x_set_border_color): Ditto.
	(x_set_scroll_bar_foreground): Ditto.
	(x_set_scroll_bar_background): Ditto.

	* xfaces.c (recompute_basic_faces): Clear face cache.
	(Finternal_set_lisp_face_attribute): Modify frame parameters
	if attributes of certain faces are changed.
	(update_face_from_frame_parameter): New.

	* xfaces.c (realize_basic_faces): Realize new basic faces.

	* dispextern.h (SCROLL_BAR_FACE_ID, BORDER_FACE_ID,
	CURSOR_FACE_ID, MOUSE_FACE_ID): New.

	* xfaces.c (Qscroll_bar, Qcursor, Qborder, Qmouse): New.
	(syms_of_xfaces): Intialize new symbols.

	* fns.c (Fmakehash): Take one argument, test, make all the
	rest keyword arguments.

	* window.c (Fset_window_margins): Make window the first argument.
	(set_window_buffer): Call Fset_window_margins with window as first
	argument.

1999-09-07  Gerd Moellmann  <gerd@gnu.org>

	* xfaces.c (Qfringe): Replaces Qmargin.

1999-09-07  Kenichi Handa  <handa@etl.go.jp>

	* charset.h: Lots of comments fixed.
	(PARSE_MULTIBYTE_SEQ): Make it work also for ASCII string.
	(STRING_CHAR_AND_CHAR_LENGTH): This macro removed.

	* charset.c : Lots of comments fixed.
	(SPLIT_MULTIBYTE_SEQ): Make it work also for ASCII string.
	(CHAR_COMPONENTS_VALID_P): Name changed from
	CHAR_COMPONENT_VALID_P.  Caller changed.

1999-09-06  Richard Stallman  <rms@gnu.org>

	* insdel.c (syms_of_insdel): Define Lisp variable
	inhibit-modification-hooks.

1999-09-06  Michael Sperber [Mr. Preprocessor]  <sperber@informatik.uni-tuebingen.de>

	* s/aix4-2.h (ALIGN_DATA_RELOC): Undefined to support new
	unexaix.c.

	* s/aix3-1.h (ALIGN_DATA_RELOC): Defined to support new unexaix.c.

1999-09-06  Dave Love  <fx@gnu.org>

	* unexaix.c: New version incorporating Michael Sperber's changes
	from XEmacs.  Should solve problems on AIX 4.3.

	* lread.c (Vbyte_boolean_vars): New variable.
	(defvar_bool, syms_of_lread): Use it.

1999-09-05  Richard Stallman  <rms@gnu.org>

	* minibuf.c (read_minibuf): Put all three properties on the
	same range, the whole prompt.

1999-09-05  Gerd Moellmann  <gerd@gnu.org>

	* sound.c (Qplay_sound_functions): Replaces Qplay_sound_hook.
	(Fplay_sound, syms_of_sound): Use it.
	(parse_sound): Allow float volume values in the range [0, 1].
	(Fplay_sound): Ditto.

	* window.c (Fset_window_vscroll): Make window the first argument,
	amount to scroll the second.  Take non-negative vscroll as
	argument.
	(Fwindow_vscroll): Return non-negative vscroll.

	* xfns.c (Fx_show_tip): Improve documentation.

1999-09-05  Gerd Moellmann  <gerd@gnu.org>

	* buffer.c, buffer.h, dispextern.h, dispnew.c, keyboard.c,
	window.c, xdisp.c, xfaces.c, xterm.c, keyboard.h: Change
	`top-line' and `top_line' to `header-line' and `header_line'.
	Likewise for similar spellings.

1999-09-05  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (row_containing_pos): New.
	(try_window_id): Use it.

	* alloc.c, dispextern.h, dispnew.c, frame.c, frame.h, keyboard.c,
	lisp.h, termhooks.h, window.c xdisp.c, xfaces.c, xfns.c, xterm.c:
	Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
	Likewise for upper-case etc.

1999-09-05  Gerd Moellmann  <gerd@gnu.org>

	* xterm.c (XTset_vertical_scroll_bar) [!USE_TOOLKIT_SCROLL_BARS]:
	Fix reference to renamed variable.

1999-09-04  Gerd Moellmann  <gerd@gnu.org>

	* window.c (Qwindow_size_fixed): Replaces Qfixed_window_size.
	(window_fixed_size_p): Use Qwindow_size_fixed instead of
	Qfixed_window_size.
	(syms_of_window): Ditto.

	* fns.c (Fmakehash): Exchange optional test and size arguments.

1999-09-03  Gerd Moellmann  <gerd@gnu.org>

	* xterm.c (XTset_vertical_scroll_bar): Block input when clearing
	under newly created scroll bar.
	(expose_window): If window is not yet fully initialized, do
	nothing.  This can happen when toolkit scroll bars are used and a
	window is split.  Reconfiguring the scroll bars will generate an
	expose for a newly created window.

	* frame.h (struct frame): New member `gamma'.

	* xfns.c: Include math.h.  Add extern declaration for atof in case
	we don't see one.
	(Qscreen_gamma): New.
	(struct x_frame_parm_table): Add prototypes, add
	x_set_screen_gamma.
	(gamma_correct): New function.
	(defined_color): Call it.
	(x_set_screen_gamma): New.
	(x_set_title): Add parameter old_value.
	(RES_TYPE_FLOAT): New.
	(x_get_arg): Handle RES_TYPE_FLOAT.
	(Fx_create_frame): Call x_default_parameter for `screen-gamma'.
	(lookup_pixel_color): Change call to x_alloc_nearest_color to
	new prototype.
	(lookup_rgb_color): Ditto.
	(syms_of_xfns): Initialize Qscreen_gamma.

	* xterm.c (x_alloc_nearest_color_for_widget) [USE_X_TOOLKIT]:
	New.  Allocate color for lwlib widgets.
	(x_alloc_nearest_color): Change parameter list include the
	frame on which to allocate colors.  Gamma-correct colors.
	(x_alloc_lighter_color): Call x_alloc_lighter_color with new
	parameter list.

	* xterm.h: Change protorype of x_alloc_nearest_color.

1999-09-03  Richard Stallman  <rms@gnu.org>

	* callproc.c: Delete the system-independent include of stdlib.h
	(leaving only the one in the WINDOWSNT conditional).

1999-09-03  Andrew Choi  <choi@cs.hku.hk>

	* callproc.c (call-process) [macintosh]: Call mac_run_command in
	sysdep.c.  The Mac code is modeled after the DOS code.

	* dispextern.h [macintosh]: Include macterm.h to define substitute X
	Window types and macros.

	* frame.h: Do nothing if included a second time.
	(enum output_method): Add mac_output frame type.
	(union output_data): Add new alternative `mac'.
	(FRAME_MAC_P): New macro.

	* frame.c (Fframep) [macintosh]: Handle mac frame type.
	(syms_of_frame_1): Initialize Qmac.
	(make_terminal_frame) [macintosh]: Initialize output_data.mac fields.
	(Fmake_terminal_frame) [macintosh]: Add an alternate error check.
	(Fmodify_frame_parameters) [macintosh]: Call
	mac_set_frame_parameter in macterm.c.

	* keyboard.c [macintosh]: Set KBD_BUFFER_SIZE to a smaller value
	(512) because Mac compilers limit local data of a function to 32K.

	* make-docfiles.c: Correctly handle input files with Mac-style
	eol's.

	* sysdep.c: Define numerous routines to emulate Unix system calls.

	* xfaces.c: on MacOS, define the set of colors listed in rgb.txt
	file of an X Window environment.

	* xfaces.c: on MacOS, define the Lisp functions x-display-color-p,
	x-display-grayscale, x-color-defined-p, and x-color-values.

	* sysdep.c [macintosh] (stat, fstat, mkdir, rmdir, utime, access)
	(open, creat, unlink, read, write, rename, fopen, pause, alarm)
	(signal, sleep, gmtime, localtime, ctime, time, index, mktemp)
	(getpwuid, getpwnam, dup, dup2, isatty, getgid, getegid, getuid)
	(geteuid, getpid, getenv, uname, opendir, closedir, readdir, getwd.):
	New functions, replacing POSIX features.

	* sysdep.c [macintosh] (Mac2UnixPathname, Unix2MacPathname, CheckAlarm)
	(InitMyPasswd, GetTempDirName, mystrchr, mystrtok, mystrcpy):
	(InitEmacsPasswdDir, run_mac_command): New subroutines.

	* sysdep.c [macintosh] (targetTicks, alarm_signal_func, myPasswdName)
	(myPasswd, emacsPasswdDir, emacsPasswd, myPasswdInited, mask)
	(myPasswdDir, TempDirName, sys_siglist): New variables.

	* sysdep.c [macintosh] (execvp, wait, croak, fork, kill, sigsetmask)
	(sigblock, request_sigio, unrequest_sigio, setpgrp, pipe, symlink)
	(link, lstat, readlink, umask, chmod, sbrk, fsync, ioctl):
	Define empty stubs so Emacs will link.

1999-09-03  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c: Use XCAR and XCDR instead of XCONS.

	* window.h: New member frozen_window_start_p.

	* window.c (foreach_window, foreach_window_1): New.
	(freeze_window_start, freeze_window_starts): New.
	(make_window): Initialize frozen_window_start_p.
	(replace_window): Ditto.
	(Fset_window_point): Remove references to deleted variables.
	(Fset_window_start): Ditto.

	* xdisp.c (Vresize_mini_config, resize_mini_frame,
	resize_mini_initial_height): Removed.
	(syms_of_xdisp): Remove references to these variables.
	(resize_mini_window): Don't save window configuration, freeze
	window starts instead.  Enlarge window until displaying an empty
	buffer, then shrink it.  Make the function externally visible.
	(redisplay_window): Treat frozen window start like forced start,
	but accept point outside of the window.

	* dispextern.h: Add function prototype for resize_mini_window.

	* minibuf.c (read_minibuf_unwind): Resize mini-window when
	reaching minibuf_level 0.

	* lisp.h: Remove extern declarations for variables deleted from
	xdisp.c.

	* dispnew.c (adjust_frame_glyphs): Remove reference to
	Vresize_mini_config.

1999-09-03  Gerd Moellmann  <gerd@gnu.org>

	* xfns.c (x_set_scroll_bar_width): Change conditional compilation
	to USE_TOOLKIT_SCROLL_BARS.

	* xterm.c (x_scroll_bar_create): Don't clear under scroll bar
	here.
	(XTset_vertical_scroll_bar): Clarify position computations.  Clear
	under newly created scroll bar.  Put toolkit scroll bars in the
	middle of the area reserved for the scroll bar.

1999-09-03  Kenichi Handa  <handa@etl.go.jp>

	The following changes are for the new handling of mulitbyte
	sequence.  Now, except for a composite character, no multibyte
	character in string/buffer has trailing garbage bytes.  For
	instance, the length of string "\201\300\300" is now 2, the first
	character is Latin-1 A-grave, the second is raw \300.

	* charset.h (MAKE_NON_ASCII_CHAR): Handle the case that C1 or C2
	are negative.
	(MAKE_CHAR): Don't set MSBs of C1 and C2 to 0.
	(VALID_MULTIBYTE_CHAR_P): This macro deleted.
	(PARSE_COMPOSITE_SEQ): New macro.
	(PARSE_CHARACTER_SEQ): New macro.
	(PARSE_MULTIBYTE_SEQ): New macro.
	(CHAR_PRINTABLE_P): New macro.
	(STRING_CHAR): Adjusted for the change of string_to_non_ascii_char.
	(STRING_CHAR_AND_LENGTH): Likewise.
	(STRING_CHAR_AND_CHAR_LENGTH): Define it as STRING_CHAR_AND_LENGTH.
	(INC_POS): Use the macro PARSE_MULTIBYTE_SEQ.
	(DEC_POS, BUF_INC_POS, BUF_DEC_POS): Likewise,

	* charset.c (SPLIT_COMPOSITE_SEQ): New macro.
	(SPLIT_CHARACTER_SEQ): New macro.
	(SPLIT_MULTIBYTE_SEQ): New macro.
	(CHAR_COMPONENT_VALID_P): New macro.
	(non_ascii_char_to_string): Generate a multibyte sequence as far
	as possible.
	(string_to_non_ascii_char): The 4th arg exclude_tail_garbage is
	deleted.  Caller changed.  Use the macro SPLIT_MULTIBYTE_SEQ.
	(split_non_ascii_string): Likewise.
	(multibyte_form_length): Use the macro PARSE_MULTIBYTE_SEQ.
	(char_printable_p): New function.
	(translate_char): Check character by NATNUMP instead of INTEGERP.
	(unibyte_char_to_multibyte): Call char_valid_p instead of
	VALID_MULTIBYTE_CHAR_P.
	(Fmake_char_internal): Check the arguments more rigidly.
	(Fcharset_after): Use the macro SPLIT_MULTIBYTE_SEQ.
	(char_valid_p): Check the validity by CHAR_COMPONENT_VALID_P.
	(Fmultibyte_char_to_unibyte): Check the validity of character by
	CHAR_VALID_P.
	(chars_in_text): Call multibyte_chars_in_text.
	(multibyte_chars_in_text): Use the macro PARSE_MULTIBYTE_SEQ.
	(Fcompose_string): Use the macro STRING_CHAR_AND_LENGTH instead of
	STRING_CHAR_AND_CHAR_LENGTH (which is obsolete now).

	* data.c (Faset): Adjust the way to check byte-combining
	possibility for the new handling of multibyte sequence.

	* editfns.c (Fsubst_char_in_region): Likewise.

	* fns.c (count_combining): Use the macro PARSE_MULTIBYTE_SEQ.
	(string_char_to_byte): Likewise.
	(string_byte_to_char): Likewise.

	* indent.c (MULTIBYTE_BYTES_WIDTH): Delete the 2nd arg C.  Use the
	macro STRING_CHAR_AND_LENGTH.  Caller changed.

	* insdel.c (count_combining_composition): New function.
	(count_combining_before): Adjust the way to check byte-combining
	possibility for the new handling of multibyte sequence.  Call
	count_combining_composition for a composite character.
	(count_combining_after): Likewise.

	* print.c (print_string): Use the macro STRING_CHAR_AND_LENGTH.
	(print): Likewise.

	* dispextern.h (struct it): Change the size of the member
	`ctl_chars'.

	* xdisp.c (get_next_display_element): Display incomplete multibyte
	sequence (e.g. \222\300) by octal form.

1999-09-02  Gerd Moellmann  <gerd@gnu.org>

	* xterm.h (VERTICAL_SCROLL_BAR_WIDTH_TRIM): Change from 2 to 0.

	* fns.c (Fhash_table_weakness): Replaces Fhash_table_weak.
	(cmpfn_eql, sxhash): Use XFLOAT_DATA.

1999-09-02  Gerd Moellmann  <gerd@gnu.org>

	* buffer.c (set_buffer_internal): Never set
	windows_or_buffers_changed.

	* xdisp.c (try_window_id): Reset first_unchanged_at_end_row
	if we have displayed to the bottom of the window.

	* syntax.c (Fforward_word): Stop at a mini-buffer prompt end
	in both directions.  Extend documentation.

1999-09-01  Gerd Moellmann  <gerd@gnu.org>

	* minibuf.c (read_minibuf): Flush display after setting cursor to
	column 0.

1999-08-31  Gerd Moellmann  <gerd@gnu.org>

	* s/freebsd.h (__FreeBSD_version): Don't define it if it is
	already defined.  This avoids a warning from buffer.c.

1999-08-30  Gerd Moellmann  <gerd@gnu.org>

	* xterm.h (FRAME_X_FLAGS_AREA_COLS): Define it as the total width
	of both margins.
	(FRAME_X_FLAGS_AREA_WIDTH): Likewise.
	(FRAME_X_LEFT_FLAGS_AREA_WIDTH): New.
	(FRAME_X_RIGHT_FLAGS_AREA_WIDTH): New.

	* frame.h (FRAME_WINDOW_WIDTH_ARG): Add in FRAME_FLAGS_AREA_COLS
	once instead of twice.
	(FRAME_LEFT_FLAGS_AREA_WIDTH): New.

	* xterm.c: Remove unused bitmaps.
	(continued_bits, continuation_bits, overlay_bits): Change images.
	(x_draw_vertical_border): Use FRAME_X_RIGHT_FLAGS_AREA_WIDTH
	instead of FRAME_X_FLAGS_AREA_WIDTH.
	(x_after_update_window_line): Ditto.
	(x_draw_bitmap): Likewise.
	(x_draw_row_bitmaps): Likewise.
	(x_draw_glyph_string_box): Likewise.
	(x_draw_glyphs): Likewise.
	(x_scroll_run): Likewise.
	(expose_window_tree): Likewise.
	(note_mode_line_highlight): Likewise.
	(XTset_vertical_scroll_bar): Likewise.
	(x_clip_to_row): Likewise.
	(x_set_window_size): Likewise.

	* xfns.c (x_figure_window_size): Use FRAME_FLAGS_AREA_COLS instead
	of 2 * that value.

	* xdisp.c (window_box_width): Use FRAME_FLAGS_AREA_COLS instead of
	2 * that value.
	(window_box_left): Use FRAME_LEFT_FLAGS_AREA_WIDTH instead of
	FRAME_FLAGS_AREA_WIDTH.

	* window.c (coordinates_in_window): Use
	FRAME_LEFT_FLAGS_AREA_WIDTH instead of FRAME_FLAGS_AREA_WIDTH.
	(window_internal_width): Subtract FRAME_FLAGS_AREA_WIDTH once
	instead of twice.

	* widget.c (set_frame_size): Set flags_area_extra to
	FRAME_FLAGS_AREA_WIDTH instead of 2 * that width.
	(EmacsFrameSetCharSize): Ditto.

	* dispnew.c (mode_line_string): Add FRAME_LEFT_FLAGS_AREA_WIDTH
	instead of FRAME_FLAGS_AREA_WIDTH.

	* dispextern.h (WINDOW_DISPLAY_PIXEL_WIDTH): Subtract
	FRAME_FLAGS_AREA_COLS once.
	(WINDOW_DISPLAY_LEFT_EDGE_PIXEL_X): Add
	FRAME_LEFT_FLAGS_AREA_WIDTH instead of FRAME_FLAGS_AREA_WIDTH.

1999-08-30  Gerd Moellmann  <gerd@gnu.org>

	* freebsd.h (C_SWITCH_SYSTEM): Added to let configure find headers
	in /usr/X11R6/include which are checked for with AC_CHECK_HEADER.

1999-08-30  Gerd Moellmann  <gerd@gnu.org>

	* fns.c (QCweakness): Replaces QCweak.
	(Fmake_hash_table): Ditto.
	(Fmakehash): Ditto.
	(syms_of_fns): Ditto.

1999-08-29  Richard Stallman  <rms@gnu.org>

	* search.c (compile_pattern_1): Enable RE_CHAR_CLASSES for regexp.

	* sysdep.c (read_input_waiting): Pass read_socket_hook just 4 args.

	* syntax.h (SYNTAX_COMMENT_NESTED, SYNTAX_FLAGS_COMMENT_NESTED):
	Add support for nested comments.

	* syntax.c (Fforward_comment, scan_lists, scan_sexps_forward):
	Consolidate the forward comment code into the new `forw_comment'.
	(forw_comment): New subroutine.  Added support for nested comments.
	(lisp_parse_state, back_comment, Fmodify_syntax_entry)
	(Fparse_partial_sexp): Add support for nested comments.

1999-08-28  Ken Raeburn  <raeburn@gnu.org>

	* lisp.h (struct Lisp_Cons, XCAR, XCDR, struct Lisp_Float): Change
	names of structure elements if HIDE_LISP_IMPLEMENTATION is
	defined, to help detect code that uses knowledge of the Lisp
	internals that it shouldn't have.
	(XFLOAT_DATA): New macro.

1999-08-25  Gerd Moellmann  <gerd@gnu.org>

	* syntax.c (Fforward_word): If in a mini-buffer and moving
	backwards, stop in front of the prompt to prevent accidentially
	moving into the read-only prompt.

	* window.c (Frecenter): Clear frame if called with nil or no arg.

	* xdisp.c (resize_mini_window): Don't resize if
	Vmax_mini_window_height is nil.  Otherwise, use a default if
	Vmax_mini_window_height is not ot a number.
	(syms_of_xdisp): Extend documentation of Vmax_mini_window_height.

1999-08-25  Alexandre Oliva  <oliva@dcc.unicamp.br>

	* unexelf.c: Merge IRIX debugging info patch from unexsgi.c
	* m/iris4d.h: Use unexelf for IRIX 5.*.
	* m/iris5d.h: Use unexelf for IRIX 6.*.
	* unexsgi.c: Deleted.

	* unexelf.c: Auto-detect .sbss section.
	(round_up): Make it static.
	(unexec): Declare alignment as Elf Word.  Skip ``Program
	segment above .bss'' test on MIPS without .sbss.
	Copy sections .got and .sdata1 sections.  Adjust offsets in
	sections .sdata, .lit4, .lit8, .got and .sdata1.

1999-08-25  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (try_window_id): Remove typo.

1999-08-24  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (try_window_id): Recognize case that PT == ZV and in
	unchanged text at the bottom when computing the cursor position.
	(message3_nolog): Raise frame only if minibuffer_auto_raise is
	set.

	* lisp.h (PVEC_TYPE_MASK): Add the bit for hash tables.

1999-08-24  Gerd Moellmann  <gerd@gnu.org>

	* xfaces.c (Qmargin): Replacement for Qbitmap_area.
	(realize_basic_faces): Replace Qmargin for Qbitmap_area.
	(syms_of_xfaces): Ditto.

	* window.c (Fset_window_point): Reset Vresize_mini_config.
	(Fset_window_start): Ditto.
	(set_window_buffer): Ditto.

	* dispnew.c (adjust_frame_glyphs): Reset Vresize_mini_config.

	* xdisp.c (redisplay_window): Don't ever test just_this_one_p
	before calling try_window.
	(echo_area_display): If height has changed, update other windows.
	(resize_mini_frame, resize_mini_initial_height): New.
	(resize_mini_window): Save/restore window configuration
	differently.

	* lisp.h (Vresize_mini_config, resize_mini_frame,
	resize_mini_initial_height): Add extern declarations.

	* xterm.c (expose_window_tree): Fix typo CANON_Y_UNIT to
	CANON_X_UNIT.

	* xfns.c [HAVE_JPEG]: Work around a warning about HAVE_STDLIB_H
	being redefined in jconfig.h.

1999-08-23  Ken'ichi Handa  <handa@gnu.org>

	* coding.h: Include "ccl.h" instead of "../src/ccl.h".

1999-08-22  Gerd Moellmann  <gerd@gnu.org>

	* alloc.c (mark_glyph_matrix): Mark strings only.

	* xdisp.c (redisplay_internal): Clear garbaged frames after
	resizing mini-window.

1999-08-22  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (unwind_with_echo_area_buffer): Use
	set_buffer_internal_1 instead of set_buffer_internal.
	(with_echo_area_buffer): Ditto.

	* buffer.c (set_buffer_internal): Set windows_or_buffers_changed
	only if buffer is displayed somewhere.

	* buffer.h (BUF_COMPUTE_UNCHANGED): New.

	* insdel.c (gap_left): Use BUF_COMPUTE_UNCHANGED.
	(gap_right): Ditto.
	(modify_region): Ditto.

	* buffer.c (modify_overlay): Use BUF_COMPUTE_UNCHANGED.

	* xdisp.c (Vresize_mini_config): New.
	(resize_mini_window): Use it to save restore original window
	configuration
	(syms_of_xdisp): Initialize it.

	* buffer.h (struct buffer): Add prevent_redisplay_optimizations_p.

	* dispextern.h (struct glyph_matrix): Add buffer, begv, and zv.

	* xdisp.c (reconsider_clip_changes): New.
	(redisplay_internal, redisplay_window): Call it.
	(mark_window_display_accurate, redisplay_internal): Set current
	matrix' buffer, begv, zv.

	* window.c (Fset_window_hscroll): Set
	prevent_redisplay_optimizations_p instead of clip_changed.
	(Fset_window_hscroll): Ditto.
	(temp_output_buffer_show): Ditto.
	(Fset_window_vscroll): Ditto.

	* buffer.c (reset_buffer): Set clip_changed to 0 and
	prevent_redisplay_optimizations_p to 1.
	(Fget_buffer_create): Set prevent_redisplay_optimizations_p to 1.

	* buffer.h (BUF_UNCHANGED_MODIFIED, UNCHANGED_MODIFIED,
	BUF_OVERLAY_UNCHANGED_MODIFIED, OVERLAY_UNCHANGED_MODIFIED,
	BUF_BEG_UNCHANGED, BEG_UNCHANGED, BUF_END_UNCHANGED,
	END_UNCHANGED): New.
	(struct buffer_text):  Add beg_unchanged, end_unchanged,
	unchanged_modified, overlay_unchanged_modified.

	* window.h (beg_unchanged, end_unchanged, unchanged_modified,
	overlay_unchanged_modified): Removed.
	(with_echo_area_unwind_data): Don't save beg/end_unchanged.
	(unwind_with_echo_area_buffer): Don't restore them.
	(debug_beg_unchanged, debug_end_unchanged) [GLYPH_DEBUG]: Removed.
	(text_outside_line_unchanged_p, redisplay_internal,
	try_scrolling): Use/set buffer-specific beg/end_unchanged.
	(redisplay_window): Let try_window_id be called if more than one
	window is displayed.  Use/set buffer-specific beg/end_unchanged.
	(get_last_unchanged_at_beg_row, get_first_unchanged_at_end_row,
	try_window_id):
	Use buffer-specific beg/end_unchanged.

	* window.h (beg_unchanged, end_unchanged, unchanged_modified,
	overlay_unchanged_modified): Remove extern declarations.

	* keyboard.c (command_loop_1):  Set beg/end_unchanged per
	buffer.

	* insdel.c (gap_left): Compute beg/end_unchanged per buffer.
	(gap_right): Ditto.
	(adjust_after_replace): Likewise.
	(replace_range, del_range_2, modify_region): Likewise.

	* dispnew.c (direct_output_for_insert):  Set beg_unchanged
	and unchanged_modified per buffer.

	* coding.c (code_convert_region): Compute beg/end_unchanged per
	buffer.

	* buffer.c (modify_overlay): Compute beg/end_unchanged
	per buffer.
	(Fget_buffer_create): Initialize new members of the buffer
	structure.

1999-08-22  Gerd Moellmann  <gerd@gnu.org>

	* lisp.h: Add prototype for copy_hash_table and Fcopy_hash_table.

	* fns.c (Qkey, Qvalue): Renamed from Qkey_weak, and Qvalue_weak.
	(Qkey_value_weak):  Removed.
	(make_hash_table): Use nil, `key', `value', t for weakness.
	(Fmake_hash_table): Ditto.
	(copy_hash_table): New.
	(Fcopy_hash_table): New.

1999-08-22  Gerd Moellmann  <gerd@gnu.org>

	* xfns.c: Call change_frame_size and do_pending_window_change with
	new parameter.

1999-08-21  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (resize_mini_window): Do it for truncate-lines t as
	well.
	(redisplay_internal): Resize mini-window only if text might
	have changed.
	(display_echo_area): Reset displayed echo_area_buffer to nil
	at the end if we're displaying a nil message.

1999-08-21  Gerd Moellmann  <gerd@gnu.org>

	* fns.c (hash_lookup): Test with EQ before calling key comparion
	function.
	(hash_remove): Ditto.
	(cmpfn_eq): Removed.
	(cmpfn_eql): Don't test with EQ.
	(cmpfn_equal): Ditto.
	(make_hash_table): Set comparison function for `eq' to null.

	* buffer.c, cmds.c, editfns.c, indent.c, insdel.c, buffer.h:
	Remove conditional compilation on NO_PROMPT_IN_BUFFER.

	* dispextern.h (NO_PROMPT_IN_BUFFER): Removed.

	* window.c, widget.c, process.c, keyboard.c, frame.c, xdisp.c,
	xterm.c: Call change_frame_size and do_pending_window_change with
	new parameter.

	* dispnew.c (do_pending_window_change): Add parameter `safe'.
	(change_frame_size): Ditto.
	(change_frame_size_1): Ditto.  Deley size changes if redisplaying
	and not called from a safe place.
	(window_change_signal): Call change_frame_size with new parameter.

	* dispextern.h: Change prototypes for do_pending_window_change
	and change_frame_size.

	* xfaces.c (face_at_buffer_position): Don't xassert that
	window's buffers equals current_buffer; this is not the
	case during echo area display.

1999-08-21  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c, minibuf.c: Remove conditional compilation on
	NO_PROMPT_IN_BUFFER.

	* minibuf.c (Fminibuffer_prompt_end): New.
	(syms_of_minibuf): Defsubr it.  Remove
	minibuffer-prompt-in-buffer.
	(Fminibuffer_prompt_width): Return 0 if not in mini-buffer.
	Extend documentation.

	* xdisp.c (get_next_display_element): Display \r as ^M.

	* xterm.c (x_scroll_bar_create) [USE_TOOLKIT_SCROLL_BARS]: Clear
	under scroll bar widget.

1999-08-21  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (minibuffer_scroll_overlap): Removed because not used
	anywhere.
	(unwind_redisplay): Return nil.
	(clear_garbaged_frames): New.
	(redisplay_internal): Use it.
	(echo_area_display): Ditto.
	(resize_mini_window): Mew.
	(display_echo_area_1): Use it to resize echo area window.
	(redisplay_internal): Use it to resize active mini-window.

	* dispextern.h, lisp.h: Add function prototypes.

	* dispnew.c (set_window_cursor_after_update): Do the
	cursor_in_echo_area case only for a mini-window showing
	a message.  Don't let cursor end up after the end of a row.

	* xdisp.c (echo_area_glyphs, echo_area_message,
	echo_area_glyphs_length, previous_echo_glyphs,
	previous_echo_area_message, previous_echo_area_glyphs_length):
	Removed.
	(Vmessage_stack, echo_area_buffer, echo_buffer,
	display_last_displayed_message_p, Vwith_echo_area_save_vector): New.
	(message2_nolog): Use set_message and clear_message.
	(message3): Rename parameter len to nbytes to make clear what
	it is.
	(message3_nolog): Ditto.  Use set_message and clear_message.
	(update_echo_area): Rewritten.
	(with_echo_area_buffer): New.
	(with_echo_area_buffer_unwind_data, unwind_with_area_buffer): New.
	(setup_echo_area_for_printing): New.
	(display_echo_area, display_echo_area_1): New.

	(current_message, current_message_1): New.
	(push_message, restore_message, pop_message,
	check_message_stack): New.
	(truncate_echo_area): Rewritten.
	(truncate_message_1): New.
	(set_message, set_message_1, clear_message): New.
	(echo_area_display): Rewritten.
	(redisplay_internal): Check for needed echo area update
	differently.
	(redisplay_preserve_echo_area): Rewritten.
	(redisplay_window): Check for mini-window displaying echo area
	message differently.
	(syms_of_xdisp): Initialize Vmessage_stack and echo area buffers.
	Remove initialzation of removed variables.
	(init_xdisp): Remove references to removed variables.

	* dispnew.c (adjust_frame_message_buffer): Removed references
	to echo_area_glyphs and previous_echo_glyphs.
	(direct_output_for_insert): Check for mini-window displaying
	echo area message differently.
	(update_frame): Likewise.
	(set_window_cursor_after_update): Likewise.  In echo area,
	don't try to set cursor on rows that aren't enabled.

	* print.c: Remove conditional compilation on `standalone'.
	(glyph_len, str_to_glyph_cpy, str_to_glyph_ncpy,
	glyph_to_str_cpy):  Remove that section because GLYPHs are no
	longer used in that way.
	(PRINTDECLARE): Add multibyte.
	(PRINTPREPARE, PRINTFINISH): Handle printcharfun t differently.
	(printbufidx): Removed.
	(printchar, strout): Rewritten.

	* keyboard.c (ok_to_echo_at_next_pause): Make it a pointer to
	a struct kboard.
	(echo_kboard): New.
	(echo_now): Set echo_kboard to the current kboard.
	(cancel_echoing): Set echo_kboard to null.
	(cmd_error_internal): Use clear_message, remove references
	to echo_area_glyphs and echo_area_message.
	(command_loop_1): Check for echo area messages differently.
	(read_char): Likewise.
	(record_menu_key): Use clear_message.
	(Fexecute_extended_command):  Check for echo area messages
	differently.  Use push_message, restore_message, pop_message.

	* alloc.c (Fgarbage_collect): Use push_message, restore_message,
	pop_message.

	* emacs.c (shut_down_emacs): Call check_message_stack.

	* lisp.h: Add function prototypes and extern declarations for
	new functions and variables.

	* fileio.c (Fdo_auto_save): Use push_message, restore_message,
	pop_message.

	* minibuf.c (read_minibuf): Use clear_message instead of
	setting echo_area_glyphs.
	(Fminibuffer_completion_help): Ditto.

	* editfns.c (Fcurrent_message): Rewritten.

	* frame.c, window.h: Remove references to echo_area_glyphs
	and previous_echo_glyphs.

1999-08-21  Dave Love  <fx@gnu.org>

	* aix3-2-5.h (C_DEBUG_SWITCH): Use -g -O.
	* aix4-1.h: Likewise.

	* irix6-5.h (C_DEBUG_SWITCH): Set for debug and optimize.

1999-08-20  Gerd Moellmann  <gerd@gnu.org>

	* xfns.c: Remove tiff34 prefix from include.

1999-08-20  Dave Love  <fx@gnu.org>

	* cm.c: Revert previous change.

1999-08-19  Gerd Moellmann  <gerd@gnu.org>

	* xterm.c (XTset_vertical_scroll_bar): Fix previous change.  Clear
	under scroll bar with width FRAME_SCROLL_BAR_COLS.

1999-08-18  Dave Love  <fx@gnu.org>

	* callproc.c, filelock.c, insdel.c, sysdep.c, xmenu.c: Use
	stdlib.h.

	* doprnt.c: Use stdlib.h, unistd.h.

	* config.in: Add HAVE_TERMCAP_H.

	* cm.c: Use termcap.h.

1999-08-18  Gerd Moellmann  <gerd@gnu.org>

	* xfns.c (x_window) [USE_X_TOOLKIT]: Remove test for
	FRAME_X_WINDOW (f) being null at the of the function.  If widgets
	cannot be created we will already have crashed earlier.  Call
	lw_set_main_areas with a null menu-bar widget, so that we have
	a reasonable default.
	(Fx_create_frame): Rearranged so that Lisp errors during frame
	initialization cause less damage.  Initialize menu bar widget
	here.

1999-08-18  Gerd Moellmann  <gerd@gnu.org>

	* dispnew.c (update_frame_line): Fix previous change.  If writing
	whole line clear to end of frame.

1999-08-17  Gerd Moellmann  <gerd@gnu.org>

	* window.c (Fcoordinates_in_window_p): Return `left-bitmap-area'
	and `right-bitmap-area' if position is in the bitmap areas.  This
	avoids an error when clicking on the bitmap areas.  Instead, they
	are currently treated like clicks inside the window.
	(coordinates_in_window): Return 5 and 6 for bitmap areas.
	(Qleft_bitmap_area, Qright_bitmap_area): New.
	(syms_of_window): Initialize new symbols.

	* dispnew.c (update_frame_line): If writing whole line,
	don't write trailing spaces unless we must.

	* xdisp.c (unwind_redisplay): New.  Resets flag redisplaying_p.
	(redisplay_internal): Register unwind_redisplay with
	register_unwind_protect.
	(try_window_reusing_current_matrix): If new start > old start,
	give up if start pos of first reusable row is not equal to new
	start.

	* eval.c (Fsignal): Don't reset redisplaying_p here.

	* xterm.c (expose_area): If row extends face to end of line,
	write the whole line.

1999-08-16  Gerd Moellmann  <gerd@gnu.org>

	* dispextern.h (struct it): Remove member
	show_trailing_whitespace_p.

	* dispnew.c (direct_output_for_insert): Use
	Vshow_trailing_whitespace instead of former iterator member
	show_trailing_whitespace_p.
	(direct_output_forward_char): Don't do it if hightlighting
	trailing whitespace.

	* xdisp.c (Qshow_trailing_whitespace): Removed.
	(Vshow_trailing_whitespace): Added.
	(init_iterator): Remove initialization code for
	show_trailing_whitespace_p.
	(redisplay_internal): Don't try cursor movement in this_line
	if showing trailing whitespace.
	(redisplay_window): Likewise for cursor movement in current
	matrix and try_window_id.
	(try_window_reusing_current_matrix): Likewise.
	(trailing_whitespace_p): Return 0 if trailing whitespace is
	in front of point.
	(display_line): Use Vshow_trailing_whitespace instead of
	former iterator member show_trailing_whitespace_p.
	(syms_of_xdisp): Add DEFVAR_LISP for show-trailing-whitespace.

1999-08-16  Gerd Moellmann  <gerd@gnu.org>

	* window.c (Fpos_visible_in_window_p): Rewritten.

	* xfaces.c (add_to_log): Renamed from display_message.
	Don't display messages in echo area.

	* xterm.c (x_draw_glyph_string_box): Use the background width
	of the glyph string for the width of the box.

1999-08-16  Stefan Monnier  <monnier@cs.yale.edu>

	* syntax.c (Fforward_comment): Set comstyle for Scomment_fence.

1999-08-16  Geoff Voelker  <voelker@cs.washington.edu>

	* xfns.c, w32fns.c (x_set_frame_parameters): Set foreground and
	background first, and then set other parameters that might
	depend upon their new values.

1999-08-15  Gerd Moellmann  <gerd@gnu.org>

	* xfaces.c (Vfont_list_limit): New.
	(syms_of_xfaces): Make it a user-variable.
	(DEFAULT_FONT_LIST_LIMIT): New.
	(sorted_font_list): If Vfont_list_limit is an integer > 0, list
	maximally that number of fonts, otherwise use
	DEFAULT_FONT_LIST_LIMIT.
	(Fx_font_family_list): Bind `font-list-limit' to higher values
	until we have all fonts.
	(Fxfont_list): Additionally return the full names of fonts and
	their registry and encoding.

	* xterm.c (XTset_vertical_scroll_bar) [USE_TOOLKIT_SCROLL_BARS]:
	Simplify clearing "under" scroll bar.

	* window.c (Qfixed_window_size): New.
	(syms_of_window): Initialiaze it.
	(check_all_windows): Add return type void.
	(window_fixed_size_p): New.  Return non-zero if window
	is fixed-size.
	(window_min_size_1): New.
	(window_min_size): Handle fixed-size windows.
	(size_window): New. Rewritten combination of set_window_height and
	set_window_width that handles fixed-size windows.
	(set_window_height): Call it.
	(set_window_width): Call it.
	(Fsplit_window): Give an error on attempt to split a fixed-size
	window.
	(change_window_height): Partly rewritten to handle fixed-size
	windows.

1999-08-13  Wolfgang Rupprecht  <wolfgang@wsrcc.com>

	* process.c (Fopen_network_stream): Fix previous change.

1999-08-13  Karl Heuer  <kwzh@gnu.org>

	* xdisp.c (line_number_display_limit_width): New var.
	(decode_mode_spec): Use it instead of hardcoded value.
	(syms_of_xdisp): Defvar it.

1999-08-13  Richard M. Stallman  <rms@gnu.org>

	* eval.c (run_hook_list_with_args): Gcpro `globals'.
	(run_hook_with_args): Likewise.

	* window.h (struct window): New field too_small_ok.

	* window.c (set_window_height, set_window_width):
	If window starts out "too small", set its too_small_ok flag.
	If window's too_small_ok flag is set, don't delete it
	unless it is so small it would cause a crash.

1999-08-13  Gerd Moellmann  <gerd@gnu.org>

	* window.c (MINSIZE): Removed.
	(window_min_size): New.
	(set_window_height): Use window_min_size.
	(change_window_height): Ditto.

1999-08-12  Gerd Moellmann  <gerd@gnu.org>

	* indent.c (vmotion): Don't add in mini-buffer prompt width
	if prompts are inserted into mini-buffer.

1999-08-12  Wolfgang Rupprecht  <wolfgang@wsrcc.com>

	* config.in: Add HAVE_GETADDRINFO.
	* process.c (Fopen_network_stream): Use getaddrinfo.

1999-08-11  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (get_overlay_arrow_glyph_row): Set the charpos of
	glyphs to -1.

	* xdisp.c (face_before_or_after_it_pos): If position after
	or before iterator's current position in the buffer is out
	of bounds, return the iterator's original face id.

	* dispnew.c (mirror_make_current): If desired row isn't enabled,
	just swap glyphs pointers between current and desired row.
	(build_frame_matrix_from_leaf_window) [GLYPH_DEBUG]: Copy
	desired matrix method string to current matrix.

1999-08-11  Kenichi Handa  <handa@etl.go.jp>

	* lisp.h (CHAR_MODIFIER_MASK): New macro.

	* lread.c (read_escape): For Control modifier, pay attention to
	multibyte character.
	(read1): Likewise.  Singal error or a multibyte character which
	has a modifer bit.  Check validity of Shift modifer.

	* charset.c (non_ascii_char_to_string): Handle modifier bits as
	the same as Lisp reader.

1999-08-10  Richard M. Stallman  <rms@gnu.org>

	* charset.h (BCOPY_SHORT): Fix typo `unsigined'.

1999-08-10  Alexandre Oliva  <oliva@dcc.unicamp.br>

	* unexelf.c [__linux__ && __alpha__] (HAS_SBSS_SECTION): Define.

1999-08-10  Eli Zaretskii  <eliz@gnu.org>

	* msdos.c (IT_set_face): Abort if the default face is not realized
	and cached.
	(IT_write_glyphs): Reset the screen face to the default face
	before writing glyphs.

	* xfaces.c (realize_default_face) [MSDOS]: Don't take default
	colors from the frame here.
	(realize_tty_face) [MSDOS]: Do it here.  Update the face
	attributes with the actual name of the color taken from the
	frame.

	* dosfns.c (msdos_stdcolor_name): Remove const from return value.
	* dosfns.h (msdos_stdcolor_name): Ditto for the prototype.

	* frame.c (Fframe_parameters): Swap foreground and background
	colors returned in frame parameters if the frame has reverse in
	its parameter alist.
	(Fmake_terminal_frame): Make a unique copy of face_alist for
	each frame.

1999-08-07  Richard Stallman  <rms@gnu.org>

	* buffer.c (Fprevious_overlay_change): Just return
	the answer obtained from overlays_at.

	* xfns.c (xpm_load) [!XpmAllocCloseColors]:
	Use XpmCloseness and attrs.closeness instead.

1999-08-06  Richard Stallman  <rms@gnu.org>

	* lread.c (Feval_buffer): New arg DO_ALLOW_PRINT.

1999-08-06  Geoff Voelker  <voelker@cs.washington.edu>

	* dired.c (directory_files_internal, Fdirectory_files_and_attributes,
	Ffile_attributes_lessp): New functions.
	(Fdirectory_files): Use directory_files_internal.
	(syms_of_dired): Initialize Fdirectory_files_and_attributes,
	Ffile_attributes_lessp.

	* w32.c (stat): Check for directory ending in separator when
	doing readdir fast path.

	* w32fns.c (x_set_icon_type): Support setting frame icons.
	* w32term.c (x_bitmap_icon): New function.
	(x_make_frame_visible, x_iconify_frame): Invoke x_bitmap_icon.

1999-08-06  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (set_iterator_to_next): After delivering a character
	from a display vector, restore face and charset to what they were
	before the display vector was processed.

1999-08-06  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (reseat_at_next_visible_line_start): New parameter
	on_newline_p.
	(set_iterator_to_next):  After delivering last char
	from display vector, reseat on next visible line start if
	dpvec_char_len < 0.
	(next_element_from_buffer): Set dpvec_char_len to -1 for
	selective display.

1999-08-06  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (compute_line_metrics): If first line's physical ascent
	 is larger than its logical ascent, use the physical ascent, and
	 make the row taller.  Set row's overlapping_p flag.

	* dispnew.c (redraw_overlapping_rows): Use flag overlapping_p.
	(direct_output_for_insert): Ditto.

	* dispextern.h (struct glyph_row): Add overlapping_p.

	* xterm.c (x_draw_phys_cursor_glyph): Redraw overlaps.

	* dispextern.h (MATRIX_ROW_OVERLAPS_PRED_P): New.
	(MATRIX_ROW_OVERLAPS_SUCC_P): New.

	* dispnew.c (direct_output_for_insert): Don't use this method if
	row is overlapped by others.
	(update_text_area): Write full line if current line is overlapped.
	(redraw_overlapped_rows): New.
	(update_window): Call it.
	(redraw_overlapping_rows): New.
	(update_window): Call it.
	(scrolling_window): Make sure overlapped_p flag in current rows is
	unchanged.
	(row_equal_p): Take rows overlapped_p flag into account.

	* dispextern.h (struct glyph_row): Add flag overlapped_p.

	* xterm.c (x_fix_overlapping_area): New.
	(x_redisplay_interface): Add x_fix_overlapping_area.

	* dispnew.c (adjust_glyphs): Block input while adjusting matrices.

1999-08-06  Gerd Moellmann  <gerd@gnu.org>

	* xterm.c (x_draw_glyphs): Add parameter overlaps_p.
	(struct glyph_string): Add member for_overlaps_p.
	(x_get_glyph_string_clip_rect): If glyph string draws foreground
	of overlapping rows, clip to window bottom.
	(x_fill_glyph_string): Add parameter overlaps_p.
	(x_fill_composite_glyph_string): Ditto.
	(BUILD_GLYPH_STRINGS): Ditto.
	(BUILD_CHAR_GLYPH_STRINGS): Ditto.
	(x_draw_glyph_string): Don't draw anything but the foreground
	if glyph string draws row overlaps.

	* dispnew.c (direct_output_for_insert): Don't use this
	optimization for rows that overlap others.
	(update_window_line): Return non-zero if display has changed.
	(update_text_area): Ditto.
	(update_window): Record if display has been changed.

	* dispextern.h (MATRIX_ROW_OVERLAPPING_P): New.

	* dispextern.h (struct redisplay_interface): Add
	fix_overlapping_area.

	* xterm.c (x_append_glyph): Set glyph flag overlaps_vertically_p.

	* dispextern.h (struct glyph): Add overlaps_vertically_p.

	* xterm.c (x_produce_image_glyph): Compute iterator's physical
	ascent and descent.
	(x_produce_stretch_glyph): Ditto.
	(x_produce_glyphs): Ditto.

	* xdisp.c (init_iterator): Reset physical line height info
	after producing special glyphs.
	(display_toolbar_line): Set physical line height info.
	(compute_line_metrics): Ditto.
	(display_line): Ditto.
	(display_string): Ditto.

	* term.c (produce_glyphs): Set iterator's physical height
	information.

	* dispnew.c (blank_row): Compute glyph row's physical height.
	(row_equal_p): Take physical row heights into account.
	(direct_output_for_insert): Ditto.
	(update_text_area): Ditto.

	* dispextern.h (struct glyph_row): Add phys_ascent and
	phys_height.
	(struct it): Add phys_ascent, phys_descent, max_phys_ascent,
	max_phys_descent.

1999-08-04  Stefan Monnier  <monnier@cs.yale.edu>

	* buffer.c (switch_to_buffer_1): New subroutine, taken out from
	Fswitch_to_buffer.
	(no_switch_buffer): New function.
	(Fswitch_to_buffer): Call them.  Don't get confused
	by "same-window" buffers in a dedicated frame.

	* window.c (display-buffer): Don't get confused
	by "same-window" buffers in a dedicated frame.

1999-08-04  Andreas Schwab  <schwab@gnu.org>

	* insdel.c (insert_from_string_1): Check gap size against number
	of outgoing bytes, not incoming bytes.

1999-08-03  Tom Breton  <tob@world.std.com>

	* lread.c (read1): Added circular reading code to #N=.
	(SUBSTITUTE): New macro.
	(seen_list): New variable.
	(substitute_object_in_subtree): New function.
	(substitute_object_recurse): New function.
	(substitute_in_interval): New function.

1999-08-02  Eli Zaretskii  <eliz@gnu.org>

	* Makefile.in (frame.o, sysdep.o, xfaces.o): Depend on dosfns.h.

	* frame.c (make_terminal_frame): Don't call init_frame_faces if
	noninteractive, for termcap frames as well.

	* sysdep.c (init_sys_modes): Call init_frame_faces for termcap
	frames.

1999-08-01  Richard Stallman  <rms@gnu.org>

	* fns.c (internal_equal): Correct overlay comparison.

1999-07-31  Richard M. Stallman  <rms@gnu.org>

	* xfns.c (x_set_internal_border_width):
	Call do_pending_window_change.  Don't block input, don't call XFlush.
	(x_set_vertical_scroll_bars): Call do_pending_window_change.
	(x_set_scroll_bar_width, x_set_font): Likewise.

	* frame.c (Fset_frame_height): Call do_pending_window_change.
	(Fset_frame_width, Fset_frame_size): Likewise.

	* xterm.c (x_set_window_size): When calling change_frame_size,
	specify 1 for DELAY.

	* widget.c (EmacsFrameSetCharSize): Don't call
	do_pending_window_change here.

1999-07-30  Dave Love  <fx@gnu.org>

	* config.in: Add HAVE_STDLIB_H.

1999-07-30  Richard M. Stallman  <rms@gnu.org>

	* process.c (create_process): Detect failure of `pipe'.

1999-07-30  Keisuke Nishida  <kei@psn.net>

	* alloc.c (allocate_vectorlike): Add missing increment.

	* data.c (Fdefalias): Call Ffset instead of duplicating code.

	* keymap.c (get_keymap_1, get_keyelt): Check the type of OBJECT
	before calling indirect_function.

1999-07-30  Eli Zaretskii  <eliz@gnu.org>

	* dispextern.h (load_color, lookup_derived_face): Declare
	prototypes.

	* dispnew.c (init_display) [MSDOS]: Don't initialize frame faces,
	it will be done later.

	* frame.c (make_terminal_frame) [MSDOS]: Don't call
	init_frame_faces if non-interactive.
	(Fframe_parameters) [MSDOS]: Replace indexing into colornames[]
	array with a call to msdos_stdcolor_name.  The font name is now
	"ms-dos", consistent with realize_tty_face.

	* keyboard.c (cmd_error_internal): Don't kill Emacs if this is an
	MSDOS frame.

	* window.c (Fset_window_configuration) [MSDOS]: Don't call
	x_set_toolbar_lines.

	* xfaces.c (load_color): Remove static from definition and remove
	prototype.
	[MSDOS]: Add a DOS-specific version of load_color.
	(lookup_face): Replace FRAME_TERMCAP_P with !FRAME_WINDOW_P.
	(lookup_derived_face): New function.
	(realize_default_face): Support MSDOS frames.
	[MSDOS]: If fore/background colors are unspecified, inherit them
	from the frame.
	(realize_face): Support MSDOS frames.
	(realize_tty_face): Support MSDOS frames.
	[MSDOS]: If the face color is not in Vface_tty_color_alist, call
	load_color to try to find a suitable approximation.  If the face
	is inverse-video, swap the foreground and background colors.

	* dosfns.c (msdos_stdcolor_name, msdos_stdcolor_idx): New
	functions.

	* dosfns.h (msdos_stdcolor_name, msdos_stdcolor_idx): Declare.

	* msdos.h: Remove redundant declarations (most of them are now in
	dispextern.h).

	* msdos.c (IT_set_face): Rewritten for the new redisplay engine.
	Use default frame colors if the face doesn't specify them; invert
	the colors if highlight is ON.
	(IT_write_glyphs): Rewritten for the new redisplay engine.
	(IT_change_line_highlight): Add (unused) parameter Y, since that's
	how the hook is called by term.c.
	(IT_copy_glyphs): New function, copies an area of the display in
	video RAM.
	(IT_insert_glyphs): Rewritten to DTRT instead of aborting, since
	redisplay now calls it even if char_ins_del_ok is zero.
	(IT_set_frame_parameters): Prototype changed.  Calls the new
	load_color.  Puts the new fore/background colors into the default
	face on current frame.
	(IT_menu_display): Rewritten to handle the new struct glyph
	instead of a char array.
	(XMenuActivate): Call lookup_derived_face to create and use
	special faces for the pop-up and drop-down menus.

1999-07-29  Gerd Moellmann  <gerd@gnu.org>

	* xterm.c (x_set_toolkit_scroll_bar_thumb): Don't call
	XawScrollbarSetThumb if thumb parameters haven't changed because
	that function apparently isn't optimized for this case.

1999-07-29  Eli Zaretskii  <eliz@gnu.org>

	* msdos.c (getdefdir): Don't return failure indication when
	_fixpath sets errno to ENOSYS.

1999-07-28  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (string_char_and_length): New.  Use it everywhere
	instead of STRING_CHAR_AND_LENGTH in xdisp.c.

1999-07-28  Kenichi Handa  <handa@etl.go.jp>

	* fns.c (count_combining): New function.
	(struct textprop_rec): New structure.
	(concat): Copy text properties correctly when byte combining
	occurs.

1999-07-28  Gerd Moellmann  <gerd@gnu.org>

	* xterm.c (x_setup_relief_color): Don't try smart color allocation
	if display is mono.
	(x_draw_row_bitmaps): If face has stipple, don't switch
	to foreground color for clearing areas, and set the fill style.

	* xfaces.c (load_face_colors): Load background color if setting
	stipple, too.
	(prepare_face_for_display): Use FillOpaqueStippled instead of
	FillStippled.

1999-07-26  Ken'ichi Handa  <handa@gnu.org>

	* xterm.c (x_find_ccl_program): Add casting.

	* w32fns.c (w32_find_ccl_program): Add casting.

1999-07-27  Gerd Moellmann  <gerd@gnu.org>

	* dispextern.h (struct glyph_row): Flag internal_border_p removed.

	* xfns.c (x_create_tip_frame): Don't set bitmapIcon resource
	because this will try to access a nonexisting widget.

1999-07-26  Markus Rost  <rost@gnu.org>

	* fns.c (Fgethash): Fix order of variables (patch by gerd).
	(Fputhash): Ditto.
	(Fremhash): Ditto.

1999-07-26  Gerd Moellmann <gerd@gnu.org>

	* widget.c (EmacsFrameSetCharSize): Don't add XtNborderWidth
	value to frame width and height.

	* xterm.c (x_get_glyph_string_clip_rect): Take internal border
	into account for full-width windows.  Don't add scroll bar width
	to width of clip rect.
	(x_draw_glyph_string_box): Add 1 to right x of full width lines.
	(x_set_glyph_string_background_width): Add 1 to background width.
	(x_draw_glyphs): Take internal border into account for full-width
	lines.

1999-07-26  Richard M. Stallman  <rms@gnu.org>

	* xfns.c (x_set_mouse_color): Always unload the old color.
	Don't allow nil as color value.
	(x_set_cursor_color, x_set_background_color, x_set_foreground_color):
	Always unload the old color.

	* indent.c (Fmove_to_column): Extend end of line only if FORCE is t.

1999-07-26  Karl Heuer  <kwzh@gnu.org>

	* fns.c (Fy_or_n_p): Doc fix.

1999-07-26  Kenichi Handa  <handa@etl.go.jp>

	* ccl.h (setup_ccl_program): The type is changed to `int'.

	* ccl.c (ccl_driver) <CCL_Call>: Now CCL program ID to call may be
	stored in the following CCL code.  Adjusted for the change of
	Vccl_program_table.
	(resolve_symbol_ccl_program): Adjusted for the new style of
	embedded symbols (SYMBOL . PROP) in CCL compiled code.   Return Qt
	is resolving failed.
	(ccl_get_compiled_code): New function.
	(setup_ccl_program): Function type changed from `void' to `int'.
	Resolve symbols in CCL_PROG.
	(Fccl_program_p): New function.
	(Fccl_execute): Get compiled CCL code by just calling
	setup_ccl_program.
	(Fccl_execute_on_string): Likewise.
	(Fregister_ccl_program): Adjusted for the change of
	Vccl_program_table.

	* coding.c (setup_coding_system): Get compiled CCL code by just
	calling setup_ccl_program.

	* xterm.c (x_find_ccl_program): Get compiled CCL code by just
	calling setup_ccl_program.

	* w32fns.c (w32_find_ccl_program): Get compiled CCL code by just
	calling setup_ccl_program.

1999-07-23  Gerd Moellmann  <gerd@gnu.org>

	* xfaces.c (frame_update_line_height): Just use the height of the
	frame's fontset or font, instead of taking face fonts into
	account.

	* xdisp.c (get_next_display_element): Display DEL as `^?'.

1999-07-23  Richard M. Stallman  <rms@gnu.org>

	* window.c (Fsplit_window): For default size, round up for left window.

1999-07-21  Joe Ramey  <ramey@ti.com>

	* filelock.c (lock_if_free): Return -1 if check_lock_owner
	has returned -1 (lockfile exists but is not a symlink?).

1999-07-20  Gerd Moellmann  <gerd@gnu.org>

	* xterm.c (x_draw_bar_cursor): Use scratch_cursor_gc to
	because of a change in cursor_gc made in 20.4.

1999-07-19  Gerd Moellmann  <gerd@gnu.org>

	* xterm.c (x_calc_absolute_position): Subtract menu bar height
	for YNegative, if using X toolkit.

	* xfns.c (x_real_positions): Don't subtract window borders
	from positions returned.

1999-07-17  Gerd Moellmann  <gerd@gnu.org>

	* xrdb.c (x_load_resources): Set double-click time defaults
	for Motif list boxes from double-click-time.

	* fns.c (Vhash_table_tests): Remvoed.
	(Qhash_table_test): New.
	(syms_of_fns): Initialize Qhash_table_test.
	(Fmake_hash_table): Look up user-defined tests in symbol prop
	`hash-table-test'.
	(Fdefine_hash_table_test): Store test and hash function as
	symbol prop `hash-table-test'.
	(make_hash_table): Add parameters user_test and user_hash.

	* window.c (set_window_buffer): Set window margins for tty
	frames, too.
	(Fset_window_margins): Ditto.

	* term.c (append_glyph): Use glyph area of iterator instead of
	always TEXT_AREA.

	* dispnew.c (update_frame_1): Add left margin width to cursor
	hpos.
	(direct_output_for_insert): Ditto.
	(direct_output_forward_char): Ditto.

	* dispnew.c (adjust_glyph_matrix): Set glyph matrix' top_line_p.

	* dispextern.h (struct glyph_matrix): Add top_line_p.

1999-07-16  Gerd Moellmann  <gerd@gnu.org>

	* frame.h (FRAME_WINDOW_REDISPLAY_P): Removed.  Use FRAME_WINDOW_P
	instead.

	* fns.c (cmpfn_eq): Add hash code parameters.
	(cmpfn_eql): Ditto.
	(cmpfn_equal): Ditto, and compare hash codes before calling Fequal.
	(cmpfn_user_defined): Likewise.

1999-07-15  Gerd Moellmann  <gerd@gnu.org>

	* lisp.h (DEFAULT_REHASH_THRESHOLD): Changed to 0.8.

	* fns.c (maybe_resize_hash_table): Correct computation of
	index vector size.
	(make_hash_table): Ditto.
	(Fmakehash): New.

	* xdisp.c (echo_area_display): Don't call redraw_garbaged_frames.

	* alloc.c (gc_sweep): Call sweep_weak_hash_tables.
	(survives_gc_p): Make it externally visible.
	(mark_object): Ditto.

	* fns.c (remove_hash_entry): Removed.
	(sweep_weak_hash_tables): New.

	* print.c (print): Print more information about hash tables.

	* xfns.c (image_spec_hash): Removed.
	(lookup_image): Use sxhash instead of image_spec_hash.
	(image_spec_equal_p): Removed.
	(lookup_image): Use Fequal instead of image_spec_equal_p.

1999-07-14  Gerd Moellmann  <gerd@gnu.org>

	* lisp.h (P_): Moved to top of file.

	* fns.c (make_hash_table): Set new members.

	* alloc.c (mark_object): Mark hash table's user_hash_function.
	Mark index vector for weak hash tables.

	* lisp.h (struct Lisp_Hash_Table): Add user_cmp_function,
	user_hash_function, cmpfn, and hashfn.

	* fns.c (build_hash): Removed.
	(hash_test): Removed.
	(cmpfn_eq, cmpfn_eql, cmpfn_equal, cmpfn_user_defined): New.
	(hashfn_eq, hashfn_eql, hashfn_equal, hashfn_user_defined): New.

1999-07-13  Gerd Moellmann  <gerd@gnu.org>

	* alloc.c (survives_gc_p): New.

	* print.c (print): Add hash table handling.

	* alloc.c (mark_object): Add code to mark hash tables.

	* lisp.h (GC_HASH_TABLE_P): New.

	* emacs.c (main): Call init_fns.

	* fns.c (init_fns): New.

	* fns.c: Add hash table implementation.

	* lisp.h (PVEC_HASH_TABLE): New.
	(struct Lisp_Hash_Table): New.
	(XHASH_TABLE): New.
	(XSET_HASH_TABLE): New.
	(HASH_TABLE_P): New.
	(CHECK_HASH_TABLE): New.
	(DEFAULT_HASH_SIZE): New.
	(DEFAULT_REHASH_THRESHOLD): New.
	(DEFAULT_REHASH_SIZE): New.

	* xterm.c (x_draw_glyphs): Add parameters real_start and real_end.
	(x_write_glyphs): Compute overwritten cursor using real start
	and end positions of display.
	(x_insert_glyphs): Ditto.

1999-07-10  Gerd Moellmann  <gerd@gnu.org>

	* keyboard.c (read_char): Use message3_nolog to show help-echo.

	* dispnew.c (blank_row): Add y-position as parameter.  Compute
	visible height.

	* xdisp.c (next_element_from_string): Give padding spaces
	a position of -1.

	* dispnew.c (adjust_glyph_matrix): Some work to support
	marginals areas on tty frames in a future version.
	(allocate_matrices_for_frame_redisplay): Ditto.

	* xdisp.c (display_line): At ZV, set glyph row's displays_text_p
	to zero if number of glyphs in the row is <= 1.

1999-07-09  Gerd Moellmann  <gerd@gnu.org>

	* dispnew.c (buffer_posn_from_coords): Take left marginal area
	into account.

	* xdisp.c (handle_display_prop): Don't reset area if handing
	a property from a string that came from a `display' property.
	(handle_single_display_prop): Don't handle recursive `display'
	properties.
	(handle_single_display_prop): Handle some display property
	forms for terminal frames.
	(Qimage): Moved here from xfns.c.

	* dispextern.h (struct it): New field string_from_display_prop_p.

	* xterm.c (x_clip_to_row): Don't let clip_rect include top
	line.

1999-07-08  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (handle_single_display_prop): Handle `:when FORM'.

	* window.c (set_window_buffer): Set window's vscroll to zero.

	* xdisp.c (QCwhen): New.
	(display_prop_end): New.
	(handle_single_display_prop): Use it.
	(debug_method_add): Print buffer name if tracing.
	(try_window_reusing_current_matrix): Compute visible height
	of reused rows.  Fix cursor position calculation in case of
	top-line.

	* dispextern.h (struct redisplay_interface): Add parameter
	cursor_on_p to update_window_end_hook.

	* xterm.c (x_update_window_end): Add parameter cursor_on_p.

1999-07-07  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (redisplay_internal): Ensure that redisplayinp_p
	doesn't become negative when decrementing it.

	* eval.c (Fsignal): Reset redisplaying_p to zero.

	* xdisp.c (try_window_reusing_current_matrix): Call hooks
	for window update.
	(try_window_id): Ditto.

	* xterm.c (x_clear_end_of_line): Handle top-line correctly.
	(x_scroll_run): Ditto.
	(any_help_event_p): New.
	(x_initialize): Set it to zero.
	(XTread_socket): Clear help echo only if any_help_event_p.

	* xdisp.c (init_iterator): Set top_line_p.
	(start_display): Use correct initial y if top-line is present.
	(make_cursor_line_fully_visible): Bug fixes for top-line.
	(try_scrolling): Ditto.
	(try_window_reusing_current_matrix): Ditto.

	* dispextern.h (struct it): Add top_line_p.

	* dispnew.c (shift_glyph_matrix): Move some computations out
	of the loop.

	* dispnew.c (margin_glyphs_to_reserve): Use NUMBERP and
	XFLOATINT.

1999-07-06  Gerd Moellmann  <gerd@gnu.org>

	* dispnew.c (update_frame_1): When setting cursor in echo area,
	skip only over padding spaces at the end.

	* xfaces.c (realize_tty_face): Set face's font_name field to
	"tty".

	* term.c (update_end): Turn cursor on only if selected window's
	cursor_off_p flag is not set.

1999-07-05  Gerd Moellmann  <gerd@gnu.org>

	* term.c (TS_cursor_visible): Renamed from TS_visual_mode.
	(TS_cursor_normal): Renamed from TS_end_visual_mode.
	(TS_cursor_invisible):  New.
	(term_init): Initialize TS_cursor_invisible.
	(tty_hide_cursor): New.
	(tty_show_cursor): New.
	(update_end): Show tty cursor.
	(update_begin): Hide tty cursor to prevent cursor flickering
	during redisplays triggered by timers (stealth fontification).

	* keyboard.c (make_lispy_event) <TOOLBAR_EVENT>: Apply modifiers.

	* xterm.c (XTread_socket) [USE_MOTIF] <KeyPress>: Catch events
	in scroll bars.
	(x_handle_toolbar_click): Set modifier bits.

1999-07-04  Gerd Moellmann  <gerd@gnu.org>

	* keyboard.c (kbd_store_ptr): Declare it as a volatile pointer
	instead of a pointer to a volatile input_event.
	(kbd_buffer_store_event): Remove volatile modifier from
	declaration of local variable `sp'.
	(Fdiscard_input): Don't cast when assigning kbd_store_ptr
	to kbd_fetch_ptr.

1999-07-03  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (try_window_id): Set beg_unchanged and end_unchanged
	only if buffer is modified.  Return quickly if changes are
	above window start.

1999-07-02  Gerd Moellmann  <gerd@gnu.org>

	* dispextern.h (HSCROLL_WINDOWS): Removed.

	* xdisp.c (mark_window_display_accurate): Don't set
	w->region_showing.
	(redisplay_internal): Don't call redraw_garbaged_frames.

1999-07-01  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (echo_area_display): Don't display truncation marks
	for messages because 20.4 doesn't do it either.
	(redisplay_window): Case same window start.  Instead of giving
	up when cursor is partially visible, make it fully visible.
	(mark_window_display_accurate): Some cleanup.  Record window's
	last cursor information.
	(debug_method_add): Improved.
	(redisplay_internal): Record last cursor info only if not
	consider_all_windows_p.

	* dispnew.c (update_window): Update top line after scrolling.
	(blank_row): Renamed from make_empty_enabled_row.
	(increment_glyph_row_buffer_positions): Increment positions
	in buffers, only.

	* window.c (Fcoordinates_in_window_p): Add top-line to doc
	string.

1999-06-30  Gerd Moellmann  <gerd@gnu.org>

	* dispnew.c (update_window): Check that updated row is visible.

	* xterm.c (x_draw_row_bitmaps): Check for invisible rows at
	top of window differently.

	* xdisp.c (try_window_reusing_current_matrix): Don't do it
	if region is showing.

	* dispnew.c (adjust_glyph_matrix): Check w->vscroll when
	avoiding matrix reallocation.  Set window_vscroll in matrix.

	* dispextern.h (struct glyph_matrix): Add member window_vscroll.

	* xdisp.c (debug_method_add): New.
	(debug_redisplay_method): Removed.
	(try_window_reusing_current_matrix): Handle case where old
	window start is the same as new window start.

	* dispextern.h (struct glyph_matrix) [GLYPH_DEBUG]: Make `method'
	an array instead of a pointer.

	* xfns.c (Fx_show_tip): Undo previous change.

	* xterm.c (x_append_glyph): Clear glyph->u.val.

	* dispextern.h (struct glyph): Increase size of face_id bit-field
	for CHAR_GLYPH to 12.

1999-06-29  Gerd Moellmann  <gerd@gnu.org>

	* xfaces.c (x_charset_registry): Make it externally visible.

1999-06-28  Gerd Moellmann  <gerd@gnu.org>

	* dispnew.c (update_window): Use mode_line_p flag of rows
	instead of WINDOW_WANTS_MODELINE_P.

	* xterm.c (clear_mouse_face): Make externally visible.

	* xfns.c (Fx_show_tip): Clear mouse face before showing tip.

	* xterm.c (expose_line): Handle exposure of top-lines.

	* xterm.c (XTframe_up_to_date): Don't call note_mouse_highlight
	if mouse_face_mouse_frame is null.

	* xdisp.c (redisplay_window): If window is echo_area_window,
	and update_mode_line is set, update menubar and toolbar.

	* dispnew.c (space_glyph): Set its charpos to -1.
	(update_frame_1): Ignore trailing padding spaces.

	* xdisp.c (next_element_from_c_string): Set position of padding
	glyphs to -1.

1999-06-27  Gerd Moellmann  <gerd@gnu.org>

	* xfns.c (x_laplace_read_row): Use XQueryColors instead of
	XQueryColor.

	* xdisp.c (display_menu_bar): Remove unwarranted assertion.
	(set_cursor_from_row): Skip over glyphs having a null object at
	the start of rows.
	(insert_left_trunc_glyphs): Use charpos < 0 to indicate truncation
	glyphs.
	(handle_invisible_prop): Compute next change only when needed.
	(handle_face_prop): Don't correct DEFAULT_FACE_ID if in the mode
	line.

1999-06-26  Gerd Moellmann  <gerd@gnu.org>

	* xrdb.c (x_load_resources): Don't set resource for double-click
	time.

	* xdisp.c (try_window_id): Return quickly if all changes are
	below the window's current matrix end.

	* dispextern.h (MATRIX_ROW_PARTIALLY_VISIBLE_P): Remove window
	parameter.

	* xdisp.c (try_window_reusing_current_matrix): Set no_scrolling_p
	in desired not in current matrix.
	(try_window_reusing_current_matrix): Rotate matrices starting
	at start_vpos instead of 0.

	* xterm.c (expose_window): Use window_text_bottom_y.
	(fast_find_position): Ditto.

	* xdisp.c (redisplay_window): Use window_text_bottom_y.
	(try_window_reusing_current_matrix): Ditto.
	(get_last_unchanged_at_beg_row): Ditto.
	(init_iterator): Ditto.

	* dispnew.c (allocate_matrices_for_window_redisplay): Allocate one
	more row.
	(check_matrix_invariants): Use window_text_bottom_y.
	(update_window): Ditto.
	(scrolling_window): Ditto.

	* xdisp.c (window_text_bottom_y): New.

1999-06-25  Gerd Moellmann  <gerd@gnu.org>

	* xterm.c (XTread_socket): Set mouse_face_frame to zero after
	clearing mouse face.
	(XTread_socket) <EnterNotify> [LESSTIF_VERSION]: If
	event.xcrossing.focus is not set, and focus is in the menu bar,
	set focus frame as if event.xcrossing.focus were set.

1999-06-24  Gerd Moellmann  <gerd@gnu.org>

	* keyboard.c (make_lispy_event): Handle mouse on top lines.
	* keyboard.c (make_lispy_movement): Ditto.

	* window.c (coordinates_in_window): Return 4 if on top line.
	(Fcoordinates_in_window_p): Return `top-line' if on top line.

	* xdisp.c (window_box_height): Subtract top line height.
	(window_box): Add top line height to top y position if top line
	exists.
	(init_iterator): If base_face_id is TOP_LINE_FACE_ID, set row to
	the top line row of the window.  Set initial y-position to
	window's top line height plus delta.
	(start_display): Choose start glyph row depending on whether
	window has a top line.
	(try_scrolling): Take top line height into account for aggressive
	scrolling.
	(compute_window_start_on_continuation_line): Take top line into
	account.
	(redisplay_window): Ditto.  If top line height has changed,
	trigger a new redisplay.
	(try_window_reusing_current_matrix): Take top line into account.
	(find_last_row_displaying_text): Ditto.
	(get_last_unchanged_at_beg_row): DItto.
	(try_window_id): Ditto.
	(compute_line_metrics): Ditto.

	* dispnew.c (shift_glyph_matrix): Compute visible row height
	taking top line of window into account.
	(update_window): Update top line.  If scrolling_window detects
	that all rows are equal, only set cursor.
	(update_window_line): Call after_update_window_line_hook if
	mode_line_p flag of rows has changed.
	(scrolling_window): Add parameter top_line_p.  Return -1 if
	all rows are equal.
	(mode_line_string): Add parameter mode_line_p.  Handle strings
	in top lines.

	* dispextern.h (MATRIX_TOP_LINE_ROW): New.
	(MATRIX_FIRST_TEXT_ROW): New.
	(MATRIX_ROW_PARTIALLY_VISIBLE_P): Use row's visible_height.
	(MATRIX_ROW_PARTIALLY_VISIBLE_AT_TOP_P): New.
	(MATRIX_ROW_PARTIALLY_VISIBLE_AT_BOTTOM_P): New.
	(MATRIX_TOP_LINE_HEIGHT): New.
	(CURRENT_MODE_LINE_HEIGHT): Use estimate_mode_line_height.
	(CURRENT_TOP_LINE_HEIGHT): New.
	(DESIRED_TOP_LINE_HEIGHT): New.
	(WINDOW_DISPLAY_TOP_LINE_HEIGHT): New.
	(WINDOW_DISPLAY_HEIGHT_NO_MODE_LINE): Replaces
	WINDOW_DISPLAY_TEXT_AREA_PIXEL_HEIGHT.
	(WINDOW_DISPLAY_TEXT_HEIGHT): New.

	* xterm.c (x_after_update_window_line): Don't draw bitmaps for top
	lines.
	(x_draw_row_bitmaps): Take top line into account when clearing
	bitmap area.
	(x_estimate_mode_line_height): Replacement for
	x_frame_mode_line_height.
	(x_get_glyph_string_clip_rect): Take top line into account.
	(x_clear_end_of_line): Ditto.
	(note_mode_line_highlight): Add parameter mode_line_p.  Handle
	top lines.
	(note_mouse_highlight): Call note_mode_line_highlight for top lines.
	(x_erase_phys_cursor): Take top line into account.

	* xdisp.c (window_box_height): Subtract top line height if
	window wants a top line.
	(display_mode_lines): New.
	(redisplay_window): Call it.
	(display_mode_line): Add parameters face_id and format.

	* dispextern.h (CURRENT_TOP_LINE_HEIGHT): New.
	(MATRIX_TOP_LINE_HEIGHT): New.

	* xterm.c (x_frame_mode_line_height): Add parameter face_id.

	* term.c (estimate_mode_line_height): Renamed from
	frame_mode_line_height.  Add parameter face_id.
	(estimate_mode_line_height_hook): Renamed from
	frame_mode_line_height_hook.
	(produce_special_glyphs_hook): Removed.
	(produce_glyphs_hook): Removed.

1999-06-23  Gerd Moellmann  <gerd@gnu.org>

	* dispextern.h (WINDOW_WANTS_TOP_LINE_P): New.
	(struct glyph_row): Add mode_line_p.

	* xfaces.c (realize_basic_faces): Realize face `top-line'.
	(Qtop_line): New.
	(syms_of_xfaces): Initialize Qtop_line.

	* dispextern.h (TOP_LINE_FACE_ID): New.

	* buffer.c (init_buffer_once): Set default for
	top_line_format to nil.
	(init_buffer_once): Init top_line_format.
	(default-top-line-format): New.
	(top-line-format): New buffer-local variable.

	* buffer.h: Add top_line_format.

	* xdisp.c (overlay_arrow_changed_p): Removed because not used.

1999-06-17  Dave Love  <fx@gnu.org>

	* xfns.c: Move the PNG section before the JPEG one to avoid
	problems surrounding setjmp.h/png.h on GNU/Linux.

1999-06-17  Gerd Moellmann  <gerd@gnu.org>

	* xfns.c (x_kill_gs_process): Don't free colors.

1999-06-17  Dave Love  <fx@gnu.org>

	* s/gnu-linux.h: Zap spurious ~.

1999-06-16  Gerd Moellmann  <gerd@gnu.org>

	* xfns.c (gif_load): Improve multi-image support.

1999-06-15  Gerd Moellmann  <gerd@gnu.org>

	* xfns.c (gif_load): Support multi-image files.

	* Makefile.in (LIBGIF): Use libungif.

	* configure.in (HAVE_GIF): Use libungif instead of libgif
	because the former doesn't contain patented compression code.

	* xdisp.c (compute_window_start_on_continuation_line): Don't
	do it if line start is too far away from window start.

1999-06-14  Gerd Moellmann  <gerd@gnu.org>

	* buffer.c (init_buffer_once): Set buffer_local_flags for
	scroll_*_aggressively.
	(syms_of_buffer): Add DEFVAR_PER_BUFFER for scroll-*-aggressively.
	(init_buffer_once): Set defaults for these variables.
	(syms_of_buffer): Add default-scroll-*-aggressively.

	* buffer.h (scroll_up_aggressively): New.
	(scroll_down_aggressively):  New.

	* Makefile.in (LIBPNG): Add -lz -lm in case we're linking with
	a static PNG library.

	* configure.in (HAVE_PNG): Add -lz -lm when checking for PNG lib
	in case it's a static library.

	* Makefile.in (ctagsfiles): Split so that files starting
	with an `x' are found before files starting with `w32'.
	(ctagsfiles1): New.
	(ctagsfiles2): New.
	(TAGS): Use ctagsfiles[12] instead of ctagsfiles.

	* xdisp.c (compute_window_start_on_continuation_line): New.
	(redisplay_window): Use it.
	(INFINITY): New.
	(reseat_to_string): Use it.
	(hscroll_window_tree): Ditto.
	(compute_window_start_on_continuation_line): Ditto.
	(redisplay_window): Don't force display with a new window start.

1999-06-06  Gerd Moellmann  <gerd@gnu.org>

	* xfns.c (x_report_frame_params): Don't report `outer-window-id'
	if widget not present.

	* xdisp.c (prepare_menu_bars): Ignore tooltip frame.

1999-06-04  Gerd Moellmann  <gerd@gnu.org>

	* xfaces.c (recompute_basic_faces)[GLYPH_DEBUG]: Check return
	value of realize_basic_faces.
	(load_face_font_or_fontset): Store full font name in face.
	(realize_default_face): Use full font name.

	* xterm.c (x_produce_glyphs): Set member char_to_display.
	(x_append_glyph): Store char_to_display in glyphs.

	* dispextern.h (struct it): Add char_to_display.

	* xfns.c (x_set_font): Don't call face-set-after-frame-default
	if faces haven't been initialized.
	(Fx_create_frame): Call face-set-after-frame-default after
	faces have been initialized, and widget has been created.

	* puresize.h (BASE_PURESIZE): Increased.

1999-06-01  Gerd Moellmann  <gerd@gnu.org>

	* xfaces.c (set_lface_from_font_name): Add parameter force_p.
	(Finternal_set_lisp_face_attribute): If frame is t when
	:font attribute is set, use the selected frame.
	(clear_face_cache): Add parameter clear_fonts_p.
	(Fclear_face_cache): Add optional parameter thorougly.

	* xfaces.c (face_numeric_value): Return -1 if symbol is not
	in table.
	(Fclear_face_cache): New.
	(choose_face_fontset_font): If fontset doesn't contain font
	pattern for the given charset, use CHARSET_ASCII.
	(Finternal_set_lisp_face_attribute): Fix handling of nil
	stipple attribute.
	(Finternal_set_lisp_face_attribute): Fix handling of changing
	font-related face attributes of the default face.
	(set_lface_from_font_name): Set only attributes that aren't
	specified.

1999-05-31  Gerd Moellmann  <gerd@gnu.org>

	* xfaces.c (SCALABLE_FONTS): Define this to enable scalable
	font support.
	(Vscalable_fonts_allowed) [SCALABLE_FONTS]: New.
	(x_face_list_fonts): Add parameter scalable_fonts_p.  Handle
	scalable fonts depending on the setting of SCALABLE_FONTS.
	(first_font_matching): List more than one font to find the
	first non-scalable matching font.
	(sorted_font_list): Let x_face_list_fonts return scalable fonts
	depending on SCALABLE_FONTS.
	(better_font_p): New parameter compare_pt_p.  If zero, don't
	compare point sizes of fonts.
	(exact_face_match_p) [SCALABLE_FONTS]: New.
	(build_scalable_font_name) [SCALABLE_FONTS]: New.
	(may_use_scalable_font_p) [SCALABLE_FONTS]: New.
	(best_matching_font) [SCALABLE_FONTS]: Handle scalable fonts.
	(syms_of_xfaces):  Add scalable-fonts-allowed.

1999-05-26  Gerd Moellmann  <gerd@gnu.org>

	* xfns.c (png_load): Let PNG lib handle gamma.  Construct
	mask only if image contains simple transparency information.
	Otherwise, combine image with frame background color.

	* configure.in (--with-png, HAVE_PNG): New.

	* config.in (HAVE_PNG): New.

	* Makefile.in: Add PNG library.

	* xfns.c: Add PNG support.

1999-05-25  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (init_xdisp): Initialize echo_area_message and
	previous_echo_area_message to nil.

	* keyboard.c (read_char): Rename local variable echo_area_message
	because it shadows the global one.

1999-05-05  Gerd Moellmann  <gerd@gnu.org>

	* xterm.c (note_mode_line_highlight): Restructured.

	* window.c (coordinates_in_window): Handle windows that don't have
	a mode line because their buffer's mode-line-format is nil.
	Recognize the mode line under x positions that correspond to
	flags areas and left scroll bar.

1999-05-02  Dave Love  <fx@gnu.org>

	* xterm.c (note_mouse_highlight): Separate help-echo processing
	from check on mouse-face so that it works generally.

1999-04-21  Gerd Moellmann  <gerd@gnu.org>

	* sound.c (Fplay_sound): Run hook play-sound-hook.
	(Qplay_sound_hook): New.

1999-04-20  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (update_echo_area): Handle echo_area_message.

1999-04-19  Gerd Moellmann  <gerd@gnu.org>

	* editfns.c (Fmessage): Use message3.

	* print.c (printchar): Set echo_area_message to nil.
	(strout): Ditto.

	* minibuf.c (read_minibuf): Reset echo message strings to nil.
	(Fminibuffer_completion_help): Ditto.

	* keyboard.c (cmd_error_internal): Set echo_areA_message.
	(command_loop_1): Test echo_areA_message.
	(read_char): Ditto.
	(record_menu_key): Set echo_area_message to nil.
	(Fexecute_extended_command): Test echo_area_message.
	(Fexecute_extended_command): Handle echo_area_message.

	* fileio.c (Fdo_auto_save): Handle the case that echo_area_message
	is set.

	* editfns.c (Fcurrent_message): If echo_area_message is set,
	return a substring of that string.

	* dispnew.c (direct_output_for_insert): Test echo_area_message
	in addition to echo_area_glyphs.
	(set_window_cursor_after_update): Ditto.
	(update_frame_1): Ditto.

	* alloc.c (Fgarbage_collect): Use message3_nolog to display
	old Lisp message string.

	* xdisp.c (echo_area_message): New.
	(previous_echo_area_message): New.
	(syms_of_xdisp): Initialize and staticpro new variables.
	(echo_area_display): Display echo_area_message if set.
	(message2_nolog): Set echo_area_message and
	previous_echo_area_message.
	(echo_area_display): Set previous_echo_area_message.
	(redisplay_internal): Display echo area if echo_area_message
	or previous_echo_area_message are set.
	(redisplay_preserve_echo_area): Test/set echo_area_message and
	previous_echo_area_message.
	(redisplay_window): Test echo_area_message.
	(message3_nolog): New.
	(message3): New.

	* editfns.c (Fformat): Add text properties to the result string
	from properties of the format string and properties of string
	arguments.

	* textprop.c (text_property_list): New.
	(add_text_properties_from_list): New.
	(extend_property_ranges): New.

1999-03-29  Gerd Moellmann  <gerd@gnu.org>

	* xfaces.c (Qraised, Qsunken, QCshadow): Removed.
	(QCline_width, QCstyle, Qpressed_button, Qreleased_button): New.
	Use these symbols for the box face attribute instead of the
	removed ones.

1999-03-12  Gerd Moellmann  <gerd@gnu.org>

	* xfaces.c (realize_tty_face): Don't set alt_char_p of face.
	Correct wrong test for slant.

1999-03-10  Gerd Moellmann  <gerd@gnu.org>

	* xfaces.c: Use `unspecified' for unspecified face attributes,
	use t and nil for on/off.

1999-03-06  Gerd Moellmann  <gerd@gnu.org>

	* buffer.c (syms_of_buffer): Extend doc string of
	mode-line-format.

	* xfaces.c (x_face_list_fonts): New parameter try_alternatives_p.
	(first_font_matching): New.
	(set_lface_from_font_name): Use it if font name is a pattern.
	(font_field_wildcard_p): Removed.

	* dispnew.c (shift_glyph_matrix): Add `window' parameter.
	Recompute visible height of rows.

	* xterm.c (note_mouse_highlight): Reorder code for help-echo.
	Don't accept non-strings for help-echo from overlays.

1999-03-04  Dave Love  <fx@gnu.org>

	* xterm.c (note_mouse_highlight): Check overlays for help-text
	property.
	(XTread_socket): Fix compiler warning.

1999-03-05  Gerd Moellmann  <gerd@gnu.org>

	* xterm.c (note_mouse_highlight): Don't restrict number of
	overlay to 10.  Call overlays_at so that it doesn't try to
	extend the vector.

	* xdisp.c (compute_line_metrics): Compute glyph row's visible
	height.

	* dispnew.c (row_equal_p): Compare visible row height, only.
	(update_text_area): Draw whole line if visible heights of
	rows differ.
	(update_window_line): Call after_update_window_line_hook
	if visible row height has changed.

	* dispextern.h (MATRIX_ROW_VISIBLE_HEIGHT): Removed.
	(struct glyph_row): New member visible_height.

	* xfaces.c (font_field_wildcard_p): New.
	(set_lface_from_font_name): Remove parameter force_p.  Accept
	font names containing wildcards.

1999-03-04  Gerd Moellmann  <gerd@gnu.org>

	* xterm.c (x_after_update_window_line): Clear internal border
	when windows_or_buffers_changed.

	* dispextern.h (WINDOW_WANTS_MODELINE_P): Return zero if window's
	buffer has a nil mode_line_format.

1999-03-03  Gerd Moellmann  <gerd@gnu.org>

	* xterm.c (x_setup_relief_colors): Use either background color
	or specified color.

	* xfaces.c (realize_x_face): Set face->use_box_color_for_shadows_p.

	* dispextern.h (struct face): Add use_box_color_for_shadows_p.

	* xterm.c (x_draw_box_rect): New.
	(x_draw_glyph_string_box): Renamed from
	x_draw_glyph_string_relief.  Call x_draw_box_rect.

	* xfns.c (QCrelief): New.
	(syms_of_xfns): Initialize it.

	* dispextern.h (struct glyph): Rename left_shadow_p to
	left_box_line_p, right_shadow_p to right_box_line_p.
	(MAX_RELIEF_THICKNESS): Removed.
	(struct it): Rename members having `relief' in their names
	to contain `box' instead.

	* xfaces.c (realize_x_face): Handle new box attribute values.
	(QCrelief, Qbox): Removed.
	(QCshadow, QCcolor, Qraised, Qsunken): New.
	(syms_of_xfaces): Initialize new symbols.

1999-03-02  Gerd Moellmann  <gerd@gnu.org>

	* dispextern.h (LFACE_RELIEF_INDEX): Removed.

	* xfaces.c (LFACE_RELIEF): Removed.
	(merge_face_vector_with_property): Remove handling of `:relief'.
	(Finternal_set_lisp_face_attribute): Ditto.
	(Finternal_set_lisp_face_attribute_from_resource): Ditto.
	(Finternal_get_lisp_face_attribute): Ditto.
	(realize_default_face): Ditto.
	(lface_hash): Don't compute hash from relief.

	* dispextern.h (struct face): Replace member `relief' by
	`box_line_width'.  Add member `box'.
	(face_box_type): New.

	* xterm.c (x_produce_glyphs): If face has overline, add overline
	thickness + 1 to ascent.

1999-03-01  Gerd Moellmann  <gerd@gnu.org>

	* xterm.c (x_draw_glyph_string): Draw underline, overline,
	strike-through, and boxes.
	(x_draw_glyph_string_underline): Removed.

	* xfaces.c (QCoverline, QCstrike_through, QCbox): New.
	(Qoverline, Qstrike_through, Qbox): New.
	(syms_of_xfaces): Define these symbols.
	(check_lface_attrs): Add checks for overline, strike-through,
	and box.
	(Finternal_set_lisp_face_attribute): Set new attributes.
	(LFACE_OVERLINE, LFACE_STRIKE_THROUGH, LFACE_BOX): New.
	(load_color): Handle new attributes.
	(realize_x_face): Ditto.
	(merge_face_vector_with_property): Ditto.
	(free_face_colors): Ditto.
	(Finternal_set_lisp_face_attribute_from_resource): Ditto.
	(Finternal_get_lisp_face_attribute): Ditto.
	(Finternal_lisp_face_attribute_values): Ditto.

	* dispextern.h (lface_attribute_index): Add enumerators for
	overstrike, strike-through, and box.
	(struct face): Add members for overline, strike-through, and
	box.

1999-02-17  Dave Love  <fx@gnu.org>

	* s/gnu-linux.h s/gnu.h s/irix5-0.h s/netbsd.h s/sco4.h s/sco5.h
	s/template.h (NARROWPROTO): Define on the basis of relevant X cf
	files.

1999-02-16  Gerd Moellmann  <gerd@gnu.org>

	* keyboard.c (toolbar_items): Call access_keymap with third
	parameter 1, so that we don't get inherited toolbar item
	definitions.

	* xdisp.c (redisplay_internal): In optimization 1, don't decrement
	the window end vpos when in empty first line of window.

1999-02-15  Gerd Moellmann  <gerd@gnu.org>

	* xfaces.c (set_font_frame_param): New.
	(Finternal_set_lisp_face_attribute): Call it.

Sun Feb 14 10:54:02 1999  Masatake Yamato  <masata-y@is.aist-nara.ac.jp>

	* xfaces.c (Finternal_set_lisp_face_attribute_from_resource):
	Accept specifications of color for underline.

1999-02-13  Gerd Moellmann  <gerd@gnu.org>

	* xfaces.c (Finternal_set_lisp_face_attribute): If parameter
	`frame' is t, operate on face defaults for new frames.  If it
	is nil, operate on the selected frame.

1999-02-12  Gerd Moellmann  <gerd@gnu.org>

	* dispnew.c (check_matrix_invariants): Put it in #if 0.
	(update_window): Put the call to check_matrix_invariants in #if 0.

Sun Feb  7 09:58:49 1999  Masatake Yamato  <masata-y@is.aist-nara.ac.jp>

	* dispextern.h: Remove all else block of UNDERLINE_COLOR.
	Remove definition of UNDERLINE_COLOR.

Mon Jan  4 04:43:41 1999  Masatake Yamato  <masata-y@is.aist-nara.ac.jp>

	* xfaces.c (free_face_colors): Free the color for underline.

	* xterm.c (x_draw_glyph_string_underline): Set the color for underline
	to the GC.

Sun Jan  3 08:41:10 1999  Masatake Yamato  <masata-y@is.aist-nara.ac.jp>

	* dispextern.h 	(UNDERLINE_COLOR): Defined.
	(struct face): Added two new members.
	underline_color, underline_defaulted_p.

	* xfaces.c (merge_face_vector_with_property):
	(check_lface_attrs): Accept the string value for underline.
	(Finternal_set_lisp_face_attribute): Likewise.

	* xfaces.c (load_color): Change the last argument type to enum
	lface_attribute_index from int. And addec code for underling coloring.
	(load_face_colors): Pass LFACE_*_INDEX to load_color.

1999-02-12  Gerd Moellmann  <gerd@gnu.org>

	* xfns.c (Fx_image_header): Removed.

1999-02-07  Gerd Moellmann  <gerd@gnu.org>

	* xterm.c: Don't include <bitmaps/gray>.
	(x_term_init): Use gray_bitmap_width and gray_bitmap_height.

	* xfns.c (Fx_image_header): Add missing `\n\'.
	(gray_bitmap_width, gray_bitmap_height, gray_bitmap_bits): New.

1999-02-01  Gerd Moellmann  <gerd@gnu.org>

	* xterm.c (x_scroll_bar_create): Set background pixel from
	specified scroll bar color.
	(x_scroll_bar_set_handle): Use scroll bar foreground color.

	* xfns.c (x_set_scroll_bar_foreground): Remove all scroll bars.
	(x_set_scroll_bar_background): Ditto.

	* xterm.c (x_create_toolkit_scroll_bar): Set scroll bar colors.

	* xfns.c (x_default_scroll_bar_color_parameter): New.
	(Fx_create_frame): Call it.

1999-01-31  Gerd Moellmann  <gerd@gnu.org>

	* xfns.c (Fx_create_frame): Initialize scroll bar pixel color
	values in x_output structure.
	(Qscroll_bar_foreground, Qscroll_bar_background): New.
	(syms_of_xfns): Initialize these symbols.

	* xterm.h (struct x_output): Add scroll bar pixel colors.

	* xfns.c (x_frame_parms): Add entries for scroll bar colors.
	(x_set_scroll_bar_foreground): New.
	(x_set_scroll_bar_background): New.

1999-01-12  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (handle_single_display_prop): New.
	(handle_display_prop): Call it.
	(handle_raise_prop): Removed.
	(handle_height_prop): Removed.
	(handle_space_width_prop): Removed.
	(handle_face_prop): Remove handling of raised text.
	(handle_display_prop): Do it here.

	* dispextern.h (DISPLAY_PROP_IDX): Replaces GLYPH_PROP_IDX.
	(RAISE_PROP_IDX): Removed.
	(HEIGHT_PROP_IDX): Removed.
	(SPACE_WIDTH_PROP_IDX): Removed.

	* xdisp.c (Qdisplay): Replaces Qglyph.
	(handle_display_prop): Formerly handle_glyph_prop.

1999-01-11  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (reseat_to_string): Set position in display vector to -1.
	(handle_stop): Set position in display vector to -1.  Don't
	check overlay strings when set up to deliver characters from a
	display vector.
	(set_iterator_to_next): At the end of a run of characters from a
	display vector, check whether the display vector display replaces
	the display of a character.

1999-01-05  Gerd Moellmann  <gerd@gnu.org>

	* xfaces.c (init_frame_faces): Don't realize faces if frame's
	X window hasn't been created yet.

1998-12-06  Gerd Moellmann  <gerd@gnu.org>

	* sound.c: New.

1998-12-04  Gerd Moellmann  <gerd@gnu.org>

	* config.in (HAVE_SOUND): New.

	* emacs.c (main): Call syms_of_sound and init_sound.

	* Makefile.in (obj): Add sound.o.

	* configure.in: Add checks for machine/soundcard.h and sys/soundcard.h.

	* config.in (HAVE_MACHINE_SOUNDCARD_H): New.
	(HAVE_SYS_SOUNDCARD_H): New.

1998-12-03  Gerd Moellmann  <gerd@gnu.org>

	* buffer.h (struct buffer): indicate_empty_lines renamed from
	indicate_zv_lines.

	* buffer.c (indicate-empty-lines): Renamed from indicate_zv_lines.
	(default-indicate-zv-lines): Likewise.

	* dispextern.h (struct glyph_row): Rename indicate_zv_line_p
	to indicate_empty_line_p.

	* xdisp.c (reseat_at_next_visible_line_start): Reset method
	to next_element_from_buffer.

	* frame.c (make_frame): Set n_current_toolbar_items to 0.

	* xdisp.c (handle_face_prop): Allow symbols of the form `N+'
	and `N-'.

	* xfns.c (xbm_scan): New.
	(xbm_read_hexint): Removed.
	(xbm_read_bitmap_file_data): Use xbm_scan.

	* fileio.c (Finsert_file_contents): Prevent redisplay optimizations.

1998-12-02  Gerd Moellmann  <gerd@gnu.org>

	* xfns.c (xbm_read_hexint): New.
	(xbm_read_bitmap_file_data): New.
	(xbm_load_image_from_file): Call xbm_read_bitmap_file_data
	instead of XReadBitmapFileData.

	* xdisp.c (handle_raise_prop): Compute voffset from current font.

	* xfaces.c (face_with_height): New.

	* xdisp.c (eval_handler): Renamed from eval_mode_handler.
	(eval_form): Renamed from eval_mode_element.
	(handle_face_prop): Use it.
	(Qheight): Replaces Qsmaller.
	(handle_height_prop): Replaces handle_smaller_prop.
	(handle_face_prop): If iterator's font_height is not an
	integer, evaluate it to get the font height to use.

	* dispextern.h (HEIGHT_PROP_IDX): Replaces SMALLER_PROP_IDX.
	(struct it): Use `font_height' instead of `smaller'.

1998-12-01  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (reseat_1): New.
	(reseat): Call it.
	(move_it_vertically_backward): Ditto.
	(redisplay_window): Don't abort when cursor not found in recenter.

1998-11-30  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (reseat_at_next_visible_line_start): When not
	currently delivering display elements from the current buffer,
	restore buffer position first.
	(init_from_display_pos): Don't set IT's position from the
	position passed to this function.

1998-11-28  Gerd Moellmann  <gerd@gnu.org>

	* config.in (PROTO): Removed.

	* xterm.h: Change PROTO to P_.

1998-11-26  Gerd Moellmann  <gerd@gnu.org>

	* xterm.c (take_vertical_position_into_account): New.
	(x_produce_image_glyph): Call it.
	(x_produce_stretch_glyph): Ditto.
	(x_produce_glyphs): Ditto.
	(x_fill_glyph_string): Adjust base line for glyph's voffset.
	(x_fill_composite_glyph_string): Ditto.
	(x_fill_image_glyph_string): Ditto.
	(x_fill_stretch_glyph_string): Ditto.

	* xdisp.c (display_line): Always compute row height from
	max_ascent and max_descent.

	* dispextern.h (struct glyph): Add voffset.
	(struct it): Replace height by descent, max_height by max_descent.

	* xterm.c (x_append_glyph): Set voffset
	(x_append_stretch_glyph): Ditto.
	(x_produce_image_glyph): Ditto.
	(x_produce_glyphs): Take voffset into account.
	(x_produce_image_glyph): Ditto.
	(x_produce_stretch_glyph): Ditto.

	* dispextern.h (struct it): Add voffset.
	* xdisp.c (push_it): Save voffset.
	(pop_it): Restore it.

	* xdisp.c (it_props): Add entry for `raise'.
	(handle_raise_prop): New.

	* dispextern.h (RAISE_PROP_IDX): New.

	* xdisp.c (Qraise): New.
	(syms_of_xdisp): Define Qraised.

	* xterm.c (x_scroll_bar_move): Clear to the left and right
	of toolkit scroll bars differently.
	(x_scroll_bar_move): Removed.
	(XTset_vertical_scroll_bar): Move code from x_scroll_bar_move here.

	* dispextern.h: Make it compilable --with-x=no.
	* alloc.c: Ditto.
	* emacs.c: Ditto.
	* dispnew.c: Ditto.
	* keyboard.c: Ditto.
	* term.c: Ditto.
	* xdisp.c: Ditto.
	* xfaces.c: Ditto.
	* xfns.c: Ditto.
	* xmenu.c: Ditto.

1998-11-25  Gerd Moellmann  <gerd@gnu.org>

	* xterm.c (XTread_socket): Cancel help-echo when leaving frame.

1998-11-24  Gerd Moellmann  <gerd@gnu.org>

	* xterm.c (x_set_toolkit_scroll_bar_thumb): When dragging,
	update slider size, only.
	(xm_scroll_callback): Set dragging member of the scroll bar.
	(xt_action_hook): Reset last_scroll_bar_part.
	(XTredeem_scroll_bar): Reset bar->dragging to nil.

	* xfns.c (Fx_hide_busy_cursor): Don't try to hide busy cursor
	window on newly created frames that don't have one.

1998-11-23  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (restore_overlay_strings): Removed.
	(restore_dpvec): Removed.
	(init_from_display_pos): Inline both functions above.

	* xfns.c (IMAGE_NON_NEGATIVE_INTEGER_VALUE): New.
	(parse_image_spec): Handle it.
	(xbm_format): Use it.
	(xpm_format): Ditto.
	(pbm_format): Ditto.
	(jpeg_format): Ditto.
	(tiff_format): Ditto.
	(gif_format): Ditto.
	(gs_format): Ditto.

	* xdisp.c (set_window_cursor): Removed.
	(redisplay_internal): Case cursor motion in cursor line of
	selected window; use set_cursor_from_row.

1998-11-22  Gerd Moellmann  <gerd@gnu.org>

	* widget.c (EmacsFrameSetCharSize): Take widget's border width
	into account.

1998-11-21  Gerd Moellmann  <gerd@gnu.org>

	* xterm.c (expose_frame): Redraw menu bar window.

	* xdisp.c (display_menu_bar): Record hpos instead of x-position
	in menu item.

	* dispnew.c (change_frame_size_1): Use FRAME_TOP_MARGIN instead
	of FRAME_TOOLBAR_LINES.  Use `f' instead of `frame'.

	* widget.c (set_frame_size): Use FRAME_SCROLL_BAR_COLS
	to determine vertical_scroll_bar_extra.
	(EmacsFrameSetCharSize): Ditto.
	* xfns.c (x_figure_window_size): Ditto.

	* xterm.c (x_draw_row_bitmaps): Draw in `bitmap-area' face.
	(x_draw_bitmap): Ditto.

	* dispextern.h (face_id): New id BITMAP_AREA_FACE_ID.
	* xfaces.c (realize_basic_faces): Realize it.

1998-11-20  Gerd Moellmann  <gerd@gnu.org>

	* xmenu.c (xmenu_show): Add workaround for remaining button grab
	under LessTif   Use the widget of the frame as parent for the
	menu, again.

1998-11-19  Gerd Moellmann  <gerd@gnu.org>

	* xterm.c (XTread_socket): Inhibit busy cursor for EnterNotify.
	When EnterNotify, don't generate a mouse movement event if
	notification is from a busy-cursor child window.

	* xterm.h (struct x_output): Add busy_window, remove cursor.

	* xfns.c (Fx_show_busy_cursor): Formerly Fx_display_busy_cursor.
	Use a transparent window to display the busy-cursor.
	(Fx_hide_busy_cursor): Formerly Fx_undisplay_busy_cursor.

1998-11-17  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (check_window_end): New, for debugging.
	(CHECK_WINDOW_END): New.
	(try_window_id): Use it.

	* xterm.c (process_expose_from_menu): Return int.

	* keyboard.c (kbd_buffer_get_event): Set flag to prevent recording
	TOOLBAR_EVENT events in last_nonmenu_event.

1998-11-16  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (redisplay_window): If windows_or_buffers_changed,
	window end isn't reliable, so set window_end_valid to nil.
	(redisplay_internal): If overlay arrow has changed, set
	windows_or_buffers_changed to redisplay thoroughly.

	* dispnew.c (adjust_glyph_matrix): Invalidate window end, if
	necessary.

	* xfns.c (file_dialog_cb): New.
	(Fx_file_dialog): New.
	* fileio.c (Fread_file_name): Call it.

	* xrdb.c (x_load_resources): Add default resoures for file
	selection dialog.

1998-11-14  Gerd Moellmann  <gerd@gnu.org>

	* xterm.c (note_mouse_highlight): Don't highlight when popup
	is active.

	* keyboard.c (timer_check): Inhibit busy cursor around calls to
	timer-event-handler.  This busy cursor tends to be anoying if
	fontifying stealthily.

	* dispnew.c (direct_output_for_insert): Give up if current row
	contains trailing whitespace.

1998-11-13  Gerd Moellmann  <gerd@gnu.org>

	* dispextern.h (prop_idx): Add FONTIFIED_PROP_IDX.

	* xdisp.c (handle_fontified_prop): New.
	(Vfontification_functions): New.
	(Qfontification_functions): New.
	(it_props): Add handle_fontified_prop.

1998-11-12  Gerd Moellmann  <gerd@gnu.org>

	* xmenu.c (xmenu_show): Use the frame's edit_widget as parent.
	Otherwise, under LessTif, after the popup has gone, all button
	press events come in for the frame's widget, and release events
	come in for the edit_widget.
	* xterm.c (XTread_socket): Remove workaround for that problem.
	(x_set_toolkit_scroll_bar_thumb): Add workaround for LessTif
	XmScrollBarSetValues.
	(SET_SAVED_MENU_EVENT): Give it statement form.

	* xfaces.c (display_message): If waiting_for_input, don't display
	the message.

	* window.c (scroll_command): If not acting on current_buffer,
	make redisplay consider all windows.

	* xfns.c (Fx_hide_tip): Return t if tooltip was open.

	* xdisp.c (handle_glyph_prop): Set it->object for images to
	the object having the glyph property.

	* xterm.c (x_draw_row_bitmaps): Don't draw if row is completely
	invisible.

1998-11-11  Gerd Moellmann  <gerd@gnu.org>

	* xterm.h (struct x_display_info): Add gray pixmap.  * xterm.c
	(x_term_init): Create the gray pixmap.
	(x_setup_relief_color): Use it.
	(x_get_glyph_string_clip_rect): Draw a toolbar window over the
	internal border at the top of a frame.
	(x_init_glyph_string): Likewise.
	(x_draw_glyph_string_relief): Correct right x by 1 pixel for
	full-width lines.
	(XTflash): Don't flash the toolbar window.

	* xterm.c (XTread_socket): Workaround for LessTif popup menus
	in case of ButtonPress events.

1998-11-10  Gerd Moellmann  <gerd@gnu.org>

	* xrdb.c (x_load_resources): Add grey background colors as
	defaults for menus, scroll bars, and dialogs.

	* insdel.c (prepare_to_modify_buffer): Move setting
	windows_or_buffers_changed from modify_region here.

	* xfns.c (Fx_show_tip): Inhibit redisplay.
	(Fx_hide_tip): Ditto.
	(Fx_image_header): New.

1998-11-09  Gerd Moellmann  <gerd@gnu.org>

	* dispnew.c (clear_window_matrices): Set window_end_valid to nil
	when clearing current window matrices.

1998-11-08  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (handle_glyph_prop): Don't set an iterator's buffer
	position from a string position.  Use the right end position
	if the property spans a whole overlay string.

1998-11-07  Gerd Moellmann  <gerd@gnu.org>

	* xmenu.c (menubar_selection_callback): Remove workaround for
	Lesstif not calling XmNpopdownCallback because it doesn't
	handle the case where users don't select any menu item.

	* insdel.c (modify_region): Set windows_or_buffers_changed.

	* buffer.c (set_buffer_internal): Don't set
	windows_or_buffers_changed.

	* xmenu.c (HAVE_BOXES): Define if USE_X_TOOLKIT.

	* xmenu.c (menubar_selection_callback): Add workaround for
	Lesstif not calling XmNpopdownCallback.

	* xdisp.c (eval_mode_element): New.
	(eval_mode_handler): New.
	(display_mode_element): Use eval_mode_element.

	* xdisp.c (display_mode_element): Allow `(:eval FORM)'.
	Remove code looking at text props of default value.

	* xmenu.c (HAVE_BOXES): Define if using Lucid menus.

1998-11-06  Gerd Moellmann  <gerd@gnu.org>

	* xmenu.c (single_submenu): Set button_type of menu to
	BUTTON_TYPE_NONE.
	(single_submenu): Likewise for panes and menu items.
	(set_frame_menubar): Set button_type of menu bar to none.
	(xmenu_show): Likewise.
	(single_submenu): Set widget values selected slot.
	(xmenu_show): Likewise.

	* xmenu.c (push_menu_item): Add parameters `type' and
	`selected'. Store it in menu_items.
	(MENU_ITEMS_ITEM_TYPE): New.
	(MENU_ITEMS_ITEM_SELECTED): New.
	(MENU_ITEMS_ITEM_LENGTH): Increase by two.

	* xfns.c (clear_image_cache): Get the current time, before
	doing anything.
	(cache_image): Set prev pointer of next image.
	(clear_image_cache): Clear current matrices if any image was
	freed.

	* xterm.c (XTread_socket): Set inhibit_busy_cursor.

	* xfns.c (x_set_cursor): New.
	(Fx_display_busy_cursor): New.
	(Fx_undisplay_busy_cursor): New.

	* xterm.h (struct x_output): Add busy_cursor.

	* xfns.c (Vx_busy_pointer_shape): New.
	(x_set_mouse_color): Create busy cursor.

	* process.c (wait_reading_process_input): Show and hide busy
	cursor.

	* keyboard.c (command_loop_1): Display busy cursor.

	* eval.c (Fsignal): Hide busy cursor.

	* buffer.c (set_buffer_internal): Don't set
	windows_or_buffers_changed.

	* xterm.c (redo_mouse_highlight): New.

1998-11-04  Gerd Moellmann  <gerd@gnu.org>

	* xfns.c (x_create_x_image_and_pixmap): Add depth parameter.
	(x_build_heuritic_mask): New.
	(lookup_image): Call it.

	* xterm.c (note_toolbar_highlight): Always set up help_echo.
	(previous_help_echo): New.
	(XTread_socket): Generate help event with nil message when
	leaving a region with help-echo.
	(note_mouse_highlight): Handle `help-echo' over text.
	(XTread_socket): Dispatch VisibilityNotify, CirculateNotify,
	CirculateRequest.
	(clear_mouse_face): Don't clear if tooltip is shown.
	(XTread_socket): Redo mouse-highlight after tooltip is gone.
	Avoid SET_FRAME_GARBAGED when tooltip is mapped.

	* keyboard.c (Vshow_help_function): New.
	(read_char): Use it.

1998-11-03  Gerd Moellmann  <gerd@gnu.org>

	* xfns.c (x_create_tip_frame): New.
	(Fx_show_tip): New.
	(Fx_hide_tip): New.

	* xterm.c (x_destroy_window): Handle case that we don't have
	a widget.

	* dispextern.h (struct glyph_row): Rename no_marginal_areas_p
	to full_width_p.  Add internal_border_p.

1998-11-02  Gerd Moellmann  <gerd@gnu.org>

	* xterm.c (note_mode_line_highlight): Check the charpos of
	the glyph under the mouse pointer before accessing text
	properties at that position.

1998-11-01  Gerd Moellmann  <gerd@gnu.org>

	* xterm.c (x_draw_image_relief): Handle toolbar_button_relief.

	* xdisp.c (auto-raise-toolbar-buttons): New.
	(build_desired_toolbar_string): Handle the flag.
	(toolbar-button-margin): New.
	(toolbar-button-relief): New.
	(build_desired_toolbar_string): Use margin and relief.

	* xterm.c (x_set_toolkit_scroll_bar_thumb): Remove workaround
	for FreeBSD.
	(note_mode_line_highlight): New.
	(note_mouse_highlight): Call it.

1998-10-31  Gerd Moellmann  <gerd@gnu.org>

	* s/freebsd.h (NARROWPROTO): New.

	* xdisp.c (display_string): New parameter face_string.
	(display_mode_element): When displaying a symbol with a string
	value, use text properties from the symbol's default value, maybe.

	* xrdb.c (x_load_resources): Add font defaults for menus and
	dialogs.

1998-10-30  Gerd Moellmann  <gerd@gnu.org>

	* xfns.c (Fx_create_frame): Try 12pt Courier font first.

1998-10-29  Gerd Moellmann  <gerd@gnu.org>

	* xterm.c (x_produce_glyphs): Fix bug causing glyphs to be
	produced for characters with codes < 32 under certain
	circumstances.

	* xdisp.c (redisplay_window): Handle values of PT in front
	of invisible, intangible text.
	(try_window_id): Set overlay_arrow_seen to zero before
	displaying lines.
	(display_mode_element): Assign to glyphs written for a mode
	line spec `%x' as object the Lisp format string, as position
	the position of the `%' in that string.
	(display_string): If displaying a C string, optionally get
	the face to use from a Lisp string.

	* xterm.c (expose_window_tree): Include mode line height.

	* xfns.c (Fx_create_frame): Add toolbar height to frame height.

1998-10-27  Gerd Moellmann  <gerd@gnu.org>

	* xterm.c (note_mouse_highlight): Change mouse pointer shape
	over mode line.

1998-10-26  Gerd Moellmann  <gerd@gnu.org>

	* window.c (coordinates_in_window): Use CURRENT_MODE_LINE_HEIGHT.

	* xdisp.c (redisplay_window): If mode line height has changed,
	 arrange for a thorough immediate redisplay using the correct mode
	 line height.
	 (window_box_height): Use CURRENT_MODE_LINE_HEIGHT.

	* dispextern.h (MATRIX_MODE_LINE_HEIGHT): New.
	(CURRENT_MODE_LINE_HEIGHT): New.
	(DESIRED_MODE_LINE_HEIGHT): New.

	* keyboard.c (make_lispy_event): Add string and string position
	info to mouse-click events.
	(read_key_sequence): Handle `local-map' property of mode line
	strings.

	* keyboard.h (POSN_STRING): New.

1998-10-25  Gerd Moellmann  <gerd@gnu.org>

	* dispnew.c (mode_line_string): Mew.

	* xterm.c (xt_action_hook): New.
	(x_create_toolkit_scroll_bar): Add action hook.
	(xm_scroll_callback): Implement dragging.

	* keyboard.c (Qend_scroll): New.
	(scroll_bar_parts): Add it.

	* termhooks.h (scroll_bar_end_scroll): New.

	* xterm.c (XTread_socket): Bug fix.

1998-10-24  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (redisplay_window): Finish scroll bars after
	redisplaying toolbar.

	* keyboard.c (scroll_bar_parts): Add Qtop and Qbottom.
	(syms_of_keyboard): Add Qbottom.

	* termhooks.h (scroll_bar_to_top): New.
	(scroll_bar_to_bottom): New.

	* xdisp.c (redisplay_window): Always resize toolbar window if
	auto_resize_toolbar_p is non-zero.
	(auto_resize_toolbar_p): Renamed from auto_resize_toolbar.
	(window_box): New.
	(window_box_height): New.
	(window_box_width): New.
	(window_box_left): New.
	(window_box_right): New.
	(window_box_edges): New.

1998-10-23  Gerd Moellmann  <gerd@gnu.org>

	* xterm.c (x_set_toolkit_scroll_bar_thumb): Kluge for call to
	XawScrollbarSetThumb in FreeBSD.
	(x_create_toolkit_scroll_bar): Set resource "beNiceToColormap"
	to true.

	* window.c (get_phys_cursor_glyph): Return null if cursor vpos
	is out of range.

	* xterm.c (x_create_toolkit_scroll_bar): Set scroll_bar_pixel.
	(x_term_init): Initialize it.

	* xterm.h (struct x_display_info): Add scroll_bar_pixel.

	* xterm.c (x_create_toolkit_scroll_bar): Set LessTif scroll bar's
	cursor.

1998-10-22  Gerd Moellmann  <gerd@gnu.org>

	* keyboard.c (make_lispy_event): Handle scroll_bar_click
	differently when using toolkit scroll bars.

	* xterm.c (x_send_scroll_bar_event): New.
	(x_scroll_bar_to_input_event): New.
	(xaw3d_scroll_callback): New.
	(xaw3d_jump_callback): New.
	(xm_scroll_callback): New.
	(x_toolkit_scroll_p): New.
	(XTread_socket): Handle scroll bar client message.
	(x_term_init): Initialize Xatom_Scrollbar.
	(x_scroll_bar_create): Set cursor.
	(xm_scroll_callback):
	(x_create_toolkit_scroll_bar): New.
	(x_set_toolkit_scroll_bar_thumb): New.
	(x_scroll_bar_create): Call x_create_toolkit_scroll_bar.
	(XTset_vertical_scroll_bar): Call x_set_toolkit_scroll_bar_thumb.

	* xterm.h (struct x_display_info): Add Xatom_Scrollbar.

1998-10-21  Gerd Moellmann  <gerd@gnu.org>

	* xterm.c (x_scroll_bar_remove): Handle toolkit scroll bars.
	(XTread_socket): Don't handle mouse button events for scroll bars
	if using toolkit scroll bars.
	(XTset_vertical_scroll_bar): Set thumb size and position for
	Athena scroll bar.

	* xterm.h (scroll_bar): Add x_widget_low and x_widget_high.

	* xterm.c (XTread_socket): Dispatch expose event to widget
	if using toolkit scroll bars.
	(x_scroll_bar_expose): Make no-op for toolkit scroll bars.
	(x_scroll_bar_create): Create and show a scroll bar widget
	if using toolkit scroll bars.
	(x_scroll_bar_move): Handle tookit scroll bars.

	* Makefile.in (LIBW): Use Xaw3d if present.

	* configure.in (USE_TOOLKIT_SCROLL_BARS): New.
	(HAVE_XAW3D): New.

	* config.in (USE_TOOLKIT_SCROLL_BARS): New.
	(HAVE_XAW3D): New.

	* xterm.c (XTset_vertical_scroll_bar): Correct position of
	right vertical scroll bar.

1998-10-20  Gerd Moellmann  <gerd@gnu.org>

	* xfns.c (xpm_load): Support reading XPM images from string
	buffers containing data in the same format as an XPM file.
	Support `:color-symbols'.
	(xpm_format): Add `:data'.
	(xpm_keyword_index): Add XPM_DATA.
	(syms_of_xfns): Add `:color-symbols'.
	(xpm_keyword_index): Add XPM_COLOR_SYMBOLS.
	(xpm_valid_color_symbols_p): New.
	(xpm_image_p): Call it.

	* xdisp.c (build_desired_toolbar_string): Add `:algorithm'
	attribute to the image if item is not enabled.

	* xfns.c (x_laplace): New.
	(x_laplace_read_row): New.
	(x_laplace_write_row): New.
	(lookup_image): Handle common image attributes here.  New
	attribute `:algorithm'.

	* xfaces.c (clear_face_cache): Call clear_image_cache.

	* xterm.c (x_inverted_image_mask): Removed.
	(x_draw_image_foreground_1): New.
	(x_draw_image_glyph_string): Draw images with mask to a temporary
	pixmap to reduce flickering.

	* xdisp.c (redisplay_toolbar): Handle auto-resize-toolbars.
	(display_toolbar_line): Remove parameter `margin'.

1998-10-19  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (toolbar_lines_needed): New.
	(auto-resize-toolbars): New.

	* xfns.c (cache_image): Correct call to xrealloc.

	* dispnew.c (Fset_toolbar_height): Removed.

	* xdisp.c (init_xdisp): Use FRAME_TOP_MARGIN instead of
	FRAME_MENU_BAR_LINES.

	* window.c (Fdelete_other_windows): Use FRAME_TOP_MARGIN
	instead of FRAME_MENU_BAR_LINES.
	(check_frame_size): Ditto.

	* dispnew.c (adjust_frame_glyphs_initially): Use FRAME_TOP_MARGIN
	instead of FRAME_MENU_BAR_LINES.
	(adjust_frame_glyphs_for_frame_redisplay): Ditto.
	(build_frame_matrix): Ditto.
	(change_frame_size_1): Ditto.

	* frame.h (FRAME_TOOLBAR_LINES): New.
	(FRAME_TOP_MARGIN): New.

	* window.c (struct save_window_data): Add frame_toolbar_lines.
	(Fset_window_configuration): Handle toolbar lines.
	(Fcurrent_window_configuration): Save toolbar lines.

	* frame.c (syms_of_frame_1): Add Qtoolbar_lines.

	* xfns.c (Fx_create_frame): Add default parameter for toolbar.

	* frame.h (struct frame): Rename top_margin to toolbar_lines.

	* xfns.c (x_frame_parms): Add `toolbar-lines'.
	(x_set_toolbar_lines): New.

	* keyboard.c (cmd_error_internal): Bug fix.

	* xterm.c: Remove double include of syssignal.h.

1998-10-18  Gerd Moellmann  <gerd@gnu.org>

	* xterm.c (x_toolbar_item): New.
	(x_handle_toolbar_click): Use it.
	(note_toolbar_highlight): Use it.

	* keyboard.c (syms_of_keyboard): Staticpro toolbar_item_properties
	and toolbar_items_vectors.

	* xterm.c (help_echo): New.
	(draw_glyphs_face): Add DRAW_IMAGE_RAISED and DRAW_IMAGE_SUNKEN.
	(x_set_glyph_string_gc): Handle them.
	(x_after_update_window_line): Don't do anything in pseudo-windows.
	(x_produce_image_glyph): Take image margin and face relief into
	account.
	(x_get_glyph_string_clip_rect): Handle pseudo-windows.
	(x_draw_glyph_string_background): Optimize case when face has
	relief.
	(x_setup_relief_color): Take frame instead of glyph string
	parameter.
	(x_draw_relief_rect): New.
	(x_draw_glyph_string_relief): Call it.
	(x_draw_image_glyph_string_foreground): Handle margin and image
	relief.
	(x_draw_image_glyph_string_background): Ditto.
	(expose_frame): Redraw toolbar window.
	(expose_window): Don't draw cursor for pseudo-windows.
	(x_y_to_hpos_vpos): Handle pseudo-windows.
	(frame_to_window_pixel_xy): New.
	(note_mouse_highlight): Call note_toolbar_highlight.
	(x_handle_toolbar_click): New.
	(note_toolbar_highlight): New.
	(show_mouse_face): Change int parameter `hl' to parameter of
	type enum draw_glyphs_face.  Handle image highlighting.
	(XTread_socket): Return a HELP_EVENT input event if help_echo is
	non-nil.  Use x_handle_toolbar_click.

	* termhooks.h (event_kind): Add HELP_EVENT, TOOLBAR_EVENT.

	* xfns.c (image_value_type): Add IMAGE_INTEGER_VALUE,
	IMAGE_BOOL_VALUE.
	(parse_image_spec): Handle them.
	(image_spec_value): Additional parameter found.
	(free_image): Remove image from the vector `images' of the
	image cache.
	(clear_image_cache): Additional parameter force_p.
	(Fclear_image_cache): New.
	(x_find_image_file): New.
	(xbm_load): Handle `:margin' and `:relief'.  Use
	x_find_image_file.
	(xpm_load): Likewise.
	(pbm_load): Likewise.
	(jpeg_load): Likewise.
	(tiff_load): Likewise.
	(gif_load): Likewise.

	* keyboard.c (Qhelp_echo): New symbol.
	(read_char): Handle `toolbar' and `help_echo' events.
	(kbd_buffer_get_event): Handle HELP_ECHO input event.
	(make_lispy_event): Handle TOOLBAR_EVENT.
	(toolbar_items): New.
	(process_toolbar_item): New.
	(PROP): New.
	(init_toolbar_items): New.
	(append_toolbar_item): New.
	(read_char_x_menu_prompt): Handle `toolbar' event.
	(read_key_sequence): Ditto.

	* xfaces.c (Qtoolbar): New.
	(realize_basic_faces): Realize `toolbar' face.
	(face_at_string_position): Remove parameter modeline_p, add
	base_face_id.

	* xfns.c (xbm_load_image_from_file): Don't use Xmu function
	to read data.

1998-10-17  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (init_iterator): Replace parameter modeline_p with
	base_face_id.
	(next_element_from_string): Call get_next_display_element
	recursively after handling text properties.
	(prepare_menu_bars): Call update_toolbar.
	(update_toolbar): New.
	(build_desired_toolbar_string): New.
	(display_toolbar_line): New.
	(redisplay_toolbar): New.
	(toolbar_item_info): New.
	(redisplay_window): Call redisplay_toolbar.
	(Fdump_toolbar_row): New.  Defined if compiled with GLYPH_DEBUG.

	* dispnew.c (clear_current_matrices): Clear matrices of toolbar
	window.
	(clear_desired_matrices): Ditto.
	(adjust_frame_glyphs_for_window_redisplay): Make toolbar window.
	(free_glyphs): Free matrices of toolbar window.
	(update_frame): Update toolbar window.
	(change_frame_size_1): Take toolbar into account.
	(Fset_toolbar_height): New.

	* dispextern.h (struct it): Remove member modeline_p, add
	base_face_id.
	(struct image): Add members relief and margin.
	(IMAGE_ASCENT): Include margin in height.

1998-10-14  Gerd Moellmann  <gerd@gnu.org>

	* xfns.c (Fclear_image_cache): New.

	* xfaces.c (realize_basic_faces): Realize toolbar face.
	(face_at_string_position): Remove parameter modeline_p, add
	base_face_id.

	* dispextern.h (enum face_id): Add TOOLBAR_FACE_ID.

1998-10-13  Gerd Moellmann  <gerd@gnu.org>

	* keyboard.c (syms_of_keyboard): Intern `:help'.

1998-10-12  Gerd Moellmann  <gerd@gnu.org>

	* xterm.c (note_toolbar_highlight): New.
	(note_mouse_highlight): Call it.

	* window.c (window_from_coordinates): Additional parameter toolbar_p.
	(coordinates_in_window): Handle toolbar window.

	* keyboard.c (toolbar_items): New.
	(process_toolbar_item): New.
	(parse_toolbar_item): New.
	(init_toolbar_items): New.
	(append_toolbar_item): New.

	* dispextern.h (enum toolbar_item_idx): New.
	(enum toolbar_item_image): New.

	* frame.h (struct frame): Add toolbar-related members.

	* xfaces.c (face_at_string_position): Remove assertion that
	current_buffer == window's buffer.  This is not the case when
	called for the toolbar window.

	* frame.c (make_frame): Initialize toolbar members.

	* alloc.c (mark_object): Mark toolbar data of frames.

	* frame.h (struct frame): Add toolbar-related members
	toolbar_window, desired_toolbar_items, current_toolbar_items,
	desired_toolbar_string, current_toolbar_string,
	n_desired_toolbar_items, n_current_toolbar_items.  Add
	window_height.

	* xterm.c (x_after_update_window_line): Don't draw bitmap
	areas for pseudo-windows.
	(expose_frame): Handle toolbar window.
	(expose_window): Don't do cursor stuff for pseudo-windows.

	* xdisp.c (display_menu_bar): Correct calls to init_iterator.

1998-10-11  Gerd Moellmann  <gerd@gnu.org>

	* frame.c (make_frame): Initialize toolbar_window.

	* alloc.c (mark_object): Make the toolbar window.

	* dispnew.c (update_frame): Update frame's toolbar_window.
	(clear_current_matrices): Likewise.
	(clear_desired_matrices): Likewise.
	(adjust_frame_glyphs_for_window_redisplay): Make toolbar_window.
	(free_glyphs): Free the toolbar window and its matrices.

	* frame.h (struct frame): Add toolbar_window.

	* xterm.c (x_draw_glyph_string_relief): Handle mouse-face
	with relief.

1998-10-10  Gerd Moellmann  <gerd@gnu.org>

	* dispnew.c (buffer_posn_from_coords): Don't screw up if
	window start is not in the range BEGV..ZV.

1998-10-09  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (try_scrolling): Experimentally handle the case
	that scroll-preserve-screen-position is set to `always'.

	* window.c (Vscroll_preserve_screen_position): Replacement for
	scroll_preserve_screen_position.

1998-10-08  Gerd Moellmann  <gerd@gnu.org>

	* dispnew.c: Don't initialize auto structs; the HP/UX compiler
	doesn't like it.
	* xdisp.c: Ditto.

	* xdisp.c (make_cursor_line_fully_visible): Adjust this_line_y.

1998-10-06  Gerd Moellmann  <gerd@gnu.org>

	* minibuf.c (Fminibuffer_complete_word): Fix computation of
	i_byte when prompts are inserted into minibuffers.

	* dispextern.h (FRAME_INTERNAL_BORDER_WIDTH_SAFE): New.
	(WINDOW_DISPLAY_LEFT_EDGE_PIXEL_X): Use it.
	(WINDOW_DISPLAY_TOP_EDGE_PIXEL_Y): Ditto.

1998-10-04  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (make_cursor_line_fully_visible): New.
	(try_scrolling): New.
	(redisplay_window): Move scrolling code to try_scrolling.
	(make_cursor_line_fully_visible): Handle case of window too small
	to show a single line.
	(redisplay_window): Case forced window start---use
	make_cursor_line_fully_visible.
	(redisplay_window): Case cursor movement via current matrix.
	If ending up on a partially visible line, make it fully visible
	instead of recentering.
	(try_scrolling): Additional parameter scroll_smoothly.

	* xterm.c (x_draw_bitmap): Don't XClearArea under the pixmap.

1998-09-28  Gerd Moellmann  <gerd@gnu.org>

	* window.c (window_scroll_pixel_based): Bug fix: vpos used
	instead of y-position for scroll-preserved-screen-position.

1998-09-07  Gerd Moellmann  <gerd@gnu.org>

	* dispnew.c (update_frame_line): If current row is not enabled,
	write the whole line.

1998-09-06  Gerd Moellmann  <gerd@gnu.org>

	* lisp.h (HAVE_FACES): Removed.

	* dispextern.h (HAVE_FACES): Removed.

	* config.in (HAVE_FACES): Removed.

	* dispnew.c (HAVE_FACES): Removed.

	* xdisp.c (HAVE_FACES): Removed.

	* xfaces.c (HAVE_FACES): Removed.

1998-09-05  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (init_iterator): If face_change_count is non-zero,
	free realized faces.

	* xfaces.c (free_all_realized_faces): Make it externally visible.
	(Finternal_set_lisp_face_attribute): Increment
	windows_or_buffers_changed.

	* dispnew.c (direct_output_for_insert): Give up if
	face_change_count is non-zero.
	(direct_output_forward_char): Ditto.

	* xfaces.c (face_change_count): New.

1998-09-04  Gerd Moellmann  <gerd@gnu.org>

	* xterm.c (x_draw_bar_cursor): Don't draw if cursor hpos is out
	of range.

1998-09-03  Gerd Moellmann  <gerd@gnu.org>

	* term.c (Ftty_display_color_p): New.

1998-09-02  Gerd Moellmann  <gerd@gnu.org>

	* xfaces.c (Ftty_defined_colors): New.

	* xterm.c (x_produce_glyphs): Fix computation of
	contains_overlapping_glyphs_p for ASCII.

	* dispnew.c (Fshow_cursor): Don't change cursor state while
	redisplaying.
	(direct_output_for_insert): If a glyph with lbearing or rbearing
	is among the new glyphs, set row flag contains_overlapping_glyph_p.

1998-09-01  Gerd Moellmann  <gerd@gnu.org>

	* term.c (OUTPUT_IF): Make replacement text have statement form.
	(OUTPUT1_IF): Ditto.
	(TS_italic_mode, TS_end_italic_mode): Removed.
	(TS_bold_mode): Removed.
	(TS_underscore_mode, TS_end_underscore_mode): Removed.
	(TS_enter_bold_mode, TS_enter_dim_mode, TS_enter_blink_mode): New.
	(TS_enter_reverse_mode): New.
	(TS_enter_underline_mode, TS_exit_underline_mode): New.
	(TN_magic_cookie_glitch_ul): New.
	(TS_enter_alt_charset_mode, TS_exit_alt_charset_mode): New.
	(TS_exit_attribute_mode): New.
	(TN_max_colors, TN_max_pairs, TS_orig_pairs): New.
	(TS_set_foreground, TS_set_background): New.
	(reset_terminal_modes): Switch colors back to default.
	(write_glyphs): Turn face on before writing text, turn it off
	afterwards.
	(insert_glyphs): Ditto.
	(term_init): Initialize new terminal capability variables.
	(turn_on_face): Turn a face on.
	(turn_off_face): Turn a face off.

	* lisp.h (MAKE_GLYPH): Remove test for frame type.
	(GLYPH_CHAR): Ditto.
	(GLYPH_FACE): Ditto.

	* xfaces.c (Vface_tty_color_alist): New.
	(face-register-tty-color): New.
	(face-clear-tty-colors): New.

	* dispextern.h (FACE_TTY_DEFAULT_COLOR): New.
	(struct it): Remove member faces_p since we now always have faces.

1998-08-31  Gerd Moellmann  <gerd@gnu.org>

	* dispextern.h (struct face): Add tty appearance flags.

	* xdisp.c (init_iterator): Always handle faces.
	(extend_face_to_end_of_line): Handle tty frames.

	* dispnew.c (clear_glyph_matrix): Allow a null matrix to be
	passed in.

1998-08-30  Gerd Moellmann  <gerd@gnu.org>

	* xfaces.c (realize_default_face): Use empty strings to indicate
	that the face should use the default foreground/background
	color of the terminal.  Fill font-related attributes with
	appropriate values for tty frames.

	* emacs.c (main): Call syms_of_xfaces before init_window_once.

	* xfaces.c (realize_default_face): If face `default' is not
	yet known, create it.

	* frame.c (make_terminal_frame): Call init_frame_faces
	unconditionally.

	* xfaces.c (init_frame_faces): Make it work for tty frames.
	(free_frame_faces): Ditto.
	(clear_face_cache): Ditto.
	(recompute_basic_faces): Ditto.
	(Fframe_face_alist): Ditto.
	(free_realized_face): Ditto.
	(prepare_face_for_display): Ditto.
	(clear_face_gcs): Ditto.
	(lookup_face): Ditto.
	(smaller_face): Ditto.
	(realize_default_face): Ditto.
	(realize_face): Ditto.
	(realize_face): Dispatch to functions depending on the frame type.
	(realize_x_face): X way of realizing faces.
	(realize_tty_face): TTY way of realizing faces.

1998-08-29  Gerd Moellmann  <gerd@gnu.org>

	* xfaces.c (realize_face): Remove parameter unibyte_registry,
	compute it instead.
	(lookup_face): Remove local variable unibyte_registry.

1998-08-22  Gerd Moellmann  <gerd@gnu.org>

	* xterm.c (x_draw_glyph_string_relief): Draw top and bottom lines
	1 pixel longer.

	* xdisp.c (face_before_or_after_it_pos): Fix computation
	of face in buffer.

	* editfns.c (make_buffer_string_both): If prompt in buffer,
	prevent start > end.

	* indent.c (Fvertical_motion): Set current_buffer to window's
	buffer if it isn't already.

1998-08-21  Gerd Moellmann  <gerd@gnu.org>

	* dispextern.h (GLYPH_DEBUG): Use default 0.

	* xdisp.c (it_props): New member `smaller'.
	(init_iterator): Initialize it.
	(Qsmaller): New.
	(push_it): Save value of `smaller' value on the stack.
	(pop_it): Restore `smaller' from the stack.
	(handle_smaller_prop): New.
	(handle_face_prop): Use `smaller' text property to select a
	suitable face.

	* dispextern.h (SMALLER_PROP_IDX): New.
	(struct it): Add member `smaller'.

	* xfaces.c (smaller_face): New.

	* frame.h (FRAME_WINDOW_WIDTH_ARG): Add bitmap area widths.

	* dispnew.c (allocate_matrices_for_window_redisplay): Compute
	total pixel width of window differently.

	* xdisp.c (init_iterator): Compute width of mode line differently.

	* dispextern.h (WINDOW_DISPLAY_PIXEL_WIDTH): Subtract width
	of bitmap areas.

	* window.c (Fsplit_window): Include width of bitmap areas in
	window width.
	(window_internal_width): Subtract width of bitmap areas from
	total width.

1998-08-18  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c: Functions reordered for better readability.

	* dispnew.c (update_text_area): Handle glyphs with arbitrary
	lbearing.
	(update_window_tree): Parameter no_scrolling_p removed.
	(update_single_window): Ditto.

	* xterm.c (x_get_char_font_and_encoding): Renamed to
	x_get_char_face_and_encoding.

	* dispnew.c (update_text_area): Don't call get_glyph_overhangs
	if end of current row reached.

	* xterm.c (x_get_glyph_face_and_encoding): New.
	(x_get_glyph_overhangs): Call it.

	* xdisp.c (Qshow_trailing_whitespace): New.
	(Qtrailing_whitespace): New.
	(enum prop_handled): New.
	(struct props, it_props): New.
	(next_overlay_change): New.  Works like Fnext_overlay_change
	but doesn't use xmalloc.
	(handle_stop): Restructured.
	(face_before_or_after_it_pos): Case iteration over a string: fix
	handling of face before current position.

1998-08-16  Gerd Moellmann  <gerd@gnu.org>

	* dispnew.c (adjust_glyph_matrix): Don't optimize matrix
	reallocation matrix if fonts_changed_p.
	(update_text_area): Handle glyphs with lbearing.

1998-08-14  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (struct props): New.
	(it_props): New.
	(compute_prop_info): New.
	(handle_stop): New.

	* textprop.c (validate_interval_range): Make it externally
	visible.

	* dispnew.c (direct_output_for_insert): Remove calls
	to compute_stop_pos.

	* dispextern.h (struct it): Remove check_charpos,
	next_overlay_pos.  Add what_changes.

1998-08-10  Gerd Moellmann  <gerd@gnu.org>

	* xterm.c (note_mouse_highlight): Set BEGV_BYTE, ZV_BYTE.

	* xfaces.c (Vx_unibyte_registry_and_encoding): Removed.  Use
	face_default_registry instead.

	* syntax.c (scan_sexps_forward): Set up syntax table before
	jumping to initial state label.

1998-08-09  Gerd Moellmann  <gerd@gnu.org>

	* dispnew.c (check_matrix_invariants): Handle case of row end pos
	>= ZV specially.

1998-08-08  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (redisplay_window): Case cursor movement---if cursor
	ends up in partially visible row, try to scroll.  Case forced
	window start---handle windows not tall enough to show a single
	line.

	* window.h (struct window): Member dy renamed vscroll.

	* xterm.c (x_list_fonts): Re-activate suppression of scalable
	fonts.
	(x_draw_stretch_glyph_string): Set clipping if using GC that
	hasn't set it yet.

	* xdisp.c (redisplay_window): Case forced window start -
	don't let cursor end on partially visible row.  Use desired
	matrix to find a suitable PT if it doesn't appear.
	(decode_mode_spec): Merged with 20.2.97.
	(try_window_reusing_current_matrix): Give up if old or
	new display is vscrolled.
	(redisplay_window): Reset vscrolling if forced window start,
	or if recentering.

1998-08-06  Gerd Moellmann  <gerd@gnu.org>

	* xfaces.c (realize_default_face): Use the fontset name instead of
	the alias for the family attribute of the default face because we
	can't easily determine a good alias from fontset-alias-alist.
	(face_fontset): Use Fquery_fontset to find the fontset.
	(font_list): Additional pattern parameter.
	(try_font_list): Ditto.
	(set_lface_from_font_name): Set face family from font foundry
	and family.
	(font_list): If family contains a hyphen, build pattern differently.

1998-08-05  Gerd Moellmann  <gerd@gnu.org>

	* xfaces.c (free_realized_faces): Increment windows_or_buffers_-
	changed instead of setting the frame garbaged.

	* xfaces.c (lface_equal_p): Don't assume equal Lisp types for
	all attribute values.  This is wrong if values are unspecified,
	i.e. nil.

	* xdisp.c (try_window_id): Give up if window start changed.

	* xfaces.c (make_realized_face): Store registry as Lisp object.
	(load_face_font_or_fontset): Compute registry of a face
	differently.  Make it `eq' to Vx_unibyte_registry_and_encoding if
	possible.

	* dispextern.h (FACE_SUITABLE_FOR_CHARSET_P): Compare registries
	differently.

	* alloc.c (mark_face_cache): Mark the registry member of faces.

	* dispextern.h (struct face): Make registry a Lisp string.

1998-08-04  Gerd Moellmann  <gerd@gnu.org>

	* xterm.c (x_get_char_font_and_encoding): Additional parameter
	multibyte_p.  Handle unibyte text.
	(x_append_glyph): Set the multibyte_p flag of glyphs.
	(x_produce_image_glyph): Ditto.
	(x_append_stretch_glyph): Ditto.
	(x_produce_glyphs): Handle unibyte text like ASCII.

	* xdisp.c (push_it): Save the multibyte flag of an iterator on the
	stack.
	(pop_it): Restore it.
	(face_before_or_after_it_pos): Handle the case that the string or
	buffer is unibyte.
	(get_overlay_strings): Set the multibyte flag of the iterator if
	the new overlay string is multibyte.
	(get_glyph_property): Likewise.
	(get_next_display_element): Don't check for charset changes in
	unibyte text.
	(append_space): Compute face differently for unibyte text.
	(extend_face_to_end_of_line): Don't return quickly if face has
	stipple.

	* xfaces.c (load_face_font_or_fontset): Store registry and
	encoding of the font in the registry member of the face.
	(make_realized_face): Additional parameter `registry'.
	(free_realized_face): Free the registry of a realized face.
	(face_suitable_for_charset_p): Function form of the macro
	with the same name in uppercase.
	(lookup_face): Use Vx_unibyte_registry_and_encoding if charset < 0.
	(choose_face_font): New parameter unibyte_registry.
	(choose_face_fontset_font): Ditto.
	(realize_default_face): Remember the registry and encoding of
	the specified frame font in Vx_unibyte_registry_and_encoding.
	(face_at_buffer_position): Handle unibyte.
	(face_at_string_position): Likewise.
	(realize_face): New parameter unibyte_registry.
	(compute_char_face): Handle the unibyte case.

	* dispextern.h (struct glyph): Add bit multibyte_p.
	(struct face): New member registry holding the registry and
	encoding of the X font of the face.
	(FACE_UNIBYTE_P): Value is non-zero if face is for unibye text.
	(enum face_id): Add BASIC_FACE_ID_SENTINEL.
	(FACE_SUITABLE_FOR_CHARSET_P): Handle charset < 0 meansing unibyte
	text.
	(struct iterator_stack_entry): Add multibyte_p.

	* xdisp.c (string_pos): Use string_char_to_byte.
	(char_charset): Removed.

1998-08-03  Gerd Moellmann  <gerd@gnu.org>

	* xterm.c (x_draw_image_glyph_string_foreground): Draw a
	rectangle for a block cursor over an image without a mask.
	(x_stretch_block_cursor): Added.  Non-zero means don't draw
	a block cursor over a stretch as wide as that stretch.
	(x_draw_stretch_glyph_string): Use it.
	(x_draw_hollow_cursor): Ditto.

	* minibuf.c (read_minibuf): Use minibuf_prompt instead of prompt.
	(read_minibuf): Add front-sticky text property for prompt.

	* xdisp.c (char_charset): Return charset of a character,
	depending on whether or not multi-byte characters are enabled.

	* xfaces.c (Fset_face_charset_registry): Removed.
	(x_charset_registry): Determine registry from charset plist.

1998-08-02  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (get_next_display_element): Don't check for charset
	changes if multi-byte characters are not enabled.

	* xdisp.c (echo_area_display): Use the flush function from the
	redisplay interface.
	* keyboard.c (detect_input_pending_run_timers): Likewise.

	* dispextern.h (produce_*glyphs_hook): Removed.
	* term.c (produce_*glyphs): Ditto.
	(cursor_to): Remove pixel position parameters.

	* dispnew.c: Remove hooks for window-based redisplay, introduce
	a redisplay interface structure.

	* xterm.c (x_per_char_metric): Return default char metrics if per
	char metric exists but contains a zero width.  Adobe Courier seems
	to contain such characters.

	* xdisp.c (compute_line_metrics): Compute the width of rows
	without stopping at glyphs with zero width.

1998-08-01  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (display_mode_line): If nothing was displayed at all,
	display a space.
	(hscroll_window_tree): Don't subtract 1 from target point if equal
	to ZV and window is not the selected window.

	* dispnew.c (check_matrix_invariants): Remove check for window
	start at BEGV or after newline.  This happens in rare cases
	intentionally.

1998-07-31  Gerd Moellmann  <gerd@gnu.org>

	* xfaces.c (x_charset_registry): Use STRING_BYTES.
	(syms_of_xfaces): Add Vface_default_registry.
	(x_charset_registry): Use it.

	* xdisp.c (run_window_scroll_functions): Run window scroll functions.
	(redisplay_window): Use it.

	* dispnew.c (update_text_area): Handle lbearing of deleted text
	by backing up one character.

1998-07-30  Gerd Moellmann  <gerd@gnu.org>

	* dispnew.c (adjust_glyph_matrix): Use a different check to
	decide to do nothing.

	* xfaces.c (face_at_string_position): Additional parameter
	mode_line_p.  If non-zero, merge with the mode line face
	instead of the default face.
	* dispextern.h (struct it): Add mode_line_p.
	* xdisp.c (init_iterator): Set it.
	(compute_face_in_string): Use it.
	(face_before_or_after_it_pos): Handle strings.
	(get_next_display_element): Don't look for relief end in C strings.
	(next_element_from_string): Deliver string position instead of
	buffer position.

	* xterm.c (x_flush): Flush X output buffer.
	(XTflash): Use it.

	* xfaces.c (lface_from_face_name): Renamed from lface_from_symbol.
	Allow strings as face names.

	* xfns.c (forall_images_in_image_cache): Check that frame is
	alive.

	* widget.c (EmacsFrameDestroy): Remove call to free_frame_faces;
	it's also called from x_destroy_window.  Since this function is
	called from X, freeing stuff allocated with xmalloc is dangerous
	here, anyway.

	* xfaces.c (free_realized_faces): Don't clear current matrices
	of a frame being destroyed.

	* frame.c (make_frame): Call set_window_buffer instead of
	Fset_window_buffer.

	* window.c (set_window_buffer): Extracted from Fset_window_buffer,
	with an additional argument specifying whether or not hooks may
	be called.
	(Fset_window_buffer): Call it.

	* dispnew.c (clear_desired_matrices): Check that frame has
	a valid root window before clearing matrices in the window tree.
	(clear_current_matrices): Ditto.
	(clear_window_matrices): If GLYPH_DEBUG, check that hchild and
	vchild are valid windows if not nil.

	* xfaces.c (merge_face_vector_with_property): Allow :reverse-video
	for :inverse-video.
	(Finternal_set_lisp_face_attribute): Ditto.
	(Finternal_set_lisp_face_attribute_from_resource): Ditto.
	(Finternal_get_lisp_face_attribute): Ditto.
	(Finternal_lisp_face_attribute_values): Ditto.
	(syms_of_xfaces): Define the symbol `:reverse-video'.

	* xdisp.c (get_glyph_property): Renamed from
	fill_iterator_from_glyph_property.
	(next_element_from_buffer): Handle case	that no `glyph' property
	was found correctly.
	(display_line): Extend face to end of line only if we have faces.

1998-07-29  Gerd Moellmann  <gerd@gnu.org>

	* dispnew.c (Fshow_cursor): Renamed from blink_cursor.  Take
	additional window argument.

	* xdisp.c (reseat_at_previous_visible_line_start): Renamed from
	set_iterator_to_previous_visible_line_start.
	(reseat_at_next_visible_line_start): Likewise.
	(compute_stop_pos): Renamed from set_iterator_stop_pos.
	(face_before_or_after_it_pos): Renamed from get_face_at_it_pos.
	(compute_face_in_buffer): Renamed from
	compute_face_at_iterator_position.
	(compute_face_in_string): Renamed from
	compute_face_at_iterator_string_position.
	(get_space_width): Renamed from get_iterator_space_width.
	(next_overlay_string): Renamed from
	set_iterator_to_next_overlay_string.
	(get_overlay_strings): Renamed from
	get_overlay_strings_at_iterator_position.
	(restore_overlay_strings): Renamed from
	setup_overlay_strings_from_glyph_pos.
	(restore_dpvec): Renamed from setup_iterator_dpvec_from_glyph_pos.
	(init_from_display_pos): Renamed from init_iterator_from_glyph_pos.
	(init_to_row_start): Renamed from init_iterator_to_row_start.
	(init_to_row_end): Formerly init_iterator_to_next_row_start.

	* xterm.c: Merge with 20.2.97.
	(x_produce_glyphs): Use x_append_stretch_glyph for tabs.

	* dispextern.h (struct glyph): Replace text_pos position with
	simple charpos.

	* xdisp.c (this_line_start_pos): Use struct text_pos.
	(this_line_end_pos): Renamed from .*endpos; use struct text_pos.
	(enum move_it_result): Renamed from move_iterator_result.
	(string_pos_nchars_ahead): Compute text_pos in a string from a
	known text_pos plus a character delta.
	(string_pos): Compute text_pos in string from charpos.
	(c_string_pos): Likewise for a C string.
	(number_of_chars): Return number of characters in a possibly
	multi-byte C string.
	(check_it): Renamed from check_iterator.  Check that charpos and
	bytepos are in sync.
	(push_it): Renamed from save_iterator_settings.
	(pop_it): Renamed from restore_iterator_settings.
	(move_it_.*): Renamed from move_iterator_.*.
	(charset_at_position): Take charpos/bytepos into account.
	(back_to_previous_line_start): Set iterator to previous line start.
	(forward_to_next_line_start): Set iterator to next line start.
	(back_to_previous_visible_line_start): Renamed from
	move_iterator_previous_visible_line_start.
	(set_iterator_to_next_visible_line_start): Handle charpos/bytepos.
	(get_face_at_it_pos): Renamed from get_face_from_cursor_pos.
	Handle charpos/bytepos.
	(compute_face_at_iterator_position): Handle charpos/bytepos.
	(compute_face_at_iterator_string_position): Likewise.
	(get_iterator_space_width): Likewise.
	(load_overlay_strings): Likewise.
	(get_overlay_strings_at_iterator_position): Likewise.
	(reseat_iterator): Take a text_pos position argument.
	(setup_iterator_overlay_strings_from_glyph_pos): Handle charpos/
	bytepos.
	(init_iterator): Take additional bytepos parameter.
	(reseat_iterator_to_string): Handle charpos/bytepos.
	(start_display): Take a text_pos parameter.  Handle charpos/bytepos.
	(next_element_from_string): Handle charpos/bytepos.
	(next_element_from_c_string): Likewise.
	(fill_iterator_from_glyph_property): Likewise.
	(next_element_from_buffer): Likewise.
	(set_iterator_to_next): Increment charpos and bytepos of an iterator.
	(move_iterator_in_display_line_to): Handle charpos/bytepos.
	(move_it_to): Likewise.
	(move_it_vertically_backward): Likewise.
	(move_it_vertically): Likewise.
	(move_it_by_lines): Likewise.
	(hscroll_window_tree): Likewise.
	(redisplay_internal): Likewise.
	(set_cursor_from_row): Likewise.
	(redisplay_window): Likewise.
	(try_window): Take a text_pos parameter.  Handle charpos/bytepos.
	(try_window_reusing_current_matrix): Handle charpos/bytepos.
	(get_first_unchanged_at_end_row): Compute and return delta_bytes.
	(try_window_id): Handle charpos/bytepos.
	(Ftrace_redisplay_toggle): Return Qnil.
	(get_overlay_arrow_glyph_row): Handle charpos/bytepos.
	(insert_left_trunc_glyphs): Likewise.

	* dispnew.c: `Merge' with 20.2.97 (it's really too different to
	do a real merge).
	(increment_glyph_matrix_buffer_positions): Add parameter delta_bytes.
	(increment_glyph_row_buffer_positions): Ditto.
	(copy_glyph_row_contents): Ditto.
	(check_matrix_invariants): Add additional checks for charpos/
	bytepos consistency.
	(direct_output_for_insert): Changed for charpos/bytepos.
	(buffer_posn_from_coords): Likewise.  Put code dealing with
	`direction-reversed' in #if 0.

	* xterm.h: Merge with 20.2.97.

	* frame.h: Merge with 20.2.97.

	* window.h: Merge with 20.2.97.  Add window_end_bytepos.

	* dispextern.h (MATRIX_ROW_START_CHARPOS): Get charpos of a row
	start.
	(MATRIX_ROW_START_BYTEPOS): Likewise for the byte position.
	(MATRIX_ROW_END_CHARPOS): Likewise for the row end.
	(MATRIX_ROW_END_BYTEPOS): Likewise for the row end byte position.
	(struct it): Various members renamed from .*pos to .*charpos.
	(IT_CHARPOS): Access current buffer character position of an
	iterator.
	(IT_BYTEPOS): Access current buffer byte position of an iterator.
	(IT_STRING_CHARPOS): Access current string character position of
	an iterator.
	(IT_STRING_BYTEPOS): Access current string byte position of
	an iterator.
	(globally): Add function prototypes from 20.2.97.

	* everywhere: Use P_ instead of PROTO for function prototypes
	because everyone else seems to use P_.

	* dispextern.h (struct text_pos): Structure describing a charpos/
	bytepos position in text.
	(BYTEPOS): Access the byte position part of a text_pos.
	(CHARPOS): Likewise for the character position.
	(SET_TEXT_POS): Set a text_pos from a character and byte position.
	(INC_TEXT_POS, DEC_TEXT_POS): Increment/decrement a text position.
	(SET_TEXT_POS_FROM_MARKER): Set a text_pos from a marker.
	(SET_MARKER_FROM_TEXT_POS): Set a marker from a text_pos.
	(TEXT_POS_EQUAL_P): Compare two text_pos structures for equality.
	(struct display_pos): Renamed from glyph_pos. Use struct text_pos
	for buffer and string positions.
	(struct glyph): Use text_pos.
	(struct it): Renamed from display_iterator.  Use text_pos.

1998-07-23  Gerd Moellmann  <gerd@gnu.org>

	* xfns.c (x_kill_gs_process): Get image colors from XImage of a
	pixmap.

1998-07-21  Gerd Moellmann  <gerd@gnu.org>

	* dispextern.h (struct glyph_row): New flag indicate_zv_line_p.
	* xterm.c (x_draw_row_bitmaps): Use it.
	* dispnew.c (row_equal_p): Ditto.
	(update_window_line): Ditto.

	* xfns.c (prepare_image_for_display): Don't set loading_failed_p
	flag of images.

	* dispextern.h (struct image): Removed member loading_failed_p.
	It's probably better to have the chance to try to load an image
	again.

1998-07-20  Gerd Moellmann  <gerd@gnu.org>

	* xterm.c (x_draw_bitmap): Draw bitmap for empty lines ending
	at ZV if `indicate-zv-lines' is non-nil.
	(x_draw_row_bitmaps): Compute bitmap for `indicate-zv-lines'.

	* dispnew.c (row_equal_p): Compare displays_text_p and
	ends_at_zv_p flags of rows.
	(update_window_line): Ditto.

	* buffer.h (struct buffer): New member indicate_zv_lines.

	* buffer.c (init_buffer_once): Add default for `indicate-zv-lines'.
	(init_buffer_once): New variable `default-indicate-zv-lines'.
	(syms_of_buffer): New buffer-local varianle `indicate-zv-lines'.

	* xdisp.c (redisplay_window): Don't try moving the cursor
	if current glyph row w->last_cursor.vpos isn't enabled.

	* xterm.c (bitmap_type): Add ZV_LINE_BITMAP.

	* window.c (Fset_window_vscroll): Allow only negative scroll
	values.  Others don't seem to make sense, and this way it's easy
	to restore a vscroll of zero.

	* xterm.c (x_inverted_image_mask): Check that pixmap could be
	allocated.
	(x_draw_image_glyph_string_background): Don't clip if pixmap
	could not be created.

	* xfns.c (xbm_load_image_from_file): Check that pixmap could
	be created.
	(xbm_load): Ditto.
	(gs_load): Ditto.

	* xterm.c (x_get_glyph_overhangs): Take image and stretch
	glyphs into account.

	* xfaces.c (realize_default_face): Don't set font family of
	the default face from the fontset alias name for `fontset-startup'.

	* xfns.c (gs_load): Pass frame's pixel foreground and background
	color to the Lisp loader.

1998-07-19  Gerd Moellmann  <gerd@gnu.org>

	* xfns.c (tiff_image_p, tiff_load): Support TIFF images via
	libtiff34.

	* configure.in (--with-tiff, HAVE_TIFF): Added.

	* config.in (HAVE_TIFF): Added.

	* Makefile.in (LIBTIFF): Added.

	* xfns.c (jpeg_image_p, jpeg_load): Support JPEG images.

	* Makefile.in (LIBJPEG): Added.

	* xfns.c (resource_types): Enumerators renamed to RES_TYPE_NUMBER,
	RES_TYPE_BOOLEAN etc. because of conflict of `boolean' with
	jpeglib.h.

	* configure.in (HAVE_JPEG, --with-jpeg): Added.  On systems
	where the library is installed in /usr/local/lib, e.g. FreeBSD,
	configure must be run with `--x-includes=/usr/X11R6/include:
	/usr/local/include --x-libraries=/usr/X11R6/lib:/usr/local/lib'.

1998-07-18  Gerd Moellmann  <gerd@gnu.org>

	* config.in (HAVE_JPEG): Added.

	* xfns.c (ct_init): Initialize color table used to map RGB colors
	from images to X pixel colors.
	(ct_free): Free color table.
	(ct_lookup): Look an RGB color up.
	(ct_allocated_colors): Get vector of allocated colors.
	(pbm_image_p): Test if image specification is a valid PPM
	image specification.
	(pbm_scan_number): Scan a decimal ASCII number from a file.
	(pbm_load): Load a PPM image.

	* window.c (Fset_window_vscroll): Adjust glyph matrix if
	necessary.  Take canonical character units as parameter.
	(Fwindow_vscroll): Return canonical character units.

	* dispnew.c (allocate_matrices_for_window_redisplay): Add negative
	w->dy to display height for which glyph rows must be allocated.

1998-07-17  Gerd Moellmann  <gerd@gnu.org>

	* xfaces.c (face_at_string_position): Merge in region face
	so that it won't overwrite the font in the region.
	(face_at_buffer_position): Ditto.
	(realize_basic_faces): Don't realize region face.

	* dispextern.h (enum face_id): REGION_FACE_ID removed.

	* xterm.c (x_set_glyph_string_background_width): Don't let
	cursor face extend to end of line.

	* xdisp.c (append_space): If adding space of default face,
	make sure glyph ist produced with right face.

	* xterm.c (x_clear_glyph_string_rect): Draw a rectangle in the
	background color of a glyph string.
	(x_draw_glyph_string_background): Call it.
	(x_draw_glyph_string_bg_rect): Ditto.
	(x_draw_stretch_glyph_string): Ditto.

1998-07-15  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (init_iterator): Initialize it->current_y to the
	window's vscroll w->dy.

	* window.c (Fwindow_vscroll): Return number of pixels window
	is vscrolled smoothly.
	(Fset_window_vscroll): Set the number.

	* xdisp.c (move_iterator_to): Recognize case MOVE_TO_POS and
	to_pos in truncated part of a line.

1998-07-14  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (move_iterator_in_display_line_to): If very first glyph
	doesn't fit on the line, truncate it, despite truncate_lines nil.
	(display_line): Ditto.

	* xfns.c: Experimental support for Ghostscript images.

	* xterm.c (x_term_init): Initialize new atoms DONE and PAGE.
	(XTread_socket): React on events from Ghostscript.
	(expose_frame): If width or height are zero, redraw entire frame.
	(XTread_socket): Call expose_frame after receiving event from
	Ghostscript.

	* xterm.h (struct x_display_info): Add atoms DONE and PAGE
	for Ghostscript support.

	* xdisp.c (redisplay_internal): Return quickly if called
	recursively.

	* alloc.c (NSTATICS): Increased to 1024.

1998-07-08  Gerd Moellmann  <gerd@gnu.org>

	* xterm.c (x_append_stretch_glyph): Append a stretch glyph to an
	iterator's glyph row.
	(x_produce_stretch_glyph): Call it.
	(x_produce_glyphs): Handle `space-width' property; call
	x_append_stretch_glyph.

	* xdisp.c (syms_of_xdisp): Add symbol `space-width' used as a text
	property.
	(get_iterator_space_width): Determine value of `space-width'
	property at iterator's position.
	(reseat_iterator): Call it.
	(next_element_from_string): Ditto.
	(next_element_from_buffer): Ditto.
	(init_iterator): Initialize space_width of iterator.
	(redisplay_internal): Don't goto end_of_redisplay if PT hasn't
	moved, but cursor blinks.
	(redisplay_internal): Set w->last_cursor_off_p after update.

	* dispextern.h (enum iterator_prop_idx): Add SPACE_WIDTH_PROP_IDX.
	(struct display_iterator): Add new member space_width.

	* window.h (struct window): Add last_cursor_off_p.

1998-07-07  Gerd Moellmann  <gerd@gnu.org>

	* Saved.

	* window.c (Fpos_visible_in_window_p): Case window not up to
	date---return nil if iterator hasn't reached position.

1998-07-06  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (text_outside_line_unchanged_p): Fix case that
	overlays have changed.
	(redisplay_window): Case cursor movement.  Don't try it if
	last_cursor.vpos is out of range.

	* xdisp.c (set_cursor_from_row): Set this_line_.* variables.  This
	way, the display optimization for the line containing the cursor
	is used more frequently, esp. when we have a blinking cursor.
	(display_line): Don't set this_line_.* variables.

	* xterm.c (x_redraw_cursor): Removed.
	(x_display_and_set_cursor): Set cursor type depending on
	cursor_off_p flag of window.

	* dispnew.c (redraw_cursor_hook): Removed.
	(Fblink_cursor): Additional parameter on_p to set the cursor_off_p
	member of the selected window.

	* xfaces.c (Fface_font): Added for compatibility with 20.2.

	* xterm.c (x_y_to_hpos_vpos): Return null if not over text.
	Return glyph area under x/y.
	(note_mouse_highlight): Use x_y_to_hpos_vpos in its new form.

	* keyboard.c (detect_input_pending_run_timers): Call gobble_input
	after redisplaying.

1998-07-05  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (text_outside_line_unchanged_p): Test if changes
	are all outside of a line of text.
	(redisplay_internal): Use it.

1998-06-30  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (next_element_from_buffer): After skipping over
	invisible text, look for the `glyph' property.
	(set_iterator_stop_pos): Ignore check positions in front
	of an iterator's current position.

	* xterm.c (show_mouse_face): Don't act on rows that don't exist
	anymore or which are marked as not having valid contents.

	* xfaces.c (Finternal_set_lisp_face_attribute): Don't free
	realized faces if new attribute value is equal to old value.

1998-06-29  Gerd Moellmann  <gerd@gnu.org>

	* xfaces.c (Finternal_make_lisp_face): Increment
	lface_id_to_name_size when lface_id_to_name is reallocated.

1998-06-27  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (set_iterator_stop_pos): Compute initial stop_pos
	as minimum of endpos and overlay_pos.
	(load_overlay_strings): Set next_overlay_pos of iterator to
	-1 if we don't have to check for more overlay strings.

1998-05-09  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (set_iterator_to_next_visible_line_start): Don't
	do anything if iterator is at ZV because scan_buffer doesn't
	work otherwise.

	* xterm.c (x_encode_char): Inline it.
	(x_get_char_font_and_encoding): Simplified.
	(x_per_char_metric): Inline it.

	* xterm.c (x_draw_glyph_string_relief): Use clipping.

	* xdisp.c (get_next_display_element): Check for end of relief
	face moved here from next_element_from_buffer.

	* xterm.c (x_produce_image_glyph): Add relief thickness.
	(x_produce_stretch_glyph): Ditto.

1998-05-08  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (fill_iterator_from_glyph_property): Handle glyph
	property value (space :width WIDTH :height HEIGHT :ascent ASCENT).

	* xterm.c (x_produce_stretch_glyph): Produce a stretch glyph
	from a glyph property.
	(x_produce_glyphs): Use it.

	* xdisp.c (set_iterator_to_next): Handle next_element_from_stretch.

	* xterm.c (x_produce_image_glyph): Add to current_x only if
	in text area.
	(x_produce_glyphs): Ditto.

	* xdisp.c (display_line): Compute row height from glyphs in
	marginal areas.

	* xterm.c (x_draw_image_glyph_string_background): Draw
	background of an image glyph string.
	(x_draw_glyph_string_bg_rect): Draw a rectangular region of
	the background of a glyph string.
	(x_draw_image_glyph_string_foreground): Draw the foreground of
	an image glyph string.
	(x_inverted_image_mask): Return the inverted mask of an image.

	* xfns.c (x_draw_image): Removed.

	* dispextern.h (struct image_type): Remove drawing function.

	* xfaces.c (load_face_colors): Swap colors if face is inverse.

	* xdisp.c (get_next_display_element): In marginal areas, translate
	newlines, tabs, etc. like normal control characters.

	* xfaces.c (Fface_color_supported_p): Transpose parameters frame
	and color.
	(free_realized_faces): Set frame garbaged.

	* xfaces.c (syms_of_xfaces): Add defsubr for
	internal-lisp-face-attribute-values.

1998-05-07  Gerd Moellmann  <gerd@gnu.org>

	* xterm.c (x_produce_image_glyph): Don't add glyph if area is
	full.
	(x_produce_image_glyph): Set IT->nglyphs to 1.
	(x_draw_image_glyph_string): Use inverted mask to draw background.

	* dispextern.h (struct image_type): Additional clipping rect
	parameters for drawing functions.

	* xterm.c (x_get_glyph_string_clip_rect): Get clip rect for
	a glyph string.
	(x_draw_image_glyph_string): Use it and pass the rect to the
	image drawing function.

	* xdisp.c (fill_iterator_from_glyph_property): Use position of
	first character with `glyph' property as image position.  Set
	iterator back to that position as long as the image hasn't been
	consumed with set_iterator_to_next.
	(set_cursor_from_row): Accept when glyph with given position is
	not found in the row.  Set cursor x to end of line in that case,
	so that we can hscroll.
	(redisplay_internal): Correct computation of delta by which
	positions have changed in redisplay optimization for cursor
	row of selected window.

	* xdisp.c (display_line): Remove start_pos.
	(display_line): Fix bug preventing display optimization for
	cursor line of selected window.
	(next_element_from_buffer): Avoid XSETBUFFER, use it->w->buffer
	instead.

	* dispnew.c (update_text_area): Use GLYPH_EQUAL_P.
	(update_text_area): Take glyph pixel width into account
	when trying to find a resync point.
	(row_equal_p): Compare glyphs in all areas.

1998-05-06  Gerd Moellmann  <gerd@gnu.org>

	* xterm.c (x_produce_glyphs): Don't add glyph if area is full.

	* dispextern.h (struct glyph_row): Use unsigned hash value.

	* xdisp.c (display_line): Simplified and made faster by setting
	the cursor with set_cursor_from_row.
	(set_cursor_from_row): Handle rows of desired matrix.

1998-05-05  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (set_cursor_from_row): Don't put cursor on glyphs
	with type != CHAR_GLYPH.
	(fill_iterator_from_glyph_property): Return void.  Set
	method to next_element_from_image.
	(next_element_from_image): Dummy function for delivering a
	single image id.
	(set_iterator_to_next): Add method next_element_from_image.
	(redisplay_window): When recentering, and cursor vpos is -1
	after display, assume middle of window is in first line displayed
	in window, and display again.
	(fill_iterator_from_glyph_property): Assign image glyph
	the position of the first character having the glyph property.

	* dispextern.h (IMAGE_ASCENT): Compute ascent of image.
	* xfns.c (x_draw_image): Use it.
	* xterm.c (x_produce_image_glyph): Use it.

	* xterm.c (x_produce_image_glyph): Set iterator's pixel_width.

	* Makefile.in: Extraneous #define of LIBXPM removed.

	* xterm.c (x_produce_glyphs): Produce a STRETCH_GLYPH for tabs.
	(x_fill_stretch_glyph_string): Fill a glyph string from a
	stretch glyph.
	(x_compute_glyph_string_overhangs): Compute overhangs only
	for text glyph strings.
	(x_draw_stretch_glyph_string): Draw a stretch glyph string.
	(x_draw_glyph_string): Call it.

	* dispextern.h (glyph_type): Add STRETCH_GLYPH.
	(struct glyph): Add sub-structure for stretchable glyphs.
	(GLYPH_EQUAL_P): Compare glyph type and u.val.

	* xdisp.c (get_overlay_arrow_glyph_row): Put face code into
	#ifdef HAVE_FACES.

	* xterm.c (x_produce_glyphs): Use ASCII face for spaces of a TAB.

	* xdisp.c (fill_iterator_from_glyph_property): Renamed from
	setup_iterator_from_glyph_property.  Don't do it for terminal
	frames.

	* xterm.c (x_produce_image_glyph): Produce glyph for image
	that can't be loaded.

	* xfns.c (lookup_image): If image can't be loaded, set its
	width and height so that we can draw a rectangle.
	(x_draw_image): Draw a rectangle for images that don't have
	a pixmap.
	(make_image): Set hash value.
	(image_spec_equal_p): Use image_spec_value.

	* xterm.c (expose_frame): Don't try to redraw if basic faces
	haven't benn realized yet.
	(x_draw_image_glyph_string): Fill background only if image
	is not as tall as row.

1998-05-04  Gerd Moellmann  <gerd@gnu.org>

	* Makefile.in (LIBXPM): If not already defined, define to -lXpm.
	(LIBX)[HAVE_X11]: Add LIBXPM.

	* xfns.c (xpm_image_p): Implementation of image type functions
	for XPM.
	(xpm_load): Ditto.

	* dispextern.h (struct image): Add mask pixmap for XPM.

	* xfns.c (x_draw_image): Handle images with masks.

	* configure.in: --with-xpm added.  Code detecting -lXpm added.

	* config.in: Add HAVE_XPM.

	* xfns.c (xbm_draw): Removed.
	(x_draw_image): Default implementation for drawing images.
	(xbm_keyword_index): Remove XBM_DEPTH.
	(xbm_format): Remove `:depth'.
	(xbm_image_spec_from_file): Removed to reduce consing.
	(xbm_load_image_from_file): Added for the same reason.

	* xterm.c (x_fill_image_glyph_string): Don't set ybase of
	glyph string.
	(x_draw_image_glyph_string): Pass ybase to image draw function.

	* xfns.c (make_image): Set default baseline.

	* xterm.c (x_produce_image_glyph): Compute ascent of image
	from its height and baseline percentage.

	* xfns.c (xbm_keyword_index): Add XBM_BASELINE.
	(xbm_format): Add description for `:baseline'.
	(xbm_image_spec_from_file): Add keywords from original spec to
	result.
	(xbm_load): Set baseline of image.
	(xbm_image_p): Check range for baseline.

	* dispextern.h (struct image): Add member baseline.

	* xdisp.c (dump_glyph_matrix): Handle image glyphs.

	* term.c (produce_glyphs): Change assertion to allow DISP_IMAGE.

	* xdisp.c (get_next_display_element): Do character translations
	only if delivering characters.

1998-05-03  Gerd Moellmann  <gerd@gnu.org>

	* dispextern.h (ITERATOR_AT_END_OF_LINE_P): Test for
	DISP_CHARACTER.

	* xterm.c (x_produce_image_glyph): Poduce image glyphs.
	(x_produce_glyphs): Call x_produce_glyphs for DISP_IMAGE.

1998-05-02  Gerd Moellmann  <gerd@gnu.org>

	* xfns.c (prepare_image_for_display): Set image timestamp.
	(clear_image_cache): Clear images if image's timestamp +
	Vimage_eviction_seconds is > now.
	(syms_of_xfns): New variables image-eviction-seconds, and
	image-types.
	(add_image_format): Add to image-types.
	(xbm_load): Support new image spec format.
	(x_alloc_image_color): Allocate a color for an image.

	* dispextern.h (struct image): Add timestamp.

	* xfns.c (xbm_image_p): Allow bool-vectors, vectors of strings and
	vectors of bool-vectors.
	(xbm_lisp_object_from_file): Build new format image spec.

1998-05-01  Gerd Moellmann  <gerd@gnu.org>

	* xfaces.c (init_frame_faces): Initialize image cache.
	(free_frame_faces): Free it.

	* xterm.c (x_delete_display): Don't free image cache.

	* emacs.c (main): Call init_xfns.

1998-04-30  Gerd Moellmann  <gerd@gnu.org>

	* alloc.c (mark_object): Mark objects in image cache.

	* xfns.c (x_set_internal_border_width): Correct call to
	widget_store_internal_border_width.

	* widget.c (widget_store_internal_border): Return void.

	* xfns.c (x_destroy_bitmap): Use xfree instead of free.  Return
	void.
	(init_x_parm_symbols): Return void.
	(x_report_frame_params): Ditto.
	(x_set_border_pixel): Ditto.
	(syms_of_xfns): Ditto.
	(x_destroy_all_bitmaps): Use xfree instead of free.

	* xterm.h (FRAME_X_IMAGE_CACHE): Access the image cache of a frame.

	* xterm.c (x_term_init): Initialize image_cache of display info.
	(x_delete_display): Free image cache.

	* xterm.h (struct x_display_info): Add image_cache.

	* xfns.c (make_image_cache): Allocate a new image cache.
	(free_image_cache): Free an image cache.
	(make_image): Allocate an image.
	(free_image): Free an image.

	* dispextern.h (struct image): Structure describing an image.
	(struct image_cache): Structure describing an image cache.

1998-04-29  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (check_iterator_glyph_property): Return int.  Value is
	non-zero if iterator is filled with something to return.
	(next_element_from_buffer): Immediately return if
	setup_iterator_from_glyph_prop has filled iterator with pixmap.
	(next_element_from_string): Likewise.

	* xfaces.c (load_pixmap): Allow to pass null for W_PTR and H_PTR.

	* dispextern.h (struct glyph): Add pixmap_id.
	(display_element_type): Add DISP_PIXMAP.

	* xmenu.c (popup_get_selection): Use xmalloc/xfree instead of
	malloc/free.

	* xfaces.c (clear_font_table): Free fonts not used by fontsets.
	(clear_face_cache): Call it.

	* xterm.c (x_query_font): Don't look at empty font table slots.
	(x_compute_min_glyph_bounds): Likewise.
	(x_term_init): Initialize font_table to null.
	(x_load_font): Change allocation of font_info structures so
	that it is possible to free fonts.

	* xfns.c (Fx_close_connection): Use xfree instead of free.
	Only free fonts from filled font table entries.

	* xfaces.c (best_matching_font): Support use of scalable fonts.
	(Fface_scalable_fonts_mode): Toggle use of scalable fonts.

	* xterm.h (struct x_display_info): Remove screen_dpi, add resx
	and resy.
	* xterm.c (x_term_init): Compute resx and resy.

	* xfaces.c (split_font_name): Don't reject scalable fonts.

	* xterm.c (x_list_fonts): Set code exclusing scalable fonts
	in #if 0.

	* xfaces.c (xlfd_point_size): Return 0 for fonts whose real
	point size cannot be determined.

	* xterm.h (FRAME_SMALLEST_CHAR_WIDTH): Return smallest character
	width over all fonts on a frame.
	(FRAME_SMALLEST_FONT_HEIGHT): Likewise for font height.
	* dispnew.c (adjust_frame_glyphs_for_window_redisplay): Use these
	macros.

	* xterm.c (x_font_min_bounds): Moved here from xfaces.c.
	(x_compute_min_char_bounds): Formerly min_char_bounds in xfaces.c.
	(x_load_font): Use x_compute_min_char_bounds.

	* xterm.h (struct x_display_info): New members smallest_char_width
	and smallest_font_height.

1998-04-28  Gerd Moellmann  <gerd@gnu.org>

	* dispextern.h (PREPARE_FACE_FOR_DISPLAY): Call function with
	the same name if GC of face is zero.

	* dispextern.h (struct face): Member non_ascii_gc removed.

	* xterm.c (x_get_char_font_and_encoding): Return face's font
	for characters < 0177 in default face.  Prepare face for
	display before returning it.
	(x_produce_glyphs): Use it->charset.
	(x_get_char_font_and_encoding): Simplified.
	(x_encode_char): Remove parameter `font'.

	* xfaces.c (choose_face_font): If registry from charset symbol
	doesn't contain a `-', make it a pattern by appending "*-*".

	* xdisp.c (check_iterator_glyph_property): Adjust limit for
	glyph_check_pos computation to character boundary.

1998-04-27  Gerd Moellmann  <gerd@gnu.org>

	* fontset.h (FONT_INFO_FROM_ID): Return null if ID is invalid.

	* xfaces.c (ascii_face_of_lisp_face): Get the id of the realized
	ASCII face for a given Lisp face id.

	* xdisp.c (set_iterator_stop_pos): Take glyph_check_pos into
	account.
	(reseat_iterator): Set glyph_check_pos. Handle case where
	new position is < original position.
	(check_iterator_glyph_property): Handle glyph property in strings.
	(next_element_from_string): Call above function.
	(next_element_from_display_vector): Handle faces in glyphs.
	(get_next_display_element): Set face_id of glyphs for
	control chars to zero.

	* Makefile.in (term.o): Add dependency on dispextern.h.

	* xdisp.c (syms_of_xdisp): Add symbol `glyph'.
	(display_line): Handle marginal areas.
	(move_iterator_in_display_line_to): Likewise.

	* xfaces.c (Finternal_make_lisp_face): Assign Lisp faces an id.

	* xfaces.c (face_at_buffer_position): Don't merge with nil
	text property.
	(face_at_string_position): Ditto.

	* dispextern.h (struct display_iterator): Use a stack of saved
	values instead of saving check positions etc. individually.

	* xdisp.c (set_iterator_to_next): If end of Lisp string reached,
	maybe pop the iterator's stack.
	(save_iterator_settings): Push a value on iterator's stack.
	(get_overlay_strings_at_iterator_position): Use it.
	(restore_iterator_settings): Pop the stack.
	(set_iterator_to_next_overlay_string): Use it.

	* xfaces.c (try_font_list): Use alternative font families.

1998-04-26  Gerd Moellmann  <gerd@gnu.org>

	* xfaces.c (Fset_face_font_sort_order): Set the order in which
	font selection matches fonts.
	(Fface_font_sort_order): Return the font sort order.
	(best_matching_font): Find best matching font based on sort order.
	(cmp_font_names): Sort by given sort order.

	* dispextern.h (struct display_iterator): New member faces_p.
	* xdisp.c (init_iterator): Initialize it->faces_p.
	(compute_face_at_iterator_string_position): Use it.
	(compute_face_at_iterator_position): Use it.
	(init_iterator): Use it.
	(display_mode_line): Ditto.

	* xdisp.c (get_next_display_element): Put code choosing a face
	when the charset changes in #ifdef HAVE_FACES.

	* dispextern.h (FACE_FOR_CHARSET): Replacement for function
	lookup_face_for_charset.

	* xfaces.c (free_font_names): Renamed from free_split_font_names.
	(free_all_realized_faces): Renamed from remove_all_realized_faces.

1998-04-25  Gerd Moellmann  <gerd@gnu.org>

	* xfaces.c (best_matching_font): Return the name of the best
	matching font in an array of font_name structures.
	(choose_face_font): Use it.
	(choose_face_fontset_font): Use it.
	(find_best_weight_font): If final font found has same weight as
	the font we started with, return the original font because it is a
	better match for the resolution of the display.
	(find_best_slant_font): Likewise.
	(merge_face_vector_with_property): Check more invalid attribute
	values.
	(lface_suitable_for_charset_p): Replaced by a macro with the same
	name in upper-case.

1998-04-24  Gerd Moellmann  <gerd@gnu.org>

	* dispextern.h (struct face): Member
	fontset_chosen_for_realization_p removed.

	* xfaces.c (cache_face): If face->fontset >= 0, add face to the
	end of the collision list, so that we find more specific faces
	first.
	(lookup_face_for_charset): Look up a new face if face->fontset >=
	0, and charset != CHARSET_COMPOSITION.

	* xfaces.c (split_font_name): Return zero if point size of font
	couldn't be computed.
	(realize_default_face): Use ASCII font of a fontset to determine
	font-related attributes of the default face.
	(face_fontset): Return fontset id for face family.
	(font_list): Additional parameter font_pattern.  If non-nil,
	return fonts matching that pattern.

1998-04-23  Gerd Moellmann  <gerd@gnu.org>

	* xfaces.c (choose_face_fontset): If new fontset cannot be
	constructed, or fontset name cannot be split, return the id of the
	standard fontset.

	* xterm.c (XTframe_up_to_date): Check that frame is an X frame.
	When Emacs starts, it may be called for the initial frame which
	isn't an X frame.

	* dispextern.h (struct face): New members foreground_defaulted_p,
	background_defaulted_p.
	(struct face): Members `mask' and `cache' removed.

	* xfaces.c (load_color): Set them.
	(free_face_colors): Check them.
	(xlfd_point_size): Return -1 if resolution or point size of
	font unknown.

	* xfaces.c (free_font): Removed.
	(load_face_font_or_fontset): Renamed from load_font.
	(load_face_font_or_fontset): Use message2 instead of signalling.
	(load_color): Likewise.
	(load_pixmap): Likewise.

	* xterm.h (struct x_display_info): Add screen_dpi.
	* xterm.c (x_term_init): Initialize it.
	* xfaces.c (xlfd_point_size): Use it.
	(split_font_name): Compute numeric XLFD_RESY.
	(cmp_font_names): Make fonts with an y-resolution more
	similar to that of the frame appear first in the result.

	* xfaces.c (cache_face): If fontset_chosen_for_realization_p
	is set for the face to cache, add it to the end of the collision
	list.
	(try_font_list): If fonts for given family and registry cannot
	be found, first try to keep the registry, and choose a different
	family.
	(choose_face_font): Allow nfonts == 0.
	(try_font_list): Give up if no font matches given registry.

1998-04-22  Gerd Moellmann  <gerd@gnu.org>

	* xterm.c (x_get_char_font_and_encoding): Get font_info from
	font info id of the face.

	* xfaces.c (load_font): Set font_info_id.
	(realize_face): Ditto.

	* dispextern.h (struct face): Change member font_info to
	font_info_id.

	* fontset.h (FONT_INFO_ID): Build an ID from a font_info pointer.
	(FONT_INFO_FROM_ID): Get a font_info pointer from an ID.

	* xdisp.c (extend_face_to_end_of_line): If IT's current charset
	isn't ASCII, get the ASCII face before adding a space.
	(append_space): Likewise.
	(insert_left_trunc_glyphs): Initialize truncate_it's charset
	to -1 so that it will compute the right face for the truncation
	glyphs.

	* xfaces.c (realize_face): Set
	face->fontset_chosen_for_realization_p.
	(lookup_face_for_charset): If fontset wasn't specified originally
	and new charset != CHARSET_COMPOSITION, get a new face for that
	charset.

	* dispextern.h (struct face): New member
	fontset_chosen_for_realization_p_specified_p.  Set to 1 when
	realize_face has chosen a fontset to display composite characters
	for a Lisp face not specifying a fontset.

	* xdisp.c (extend_face_to_end_of_line): Move tests for default
	face and line already filled here.  Don't do anything if current
	face hasn't a relief or has a background equal to the frame
	background.

	* xfaces.c (split_font_name): Additional parameter numeric_p.
	Don't compute numeric values if it is non-zero.
	(choose_face_fontset): Call split_font_name with numeric_p == 0.
	(choose_face_fontset): Print a message if fontset contains a
	font whose name cannot be split into fields.

1998-04-21  Gerd Moellmann  <gerd@gnu.org>

	* xfaces.c (try_font_list): Try to load a list of fonts,
	possibly using less restrictive patterns.
	(choose_face_font): Use it.

	* xterm.c (x_get_char_font_and_encoding): For charset !=
	CHARSET_ASCII use font_info of face if face hasn't a fontset set.

	* dispextern.h (struct face): New member font_info.

	* xfaces.c (load_font): Use FS_LOAD_FONT to load fonts for faces
	specifying a fontset as well as those not having a fontset.
	(free_font): Make it empty.
	(realize_face): Use changed load_font.

	* xterm.c (x_get_char_font_and_encoding): If face doesn't
	fit for charset, get the right one.

	* xfaces.c (load_font): Take frame and name parameter, return
	font.
	(free_font): Likewise.
	(split_font_name): Compute numeric values for height, swidth etc.
	(cmp_font_names): Use them.
	(find_best_width_font): Ditto.
	(find_best_height_font): Ditto.
	(find_best_weight_font): Ditto.
	(find_best_slant_font): Ditto.
	(lface_hash): Add weight, slant, swidth and relief to hash value.
	(lface_equal_p): Make it faster.
	(lface_from_symbol): Use assq_no_quit.
	(Fnote_default_face_changed): Removed.
	(cmp_font_names): Use strcmp instead of xstricmp.
	(face_charset_registries): Removed.

1998-04-20  Gerd Moellmann  <gerd@gnu.org>

	* frame.h (CHECK_FRAME): Give this macro a statement form.
	(CHECK_LIVE_FRAME): Ditto.

	* xfaces.c (find_best_width_font): Find the best matching font
	for a given width.
	(find_best_height_font): Likewise for height.
	(find_best_weight_font): Likewise for weight.
	(find_best_slant_font): Likewise for slant.
	(choose_face_font): Use them.
	(get_lface_attributes): Always return frame-local face attrs.
	(Finternal_merge_in_global_face): Merge local face with
	global face attributes.

	* xfaces.c (check_lface_attrs, check_lface): Check consistency of
	Lisp face attributes.

1998-04-19  Gerd Moellmann  <gerd@gnu.org>

	* xfaces.c (Finternal_set_lisp_face_attribute): Add :bold
	and :italic for compatibility.
	(Finternal_set_lisp_face_attribute_from_resource): Handle
	:bold and :italic.  Handle boolean resource values for
	:underline and :italic.

	* xfns.c (display_x_get_resource): Make it externally visible.

	* xfaces.c (lface_from_symbol): Take a frame as parameter.
	If that frame is non-null, return the frame-local face.
	(Finternal_make_lisp_face): Additional frame argument.
	(lface_attributes): Get face attributes from global and frame-local
	definitions.
	(Finternal_lisp_face_equal_p): Additional frame argument.
	(merge_lisp_face_vector_with_property): Ditto.
	(Frealize_basic_faces): Removed.
	(Finternal_get_lisp_face_attribute): Additional frame argument.
	(Finternal_lisp_face_p): Ditto.
	(load_color) [MSDOS]: Removed because it isn't clear how
	to do this for MS-DOS.

	* xfaces.c (lface_from_symbol): Get global face definition
	from face-global-alist.

	* xfaces.c (Finternal_set_lisp_face_attribute): Allow `t'
	as values for :underline and :inverse-video.
	(Finternal_set_lisp_face_attribute): Allow nil values.

1998-04-17  Gerd Moellmann  <gerd@gnu.org>

	* xfaces.c (Finternal_make_lisp_face): Return Lisp face vector.

	* xfaces.c (syms_of_xfaces): Add Vall_faces.
	(Finternal_make_lisp_face): Add new face to Vall_faces.

	* xdisp.c (echo_area_display): Remove code recomputing faces.
	(redisplay_internal): Ditto.
	(init_iterator): Do it here.

	* xfaces.c (choose_face_font): Check that swidth doesn't change
	for subusequent attributes.
	(xlfd_point_size): Return int.

	* xdisp.c (redisplay_internal, echo_area-display): If realized
	faces have been cleared, call recompute_basic_faces.

	* xfaces.c (recompute_basic_faces): Free realized faces.  Reset
	face_attributes_changed_p.
	(remove_all_realized_faces): Remove all realized faces on
	all frames.
	(Finternal_set_lisp_face_attribute): Call remove_all_realized_faces.

	* xdisp.c (redisplay_internal): If face attributes have been
	changed since the last redisplay, recompute basic faces.
	(echo_area_display): Ditto.

	* xfaces.c (clear_face_gcs): Renamed from clear_realized_face_cache.

	* xfaces.c (min_char_bounds): If face cache not yet present,
	don't try to get font dimensions from faces.

	* xterm.c (x_frame_mode_line_height): If face cache not present
	set, return default height.

	* alloc.c (mark_face_cache): Check for null faces.  Correct
	index bug.

	* dispextern.h (struct face): Renamed from struct rface.  Member
	underline renamed underline_p.  Make it a bit-field.

	* xfaces.c (init_frame_faces): Allocate face cache.
	(free_frame_faces): Free face cache.
	(recompute_basic_faces): Realize basic faces only if face cache is
	allocated, i.e. after init_frame_faces has been called.

	* frame.c (make_frame): Initialze face cache with null.

	* xfaces.c (same_size_fonts): Removed.

	* xterm.c (x_set_glyph_string_gc): Add post-condition
	s->gc != 0.
	(x_set_mouse_face_gc): Ditto.
	(x_set_mode_line_face_gc): Ditto.

	* xfaces.c (realize_default_face): Return int.  Value is
	zero if frame params don't contain enough information to
	realize the default face.
	(realize_basic_faces): Ditto.
	(init_frame_faces): Realize basic faces.

	* xfns.c (x_set_font): First store real font name in frame
	parameters, then call recompute_basic_faces.

	* xfaces.c (recompute_basic_faces): Call realize_basic_faces.

1998-04-16  Gerd Moellmann  <gerd@gnu.org>

	* xfaces.c (syms_of_xfaces): Correct calls to defsubr.

	* xfns.c (Fx_face_fixed_p): Removed.
	(Fx_list_fonts): Moved to xfaces.c.

	* xfaces.c (compute_face_at_buffer_pos): Renamed to
	face_at_buffer_position.  Parameter charset removed; always
	compute face for CHARSET_ASCII.
	(face_at_string_position): Renamed from
	compute_face_at_string_pos. Parameter charset removed; always
	compute for CHARSET_ASCII.
	(lookup_face_for_charset): Take frame parameter instead of
	face_cache.
	(lookup_face): Ditto.
	(compute_char_face): Renamed from compute_glyph_face.

	* xdisp.c (init_iterator): Initialize charset member.
	(reseat_iterator_to_string): Ditto.
	(get_charset_at_buffer_position): Determine charset at
	buffer position in current_buffer.
	(reseat_iterator): Call above function.
	(compute_face_at_iterator_position): Call
	compute_face_at_buffer_pos.
	(compute_face_at_iterator_string_position): Call
	compute_face_at_string_pos.
	(get_face_from_id): Removed.
	(get_face_from_cursor_pos): Call compute_face_at_buffer_pos.
	Call get_charset_at_buffer_position.
	(reseat_iterator): Determine face if charset at pos differs
	from iterator's charset.
	(reseat_iterator_to_glyph_pos): Removed.

	* xfaces.c (compute_face_at_bufpos): Remove parameter charset.
	Determine charset from buffer position.
	(compute_string_char_face): Renamed to compute_face_at_string_pos.
	(compute_face_at_bufpos): Renamed to compute_face_at_buffer_pos.

	* dispextern.h (struct display_iterator): Add member charset.

1998-04-15  Gerd Moellmann  <gerd@gnu.org>

	* xfaces.c (compute_char_face): Removed.

	* xdisp.c (get_overlay_arrow_glyph_row): Use compute_glyph_face
	with new parameter list.

	* xfaces.c (region_face): Removed.
	(allocate_face): Removed.
	(copy_face): Ditto.
	(face_eql): Removed.
	(intern_face): Removed.
	(clear_face_cache): Removed.
	(load_font): Ditto.
	(unload_font): Ditto.
	(load_color): Ditto.
	(unload_color): Ditto.
	(new_computed_face): Ditto.
	(intern_computed_face): Ditto.
	(ensure_face_ready): Ditto.
	(merge_faces): Ditto.
	(compute_base_face): Ditto.
	(merge_face_list): Ditto.
	(Fmake_face_internal): Removed.
	(Fset_face_attribute_internal): Ditto.
	(face_name_id_number): Removed.
	(Fframe_face_alist): Ditto.
	(Fset_frame_face_alist): Ditto.
	(Finternal_next_face_id): Ditto.

	* xterm.h (struct x_output): Remove computed_faces, and
	param_faces.  Remove macros accessing them.

	* xfaces.c: Entirely new face implementation added.

1998-04-11  Gerd Moellmann  <gerd@gnu.org>

	* dispextern.h (struct glyph_pos): Member `bufpos' renamed
	`charpos'.

1998-04-10  Gerd Moellmann  <gerd@gnu.org>

	* xterm.c (x_scroll_bar_move): Clear only regions not covered by
	scroll bar window to reduce flickering.  Clear entire height.

	* xdisp.c (move_iterator_vertically_backward): Set iterator's
	current_x and hpos to zero after moving to previous line
	start.

1998-04-03  Gerd Moellmann  <gerd@gnu.org>

	* frame.h (FRAME_FACE_CACHE): Access to a frame's face cache.

	* xfaces.c (xlfd_point_size): Compute relative point size of
	fonts from font and frame resolution.
	(sort_fonts): New function to sort fonts, temporarily setting
	font_frame to the frame in effect.
	(xlfd_point_size): Take additional frame parameter to be able
	to get at the display's resolution.

	* xterm.c (x_setup_relief_colors): Use WHITE_PIX_DEFAULT and
	BLACK_PIX_DEFAULT.
	(x_setup_relief_color): Use FRAME_X_SCREEN instead of default
	screen of display.

1998-03-31  Gerd Moellmann  <gerd@gnu.org>

	* xfaces.c (choose_face_fontset): Instantiate fontsets.

	* fontset.h: Add external declarations for Vfontset_alias_alist
	and Vglobal_fontset_alist.

	* xfaces.c (merge_lisp_face_vector_with_property): Simplified.
	(realize_default_face): If frame parameters contain an artificial
	font name naming a fontset, set the family of the default face to
	the fontset name given by the registry.

	* Makefile.in (alloc.o): Add dependency to dispextern.h.

1998-03-22  Gerd Moellmann  <gerd@gnu.org>

	* alloc.c (mark_object): Add function prototype.  Add cast to
	Lisp_Object pointer in call to mark_object for symbol names
	because this otherwise gives a warning from gcc 2.8.1.
	(mark_face_cache): Mark Lisp objects in realized faces.

1998-03-19  Gerd Moellmann  <gerd@gnu.org>

	* frame.h (struct frame): Add member face_cache.

	* alloc.c (mark_object): Mark face cache.
	(mark_face_cache): Mark Lisp faces in face cache of frame.

	* frame.c (make_frame): Initialize face_cache.
	(Fdelete_frame): Free it.

1998-03-18  Gerd Moellmann  <gerd@gnu.org>

	* xfaces.c: Very first skeleton of functions for face realization,
	face merging, face cache etc.

	* dispextern.h (struct rface): Realized faces.  Will replace
	struct face when tested.
	(struct face_cache): Realized face caches.

	* xdisp.c (init_iterator): Initialize area member of display
	iterator.

1998-03-17  Gerd Moellmann  <gerd@gnu.org>

	* xterm.c (x_append_glyph): Use it->area to store glyphs.

	* dispextern.h (struct display_iterator): New member area.

	* xterm.c (note_overwritten_text_cursor): Note when the text
	cursor of a window is overwritten.

	* xdisp.c (set_cursor_from_row): If PT is not found in the
	row, display the cursor at the start of the row.

	* dispnew.c (direct_output_forward_char): Call
	set_cursor_from_row.

	* xdisp.c (setup_iterator_overlay_strings_from_glyph_pos): If
	position is not in an overlay string, set iterator's position and
	method explicitly so.
	(set_cursor_from_row): Correct cursor position calculation.
	Make it externally visible.
	(redisplay_window): Call set_cursor_from_row so that there is only
	one place where the cursor position is calculated from a current
	row.

	* dispextern.h (struct display_iterator): New member
	overlay_strings_at_end_processed_p.

	* xdisp.c (check_iterator): Perform sanity checks on
	display_iterators.
	(next_element_from_buffer): Check for overlay strings at ZV.

1998-03-16  Gerd Moellmann  <gerd@gnu.org>

	* buffer.c (init_buffer_once): Add left_margin_width and
	right_margin_width to buffer_local_flags.

	* dispnew.c (margin_glyphs_to_reserve): Function computing
	number of glyphs to reserve for a marginal area.
	(adjust_glyph_matrix): Call it.
	(adjust_frame_glyphs_for_frame_redisplay): Return if frame
	is not alive.

	* window.c (Fset_window_margins): Allow floats.

	* buffer.c (syms_of_buffer): Add buffer-local variables
	left-margin-width and right-margin-width.  Add defaults
	default-left-margin-width and default-right-margin-width.

	* buffer.h (struct buffer): New members left_margin_width
	and right_margin_width.

	* window.c (Fset_window_margins): Make window the last and
	optional argument.

	* xterm.c (x_draw_glyphs): Compute x-positions for rows with
	flag no_marginal_areas_p differently.
	(x_clear_end_of_line): Ditto.
	(x_draw_glyph_string_relief): Compute width of relief differently
	for rows with flag no_marginal_areas_p.

	* dispnew.c (update_window_line): Update marginal areas only
	for rows that don't have no_marginal_areas_p set.

	* xdisp.c (display_mode_line): Set row's flag no_marginal_areas_p.
	(display_menu_bar): Ditto.

	* dispextern.h (struct glyph_row): New member no_marginal_areas_p.

	* dispnew.c (adjust_glyph_matrix): Compute glyph pointers for
	marginal areas in window-based redisplay.

	* dispextern.h (struct glyph_matrix): New members
	left_margin_glyphs and right_margin_glyphs.

1998-03-15  Gerd Moellmann  <gerd@gnu.org>

	* minibuf.c (read_minibuf_unwind): Return Lisp_Object.

	* charset.c (non_ascii_char_to_string): Use char type parameters
	because the function is used that way from outside.  Use unsigned
	char internally.

	* window.c (change_window_height): Return void.
	(make_dummy_parent): Return void.
	(init_window_once): Return void.
	(syms_of_window): Ditto.
	(keys_of_window): Ditto.
	(delete_window): Correct return with and without value.

	* buffer.c (record_buffer): Return void.

	* marker.c (unchain_marker): Return void.

	* window.c (unshow_buffer): Return void.
	(replace_window): Ditto.
	(delete_window): Ditto.

	* term.c (delete_glyphs_hook): Void return type.
	(ring_bell_hook): Ditto.
	(set_terminal_window_hook): Ditto.

	* sysdep.c (init_sigio): Return void.

	* xterm.c (x_set_window_size): Return void.
	(x_calc_absolute_position): Ditto.
	(x_set_offset): Ditto.
	(x_focus_on_frame): Ditto.
	(x_unfocus_frame): Ditto.
	(x_make_frame_visible): Ditto.
	(x_make_frame_invisible): Ditto.
	(x_iconify_frame): Ditto.
	(x_destroy_window): Ditto.
	(x_wm_set_window_state): Ditto.
	(x_wm_set_icon_pixmap): Ditto.
	(x_wm_set_icon_position): Ditto.
	(x_initialize): Ditto.
	(x_error_quitter): Ditto.
	(x_destroy_window): Use xfree instead of free.

	* keyboard.c (clear_waiting_for_input): Return void.

	* xterm.c (x_wm_set_size_hint): Return void.
	(x_raise_frame): Ditto.
	(refreshicon): Ditto.
	(x_error_catcher): Ditto.
	(x_clear_errors): Ditto.

	* keyboard.c (record_asynch_buffer_change): Return void.

	The first line of the following paragraph was garbled for an
	unknown reason.  It couldn't be fully reconstructed.

	* xterm.c (XTread_socket, XTset_terminal_window): Ditto.
	(x_lower_frame): Ditto.
	(x_scroll_bar_clear): Ditto.
	(XTflash): Add default case in switch for -Wall.
	(construct_mouse_click): Return Qnil.
	(cancel_mouse_face): Return void.
	(x_queue_event): Use xmalloc instead of malloc.
	(x_unqueue_events): Use xfree instead of free.

	* ccl.c (ccl_driver): Return int.

	* keyboard.c (stop_polling): Return void.
	(start_polling): Ditto.

	* term.c (keys): Add braces in initializer list for -Wall.

	* sysdep.c (tabs_safe_p): Return int.
	(init_baud_rate): Return void.

	* xterm.c (x_draw_bitmap): Add default case.
	(x_setup_relief_colors): Use DefaultScreen instead of
	DefaultScreenOfDisplay.
	(x_delete_glyphs): Return void.
	(construct_menu_click): Put in #if 0 because it isn't called.

	* xdisp.c (load_overlay_strings): Remove extraneous argument
	in call to qsort.
	(get_overlay_arrow_glyph_row): Add missing return value.

	* window.c (set_window_height): Return void.
	(set_window_width): Ditto.

	* sysdep.c (request_sigio): Return void.
	(unrequest_sigio): Ditto.
	(get_frame_size): Ditto.

	* scroll.c (scroll_cost): Return int.
	(do_line_insertion_deletion_costs): Return void.

	* frame.c (Fdelete_frame): Use xfree instead of free.

	* fileio.c (report_file_error): Return void.

	* dispnew.c: Make compilable with -Wall.
	* term.c: Ditto.

	* charset.h (CHAR_LEN): Moved here from dispextern.h.

1998-03-14  Gerd Moellmann  <gerd@gnu.org>

	* xterm.c (x_scroll_bar_move): Clear under scroll bar if height is
	increased.
	(x_setup_relief_color): Free color only for appropriate visual
	classes.

	* xterm.c (expose_window): Fix calculation of intersection of mode
	line rectangle with exposed rectangle.

	* xdisp.c (redisplay_window): Don't do cursor movement based
	on current matrix if w->last_point is not valid.

1998-03-09  Gerd Moellmann  <gerd@gnu.org>

	* xterm.c (expose_line): Redraw mode line and menu lines
	differently because they reach into the scroll bar area.

	* xdisp.c (redisplay_window): If redisplaying with same window
	start, don't accept cursor on partially visible line.

1998-03-08  Gerd Moellmann  <gerd@gnu.org>

	* xterm.c (x_set_glyph_string_clipping): Set clip rectangle
	for wider mode lines.
	(x_draw_glyph_string_relief): Use larger rectangle for mode lines.

	* xdisp.c (init_iterator): Increase last_visible_x by vertical
	scroll bar width for mode lines.

	* dispnew.c (allocate_matrices_for_window_redisplay): Include
	vertical scroll bar width in width calculation so that we can
	display mode lines wider.

	* xdisp.c (redisplay_window): Restore buffers before returning
	when fonts have changed.

	* dispnew.c (update_window): Mark invisible rows in the current
	matrix invalid.

	* xdisp.c (try_window_id): Force update of first row displayed
	at window end.
	(dump_glyph_matrix): Extracted from Fdump_glyph_matrix.

1998-03-05  Gerd Moellmann  <gerd@gnu.org>

	* dispextern.h (struct glyph_row): Member max_ascent renamed
	ascent.  Member max_descent replaced by height.
	(struct display_iterator): Member max_descent replaced by height.
	(MATRIX_ROW_PIXEL_HEIGHT): Removed.

	* xterm.c (x_alloc_lighter_color): Don't free colors if visual
	class makes it unnecessary or dangerous.

	* xdisp.c (redisplay_window): Case only point has changed, and
	point has moved forward.  Move forward over overlay strings.
	(display_line): Don't set cursor if first glyph from PT is part of
	a continuation line.

1998-02-21  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (start_display): When computing continuation lines
	width, add current_x to the continuation lines width because
	move_iterator_to will stop in front of the buffer position moved
	to.

1998-02-20  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (redisplay_window): Don't try try_window_id if
	windows_or_buffers_changed.

	* xterm.c (x_alloc_lighter_color): Try both factor and delta to
	determine a color.
	(x_setup_relief_color): Allocate/ change one relief.
	(x_setup_relief_colors): Call above function.

	* xterm.h (struct relief): New structure type holding relief info:
	GCs, colors, and whether colors are allocated.

	* xterm.c (x_alloc_lighter_color): If multiplying by factor
	produces the same color, try adding a delta to RGB values.
	(x_setup_relief_colors): Free color cells.

	* xterm.h (struct x_output): New members white_relief_pixel,
	black_relief_pixel holding the foreground colors allocated for
	relief GCs.  New members white_allocated_p, black_allocated_p.

	* xterm.c (x_scroll_run): Don't set updated_window to null.
	This resets updated_window when called from scrolling_window.

	* dispextern.h (scroll_run_hook): Renamed from line_dance_hook.

	* xterm.c (x_scroll_run): Additional window parameter.  Set
	and reset updated_window.

	* dispnew.c (line_dance_hook): Additional window parameter.

	* xdisp.c (try_window_reusing_current_matrix): Don't call
	update_window_begin/end here.  The end function would display the
	cursor on a wrong position and the additional functionality of
	update_window_begin is not needed anyway.  Just set
	updated_window.
	(try_window_id): Ditto.

	* dispnew.c (Fblink_cursor): Remove call to detect_input_pending.
	Don't redraw cursor during redisplay.

	* xterm.c (x_scroll_run): Renamed from do_line_dance.

	* xdisp.c (redisplay_window): For window-based redisplay, alway
	try try_window_id.

	* xterm.c (struct glyph_string): New member two_byte_p that is
	non-zero if 16-bit drawing functions must be used.
	(x_fill_composite_glyph_string): Set it.
	(x_fill_glyph_string): Set it.
	(x_draw_glyph_string_foreground): Use it.
	(x_draw_vertical_border): Make line 1 pixel less tall.
	(x_draw_row_bitmaps): Decrease width of area cleared on the left
	side by 1 pixel if window is not right-most hasn't vertical scroll
	bars.
	(x_draw_phys_cursor_glyph): Do nothing if phys_cursor.hpos is
	out of bounds.
	(x_draw_glyph_string_foreground): Use XDrawImageStringX if
	hl == DRAW_CURSOR.

	* xdisp.c (start_display): Check that window start is at line
	start if GLYPH_DEBUG != 0.

	* window.c (window_scroll_pixel_based): Move assertion to
	start_display.

1998-02-19  Gerd Moellmann  <gerd@gnu.org>

	* xterm.c (x_redraw_cursor): Don't redraw the cursor if the
	frame hasn't the focus.

	* window.c (make_window): Initialize dy.
	(replace_window): Ditto.

	* window.h (window): New member dy specifying the amount by which
	a window is scrolled "smoothly".

	* xterm.c (x_set_glyph_string_clipping): Don't use glyph string's
	y-position because it can be negative.
	(x_draw_row_bitmaps): Don't clear with negative y-position like
	above.
	(x_clear_end_of_line): Same theme as above.

	* xterm.c (x_alloc_nearest_color): Allocate a color or, if no
	exact match exists, the nearest existing color.  Patterned after
	defined_color.
	(x_alloc_lighter_color): Allocate a color that is lighter or
	darker than a given color by a specified factor.
	(x_setup_relief_colors): Set up relief line colors based on
	the background color of a glyph string face.
	(x_draw_glyph_string_relief): Call x_setup_relief_colors.

	* xfns.c (x_make_gc): Don't allocate relief GCs.
	* widget.c (create_frame_gcs): Don't allocate relief GCs.
	(setup_frame_gcs): Don't change relief GCs.

	* xterm.h (struct x_output): New member relief_background giving
	the background pixel color for which relief GCs can be used.
	Set by x_setup_relief_colors.

	* xterm.c (x_draw_glyph_string_relief): Draw relief differently
	for mode and menu lines.

	* xdisp.c (set_next_iterator_stop_pos): No longer static.

	* dispnew.c (direct_output_for_insert): Call
	set_next_iterator_stop_pos after having changed it2.endpos.

1998-02-17  Gerd Moellmann  <gerd@gnu.org>

	* dispnew.c (update_window): Work on selected_window, only.

	* xterm.c (x_erase_phys_cursor): Return quickly if physical cursor
	hpos is >= number of glyphs in the cursor row.

	* xdisp.c (try_window_id): Bug fix; update_window_end was not
	called.

1998-02-16  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (init_iterator): Increase last_visible_x for mode lines
	and menu lines.

	* dispnew.c (allocate_matrices_for_window_redisplay): Allocate
	enough glyphs to display a mode line or menu line which draws over
	flags areas.

	* xterm.c (XTset_vertical_scroll_bar): Use
	WINDOW_DISPLAY_TEXT_AREA_PIXEL_HEIGHT instead of
	VERTICAL_SCROLL_BAR_PIXEL_HEIGHT.
	(x_draw_glyphs): Draw over flags areas when drawing a mode line
	or menu.
	(x_set_glyph_string_clipping): Set clipping differently if drawing
	a mode line or menu line.

	* xterm.h (VERTICAL_SCROLL_BAR_PIXEL_HEIGHT): Removed.

	* xterm.c (expose_line): Don't draw bitmaps for mode lines and
	menu lines.
	(x_scroll_bar_create): Don't clear flags areas.
	(x_draw_row_bitmaps): Clear visible row height, only.

	* dispnew.c (Fblink_cursor): Moved here from xdisp.c.

1998-02-15  Gerd Moellmann  <gerd@gnu.org>

	* dispnew.c (direct_output_for_insert): When checking for tabs in
	the line, set it2.endpos to ZV.

	* window.h (struct window): New member cursor_off_p.
	* xterm.c (x_redraw_cursor): Implementation of redraw_cursor_hook
	for X.
	* dispnew.c (redraw_cursor_hook): If non-null, function that can
	be called to display or erase the cursor.
	* xdisp.c (Fblink_cursor): Blink the cursor of a specified window
	or selected_window.

	* xterm.h (text_cursor_kinds): Enumerators changed to uppercase.

	* dispnew.c (update_window_line): Special handling of inverse
	lines in #if 0 removed.

	* xterm.c (x_write_glyphs): Renamed from XTwrite_glyphs.
	(x_insert_glyphs): Renamed from XTinsert_glyphs.
	(x_clear_frame): Renamed from XTclear_frame.
	(x_clear_end_of_line): Renamed from XTclear_end_of_line.
	(x_ins_del_lines): Renamed from XTins_del_lines.
	(x_change_line_height): Renamed from XTchange_line_height.
	(x_delete_glyphs): Renamed from XTdelete_glyphs.
	(x_clear_cursor): Renamed from clear_cursor.
	(x_update_begin): Renamed from XTupdate_begin.
	(x_update_end): Renamed from XTupdate_end.
	(x_update_window_begin): Renamed from XTupdate_window_begin.
	(x_update_window_end): Renamed from XTupdate_window_end.
	(x_frame_mode_line_height): Renamed from XTframe_mode_line_height.
	(x_produce_glyphs): Renamed from XTproduce_glyphs.
	(x_produce_special_glyphs): Renamed from XTproduce_special_glyphs.
	(x_produce_special_glyphs): Implementation in #if 0 removed.

	* xdisp.c (Fdump_redisplay_state): Display row's fill_line_p
	flag in the dump.

	* dispnew.c (update_text_area): Handling of glyphs with pixel
	width zero removed.  Decrement desired stop pos if desired row
	fills its line.

	* xterm.c (x_fill_glyph_string): Handling of glyphs with pixel
	width zero removed.
	(BUILD_GLYPH_STRINGS): Set glyph string flag
	extends_to_end_of_line_p based on row's flag fill_line_p and face
	background and stipple.  Make sure it works for composite characters.

	* xdisp.c (extend_face_to_end_of_line): Set the glyph row flag
	fill_line_p.  For window-based redisplay, add a space only if
	the row is empty so that we know the face to draw.

	* dispextern.h (struct glyph_row): New flag fill_line_p.  Non-zero
	means draw the face of the last glyph in the text area to the
	right end of the text area.

	* xdisp.c (init_iterator): Show region in window mini-buffer
	window refers to.

	* dispextern.h (struct display_iterator): Redundant member
	region_showing_p removed.  Test for region_beg > 0 instead.

	* dispnew.c (update_text_area): Clear to end of line if cursor is
	beyond the end of the desired line.  Necessary because we don't
	have a phys_cursor_glyph with which to erase the cursor.  We don't
	have one because this method of drawing a cursor doesn't work with
	lbearing/rbearing.

	* xterm.c (XTinsert_glyphs): Block input.

1998-02-14  Gerd Moellmann  <gerd@gnu.org>

	* xterm.c (x_set_cursor_gc): Don't use cursor_gc for composite
	glyph strings.
	(x_draw_glyph_string_background): Fill background with background
	pixel for the first glyph of a composite character.

	* xdisp.c (try_window): Change return type to int.  Value is zero
	if fonts were loaded during redisplay.
	(redisplay_window): Return if fonts have been loaded during
	redisplay.
	(append_space): New parameter default_face_p.

1998-02-13  Gerd Moellmann  <gerd@gnu.org>

	* dispnew.c (adjust_glyph_matrix): In case of optimizing C-x 2,
	don't let a partially visible line in a current matrix stay
	enabled.

1998-02-09  Gerd Moellmann  <gerd@gnu.org>

	* minibuf.c (read_minibuf): Put access to minibuffer_prompt_length
	in #if PROMPT_IN_BUFFER.

	* xdisp.c (display_line): If row ends in ZV, make the space
	that is added to place the cursor on it appear in default face.

	* xterm.c (expose_area): New function redrawing a single
	glyph row area.
	(expose_line): Use it to redraw all areas of a row.

	* dispextern.h (move_operation_enum): New enum
	move_operation_enum.

	* window.c (window_scroll_pixel_based): Remove now unnecessary
	code that made sure that it->current_y doesn't become negative.

	* xdisp.c (move_iterator_in_display_line_to): New parameter
	op.  Special meaning of to_pos <= 0 and to_x < 0 removed.
	(move_iterator_to): Ditto.

	* dispextern.h (struct glyph_matrix): New member window_width.

	* dispnew.c (adjust_glyph_matrix): Set window_width.  Optimize
	case of changing window height.

	* xterm.c (x_draw_row_bitmaps): Don't clear vertical window
	border to the left.

	* dispextern.h (struct glyph_row): Remove right_to_left_p.  RMS
	says this aspect of Emacs is currently redesigned.

	* xterm.c (x_clip_to_row): Subtract 1 from clip width if we
	have to draw a vertical border.

	* window.c (window_scroll_pixel_based): When scrolling down by
	screen-fulls, make sure it.current_y doesn't get negative because
	this would confuse move_iterator_vertically.

	* xdisp.c (move_iterator_vertically_backward): Bug fix for
	the case continuation lines are involved.
	(try_window_id): Don't set the cursor into scroll margins.

1998-02-08  Gerd Moellmann  <gerd@gnu.org>

	* xterm.c (x_append_glyph): Don't compute left_overhang and
	right_overhang.
	(XTproduce_glyphs): left_overhang and right_overhang removed.
	Set it->glyph_row->contains_overlapping_glyphs_p.

	* xdisp.c (Fdump_redisplay_state): Output of glyph->left_overhang
	and right_overhang removed.

	* dispextern.h (struct glyph_row): New member
	contains_overlapping_glyphs_p used to optimize glyph drawing.
	(struct display_iterator): left_overhang and right_overhang
	removed.
	(struct glyph): Ditto.

	* xterm.c (x_draw_relief): Removed.
	(x_draw_bitmap): Renamed from draw_bitmap.
	(x_draw_glyphs): Completely new implementation of draw_glyphs
	capable of handling arbitrary lbearing and rbearing values.
	Several sub-functions not mentioned here.

1998-01-30  Gerd Moellmann  <gerd@gnu.org>

	* xterm.c (x_erase_phys_cursor): Clear area under the cursor only
	if displaying hollow box cursor.  draw_glyphs should handle
	other cases.
	(draw_glyphs): Move start to the left and end to the right if they
	overlap with previous or following characters.
	(draw_glyphs): If background is cleared for hl == DRAW_CURSOR,
	make sure XDrawString uses function GXset.  Otherwise the
	character under the cursor would be invisible.
	(x_draw_bar_cursor): Don't draw over previous character if it
	has right_overhang.

	* window.c (get_phys_cursor_glyph): Return the glyph under a
	window's physical cursor.

	* xterm.c (x_draw_hollow_cursor): Use get_phys_cursor_glyph.
	(x_draw_bar_cursor): Ditto.
	(x_erase_phys_cursor): Ditto.
	(x_phys_cursor_in_rect_p): Ditto.
	(x_display_and_set_cursor): Remove reference to w->phys_cursor_glyph.

	* window.c (make_window): Remove reference to phys_cursor_glyph.
	(replace_window): Ditto.

	* window.h (struct window): Remove phys_cursor_glyph.  There is
	now always a glyph present for placing the cursor on it in
	each glyph row, even at the end of a line.

	* xdisp.c (append_space): Function to add a space to an iterators
	glyph row.
	(display_line): Add spaces at the end of lines that are used to
	place the cursor on them.
	(compute_line_metrics): If row consists of a space only that was
	added to place the cursor on it, use that space's height as the
	line height.

1998-01-29  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (Fdump_redisplay_state): Dump left and right overhang of
	glyphs.

1998-01-28  Gerd Moellmann  <gerd@gnu.org>

	* xterm.c (x_append_glyph): Set overhang of glyph from iterator.
	(XTproduce_glyphs): Set it->left_overhang and it->right_overhang.

	* dispextern.h (struct glyph): Add left_overhang and
	right_overhang.
	(struct display_iterator): Ditto.

	* dispnew.c (direct_output_for_insert): Give up if newly inserted
	glyphs have different ascent or descent than original row.

	* xdisp.c (compute_line_metrics): Compute row->max_ascent and
	row->max_descent only if unknown.
	(display_line): Compute row->max_ascent and row->max_descent.
	(display_string): Ditto.

	* window.h (struct window): New members phys_cursor_ascent and
	phys_cursor_descent.

	* xterm.c (x_phys_cursor_in_rect_p): Use them.
	(x_draw_hollow_cursor): Ditto.
	(x_erase_phys_cursor): Ditto.
	(x_display_and_set_cursor): Set them.
	(x_append_glyph): Don't set glyph members that were removed.

	* dispextern.h (struct glyph): Members ascent, descent,
	contributes_to_line_height_p removed.

1998-01-25  Gerd Moellmann  <gerd@gnu.org>

	* dispextern.h (DEFAULT_FACE_ID, MODE_LINE_FACE_ID): Symbolic
	names for face ids of frame default face and mode line face.

	* xdisp.c (compute_face_at_iterator_string_position): If
	displaying a mode line use MODE_LINE_FACE_ID instead of
	DEFAULT_FACE_ID.

	* xdisp.c (reseat_iterator_to_string): Additional parameter start.
	(display_string): Ditto, additional parameter lisp_string.
	(display_line): Call display_string with Lisp mini-buffer prompt
	string.
	(display_menu_bar): Call display_string with Lisp string.
	(display_mode_element): Ditto.
	(next_element_from_string): Make it work for non-overlay Lisp
	strings with field width and precision.

	* minibuf.c (minibuffer-prompt-in-buffer): Bound if
	PROMPT_IN_BUFFER.

	* xfaces.c (compute_string_char_face): Fix face computation
	for overlay strings.

	* xdisp.c (struct overlay_entry): Add member after_string_p.
	(load_overlay_strings): Simplify.

	* window.c (delete_window): Defer glyph matrix adjustment.
	(Fsplit_window): Ditto.
	(change_window_height): Ditto.
	(Fset_window_configuration): Ditto.
	(Fset_window_margins): Ditto.
	* frame.c (set_menu_bar_lines): Ditto.
	(Fmake_terminal_frame): Ditto.
	* dispnew.c (change_frame_size_1): Ditto.

1998-01-24  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (move_iterator_vertically_backward): Change algorithm.

	* dispnew.c (direct_output_for_insert): Give up if start
	position has overlay strings.

	* xdisp.c (display_line): Don't set cursor if row ends in middle
	of overlay string.
	(Fdump_redisplay_state): Print complete row start and end
	position.
	(redisplay_window): Cursor movement when matrix hasn't changed---
	if PT < last_point, maybe move forward if row ends at PT and
	in middle of char.

	* minibuf.c (read_minibuf): Save the value of
	minibuffer_prompt_length in minibuf_save_list.
	(read_minibuf_unwind): Restore minibuffer_prompt_length.

	* xdisp.c (redisplay_window): Add assertion for cursor movement
	case, PT < last_point.
	(move_iterator_in_display_line_to): If to_pos specified, move
	over before-strings.

	* dispextern.h (MATRIX_ROW_STARTS_IN_MIDDLE_OF_CHAR_P): Test
	start.string_index > 0.

	* xdisp.c (redisplay_internal): Adjust glyphs if fonts_changed_p
	is set.  Retry redisplay if fonts_changed_p is set before update.

	* xterm.c (x_load_font): Set fonts_changed_p.

	* xfaces.c (Fset_face_attribute_internal): Set fonts_changed_p.

	* dispnew.c (adjust_glyphs_for_font_change): Removed.

	* xdisp.c (try_window): Check fonts_changed_p.
	(try_window_reusing_current_matrix): Ditto.
	(try_window_id): Ditto.

	* dispnew.c (adjust_glyphs_for_font_change): Set fonts_changed_p.
	(fonts_changed_p): Flag indicating a font change since the last
	glyph matrix adjustment.

	* xterm.c (x_per_char_metric): Use font->max_bounds as
	char metric of the font's default char if the default char
	hasn't per char metric itself.

	* xfaces.c (Fset_face_attribute_internal): Adjust glyphs
	for font change.
	(min_char_bounds): Check face->font != NULL.
	(font_min_bounds): Return minimum font metrics.  Capture the
	case of invalid min_bounds contents.
	(min_char_bounds): Call font_min_bounds.

1998-01-22  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (start_display): Don't set it->prompt_width if
	PROMPT_IN_BUFFER.
	(move_iterator_in_display_line_to): Ditto.
	(display_line): Don't display prompt via display_string if
	PROMPT_IN_BUFFER.

	* minibuf.c (Fminibuffer_prompt_width): Return value from
	current_buffer if PROMPT_IN_BUFFER.
	(read_minibuf): If PROMPT_IN_BUFFER, insert prompt into
	mini-buffer and make it read-only.
	(Fminibuffer_complete_and_exit): If PROMPT_IN_BUFFER, use
	minibuffer_prompt_length instead of BEGV.
	(Fminibuffer_complete_word): Ditto.
	(Fminibuffer_complete_word): Ditto.

	* insdel.c (del_range_1): If PROMPT_IN_BUFFER, and start position
	is less than mini-buffer prompt width, use prompt width as start.

	* editfns.c (make_buffer_string): If PROMPT_IN_BUFFER, and start
	position is less than mini-buffer prompt width, use the prompt
	width as start.

	* cmds.c (Fbeginning_of_line): If PROMPT_IN_BUFFER, set point to
	end of prompt if applied to a mini-buffer and BEG reached.

1998-01-21  Gerd Moellmann  <gerd@gnu.org>

	* editfns.c (make_buffer_string): If PROMPT_IN_BUFFER, add prompt
	length to start position.

	* buffer.c (Fget_buffer_create): Initialize
	minibuffer_prompt_length.
	(Fmake_indirect_buffer): Ditto.
	(Fkill_buffer): Ditto.

	* buffer.h (struct buffer): Add member minibuffer_prompt_length
	if PROMPT_IN_BUFFER.

1998-01-19  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (next_element_from_string): Make it work for arbitrary
	Lisp strings.
	(set_iterator_to_next): Advance to next overlay string only
	if it->string is an overlay string.

	* dispextern.h (struct display_iterator):
	next_ovstr_face_check_pos renamed next_string_face_check_pos.

	* xfaces.c (compute_string_char_face): Compute face for
	arbitrary Lisp string.  Renamed from compute_overlay_string_char_face.

	* xdisp.c (next_element_from_string): Renamed from
	next_element_from_overlay_string.
	(compute_face_at_iterator_string_position): Renamed from
	compute_face_at_iterator_overlay_string_position.

	* dispextern.h (struct display_iterator): Member overlay_string
	renamed string.

	* xdisp.c (next_element_from_c_string): Renamed from
	next_element_from_string.

	* dispextern.h (struct glyph_pos): Reversed meaning of
	overlay_string_index and string_index.

	* xdisp.c (next_element_from_overlay_string): Fix bug that made
	this function always return the first character of an overlay
	string.

1998-01-18  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (reseat_iterator): Set next_invisible_check_pos only if
	forced or new pos > next_invisible_check_pos.
	(redisplay_window): Don't try same window start if PT < window
	start.
	(move_iterator_vertically): Bug fix satisfying post-condition
	when ZV is reached and no newline in front.
	(move_iterator_vertically_backward): New implementation.
	(move_iterator_vertically_backward): Bug fixes.

	* xterm.c (XTmouse_position): Change call to min_char_bounds.
	* dispnew.c (adjust_frame_glyphs_for_window_redisplay): Ditto.
	(adjust_glyphs_for_font_change): Always adjust.

	* dispnew.c (struct dim): Use int.

	* xfaces.c (Fset_face_attribute_internal): Set face->font_name;
	(allocate_face): Initialize it.
	(load_font): Use XLoadQueryFont again instead of x_load_font.
	(unload_font): Use XFreeFont again.
	(min_char_bounds): Iterate over fonts of faces.  Use frame's
	font sizes as default.  Remove parameter except_last_font_p.

	* dispextern.h (struct face): Add font_name.

1998-01-17  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (move_iterator_vertically): Check post-condition.  Move
	to start of line if ending at ZV and no newline in front.
	(move_iterator_to): If to_y specified, always first move to x = 0,
	so that move stops at line start instead of line end.  This is
	probably what callers would expect to happen.

	* window.c (window_scroll_pixel_based): Pixel-based scrolling that
	can handle different line heights.
	(window_scroll_line_based): Formerly window_scroll.
	(window_scroll): Call both.

	* xdisp.c (start_display): Exclude code if PROMPT_IN_BUFFER.
	(move_iterator_in_display_line_to): Ditto.
	(display_line): Ditto.

	* minibuf.c (read_minibuf): Conditionally insert prompt into
	buffer instead of handling prompts specially.  Change other
	functions accordingly.  All such code is in #if PROMPT_IN_BUFFER.

	* dispnew.c (adjust_glyph_matrix): Optimize the handling of C-x 2,
	upper window.  Optimize calls to xrealloc if same width.

	* xdisp.c (redisplay_window): Don't use
	try_window_reusing_current_matrix if window scroll functions
	exist.

	* dispextern.h (struct display_iterator): Member
	redisplay_end_trigger_p removed.

	* dispextern.h (WINDOW_DISPLAY_PIXEL_HEIGHT_WITHOUT_MODE_LINE):
	Renamed to WINDOW_DISPLAY_TEXT_AREA_PIXEL_HEIGHT.

1998-01-16  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (move_iterator_by_lines): Optimize for truncate-lines
	nil.  Optimize truncate-lines t and moving backward.
	(move_iterator_to_previous_visible_line_start): Contains the heart
	of the previous set_iterator_to_previous_visible_line_end.  Don't
	reseat the iterator.  Used by move_iterator_by_lines.
	(set_iterator_to_previous_visible_line_start): Call function
	above.
	(move_iterator_in_display_line_to): Check TO_POS before doing
	anything else.  Otherwise to_pos == PT would move to x of PT+1.

	* indent.c (Fvertical_motion): Use display_iterator.

	* xdisp.c (move_iterator_by_lines): New function moving by screen
	lines.
	(redisplay_window): Use it.
	(move_iterator_to): Correct branch of to_vpos specified.
	(move_iterator_vertically_backward): Increment nlines after having
	backed up over some lines because the last line was not backed up
	over.
	(move_iterator_via_matrix): Look for it->pos in the matrix, and
	calculate it->vpos and it->current_y relative to this row.
	(move_iterator_via_matrix): Set in #if 0.  It doesn't seem to
	have a big effect and it is complex.
	(move_iterator_to): Call to move_iterator_via_matrix in #if 0.

1998-01-15  Gerd Moellmann  <gerd@gnu.org>

	* xterm.c (x_draw_relief): Simplify drawing and draw so that lines
	join nicely.  Lines with widths > 2 don't join nicely under X.
	* xterm.h (struct x_output): Remove member relief_gc_line_width.
	* widget.c (setup_frame_gcs): Initialize relief GC's to line
	width 1; remove references to relief_gc_line_width.
	* xfns.c (x_make_gc): Ditto.

	* xfaces.c (Fset_face_attribute_internal): Set frame garbaged
	if relief changes.
	(Fset_face_attribute_internal): Use XINT instead of XFASTINT
	to get a relief because they can be negative.

	* xterm.c (x_draw_relief): Correct line drawing positions.  Pixel
	positions are for the middle of lines under X.

	* xdisp.c (try_window_id): Always search for the cursor by setting
	w->cursor.vpos = -1.  Search in unchanged rows at the top and
	bottom if cursor not found in displayed lines.
	(display_mode_line): First extend face, then set right shadow
	flag.  Otherwise the wrong glyph gets the right shadow.

	* dispnew.c (direct_output_for_insert): Give up if line contains
	a tab.  The number of spaces inserted for a tab changes if we
	insert glyphs in front of it.

	* xterm.c (x_list_fonts): Changes undone because the Lisp
	implementation for make-face-smaller, make-face-larger, and
	make-face-fixed can do without them.

	* xfns.c (Fx_list_fonts): Original x-list-fonts from x-list-font.c
	inserted.

	* xdisp.c (try_window_id): First compute beg_unchanged, then
	compare with window start pos.

	* xfns.c (Fx_face_fixed_p): Determine whether a face has a
	fixed-width font.
	(syms_of_xfns): defsubr for x-face-fixed-p.

	* xterm.c (x_erase_phys_cursor): If row containing cursor is not
	enabled, don't do anything because this row will be newly drawn
	anyway and because we can additionally no longer determine the row
	height.

	* xdisp.c (display_line): Bug fix cursor positioning.

	* xfns.c (x-list-fonts): Copied from x-list-fonts.c; #include
	removed.  x-list-fonts.c is now obsolete.
	(Qfixed, Qvariable): Moved here from xfaces.c.

1998-01-14  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (display_line): Set row->ends_at_zv_p based on
	FETCH_BYTE for truncated lines.
	(display_line): Set cursor differently.
	(display_line): Fixed bug setting last_pos_on_this_line wrong
	for truncated lines.

	* dispnew.c (adjust_glyph_matrix): Always adjust for frame-based
	redisplay.

	* window.c (Fsplit_window): Adjust glyphs before setting buffer.

	* dispnew.c (adjust_frame_glyphs_for_window_redisplay): Add
	assertion that character dimensions are not zero.

	* xterm.c (x_load_font): adjust_glyphs_for_font_change while
	input is blocked.

	* xdisp.c (decode_mode_spec): Faster implementation of line number
	display.

	* xterm.c (x_draw_row_bitmaps): Clear flags area before drawing
	bitmaps if bitmaps don't fill the entire area.
	(draw_bitmap): Draw bitmaps horizontally centered in flags area.

	* xterm.h (FRAME_FLAGS_BITMAP_HEIGHT): Macro giving the
	pixel height of flags bitmaps.

	* frame.h (FRAME_FLAGS_AREA_COLS): Use FRAME_X_FLAGS_AREA_COLS.
	(FRAME_FLAGS_AREA_WIDTH): Ditto.

	* xterm.h (FRAME_FLAGS_BITMAP_WIDTH): Macro giving the width
	in pixels of a flags area of a frame.
	(FRAME_X_FLAGS_AREA_WIDTH): Removed.
	(FRAME_X_FLAGS_AREA_COLS): Macro giving the number of columns
	occupied by a flags area.

1998-01-13  Gerd Moellmann  <gerd@gnu.org>

	* xdisp.c (hscroll_window_tree): Remove test for non-nil
	window_end_valid.

	* dispnew.c (adjust_glyph_matrix): Check redisplay_p if
	GLYPH_DEBUG != 0.

	* xdisp.c (display_line): Correct wrong calculation of row->x for
	the case of nglyphs == 1.
	(hscroll_window_tree): Renamed from hscroll_windows.
	(hscroll_windows): New function calling hscroll_window_tree that
	clears desired matrices on a frame when hscroll has been changed.
	(redisplay_p): Global flag set during redisplay.
	(redisplay_internal): Set and clear redisplay_p.

	* xfaces.c (min_char_bounds): Add assertion that width and height
	are not zero at the end.  Initialize *height and *width to -1,
	instead of using BITS_PER_SHORT.  If font has min_bounds.width
	zero, use its max_bounds.width.

	* x-list-font.c (Fx_list_fonts): Check INTEGERP or FLOATP for
	width and height.

1998-01-12  Gerd Moellmann  <gerd@acm.org>

	* dispnew.c (adjust_glyph_matrix): Do nothing if sizes haven't
	changed.  Don't clear desired matrices.

	* xdisp.c (hscroll_windows): Compute pt after setting
	current_buffer.
	(redisplay_window): Don't do cursor movement based on current
	matrix if just_this_one_p is zero.

	* x-list-font.c (Fx_list_fonts): Additional parameter fixed.
	specifying that fixed-width, variable-width fonts or both
	should be returned.

	* xfaces.c (Qfixed, Qvariable): Symbols for use by x-list-fonts.
	(syms_of_xfaces): Initialize them.

	* xterm.c (x_list_fonts): Include auto-scaled fonts.  Extend
	cached information.

1998-01-11  Gerd Moellmann  <gerd@acm.org>

	* xdisp.c (display_mode_line): Extend face to end of line.

	* xdisp.c (echo_area_display): Don't call display_string with
	echo_area_glyphs_length == 0 which would mean infinite precision.
	(redisplay_internal): Adjust window_end_vpos if necessary.

1998-01-07  Gerd Moellmann  <gerd@acm.org>

	* xdisp.c (display_line): Set it->ends_at_zv_p differently.

1998-01-05  Gerd Moellmann  <gerd@acm.org>

	* xdisp.c (get_row_start_continuation_line_width): Removed.
	(init_iterator_to_row_start): Set it.current_x from row.
	(try_window_id): Set it.continuation_lines_width directly from
	row.

	* xdisp.c (hscroll_windows): Use w->pointm if window is not
	selected_window.
	(hscroll_windows): Center cursor in window.
	(hscroll_windows): Call move_iterator_in_display_line_to.

1998-01-04  Gerd Moellmann  <gerd@acm.org>

	* xdisp.c (hscroll_windows): Check hscroll < 0.
	(redisplay_window): Allow quick cursor movement if overlay arrow
	but frame uses window-based redisplay.
	(display_line): Take special case for nglyphs == 1 out of #if 0.
	(display_line): Set row->ends_at_zv_p after the loop displaying
	glyphs because ZV can be in truncated text.
	(hscroll_windows): Use init_iterator_to_row_start.

	* dispnew.c (scrolling_window): Calculation of overlapping
	runs fixed.
	(row_equal_p): Compare continued_p and continuation_line_p.

1998-01-02  Gerd Moellmann  <gerd@acm.org>

	* xterm.c (x_get_mode_line_face_gc): Renamed from
	x_get_modeline_face_gc.

	* xdisp.c (TEXT_PROP_DISTANCE_LIMIT): Max. distance from current
	buffer position to look for text properties.
	(get_face_from_cursor_pos): Use it.
	(compute_face_at_iterator_position): Use it.
	(next_element_from_buffer): Use it.

	* dispnew.c (scrolling_window): Decrement run's y-position
	when extending it backwards.

	* xterm.c (do_line_dance): Don't ever copy more than window height.

1998-01-01  Gerd Moellmann  <gerd@acm.org>

	* xdisp.c (redisplay_window): Cursor motion in unchanged
	matrix---use MATRIX_ROW_.*_IN_MIDDLE_OF_CHAR_P.
	(init_iterator_to_next_row_start): Special handling of lines
	ending in middle of char removed.
	(hscroll_windows): Hscroll windows only if window_end_valid is not
	nil.
	(try_window_reusing_current_matrix): Call hscroll_windows.
	(init_iterator_to_row_start): Initialize iterator for display
	starting at a position given by a glyph_row->start.
	(redisplay_window): Don't use vmotion because it gives wrong
	results if lines are continued and variable width fonts are used.

	* dispextern.h (struct glyph_pos): New member dpvec_index.
	(MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P): Test if row ends in the
	the middle of a character.
	(MATRIX_ROW_STARTS_IN_MIDDLE_OF_CHAR_P): Test if row starts in
	the middle of a character.

	* xdisp.c (set_iterator_to_next): Increment it->dpvec_index, reset
	it.
	(next_element_from_display_vector): Use it->dpvec_index.
	(reseat_iterator): Reset it.
	(init_iterator): Reset it.
	(setup_iterator_dpvec_from_glyph_pos): Set up it->dpvec and
	it->pos.dpvec_index from a glyph_pos structure.
	(init_iterator_from_glyph_pos): Call the function above.
	(reseat_iterator_to_glyph_pos): Ditto.

	* dispnew.c (direct_output_forward_char): Don't use this method at
	overlay boundaries or near invisible text.
	(direct_output_forward_char): Step through glyph row to find
	cursor position.

	* xterm.c (x_get_cursor_gc): Don't return cursor_gc for font ==
	frame font if line height differs from font height.

	* xdisp.c (set_iterator_to_next): Renamed from
	move_iterator_forward to avoid confusion with other move_.*
	functions.

	* dispextern.h (FACE_RELIEF_P): Renamed from FACE_3D_P.

1997-12-31  Gerd Moellmann  <gerd@acm.org>

	* xterm.c (x_get_cursor_gc): Renamed from x_cursor_gc to use the
	same naming convention as for other GC functions.
	(draw_glyphs): Don't fill background when drawing a cursor and
	font height is less than line height.

1997-12-30  Gerd Moellmann  <gerd@acm.org>

	* xdisp.c (init_display_iterator.*): Renamed to shorter names
	init_iterator_.*.

	* xdisp.c (move_iterator_forward): Restore it->len from
	it->dpvec_char_len if dpend reached.
	(get_next_display_element): Don't consume translated char
	prematurely.
	(display_line): Don't set this_.* variables if row is continued.
	(start_display): Move to start of continuation line if ending
	up at end of continued line.

	* dispextern.h (struct display_iterator): New member dpvec_char_len.

	* xdisp.c (move_iterator_in_display_line_to): Check TO_POS after
	checking TO_X and continuation lines.
	(get_last_unchanged_at_beg_row): If first_changed_pos is the end
	of a continued line, don't consider this line as unchanged because
	it may no longer be continued.

1997-12-29  Gerd Moellmann  <gerd@acm.org>

	* xdisp.c (try_window_id): Catch the case that moving over
	continuation lines moves first_unchanged_at_end_row to a row not
	displaying text.

	* dispextern.h (struct glyph_row): New member
	continuation_lines_width.  Member continuation_line_p removed.
	(MATRIX_ROW_CONTINUATION_LINE_P): Non-zero if row displays a
	continuation line.
	* xdisp.c (display_line): Set row->continuation_lines_width.
	(get_row_start_continuation_line_width): Set continuation lines
	width of iterator from continuation lines width of glyph row.
	(get_row_start_continuation_line_width): Make it inline.
	(set_window_cursor): Make it inline.
	(try_window_id): Use MATRIX_ROW_CONTINUATION_LINE_P.
	(Fdump_redisplay_state): Ditto.

	* dispnew.c (update_window_line): Use MATRIX_ROW_CONTINUATION_LINE_P.
	* xterm.c (x_draw_row_bitmaps): Use MATRIX_ROW_CONTINUATION_LINE_P.

	* xdisp.c (try_window_id): Set it.hpos and it.current_x to zero
	after determining the continuation lines width for
	last_unchanged_at_beg_row.

	* xterm.c (x_draw_row_bitmaps): Let overlay arrow have precedence.

	* xdisp.c (display_mode_line): Handle 3D faces only on frames
	which support faces.
	(init_display_iterator): Ditto.
	(move_iterator_via_matrix): Skip over truncation glyph at the row
	start on terminal frames.
	(hscroll_windows): Choose hscroll margin differently for window
	system and terminal frames.

1997-12-28  Gerd Moellmann  <gerd@acm.org>

	* xdisp.c (hscroll_windows): Change hscroll of windows.
	(redisplay_internal): Call it.

	* dispnew.c (direct_output_for_insert): Give up if a glyph
	doesn't fit completely on the line.
	(direct_output_forward_char): Give up for non-ASCII chars.
	(direct_output_forward_char): Set redisplay_performed_directly_p.

	* dispextern.h (struct display_iterator): Make first_visible_x
	and last_visible_x ints; this is for very long truncated lines.

	* xdisp.c (move_iterator_in_display_line_to): Separate check for
	MOVE_X_REACHED only if it->nglyphs == 0.  This fixes cursor
	positioning problems with the mouse.
	(move_iterator_in_display_line_to): Truncate lines if it->current_x
	>= it->last_visible_x instead of >.
	(display_line): Ditto.

	* xterm.c (draw_glyphs): Draw rectangles if font could not be
	loaded.
	(XTproduce_glyphs): Calculate pixel_width for composite chars and
	non-ASCII chars differently.  Always produce 1 glyph for composite
	chars.  If font not found, use CHARSET_WIDTH to calculate width of
	non-ASCII chars.
	(x_get_char_font_and_encoding): Return null if font could not be
	loaded.  Reset font to null if fontset could not be loaded.
	(draw_glyphs): Fill background if font not found.
	(draw_glyphs): Unused parameter just_foreground_p removed. New
	parameter composite_glyph.
	(draw_glyphs): Use enumeration for parameter hl.
	(draw_glyphs): Pass a display area relative x-position to
	draw_glyphs when calling it recursively for composite chars.

1997-12-27  Gerd Moellmann  <gerd@acm.org>

	* xterm.c: Patches from handa.etl.go.jp integrated.
	(draw_glyphs): Don't rely on x_get_char_font_and_encoding to
	find a font_info.

	* xdisp.c (move_iterator_in_display_line_to): Check to_x
	for nglyphs == 1.

	* xterm.c (x_draw_relief): Draw relief lines.
	(draw_glyphs): Call x_draw_relief.

1997-12-26  Gerd Moellmann  <gerd@acm.org>

	* xfns.c (x_make_gc): Create relief GC's.

	* widget.c (create_frame_gcs): Create GC's for relief drawing.
	(setup_frame_gcs): Initialize them.
	(EmacsFrameDestroy): Free them.

	* xdisp.c (try_window_id): Get continuation lines width if
	last_unchanged_at_beg_row is continued or a continuation line.
	(move_iterator_via_matrix): Don't do it for mini-buffer windows.
	(redisplay_window): Case point has changed, and it has not
	moved off the frame.  Don't increment row if PT equals the row
	end if the row ends in ZV.

	* xterm.c (x_draw_row_bitmaps): New function to draw bitmaps.
	(expose_line): Call it.
	(x_after_update_window_line): Call it.

	* xdisp.c (display_line): Reset continuation_lines_width when ZV
	reached.

	* xterm.c (x_after_update_window_line): Draw continuation line
	bitmap.

	* dispnew.c (update_window_line): Call
	after_update_window_line_hook when row's continuation_line_p
	changes.

	* xterm.c (draw_bitmap): Draw new bitmap CONTINUATION_LINE_BITMAP.

	* xdisp.c (display_line): Handle continued lines on window system
	frames differently since continuation glyphs are not displayed.
	(move_iterator_in_display_line_to): Ditto.
	(move_iterator_in_display_line_to): Take the mini-buffer prompt
	into account.
	(move_iterator_vertically_backward): Handle dy == 0 specially.
	(redisplay_window): Catch the case of small windows when
	recentering where moving back window_height/2 moves us beyond the
	top of the display area of the window.

1997-12-18  Gerd Moellmann  <gerd@acm.org>

	* xdisp.c (move_iterator_vertically_backward): Unused parameter
	dvpos removed.

1997-12-17  Gerd Moellmann  <gerd@acm.org>

	* dispnew.c (direct_output_forward_char): Correct new cursor
	x-position.

1997-12-16  Gerd Moellmann  <gerd@acm.org>

	* xterm.c (x_after_update_window_line): Remove unused parameters.
	(XTclear_end_of_line): Clear to display_height instead of
	display_height - 1.

	* dispnew.c (set_frame_matrix_frame): Make it INLINE.
	(update_window_line): Call after_update_window_line_hook if
	rows have different y-positions, or different height.

1997-12-14  Gerd Moellmann  <gerd@acm.org>

	* frame.h (FRAME_MODE_LINE_PIXEL_HEIGHT): Removed.

	* window.c (coordinates_in_window): Call frame_mode_line_height.

	* xterm.c (x_draw_3d_border): Removed.
	(x_draw_row_borders): Removed.

	* dispnew.c (update_window): References to
	FRAME_MODE_LINE_BORDER_WIDTH removed.

	* xterm.h (FRAME_MODE_LINE_BORDER_WIDTH): Removed.
	(FRAME_MODE_LINE_HEIGHT): Removed.

	* xterm.c (draw_3d_borders_p): Removed.
	(draw_glyphs): Ditto.
	(XTwrite_glyphs): Ditto.
	(expose_line): Ditto.
	(x_initialize): Ditto.

	* dispextern.h (WINDOW_DISPLAY_MODE_LINE_HEIGHT): Call
	frame_mode_line_height.

	* term.c (frame_mode_line_height): Get the pixel height of a
	frame's mode line.
	(frame_mode_line_height_hook): Hook to implement system dependent
	versions.

	* xterm.c (x_initialize): Set the hook.
	(XTframe_mode_line_height): X version of frame_mode_line_height.

	* xdisp.c (echo_area_display): Call gobble_input to flush the X
	output buffer.
	(display_string): Don't add right truncation mark if line ends in
	padding space.
	(init_display_iterator): If called with modeline_p non-zero, set
	face_id to 1, which is the id of the mode line face.

	* keyboard.c (cmd_error_internal): Write to stderr if selected
	frame is Vterminal_frame under X.  This is the case when a font
	cannot be loaded when Emacs starts.  Replace test for
	FRAME_MESSAGE_BUF with test for glyphs_initialized_p.

	* xfaces.c (compute_overlay_string_char_face): Compute the
	face of a character in an overlay string.
	* xterm.h (compute_overlay_string_char_face): Prototype.
	* xdisp.c (compute_face_at_iterator_overlay_string_position):
	Use it.

	* xdisp.c (set_iterator_to_next_overlay_string): Formerly
	set_iterator_to_next_overlay.
	(struct overlay_entry): Structure used to sort overlay strings.
	(compare_overlay_entries): Compare overlay strings.
	(load_iterator_with_overlay_strings): Load a chunk of overlay
	strings.
	(get_overlay_strings_at_iterator_position): Call it.
	(next_element_from_overlay_string): Set it->object to the overlay
	string.  Prepare for setting it->position to a string position.
	(get_overlay_strings_at_iterator_position): Renamed from
	get_overlays_at_iterator_position.
	(setup_iterator_overlay_strings_from_glyph_pos): Changed to load
	chunks of overlay strings.
	(load_overlay_strings): Renamed from load_iterator_overlay_strings.

	* dispextern.h (struct display_iterator): New vector
	overlay_strings and new member n_overlay_strings---formerly
	overlays and n_overlays.
	(struct glyph_pos): Remove after_string_p; overlay_index
	renamed to string_index.

1997-12-13  Gerd Moellmann  <gerd@acm.org>

	* xdisp.c (copy_iterator): Increment n_iterator_overlay_vectors
	when allocating a vector.
	(release_iterator): Removed.
	(restore_iterator): Removed.
	(copy_iterator): Removed.

1997-12-08  Gerd Moellmann  <gerd@acm.org>

	* xdisp.c (redisplay_window): Use make_empty_enabled_row for
	clearing a mini-buffer window that is not active.
	(redisplay_window): Do not scroll one line too early when last
	window line is completely visible.
	(init_display_iterator): Leave some room to display the cursor
	after the last glyph on a continued line.

	* xterm.h (struct x_output): trunc_area_extra renamed
	flags_areas_extra.
	(FRAME_X_FLAGS_AREA_WIDTH): Renamed from FRAME_X_TRUNC_WIDTH.

	* dispnew.c (update_window_line): Call
	after_update_window_line_hook when current row is not enabled
	which is the case after a frame has been cleared.

	* xdisp.c (display_mode_line): Reset row flags for truncation
	on right side for the mode line.

	* xterm.c (bitmap_type): Type of bitmap to display in flags
	area of frame.
	(x_after_update_window_line): Use the enum.
	(draw_bitmap): Ditto.

1997-12-07  Gerd Moellmann  <gerd@acm.org>

	* xterm.c (x_clip_to_row): Include width of both flag areas.
	(do_line_dance): Ditto.
	(expose_window_tree): Ditto.
	* dispnew.c (update_window_line): Call
	after_update_window_line_hook for right truncation and continuation.
	* xdisp.c (init_display_iterator): Don't subtract width of
	continuation glyphs for window-based redisplay.
	* xterm.c (draw_bitmap): Draw continuation bitmap.
	* widget.c (set_frame_size): Double trunc_area_extra.
	(EmacsFrameSetCharSize): Ditto.
	* xfns.c (x_figure_window_size): Ditto.
	* xterm.c (x_set_window_size): Ditto.
	(x_after_update_window_line): Draw right truncation mark.

	* xterm.c (draw_glyphs): Bug fix buffer overrun.

	* window.h: Include blocker around dispextern.h removed.

	* eval.c (Feval): Check interrupt_input_block == 0.

	* dispextern.h (struct display_iterator): Former ovstr made a
	Lisp_Object overlay_string.  New next_ovstr_face_check_pos and
	next_ovstr_invisble_check_pos; check at these positions for
	face changes and changes in invisible text property.
	(struct glyph_pos): Former ovlen now overlay_string_index.

	* xdisp.c (setup_iterator_overlays_from_glyph_pos): Set
	overlay_string.
	(set_iterator_to_next_overlay_string): Set overlay_string and
	pos.overlay_string_index.
	(get_overlays_at_iterator_position): Use overlay_string and
	overlay_string_index.
	(next_element_from_overlay_string): Use overlay_string and
	overlay_string_index.
	(move_iterator_forward): Increment overlay_string_index.
	(try_window_id): Use overlay_string and overlay_string_index.
	(move_iterator_forward): At end of dpvec, maybe use method
	next_element_from_overlay_string for the case a character from an
	overlay string was translated via a display table.
	(reseat_iterator_to_string): Take a Lisp string.
	(display_string): Pass a Lisp string to reseat_iterator_to_string.
	(compute_face_at_iterator_overlay_string_position): Compute face
	based on text properties for an overlay string.
	(next_element_from_overlay_string): Check invisible and face text
	properties.

	(set_iterator_to_next_overlay_string): Restore face id before
	overlay strings when no more overlay strings are found to return.
	Initialize next_ovstr_.*check_pos for each new overlay string

	A line in the following paragraph was garbled for an unknown
	reason.  It couldn't be fully reconstructed.

	(compute_base_face): Made public.
	(merge_face_list): Ditto.
	(intern_computed_face): Ditto.

	* xdisp.c (redisplay_window): Cursor movement in unchanged
	window if PT > w->last_point.  Goto try_to_scroll if bottom Y
	of row is > instead of >= last_y.

	* buffer.h (overlays_at): Function prototype.

	* xdisp.c (reseat_iterator_to_string): Clear iterator position.
	* dispextern.h (GET_NEXT_DISPLAY_ELEMENT): Removed.

	* xdisp.c (release_iterator): Release dynamically allocated
	memory of a display_iterator.
	(copy_iterator): Copy an iterator.
	(restore_iterator): Restore an iterator from a backup copy.
	(global): Use the functions above.
	* window.c (Fpos_visible_in_window_p): Call release_iterator.
	* dispnew.c (direct_output_for_insert): Call release_iterator.

	* dispextern.h (struct display_iterator): Allocate overlays
	vector dynamically.

1997-12-06  Gerd Moellmann  <gerd@acm.org>

	* Makefile.in (window.o): Depends on dispextern.h.

	* buffer.c (overlays_at): Make it work when extending vectors
	and an initial vector of zero size.

	* xdisp.c (set_iterator_to_previous_visible_line_end): Renamed
	from set_cursor_to_previous_visible_line_end.
	(set_iterator_to_next_visible_line_start): Renamed from
	set_cursor_to_next_visible_line_end.
	(set_next_iterator_stop_pos): Renamed from set_next_stop_pos.
	(compute_face_at_iterator_position): Renamed from
	compute_cursor_face.
	(set_iterator_to_next_overlay_string): Renamed from
	cursor_to_next_overlay_string.
	(get_overlays_at_iterator_position): Renamed from
	get_overlays_for_cursor.
	(reseat_iterator): Renamed from reseat_cursor.
	(setup_iterator_overlays_from_glyph_pos): Renamed from
	setup_overlays_from_pos.
	(init_string_iterator): Renamed from init_string_cursor.
	(get_next_display_element): Renamed from next_display_element.
	(move_iterator_forward): Renamed from advance_display_cursor.
	(get_overlays_at_iterator_position): Allocate overlays vector
	dynamically.

	* xdisp.c: display_cursor renamed display_iterator.
	* dispextern.h: Ditto.
	* dispnew.c: Ditto.

1997-12-01  Gerd Moellmann  <gerd@acm.org>

	* window.c (mark_window_cursors_off): Function comment added.
	(window_topmost_p, window_rightmost_p): Removed because not used.

1997-11-30  Gerd Moellmann  <gerd@acm.org>

	* emacs.c (main): Function prototypes removed in profiling code.
	Use safe_bcopy as start of text.

	* dispnew.c (update_frame_line): update_line -> update_frame_line;
	mirrored_make_current -> make_current.

	* xdisp.c: (store_frame_title_char): New function to store a
	single character for the frame title with re-allocation of
	frame_title_buf.
	(init_xdisp): Intialize frame_title_.* variables to null.

	* dispnew.c (quit_error_check): Removed.

	* eval.c (Fsignal): Call to quit_error_check removed.
	* keyboard.c (quit_throw_to_read_char): Ditto.

1997-11-23  Gerd Moellmann  <gerd@acm.org>

	* xfaces.c (Fset_face_attribute_internal): Allow nil relief
	to mean a zero relief.

1997-11-19  Gerd Moellmann  <gerd@acm.org>

	* dispnew.c (new_glyph_matrix): Increment glyph_matrix_count
	unconditionally.
	(glyph_matrix_count, glyph_pool_count): Define unconditionally.
	(free_glyph_matrix): Decrement glyph_matrix_count unconditionally.
	(check_glyph_memory): Define function body unconditionally.

1997-11-17  Gerd Moellmann  <gerd@acm.org>

	* dispnew.c (scrolling_window): Alternative version of this
	function removed.

1997-11-16  Gerd Moellmann  <gerd@acm.org>

	* dispnew.c (make_empty_enabled_row): Make an empty, enabled row
	of height CANON_Y_UNIT.
	* dispextern.h: Prototype for that function.
	* xdisp.c (echo_area_display): Don't use display_string to
	produce empty rows.  Use make_empty_enabled_row instead.

	* dispnew.c (scrolling_window): New version using diff-like
	algorithm activated.

1997-11-15  Gerd Moellmann  <gerd@acm.org>

	* dispnew.c (clear_current_matrices): Clear matrix of menu_bar_window
	(clear_desired_matrices): Ditto.
	(adjust_frame_glyphs_for_window_redisplay): Use FRAME_WINDOW_WIDTH
	for menu_bar_window.

	* alloc.c (mark_object): Mark menu_bar_window of frames.

	* xterm.c (XTupdate_window_end): Don't display cursor if
	pseudo_window_p.

	* dispnew.c (adjust_frame_glyphs_for_window_redisplay): Don't
	set mini_p.
	(update_window): Don't set cursor if pseudo_window_p.

	* dispextern.h (WINDOW_WANTS_MODELINE_P): Test pseudo_window_p.

	* window.h (struct window): New flag pseudo_window_p set to
	1 for windows that aren't really part of the window tree, like
	menu_bar_window's of frames.
	* window.c (make_window): Initialize it.
	(replace_window): Ditto.
	* dispnew.c (adjust_frame_glyphs_for_window_redisplay): Ditto.

	* frame.c (make_frame): Initialize menu_bar_window to nil.

	* xterm.c (XTget_display_info): FACE_SHADOW_THICKNESS renamed
	FACE_RELIEF

	* xfaces.c (copy_face): shadow_thickness -> relief.
	(face_eql): Ditto.
	(merge_faces): Ditto.
	(compute_base_face): Ditto.
	(Fset_face_attribute_internal): Ditto.
	* dispextern.h (struct face): Ditto.

	* dispnew.c (update_frame): Update menu_bar_window of the frame if
	it is non-nil.

	* xdisp.c (display_menu_bar): Display the menu bar in
	f->menu_bar_window if appropriate.
	(display_mode_line): Use MATRIX_MODE_LINE_ROW.

	* dispnew.c (adjust_frame_glyphs_for_window_redisplay): Allocate
	dummy window and window matrices for f->menu_bar_window.
	(free_glyphs): Free the dummy window and its glyph matrices.

	* frame.h (struct frame): New member menu_bar_window.

1997-11-09  Gerd Moellmann  <gerd@acm.org>

	* dispnew.c (scrolling_window): New version with diff-like
	algorithm.

	* xdisp.c (try_window_reusing_current_matrix): If new_start >
	old_start always start displaying at start of
	first_row_to_display.  The previous scheme failed if the last row
	was fully visible.

	* dispnew.c (update_window): Remove cost calculations.  Remove
	redundant preempt_count calculations.

	* xterm.c (x_clip_to_row): Set clipping for non-text rows
	differently.

	* dispnew.c (update_window): Use WINDOW_WANTS_MODELINE_P.

	* window.c (syms_of_window): Functions for marginal areas if
	WITH_MARGINAL_AREAS is defined.

	* xdisp.c (try_window_reusing_current_matrix): Trace fprintf
	removed.

	* dispnew.c (scrolling): Call line_hash_code because hash values
	are not set in the frame matrix.

	* xdisp.c (try_window_id): Fix scrolling for terminal frames.
	(redisplay_window): Check line_ins_del_ok before calling
	try_window_id.
	(try_window_reusing_current_matrix): Give up for terminal frames
	if window is not full width or we cannot insert/delete lines.
	(try_window_reusing_current_matrix): Fixed scrolling for terminal
	frames.

	* alloc.c (mark_glyph_matrix): Bug fix - pass pointer to
	Lisp_Object to mark_object.

	* xdisp.c (sync_frame_with_window_matrix_rows): Make frame and
	window rows have the same glyph pointers.
	(try_window_id): Call it.

	* alloc.c (mark_glyph_matrix): Function to mark Lisp objects in
	a glyph matrix.
	(mark_object): Call it.

	* xdisp.c (insert_left_trunc_glyphs): Use 0 object in glyphs for
	truncations.
	(display_line): Ditto.
	(display_line): Ditto for DISP_CONTINUATION.
	(display_line): Truncation on right: test current_x >
	last_visible_x.
	(skip_in_display_line_to): Ditto.
	(skip_via_matrix): Stop skipping in glyph row at face extending
	glyphs or at padding spaces.

	* dispnew.c (fill_up_glyph_row_with_spaces): Comment extended.

	* xdisp.c (display_line): Use glyph->object == 0 for padding
	glyphs.
	(redisplay_window): Don't let cursor move over padding
	spaces.

	* dispextern.h (struct glyph): Fix comment for object.

1997-11-08  Gerd Moellmann  <gerd@acm.org>

	* dispextern.h (WINDOW_WANTS_MODELINE_P): Non-zero if a window
	has a mode line.
	* xdisp.c (redisplay_window): Use it.
	(display_mode_line): Check that window wants mode line.

1997-11-03  Gerd Moellmann  <gerd@acm.org>

	* xdisp.c (display_menu_bar): Enable menu bar rows.

	* xterm.c (x_draw_hollow_cursor): X positions based on text area.
	(x_erase_phys_cursor): Ditto.
	(x_draw_bar_cursor): Ditto.

1997-11-02  Gerd Moellmann  <gerd@acm.org>

	* dispnew.c (update_marginal_area): Update a marginal area.
	(update_text_area): Update text area.
	(update_window_line): Call both.

	* xterm.c (XTclear_end_of_line): Translate coordinates area
	dependent.

	* dispnew.c (updated_area): Row area being updated in
	update_window_line.
	(update_window_line): Set it.
	(update_marginal_area): Clear to end of line if not in text area.

	* window.c (Fset_window_margins): Increment
	windows_or_buffer_changed.  Adjust glyphs.

	* dispextern.h (WINDOW_TEXT_TO_FRAME_PIXEL_X): Convert text
	area X coordinates to frame coordinates.
	(WINDOW_DISPLAY_LEFT_AREA_PIXEL_WIDTH): Width of left marginal area.
	(WINDOW_DISPLAY_RIGHT_AREA_PIXEL_WIDTH): Same for right area.
	(WINDOW_DISPLAY_TEXT_AREA_PIXEL_WIDTH): Same for text area.

	* xterm.c (draw_glyphs): Use text area width as display width.

	* xdisp.c (init_display_info): Subtract widths of marginal areas
	from last_visible_x.

	* alloc.c (mark_object): Mark objects in glyphs only if they are
	overlays.  Mark only if current_matrix != 0.  Activate the code.

	* window.c (Fset_window_margins): Set margins.
	(Fwindow_margins): Return margin area widths.
	(syms_of_window): Add defsubr's.

	* window.h (struct window): left_margin_width, right_margin_width.

	* xfns.c (x_set_trunc_area_width): Set truncation pixel width
	and cols.

	* frame.h (FRAME_TRUNC_COLS): Number of columns occupied by
	truncation/overlay arrow area.
	(struct frame): trunc_area_pixel_width, and _cols.

	* window.c (Fsplit_window): Use it.

	* window.c (Fsplit_window): Set cursor vpos to -1 after
	splitting.
	(Fsplit_window): SUbtract/add FRAME_TRUNC_WIDTH for horizontally
	split windows.

	* dispnew.c (set_window_cursor_after_update): Accept out
	of bounds cursor positions.

	* xdisp.c (redisplay_internal): Check that after cursor motion
	within line, PT is on same line.

	* dispextern.h (WINDOW_DISPLAY_PIXEL_WIDTH): Don't subtract
	FRAME_TRUNC_WIDTH.

	* xterm.h (struct x_output): trunc_area_extra.
	(CHAR_TO_PIXEL_WIDTH): Add in trunc_area_extra.
	(PIXEL_TO_CHAR_WIDTH): Subtract it.
	* widget.c (set_frame_size): Set it.
	(EmacsFrameSetCharSize): Ditto.
	* xfns.c (x_figure_window_size): Ditto.
	* xterm.c (x_set_window_size): Ditto.

	* dispnew.c (check_matrix_invariants): First try to check window
	ends (in #if 0).

	* xdisp.c (try_window_reusing_current_matrix): Try window
	redisplay with different window start.

1997-11-01  Gerd Moellmann  <gerd@acm.org>

	* window.c (make_window): Set window_end_pos/vpos.
	(Fsplit_window): Zero last_cursor, window_end_valid.
	(Fset_window_buffer): Set window_end_vpos, zero last_cursor.

	* dispnew.c (check_matrix_invariants): Check window_end_pos/vpos.

1997-10-31  Gerd Moellmann  <gerd@acm.org>

	* window.c (make_window): Initialize last_cursor.
	(replace_window): Ditto.

1997-10-29  Gerd Moellmann  <gerd@acm.org>

	* window.h: New member last_cursor.
	* dispnew.c (direct_output_for_insert): Set it.
	(direct_output_forward_char): Ditto.
	* xdisp.c (redisplay_internal): Ditto.

1997-10-28  Gerd Moellmann  <gerd@acm.org>

	* xdisp.c (redisplay_internal): Optimization 1 change partially
	reverted.  Check this again later.
	(skip_via_matrix): Remove redundent test for
	MATRIX_ROW_DISPLAYS_TEXT_P.

1997-10-27  Gerd Moellmann  <gerd@acm.org>

	* dispnew.c (update_window_line): Call
	after_update_window_line_hook only for interesting constellations.
	(free_glyph_matrix): Fix memory leak.

	* window.h: Include blocker WINDOW_H_INCLUDED, include
	dispextern.h.
	(struct window): phys_cursor_glyph as struct glyph.  * window.c
	(make_window): Initialize it.
	(replace_window): Ditto.
	* dispnew.c (free_window_matrices): Remove freeing of
	phys_cursor_glyph.
	(check_matrix_invariants): Renamed from check_current_matrix_...
	* xterm.c: All references to phys_cursor_glyph changed.

	* dispextern.h (DISPEXTERN_H_INCLUDED: New include blocker.

	* xfaces.c: Comment update.

	* window.h (struct window): Make phys_cursor_glyph a struct glyph
	pointer. Remove phys_cursor_ascent, descent, etc.
	* dispnew.c (free_window_matrices): Free it.
	* window.c (make_window): Allocate it.
	(replace_window): Ditto.
	* xterm.c (x_draw_phys_cursor_glyph): Draw it.
	(x_display_and_set_cursor): Fill it.
	(x_phys_cursor_in_rect_p): Use it.
	(x_draw_hollow_cursor): Ditto.
	(x_draw_bar_cursor): Ditto.
	(x_erase_phys_cursor): Ditto.

	* xdisp.c (skip_in_display_line_to): Use SET_INFO_FROM_CURSOR.

	* xterm.c (XTget_display_info): Handle 3D facess.
	(draw_glyphs): Ditto.

	* xdisp.c (Fdump_redisplay_state): Change interactive spec to "p".

	* xfaces.c (Fset_face_attribute_internal): New face attribute
	shadow-thickness.
	(copy_face): Handle shadow_thickness.
	(face_eql): Ditto.
	(merge_faces): Ditto.
	(compute_base_face): Ditto.

	* dispextern.h (struct display_cursor): New member start_of_3d_run_p.
	(struct display_info): Ditto.
	(SET_INFO_FROM_CURSOR): Transfer it to display_info.
	* xdisp.c (compute_cursor_face): Set it.
	(advance_display_cursor): Clear it.

	* xdisp.c (init_string_cursor): Initialize face_id to -1.
	(init_string_cursor): Init face_id to zero.

	* dispextern.h (struct face): New member shadow_thickness.

	* xdisp.c (compute_cursor_face): Set limit for text property
	search to 100.

	* dispnew.c (update_window_line): Try to resynch with current line
	to prevent mode line flickering.

1997-10-26  Gerd Moellmann  <gerd@acm.org>

	* dispnew.c (set_window_cursor_after_update): React again
	on cursor_in_echo_area >= 0.

	* xdisp.c (echo_area_display): Clear desired matrix before
	displaying into it.
	(display_menu_bar): Clear glyph row instead of hoping it is not
	enabled.  This is safer.

	* dispnew.c (check_current_matrix_invariants): Check only
	visible rows.

	* xdisp.c (try_window_id): Handle window end setting in case of
	display to end of window, but only non-text lines displayed.

	* dispnew.c (check_current_matrix_invariants): Check nrows for zero.
	(check_current_matrix_invariants): Check used counts.

	* Revisiob v114.

	* dispnew.c (scrolling): Use hash codes from rows.

	* xdisp.c (Fdump_redisplay_state): Dump current matrix.

	* dispnew.c (scrolling_window): Invalidate conflicting runs.

1997-10-25  Gerd Moellmann  <gerd@acm.org>

	* dispextern.h (struct glyph_matrix): Flag no_scrolling_p.
	* dispnew.c (update_window): Use it.
	(clear_glyph_matrix): Clear it.
	* xdisp.c (try_window_id): Set it.

	* dispextern.h (struct glyph_row): New flag ends_at_zv_p.

	* xdisp.c (redisplay_internal): Increment glyph positions differently.

	* dispextern.h: More comments etc.

1997-10-24  Gerd Moellmann  <gerd@acm.org>

	* dispnew.c (set_window_cursor_after_update): Set cursor
	for cursor_in_echo_area == 0 to (0, 0).

	* dispextern.h (struct glyph_row): New flags continuation_line_p
	and displays_text_p.
	(MATRIX_ROW_DISPLAYS_TEXT_P): Use displays_text_p.
	* xdisp.c (display_line): Set them.
	(try_window_id): Move to start of continuation line to find out
	continuation_line_width.
	(first_unchanged_current_row): Don't retract row if continued,
	truncated etc.

	* xterm.c: Map X coordinates.

1997-10-23  Gerd Moellmann  <gerd@acm.org>

	* dispnew.c (buffer_posn_from_coords): Translate X for right to
	left text.

	* xdisp.c (display_line): Set right_to_left_p after clearing the row.

	* xterm.c (XTclear_end_of_line): Respect right_to_left_p.

	* xdisp.c (try_window_id): Clear desired matrix if not successul.

	* xdisp.c (try_window_id): Call update_window_begin_hook/end_hook.

	* dispnew.c (update_window_begin_hook, update_winodw_end_hook):
	Set this to functions to be called before/after window updates.
	(direct_output_for_insert): Call them.
	(update_window): Ditto.
	(update_frame): Call update_begin/ update_end for windows.

	* xterm.c (XTupdate_window_begin): Called before window updates.
	(XTupdate_end): Called after window updates.
	(x_initialize): Set hooks to above.

	* xdisp.c (init_display_info): Initialize c and len of
	display_info.

	* xterm.c (x_get_char_font_and_encoding): Bug fix.  Don't load
	fonts more than once.

1997-10-22  Gerd Moellmann  <gerd@acm.org>

	* xdisp.c (display_line): Handle most common case of current_x <
	last_visible_x separately.

	* dispextern.h (display_element_type): DISP_ELLIPSIS removed.

	* dispnew.c (update_window_line): Compare pixel widths of glyphs
	so that face extending space doesn't compare equal to normal space
	with same face.

	* xdisp.c (display_line): Make sure we have a position for
	a line end in an otherwise blank line if face is extended.

	* dispnew.c (direct_output_for_insert): Increment row end position.

	* window.c (Fpos_visible_in_window_p): Use old meaning of
	window_end_pos.

	* xdisp.c (init_display_cursor_from_glyph_pos): New.

	* dispextern.h (MATRIX_ROW_FIRST_POS): Use row start.

	* dispnew.c (increment_glyph_row_buffer_positions): Adjust
	start and end positions in rows.
	(increment_glyph_row_buffer_positions): Stop adjusting at
	glyphs with positions <= 0.

	* dispextern.h (struct glyph_pos): Structure desribing a text
	position including position in overlay.
	(struct glyph_row): Use it for start and end positions.
	(struct display_cursor): Use it.
	* xdisp.c: Use it.
	(display_line): Set row start and end positions.

	* dispnew.c (copy_row_except_pointers): Use bcopy and struct
	assignment.

1997-10-21  Gerd Moellmann  <gerd@acm.org>

	* dispnew.c (update_window): Add scrolling_window again.  It's
	necessary for scroll_step != 0.

	* xdisp.c (redisplay_window): Use vmotion for scroll_step
	scrolling.

	* xdisp.c (last_unchanged_current_row): Use window_end_vpos.

	* xterm.c (XTupdate_end): Flush only for messages.

	* xdisp.c (try_window_id): Assert last_unchanged_row >=
	first_unchanged_row.

	* xterm.c (XTupdate_end): Flush if miniwindow.

	* dispnew.c (matrix_row_last_pos): New function.
	* dispextern.h (MATRIX_ROW_LAST_POS): Call it.
	Large comment moved to xdisp.c.

	* xdisp.c (redisplay_window): Bug fix: PT set to value > Z.
	(skip_via_matrix): Check window_end_valid instead of
	display_completed.

	* dispnew.c (scroll_glyph_matrix_range): Bug fix.
	(update_window): scrolling_window commented out.  It has negative
	effect most of the time.

	* xdisp.c (try_window_id): Correct parameters to
	scroll_glyph_matrix_range.

	* xterm.c (XTupdate_end): XFlush commented out.

	* window.h: Comments for window_end_pos/vpos.

	* xdisp.c (skip_to): Assert current_buffer is the buffer
	of the window in which we are skipping.

	* dispnew.c (update_window_line): Optimized clear_end_of_line.

	* xterm.c (draw_glyphs): Bug fix.  Return window relative X
	reached.

1997-10-20  Gerd Moellmann  <gerd@acm.org>

	* dispextern.h (MATRIX_ROW_LAST_POS): Go back one glyph if this is
	a face extending glyph.

	* xdisp.c (try_window_id): Check if point will appear.
	(set_cursor_from_row): Set cursor position from a glyph row.

	* dispnew.c (update_window_line): Write entire line if hash
	codes of lines differ.

	* dispextern.h (MATRIX_ROW_EXTENDS_FACE_P): Value is non-zero
	if glyph row has an infinite width glyph at its end.

	* xdisp.c (last_unchanged_current_row): Respect partially visible
	lines when looking for the last row displaying text.
	(try_window_id): Handle partially visible lines better.

1997-10-19  Gerd Moellmann  <gerd@acm.org>

	* dispnew.c (update_window): Remove unused variable.
	(update_window_line): Simplified.

	* xterm.c (x_get_char_font_and_encoding): Handle most common
	case at the beginning.

	* xdisp.c (advance_display_cursor): Dispatch on method and
	order if statements by expected call frequency.  Fixed unclosed
	comment.

	* xdisp.c (try_window_id): New implementation.

	* dispnew.c (increment_glyph_row_buffer_positions): Capture
	rows displaying a line end, only.

1997-10-18  Gerd Moellmann  <gerd@acm.org>

	* window.c (Fpos_visible_in_window_p): Remove use of window_end_vpos.

1997-10-14  Gerd Moellmann  <gerd@acm.org>

	* xdisp.c (display_line): Mark empty lines not corresponding to
	text with position -1.

	* xterm.c (x_erase_phys_cursor): Don't bother to erase cursor if
	not within window matrix bounds.

	* dispextern.h (struct display_cursor): New member REGION_SHOWING_P.
	(struct display_info): NGLYPHS_TO_IGNORE removed.
	* xdisp.c: References to NGLYPHS_TO_IGNORE removed.
	* term.c: Ditto.
	* xterm.c: Ditto.

	* xdisp.c (init_display_cursor): Set it.
	(display_line): Use it to set W->REGION_SHOWING.

	* xdisp.c (skip_via_matrix): Check for overlay arrow.

	* region-cache.h: functino prototypes with PROTO.

	* dispnew.c (buffer_posn_from_coords): Use -1 as skip position.

	* xdisp.c (skip_via_matrix): Check for rows that don't contain
	a position.

	* xterm.c (XTmouse_position): Calculate LAST_MOUSE_GLYPH
	rectangle based on minimum character bounds.

	* keyboard.c (make_lispy_event): Mouse clicks; don't do frame
	glyph position calculations.
	(make_lispy_movement): Use buffer_posn_from_coords and window
	relative coordinates.

	* xterm.c (construct_mouse_click): Remove #if 0 case.

	* dispextern.h (MATRIX_ROW_BOTTOM_Y): Return bottom pixel y of
	given row.

	* xdisp.c (skip_via_matrix): Skip using current matrix if up to
	date.
	(skip_to): Use it.
	(redisplay_window): Remove code skipping using current matrix.

1997-10-13  Gerd Moellmann  <gerd@acm.org>

	* xdisp.c (redisplay_window): Use available current matrix to
	skip faster when only point is moved withing the window.

	* intervals.c: Include stdio.h.
	(find_interval): Trace to stderr to catch some nasty error
	that did not yet occur again with tracing.
	(set_point): Ditto.

	* dispnew.c (shift_glyph_matrix): Experimental code for handling
	cursor positioning on partially visible lines.
	(set_window_cursor_after_update): Ditto.

	* dispextern.h (MATRIX_ROW_PARTIALLY_VISIBLE_P): Bug fix.

	* window.h (struct window): start_y removed.

	* window.c (make_window): start_y removed.
	(replace_window): Ditto.

	* xdisp.c (last_max_ascent, last_max_descent):  Ascent and
	descent values of the last line processed by skip_to.
	(redisplay_window): Use them.
	(skip_to): Set them.

	* dispextern.h (struct display_cursor): New member METHOD.

	* xdisp.c: Use function member METHOD.

	* xdisp.c (set_next_stop_pos): Determine next position at which to
	check for face properties, invisible text properties, and overlays.
	(compute_cursor_face): Use it.
	(get_overlays_for_cursor): Ditto.
	(reseat_cursor): Ditto.
	(next_display_element): Ditto.

Sun Aug 24 08:50:52 1997  Gerd Moellmann  <gerd@acm.org>

	* termhooks.h: Some hooks with prototypes.

	* term.c: Some hooks with function prototypes.

	* xdisp.c (reseat_cursor):  Additional argument force_p.  Avoid
	computing face if possible.

	* xdisp.c (next_display_element):  Use face from glyph from display
	table only if != 0.

	* emacs.c: FreeBSD headers for profiling removed.

	* dispnew.c (direct_output_for_insert): Don't use PT-1 for
	display cursor, use DEC_POS instread.

	* xfaces.c (load_font): Use x_load_font to load fonts so that
	all fonts are in the font table.
	(unload_font): Don't XFreeFont.

	* dispnew.c (row_equal_p): Compare ascent, descent and visible
	row height.

	* xterm.c (draw_glyphs): Use 8-bit functions if possible.
	(x_erase_phys_cursor): Clear only visible part of row.
	(x_draw_bar_cursor): Set clipping.
	(x_draw_hollow_cursor): Ditto.
	(x_display_and_set_cursor): Remove clipping.
	(expose_window_tree): Take trunc border into account.
	(x_phys_cursor_in_rect_p): Test if phys_cursor intersects a rect.
	(expose_window): Use it.

	* xdisp.c (display_string): Catch case that we are called with
	current_x already beyond max_x.
	(global): Fix usage of FRAME_WINDOW_P <-> FRAME_WINDOW_REDISPLAY_P.
	(init_display_info): Subtract vertical border glyph from
	last_visible_x.

	* scroll.c (scrolling_window_1): Removed.

	* dispnew.c (adjust_frame_glyphs): Split into two functions,
	based on redisplay method used.
	(adjust_frame_glyphs_for_frame_redisplay): Part for frame
	based redisplay.
	(adjust_frame_glyphs_for_window_redisplay): Part for purely
	window based redisplay.

	* frame.h (FRAME_WINDOW_REDISPLAY_P): Changed to not depend
	on data structures.

	* dispnew.c (adjust_glyph_matrix): Additional parameter W.
	Handle own storage for purely window based redisplay.
	(allocate_matrices_for_frame_redisplay): Formerly part of
	allocate_matrices.
	(allocate_matrices_for_window_redisplay): Ditto.

	* dispextern.h (struct glyph_matrix): window_top_y,
	window_height.

	* dispnew.c (allocate_matrices_for_window_redisplay): Detect
	and optimize some common cases of window changes.

	* emacs.c (main): Remove own profiling code because 0.95 now
	has it in.

Fri Aug 22 18:46:43 1997  Gerd Moellmann  <gerd@acm.org>

	* xterm.c (XTupdate_end): Draw horizontal border at right position.
	(expose_window): Draw vertical border.
	(XTclear_end_of_line): Accept width <= 0 and height <= 0 but
	don't do anything.

	* xdisp.c (redisplay_internal): Set update_mode_line if paused
	for non full width windows only if not window redisplay.

	* dispnew.c (update_window_tree): Or paused_p return of called
	functions.

	* xterm.c (x_display_and_set_cursor): Return if hpos/vpos outside
	of window.

	* window.c (Fset_window_configuration): adjust_glyphs being
	called twice.
	(Fset_window_configuration): Set frame garbaged if not all
	leaf windows reused.

1997-08-21  Gerd Moellmann  <gerd@acm.org>

	* dispnew.c (clear_glyph_matrix): Additional argument specifiying
	that rows should really be cleared.  Used for current matrices.

	* dispnew.c (scrolling_window):  Bug fix.
	(line_dance_hook):  Formerly line_dance_fn, take only one parameter.

	* dispextern.h (struct run): Remove current_vpos.

	* xterm.c (do_line_dance): Only one parameter.

	* xdisp.c (display_line): Set continued_p.

	* dispextern.h (struct glyph_row): New flag continued_p.
	Fix truncated_on_left_p and truncated_on_right_p to be bits.
	(struct glyph_row):

Thu Aug 21 14:37:34 1997  Gerd Moellmann  <gerd@acm.org>

	* xdisp.c (skip_vertically_backward): Avoid negative vpos values
	when calling skip_to for continued lines.

	* dispnew.c (change_frame_size_1): Set frame garbaged.

	* xterm.c (expose_window): Check enabled_p of rows.

	* xdisp.c (redisplay_internal): Compare line heights before and
	now for redisplay optimization 2 (hit).
	(display_line): Set this_line_pixel_height.

	* xterm.c (x_draw_row_borders): Use FRAME_MODE_LINE_HEIGHT height
	value.
	(x_clip_to_row): Use MATRIX_ROW_VISIBLE_HEIGHT. Simplified.
	(do_line_dance): Simplified and pixel corrected.

	* dispnew.c (scrolling_window): Simplified.

	* xterm.c (x_draw_3d_border): Inset rectangle by line width.

	* dispnew.c (update_window): Add FRAME_MODE_LINE_BORDER_WIDTH
	to mode line row->x.

Wed Aug 20 11:23:28 1997  Gerd Moellmann  <gerd@acm.org>

	* xterm.c (x_get_char_font_and_encoding): Don't let fontset
	override font of face.
	(draw_glyphs): Correct return value.
	(XTclear_end_of_line): Compare differently with output cursor
	position.
	(x_draw_hollow_cursor): 2 parameters, window and row.

	* dispnew.c (update_window_line): If rows have different height
	or y, write entire line.

	* xdisp.c (compute_line_metrics): Reset max_ascent and max_descent
	of info struct.

	* xfaces.c (Fset_face_attribute_internal): Don't call
	frame_update_line_height.
	(merge_faces): Don't use default font if new font has different
	size.

Tue Aug 19 14:38:05 1997  Gerd Moellmann  <gerd@acm.org>

	* xterm.c (x_display_and_set_cursor): Use FONT_WIDTH if width
	unknown.  Some fonts have min_width zero.
	(draw_glyphs): Don't draw underlines to the end of the display
	line if face is merely extended to that point.
	(draw_glyphs): Don't assume background is filled if
	just_foreground_p but extending to end of line.

	* xterm.c (XTclear_end_of_line): Clip only to display_height - 1
	for partially visible last lines.
	(x_clip_to_row): Ditto.
	(x_clip_to_row): Clip to display_height-1 if y + line_height >
	display_height since line_height is really a line distance.
	(x_display_and_set_cursor): If cursor on padding glyph, use
	min_bounds pixel width.

Mon Aug 18 09:39:18 1997  Gerd Moellmann  <gerd@acm.org>

	* xterm.c (x_clip_to_row):  Height value was 1 too large.
	(XTclear_end_of_line):  Clip to display area.

	* xfns.c (x_figure_window_sizes):  Add trunc border width
	to frame pixel width.

	* xdisp.c (next_display_element): Don't display overlay strings
	within invisible text.
	(skip_vertically_backward):  Skip display lines.

Sat Aug 16 13:13:32 1997  Gerd Moellmann  <gerd@acm.org>

	* xdisp.c (x_consider_frame_titie): Don't pad with blanks.

	* xdisp.c (next_display_element):  Next invisible
	text check position computed differently.

	* dispextern.h (struct display_cursor): last_invisible_text_pos
	and display_ellipsis_for_invisible_p removed.

	* xdisp.c (next_display_element):  Set last_invisible_text_pos
	to the last position at which invisible text was found.  Don't
	decrement cursor.pos for newlines and cr with ellipsis.  Set
	dpvec for `...' due to invisible text directly.
	(redisplay_internal):  Don't assert that cursor is at PT after
	skip_to.  It may be in invisible text.

	* keyboard.c (make_lispy_event): For mouse clicks, use
	x_y_to_hpos_vpos.

	* xdisp.c (next_display_element):  Call get_overlays_for_cursor when
	next_overlay_pos is reached.  Use limit cursor.pos + 100 when
	checking for invisible text.

	* xterm.h (WINDOW_COL_PIXEL_X etc.) Removed.

	* dispextern.h (WINDOW_TO_FRAME_HPOS/VPOS): Moved to dispnew.c

	* xfns.c (x_contour_region):  Use pixel coordinates from window
	cursor instead of WINDOW_TO_FRAME_H/VPOS.

	* dispextern.h (FRAME_TO_WINDOW_HPOS, FRAME_TO_WINDOW_VPOS):
	Removed.

	* dispnew.c (frame_to_window_hpos, frame_to_window_vpos): Removed.

	* xterm.c (x_y_to_hpos_vpos):  Get hpos/vpos from window relative
	pixel coordinates.
	(note_mouse_highlight): Use it.

	* xdisp.c (echo_area_display):  Ignore calls for terminal frames
	under a window system.

	* dispnew.c (adjust_frame_glyphs): Call redraw_frame if
	necessary.
	(update_window_line): Add width of face padding glyph to
	displayed widths of rows.

	* xterm.c (x_display_and_set_cursor):  Set clipping after
	erasing cursor.

	* window.c (Fset_window_configuration): Free only those
	window matrices not reused.
	(get_leaf_windows): Build vector of leaf windows.
	Corrupted archive restored from v77.

	* xdisp.c (display_string): Stop at >= last_visible_x if truncating
	like display_line does.

	* xdisp.c (display_mode_line): Don't hscroll mode line.

	* xterm.c (draw_glyphs): Wrong run_width computed for horiz. split
	windows.
	(x_scroll_bar_create): #3039 Clear area below scroll bar to remove
	garbage between mode lines when splitting windows horiz.

	* dispnew.c (direct_output_for_insert): Bug fix.

	* dispextern.h (struct display_cursor): New member string_length.

	* xdisp.c (next_display_element): Return padding spaces.
	(init_string_cursor): Take precision and field_width
	(display_string): Use string cursor, skip over invisible text.

Thu Aug 14 10:41:41 1997  Gerd Moellmann  <gerd@acm.org>

	* xterm.c (x_clip_to_row): Clip to partially visible lines.
	(x_display_and_set_cursor): Call it.
	(draw_glyphs): Call it
	(draw_bitmap): Call it.

	* dispnew.c (adjust_frame_glyphs): Optimize frame garbaging.
	(allocate_leaf_matrix): Return flags.
	(row_equal_p): Compare enabled_p.

	* xterm.c (x_erase_phys_cursor):  Set phys_cursor_on_p to 0
	for type == -1.

	* xterm.c (x_display_and_set_cursor): Bar cursor 1 pixel taller.
	(draw_glyphs):  Clip height one pixel taller.

	* dispnew.c (direct_output_for_insert): Give up for hscrolled
	mini window.

	* xdisp.c (display_line): Don't scroll mini prompt.

	* xdisp.c (echo_area_display): Call update_single_window if
	possible.

	* dispnew.c (update_window_line):  Call scrolling_window.
	(scrolling_window): Work on enabled desired lines only.
	(update_single_window): Update a single window like update_frame
	does for all windows.
	(update_window, update_window_tree): Additional argument
	no_scrolling_p.
	(update_frame): Pass no_scrolling_p to update_window_tree.
	(update_window): Don't call scrolling_window if no_scrolling_p.

	* xterm.c (x_erase_phys_cursor): Do nothing if type == -1.
	Erase under hollow cursor.
	(x_display_and_set_cursor): Do nothing if cursor glyph row
	not enabled.  Draw bar cursor 1 pixel smaller.

	* dispnew.c (adjust_frame_glyphs): Don't set frame garbaged
	since update will follow soon.

	* xdisp.c (echo_area_display): Unitialized variable.

	* xterm.c (draw_bitmap): Previously draw_truncation; draw
	overlay arrow bitmap.

	* xdisp.c (display_line): For truncated lines, consider everything
	up to the final \n as part of the line for cursor positioning.

	* xterm.c (draw_truncation): Take FRAME_X_TRUNC_WIDTH into account.
	(x_after_update_window_line): Clear trunc marks.

	* xterm.h (FRAME_X_TRUNC_WIDTH).

	* frame.h (FRAME_TRUNC_WIDTH):  Width of area at the left margin
	of a window reserved for truncation mark.

	* dispextern.h: Take FRAME_TRUNC_WIDTH into account.

	* dispnew.c (update_window_line): Call after_update_windwo_line-
	hook.

	* xdisp.c (display_line): Set overlay_arrow_p in row.

	* dispextern.h (struct glyph_row): New flag overlay_arrow_p.

	* xterm.c (x_after_update_window_line): Draw truncation marks.

	* xdisp.c (display_line): Insert truncation for lines with
	current_x > 0.

	* xterm.c (x_draw_row_borders): Convert y to frame coords.
	Correct y by 1.
	(x_display_cursor): Use default font width if width not
	known.

	* xdisp.c (echo_area_display): Set row->y.

	* dispnew.c (set_window_cursor_after_update): Don't assume
	all rows are enabled.

	* xdisp.c (skip_in_display_line_to): Test cursor.position instead
	of cursor.pos.
	(skip_in_display_line_to): Check cursor.position after call to
	next_display_element.

	* dispextern.h (CURSOR_AT_P): Test if cursor has reached
	buffer position.

	* xdisp.c (display_line): Set row->y here.
	(skip_in_display_line_to): Test for to_pos after all glyphs
	have been added to hpos so that hpos is at the end of all
	glyphs for to_pos.
	(start_display): Remove assertion.

	* dispnew.c (direct_output_forward_char): Bug fix, = instead of ==.
	(update_window): Don't set row->y here.

	* xdisp.c (next_display_element): Don't translate control chars
	from display table entries.

	* dispnew.c (direct_output_for_insert): Set cursor before
	update end to prevent cursor flickering.  Revert changes to
	setting cursor.endpos.

Wed Aug 13 10:46:12 1997  Gerd Moellmann  <gerd@acm.org>

	* dispnew.c (direct_output_for_insert):  Don't set cursor.endpos
	to PT because this prevents multi-byte characters from being
	recognized.

	* xdisp.c (skip_to, display_line):  Advance cursor at end of
	truncated line.

	* xterm.c (x_draw_3d_borders): Use CapRound. Struct rect
	replaced by XRectangle.

	* dispnew.c (scrolling_window): New method.

	* xterm.c (do_line_dance): New implementation, new method.

	* xdisp.c (draw_glyphs):  Draw truncation bitmaps. Clip to
	visible part of line.

	* dispnew.c (update_window_line): Fill inverse video lines
	with infinite width space.
	(update_window): Handle completely empty matrices.
	(set_window_cursor_after_update): Bug fix.

	* xterm.c (draw_glyphs): Stop drawing at right window end.

	* dispnew.c (update_window_line): Don't ignore spaces, don't
	fill with spaces.

	* xdisp.c (compute_line_metrics): Stop adding glyph widths with
	the first glyph having width 0.

	* xterm.c (draw_glyphs): Let a glyph pixel with of 0 denote
	a glyph that extends to the end of the line.

	* xdisp.c (display_line): Insert one padding glyph

	* xdisp.c (skip_in_display_line_to): Don't subtract shift left
	amount from info.current_x.
	(display_line): Ditto.

	* dispnew.c (direct_output_for_insert): Correct use of cursor.x.
	(change_frame_size_1): Correct cursor.x if frame gets too small.
	(update_window_line): Start at row->x.

	* xdisp.c (redisplay_internal): Correct cursor.x (everwhere
	in xdisp.c).

	* xterm.c (set_output_cursor): Use window relative X/Y.
	(global): Use window relative output cursor x/y.
	(draw_glyphs): Remove y param. Pass window relative x/y.

	* dispnew.c (update_window): Start rows at start_y.
	(update_window): Don't try scrolling because it wouldn't work
	with variable height lines, anyway.

	* dispextern.h (struct glyph_row): Remove shift_left_by,
	add x.

	* window.h: (struct window): New member start_y.

	* window.c (replace_window): Initialize start_y.
	(make_window): Ditto.

Tue Aug 12 14:53:04 1997  Gerd Moellmann  <gerd@acm.org>

	* xterm.c (draw_glyphs): Clip rows that would paint over
	the mode line.

	* dispnew.c (update_window): Take mode line border into
	account.

	* xterm.h (FRAME_MODE_LINE_BORDER_WIDTH): Number of pixels
	of border around mode line.

	* xterm.c (x_draw_row_borders): Bug fix.
	(x_erase_phys_cursor): Set pyhs_cursor.x/y before calling
	drawing functions.

	* xterm.c (x_draw_row_border): Experimental; draw 3d borders
	around modeline instead of inverting it.

	* xterm.c (glyph_to_pixel_coords): Use current matrix.

	* dispnew.c (buffer_posn_from_coords): Use SKIP_TO.  Now takes
	window relative pixel coordinates as arguments.

	* keyboard.c (make_lispy_event): Use BUFFER_POSN_FROM_COORDS
	with window relative pixel coordinates.  Use GLYPH_TO_PIXEL_-
	COORDS mit new arguments.

Mon Aug 11 12:32:34 1997  Gerd Moellmann  <gerd@acm.org>

	* xdisp.c (start_display): Use SKIP_TO instead of SKIP_IN-
	DISPLAY_LINE.

	* keyboard.c (make_lispy_event): WINDOW_FROM_COORDINATES with
	pixel coords.
	(make_lispy_movement): Same.

	* xterm.c (note_mouse_highlight): Use WINDOW_FROM_COORDINATES
	with new parameter meaning.

	* window.c (Fcoordinates_in_window_p): Convert Lisp params
	from canon units to pixels.
	(coordinates_in_window): Pixel based.
	(Fcoordinates_in_window_p): Convert result pixel values back
	to canonical units.

	* window.h: phys_cursor_ascent + descent instead of height.

	* xterm.c (XTget_char_info): Use per char metrics for multi-byte
	chars with charset width 1.

	* dispnew.c (direct_output_for_insert): Set updated_row.

Sat Aug  9 12:11:44 1997  Gerd Moellmann  <gerd@acm.org>

	* dispextern.h (struct glyph): Padding flag removed.

Tue Aug  5 09:59:08 1997  Gerd Moellmann  <gerd@acm.org>

	* sysdep.c (reset_sys_modes): cursor_to with 4 params.

	* keyboard.c (interrupt_signal): Cursor_to with 4 params.

	* dispnew.c (update_window_line): Use pixels.

	* xdisp.c (compute_line_metrics): Correct pixel_width by
	shift_left_by.

	* dispextern.h (struct glyph_row): FIRST_SHIFTED_LEFT_GLYPH
	removed.  Remove references to it everywhere.  Reverse_p in
	glyph_row -> right_to_left_p.  Change references to it.

Mon Aug  4 18:09:27 1997  Gerd Moellmann  <gerd@acm.org>

	* dispnew.c (direct_output_for_insert): Use INSERT_GLYPHS.

	* xterm.c (XTinsert_glyphs): Implement it.

	* term.c (insert_glyphs): UPDATING_FRAME may be NULL in case
	of a call from DIRECT_OUTPUT_FOR_INSERT.

	* window.h (struct cursor_pos): Keeps both matrix positions
	and pixel positions.
	(struct window): Use it.

	* dispnew.c (direct_output_for_insert): New version.

	* xdisp.c (redisplay_internal): Don't do anything if it has
	already be done directly.

	* keyboard.c (command_loop_1): Call DIRECT_OUTPUT_FOR_INSERT
	for any character.

Thu Jul 31 15:39:10 1997  Gerd Moellmann  <gerd@acm.org>

	* xdisp.c (echo_area_display): Use new DISPLAY_STRING.

Wed Jul 30 12:18:03 1997  Gerd Moellmann  <gerd@acm.org>

	* dispextern.h (struct glyph_row): MAX_ASCENT, MAX_DESCENT.
	(struct glyph): ASCENT, DESCENT.
	(MATRIX_ROW_PIXEL_HEIGHT): Pixel height of row.
	(GLYPH_PIXEL_HEIGHT): Pixel height of glyph.

	* xterm.c (XTget_display_info): Correct tab computation.

	* term.c (get_display_info): Correct tab computation.

	* dispextern.h (struct display_cursor): WHAT_FOUND, SOURCE_OBJECT.
	Renamed from CHAR_CURSOR.

Tue Jul 29 12:52:40 1997  Gerd Moellmann  <gerd@acm.org>

	* xdisp.c (display_text_line): Mostly pixel oriented.

	* dispextern.h (struct glyph): BOX_WIDTH -> PIXEL_WIDTH.

	* term.c (append_intermediate_glyph): Generate padding glyphs.

	* xdisp.c (display_text_line): More into final direction.

	* xterm.c (XTget_char_info): Use WHAT field of CHAR_INFO.
	(XTget_char_info): Use tabs as multiples of spaces.

	* term.c (get_char_info): Use WHAT field of CHAR_INFO.
	Use tabs as multiples of spaces.

	* dispextern.h (struct char_info ): WHAT field.

	* term.c (encode_terminal_code): Don't use GLYPH_CHAR, use
	FAST_GLYPH_CHAR instead because GLYPH_CHAR won't remove faces.

Mon Jul 28 14:23:06 1997  Gerd Moellmann  <gerd@acm.org>

	* dispnew.c (init_char_info): Correct TAB_WIDTH to a reasonable
	value.
	(init_char_info): Initialize with glyph row.

	* term.c (get_char_info): Check WANT_ELLIPSIS_P.

	* xterm.c (XTget_char_info): Check WANT_ELLIPSIS_P.

	* dispextern.h (struct char_info ): GLYPH_ROW for intermediate
	glyphs.

	* dispnew.c (init_char_info): Init GLYPH_ROW to NULL. CHAR_CURSOR
	moved to xdisp.c.

	* xdisp.c (display_text_line): Use CHAR_CURSOR.

	* xterm.c (x_append_intermediate_glyph): Intermediate glyph
	generation.
	(XTget_char_info): Ditto.

	* term.c (get_char_info): Intermediate glyph generation.
	(append_intermediate_glyph): Ditto.

Sun Jul 27 18:57:24 1997  Gerd Moellmann  <gerd@acm.org>

	* dispnew.c (compute_char_cursor_face): Compute the face for a
	CHAR_CURSOR.
	(init_char_cursor): Initialize a CHAR_CURSOR.
	(get_char_and_advance): Get next character to display.

	* dispextern.h (struct char_cursor): Cursor for iterating over
	display text of CURRENT_BUFFER.

Sat Jul 26 13:33:03 1997  Gerd Moellmann  <gerd@acm.org>

	* term.c (get_char_info): Set MAX_PIXEL_WIDTH in CHAR_INFO.

	* dispextern.h (struct char_info ): Use LISP_CHAR_TABLE for DP.
	New member MAX_PIXEL_HEIGHT.

	* xterm.c (x_per_char_metric): Get per character metrics.
	(XTget_char_info): More cases covered.

	* term.c (get_char_and_info): Get next character and character
	display information.
	(get_char_info): Get character display information.

	* dispextern.h: Character display information.

	* xterm.c (x_get_char_font_and_encoding): Get font and
	encode character.
	(XTget_char_info): Get display information about a character.

Wed Jul 23 16:50:18 1997  Gerd Moellmann  <gerd@acm.org>

	* dispextern.h (WINDOW_DISPLAY_MODE_LINE_HEIGHT): Height is
	zero if window is mini-window.

	* xdisp.c: Include xterm.h or w32term.h for FRAME_LINE_HEIGHT.
	(try_window): DISPLAY_TEXT_LINE as long as Y < DISPLAY_HEIGHT.

	* dispnew.c (assign_row): Assign row pixel height.
	(clear_glyph_row): Clear pixel height.
	(update_window): Use PIXEL_HEIGHT.

	* xdisp.c (display_string): Set row pixel height temporarily.
	(display_text_line): Ditto.

	* dispextern.h (GLYPH_PIXEL_WIDTH):
	(GLYPH_PIXEL_HEIGHT): Get glyph pixel dimension.

	* frame.h (FRAME_DEFAULT_PIXEL_LINE_HEIGHT): Get height of
	line in default font.
	(FRAME_DEFAULT_GLYPH_PIXEL_WIDTH): Get width of character
	in default font.
	(FRAME_MODE_LINE_PIXEL_HEIGHT): Get height of mode line.

	* xterm.h (FRAME_MODE_LINE_HEIGHT): Return height of mode line
	in pixels.

	* dispnew.c (allocate_leaf_matrix): Use window pixel macros.

	* dispextern.h (WINDOW_DISPLAY_PIXEL_WIDTH):
	(WINDOW_DISPLAY_PIXEL_HEIGHT):
	(WINDOW_DISPLAY_MODE_LINE_HEIGHT):
	(WINDOW_DISPLAY_PIXEL_HEIGHT_WITHOUT_MODE_LINE):
	(WINDOW_DISPLAY_LEFT_EDGE_PIXEL_X):
	(WINDOW_DISPLAY_RIGHT_EDGE_PIXEL_X):
	(WINDOW_DISPLAY_TOP_EDGE_PIXEL_Y):
	(WINDOW_DISPLAY_BOTTOM_EDGE_PIXEL_Y): Macros to get various
	pixel values related to windows.

Mon Jul 21 12:22:02 1997  Gerd Moellmann  <gerd@acm.org>

	* xterm.c (XTflash): Flash last line of frame.

	* dispextern.h (cursor_in_echo_area): Extern declaration.

	* xterm.c (dumpglyphs): 8-bit version to test if my Xserver
	freezes stem from 16-bit functions.

	* xterm.c (x_display_and_set_cursor): Don't display hollow
	cursor in mini windows.

	* window.c (replace_window): Initialize PHYS_CURSOR_TYPE.
	(make_window): Ditto.

	* xterm.c (x_erase_phys_cursor): Erase cursor image.
	(x_display_and_set_cursor): Merged version of X_DISPLAY_BOX_CURSOR
	and X_DISPLAY_BAR_CURSOR.
	(x_display_cursor): Use it.
	(x_update_window_cursor): Use it.

	* xdisp.c (display_text_line): Set cursor for window even if not
	selected.

	* xterm.c (x_display_bar_cursor): Use HPOS and VPOS instead
	of X and Y to denote matrix positions.
	(x_display_cursor): Ditto.

	* dispnew.c (scrolling_window): Scrolling for windows.

Wed Jul 16 13:37:51 1997  Gerd Moellmann  <gerd@acm.org>

	* dispnew.c (build_frame_matrix): Work on windows with update
	flag set.
	(build_frame_matrix_from_window_tree): Ditto.
	(build_frame_matrix_from_leaf_window): Ditto.

	* xdisp.c (echo_area_display): Set MUST_BE_UPDATED_P instead of
	building frame matrix.
	(redisplay_internal): Set window update flags instead of
	building frame matrix.

	* minibuf.c (read_minibuf): Set MUST_BE_UPDATED_P instead of
	building frame matrix.

	* window.c (make_window): Initialize new members.
	(replace_window): Ditto.

	* xfns.c (Fx_create_frame): Don't set PHYS_CURSOR_X to -1.
	I don't believe this is really necessary.

	* dispnew.c (build_frame_matrix_from_leaf_window): Determine
	border glyph once.

Tue Jul 15 13:58:33 1997  Gerd Moellmann  <gerd@acm.org>

	* window.c (mark_window_cursors_off): Mark all cursors in
	window tree off.

	* xterm.c (x_display_box_cursor): Window paraemter.  Use
	window matrix.
	(glyph_to_pixel_pos): Convert matrix pos -> pixels.
	(pixel_to_glyph_pos): Convert pixel pos -> matrix pos.
	(x_update_cursor): Work on windows.
	(x_display_bar_cursor): Ditto.
	(x_draw_single_glyph): Ditto.

	* xterm.h: Prototype for X_DISPLAY_CURSOR.

	* xterm.c (XTcursor_to): Void return type.  Test for
	UPDATED_WINDOW.  Call x_display_cursor with window.
	(x_display_cursor): Void return type.  Window instead of frame
	parameter.

	* window.h (WINDOW_RIGHTMOST_P, WINDOW_TOPMOST_P): Use functions below.

	* window.c (window_rightmost_p, window_topmost_p): Based on
	window tree.

	* dispnew.c (adjust_frame_message_buffer): Allocate with
	FRAME_MESSAGE_BUF_SIZE.

	* window.h: PHYS_CURSOR_.* added.

	* frame.h (struct frame): Cursor information removed.

	* frame.h (FRAME_SCROLL_BAR_WIDTH): Removed because unused.
	(FRAME_WINDOW_WIDTH_ARG): Don't add scroll bar width.

	* window.h (WINDOW_LEFT_MARGIN): Remove FRAME_LEFT_SCROLL_BAR.

	* window.c (window_internal_width): Scroll bars no longer
	part of window.

	* xterm.c (XTclear_end_of_line): FRAME_LEFT_SCROLL_BAR_WIDTH removed.

	* xfns.c (x_set_scroll_bar_width): FRAME_LEFT_SCROLL_BAR_WIDTH removed.

	* xdisp.c (echo_area_display): FRAME_LEFT_SCROLL_BAR_WIDTH removed.
	(redisplay_internal): Ditto.
	(redisplay_window): Ditto.
	(redisplay_window): Ditto.
	(display_text_line): Ditto.
	(display_mode_line): Ditto.

	* minibuf.c (read_minibuf): FRAME_LEFT_SCROLL_BAR_WIDTH removed.

	* dispnew.c (set_cursor_to): FRAME_LEFT_SCROLL_BAR_WIDTH removed.
	(direct_output_for_insert): Ditto.
	(direct_output_forward_char): Ditto.
	(update_frame_1): Ditto.

Mon Jul 14 12:30:03 1997  Gerd Moellmann  <gerd@acm.org>

	* dispnew.c (updated_window): Set by UPDATE_WINDOW to the window
	being updated.
	(update_window): Set and clear it.

	* dispnew.c (update_window_line, update_window, scrolling_window):
	First versions.

	* dispnew.c (build_frame_matrix_from_leaf_window): Add vertical
	bar for window borders.
	(fill_up_glyph_row_area_with_spaces): Fill an area of a row
	with spaces.
	(fill_up_glyph_row_with_spaces): Call above function.

	* xdisp.c (display_text_line): Don't add vertical bar for
	window borders.
	(display_string): Ditto.

	* window.c (make_window): Init CURSOR_VPOS/HPOS.
	(replace_window): Ditto.

	* xterm.c (XTwrite_glyphs): Use selected window cursor position.

	* xfns.c (Fx_contour_region): Use selected window cursor position.
	(Fx_uncontour_region): Ditto.
	(Fx_select_region): Ditto.

	* frame.c (make_frame): Remove CURSOR_X/Y.

	* xdisp.c (redisplay_internal): Use window cursor position.

	* dispnew.c (update_frame_1): Use cursor position of selected
	window.
	(change_frame_size_1): Ditto.

	* xterm.c (XTupdate_begin): Set CURS_X/Y from selected window.
	(XTwrite_glyphs): Use cursor position of selected window.

	* xfns.c (x_set_scroll_bar_width): Set cursor pos of selected window.

	* dispnew.c (set_cursor_to): Set window cursor position.
	(direct_output_for_insert): Use window cursor position.
	(init_display): Don't use frame cursor position.

	* window.h: CURSOR_VPOS/HPOS added.

	* frame.h (struct frame): CURSOR_X/Y removed.
	(FRAME_CURSOR_X): Removed.
	(FRAME_CURSOR_Y): Ditto.

	* dispnew.c (direct_output_for_insert): LAST_POINT_X removed.
	(direct_output_forward_char): Ditto.

	* xdisp.c (redisplay_internal): LAST_POINT_X and LAST_POINT_Y removed.

	* window.c (make_window): LAST_POINT_X and LAST_POINT_Y removed.

	* window.h: LAST_POINT_X and LAST_POINT_Y removed.

Sun Jul 13 14:18:24 1997  Gerd Moellmann  <gerd@acm.org>

	* xdisp.c: Bug fixes using SET_CURSOR with HPOS 0 instead
	of FRAME_LEFT_SCROLL_BAR_WIDTH.

	* dispextern.h: Changed function names.

	* dispnew.c (scrolling): Don't call SCROLLING_1 if WINDOW_SIZE
	< 2.
	(clear_window_matrices): Formerly two functions for desired
	and current matrix.
	(update_frame_1): Call CLEAR_DESIRED_MATRICES.
	(update_frame): Return return value from UPDATE_FRAME_1.

Sat Jul 12 12:58:48 1997  Gerd Moellmann  <gerd@acm.org>

	* xdisp.c (try_window): Set WINDOW_END_VPOS with window relative
	LAST_TEXT_VPOS.

	* frame.c (set_menu_bar_lines): Adjust matrices.

	* dispnew.c (set_cursor_to): Set cursor position.

	* minibuf.c (read_minibuf): Build frame matrix.

	* xdisp.c (this_line_start_hpos): Renamed to
	THIS_LINE_START_WINDOW_HPOS to make it clear that this is window
	relative.
	(this_line_vpos): Renamed to THIS_LINE_WINDOW_VPOS for the same
	reason.

	* dispnew.c (build_frame_matrix): Don't clear rows of the
	menu bar.
	(clear_window_records): Clear window rows.
	(clear_frame_records): Clear window and frame rows.
	(clear_glyph_matrix): Set all rows of a matrix to empty.

	* xdisp.c (echo_area_display): Parameter UPDATE_FRAME_P.
	Update frame if set.
	(message2_nolog): Pass 1 to ECHO_AREA_DISPLAY.  UPDATE_FRAME
	removed.
	(redisplay_internal): Pass 0 to ECHO_AREA_DISPLAY.
	(redisplay_internal): Build frame matrix before UPDATE_FRAME.

	* dispnew.c (assign_row): Assign one glyph row to another.
	(mirrored_