Skip to content

Commit 8a932f9

Browse files
geoffmclgeoffmcl
committed
Issue #456 - Oops, incorrect merge conflict
1 parent 049bc6c commit 8a932f9

File tree

1 file changed

+34
-34
lines changed

1 file changed

+34
-34
lines changed

‎src/config.c

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -279,40 +279,40 @@ static const TidyOptionImpl option_defs[] =
279279
#if SUPPORT_ASIAN_ENCODINGS
280280
{ TidyPunctWrap, PP, "punctuation-wrap", BL, no, ParsePickList, &boolPicks },
281281
#endif
282-
{ TidyQuiet, MS, "quiet", BL, no, ParseBool, boolPicks },
283-
{ TidyQuoteAmpersand, MU, "quote-ampersand", BL, yes, ParseBool, boolPicks },
284-
{ TidyQuoteMarks, MU, "quote-marks", BL, no, ParseBool, boolPicks },
285-
{ TidyQuoteNbsp, MU, "quote-nbsp", BL, yes, ParseBool, boolPicks },
286-
{ TidyReplaceColor, MU, "replace-color", BL, no, ParseBool, boolPicks },
287-
{ TidyShowErrors, DG, "show-errors", IN, 6, ParseInt, NULL },
288-
{ TidyShowInfo, DG, "show-info", BL, yes, ParseBool, boolPicks },
289-
{ TidyShowMarkup, PP, "markup", BL, yes, ParseBool, boolPicks },
290-
{ TidyShowWarnings, DG, "show-warnings", BL, yes, ParseBool, boolPicks },
291-
{ TidySkipNested, MU, "skip-nested", BL, yes, ParseBool, boolPicks }, /* 1642186 - Issue #65 */
292-
{ TidySortAttributes, PP, "sort-attributes", IN, TidySortAttrNone,ParseSorter, sorterPicks },
293-
{ TidyStrictTagsAttr, MU, "strict-tags-attributes", BL, no, ParseBool, boolPicks }, /* 20160209 - Issue #350 */
294-
{ TidyTabSize, PP, "tab-size", IN, 8, ParseInt, NULL },
295-
{ TidyUpperCaseAttrs, MU, "uppercase-attributes", BL, no, ParseBool, boolPicks },
296-
{ TidyUpperCaseTags, MU, "uppercase-tags", BL, no, ParseBool, boolPicks },
297-
{ TidyUseCustomTags, MU, "custom-tags", IN, TidyCustomNo, ParseUseCustomTags,customTagsPicks }, /* 20170309 - Issue #119 */
298-
{ TidyVertSpace, PP, "vertical-space", IN, no, ParseAutoBool, autoBoolPicks }, /* #228 - tri option */
299-
{ TidyWarnPropAttrs, MU, "warn-proprietary-attributes", BL, yes, ParseBool, boolPicks },
300-
{ TidyWord2000, MU, "word-2000", BL, no, ParseBool, boolPicks },
301-
{ TidyWrapAsp, PP, "wrap-asp", BL, yes, ParseBool, boolPicks },
302-
{ TidyWrapAttVals, PP, "wrap-attributes", BL, no, ParseBool, boolPicks },
303-
{ TidyWrapJste, PP, "wrap-jste", BL, yes, ParseBool, boolPicks },
304-
{ TidyWrapLen, PP, "wrap", IN, 68, ParseInt, NULL },
305-
{ TidyWrapPhp, PP, "wrap-php", BL, yes, ParseBool, boolPicks },
306-
{ TidyWrapScriptlets, PP, "wrap-script-literals", BL, no, ParseBool, boolPicks },
307-
{ TidyWrapSection, PP, "wrap-sections", BL, yes, ParseBool, boolPicks },
308-
{ TidyWriteBack, MS, "write-back", BL, no, ParseBool, boolPicks },
309-
{ TidyXhtmlOut, MU, "output-xhtml", BL, no, ParseBool, boolPicks },
310-
{ TidyXmlDecl, MU, "add-xml-decl", BL, no, ParseBool, boolPicks },
311-
{ TidyXmlOut, MU, "output-xml", BL, no, ParseBool, boolPicks },
312-
{ TidyXmlPIs, MU, "assume-xml-procins", BL, no, ParseBool, boolPicks },
313-
{ TidyXmlSpace, MU, "add-xml-space", BL, no, ParseBool, boolPicks },
314-
{ TidyXmlTags, MU, "input-xml", BL, no, ParseBool, boolPicks },
315-
{ TidyMetaCharset, MS, "add-meta-charset", BL, no, ParseBool, boolPicks }, /* 20161004 - Issue #456 */
282+
{ TidyQuiet, MS, "quiet", BL, no, ParsePickList, &boolPicks },
283+
{ TidyQuoteAmpersand, MU, "quote-ampersand", BL, yes, ParsePickList, &boolPicks },
284+
{ TidyQuoteMarks, MU, "quote-marks", BL, no, ParsePickList, &boolPicks },
285+
{ TidyQuoteNbsp, MU, "quote-nbsp", BL, yes, ParsePickList, &boolPicks },
286+
{ TidyReplaceColor, MU, "replace-color", BL, no, ParsePickList, &boolPicks },
287+
{ TidyShowErrors, DG, "show-errors", IN, 6, ParseInt, NULL },
288+
{ TidyShowInfo, DG, "show-info", BL, yes, ParsePickList, &boolPicks },
289+
{ TidyShowMarkup, PP, "markup", BL, yes, ParsePickList, &boolPicks },
290+
{ TidyShowWarnings, DG, "show-warnings", BL, yes, ParsePickList, &boolPicks },
291+
{ TidySkipNested, MU, "skip-nested", BL, yes, ParsePickList, &boolPicks }, /* 1642186 - Issue #65 */
292+
{ TidySortAttributes, PP, "sort-attributes", IN, TidySortAttrNone,ParsePickList, &sorterPicks },
293+
{ TidyStrictTagsAttr, MU, "strict-tags-attributes", BL, no, ParsePickList, &boolPicks }, /* 20160209 - Issue #350 */
294+
{ TidyTabSize, PP, "tab-size", IN, 8, ParseInt, NULL },
295+
{ TidyUpperCaseAttrs, MU, "uppercase-attributes", IN, TidyUppercaseNo, ParsePickList, &attributeCasePicks },
296+
{ TidyUpperCaseTags, MU, "uppercase-tags", BL, no, ParsePickList, &boolPicks },
297+
{ TidyUseCustomTags, MU, "custom-tags", IN, TidyCustomNo, ParsePickList, &customTagsPicks }, /* 20170309 - Issue #119 */
298+
{ TidyVertSpace, PP, "vertical-space", IN, no, ParsePickList, &autoBoolPicks }, /* #228 - tri option */
299+
{ TidyWarnPropAttrs, MU, "warn-proprietary-attributes", BL, yes, ParsePickList, &boolPicks },
300+
{ TidyWord2000, MU, "word-2000", BL, no, ParsePickList, &boolPicks },
301+
{ TidyWrapAsp, PP, "wrap-asp", BL, yes, ParsePickList, &boolPicks },
302+
{ TidyWrapAttVals, PP, "wrap-attributes", BL, no, ParsePickList, &boolPicks },
303+
{ TidyWrapJste, PP, "wrap-jste", BL, yes, ParsePickList, &boolPicks },
304+
{ TidyWrapLen, PP, "wrap", IN, 68, ParseInt, NULL },
305+
{ TidyWrapPhp, PP, "wrap-php", BL, yes, ParsePickList, &boolPicks },
306+
{ TidyWrapScriptlets, PP, "wrap-script-literals", BL, no, ParsePickList, &boolPicks },
307+
{ TidyWrapSection, PP, "wrap-sections", BL, yes, ParsePickList, &boolPicks },
308+
{ TidyWriteBack, MS, "write-back", BL, no, ParsePickList, &boolPicks },
309+
{ TidyXhtmlOut, MU, "output-xhtml", BL, no, ParsePickList, &boolPicks },
310+
{ TidyXmlDecl, MU, "add-xml-decl", BL, no, ParsePickList, &boolPicks },
311+
{ TidyXmlOut, MU, "output-xml", BL, no, ParsePickList, &boolPicks },
312+
{ TidyXmlPIs, MU, "assume-xml-procins", BL, no, ParsePickList, &boolPicks },
313+
{ TidyXmlSpace, MU, "add-xml-space", BL, no, ParsePickList, &boolPicks },
314+
{ TidyXmlTags, MU, "input-xml", BL, no, ParsePickList, &boolPicks },
315+
{ TidyMetaCharset, MS, "add-meta-charset", BL, no, ParsePickList, &boolPicks }, /* 20161004 - Issue #456 */
316316
{ N_TIDY_OPTIONS, XX, NULL, XY, 0, NULL, NULL }
317317
};
318318

0 commit comments

Comments
 (0)