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

miscellaneous comment fixes 

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4012 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
David Lawrence Ramsey 2007-01-01 05:15:32 +00:00
parent 4b1c73ee17
commit 6335fb54d5
18 changed files with 62 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,4 +1,8 @@
CVS code - CVS code -
- General:
- Miscellaneous comment fixes. (DLR)
do_credits()
- Update the last copyright notice to include 2006. (DLR)
- README: - README:
- Add more miscellaneous cosmetic fixes. (DLR) - Add more miscellaneous cosmetic fixes. (DLR)
- doc/syntax/python.nanorc: - doc/syntax/python.nanorc:

4
src/browser.c
View File

@ -3,7 +3,7 @@
* browser.c * * browser.c *
* * * *
* Copyright (C) 2001, 2002, 2003, 2004 Chris Allegretta * * Copyright (C) 2001, 2002, 2003, 2004 Chris Allegretta *
* Copyright (C) 2005, 2006 David Lawrence Ramsey * * Copyright (C) 2005, 2006, 2007 David Lawrence Ramsey *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by * * it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2, or (at your option) * * the Free Software Foundation; either version 2, or (at your option) *
@ -57,7 +57,7 @@ char *do_browser(char *path, DIR *dir)
/* The directory we were in, if any, before backing up via /* The directory we were in, if any, before backing up via
* browsing to "..". */ * browsing to "..". */
char *ans = NULL; char *ans = NULL;
/* The last answer the user typed on the statusbar. */ /* The last answer the user typed at the statusbar prompt. */
size_t old_selected; size_t old_selected;
/* The selected file we had before the current selected file. */ /* The selected file we had before the current selected file. */

7
src/chars.c
View File

@ -3,7 +3,7 @@
* chars.c * * chars.c *
* * * *
* Copyright (C) 2001, 2002, 2003, 2004 Chris Allegretta * * Copyright (C) 2001, 2002, 2003, 2004 Chris Allegretta *
* Copyright (C) 2005, 2006 David Lawrence Ramsey * * Copyright (C) 2005, 2006, 2007 David Lawrence Ramsey *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by * * it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2, or (at your option) * * the Free Software Foundation; either version 2, or (at your option) *
@ -38,9 +38,8 @@ static bool use_utf8 = FALSE;
/* Whether we've enabled UTF-8 support. */ /* Whether we've enabled UTF-8 support. */
static const wchar_t bad_wchar = 0xFFFD; static const wchar_t bad_wchar = 0xFFFD;
/* If we get an invalid multibyte sequence, we treat it as /* If we get an invalid multibyte sequence, we treat it as
* Unicode FFFD (Replacement Character), unless we're * Unicode FFFD (Replacement Character), unless we're searching
* determining if it's a control character or searching for a * for a match to it. */
* match to it. */
static const char *const bad_mbchar = "\xEF\xBF\xBD"; static const char *const bad_mbchar = "\xEF\xBF\xBD";
static const int bad_mbchar_len = 3; static const int bad_mbchar_len = 3;

4
src/color.c
View File

@ -3,7 +3,7 @@
* color.c * * color.c *
* * * *
* Copyright (C) 2001, 2002, 2003, 2004 Chris Allegretta * * Copyright (C) 2001, 2002, 2003, 2004 Chris Allegretta *
* Copyright (C) 2005, 2006 David Lawrence Ramsey * * Copyright (C) 2005, 2006, 2007 David Lawrence Ramsey *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by * * it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2, or (at your option) * * the Free Software Foundation; either version 2, or (at your option) *
@ -29,7 +29,7 @@
#ifdef ENABLE_COLOR #ifdef ENABLE_COLOR
/* For each syntax list entry, go through the list of colors and assign /* For each syntax list entry, go through the list of colors and assign
* color pairs. */ * the color pairs. */
void set_colorpairs(void) void set_colorpairs(void)
{ {
const syntaxtype *this_syntax = syntaxes; const syntaxtype *this_syntax = syntaxes;

10
src/cut.c
View File

@ -3,7 +3,7 @@
* cut.c * * cut.c *
* * * *
* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta * * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta *
* Copyright (C) 2005, 2006 David Lawrence Ramsey * * Copyright (C) 2005, 2006, 2007 David Lawrence Ramsey *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by * * it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2, or (at your option) * * the Free Software Foundation; either version 2, or (at your option) *
@ -146,7 +146,7 @@ void do_cut_text(
if (copy_text) { if (copy_text) {
if (cutbuffer != NULL) { if (cutbuffer != NULL) {
/* If the cutbuffer isn't empty, save where it currently /* If the cutbuffer isn't empty, save where it currently
* ends. This is where the new text will be added. */ * ends. This is where we'll add the new text. */
cb_save = cutbottom; cb_save = cutbottom;
cb_save_len = strlen(cutbottom->data); cb_save_len = strlen(cutbottom->data);
} }
@ -173,12 +173,12 @@ void do_cut_text(
cut_marked(); cut_marked();
openfile->mark_set = FALSE; openfile->mark_set = FALSE;
} else if (ISSET(CUT_TO_END)) } else if (ISSET(CUT_TO_END))
/* Otherwise, if the CUT_TO_END flag is set, move all text up to /* If the CUT_TO_END flag is set, move all text up to the end of
* the end of the line into the cutbuffer. */ * the line into the cutbuffer. */
cut_to_eol(); cut_to_eol();
else else
#endif #endif
/* Otherwise, move the entire line into the cutbuffer. */ /* Move the entire line into the cutbuffer. */
cut_line(); cut_line();
#ifndef NANO_TINY #ifndef NANO_TINY

6
src/files.c
View File

@ -3,7 +3,7 @@
* files.c * * files.c *
* * * *
* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta * * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta *
* Copyright (C) 2005, 2006 David Lawrence Ramsey * * Copyright (C) 2005, 2006, 2007 David Lawrence Ramsey *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by * * it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2, or (at your option) * * the Free Software Foundation; either version 2, or (at your option) *
@ -681,7 +681,7 @@ void do_insertfile(
int i; int i;
const char *msg; const char *msg;
char *ans = mallocstrcpy(NULL, ""); char *ans = mallocstrcpy(NULL, "");
/* The last answer the user typed on the statusbar. */ /* The last answer the user typed at the statusbar prompt. */
filestruct *edittop_save = openfile->edittop; filestruct *edittop_save = openfile->edittop;
size_t current_x_save = openfile->current_x; size_t current_x_save = openfile->current_x;
ssize_t current_y_save = openfile->current_y; ssize_t current_y_save = openfile->current_y;
@ -1752,7 +1752,7 @@ int do_writeout(bool exiting)
int i, retval = 0; int i, retval = 0;
append_type append = OVERWRITE; append_type append = OVERWRITE;
char *ans; char *ans;
/* The last answer the user typed on the statusbar. */ /* The last answer the user typed at the statusbar prompt. */
#ifdef NANO_EXTRA #ifdef NANO_EXTRA
static bool did_credits = FALSE; static bool did_credits = FALSE;
#endif #endif

4
src/global.c
View File

@ -3,7 +3,7 @@
* global.c * * global.c *
* * * *
* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta * * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta *
* Copyright (C) 2005, 2006 David Lawrence Ramsey * * Copyright (C) 2005, 2006, 2007 David Lawrence Ramsey *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by * * it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2, or (at your option) * * the Free Software Foundation; either version 2, or (at your option) *
@ -110,7 +110,7 @@ size_t quotelen;
#endif #endif
char *answer = NULL; char *answer = NULL;
/* The answer string used in the statusbar prompt. */ /* The answer string used by the statusbar prompt. */
ssize_t tabsize = -1; ssize_t tabsize = -1;
/* The width of a tab in spaces. The default value is set in /* The width of a tab in spaces. The default value is set in

4
src/help.c
View File

@ -3,7 +3,7 @@
* help.c * * help.c *
* * * *
* Copyright (C) 2000, 2001, 2002, 2003, 2004 Chris Allegretta * * Copyright (C) 2000, 2001, 2002, 2003, 2004 Chris Allegretta *
* Copyright (C) 2005, 2006 David Lawrence Ramsey * * Copyright (C) 2005, 2006, 2007 David Lawrence Ramsey *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by * * it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2, or (at your option) * * the Free Software Foundation; either version 2, or (at your option) *
@ -51,7 +51,7 @@ void do_help(void (*refresh_func)(void))
/* The current shortcut list. */ /* The current shortcut list. */
#endif #endif
const char *ptr; const char *ptr;
/* The current line of help text. */ /* The current line of the help text. */
size_t old_line = (size_t)-1; size_t old_line = (size_t)-1;
/* The line we were on before the current line. */ /* The line we were on before the current line. */

8
src/move.c
View File

@ -3,7 +3,7 @@
* move.c * * move.c *
* * * *
* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta * * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta *
* Copyright (C) 2005, 2006 David Lawrence Ramsey * * Copyright (C) 2005, 2006, 2007 David Lawrence Ramsey *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by * * it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2, or (at your option) * * the Free Software Foundation; either version 2, or (at your option) *
@ -272,8 +272,7 @@ bool do_next_word(bool allow_punct, bool allow_update)
free(char_mb); free(char_mb);
/* If we haven't found it, leave the cursor at the end of the /* If we haven't found it, move to the end of the file. */
* file. */
if (openfile->current == NULL) if (openfile->current == NULL)
openfile->current = openfile->filebot; openfile->current = openfile->filebot;
@ -371,8 +370,7 @@ bool do_prev_word(bool allow_punct, bool allow_update)
} }
} }
/* If we haven't found it, leave the cursor at the beginning of the /* If we haven't found it, move to the beginning of the file. */
* file. */
if (openfile->current == NULL) if (openfile->current == NULL)
openfile->current = openfile->fileage; openfile->current = openfile->fileage;
/* If we've found it, move backward until we find the character /* If we've found it, move backward until we find the character

4
src/nano.c
View File

@ -3,7 +3,7 @@
* nano.c * * nano.c *
* * * *
* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta * * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta *
* Copyright (C) 2005, 2006 David Lawrence Ramsey * * Copyright (C) 2005, 2006, 2007 David Lawrence Ramsey *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by * * it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2, or (at your option) * * the Free Software Foundation; either version 2, or (at your option) *
@ -47,7 +47,7 @@ static bool no_rcfiles = FALSE;
static struct termios oldterm; static struct termios oldterm;
/* The user's original terminal settings. */ /* The user's original terminal settings. */
static struct sigaction act; static struct sigaction act;
/* For all our fun signal handlers. */ /* Used to set up all our fun signal handlers. */
/* Create a new filestruct node. Note that we do not set prevnode->next /* Create a new filestruct node. Note that we do not set prevnode->next
* to the new line. */ * to the new line. */

4
src/nano.h
View File

@ -3,7 +3,7 @@
* nano.h * * nano.h *
* * * *
* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta * * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta *
* Copyright (C) 2005, 2006 David Lawrence Ramsey * * Copyright (C) 2005, 2006, 2007 David Lawrence Ramsey *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by * * it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2, or (at your option) * * the Free Software Foundation; either version 2, or (at your option) *
@ -50,7 +50,7 @@
#define ISSET(bit) ((flags & bit) != 0) #define ISSET(bit) ((flags & bit) != 0)
#define TOGGLE(bit) flags ^= bit #define TOGGLE(bit) flags ^= bit
/* Macros for character allocation, etc. */ /* Macros for character allocation and more. */
#define charalloc(howmuch) (char *)nmalloc((howmuch) * sizeof(char)) #define charalloc(howmuch) (char *)nmalloc((howmuch) * sizeof(char))
#define charealloc(ptr, howmuch) (char *)nrealloc(ptr, (howmuch) * sizeof(char)) #define charealloc(ptr, howmuch) (char *)nrealloc(ptr, (howmuch) * sizeof(char))
#define charmove(dest, src, n) memmove(dest, src, (n) * sizeof(char)) #define charmove(dest, src, n) memmove(dest, src, (n) * sizeof(char))

4
src/prompt.c
View File

@ -3,7 +3,7 @@
* prompt.c * * prompt.c *
* * * *
* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta * * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta *
* Copyright (C) 2005, 2006 David Lawrence Ramsey * * Copyright (C) 2005, 2006, 2007 David Lawrence Ramsey *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by * * it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2, or (at your option) * * the Free Software Foundation; either version 2, or (at your option) *
@ -28,7 +28,7 @@
#include <string.h> #include <string.h>
static char *prompt = NULL; static char *prompt = NULL;
/* The prompt string for statusbar questions. */ /* The prompt string used for statusbar questions. */
static size_t statusbar_x = (size_t)-1; static size_t statusbar_x = (size_t)-1;
/* The cursor position in answer. */ /* The cursor position in answer. */
static size_t statusbar_pww = (size_t)-1; static size_t statusbar_pww = (size_t)-1;

35
src/proto.h
View File

@ -3,7 +3,7 @@
* proto.h * * proto.h *
* * * *
* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta * * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta *
* Copyright (C) 2005, 2006 David Lawrence Ramsey * * Copyright (C) 2005, 2006, 2007 David Lawrence Ramsey *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by * * it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2, or (at your option) * * the Free Software Foundation; either version 2, or (at your option) *
@ -26,8 +26,7 @@
#include "nano.h" #include "nano.h"
/* All public external variables. See global.c for their /* All external variables. See global.c for their descriptions. */
* descriptions. */
#ifndef NANO_TINY #ifndef NANO_TINY
extern sigjmp_buf jump_buf; extern sigjmp_buf jump_buf;
extern bool jump_buf_main; extern bool jump_buf_main;
@ -142,7 +141,7 @@ extern int reverse_attr;
extern char *homedir; extern char *homedir;
/* All public functions in browser.c. */ /* All functions in browser.c. */
#ifndef DISABLE_BROWSER #ifndef DISABLE_BROWSER
char *do_browser(char *path, DIR *dir); char *do_browser(char *path, DIR *dir);
char *do_browse_from(const char *inpath); char *do_browse_from(const char *inpath);
@ -161,7 +160,7 @@ void do_last_file(void);
char *striponedir(const char *path); char *striponedir(const char *path);
#endif #endif
/* All public functions in chars.c. */ /* All functions in chars.c. */
#ifdef ENABLE_UTF8 #ifdef ENABLE_UTF8
void utf8_init(void); void utf8_init(void);
bool using_utf8(void); bool using_utf8(void);
@ -243,14 +242,14 @@ bool is_valid_unicode(wchar_t wc);
bool is_valid_mbstring(const char *s); bool is_valid_mbstring(const char *s);
#endif #endif
/* All public functions in color.c. */ /* All functions in color.c. */
#ifdef ENABLE_COLOR #ifdef ENABLE_COLOR
void set_colorpairs(void); void set_colorpairs(void);
void color_init(void); void color_init(void);
void color_update(void); void color_update(void);
#endif #endif
/* All public functions in cut.c. */ /* All functions in cut.c. */
void cutbuffer_reset(void); void cutbuffer_reset(void);
void cut_line(void); void cut_line(void);
#ifndef NANO_TINY #ifndef NANO_TINY
@ -272,7 +271,7 @@ void do_cut_till_end(void);
#endif #endif
void do_uncut_text(void); void do_uncut_text(void);
/* All public functions in files.c. */ /* All functions in files.c. */
void make_new_buffer(void); void make_new_buffer(void);
void initialize_buffer(void); void initialize_buffer(void);
void initialize_buffer_text(void); void initialize_buffer_text(void);
@ -340,7 +339,7 @@ bool writehist(FILE *hist, filestruct *histhead);
void save_history(void); void save_history(void);
#endif #endif
/* All public functions in global.c. */ /* All functions in global.c. */
size_t length_of_list(const shortcut *s); size_t length_of_list(const shortcut *s);
#ifndef NANO_TINY #ifndef NANO_TINY
void toggle_init_one(int val void toggle_init_one(int val
@ -362,7 +361,7 @@ void free_shortcutage(shortcut **shortcutage);
void thanks_for_all_the_fish(void); void thanks_for_all_the_fish(void);
#endif #endif
/* All public functions in help.c. */ /* All functions in help.c. */
#ifndef DISABLE_HELP #ifndef DISABLE_HELP
void do_help(void (*refresh_func)(void)); void do_help(void (*refresh_func)(void));
void do_help_void(void); void do_help_void(void);
@ -374,7 +373,7 @@ void parse_help_input(int *kbinput, bool *meta_key, bool *func_key);
size_t help_line_len(const char *ptr); size_t help_line_len(const char *ptr);
#endif #endif
/* All public functions in move.c. */ /* All functions in move.c. */
void do_first_line(void); void do_first_line(void);
void do_last_line(void); void do_last_line(void);
void do_page_up(void); void do_page_up(void);
@ -418,7 +417,7 @@ void do_scroll_down(void);
void do_left(void); void do_left(void);
void do_right(void); void do_right(void);
/* All public functions in nano.c. */ /* All functions in nano.c. */
filestruct *make_new_node(filestruct *prevnode); filestruct *make_new_node(filestruct *prevnode);
filestruct *copy_node(const filestruct *src); filestruct *copy_node(const filestruct *src);
void splice_node(filestruct *begin, filestruct *newnode, filestruct void splice_node(filestruct *begin, filestruct *newnode, filestruct
@ -489,7 +488,7 @@ bool do_mouse(void);
#endif #endif
void do_output(char *output, size_t output_len, bool allow_cntrls); void do_output(char *output, size_t output_len, bool allow_cntrls);
/* All public functions in prompt.c. */ /* All functions in prompt.c. */
int do_statusbar_input(bool *meta_key, bool *func_key, bool *s_or_t, int do_statusbar_input(bool *meta_key, bool *func_key, bool *s_or_t,
bool *ran_func, bool *finished, bool allow_funcs, void bool *ran_func, bool *finished, bool allow_funcs, void
(*refresh_func)(void)); (*refresh_func)(void));
@ -546,7 +545,7 @@ int do_prompt(bool allow_tabs,
void do_prompt_abort(void); void do_prompt_abort(void);
int do_yesno_prompt(bool all, const char *msg); int do_yesno_prompt(bool all, const char *msg);
/* All public functions in rcfile.c. */ /* All functions in rcfile.c. */
#ifdef ENABLE_NANORC #ifdef ENABLE_NANORC
void rcfile_error(const char *msg, ...); void rcfile_error(const char *msg, ...);
char *parse_next_word(char *ptr); char *parse_next_word(char *ptr);
@ -567,7 +566,7 @@ void parse_rcfile(FILE *rcstream
void do_rcfile(void); void do_rcfile(void);
#endif #endif
/* All public functions in search.c. */ /* All functions in search.c. */
#ifdef HAVE_REGEX_H #ifdef HAVE_REGEX_H
int regexp_init(const char *regexp); int regexp_init(const char *regexp);
void regexp_cleanup(void); void regexp_cleanup(void);
@ -623,7 +622,7 @@ char *get_history_completion(filestruct **h, const char *s, size_t len);
#endif #endif
#endif #endif
/* All public functions in text.c. */ /* All functions in text.c. */
#ifndef NANO_TINY #ifndef NANO_TINY
void do_mark(void); void do_mark(void);
#endif #endif
@ -680,7 +679,7 @@ void do_wordlinechar_count(void);
#endif #endif
void do_verbatim_input(void); void do_verbatim_input(void);
/* All public functions in utils.c. */ /* All functions in utils.c. */
int digits(size_t n); int digits(size_t n);
void get_homedir(void); void get_homedir(void);
bool parse_num(const char *str, ssize_t *val); bool parse_num(const char *str, ssize_t *val);
@ -728,7 +727,7 @@ void dump_filestruct(const filestruct *inptr);
void dump_filestruct_reverse(void); void dump_filestruct_reverse(void);
#endif #endif
/* All public functions in winio.c. */ /* All functions in winio.c. */
void get_key_buffer(WINDOW *win); void get_key_buffer(WINDOW *win);
size_t get_key_buffer_len(void); size_t get_key_buffer_len(void);
void unget_input(int *input, size_t input_len); void unget_input(int *input, size_t input_len);

5
src/rcfile.c
View File

@ -3,7 +3,7 @@
* rcfile.c * * rcfile.c *
* * * *
* Copyright (C) 2001, 2002, 2003, 2004 Chris Allegretta * * Copyright (C) 2001, 2002, 2003, 2004 Chris Allegretta *
* Copyright (C) 2005, 2006 David Lawrence Ramsey * * Copyright (C) 2005, 2006, 2007 David Lawrence Ramsey *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by * * it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2, or (at your option) * * the Free Software Foundation; either version 2, or (at your option) *
@ -97,8 +97,7 @@ static const rcoption rcopts[] = {
static bool errors = FALSE; static bool errors = FALSE;
/* Whether we got any errors while parsing an rcfile. */ /* Whether we got any errors while parsing an rcfile. */
static size_t lineno = 0; static size_t lineno = 0;
/* If we did, the line number where the current error /* If we did, the line number where the last error occurred. */
* occurred. */
static char *nanorc = NULL; static char *nanorc = NULL;
/* The path to the rcfile we're parsing. */ /* The path to the rcfile we're parsing. */
#ifdef ENABLE_COLOR #ifdef ENABLE_COLOR

4
src/search.c
View File

@ -3,7 +3,7 @@
* search.c * * search.c *
* * * *
* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta * * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta *
* Copyright (C) 2005, 2006 David Lawrence Ramsey * * Copyright (C) 2005, 2006, 2007 David Lawrence Ramsey *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by * * it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2, or (at your option) * * the Free Software Foundation; either version 2, or (at your option) *
@ -977,7 +977,7 @@ void do_gotolinecolumn(ssize_t line, ssize_t column, bool use_answer,
if (interactive) { if (interactive) {
char *ans = mallocstrcpy(NULL, answer); char *ans = mallocstrcpy(NULL, answer);
/* Ask for it. */ /* Ask for the line and column. */
int i = do_prompt(FALSE, int i = do_prompt(FALSE,
#ifndef DISABLE_TABCOMP #ifndef DISABLE_TABCOMP
TRUE, TRUE,

6
src/text.c
View File

@ -3,7 +3,7 @@
* text.c * * text.c *
* * * *
* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta * * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta *
* Copyright (C) 2005, 2006 David Lawrence Ramsey * * Copyright (C) 2005, 2006, 2007 David Lawrence Ramsey *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by * * it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2, or (at your option) * * the Free Software Foundation; either version 2, or (at your option) *
@ -194,8 +194,8 @@ void do_tab(void)
/* Indent or unindent the current line (or all lines covered by the mark /* Indent or unindent the current line (or all lines covered by the mark
* if the mark is on) len columns, depending on whether len is positive * if the mark is on) len columns, depending on whether len is positive
* or negative. If the TABS_TO_SPACES flag is set, indent/unindent by * or negative. If the TABS_TO_SPACES flag is set, indent/unindent by
* len spaces. Otherwise, indent/unindent by (len / tabsize) tabs and * len spaces. Otherwise, indent or unindent by (len / tabsize) tabs
* (len % tabsize) spaces. */ * and (len % tabsize) spaces. */
void do_indent(ssize_t cols) void do_indent(ssize_t cols)
{ {
bool indent_changed = FALSE; bool indent_changed = FALSE;

4
src/utils.c
View File

@ -3,7 +3,7 @@
* utils.c * * utils.c *
* * * *
* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta * * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta *
* Copyright (C) 2005, 2006 David Lawrence Ramsey * * Copyright (C) 2005, 2006, 2007 David Lawrence Ramsey *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by * * it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2, or (at your option) * * the Free Software Foundation; either version 2, or (at your option) *
@ -46,7 +46,7 @@ int digits(size_t n)
} }
/* Return the user's home directory. We use $HOME, and if that fails, /* Return the user's home directory. We use $HOME, and if that fails,
* we fall back on getpwuid(). */ * we fall back on the home directory of the effective user ID. */
void get_homedir(void) void get_homedir(void)
{ {
if (homedir == NULL) { if (homedir == NULL) {

8
src/winio.c
View File

@ -3,7 +3,7 @@
* winio.c * * winio.c *
* * * *
* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta * * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta *
* Copyright (C) 2005, 2006 David Lawrence Ramsey * * Copyright (C) 2005, 2006, 2007 David Lawrence Ramsey *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by * * it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2, or (at your option) * * the Free Software Foundation; either version 2, or (at your option) *
@ -30,8 +30,8 @@
#include <ctype.h> #include <ctype.h>
static int *key_buffer = NULL; static int *key_buffer = NULL;
/* The keystroke buffer, containing all the keystrokes we have /* The keystroke buffer, containing all the keystrokes we
* at a given point. */ * haven't handled yet at a given point. */
static size_t key_buffer_len = 0; static size_t key_buffer_len = 0;
/* The length of the keystroke buffer. */ /* The length of the keystroke buffer. */
static int statusblank = 0; static int statusblank = 0;
@ -3213,7 +3213,7 @@ void do_credits(void)
"", "",
"", "",
"(c) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta", "(c) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta",
"(c) 2005, 2006 David Lawrence Ramsey", "(c) 2005, 2006, 2007 David Lawrence Ramsey",
"", "",
"", "",
"", "",