[prev in list] [next in list] [prev in thread] [next in thread] 

List:       nano-devel
Subject:    [Nano-devel] [PATCH 07/15] options: let --fill no longer imply automatic hard-wrapping
From:       Benno Schulenberg <bensberg () telfort ! nl>
Date:       2019-01-31 16:49:33
Message-ID: 20190131164941.14074-7-bensberg () telfort ! nl
[Download RAW message or body]

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 mailing list
Nano-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/nano-devel
[prev in list] [next in list] [prev in thread] [next in thread]