Commit 42a761e7 authored by Benno Schulenberg's avatar Benno Schulenberg
Browse files

Adjusting the indentation after the previous change.

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5527 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
parent 0d85c8c6
Showing with 22 additions and 24 deletions
+22 -24
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
instead of doing it always. instead of doing it always.
* src/color.c (reset_multis): Abort when having no multiline regexes. * 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): A functionless shortcut should be impossible.
* src/nano.c (do_input): Adjust indentation.
2016-01-02 Benno Schulenberg <bensberg@justemail.net> 2016-01-02 Benno Schulenberg <bensberg@justemail.net>
* src/text.c (do_spell, do_formatter): Plug three tiny memory leaks. * src/text.c (do_spell, do_formatter): Plug three tiny memory leaks.
......
...@@ -1664,7 +1664,6 @@ int do_input(bool allow_funcs) ...@@ -1664,7 +1664,6 @@ int do_input(bool allow_funcs)
kbinput = (int *)nrealloc(kbinput, kbinput_len * kbinput = (int *)nrealloc(kbinput, kbinput_len *
sizeof(int)); sizeof(int));
kbinput[kbinput_len - 1] = input; kbinput[kbinput_len - 1] = input;
} }
} }
...@@ -1703,6 +1702,7 @@ int do_input(bool allow_funcs) ...@@ -1703,6 +1702,7 @@ int do_input(bool allow_funcs)
} }
if (have_shortcut) { if (have_shortcut) {
const subnfunc *f = sctofunc((sc *)s);
/* If the function associated with this shortcut is /* If the function associated with this shortcut is
* cutting or copying text, remember this. */ * cutting or copying text, remember this. */
if (s->scfunc == do_cut_text_void if (s->scfunc == do_cut_text_void
...@@ -1716,8 +1716,6 @@ int do_input(bool allow_funcs) ...@@ -1716,8 +1716,6 @@ int do_input(bool allow_funcs)
statusbar("Internal error: shortcut without function!"); statusbar("Internal error: shortcut without function!");
return ERR; return ERR;
} }
{
const subnfunc *f = sctofunc((sc *) s);
if (ISSET(VIEW_MODE) && f && !f->viewok) if (ISSET(VIEW_MODE) && f && !f->viewok)
print_view_warning(); print_view_warning();
else { else {
...@@ -1747,7 +1745,6 @@ int do_input(bool allow_funcs) ...@@ -1747,7 +1745,6 @@ int do_input(bool allow_funcs)
} }
} }
} }
}
/* If we aren't cutting or copying text, and the key wasn't a toggle, /* If we aren't cutting or copying text, and the key wasn't a toggle,
* blow away the text in the cutbuffer upon the next cutting action. */ * blow away the text in the cutbuffer upon the next cutting action. */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment