From 85c0b3c37ed07f2592c8158ddaa133eefbf4d5f3 Mon Sep 17 00:00:00 2001
From: David Lawrence Ramsey <pooka109@gmail.com>
Date: Wed, 29 Jun 2005 17:10:58 +0000
Subject: [PATCH] improve version()'s output
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2795 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
---
ChangeLog | 4 ++++
src/nano.c | 28 +++++++++++++++-------------
2 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 43c69b62..f01d0b81 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -233,6 +233,10 @@ CVS code -
- Add missing N_() around one message, so that it isn't
erroneously translated twice. (DLR)
- Remove inaccurate default listed for -Q/--quotestr. (DLR)
+ version()
+ - Add --enable-utf8 to the displayed compilation options, put
+ the options in alphabetical order, and handle --enable-tiny
+ the same way as all the other options. (DLR)
do_tab()
- Remove unneeded variable kbinput. (DLR)
do_int_spell_fix()
diff --git a/src/nano.c b/src/nano.c
index e3b67101..c6a8eb60 100644
--- a/src/nano.c
+++ b/src/nano.c
@@ -1117,18 +1117,6 @@ void version(void)
_(" Email: nano@nano-editor.org Web: http://www.nano-editor.org/"));
printf(_("\n Compiled options:"));
-#ifndef ENABLE_NLS
- printf(" --disable-nls");
-#endif
-#ifdef DEBUG
- printf(" --enable-debug");
-#endif
-#ifdef NANO_EXTRA
- printf(" --enable-extra");
-#endif
-#ifdef NANO_SMALL
- printf(" --enable-tiny");
-#else
#ifdef DISABLE_BROWSER
printf(" --disable-browser");
#endif
@@ -1141,6 +1129,9 @@ void version(void)
#ifdef DISABLE_MOUSE
printf(" --disable-mouse");
#endif
+#ifndef ENABLE_NLS
+ printf(" --disable-nls");
+#endif
#ifdef DISABLE_OPERATINGDIR
printf(" --disable-operatingdir");
#endif
@@ -1150,7 +1141,6 @@ void version(void)
#ifdef DISABLE_TABCOMP
printf(" --disable-tabcomp");
#endif
-#endif /* NANO_SMALL */
#ifdef DISABLE_WRAPPING
printf(" --disable-wrapping");
#endif
@@ -1160,12 +1150,24 @@ void version(void)
#ifdef ENABLE_COLOR
printf(" --enable-color");
#endif
+#ifdef DEBUG
+ printf(" --enable-debug");
+#endif
+#ifdef NANO_EXTRA
+ printf(" --enable-extra");
+#endif
#ifdef ENABLE_MULTIBUFFER
printf(" --enable-multibuffer");
#endif
#ifdef ENABLE_NANORC
printf(" --enable-nanorc");
#endif
+#ifdef NANO_SMALL
+ printf(" --enable-tiny");
+#endif
+#ifdef NANO_WIDE
+ printf(" --enable-utf8");
+#endif
#ifdef USE_SLANG
printf(" --with-slang");
#endif
--
GitLab