ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
master
David Lawrence Ramsey 2005-11-29 21:30:00 +00:00
parent 3239ff22c8
commit c7c04bb665
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -198,6 +198,9 @@ CVS code -
break_line() break_line()
- Only include the newline parameter if DISABLE_HELP isn't - Only include the newline parameter if DISABLE_HELP isn't
defined, as it's only used then. (DLR) 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() begpar()
- Return FALSE if foo is NULL, as inpar() does. (DLR) - Return FALSE if foo is NULL, as inpar() does. (DLR)
backup_lines() backup_lines()

2
src/proto.h
View File

@ -563,7 +563,7 @@ bool execute_command(const char *command);
void wrap_reset(void); void wrap_reset(void);
bool do_wrap(filestruct *line); bool do_wrap(filestruct *line);
#endif #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 ssize_t break_line(const char *line, ssize_t goal
#ifndef DISABLE_HELP #ifndef DISABLE_HELP
, bool newline , bool newline

4
src/text.c
View File

@ -583,7 +583,7 @@ bool do_wrap(filestruct *line)
} }
#endif /* !DISABLE_WRAPPING */ #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 /* 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 * 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 * 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; return blank_loc;
} }
#endif /* !DISABLE_HELP || !DISABLE_JUSTIFY || !DISABLE_WRAPPING */ #endif /* !DISABLE_HELP || !DISABLE_WRAPJUSTIFY */
#if !defined(NANO_TINY) || !defined(DISABLE_JUSTIFY) #if !defined(NANO_TINY) || !defined(DISABLE_JUSTIFY)
/* The "indentation" of a line is the whitespace between the quote part /* The "indentation" of a line is the whitespace between the quote part