commit f5eeb92f40c6cc95b755d60baa476861716092a7
parent ae1ba5e25964093885041bdfd89999de35c48762
Author: Benno Schulenberg <bensberg@telfort.nl>
Date: Sun, 13 May 2018 09:47:40 +0200
tweaks: sort an option better, and reschedule a removal
Diffstat:
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/rcfile.c b/src/rcfile.c
@@ -39,9 +39,6 @@
static const rcoption rcopts[] = {
{"boldtext", BOLD_TEXT},
-#ifdef ENABLE_LINENUMBERS
- {"linenumbers", LINE_NUMBERS},
-#endif
#ifdef ENABLE_JUSTIFY
{"brackets", 0},
#endif
@@ -52,6 +49,9 @@ static const rcoption rcopts[] = {
#ifdef ENABLE_HISTORIES
{"historylog", HISTORYLOG},
#endif
+#ifdef ENABLE_LINENUMBERS
+ {"linenumbers", LINE_NUMBERS},
+#endif
{"morespace", MORE_SPACE},
#ifdef ENABLE_MOUSE
{"mouse", USE_MOUSE},
@@ -96,9 +96,9 @@ static const rcoption rcopts[] = {
{"backupdir", 0},
{"backwards", BACKWARDS_SEARCH},
{"casesensitive", CASE_SENSITIVE},
- {"cut", CUT_FROM_CURSOR}, /* deprecated form, remove in 2020 */
+ {"cut", CUT_FROM_CURSOR}, /* deprecated form, remove end of 2018 */
{"cutfromcursor", CUT_FROM_CURSOR},
- {"justifytrim", TRIM_BLANKS}, /* deprecated form, remove in 2020 */
+ {"justifytrim", TRIM_BLANKS}, /* deprecated form, remove end of 2018 */
{"locking", LOCKING},
{"matchbrackets", 0},
{"noconvert", NO_CONVERT},