nano

commit 5c5806bbe7f2d23c43e6c770caa489e67c6005a8
parent 16a3dc90c7f3a9d09b24725cef0346abcfa02c31
Author: Benno Schulenberg <bensberg@telfort.nl>
Date:   Sun, 21 Oct 2018 15:00:21 +0200

wrapping: make the --fill option override 'set fill' again

This completes the reverting of commit e90b7cf4 as intended by the
previous commit.

Diffstat:
M
src/nano.c
 | 
4
++--

1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/nano.c b/src/nano.c
@@ -2315,7 +2315,7 @@ int main(int argc, char **argv)
 	if (!no_rcfiles) {
 		/* Back up the command-line options, then clear the strings. */
 #ifdef ENABLED_WRAPORJUSTIFY
-		ssize_t fill_cmdline = fill;
+		ssize_t wrap_at_cmdline = wrap_at;
 #endif
 #ifndef NANO_TINY
 		char *backup_dir_cmdline = backup_dir;
@@ -2361,7 +2361,7 @@ int main(int argc, char **argv)
 		/* If the backed-up command-line options have a value, restore them. */
 #ifdef ENABLED_WRAPORJUSTIFY
 		if (fill_used)
-			fill = fill_cmdline;
+			wrap_at = wrap_at_cmdline;
 #endif
 #ifndef NANO_TINY
 		if (backup_dir_cmdline != NULL) {