Adjusting the indentation after the previous change.

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

diff --git a/ChangeLog b/ChangeLog
index b359c2779f683b9fca1eb3efd89ff2ad83fbfc82..ee9529c9bcf6f304bed816616320e92e322eea45 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@
        instead of doing it always.
        * src/color.c (reset_multis): Abort when having no multiline regexes.
        * src/nano.c (do_input): A functionless shortcut should be impossible.
+       * src/nano.c (do_input): Adjust indentation.
 
 2016-01-02  Benno Schulenberg  <bensberg@justemail.net>
        * src/text.c (do_spell, do_formatter): Plug three tiny memory leaks.

diff --git a/src/nano.c b/src/nano.c
index 45fc33e28cce20b7e8868c8e2d85350f06368231..3007f6c75b2efaf6e02ab338d920f80f4d950f2f 100644 (file)
--- a/src/nano.c
+++ b/src/nano.c
@@ -1664,7 +1664,6 @@ int do_input(bool allow_funcs)
                kbinput = (int *)nrealloc(kbinput, kbinput_len *
                        sizeof(int));
                kbinput[kbinput_len - 1] = input;
-
            }
        }
 
@@ -1703,6 +1702,7 @@ int do_input(bool allow_funcs)
        }
 
        if (have_shortcut) {
+           const subnfunc *f = sctofunc((sc *)s);
            /* If the function associated with this shortcut is
             * cutting or copying text, remember this. */
            if (s->scfunc == do_cut_text_void
@@ -1716,34 +1716,31 @@ int do_input(bool allow_funcs)
                statusbar("Internal error: shortcut without function!");
                return ERR;
            }
-           {
-               const subnfunc *f = sctofunc((sc *) s);
-               if (ISSET(VIEW_MODE) && f && !f->viewok)
-                   print_view_warning();
-               else {
+           if (ISSET(VIEW_MODE) && f && !f->viewok)
+               print_view_warning();
+           else {
 #ifndef NANO_TINY
-                   if (s->scfunc == do_toggle_void) {
-                       do_toggle(s->toggle);
-                       if (s->toggle != CUT_TO_END)
-                           preserve = TRUE;
-                   } else
-#endif
-                   {
-                       /* Execute the function of the shortcut. */
-                       s->scfunc();
+               if (s->scfunc == do_toggle_void) {
+                   do_toggle(s->toggle);
+                   if (s->toggle != CUT_TO_END)
+                       preserve = TRUE;
+               } else
+#endif
+               {
+                   /* Execute the function of the shortcut. */
+                   s->scfunc();
 #ifndef DISABLE_COLOR
-                       if (f && !f->viewok)
-                           reset_multis(openfile->current, FALSE);
+                   if (f && !f->viewok)
+                       reset_multis(openfile->current, FALSE);
 #endif
-                       if (edit_refresh_needed) {
+                   if (edit_refresh_needed) {
 #ifdef DEBUG
-                           fprintf(stderr, "running edit_refresh() as edit_refresh_needed is true\n");
+                       fprintf(stderr, "running edit_refresh() as edit_refresh_needed is true\n");
 #endif
-                           edit_refresh();
-                           edit_refresh_needed = FALSE;
-                       } else if (s->scfunc == do_delete || s->scfunc == do_backspace)
-                           update_line(openfile->current, openfile->current_x);
-                   }
+                       edit_refresh();
+                       edit_refresh_needed = FALSE;
+                   } else if (s->scfunc == do_delete || s->scfunc == do_backspace)
+                       update_line(openfile->current, openfile->current_x);
                }
            }
        }