STRLCPY/neomutt

sort things alphabetically
Richard Russon committed 2 years ago

03d5a32c

1 parent 7e5fd3ba

Revision indexing in progress... (symbol navigation in revisions will be accurate after indexed)

■ ■ ■ ■ ■ ■

color/color.c

		skipped 102 lines
103	103		{
104	104		return (cid == MT_COLOR_ATTACH_HEADERS) \|\| (cid == MT_COLOR_BODY) \|\|
105	105		(cid == MT_COLOR_HEADER) \|\| (cid == MT_COLOR_INDEX) \|\|
106		-	(cid == MT_COLOR_INDEX_AUTHOR) \|\| (cid == MT_COLOR_INDEX_FLAGS) \|\|
107		-	(cid == MT_COLOR_INDEX_SUBJECT) \|\| (cid == MT_COLOR_INDEX_TAG) \|\|
108		-	(cid == MT_COLOR_INDEX_COLLAPSED) \|\| (cid == MT_COLOR_INDEX_DATE) \|\|
	106	+	(cid == MT_COLOR_INDEX_AUTHOR) \|\| (cid == MT_COLOR_INDEX_COLLAPSED) \|\|
	107	+	(cid == MT_COLOR_INDEX_DATE) \|\| (cid == MT_COLOR_INDEX_FLAGS) \|\|
109	108		(cid == MT_COLOR_INDEX_LABEL) \|\| (cid == MT_COLOR_INDEX_NUMBER) \|\|
110		-	(cid == MT_COLOR_INDEX_SIZE) \|\| (cid == MT_COLOR_INDEX_TAGS) \|\|
	109	+	(cid == MT_COLOR_INDEX_SIZE) \|\| (cid == MT_COLOR_INDEX_SUBJECT) \|\|
	110	+	(cid == MT_COLOR_INDEX_TAG) \|\| (cid == MT_COLOR_INDEX_TAGS) \|\|
111	111		(cid == MT_COLOR_STATUS);
112	112		}
113	113

■ ■ ■ ■ ■ ■

color/color.h

		skipped 72 lines
73	73		MT_COLOR_TREE, ///< Index: tree-drawing characters
74	74		MT_COLOR_UNDERLINE, ///< Underlined text
75	75		MT_COLOR_WARNING, ///< Warning messages
76		-	/* please no non-MT_COLOR_INDEX objects after this point */
77		-	MT_COLOR_INDEX, ///< Index: default colour (takes a pattern)
78		-	MT_COLOR_INDEX_AUTHOR, ///< Index: author field (takes a pattern)
79		-	MT_COLOR_INDEX_FLAGS, ///< Index: flags field (takes a pattern)
80		-	MT_COLOR_INDEX_SUBJECT, ///< Index: subject field (takes a pattern)
81		-	MT_COLOR_INDEX_TAG, ///< Index: tag field (%g, takes a pattern)
	76	+	// Index colours which all take a pattern
	77	+	MT_COLOR_INDEX, ///< Index: default colour
	78	+	MT_COLOR_INDEX_AUTHOR, ///< Index: author field
82	79		MT_COLOR_INDEX_COLLAPSED, ///< Index: number of messages in collapsed thread
83	80		MT_COLOR_INDEX_DATE, ///< Index: date field
	81	+	MT_COLOR_INDEX_FLAGS, ///< Index: flags field
84	82		MT_COLOR_INDEX_LABEL, ///< Index: label field
85	83		MT_COLOR_INDEX_NUMBER, ///< Index: index number
86	84		MT_COLOR_INDEX_SIZE, ///< Index: size field
	85	+	MT_COLOR_INDEX_SUBJECT, ///< Index: subject field
	86	+	MT_COLOR_INDEX_TAG, ///< Index: tag field (%g)
87	87		MT_COLOR_INDEX_TAGS, ///< Index: tags field (%g, %J)
88	88		MT_COLOR_MAX,
89	89		};
		skipped 20 lines

■ ■ ■ ■ ■ ■

color/regex.c

		skipped 50 lines
51	51		struct RegexColorList IndexAuthorList; ///< List of colours applied to the author in the index
52	52		struct RegexColorList IndexCollapsedList; ///< List of colours applied to a collapsed thread in the index
53	53		struct RegexColorList IndexDateList; ///< List of colours applied to the date in the index
	54	+	struct RegexColorList IndexFlagsList; ///< List of colours applied to the flags in the index
54	55		struct RegexColorList IndexLabelList; ///< List of colours applied to the label in the index
	56	+	struct RegexColorList IndexList; ///< List of default colours applied to the index
55	57		struct RegexColorList IndexNumberList; ///< List of colours applied to the message number in the index
56	58		struct RegexColorList IndexSizeList; ///< List of colours applied to the size in the index
57		-	struct RegexColorList IndexTagsList; ///< List of colours applied to the tags in the index
58		-	struct RegexColorList IndexFlagsList; ///< List of colours applied to the flags in the index
59		-	struct RegexColorList IndexList; ///< List of default colours applied to the index
60	59		struct RegexColorList IndexSubjectList; ///< List of colours applied to the subject in the index
61	60		struct RegexColorList IndexTagList; ///< List of colours applied to tags in the index
	61	+	struct RegexColorList IndexTagsList; ///< List of colours applied to the tags in the index
62	62		struct RegexColorList StatusList; ///< List of colours applied to the status bar
63	63		// clang-format on
64	64
		skipped 130 lines
195	195		return &IndexList;
196	196		case MT_COLOR_INDEX_AUTHOR:
197	197		return &IndexAuthorList;
198		-	case MT_COLOR_INDEX_FLAGS:
199		-	return &IndexFlagsList;
200		-	case MT_COLOR_INDEX_SUBJECT:
201		-	return &IndexSubjectList;
202		-	case MT_COLOR_INDEX_TAG:
203		-	return &IndexTagList;
204	198		case MT_COLOR_INDEX_COLLAPSED:
205	199		return &IndexCollapsedList;
206	200		case MT_COLOR_INDEX_DATE:
207	201		return &IndexDateList;
	202	+	case MT_COLOR_INDEX_FLAGS:
	203	+	return &IndexFlagsList;
208	204		case MT_COLOR_INDEX_LABEL:
209	205		return &IndexLabelList;
210	206		case MT_COLOR_INDEX_NUMBER:
211	207		return &IndexNumberList;
212	208		case MT_COLOR_INDEX_SIZE:
213	209		return &IndexSizeList;
	210	+	case MT_COLOR_INDEX_SUBJECT:
	211	+	return &IndexSubjectList;
	212	+	case MT_COLOR_INDEX_TAG:
	213	+	return &IndexTagList;
214	214		case MT_COLOR_INDEX_TAGS:
215	215		return &IndexTagsList;
216	216		case MT_COLOR_STATUS:
		skipped 146 lines
363	363		break;
364	364		case MT_COLOR_INDEX:
365	365		case MT_COLOR_INDEX_AUTHOR:
366		-	case MT_COLOR_INDEX_FLAGS:
367		-	case MT_COLOR_INDEX_SUBJECT:
368		-	case MT_COLOR_INDEX_TAG:
369	366		case MT_COLOR_INDEX_COLLAPSED:
370	367		case MT_COLOR_INDEX_DATE:
	368	+	case MT_COLOR_INDEX_FLAGS:
371	369		case MT_COLOR_INDEX_LABEL:
372	370		case MT_COLOR_INDEX_NUMBER:
373	371		case MT_COLOR_INDEX_SIZE:
	372	+	case MT_COLOR_INDEX_SUBJECT:
	373	+	case MT_COLOR_INDEX_TAG:
374	374		case MT_COLOR_INDEX_TAGS:
375	375		sensitive = true;
376	376		is_index = true;
		skipped 109 lines

■ ■ ■ ■ ■ ■

index/index.c

		skipped 275 lines
276	276
277	277		// MT_COLOR_MAX is sent on `uncolor *`
278	278		if (!((cid == MT_COLOR_INDEX) \|\| (cid == MT_COLOR_INDEX_AUTHOR) \|\|
279		-	(cid == MT_COLOR_INDEX_FLAGS) \|\| (cid == MT_COLOR_INDEX_SUBJECT) \|\|
280		-	(cid == MT_COLOR_INDEX_TAG) \|\| (cid == MT_COLOR_INDEX_COLLAPSED) \|\|
281		-	(cid == MT_COLOR_INDEX_DATE) \|\| (cid == MT_COLOR_INDEX_LABEL) \|\|
	279	+	(cid == MT_COLOR_INDEX_COLLAPSED) \|\| (cid == MT_COLOR_INDEX_DATE) \|\|
	280	+	(cid == MT_COLOR_INDEX_FLAGS) \|\| (cid == MT_COLOR_INDEX_LABEL) \|\|
282	281		(cid == MT_COLOR_INDEX_NUMBER) \|\| (cid == MT_COLOR_INDEX_SIZE) \|\|
283		-	(cid == MT_COLOR_INDEX_TAGS) \|\| (cid == MT_COLOR_TREE) \|\|
284		-	(cid == MT_COLOR_NORMAL) \|\| (cid == MT_COLOR_MAX)))
	282	+	(cid == MT_COLOR_INDEX_SUBJECT) \|\| (cid == MT_COLOR_INDEX_TAG) \|\|
	283	+	(cid == MT_COLOR_INDEX_TAGS) \|\| (cid == MT_COLOR_MAX) \|\|
	284	+	(cid == MT_COLOR_NORMAL) \|\| (cid == MT_COLOR_TREE)))
285	285		{
286	286		// The changes aren't relevant to the index menu
287	287		return 0;
		skipped 376 lines

sort things alphabetically