From 33c7a4ca95c169a6260124f79bc24782d75b4608 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@telfort.nl>
Date: Sun, 18 Jun 2017 11:12:49 +0200
Subject: [PATCH] tweaks: adjust indentation after preceding changes
Also, shorten two variable names.
---
src/nano.c | 45 +++++++++++++++++++++------------------------
1 file changed, 21 insertions(+), 24 deletions(-)
diff --git a/src/nano.c b/src/nano.c
index 1690ddac..72df7cb7 100644
--- a/src/nano.c
+++ b/src/nano.c
@@ -2533,33 +2533,30 @@ int main(int argc, char **argv)
#endif
/* Read the named files on the command line into new buffers. */
- {
- while (optind < argc && (!openfile || ISSET(MULTIBUFFER))) {
- ssize_t givenline = 0, givencol = 0;
-
- /* If there's a +LINE or +LINE,COLUMN flag here, it is followed
- * by at least one other argument: the filename it applies to. */
- if (optind < argc - 1 && argv[optind][0] == '+') {
- if (!parse_line_column(&argv[optind++][1], &givenline, &givencol))
- statusline(ALERT, _("Invalid line or column number"));
- }
- /* If opening fails, don't try to position the cursor. */
- if (!open_buffer(argv[optind++], FALSE))
- continue;
+ while (optind < argc && (!openfile || ISSET(MULTIBUFFER))) {
+ ssize_t givenline = 0, givencol = 0;
+
+ /* If there's a +LINE[,COLUMN] argument here, eat it up. */
+ if (optind < argc - 1 && argv[optind][0] == '+') {
+ if (!parse_line_column(&argv[optind++][1], &givenline, &givencol))
+ statusline(ALERT, _("Invalid line or column number"));
+ }
+
+ /* If opening fails, don't try to position the cursor. */
+ if (!open_buffer(argv[optind++], FALSE))
+ continue;
- /* If a position was given on the command line, go there. */
- if (givenline > 0 || givencol > 0)
- do_gotolinecolumn(givenline, givencol, FALSE, FALSE);
+ /* If a position was given on the command line, go there. */
+ if (givenline > 0 || givencol > 0)
+ do_gotolinecolumn(givenline, givencol, FALSE, FALSE);
#ifndef DISABLE_HISTORIES
- else if (ISSET(POS_HISTORY)) {
- ssize_t savedposline, savedposcol;
- /* If edited before, restore the last cursor position. */
- if (has_old_position(argv[optind - 1], &savedposline, &savedposcol))
- do_gotolinecolumn(savedposline, savedposcol,
- FALSE, FALSE);
- }
-#endif
+ else if (ISSET(POS_HISTORY)) {
+ ssize_t savedline, savedcol;
+ /* If edited before, restore the last cursor position. */
+ if (has_old_position(argv[optind - 1], &savedline, &savedcol))
+ do_gotolinecolumn(savedline, savedcol, FALSE, FALSE);
}
+#endif
}
/* If no filenames were given, or all of them were invalid things like
--
GitLab