[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Nano-devel] [PATCH 07/15] options: let --fill no longer imply automatic
From: |
Benno Schulenberg |
Subject: |
[Nano-devel] [PATCH 07/15] options: let --fill no longer imply automatic hard-wrapping |
Date: |
Thu, 31 Jan 2019 17:49:33 +0100 |
Now --fill only sets the target width for hard-wrapping and justifying,
but automatic hard-wrapping itself is switched on with --breaklonglines.
---
src/nano.c | 3 ---
src/rcfile.c | 3 +--
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/src/nano.c b/src/nano.c
index 6be5932c..1c7775ea 100644
--- a/src/nano.c
+++ b/src/nano.c
@@ -2262,9 +2262,6 @@ int main(int argc, char **argv)
}
#ifdef ENABLE_NANORC
fill_used = TRUE;
-#endif
-#ifdef ENABLE_WRAPPING
- SET(BREAK_LONG_LINES);
#endif
break;
#endif
diff --git a/src/rcfile.c b/src/rcfile.c
index c81fd7d7..295a94d5 100644
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -1111,8 +1111,7 @@ void parse_rcfile(FILE *rcstream, bool syntax_only)
rcfile_error(N_("Requested fill size \"%s\" is
invalid"),
option);
fill = -COLUMNS_FROM_EOL;
- } else
- UNSET(NO_WRAP);
+ }
free(option);
} else
#endif
--
2.19.2
- [Nano-devel] [PATCH 01/15] options: add -b, --breaklonglines, the counterpart of --nowrap, Benno Schulenberg, 2019/01/31
- [Nano-devel] [PATCH 02/15] options: add -f, --finalnewline, the counterpart of --nonewlines, Benno Schulenberg, 2019/01/31
- [Nano-devel] [PATCH 03/15] options: add -j, --jumpyscrolling, the counterpart of --smooth, Benno Schulenberg, 2019/01/31
- [Nano-devel] [PATCH 04/15] options: add -e, --emptyline, the counterpart of --morespace, Benno Schulenberg, 2019/01/31
- [Nano-devel] [PATCH 05/15] rcfile: add the options that correspond to -b, -f, -j, and -e, Benno Schulenberg, 2019/01/31
- [Nano-devel] [PATCH 06/15] options: when a nanorc unsets an old flag, set the corresponding new flag, Benno Schulenberg, 2019/01/31
- [Nano-devel] [PATCH 07/15] options: let --fill no longer imply automatic hard-wrapping,
Benno Schulenberg <=
- [Nano-devel] [PATCH 08/15] docs: stop saying that --fill switches on automatic hard-wrapping, Benno Schulenberg, 2019/01/31
- [Nano-devel] [PATCH 09/15] docs: describe the four new options (-b, -f, -j, -e) [*incomplete*], Benno Schulenberg, 2019/01/31
- [Nano-devel] [PATCH 10/15] options: warn when -L, -O, -S, or -w are given, and ignore them, Benno Schulenberg, 2019/01/31
- [Nano-devel] [PATCH 11/15] tweaks: switch from referencing NO_WRAP to referencing BREAK_LONG_LINES, Benno Schulenberg, 2019/01/31
- [Nano-devel] [PATCH 12/15] tweaks: switch from referencing NO_NEWLINES to referencing FINAL_NEWLINE, Benno Schulenberg, 2019/01/31