Remove trailing spaces on source files as they suck

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4548 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
This commit is contained in:
Chris Allegretta
2012-12-30 19:20:10 +00:00
parent d84849ec12
commit 2ad1de0ba6
8 changed files with 16 additions and 16 deletions

View File

@@ -794,7 +794,7 @@ int filesearch_init(void)
TRUE, TRUE,
#endif #endif
MWHEREISFILE, backupstring, MWHEREISFILE, backupstring,
&meta_key, &func_key, &meta_key, &func_key,
#ifndef NANO_TINY #ifndef NANO_TINY
&search_history, &search_history,
#endif #endif

View File

@@ -678,7 +678,7 @@ void read_file(FILE *f, int fd, const char *filename, bool undoable, bool checkw
* found". * found".
* *
* Return -2 if we say "New File", -1 if the file isn't opened, and the * Return -2 if we say "New File", -1 if the file isn't opened, and the
* fd opened otherwise. The file might still have an error while reading * fd opened otherwise. The file might still have an error while reading
* with a 0 return value. *f is set to the opened file. */ * with a 0 return value. *f is set to the opened file. */
int open_file(const char *filename, bool newfie, FILE **f) int open_file(const char *filename, bool newfie, FILE **f)
{ {
@@ -693,7 +693,7 @@ int open_file(const char *filename, bool newfie, FILE **f)
/* Okay, if we can't stat the path due to a component's /* Okay, if we can't stat the path due to a component's
permissions, just try the relative one */ permissions, just try the relative one */
if (full_filename == NULL if (full_filename == NULL
|| (stat(full_filename, &fileinfo) == -1 && stat(filename, &fileinfo2) != -1)) || (stat(full_filename, &fileinfo) == -1 && stat(filename, &fileinfo2) != -1))
full_filename = mallocstrcpy(NULL, filename); full_filename = mallocstrcpy(NULL, filename);

View File

@@ -153,7 +153,7 @@ char *syntaxstr = NULL;
#endif #endif
bool edit_refresh_needed = 0; bool edit_refresh_needed = 0;
/* Did a command mangle enough of the buffer refresh that we /* Did a command mangle enough of the buffer refresh that we
should repaint the screen */ should repaint the screen */
const shortcut *currshortcut; const shortcut *currshortcut;
@@ -374,7 +374,7 @@ void add_to_sclist(int menu, const char *scstring, void (*func)(void), int toggl
/* Return the given menu's first shortcut sequence, or the default value /* Return the given menu's first shortcut sequence, or the default value
(2nd arg). Assumes currmenu for the menu to check*/ (2nd arg). Assumes currmenu for the menu to check*/
int sc_seq_or (void (*func)(void), int defaultval) int sc_seq_or (void (*func)(void), int defaultval)
{ {
const sc *s = first_sc_for(currmenu, func); const sc *s = first_sc_for(currmenu, func);
@@ -385,7 +385,7 @@ int sc_seq_or (void (*func)(void), int defaultval)
} }
/* Assign the info to the shortcut struct /* Assign the info to the shortcut struct
Assumes keystr is already assigned, naturally */ Assumes keystr is already assigned, naturally */
void assign_keyinfo(sc *s) void assign_keyinfo(sc *s)
{ {
@@ -814,7 +814,7 @@ void shortcut_init(bool unjustify)
#ifndef NANO_TINY #ifndef NANO_TINY
add_to_funcs(do_mark, MMAIN, N_("Mark Text"), add_to_funcs(do_mark, MMAIN, N_("Mark Text"),
IFSCHELP(nano_mark_msg), FALSE, VIEW); IFSCHELP(nano_mark_msg), FALSE, VIEW);
add_to_funcs(do_research, (MMAIN|MBROWSER), whereis_next_msg, add_to_funcs(do_research, (MMAIN|MBROWSER), whereis_next_msg,
@@ -953,7 +953,7 @@ void shortcut_init(bool unjustify)
IFSCHELP(nano_wordcount_msg), FALSE, VIEW); IFSCHELP(nano_wordcount_msg), FALSE, VIEW);
#endif #endif
add_to_funcs(total_refresh, (MMAIN|MHELP), refresh_msg, add_to_funcs(total_refresh, (MMAIN|MHELP), refresh_msg,
IFSCHELP(nano_refresh_msg), FALSE, VIEW); IFSCHELP(nano_refresh_msg), FALSE, VIEW);
add_to_funcs(do_suspend_void, MMAIN, suspend_msg, add_to_funcs(do_suspend_void, MMAIN, suspend_msg,

View File

@@ -79,7 +79,7 @@ void do_page_up(void)
if (ISSET(SOFTWRAP) && openfile->current) { if (ISSET(SOFTWRAP) && openfile->current) {
skipped += strlenpt(openfile->current->data) / COLS; skipped += strlenpt(openfile->current->data) / COLS;
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "do_page_up: i = %d, skipped = %d based on line %ld len %d\n", i, (unsigned long) skipped, fprintf(stderr, "do_page_up: i = %d, skipped = %d based on line %ld len %d\n", i, (unsigned long) skipped,
openfile->current->lineno, strlenpt(openfile->current->data)); openfile->current->lineno, strlenpt(openfile->current->data));
#endif #endif
} }

View File

@@ -1,4 +1,4 @@
/* $Id$ */ /* $Id$ */
/************************************************************************** /**************************************************************************
* nano.c * * nano.c *
* * * *
@@ -2010,7 +2010,7 @@ void do_output(char *output, size_t output_len, bool allow_cntrls)
#endif #endif
} }
/* Well we might also need a full refresh if we've changed the /* Well we might also need a full refresh if we've changed the
line length to be a new multiple of COLS */ line length to be a new multiple of COLS */
if (ISSET(SOFTWRAP) && edit_refresh_needed == FALSE) if (ISSET(SOFTWRAP) && edit_refresh_needed == FALSE)
if (strlenpt(openfile->current->data) / COLS != orig_lenpt / COLS) if (strlenpt(openfile->current->data) / COLS != orig_lenpt / COLS)
@@ -2449,7 +2449,7 @@ int main(int argc, char **argv)
#ifndef DISABLE_WRAPPING #ifndef DISABLE_WRAPPING
/* Overwrite an rcfile "set nowrap" or --disable-wrapping-as-root /* Overwrite an rcfile "set nowrap" or --disable-wrapping-as-root
if a --fill option was given on the command line. */ if a --fill option was given on the command line. */
if (fill_used) if (fill_used)
UNSET(NO_WRAP); UNSET(NO_WRAP);
#endif #endif

View File

@@ -470,7 +470,7 @@ typedef struct subnfunc {
} subnfunc; } subnfunc;
/* Enumeration to be used in flags table. See FLAGBIT and FLAGOFF /* Enumeration to be used in flags table. See FLAGBIT and FLAGOFF
* definitions. */ * definitions. */
enum enum
{ {

View File

@@ -1,4 +1,4 @@
/* $Id$ */ /* $Id$ */
/************************************************************************** /**************************************************************************
* text.c * * text.c *
* * * *
@@ -855,7 +855,7 @@ void add_undo(undo_type current_action)
/* Ugh, if we were called while cutting not-to-end, non-marked and on the same lineno, /* Ugh, if we were called while cutting not-to-end, non-marked and on the same lineno,
we need to abort here */ we need to abort here */
u = fs->current_undo; u = fs->current_undo;
if (current_action == CUT && u && u->type == CUT if (current_action == CUT && u && u->type == CUT
&& !u->mark_set && u->lineno == fs->current->lineno) && !u->mark_set && u->lineno == fs->current->lineno)
return; return;

View File

@@ -1800,7 +1800,7 @@ const sc *get_shortcut(int menu, int *kbinput, bool
/* Try to get a function back from a window. Just a wrapper so /* Try to get a function back from a window. Just a wrapper so
functions to need to create function_key meta_key blah blah functions to need to create function_key meta_key blah blah
mmenu - what menu name to look through for valid funcs */ mmenu - what menu name to look through for valid funcs */
const subnfunc *getfuncfromkey(WINDOW *win) const subnfunc *getfuncfromkey(WINDOW *win)
{ {