.gitignore

@@ -1 +1,423 @@
-/vim-*.tar.bz2
+/vim-7.4.tar.bz2
+/vim-7.4-2342.tar.bz2
+/vim-8.0-003.tar.bz2
+/vim-8.0-018.tar.bz2
+/vim-8.0-037.tar.bz2
+/vim-8.0-057.tar.bz2
+/vim-8.0-061.tar.bz2
+/vim-8.0-000.tar.bz2
+/vim-8.0-070.tar.bz2
+/vim-8.0-084.tar.bz2
+/vim-8.0-085.tar.bz2
+/vim-8.0-086.tar.bz2
+/vim-8.0-094.tar.bz2
+/vim-8.0-095.tar.bz2
+/vim-8.0-104.tar.bz2
+/vim-8.0-118.tar.bz2
+/vim-8.0-124.tar.bz2
+/vim-8.0-133.tar.bz2
+/vim-8.0-134.tar.bz2
+/vim-8.0-142.tar.bz2
+/vim-8.0-160.tar.bz2
+/vim-8.0-170.tar.bz2
+/vim-8.0-172.tar.bz2
+/vim-8.0-176.tar.bz2
+/vim-8.0-194.tar.bz2
+/vim-8.0-197.tar.bz2
+/vim-8.0-206.tar.bz2
+/vim-8.0-238.tar.bz2
+/vim-8.0-271.tar.bz2
+/vim-8.0-273.tar.bz2
+/vim-8.0-275.tar.bz2
+/vim-8.0-297.tar.bz2
+/vim-8.0-311.tar.bz2
+/vim-8.0-314.tar.bz2
+/vim-8.0-318.tar.bz2
+/vim-8.0-324.tar.bz2
+/vim-8.0-329.tar.bz2
+/vim-8.0-342.tar.bz2
+/vim-8.0-344.tar.bz2
+/vim-8.0-347.tar.bz2
+/vim-8.0-363.tar.bz2
+/vim-8.0-381.tar.bz2
+/vim-8.0-386.tar.bz2
+/vim-8.0-388.tar.bz2
+/vim-8.0-398.tar.bz2
+/vim-8.0-402.tar.bz2
+/vim-8.0-425.tar.bz2
+/vim-8.0-427.tar.bz2
+/vim-8.0-430.tar.bz2
+/vim-8.0-442.tar.bz2
+/vim-8.0-456.tar.bz2
+/vim-8.0-458.tar.bz2
+/vim-8.0-494.tar.bz2
+/vim-8.0-497.tar.bz2
+/vim-8.0-502.tar.bz2
+/vim-8.0-503.tar.bz2
+/vim-8.0-514.tar.bz2
+/vim-8.0-515.tar.bz2
+/vim-8.0-517.tar.bz2
+/vim-8.0-525.tar.bz2
+/vim-8.0-529.tar.bz2
+/vim-8.0-540.tar.bz2
+/vim-8.0-543.tar.bz2
+/vim-8.0-559.tar.bz2
+/vim-8.0-562.tar.bz2
+/vim-8.0-566.tar.bz2
+/vim-8.0-586.tar.bz2
+/vim-8.0-596.tar.bz2
+/vim-8.0-597.tar.bz2
+/vim-8.0-598.tar.bz2
+/vim-8.0-599.tar.bz2
+/vim-8.0-600.tar.bz2
+/vim-8.0-604.tar.bz2
+/vim-8.0-606.tar.bz2
+/vim-8.0-617.tar.bz2
+/vim-8.0-627.tar.bz2
+/vim-8.0-628.tar.bz2
+/vim-8.0-636.tar.bz2
+/vim-8.0-642.tar.bz2
+/vim-8.0-647.tar.bz2
+/vim-8.0-648.tar.bz2
+/vim-8.0-662.tar.bz2
+/vim-8.0-679.tar.bz2
+/vim-8.0-685.tar.bz2
+/vim-8.0-688.tar.bz2
+/vim-8.0-691.tar.bz2
+/vim-8.0-705.tar.bz2
+/vim-8.0-711.tar.bz2
+/vim-8.0-728.tar.bz2
+/vim-8.0-730.tar.bz2
+/vim-8.0-738.tar.bz2
+/vim-8.0-739.tar.bz2
+/vim-8.0-823.tar.bz2
+/vim-8.0-826.tar.bz2
+/vim-8.0-844.tar.bz2
+/vim-8.0-885.tar.bz2
+/vim-8.0-891.tar.bz2
+/vim-8.0-893.tar.bz2
+/vim-8.0-895.tar.bz2
+/vim-8.0-896.tar.bz2
+/vim-8.0-938.tar.bz2
+/vim-8.0-946.tar.bz2
+/vim-8.0-956.tar.bz2
+/vim-8.0-983.tar.bz2
+/vim-8.0-987.tar.bz2
+/vim-8.0-992.tar.bz2
+/vim-8.0-1030.tar.bz2
+/vim-8.0-1052.tar.bz2
+/vim-8.0-1056.tar.bz2
+/vim-8.0-1064.tar.bz2
+/vim-8.0-1067.tar.bz2
+/vim-8.0-1071.tar.bz2
+/vim-8.0-1092.tar.bz2
+/vim-8.0-1097.tar.bz2
+/vim-8.0-1098.tar.bz2
+/vim-8.0-1102.tar.bz2
+/vim-8.0-1123.tar.bz2
+/vim-8.0-1127.tar.bz2
+/vim-8.0-1129.tar.bz2
+/vim-8.0-1132.tar.bz2
+/vim-8.0-1144.tar.bz2
+/vim-8.0-1155.tar.bz2
+/vim-8.0-1171.tar.bz2
+/vim-8.0-1173.tar.bz2
+/vim-8.0-1175.tar.bz2
+/vim-8.0-1176.tar.bz2
+/vim-8.0-1184.tar.bz2
+/vim-8.0-1187.tar.bz2
+/vim-8.0-1203.tar.bz2
+/vim-8.0-1207.tar.bz2
+/vim-8.0-1213.tar.bz2
+/vim-8.0-1216.tar.bz2
+/vim-8.0-1226.tar.bz2
+/vim-8.0-1238.tar.bz2
+/vim-8.0-1240.tar.bz2
+/vim-8.0-1241.tar.bz2
+/vim-8.0-1257.tar.bz2
+/vim-8.0-1272.tar.bz2
+/vim-8.0-1274.tar.bz2
+/vim-8.0-1283.tar.bz2
+/vim-8.0-1322.tar.bz2
+/vim-8.0-1326.tar.bz2
+/vim-8.0-1330.tar.bz2
+/vim-8.0-1349.tar.bz2
+/vim-8.0-1351.tar.bz2
+/vim-8.0-1358.tar.bz2
+/vim-8.0-1359.tar.bz2
+/vim-8.0-1360.tar.bz2
+/vim-8.0-1367.tar.bz2
+/vim-8.0-1376.tar.bz2
+/vim-8.0-1379.tar.bz2
+/vim-8.0-1386.tar.bz2
+/vim-8.0-1387.tar.bz2
+/vim-8.0-1389.tar.bz2
+/vim-8.0-1390.tar.bz2
+/vim-8.0-1401.tar.bz2
+/vim-8.0-1406.tar.bz2
+/vim-8.0-1427.tar.bz2
+/vim-8.0-1428.tar.bz2
+/vim-8.0-1438.tar.bz2
+/vim-8.0-1451.tar.bz2
+/vim-8.0-1473.tar.bz2
+/vim-8.0-1475.tar.bz2
+/vim-8.0-1478.tar.bz2
+/vim-8.0-1505.tar.bz2
+/vim-8.0-1509.tar.bz2
+/vim-8.0-1520.tar.bz2
+/vim-8.0-1523.tar.bz2
+/vim-8.0-1527.tar.bz2
+/vim-8.0-1543.tar.bz2
+/vim-8.0-1553.tar.bz2
+/vim-8.0-1569.tar.bz2
+/vim-8.0-1573.tar.bz2
+/vim-8.0-1587.tar.bz2
+/vim-8.0-1589.tar.bz2
+/vim-8.0-1591.tar.bz2
+/vim-8.0-1599.tar.bz2
+/vim-8.0-1603.tar.bz2
+/vim-8.0-1605.tar.bz2
+/vim-8.0-1625.tar.bz2
+/vim-8.0-1630.tar.bz2
+/vim-8.0-1661.tar.bz2
+/vim-8.0-1666.tar.bz2
+/vim-8.0-1679.tar.bz2
+/vim-8.0-1704.tar.bz2
+/vim-8.0-1755.tar.bz2
+/vim-8.0-1763.tar.bz2
+/vim-8.0-1765.tar.bz2
+/vim-8.0-1766.tar.bz2
+/vim-8.0-1787.tar.bz2
+/vim-8.0-1788.tar.bz2
+/vim-8.0-1789.tar.bz2
+/vim-8.0-1806.tar.bz2
+/vim-8.0-1813.tar.bz2
+/vim-8.0-1842.tar.bz2
+/vim-8.0-1848.tar.bz2
+/vim-8.1-001.tar.bz2
+/vim-8.1-010.tar.bz2
+/vim-8.1-016.tar.bz2
+/vim-8.1-020.tar.bz2
+/vim-8.1-022.tar.bz2
+/vim-8.1-026.tar.bz2
+/vim-8.1-034.tar.bz2
+/vim-8.1-035.tar.bz2
+/vim-8.1-039.tar.bz2
+/vim-8.1-042.tar.bz2
+/vim-8.1-055.tar.bz2
+/vim-8.1-072.tar.bz2
+/vim-8.1-095.tar.bz2
+/vim-8.1-115.tar.bz2
+/vim-8.1-117.tar.bz2
+/vim-8.1-119.tar.bz2
+/vim-8.1-177.tar.bz2
+/vim-8.1-189.tar.bz2
+/vim-8.1-197.tar.bz2
+/vim-8.1-207.tar.bz2
+/vim-8.1-209.tar.bz2
+/vim-8.1-213.tar.bz2
+/vim-8.1-229.tar.bz2
+/vim-8.1-233.tar.bz2
+/vim-8.1-240.tar.bz2
+/vim-8.1-254.tar.bz2
+/vim-8.1-258.tar.bz2
+/vim-8.1-264.tar.bz2
+/vim-8.1-279.tar.bz2
+/vim-8.1-287.tar.bz2
+/vim-8.1-328.tar.bz2
+/vim-8.1-351.tar.bz2
+/vim-8.1-408.tar.bz2
+/vim-8.1-450.tar.bz2
+/vim-8.1-451.tar.bz2
+/vim-8.1-483.tar.bz2
+/vim-8.1-497.tar.bz2
+/vim-8.1-511.tar.bz2
+/vim-8.1-513.tar.bz2
+/vim-8.1-527.tar.bz2
+/vim-8.1-549.tar.bz2
+/vim-8.1-575.tar.bz2
+/vim-8.1-702.tar.bz2
+/vim-8.1-714.tar.bz2
+/vim-8.1-789.tar.bz2
+/vim-8.1-818.tar.bz2
+/vim-8.1-837.tar.bz2
+/vim-8.1-847.tar.bz2
+/vim-8.1-873.tar.bz2
+/vim-8.1-880.tar.bz2
+/vim-8.1-897.tar.bz2
+/vim-8.1-918.tar.bz2
+/vim-8.1-956.tar.bz2
+/vim-8.1-994.tar.bz2
+/vim-8.1-998.tar.bz2
+/vim-8.1-1048.tar.bz2
+/vim-8.1-1099.tar.bz2
+/vim-8.1-1137.tar.bz2
+/vim-8.1-1359.tar.bz2
+/vim-8.1-1413.tar.bz2
+/vim-8.1-1471.tar.bz2
+/vim-8.1-1517.tar.bz2
+/vim-8.1-1561.tar.bz2
+/vim-8.1-1602.tar.bz2
+/vim-8.1-1661.tar.bz2
+/vim-8.1-1713.tar.bz2
+/vim-8.1-1749.tar.bz2
+/vim-8.1-1790.tar.bz2
+/vim-8.1-1890.tar.bz2
+/vim-8.1-1912.tar.bz2
+/vim-8.1-1991.tar.bz2
+/vim-8.1-2019.tar.bz2
+/vim-8.1-2056.tar.bz2
+/vim-8.1-2102.tar.bz2
+/vim-8.1-2120.tar.bz2
+/vim-8.1-2168.tar.bz2
+/vim-8.1-2197.tar.bz2
+/vim-8.1-2198.tar.bz2
+/vim-8.1-2234.tar.bz2
+/vim-8.1-2267.tar.bz2
+/vim-8.1-2352.tar.bz2
+/vim-8.1-2424.tar.bz2
+/vim-8.2-012.tar.bz2
+/vim-8.2-019.tar.bz2
+/vim-8.2-076.tar.bz2
+/vim-8.2-109.tar.bz2
+/vim-8.2-158.tar.bz2
+/vim-8.2-236.tar.bz2
+/vim-8.2-348.tar.bz2
+/vim-8.2-356.tar.bz2
+/vim-8.2-357.tar.bz2
+/vim-8.2-390.tar.bz2
+/vim-8.2-444.tar.bz2
+/vim-8.2-448.tar.bz2
+/vim-8.2-480.tar.bz2
+/vim-8.2-520.tar.bz2
+/vim-8.2-525.tar.bz2
+/vim-8.2-534.tar.bz2
+/vim-8.2-587.tar.bz2
+/vim-8.2-613.tar.bz2
+/vim-8.2-628.tar.bz2
+/vim-8.2-694.tar.bz2
+/vim-8.2-735.tar.bz2
+/vim-8.2-752.tar.bz2
+/vim-8.2-789.tar.bz2
+/vim-8.2-806.tar.bz2
+/vim-8.2-834.tar.bz2
+/vim-8.2-869.tar.bz2
+/vim-8.2-905.tar.bz2
+/vim-8.2-987.tar.bz2
+/vim-8.2-993.tar.bz2
+/vim-8.2-1009.tar.bz2
+/vim-8.2-1052.tar.bz2
+/vim-8.2-1081.tar.bz2
+/vim-8.2-1199.tar.bz2
+/vim-8.2-1217.tar.bz2
+/vim-8.2-1224.tar.bz2
+/vim-8.2-1273.tar.bz2
+/vim-8.2-1307.tar.bz2
+/vim-8.2-1328.tar.bz2
+/vim-8.2-1359.tar.bz2
+/vim-8.2-1382.tar.bz2
+/vim-8.2-1412.tar.bz2
+/vim-8.2-1484.tar.bz2
+/vim-8.2-1520.tar.bz2
+/vim-8.2-1522.tar.bz2
+/vim-8.2-1551.tar.bz2
+/vim-8.2-1634.tar.bz2
+/vim-8.2-1651.tar.bz2
+/vim-8.2-1687.tar.bz2
+/vim-8.2-1770.tar.bz2
+/vim-8.2-1805.tar.bz2
+/vim-8.2-1815.tar.bz2
+/vim-8.2-1885.tar.bz2
+/vim-8.2-1941.tar.bz2
+/vim-8.2-1961.tar.bz2
+/vim-8.2-1971.tar.bz2
+/vim-8.2-2018.tar.bz2
+/vim-8.2-2072.tar.bz2
+/vim-8.2-2086.tar.bz2
+/vim-8.2-2108.tar.bz2
+/vim-8.2-2115.tar.bz2
+/vim-8.2-2143.tar.bz2
+/vim-8.2-2146.tar.bz2
+/vim-8.2-2311.tar.bz2
+/vim-8.2-2451.tar.bz2
+/vim-8.2-2465.tar.bz2
+/vim-8.2-2488.tar.bz2
+/vim-8.2-2529.tar.bz2
+/vim-8.2-2541.tar.bz2
+/vim-8.2-2559.tar.bz2
+/vim-8.2-2576.tar.bz2
+/vim-8.2-2607.tar.bz2
+/vim-8.2-2637.tar.bz2
+/vim-8.2-2735.tar.bz2
+/vim-8.2-2756.tar.bz2
+/vim-8.2-2787.tar.bz2
+/vim-8.2-2811.tar.bz2
+/vim-8.2-2825.tar.bz2
+/vim-8.2-2846.tar.bz2
+/vim-8.2-2875.tar.bz2
+/vim-8.2-2879.tar.bz2
+/vim-8.2-2932.tar.bz2
+/vim-8.2-2956.tar.bz2
+/vim-8.2-3009.tar.bz2
+/vim-8.2-3043.tar.bz2
+/vim-8.2-3046.tar.bz2
+/vim-8.2-3070.tar.bz2
+/vim-8.2-3154.tar.bz2
+/vim-8.2-3182.tar.bz2
+/vim-8.2-3223.tar.bz2
+/vim-8.2-3273.tar.bz2
+/vim-8.2-3290.tar.bz2
+/vim-8.2-3318.tar.bz2
+/vim-8.2-3354.tar.bz2
+/vim-8.2-3367.tar.bz2
+/vim-8.2-3391.tar.bz2
+/vim-8.2-3404.tar.bz2
+/vim-8.2-3512.tar.bz2
+/vim-8.2-3568.tar.bz2
+/vim-8.2-3582.tar.bz2
+/vim-8.2-3642.tar.bz2
+/vim-8.2-3717.tar.bz2
+/vim-8.2-3755.tar.bz2
+/vim-8.2-3811.tar.bz2
+/vim-8.2-4006.tar.bz2
+/vim-8.2-4051.tar.bz2
+/vim-8.2-4068.tar.bz2
+/vim-8.2-4198.tar.bz2
+/vim-8.2-4232.tar.bz2
+/vim-8.2-4314.tar.bz2
+/vim-8.2-4386.tar.bz2
+/vim-8.2-4428.tar.bz2
+/vim-8.2-4460.tar.bz2
+/vim-8.2-4485.tar.bz2
+/vim-8.2-4529.tar.bz2
+/vim-8.2-4579.tar.bz2
+/vim-8.2-4621.tar.bz2
+/vim-8.2-4701.tar.bz2
+/vim-8.2-4804.tar.bz2
+/vim-8.2-4845.tar.bz2
+/vim-8.2-4857.tar.bz2
+/vim-8.2-4877.tar.bz2
+/vim-8.2-4927.tar.bz2
+/vim-8.2-4969.tar.bz2
+/vim-8.2-4975.tar.bz2
+/vim-8.2-5046.tar.bz2
+/vim-8.2-5052.tar.bz2
+/vim-8.2-5085.tar.bz2
+/vim-8.2-5141.tar.bz2
+/vim-8.2-5172.tar.bz2
+/vim-9.0-049.tar.bz2
+/vim-9.0-077.tar.bz2
+/vim-9.0-137.tar.bz2
+/vim-9.0-189.tar.bz2
+/vim-9.0-213.tar.bz2
+/vim-9.0-246.tar.bz2
+/vim-9.0-327.tar.bz2
+/vim-9.0-348.tar.bz2
+/vim-9.0-412.tar.bz2
+/vim-9.0-475.tar.bz2
+/vim-9.0-720.tar.bz2
+/vim-9.0-777.tar.bz2
+/vim-9.0-803.tar.bz2
+/vim-9.0-828.tar.bz2
+/vim-9.0-915.tar.bz2
+/vim-9.0-963.tar.bz2

ci.fmf

@@ -1 +0,0 @@
-resultsdb-testcase: separate

gating.yaml

@@ -1,25 +1,26 @@
 --- !Policy
 product_versions:
   - fedora-*
-decision_context: bodhi_update_push_testing
+decision_contexts: [bodhi_update_push_testing]
 subject_type: koji_build
 rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
  
-#Rawhide
+#gating rawhide
 --- !Policy
 product_versions:
   - fedora-*
-decision_context: bodhi_update_push_stable
+decision_contexts: [bodhi_update_push_stable]
 subject_type: koji_build
 rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
- 
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
+
 #gating rhel
 --- !Policy
 product_versions:
   - rhel-*
 decision_context: osci_compose_gate
 rules:
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-public.functional}
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional}
+  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
+  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tedude.validation}
+  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.acceptance-tier.functional}

gvim.desktop

@@ -0,0 +1,64 @@
+[Desktop Entry]
+Name=Vi IMproved
+Name[bg]=Vi Ðåäàêòîð
+Name[ca]=Vi Millorat
+Name[da]=Vi forbedret
+Name[eo]=VIM
+Name[et]=Täiustatud Vi (vim)
+Name[fr]=Vi étendu (VIM)
+Name[he]=רפושמ Vi
+Name[hu]=Vi
+Name[is]=Vi IMproved ritillinn
+Name[it]=Vi iMproved
+Name[no]=Vi IMproved (forbedret VI)
+Name[pl]=Poprawiony VI (vim)
+Name[ro]=VIM
+Name[ru]=Улучшенный VI
+Name[sk]=Vi IMpreved
+Name[sl]=Izboljšani vi (vim)
+Name[sv]=Förbättrad Vi
+Name[zh_CN.GB2312]=改进的 Vi
+Comment=Powerful text editor with scripting functions and macro recorder
+Comment[bg]=Ðåäàêòîð ñ ìíîãî âúçìîæíîñòè
+Comment[ca]=Editor vi potent
+Comment[cs]=Mocný textový editor vi
+Comment[da]=En kraftig vi tekstbehandler
+Comment[de]=Ein leistungsfähiger vi-Editor
+Comment[el]=Πανίσχυρος διορθωτής vi
+Comment[eo]=VIM similas al redaktilo "vi", sed havas aldonajn ecojn
+Comment[es]=Una versión mejorada del editor vi
+Comment[et]=Võimas tekstiredaktor vi
+Comment[fi]=Tehokas vi-tekstieditori
+Comment[fr]=Éditeur vi puissant
+Comment[gl]=Potente editor vi
+Comment[he]=Vi המצועה בר ךרועה
+Comment[hr]=Napredni vi uređivač
+Comment[hu]=Vi szövegszerkesztő
+Comment[is]=Öflug útgáfa vi ritilsins
+Comment[it]=Un editor vi potenziato
+Comment[ja]=強力なViエディタ
+Comment[lt]=Galingas vi redaktorius
+Comment[mk]=Моќен VI уредувач
+Comment[nl]=Krachtige vi-editor
+Comment[no]=En kraftig vi-redigerer
+Comment[no_NY]=Kraftig vi-tekstredigeringsprogram
+Comment[pl]=Edytor vi
+Comment[pt]=Um poderoso editor de texto
+Comment[ro]=Un editor de texte VI, puternic
+Comment[ru]=Мощный текстовый редактор vi
+Comment[sk]=Silný textový procesor vi
+Comment[sl]=Zmogljivi urejevalnik vi
+Comment[sr]=Moćni vi editor
+Comment[sv]=En kraftfull texteditor
+Comment[ta]=ºì¾¢Å¡öó¾ vi ¦¾¡ÌôÀ¡Ç÷
+Comment[tr]=Güçlü vi düzenleyicisi
+Comment[uk]=Потужний редактор vi
+Comment[zh_CN.GB2312]=功能强大的 vi 编辑器
+MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
+Exec=gvim -f %F
+Icon=gvim
+Type=Application
+Terminal=false
+X-XClassHintResName=VIM
+MapNotify=false
+Categories=Utility;TextEditor;

plans.fmf

@@ -1,35 +0,0 @@
-/tier1-internal:
-  plan:
-    import:
-      url: https://gitlab.com/redhat/centos-stream/tests/vim.git
-      name: /plans/tier1/internal
- 
-/tier1-public:
-  plan:
-    import:
-      url: https://gitlab.com/redhat/centos-stream/tests/vim.git
-      name: /plans/tier1/public
- 
-/tier2-tier3-internal:
-  plan:
-    import:
-      url: https://gitlab.com/redhat/centos-stream/tests/vim.git
-      name: /plans/tier2-tier3/internal
- 
-/tier2-tier3-public:
-  plan:
-    import:
-      url: https://gitlab.com/redhat/centos-stream/tests/vim.git
-      name: /plans/tier2-tier3/public
- 
-/others-internal:
-  plan:
-    import:
-      url: https://gitlab.com/redhat/centos-stream/tests/vim.git
-      name: /plans/others/internal
- 
-/others-public:
-  plan:
-    import:
-      url: https://gitlab.com/redhat/centos-stream/tests/vim.git
-      name: /plans/others/public

plans/all.fmf

@@ -0,0 +1,6 @@
+summary: Test plan with all Fedora tests
+discover:
+       how: fmf
+       url: https://src.fedoraproject.org/tests/vim.git
+execute:
+       how: tmt

sources

@@ -1 +1 @@
-SHA512 (vim-9.1-2068.tar.bz2) = f19ae5898f7c388f437fe03af23d956ef66706c2a629a3389622e0b583d9bd831dd4e250badb181fceacb2b52b1f8a6bda4f72fbece122b5f5097153daf774f3
+SHA512 (vim-9.0-963.tar.bz2) = ed62cab1dbce7e6e989492a632f1c7f6ddd6e40fd1740564cd8f20a3d239f59d41475e8d3a66a31a9b3724c72feb9a037708edad826b0066a5df9a73159d0cf4

vim-7.4-fstabsyntax.patch

@@ -0,0 +1,21 @@
+diff -up vim82/runtime/syntax/fstab.vim.fstabsyntax vim82/runtime/syntax/fstab.vim
+--- vim82/runtime/syntax/fstab.vim.fstabsyntax	2020-08-10 12:08:01.000000000 +0200
++++ vim82/runtime/syntax/fstab.vim	2020-08-10 12:17:22.540855735 +0200
+@@ -56,7 +56,7 @@ syn keyword fsMountPointKeyword containe
+ " Type
+ syn cluster fsTypeCluster contains=fsTypeKeyword,fsTypeUnknown
+ syn match fsTypeUnknown /\s\+\zs\w\+/ contained
+-syn keyword fsTypeKeyword contained adfs ados affs anon_inodefs atfs audiofs auto autofs bdev befs bfs btrfs binfmt_misc cd9660 cfs cgroup cifs coda configfs cpuset cramfs devfs devpts devtmpfs e2compr efs ext2 ext2fs ext3 ext4 fdesc ffs filecore fuse fuseblk fusectl hfs hpfs hugetlbfs iso9660 jffs jffs2 jfs kernfs lfs linprocfs mfs minix mqueue msdos ncpfs nfs nfsd nilfs2 none ntfs null nwfs overlay ovlfs pipefs portal proc procfs pstore ptyfs qnx4 reiserfs ramfs romfs securityfs shm smbfs squashfs sockfs sshfs std subfs swap sysfs sysv tcfs tmpfs udf ufs umap umsdos union usbfs userfs vfat vs3fs vxfs wrapfs wvfs xenfs xfs zisofs
++syn keyword fsTypeKeyword contained adfs ados affs anon_inodefs atfs audiofs auto autofs bdev befs bfs btrfs binfmt_misc cd9660 cfs cgroup cifs coda configfs cpuset cramfs devfs devpts devtmpfs e2compr efs ext2 ext2fs ext3 ext4 fdesc ffs filecore fuse fuseblk fusectl hfs hpfs hugetlbfs iso9660 jffs jffs2 jfs kernfs lfs linprocfs mfs minix mqueue msdos ncpfs nfs nfsd nilfs2 none ntfs null nwfs overlay ovlfs pipefs portal proc procfs pstore ptyfs qnx4 reiserfs ramfs romfs rpc_pipefs securityfs shm smbfs squashfs sockfs sshfs std subfs swap sysfs sysv tcfs tmpfs udf ufs umap umsdos union usbfs userfs vfat vs3fs vxfs wrapfs wvfs xenfs xfs zisofs
+ 
+ " Options
+ " -------
+@@ -68,7 +68,7 @@ syn match fsOptionsString /[a-zA-Z0-9_-]
+ syn keyword fsOptionsYesNo yes no
+ syn cluster fsOptionsCheckCluster contains=fsOptionsExt2Check,fsOptionsFatCheck
+ syn keyword fsOptionsSize 512 1024 2048
+-syn keyword fsOptionsGeneral async atime auto bind current defaults dev devgid devmode devmtime devuid dirsync exec force fstab kudzu loop mand move noatime noauto noclusterr noclusterw nodev nodevmtime nodiratime noexec nomand norelatime nosuid nosymfollow nouser owner rbind rdonly relatime remount ro rq rw suid suiddir supermount sw sync union update user users wxallowed xx nofail failok
++syn keyword fsOptionsGeneral async atime auto bind current defaults dev devgid devmode devmtime devuid dirsync exec force fstab kudzu loop managed mand move noatime noauto noclusterr noclusterw nodev nodevmtime nodiratime noexec nomand norelatime nosuid nosymfollow nouser owner pamconsole rbind rdonly relatime remount ro rq rw suid suiddir supermount sw sync union update user users wxallowed xx nofail
+ syn match fsOptionsGeneral /_netdev/
+ 
+ " Options: adfs

vim-7.4-globalsyntax.patch

@@ -1,12 +1,13 @@
-diff -up vim91/runtime/syntax/spec.vim.globalsyntax vim91/runtime/syntax/spec.vim
---- vim91/runtime/syntax/spec.vim.globalsyntax	2024-09-20 22:29:01.858870640 +0200
-+++ vim91/runtime/syntax/spec.vim	2024-09-20 22:31:43.776217933 +0200
-@@ -112,7 +112,7 @@ syn region specDescriptionArea matchgrou
+diff --git a/runtime/syntax/spec.vim b/runtime/syntax/spec.vim
+index 1a5a108..b709d20 100644
+--- a/runtime/syntax/spec.vim
++++ b/runtime/syntax/spec.vim
+@@ -111,7 +111,7 @@ syn region specDescriptionArea matchgroup=specSection start='^%description' end=
  syn region specPackageArea matchgroup=specSection start='^%package' end='^%'me=e-1 contains=specPackageOpts,specPreAmble,specComment
  
  "%% Scripts Section %%
--syn region specScriptArea matchgroup=specSection start='^%\(prep\|generate_buildrequires\|conf\|build\|install\|clean\|check\|pre\|postun\|preun\|post\|posttrans\|filetriggerin\|filetriggerun\|filetriggerpostun\|transfiletriggerin\|transfiletriggerun\|transfiletriggerpostun\)\>' skip='^%{\|^%\(define\|patch\d*\|configure\|GNUconfigure\|setup\|autosetup\|autopatch\|find_lang\|make_build\|makeinstall\|make_install\)\>' end='^%'me=e-1 contains=specSpecialVariables,specVariables,@specCommands,specVariables,shDo,shFor,shCaseEsac,specNoNumberHilite,specCommandOpts,shComment,shIf,specSpecialChar,specMacroIdentifier,specSectionMacroArea,specSectionMacroBracketArea,shOperator,shQuote1,shQuote2
-+syn region specScriptArea matchgroup=specSection start='^%\(prep\|generate_buildrequires\|conf\|build\|install\|clean\|check\|pre\|postun\|preun\|post\|posttrans\|filetriggerin\|filetriggerun\|filetriggerpostun\|transfiletriggerin\|transfiletriggerun\|transfiletriggerpostun\)\>' skip='^%{\|^%\(define\|global\|patch\d*\|configure\|GNUconfigure\|setup\|autosetup\|autopatch\|find_lang\|make_build\|makeinstall\|make_install\)\>' end='^%'me=e-1 contains=specSpecialVariables,specVariables,@specCommands,specVariables,shDo,shFor,shCaseEsac,specNoNumberHilite,specCommandOpts,shComment,shIf,specSpecialChar,specMacroIdentifier,specSectionMacroArea,specSectionMacroBracketArea,shOperator,shQuote1,shQuote2
+-syn region specScriptArea matchgroup=specSection start='^%\(prep\|build\|install\|clean\|check\|pre\|postun\|preun\|post\|posttrans\)\>' skip='^%{\|^%\(define\|patch\d*\|configure\|GNUconfigure\|setup\|autosetup\|autopatch\|find_lang\|make_build\|makeinstall\|make_install\)\>' end='^%'me=e-1 contains=specSpecialVariables,specVariables,@specCommands,specVariables,shDo,shFor,shCaseEsac,specNoNumberHilite,specCommandOpts,shComment,shIf,specSpecialChar,specMacroIdentifier,specSectionMacroArea,specSectionMacroBracketArea,shOperator,shQuote1,shQuote2
++syn region specScriptArea matchgroup=specSection start='^%\(prep\|build\|install\|clean\|check\|pre\|postun\|preun\|post\|posttrans\)\>' skip='^%{\|^%\(define\|global\|patch\d*\|configure\|GNUconfigure\|setup\|autosetup\|autopatch\|find_lang\|make_build\|makeinstall\|make_install\)\>' end='^%'me=e-1 contains=specSpecialVariables,specVariables,@specCommands,specVariables,shDo,shFor,shCaseEsac,specNoNumberHilite,specCommandOpts,shComment,shIf,specSpecialChar,specMacroIdentifier,specSectionMacroArea,specSectionMacroBracketArea,shOperator,shQuote1,shQuote2
  
  "%% Changelog Section %%
  syn region specChangelogArea matchgroup=specSection start='^%changelog' end='^%'me=e-1 contains=specEmail,specURL,specWeekday,specMonth,specNumber,specComment,specLicense

vim-7.4-specsyntax.patch

@@ -1,6 +1,6 @@
-diff -up vim91/runtime/syntax/spec.vim.spec-syntax vim91/runtime/syntax/spec.vim
---- vim91/runtime/syntax/spec.vim.spec-syntax	2025-11-14 07:38:27.000000000 +0100
-+++ vim91/runtime/syntax/spec.vim	2025-11-14 07:52:56.081212607 +0100
+diff -up vim74/runtime/syntax/spec.vim.highlite vim74/runtime/syntax/spec.vim
+--- vim74/runtime/syntax/spec.vim.highlite	2016-07-04 10:17:45.000000000 +0200
++++ vim74/runtime/syntax/spec.vim	2016-08-04 15:20:26.116049343 +0200
 @@ -38,7 +38,7 @@ syn match specNoNumberHilite 'X11\|X11R6
  syn match specManpageFile '[a-zA-Z]\.1'
  
@@ -10,12 +10,24 @@ diff -up vim91/runtime/syntax/spec.vim.spec-syntax vim91/runtime/syntax/spec.vim
  syn keyword specWeekday contained Mon Tue Wed Thu Fri Sat Sun
  syn keyword specMonth   contained Jan Feb Mar Apr Jun Jul Aug Sep Oct Nov Dec
  syn keyword specMonth   contained January February March April May June July August September October November December
+@@ -61,9 +61,9 @@ syn cluster specListedFiles contains=spe
+ 
+ "specComands
+ syn match   specConfigure  contained '\./configure'
+-syn match   specTarCommand contained '\<tar\s\+[cxvpzIf]\{,5}\s*'
++syn match   specTarCommand contained '\<tar\s\+[cxvpzIjf]\{,5}\s*'
+ syn keyword specCommandSpecial contained root
+-syn keyword specCommand		contained make xmkmf mkdir chmod ln find sed rm strip moc echo grep ls rm mv mkdir install cp pwd cat tail then else elif cd gzip rmdir ln eval export touch
++syn keyword specCommand		contained make xmkmf mkdir chmod ln find sed rm strip moc echo grep ls rm mv mkdir install cp pwd cat tail then else elif cd gzip rmdir ln eval export touch bzip2 bunzip2 gunzip
+ syn cluster specCommands contains=specCommand,specTarCommand,specConfigure,specCommandSpecial
+ 
+ "frequently used rpm env vars
 @@ -105,7 +105,7 @@ syn case ignore
  "%% PreAmble Section %%
  "Copyright and Serial were deprecated by License and Epoch
  syn region specPreAmbleDeprecated oneline matchgroup=specError start='^\(Copyright\|Serial\)' end='$' contains=specEmail,specURL,specURLMacro,specLicense,specColon,specVariables,specSpecialChar,specMacroIdentifier
--syn region specPreAmble oneline matchgroup=specCommand start='^\(Prereq\|Summary\|Name\|Version\|Packager\|Requires\|Recommends\|Suggests\|Supplements\|Enhances\|Icon\|URL\|SourceLicense\|Source\d*\|Patch\d*\|Prefix\|Packager\|Group\|License\|Release\|BuildRoot\|Distribution\|DistTag\|Vendor\|Provides\|ExclusiveArch\|ExcludeArch\|ExclusiveOS\|Obsoletes\|BuildArch\|BuildArchitectures\|BuildRequires\|BuildConflicts\|BuildPreReq\|Conflicts\|AutoRequires\|AutoReq\|AutoReqProv\|AutoProv\|Epoch\|ModularityLabel\)' end='$' contains=specEmail,specURL,specURLMacro,specLicense,specColon,specVariables,specSpecialChar,specMacroIdentifier
-+syn region specPreAmble oneline matchgroup=specCommand start='^\(Prereq\|Summary\|Name\|Version\|Packager\|Requires\|Recommends\|Suggests\|Supplements\|Enhances\|Icon\|URL\|SourceLicense\|Source\d*\|Patch\d*\|Prefix\|Packager\|Group\|License\|Release\|BuildRoot\|Distribution\|DistTag\|Vendor\|Provides\|ExclusiveArch\|ExcludeArch\|ExcludeOS\|ExclusiveOS\|Obsoletes\|BuildArch\|BuildArchitectures\|BuildRequires\|BuildConflicts\|BuildPreReq\|Conflicts\|AutoRequires\|AutoReq\|AutoReqProv\|AutoProv\|Epoch\|ModularityLabel\)' end='$' contains=specEmail,specURL,specURLMacro,specLicense,specColon,specVariables,specSpecialChar,specMacroIdentifier
+-syn region specPreAmble oneline matchgroup=specCommand start='^\(Prereq\|Summary\|Name\|Version\|Packager\|Requires\|Recommends\|Suggests\|Supplements\|Enhances\|Icon\|URL\|Source\d*\|Patch\d*\|Prefix\|Packager\|Group\|License\|Release\|BuildRoot\|Distribution\|Vendor\|Provides\|ExclusiveArch\|ExcludeArch\|ExclusiveOS\|Obsoletes\|BuildArch\|BuildArchitectures\|BuildRequires\|BuildConflicts\|BuildPreReq\|Conflicts\|AutoRequires\|AutoReq\|AutoReqProv\|AutoProv\|Epoch\)' end='$' contains=specEmail,specURL,specURLMacro,specLicense,specColon,specVariables,specSpecialChar,specMacroIdentifier
++syn region specPreAmble oneline matchgroup=specCommand start='^\(Prereq\|Summary\|Name\|Version\|Packager\|Requires\|Recommends\|Suggests\|Supplements\|Enhances\|Icon\|URL\|Source\d*\|Patch\d*\|Prefix\|Packager\|Group\|License\|Release\|BuildRoot\|Distribution\|Vendor\|Provides\|ExclusiveArch\|ExcludeArch\|ExcludeOS\|ExclusiveOS\|Obsoletes\|BuildArch\|BuildArchitectures\|BuildRequires\|BuildConflicts\|BuildPreReq\|Conflicts\|AutoRequires\|AutoReq\|AutoReqProv\|AutoProv\|Epoch\)' end='$' contains=specEmail,specURL,specURLMacro,specLicense,specColon,specVariables,specSpecialChar,specMacroIdentifier
  
  "%% Description Section %%
  syn region specDescriptionArea matchgroup=specSection start='^%description' end='^%'me=e-1 contains=specDescriptionOpts,specEmail,specURL,specNumber,specMacroIdentifier,specComment

vim-8.0-copy-paste.patch

@@ -1,7 +1,8 @@
-diff -up vim91/runtime/defaults.vim.copypaste vim91/runtime/defaults.vim
---- vim91/runtime/defaults.vim.copypaste	2025-06-27 06:43:53.000000000 +0200
-+++ vim91/runtime/defaults.vim	2025-07-11 09:16:19.013363739 +0200
-@@ -70,18 +70,6 @@ sunmap Q
+diff --git a/runtime/defaults.vim b/runtime/defaults.vim
+index f1d5cd1..b08de8e 100644
+--- a/runtime/defaults.vim
++++ b/runtime/defaults.vim
+@@ -74,18 +74,6 @@ sunmap Q
  " Revert with ":iunmap <C-U>".
  inoremap <C-U> <C-G>u<C-U>
  
@@ -20,32 +21,23 @@ diff -up vim91/runtime/defaults.vim.copypaste vim91/runtime/defaults.vim
  " Only do this part when Vim was compiled with the +eval feature.
  if 1
  
-diff -up vim91/src/testdir/test_balloon.vim.copypaste vim91/src/testdir/test_balloon.vim
---- vim91/src/testdir/test_balloon.vim.copypaste	2025-07-11 09:16:19.013500976 +0200
-+++ vim91/src/testdir/test_balloon.vim	2025-07-11 09:17:20.168187029 +0200
-@@ -7,6 +7,7 @@ CheckFeature balloon_eval_term
- source util/screendump.vim
+diff --git a/src/testdir/test_balloon.vim b/src/testdir/test_balloon.vim
+index ed0c6c1..90c8c40 100644
+--- a/src/testdir/test_balloon.vim
++++ b/src/testdir/test_balloon.vim
+@@ -9,6 +9,7 @@ source screendump.vim
+ CheckScreendump
  
  let s:common_script =<< trim [CODE]
 +  set mouse=a
    call setline(1, ["one one one", "two tXo two", "three three three"])
    set balloonevalterm balloonexpr=MyBalloonExpr()..s:trailing balloondelay=100
    let s:trailing = '<'  " check that script context is set
-diff -up vim91/src/testdir/test_popup.vim.copypaste vim91/src/testdir/test_popup.vim
---- vim91/src/testdir/test_popup.vim.copypaste	2025-07-11 08:58:40.000000000 +0200
-+++ vim91/src/testdir/test_popup.vim	2025-07-11 09:16:19.013692144 +0200
-@@ -957,6 +957,7 @@ func Test_mouse_popup_position()
-   let script =<< trim END
-     set mousemodel=popup_setpos
-     source $VIMRUNTIME/menu.vim
-+    set mouse=a
-     call setline(1, join(range(20)))
-     func Trigger(col)
-       call test_setmouse(1, a:col)
-diff -up vim91/src/testdir/test_popupwin.vim.copypaste vim91/src/testdir/test_popupwin.vim
---- vim91/src/testdir/test_popupwin.vim.copypaste	2025-07-11 08:58:40.000000000 +0200
-+++ vim91/src/testdir/test_popupwin.vim	2025-07-11 09:16:19.013971633 +0200
-@@ -556,6 +556,7 @@ func Test_popup_drag()
+diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim
+index b91689e..c6b70d1 100644
+--- a/src/testdir/test_popupwin.vim
++++ b/src/testdir/test_popupwin.vim
+@@ -553,6 +553,7 @@ func Test_popup_drag()
    " create a popup that covers the command line
    let lines =<< trim END
  	call setline(1, range(1, 20))
@@ -53,7 +45,7 @@ diff -up vim91/src/testdir/test_popupwin.vim.copypaste vim91/src/testdir/test_po
  	split
  	vsplit
  	$wincmd w
-@@ -623,6 +624,7 @@ func Test_popup_drag_minwidth()
+@@ -621,6 +622,7 @@ func Test_popup_drag_minwidth()
  
    " create a popup that does not fit
    let lines =<< trim END
@@ -61,7 +53,7 @@ diff -up vim91/src/testdir/test_popupwin.vim.copypaste vim91/src/testdir/test_po
        call range(40)
  	      \ ->map({_,i -> string(i)})
  	      \ ->popup_create({
-@@ -670,6 +672,7 @@ func Test_popup_drag_termwin()
+@@ -669,6 +671,7 @@ func Test_popup_drag_termwin()
    let lines =<< trim END
  	set foldmethod=marker
  	call setline(1, range(100))
@@ -77,7 +69,7 @@ diff -up vim91/src/testdir/test_popupwin.vim.copypaste vim91/src/testdir/test_po
  	" With border, can click on X
  	let winid = popup_create('foobar', #{
  	      \ close: 'button',
-@@ -1559,6 +1563,7 @@ func Test_popup_beval()
+@@ -1557,6 +1561,7 @@ func Test_popup_beval()
    let lines =<< trim END
  	call setline(1, range(1, 20))
  	call setline(5, 'here is some text to hover over')
@@ -85,7 +77,7 @@ diff -up vim91/src/testdir/test_popupwin.vim.copypaste vim91/src/testdir/test_po
  	set balloonevalterm
  	set balloonexpr=BalloonExpr()
  	set balloondelay=100
-@@ -2269,6 +2274,7 @@ func Test_popup_scrollbar()
+@@ -2262,6 +2267,7 @@ func Test_popup_scrollbar()
  
    let lines =<< trim END
      call setline(1, range(1, 20))

vim-crypto-warning.patch

@@ -1,7 +1,7 @@
-diff -up vim91/src/config.h.in.fips-warning vim91/src/config.h.in
---- vim91/src/config.h.in.fips-warning	2025-10-31 08:12:59.598267544 +0100
-+++ vim91/src/config.h.in	2025-10-31 08:14:45.661859595 +0100
-@@ -526,5 +526,14 @@
+diff -up vim82/src/config.h.in.fips-warning vim82/src/config.h.in
+--- vim82/src/config.h.in.fips-warning	2022-02-24 08:13:59.017280243 +0100
++++ vim82/src/config.h.in	2022-02-24 08:14:33.085580298 +0100
+@@ -508,5 +508,14 @@
  /* Define if _SC_SIGSTKSZ is available via sysconf() */
  #undef HAVE_SYSCONF_SIGSTKSZ
  
@@ -16,10 +16,10 @@ diff -up vim91/src/config.h.in.fips-warning vim91/src/config.h.in
 +
  /* Define if you want to load libgpm dynamically */
  #undef DYNAMIC_GPM
-diff -up vim91/src/configure.ac.fips-warning vim91/src/configure.ac
---- vim91/src/configure.ac.fips-warning	2025-10-31 08:12:59.596711911 +0100
-+++ vim91/src/configure.ac	2025-10-31 08:12:59.598566242 +0100
-@@ -631,6 +631,38 @@ else
+diff -up vim82/src/configure.ac.fips-warning vim82/src/configure.ac
+--- vim82/src/configure.ac.fips-warning	2022-02-24 08:13:59.014280304 +0100
++++ vim82/src/configure.ac	2022-02-24 08:13:59.018280222 +0100
+@@ -583,6 +583,38 @@ else
    AC_SUBST(XDIFF_OBJS_USED)
  fi
  
@@ -58,17 +58,17 @@ diff -up vim91/src/configure.ac.fips-warning vim91/src/configure.ac
  dnl Check for Lua feature.
  AC_MSG_CHECKING(--enable-luainterp argument)
  AC_ARG_ENABLE(luainterp,
-diff -up vim91/src/crypt.c.fips-warning vim91/src/crypt.c
---- vim91/src/crypt.c.fips-warning	2025-10-10 07:16:11.000000000 +0200
-+++ vim91/src/crypt.c	2025-10-31 08:12:59.598872032 +0100
-@@ -806,6 +806,21 @@ crypt_check_method(int method)
+diff -up vim82/src/crypt.c.fips-warning vim82/src/crypt.c
+--- vim82/src/crypt.c.fips-warning	2022-02-24 08:09:29.000000000 +0100
++++ vim82/src/crypt.c	2022-02-24 08:13:59.018280222 +0100
+@@ -740,6 +740,21 @@ crypt_check_method(int method)
  	msg_scroll = TRUE;
  	msg(_("Warning: Using a weak encryption method; see :help 'cm'"));
      }
 +#ifdef HAVE_FIPS_WARNING
 +    FILE *fips_enable_fd = fopen(FIPS_ENABLED_FILE_LINK, "r");
 +    if (fips_enable_fd == NULL)
-+	return;
++      return;
 +
 +    int enabled = fgetc(fips_enable_fd);
 +
@@ -82,4 +82,4 @@ diff -up vim91/src/crypt.c.fips-warning vim91/src/crypt.c
 +#endif
  }
  
- /*
+ #ifdef FEAT_SODIUM

vim-manpagefixes-948566.patch

@@ -1,7 +1,38 @@
-diff -up vim91/runtime/doc/vim.1.manpagefixes vim91/runtime/doc/vim.1
---- vim91/runtime/doc/vim.1.manpagefixes	2024-11-29 12:17:53.553382696 +0100
-+++ vim91/runtime/doc/vim.1	2024-11-29 12:17:53.556382667 +0100
-@@ -17,11 +17,13 @@ vim \- Vi IMproved, a programmer's text
+diff -up vim73/runtime/doc/vim.man.rh1 vim73/runtime/doc/vim.man
+--- vim73/runtime/doc/vim.man.rh1	2013-07-26 11:26:20.566576864 +0200
++++ vim73/runtime/doc/vim.man	2013-07-26 11:47:42.061351469 +0200
+@@ -11,9 +11,9 @@ SYNOPSIS
+        vim [options] -t tag
+        vim [options] -q [errorfile]
+ 
+-       ex
++       ex gex
+        view
+-       gvim gview evim eview
++       gvim gview vimx evim eview
+        rvim rview rgvim rgview
+ 
+ DESCRIPTION
+@@ -79,8 +79,13 @@ DESCRIPTION
+                  the files.  Can also be done with the "-R" argument.
+ 
+        gvim gview
+-                 The GUI version.  Starts a new window.  Can also be done with
+-                 the "-g" argument.
++                 The GUI version.  Starts a new window.
++
++       gex       Starts a new gvim window in Ex mode. Can also be done with
++                 the "-e" argument to gvim.
++
++       vimx      Starts gvim in "Vi" mode similar to "vim", but with 
++                 additional features like xterm clipboard support.
+ 
+        evim eview
+                  The GUI version in easy mode.  Starts a new window.  Can also
+diff -urN vim73/runtime/doc/vim.1 vim73_new/runtime/doc/vim.1
+--- vim73/runtime/doc/vim.1	2013-07-31 14:13:01.039765800 +0200
++++ vim73_new/runtime/doc/vim.1	2013-07-31 13:57:59.861912768 +0200
+@@ -17,11 +17,13 @@
  .PP
  .br
  .B ex
@@ -15,7 +46,7 @@ diff -up vim91/runtime/doc/vim.1.manpagefixes vim91/runtime/doc/vim.1
  .B evim
  .B eview
  .br
-@@ -114,7 +116,12 @@ Can also be done with the "\-R" argument
+@@ -114,7 +116,12 @@
  gvim gview
  The GUI version.
  Starts a new window.
@@ -29,7 +60,7 @@ diff -up vim91/runtime/doc/vim.1.manpagefixes vim91/runtime/doc/vim.1
  .TP
  evim eview
  The GUI version in easy mode.
-@@ -491,6 +498,12 @@ As \-\-remote, but Vim does not exit unt
+@@ -458,6 +458,12 @@
  \-\-remote\-wait\-silent
  As \-\-remote\-wait, but without the warning when no server is found.
  .TP
@@ -42,10 +73,10 @@ diff -up vim91/runtime/doc/vim.1.manpagefixes vim91/runtime/doc/vim.1
  \-\-serverlist
  List the names of all Vim servers that can be found.
  .TP
-diff -up vim91/runtime/doc/vim-fr.1.manpagefixes vim91/runtime/doc/vim-fr.1
---- vim91/runtime/doc/vim-fr.1.manpagefixes	2024-11-15 06:32:23.000000000 +0100
-+++ vim91/runtime/doc/vim-fr.1	2024-11-29 12:17:53.556382667 +0100
-@@ -24,11 +24,13 @@ vim \- Vi IMproved, 閐iteur de texte pou
+diff -urN vim73/runtime/doc/vim-fr.1 vim73_new/runtime/doc/vim-fr.1
+--- vim73/runtime/doc/vim-fr.1	2010-05-15 13:04:00.000000000 +0200
++++ vim73_new/runtime/doc/vim-fr.1	2013-07-31 13:59:10.587467916 +0200
+@@ -24,11 +24,13 @@
  .PP
  .br
  .B ex
@@ -59,10 +90,10 @@ diff -up vim91/runtime/doc/vim-fr.1.manpagefixes vim91/runtime/doc/vim-fr.1
  .B evim
  .B eview
  .br
-diff -up vim91/runtime/doc/vim-fr.UTF-8.1.manpagefixes vim91/runtime/doc/vim-fr.UTF-8.1
---- vim91/runtime/doc/vim-fr.UTF-8.1.manpagefixes	2024-11-15 06:32:23.000000000 +0100
-+++ vim91/runtime/doc/vim-fr.UTF-8.1	2024-11-29 12:17:53.556382667 +0100
-@@ -24,11 +24,13 @@ vim \- Vi IMproved, 茅diteur de texte po
+diff -urN vim73/runtime/doc/vim-fr.UTF-8.1 vim73_new/runtime/doc/vim-fr.UTF-8.1
+--- vim73/runtime/doc/vim-fr.UTF-8.1	2010-05-15 13:04:00.000000000 +0200
++++ vim73_new/runtime/doc/vim-fr.UTF-8.1	2013-07-31 13:59:28.394852347 +0200
+@@ -24,11 +24,13 @@
  .PP
  .br
  .B ex
@@ -76,10 +107,10 @@ diff -up vim91/runtime/doc/vim-fr.UTF-8.1.manpagefixes vim91/runtime/doc/vim-fr.
  .B evim
  .B eview
  .br
-diff -up vim91/runtime/doc/vim-it.1.manpagefixes vim91/runtime/doc/vim-it.1
---- vim91/runtime/doc/vim-it.1.manpagefixes	2024-11-15 06:32:23.000000000 +0100
-+++ vim91/runtime/doc/vim-it.1	2024-11-29 12:17:53.557382658 +0100
-@@ -17,11 +17,13 @@ vim \- VI Migliorato, un editor di testi
+diff -urN vim73/runtime/doc/vim-it.1 vim73_new/runtime/doc/vim-it.1
+--- vim73/runtime/doc/vim-it.1	2010-07-27 22:22:52.000000000 +0200
++++ vim73_new/runtime/doc/vim-it.1	2013-07-31 13:59:43.474331077 +0200
+@@ -17,11 +17,13 @@
  .PP
  .br
  .B ex
@@ -93,10 +124,10 @@ diff -up vim91/runtime/doc/vim-it.1.manpagefixes vim91/runtime/doc/vim-it.1
  .B evim
  .B eview
  .br
-diff -up vim91/runtime/doc/vim-it.UTF-8.1.manpagefixes vim91/runtime/doc/vim-it.UTF-8.1
---- vim91/runtime/doc/vim-it.UTF-8.1.manpagefixes	2024-11-15 06:32:23.000000000 +0100
-+++ vim91/runtime/doc/vim-it.UTF-8.1	2024-11-29 12:17:53.557382658 +0100
-@@ -17,11 +17,13 @@ vim \- VI Migliorato, un editor di testi
+diff -urN vim73/runtime/doc/vim-it.UTF-8.1 vim73_new/runtime/doc/vim-it.UTF-8.1
+--- vim73/runtime/doc/vim-it.UTF-8.1	2010-07-30 20:53:57.000000000 +0200
++++ vim73_new/runtime/doc/vim-it.UTF-8.1	2013-07-31 13:59:55.985898573 +0200
+@@ -17,11 +17,13 @@
  .PP
  .br
  .B ex
@@ -110,41 +141,26 @@ diff -up vim91/runtime/doc/vim-it.UTF-8.1.manpagefixes vim91/runtime/doc/vim-it.
  .B evim
  .B eview
  .br
-diff -up vim91/runtime/doc/vim.man.manpagefixes vim91/runtime/doc/vim.man
---- vim91/runtime/doc/vim.man.manpagefixes	2024-11-15 06:32:23.000000000 +0100
-+++ vim91/runtime/doc/vim.man	2024-11-29 12:17:53.557382658 +0100
-@@ -9,9 +9,9 @@ SYNOPSIS
-        vim [options] -t tag
-        vim [options] -q [errorfile]
+diff -urN vim73/runtime/doc/vim.man vim73_new/runtime/doc/vim.man
+--- vim73/runtime/doc/vim.man	2013-07-31 14:13:01.044765627 +0200
++++ vim73_new/runtime/doc/vim.man	2013-07-31 13:53:35.107064804 +0200
+@@ -82,10 +82,10 @@
+                  The GUI version.  Starts a new window.
  
--       ex
-+       ex gex
-        view
--       gvim gview evim eview
-+       gvim gview vimx evim eview
-        rvim rview rgvim rgview
- 
- DESCRIPTION
-@@ -77,8 +77,13 @@ DESCRIPTION
-                  the files.  Can also be done with the "-R" argument.
- 
-        gvim gview
--                 The GUI version.  Starts a new window.  Can also be done with
--                 the "-g" argument.
-+                 The GUI version.  Starts a new window.
-+
-+       gex       Starts a new gvim window in Ex mode. Can also be done with
+        gex       Starts a new gvim window in Ex mode. Can also be done with
+-                 the "-e" argument to gvim.
 +                 the "-e" argument to gvim
-+
-+       vimx      Starts gvim in "Vi" mode similar to "vim", but with 
+ 
+        vimx      Starts gvim in "Vi" mode similar to "vim", but with 
+-                 additional features like xterm clipboard support.
 +                 additional features like xterm clipboard support
  
         evim eview
                   The GUI version in easy mode.  Starts a new window.  Can also
-diff -up vim91/runtime/doc/vim-pl.1.manpagefixes vim91/runtime/doc/vim-pl.1
---- vim91/runtime/doc/vim-pl.1.manpagefixes	2024-11-15 06:32:23.000000000 +0100
-+++ vim91/runtime/doc/vim-pl.1	2024-11-29 12:17:53.557382658 +0100
-@@ -17,11 +17,13 @@ vim \- Vi rozbudowany, edytor tekstu dla
+diff -urN vim73/runtime/doc/vim-pl.1 vim73_new/runtime/doc/vim-pl.1
+--- vim73/runtime/doc/vim-pl.1	2010-05-15 13:04:01.000000000 +0200
++++ vim73_new/runtime/doc/vim-pl.1	2013-07-31 14:00:21.282024131 +0200
+@@ -17,11 +17,13 @@
  .PP
  .br
  .B ex
@@ -158,10 +174,10 @@ diff -up vim91/runtime/doc/vim-pl.1.manpagefixes vim91/runtime/doc/vim-pl.1
  .B evim
  .B eview
  .br
-diff -up vim91/runtime/doc/vim-pl.UTF-8.1.manpagefixes vim91/runtime/doc/vim-pl.UTF-8.1
---- vim91/runtime/doc/vim-pl.UTF-8.1.manpagefixes	2024-11-15 06:32:23.000000000 +0100
-+++ vim91/runtime/doc/vim-pl.UTF-8.1	2024-11-29 12:17:53.558382649 +0100
-@@ -17,11 +17,13 @@ vim \- Vi rozbudowany, edytor tekstu dla
+diff -urN vim73/runtime/doc/vim-pl.UTF-8.1 vim73_new/runtime/doc/vim-pl.UTF-8.1
+--- vim73/runtime/doc/vim-pl.UTF-8.1	2010-05-15 13:37:38.000000000 +0200
++++ vim73_new/runtime/doc/vim-pl.UTF-8.1	2013-07-31 14:00:36.056513402 +0200
+@@ -17,11 +17,13 @@
  .PP
  .br
  .B ex
@@ -175,10 +191,10 @@ diff -up vim91/runtime/doc/vim-pl.UTF-8.1.manpagefixes vim91/runtime/doc/vim-pl.
  .B evim
  .B eview
  .br
-diff -up vim91/runtime/doc/vim-ru.1.manpagefixes vim91/runtime/doc/vim-ru.1
---- vim91/runtime/doc/vim-ru.1.manpagefixes	2024-11-15 06:32:23.000000000 +0100
-+++ vim91/runtime/doc/vim-ru.1	2024-11-29 12:17:53.558382649 +0100
-@@ -18,11 +18,13 @@
+diff -urN vim73/runtime/doc/vim-ru.1 vim73_new/runtime/doc/vim-ru.1
+--- vim73/runtime/doc/vim-ru.1	2010-05-15 13:04:00.000000000 +0200
++++ vim73_new/runtime/doc/vim-ru.1	2013-07-31 14:01:10.071337568 +0200
+@@ -17,11 +17,15 @@
  .PP
  .br
  .B ex
@@ -189,13 +205,15 @@ diff -up vim91/runtime/doc/vim-ru.1.manpagefixes vim91/runtime/doc/vim-ru.1
  .B gvim
  .B gview
 +.B vimx
- .B evim
- .B eview
++.B evim
++.B eview
  .br
-diff -up vim91/runtime/doc/vim-ru.UTF-8.1.manpagefixes vim91/runtime/doc/vim-ru.UTF-8.1
---- vim91/runtime/doc/vim-ru.UTF-8.1.manpagefixes	2024-11-15 06:32:23.000000000 +0100
-+++ vim91/runtime/doc/vim-ru.UTF-8.1	2024-11-29 12:17:53.558382649 +0100
-@@ -18,11 +18,13 @@ 锌褉芯谐褉邪屑屑懈褋褌芯胁.
+ .B rvim
+ .B rview
+diff -urN vim73/runtime/doc/vim-ru.UTF-8.1 vim73_new/runtime/doc/vim-ru.UTF-8.1
+--- vim73/runtime/doc/vim-ru.UTF-8.1	2010-05-15 13:04:00.000000000 +0200
++++ vim73_new/runtime/doc/vim-ru.UTF-8.1	2013-07-31 14:01:34.494493301 +0200
+@@ -17,11 +17,15 @@
  .PP
  .br
  .B ex
@@ -206,60 +224,62 @@ diff -up vim91/runtime/doc/vim-ru.UTF-8.1.manpagefixes vim91/runtime/doc/vim-ru.
  .B gvim
  .B gview
 +.B vimx
- .B evim
- .B eview
++.B evim
++.B eview
  .br
-diff -up vim91/runtime/doc/vimtutor.1.manpagefixes vim91/runtime/doc/vimtutor.1
---- vim91/runtime/doc/vimtutor.1.manpagefixes	2024-11-15 06:32:23.000000000 +0100
-+++ vim91/runtime/doc/vimtutor.1	2024-11-29 12:17:53.559382639 +0100
-@@ -8,6 +8,8 @@ vimtutor \- the Vim tutor
- .B vimtutor [\-h | \-\-help]
+ .B rvim
+ .B rview
+diff -urN vim73/runtime/doc/vimtutor.1 vim73_new/runtime/doc/vimtutor.1
+--- vim73/runtime/doc/vimtutor.1	2010-05-15 13:04:00.000000000 +0200
++++ vim73_new/runtime/doc/vimtutor.1	2013-07-31 14:10:10.093671964 +0200
+@@ -4,6 +4,8 @@
+ .SH SYNOPSIS
  .br
- .B vimtutor [\-\-list]
+ .B vimtutor [\-g] [language]
 +.br
 +.B gvimtutor
  .SH DESCRIPTION
  .B Vimtutor
  starts the
-diff -up vim91/runtime/doc/vimtutor-it.1.manpagefixes vim91/runtime/doc/vimtutor-it.1
---- vim91/runtime/doc/vimtutor-it.1.manpagefixes	2024-11-15 06:32:23.000000000 +0100
-+++ vim91/runtime/doc/vimtutor-it.1	2024-11-29 12:17:53.559382639 +0100
-@@ -8,6 +8,8 @@ vimtutor \- Un breve corso introduttivo
- .B vimtutor [\-h | \-\-help]
+diff -urN vim73/runtime/doc/vimtutor-it.1 vim73_new/runtime/doc/vimtutor-it.1
+--- vim73/runtime/doc/vimtutor-it.1	2010-07-27 22:35:32.000000000 +0200
++++ vim73_new/runtime/doc/vimtutor-it.1	2013-07-31 14:10:33.564861055 +0200
+@@ -4,6 +4,8 @@
+ .SH SINTASSI
  .br
- .B vimtutor [\-\-list]
+ .B vimtutor [\-g] [lingua]
 +.br
 +.B gvimtutor
  .SH DESCRIZIONE
  .B Vimtutor
  inizia il
-diff -up vim91/runtime/doc/vimtutor-it.UTF-8.1.manpagefixes vim91/runtime/doc/vimtutor-it.UTF-8.1
---- vim91/runtime/doc/vimtutor-it.UTF-8.1.manpagefixes	2024-11-15 06:32:23.000000000 +0100
-+++ vim91/runtime/doc/vimtutor-it.UTF-8.1	2024-11-29 12:17:53.559382639 +0100
-@@ -8,6 +8,8 @@ vimtutor \- Un breve corso introduttivo
- .B vimtutor [\-h | \-\-help]
+diff -urN vim73/runtime/doc/vimtutor-it.UTF-8.1 vim73_new/runtime/doc/vimtutor-it.UTF-8.1
+--- vim73/runtime/doc/vimtutor-it.UTF-8.1	2010-07-30 20:53:57.000000000 +0200
++++ vim73_new/runtime/doc/vimtutor-it.UTF-8.1	2013-07-31 14:10:40.483622016 +0200
+@@ -4,6 +4,8 @@
+ .SH SINTASSI
  .br
- .B vimtutor [\-\-list]
+ .B vimtutor [\-g] [lingua]
 +.br
 +.B gvimtutor
  .SH DESCRIZIONE
  .B Vimtutor
  inizia il
-diff -up vim91/runtime/doc/vimtutor.man.manpagefixes vim91/runtime/doc/vimtutor.man
---- vim91/runtime/doc/vimtutor.man.manpagefixes	2024-11-15 06:32:23.000000000 +0100
-+++ vim91/runtime/doc/vimtutor.man	2024-11-29 12:17:53.559382639 +0100
-@@ -8,6 +8,7 @@ SYNOPSIS
-        [ISO639]
-        vimtutor [-h | --help]
-        vimtutor [--list]
+diff -urN vim73/runtime/doc/vimtutor.man vim73_new/runtime/doc/vimtutor.man
+--- vim73/runtime/doc/vimtutor.man	2010-05-15 13:04:00.000000000 +0200
++++ vim73_new/runtime/doc/vimtutor.man	2013-07-31 14:11:04.786782356 +0200
+@@ -7,6 +7,7 @@
+ 
+ SYNOPSIS
+        vimtutor [-g] [language]
 +       gvimtutor
  
  DESCRIPTION
-        Vimtutor starts the Vim tutor.
-diff -up vim91/runtime/doc/vimtutor-pl.1.manpagefixes vim91/runtime/doc/vimtutor-pl.1
---- vim91/runtime/doc/vimtutor-pl.1.manpagefixes	2024-11-15 06:32:23.000000000 +0100
-+++ vim91/runtime/doc/vimtutor-pl.1	2024-11-29 12:17:53.559382639 +0100
-@@ -4,6 +4,8 @@ vimtutor \- nauczyciel Vima
+        Vimtutor starts the Vim tutor.  It copies the tutor file first, so that
+diff -urN vim73/runtime/doc/vimtutor-pl.1 vim73_new/runtime/doc/vimtutor-pl.1
+--- vim73/runtime/doc/vimtutor-pl.1	2010-05-15 13:04:00.000000000 +0200
++++ vim73_new/runtime/doc/vimtutor-pl.1	2013-07-31 14:11:13.602477777 +0200
+@@ -4,6 +4,8 @@
  .SH SYNOPSIS
  .br
  .B vimtutor -g [jêzyk]
@@ -268,10 +288,10 @@ diff -up vim91/runtime/doc/vimtutor-pl.1.manpagefixes vim91/runtime/doc/vimtutor
  .SH OPIS
  .B Vimtutor
  uruchamia nauczyciela
-diff -up vim91/runtime/doc/vimtutor-pl.UTF-8.1.manpagefixes vim91/runtime/doc/vimtutor-pl.UTF-8.1
---- vim91/runtime/doc/vimtutor-pl.UTF-8.1.manpagefixes	2024-11-15 06:32:23.000000000 +0100
-+++ vim91/runtime/doc/vimtutor-pl.UTF-8.1	2024-11-29 12:17:53.560382630 +0100
-@@ -4,6 +4,8 @@ vimtutor \- nauczyciel Vima
+diff -urN vim73/runtime/doc/vimtutor-pl.UTF-8.1 vim73_new/runtime/doc/vimtutor-pl.UTF-8.1
+--- vim73/runtime/doc/vimtutor-pl.UTF-8.1	2010-05-15 13:04:00.000000000 +0200
++++ vim73_new/runtime/doc/vimtutor-pl.UTF-8.1	2013-07-31 14:11:20.571237009 +0200
+@@ -4,6 +4,8 @@
  .SH SYNOPSIS
  .br
  .B vimtutor -g [język]
@@ -280,27 +300,27 @@ diff -up vim91/runtime/doc/vimtutor-pl.UTF-8.1.manpagefixes vim91/runtime/doc/vi
  .SH OPIS
  .B Vimtutor
  uruchamia nauczyciela
-diff -up vim91/runtime/doc/vimtutor-ru.1.manpagefixes vim91/runtime/doc/vimtutor-ru.1
---- vim91/runtime/doc/vimtutor-ru.1.manpagefixes	2024-11-29 12:17:53.560382630 +0100
-+++ vim91/runtime/doc/vimtutor-ru.1	2024-11-29 12:20:14.883047832 +0100
-@@ -8,6 +8,8 @@
- .B vimtutor [\-h | \-\-help]
+diff -urN vim73/runtime/doc/vimtutor-ru.1 vim73_new/runtime/doc/vimtutor-ru.1
+--- vim73/runtime/doc/vimtutor-ru.1	2010-05-15 13:04:00.000000000 +0200
++++ vim73_new/runtime/doc/vimtutor-ru.1	2013-07-31 14:11:35.673715221 +0200
+@@ -4,6 +4,8 @@
+ .SH 腼磲钿钺<E992BF> 篝蝻脶
  .br
- .B vimtutor [\-\-list]
+ .B vimtutor [掩偎]
 +.br
 +.B gvimtutor
  .SH ïðéóáîéå
- 鹣 讼土文<EFBFBD>
+ 胂土文<EFBFBD>
  .B vimtutor
-diff -up vim91/runtime/doc/vimtutor-ru.UTF-8.1.manpagefixes vim91/runtime/doc/vimtutor-ru.UTF-8.1
---- vim91/runtime/doc/vimtutor-ru.UTF-8.1.manpagefixes	2024-11-29 12:17:53.560382630 +0100
-+++ vim91/runtime/doc/vimtutor-ru.UTF-8.1	2024-11-29 12:19:27.318497067 +0100
-@@ -11,6 +11,8 @@ 袩褉芯谐褉邪屑屑邪 vimtutor \[em] 胁褘锌
+diff -urN vim73/runtime/doc/vimtutor-ru.UTF-8.1 vim73_new/runtime/doc/vimtutor-ru.UTF-8.1
+--- vim73/runtime/doc/vimtutor-ru.UTF-8.1	2010-05-15 13:04:00.000000000 +0200
++++ vim73_new/runtime/doc/vimtutor-ru.UTF-8.1	2013-07-31 14:11:46.649335999 +0200
+@@ -7,6 +7,8 @@
  .SH ОПИСÐ<C2A1>Ð<EFBFBD>ИЕ
- 袩芯 泻芯屑邪薪写械
+ 袣芯屑邪薪写邪
  .B vimtutor
 +.br
 +.B gvimtutor
- 胁褘锌芯谢薪褟械褌褋褟 蟹邪锌褍褋泻 褉械写邪泻褌芯褉邪
+ 蟹邪锌褍褋泻邪械褌 褍褔械斜薪懈泻 锌芯
  .B Vim.
- 褋 蟹邪谐褉褍卸械薪薪褘屑 褎邪泄谢芯屑, 褋芯写械褉卸邪褖械屑 褌械泻褋褌 褍褔械斜薪懈泻邪.
+ 袩褉懈 褝褌芯屑 褋薪邪褔邪谢邪 锌褉芯懈褋褏芯写懈褌 褋芯蟹写邪薪懈械 泻芯锌懈懈 褎邪泄谢邪 褍褔械斜薪懈泻邪, 

vim-update.sh

@@ -1,12 +1,12 @@
 #!/bin/bash
 debug=""
 #debug="echo "
-branches=( "rawhide" "f43" "f42" )
-releases=( "fc44" "fc43" "fc42" )
+branches=( "rawhide" "f37" "f36" "f35" )
+releases=( "fc38" "fc37" "fc36" "fc35" )
 # the first bodhi enabled release is the last without \| - all
 # others need to have \|
-regexps=( "fc44" "fc43" "\|fc42" )
-bodhi_enabled=( "0" "1" "1" )
+regexps=( "fc38" "fc37" "\|fc36" "\|fc35" )
+bodhi_enabled=( "0" "1" "1" "1" )
 needs_update=()
 #releases_regexp=fc28\\\|fc27\\\|fc28
 
@@ -28,6 +28,11 @@ if [ "x$1" == "x--force" ]; then
   force=1
 fi
 
+if [ "x$(grep -o VERSION_ID=35 /etc/os-release)" == "xVERSION_ID=35" ]
+then
+  BODHI_USER="--user $(id -un)"
+fi
+
 DATE=`date +"%a %b %d %Y"`
 $debug fedpkg switch-branch "${branches[@]: $branches_index: 1}"
 
@@ -123,9 +128,9 @@ if [ $CHANGES -ne 0 ]; then
      $debug fedpkg switch-branch $branch
 
      # merge with previous branch
-     $debug bash -c "git merge rawhide <<<':x'"
+     $debug bash -c "git merge ${branches[@]: $branches_index: 1} <<<':x'"
      if [ $? -ne 0 ]; then
-       echo "Error: git merge rawhide"
+       echo "Error: git merge ${branches[@]: $branches_index: 1}"
        exit 1
      fi
 
@@ -163,7 +168,8 @@ if [ $CHANGES -ne 0 ]; then
          # if branch isn't rawhide or branch is enabled in bodhi, create the update if newer branch does
          # not have an update in testing
          if [ $branch != "rawhide" ] || [ ${bodhi_enabled[@]: $bodhi_enabled_index: 1} -eq 1 ]; then
-           $debug bodhi updates new --type enhancement --notes "The newest upstream commit" --request testing --autotime --autokarma --stable-karma 3 --unstable-karma -3 vim-${UPSTREAMMAJOR}.${LASTPLFILLED}-1.${releases[@]: $release_index: 1}
+           # uses 'id' value for updates -> your username in OS must match with your username in Fedora accounts
+           $debug bodhi updates new ${BODHI_USER} --type enhancement --notes "The newest upstream commit" --request testing --autotime --autokarma --stable-karma 3 --unstable-karma -3 vim-${UPSTREAMMAJOR}.${LASTPLFILLED}-1.${releases[@]: $release_index: 1}
          fi
        else
          echo "Error when building package for $branch"

vimrc

@@ -54,14 +54,10 @@ if has("autocmd")
   " In text files, always limit the width of text to 78 characters
   " autocmd BufRead *.txt set tw=78
   " When editing a file, always jump to the last cursor position
-  " (taken from Vim's defaults.vim)
   autocmd BufReadPost *
-  \ let line = line("'\"")
-  \ | if line >= 1 && line <= line("$") && &filetype !~# 'commit'
-  \      && index(['xxd', 'gitrebase', 'tutor'], &filetype) == -1
-  \      && !&diff
-  \ |   execute "normal! g`\""
-  \ | endif
+  \ if line("'\"") > 0 && line ("'\"") <= line("$") |
+  \   exe "normal! g'\"" |
+  \ endif
   " don't write swapfile on most commonly used directories for NFS mounts or USB sticks
   autocmd BufNewFile,BufReadPre /media/*,/run/media/*,/mnt/* set directory=~/tmp,/var/tmp,/tmp
   " start with spec file template