nano

commit b77b1391c3d50f3c32b5a98f0aea29e940ada66f
parent 7e0c4e572652f36b605bb4cd541733d88b9f86f0
Author: Benno Schulenberg <bensberg@justemail.net>
Date:   Fri, 26 Aug 2016 12:18:04 +0200

tweaks: improve some indentation and reshuffle a few lines

Diffstat:
M
src/browser.c
 | 
8
++++----
M
src/files.c
 | 
20
++++++++++----------
M
src/prompt.c
 | 
4
++--
M
src/search.c
 | 
40
++++++++++++++++++++--------------------

4 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/src/browser.c b/src/browser.c
@@ -681,13 +681,13 @@ int filesearch_init(void)
     /* This is now one simple call.  It just does a lot. */
     input = do_prompt(FALSE,
 #ifndef DISABLE_TABCOMP
-	TRUE,
+		TRUE,
 #endif
-	MWHEREISFILE, NULL,
+		MWHEREISFILE, NULL,
 #ifndef DISABLE_HISTORIES
-	&search_history,
+		&search_history,
 #endif
-	browser_refresh, "%s%s", _("Search"), buf);
+		browser_refresh, "%s%s", _("Search"), buf);
 
     /* Release buf now that we don't need it anymore. */
     free(buf);
diff --git a/src/files.c b/src/files.c
@@ -1085,21 +1085,21 @@ void do_insertfile(
     while (TRUE) {
 #ifndef NANO_TINY
 	if (execute) {
-	    msg =
 #ifndef DISABLE_MULTIBUFFER
-		ISSET(MULTIBUFFER) ?
-		_("Command to execute in new buffer [from %s] ") :
+	    if (ISSET(MULTIBUFFER))
+		msg = _("Command to execute in new buffer [from %s] ");
+	    else
 #endif
-		_("Command to execute [from %s] ");
+		msg = _("Command to execute [from %s] ");
 	} else
 #endif /* NANO_TINY */
 	{
-	    msg =
 #ifndef DISABLE_MULTIBUFFER
-		ISSET(MULTIBUFFER) ?
-		_("File to insert into new buffer [from %s] ") :
+	    if (ISSET(MULTIBUFFER))
+		msg = _("File to insert into new buffer [from %s] ");
+	    else
 #endif
-		_("File to insert [from %s] ");
+		msg = _("File to insert [from %s] ");
 	}
 
 	present_path = mallocstrcpy(present_path, "./");
@@ -1117,8 +1117,8 @@ void do_insertfile(
 #endif
 		edit_refresh, msg,
 #ifndef DISABLE_OPERATINGDIR
-		operating_dir != NULL && strcmp(operating_dir,
-		".") != 0 ? operating_dir :
+		operating_dir != NULL && strcmp(operating_dir, ".") != 0 ?
+		operating_dir :
 #endif
 		"./");
 
diff --git a/src/prompt.c b/src/prompt.c
@@ -546,7 +546,7 @@ functionptrtype acquire_an_answer(int *actual, bool allow_tabs,
     }
 
 #ifdef DEBUG
-    fprintf(stderr, "acquire_an_answer: answer = \"%s\", statusbar_x = %lu\n", answer, (unsigned long) statusbar_x);
+    fprintf(stderr, "acquiring: answer = \"%s\", statusbar_x = %lu\n", answer, (unsigned long) statusbar_x);
 #endif
 
     update_the_statusbar();
@@ -709,7 +709,7 @@ int do_prompt(bool allow_tabs,
 {
     va_list ap;
     int retval = KEY_WINCH;
-    functionptrtype func;
+    functionptrtype func = NULL;
 #ifndef DISABLE_TABCOMP
     bool listed = FALSE;
 #endif
diff --git a/src/search.c b/src/search.c
@@ -155,32 +155,32 @@ int search_init(bool replacing, bool use_answer)
     /* This is now one simple call.  It just does a lot. */
     i = do_prompt(FALSE,
 #ifndef DISABLE_TABCOMP
-	TRUE,
+		TRUE,
 #endif
-	replacing ? MREPLACE : MWHEREIS, backupstring,
+		replacing ? MREPLACE : MWHEREIS, backupstring,
 #ifndef DISABLE_HISTORIES
-	&search_history,
+		&search_history,
 #endif
-	/* TRANSLATORS: This is the main search prompt. */
-	edit_refresh, "%s%s%s%s%s%s", _("Search"),
+		/* TRANSLATORS: This is the main search prompt. */
+		edit_refresh, "%s%s%s%s%s%s", _("Search"),
 #ifndef NANO_TINY
-	/* TRANSLATORS: The next three strings are modifiers of the search prompt. */
-	ISSET(CASE_SENSITIVE) ? _(" [Case Sensitive]") :
+		/* TRANSLATORS: The next three modify the search prompt. */
+		ISSET(CASE_SENSITIVE) ? _(" [Case Sensitive]") :
 #endif
-	"",
+		"",
 #ifdef HAVE_REGEX_H
-	ISSET(USE_REGEXP) ? _(" [Regexp]") :
+		ISSET(USE_REGEXP) ? _(" [Regexp]") :
 #endif
-	"",
+		"",
 #ifndef NANO_TINY
-	ISSET(BACKWARDS_SEARCH) ? _(" [Backwards]") :
+		ISSET(BACKWARDS_SEARCH) ? _(" [Backwards]") :
 #endif
-	"", replacing ?
+		"", replacing ?
 #ifndef NANO_TINY
-	/* TRANSLATORS: The next two strings are modifiers of the search prompt. */
-	openfile->mark_set ? _(" (to replace) in selection") :
+		/* TRANSLATORS: The next two modify the search prompt. */
+		openfile->mark_set ? _(" (to replace) in selection") :
 #endif
-	_(" (to replace)") : "", buf);
+		_(" (to replace)") : "", buf);
 
     /* Release buf now that we don't need it anymore. */
     free(buf);
@@ -834,14 +834,14 @@ void do_replace(void)
 
     i = do_prompt(FALSE,
 #ifndef DISABLE_TABCOMP
-	TRUE,
+		TRUE,
 #endif
-	MREPLACEWITH, NULL,
+		MREPLACEWITH, NULL,
 #ifndef DISABLE_HISTORIES
-	&replace_history,
+		&replace_history,
 #endif
-	/* TRANSLATORS: This is a prompt. */
-	edit_refresh, _("Replace with"));
+		/* TRANSLATORS: This is a prompt. */
+		edit_refresh, _("Replace with"));
 
 #ifndef DISABLE_HISTORIES
     /* If the replace string is not "", add it to the replace history list. */