nano

commit e5fee7e649addebef9180e68993d798c504eb73d
parent 836fa7066a47b95b6c7c1d9036c6c66508b33f5e
Author: Benno Schulenberg <bensberg@justemail.net>
Date:   Sun,  7 Feb 2016 13:37:16 +0000

Normalizing a bit of indentation.


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5619 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

Diffstat:
M
ChangeLog
 | 
1
+
M
src/prompt.c
 | 
59
+++++++++++++++++++++++++----------------------------------

2 files changed, 26 insertions(+), 34 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -6,6 +6,7 @@
 	* src/files.c (write_file): Elide an unneeded 'if'.
 	* doc/syntax/c.nanorc: Use a character class instead of a literal tab
 	and space.  The change was inspired by David Niklas.
+	* src/prompt.c (do_yesno_prompt): Normalize the indentation.
 
 2016-02-06  Benno Schulenberg  <bensberg@justemail.net>
 	* src/files.c (write_file): Remove the --nofollow option that hasn't
diff --git a/src/prompt.c b/src/prompt.c
@@ -913,46 +913,37 @@ int do_yesno_prompt(bool all, const char *msg)
 	    ok = -1;
 #ifndef DISABLE_MOUSE
 	else if (kbinput == KEY_MOUSE) {
-		/* We can click on the Yes/No/All shortcut list to
-		 * select an answer. */
-		if (get_mouseinput(&mouse_x, &mouse_y, FALSE) == 0 &&
-			wmouse_trafo(bottomwin, &mouse_y, &mouse_x,
-			FALSE) && mouse_x < (width * 2) &&
-			mouse_y > 0) {
-		    int x = mouse_x / width;
-			/* Calculate the x-coordinate relative to the
-			 * two columns of the Yes/No/All shortcuts in
-			 * bottomwin. */
-		    int y = mouse_y - 1;
-			/* Calculate the y-coordinate relative to the
-			 * beginning of the Yes/No/All shortcuts in
-			 * bottomwin, i.e. with the sizes of topwin,
-			 * edit, and the first line of bottomwin
-			 * subtracted out. */
-
-		    assert(0 <= x && x <= 1 && 0 <= y && y <= 1);
-
-		    /* x == 0 means they clicked Yes or No.  y == 0
-		     * means Yes or All. */
-		    ok = -2 * x * y + x - y + 1;
-
-		    if (ok == 2 && !all)
-			ok = -2;
-		}
+	    /* We can click on the Yes/No/All shortcuts to select an answer. */
+	    if (get_mouseinput(&mouse_x, &mouse_y, FALSE) == 0 &&
+			wmouse_trafo(bottomwin, &mouse_y, &mouse_x, FALSE) &&
+			mouse_x < (width * 2) && mouse_y > 0) {
+		int x = mouse_x / width;
+			/* The x-coordinate among the Yes/No/All shortcuts. */
+		int y = mouse_y - 1;
+			/* The y-coordinate among the Yes/No/All shortcuts. */
+
+		assert(0 <= x && x <= 1 && 0 <= y && y <= 1);
+
+		/* x == 0 means they clicked Yes or No.
+		 * y == 0 means Yes or All. */
+		ok = -2 * x * y + x - y + 1;
+
+		if (ok == 2 && !all)
+		    ok = -2;
+	    }
 	}
 #endif /* !DISABLE_MOUSE */
 	else if (func == total_refresh) {
 	    total_redraw();
 	    continue;
 	} else {
-		/* Look for the kbinput in the Yes, No and (optionally)
-		 * All strings. */
-		if (strchr(yesstr, kbinput) != NULL)
-		    ok = 1;
-		else if (strchr(nostr, kbinput) != NULL)
-		    ok = 0;
-		else if (all && strchr(allstr, kbinput) != NULL)
-		    ok = 2;
+	    /* Look for the kbinput in the Yes, No (and All) strings. */
+	    if (strchr(yesstr, kbinput) != NULL)
+		ok = 1;
+	    else if (strchr(nostr, kbinput) != NULL)
+		ok = 0;
+	    else if (all && strchr(allstr, kbinput) != NULL)
+		ok = 2;
 	}
     } while (ok == -2);