in brak_line(), in the surrounding #ifdef, replace the combination of

!DISABLE_JUSTIFY and !DISABLE_WRAPPING with !DISABLE_WRAPJUSTIFY, for
consistency

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3229 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index 52d202ee351749dce185a104c60fa516536d9b0c..6f85a3e3aec30233e54f32dd0b2e3b201e4b0c0f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -198,6 +198,9 @@ CVS code -
   break_line()
        - Only include the newline parameter if DISABLE_HELP isn't
          defined, as it's only used then. (DLR)
+       - In the surrounding #ifdef, replace the combination of
+         !DISABLE_JUSTIFY and !DISABLE_WRAPPING with
+         !DISABLE_WRAPJUSTIFY, for consistency. (DLR)
   begpar()
        - Return FALSE if foo is NULL, as inpar() does. (DLR)
   backup_lines()

diff --git a/src/proto.h b/src/proto.h
index 42114542def158b3d5820dbd6410543dcdb98c93..a1ec26924d616e4ac977f1849145a4e570756323 100644 (file)
--- a/src/proto.h
+++ b/src/proto.h
@@ -563,7 +563,7 @@ bool execute_command(const char *command);
 void wrap_reset(void);
 bool do_wrap(filestruct *line);
 #endif
-#if !defined(DISABLE_HELP) || !defined(DISABLE_JUSTIFY) || !defined(DISABLE_WRAPPING)
+#if !defined(DISABLE_HELP) || !defined(DISABLE_WRAPJUSTIFY)
 ssize_t break_line(const char *line, ssize_t goal
 #ifndef DISABLE_HELP
        , bool newline

diff --git a/src/text.c b/src/text.c
index bac9a683f5208ffb26bbc95869783d7c725ab795..33effee8a661927202ee55ed0d9a0da6ff7802e2 100644 (file)
--- a/src/text.c
+++ b/src/text.c
@@ -583,7 +583,7 @@ bool do_wrap(filestruct *line)
 }
 #endif /* !DISABLE_WRAPPING */
 
-#if !defined(DISABLE_HELP) || !defined(DISABLE_JUSTIFY) || !defined(DISABLE_WRAPPING)
+#if !defined(DISABLE_HELP) || !defined(DISABLE_WRAPJUSTIFY)
 /* We are trying to break a chunk off line.  We find the last blank such
  * that the display length to there is at most (goal + 1).  If there is
  * no such blank, then we find the first blank.  We then take the last
@@ -676,7 +676,7 @@ ssize_t break_line(const char *line, ssize_t goal
 
     return blank_loc;
 }
-#endif /* !DISABLE_HELP || !DISABLE_JUSTIFY || !DISABLE_WRAPPING */
+#endif /* !DISABLE_HELP || !DISABLE_WRAPJUSTIFY */
 
 #if !defined(NANO_TINY) || !defined(DISABLE_JUSTIFY)
 /* The "indentation" of a line is the whitespace between the quote part