From 8a07a96eef584969071d3969b7f1ab3e9a73b91f Mon Sep 17 00:00:00 2001 From: Chris Allegretta Date: Wed, 2 Dec 2009 03:36:22 +0000 Subject: [PATCH] 2009-12-01 David Lawrence Ramsey * Update documentation for 2.2 features including sample nanorc file, texinfo file, man pages, UPGRADE file, and update copyright noticed for the current year. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4453 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 4 +++- UPGRADE | 16 ++++++++++++++++ doc/faq.html | 16 +++++++++------- doc/man/nano.1 | 37 +++++++++++++++++++------------------ doc/man/nanorc.5 | 16 ++++++++-------- doc/nanorc.sample.in | 17 +++++++++++------ doc/syntax/nanorc.nanorc | 2 +- doc/texinfo/nano.texi | 38 +++++++++++++++++++++++++++++++++----- src/browser.c | 2 +- src/chars.c | 2 +- src/color.c | 2 +- src/cut.c | 4 ++-- src/files.c | 4 ++-- src/global.c | 4 ++-- src/help.c | 4 ++-- src/move.c | 4 ++-- src/nano.c | 8 ++++---- src/nano.h | 4 ++-- src/prompt.c | 4 ++-- src/proto.h | 4 ++-- src/rcfile.c | 2 +- src/search.c | 4 ++-- src/text.c | 4 ++-- src/utils.c | 4 ++-- src/winio.c | 4 ++-- 25 files changed, 132 insertions(+), 78 deletions(-) diff --git a/ChangeLog b/ChangeLog index ac34683c..cf931937 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,8 +7,10 @@ Christian Weisgerber. * doc/man/nanorc.5 - Fix typo in Meta documentation, reported by gibboris@gmail.com. -2009-11-29 David Lawrence Ramsey +2009-12-01 David Lawrence Ramsey * global.c (shortcut_init) - Add support for ^P and ^N in the help menu. + * Update documentation for 2.2 features including sample nanorc file, texinfo + file, man pages, UPGRADE file, and update copyright noticed for the current year. GNU nano 2.2.0 - 2009.11.30 2009-11-29 Chris Allegretta diff --git a/UPGRADE b/UPGRADE index 56b40bda..72c6d679 100644 --- a/UPGRADE +++ b/UPGRADE @@ -1,6 +1,22 @@ GNU nano upgrading information ============================== +Visible changes since 2.0 +------------------------- +* Editor Features + - The ability to rebind (reassign) keys using the nanorc. + - The ability to read standard input like a pager ("nano -"). + - Color syntax highlighting can be set by the first line of a file. + - The ability to silence nanorc error messages (-q). + - Undo/redo operations (-u). + - Soft wrapping of text (-$). + +* File Handling + - Better handling of backup files: if nano can't write a backup file, + it won't try to write the original file afterward. + - Emergency savefiles retain ownerships and permissions when possible. + - Performance improvements in color syntax highlighting. + Visible changes since 1.2 ------------------------- * Editor Features diff --git a/doc/faq.html b/doc/faq.html index d0f974c9..e178704e 100644 --- a/doc/faq.html +++ b/doc/faq.html @@ -83,9 +83,9 @@

1.5. Why the name change from TIP?

On January 10, 2000, TIP was officially renamed to nano because of a namespace conflict with another program called 'tip'. The original 'tip' program "establishes a full duplex terminal connection to a remote host", and was included with many older Unix systems (and newer ones like Solaris). The conflict was not noticed at first because there is no 'tip' utility included with most GNU/Linux distributions (where nano was developed).

1.6. What is the current version of nano?

-

The current version of nano *should* be 2.0.7. Of course, you should always check the nano homepage to see what the latest and greatest version is.

+

The current version of nano *should* be 2.2.0. Of course, you should always check the nano homepage to see what the latest and greatest version is.

1.7. I want to read the man page without having to download the program!

-

Jeez, demanding, aren't we? Okay, look here.

+

Jeez, demanding, aren't we? Okay, look here.

2. Where to get GNU nano.

2.1. FTP and WWW sites that carry nano.

@@ -99,8 +99,8 @@

2.2. RedHat and derivatives (.rpm) packages.

2.3. Debian (.deb) packages.

@@ -246,7 +246,7 @@ Of course, due to the license change you can now use the http://mail.gnu.org/mailman/listinfo/help-nano/
nano-devel - http://mail.gnu.org/mailman/listinfo/nano-devel/

7.2. I want to send the development team a big load of cash (or just a thank you).

-

That's fine. Send it our way! Better yet, fix a bug in the program or implement a cool feature and send us that instead (though cash is fine too).

+

That's fine. Send it our way! Better yet, fix a bug in the program or implement a cool feature and send us that instead (though cash is fine too).

7.3. How do I submit a bug report or patch?

The best place to submit bugs is to the Savannah bug tracker as you can check whether the bug you are submitting has already been submitted. @@ -256,8 +256,10 @@ Of course, due to the license change you can now use the 7.5. Can I have write access to the subversion tree?

Re-read Section 7.4 and you should know the answer.

8. ChangeLog

-

2007/12/21 - Update maintainer information. (DLR)
-2008/03/16 - Update docs to refer to subversion instead of CVS, add more words about Apline, and refer to Savannah for bugs and patches. (chrisa) +

2009/11/30 - Update various bits for nano 2.2.x. (DLR)
+2009/11/18 - Typo fix. (j.mader@gmail.com)
+2008/03/16 - Update docs to refer to subversion instead of CVS, add more words about Alpine, and refer to Savannah for bugs and patches. (chrisa)
+2007/12/21 - Update maintainer information. (DLR)
2007/12/09 - Add minor punctuation and wording fixes, and update various sections to account for Alpine. (DLR)
2007/08/26 - Update links to the Free Translation Project. (DLR)
2007/07/29 - Update RPM links for nano 2.0.x. (DLR)
diff --git a/doc/man/nano.1 b/doc/man/nano.1 index 666ea2d0..a3acc3d6 100644 --- a/doc/man/nano.1 +++ b/doc/man/nano.1 @@ -1,6 +1,6 @@ .\" Hey, EMACS: -*- nroff -*- -.\" Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 -.\" Free Software Foundation, Inc. +.\" Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, +.\" 2008, 2009 Free Software Foundation, Inc. .\" .\" This document is dual-licensed. You may distribute and/or modify it .\" under the terms of either of the following licenses: @@ -19,7 +19,7 @@ .\" . .\" .\" $Id$ -.TH NANO 1 "version 2.0.0" "August 23, 2007" +.TH NANO 1 "version 2.2.0" "November 30, 2009" .\" Please adjust this date whenever revising the manpage. .\" @@ -79,11 +79,11 @@ Enable multiple file buffers, if available. .TP .B \-H (\-\-historylog) Log search and replace strings to \fI~/.nano_history\fP, so they can be -retrieved in later sessions, if nanorc support is available. +retrieved in later sessions, if \fInanorc\fP support is available. .TP .B \-I (\-\-ignorercfiles) -Don't look at \fISYSCONFDIR/nanorc\fP or \fI~/.nanorc\fP, if nanorc -support is available. +Don't look at \fISYSCONFDIR/nanorc\fP or \fI~/.nanorc\fP, if +\fInanorc\fP support is available. .TP .B \-K (\-\-rebindkeypad) Interpret the numeric keypad keys so that they all work properly. You @@ -107,10 +107,11 @@ Tab. .TP .B \-R (\-\-restricted) Restricted mode: don't read or write to any file not specified on the -command line; read any nanorc files; allow suspending; allow a file -to be appended to, prepended to, or saved under a different name if it -already has one; or use backup files or spell checking. Also accessible -by invoking \fBnano\fP with any name beginning with 'r' (e.g. "rnano"). +command line; read any \fInanorc\fP files; allow suspending; allow a +file to be appended to, prepended to, or saved under a different name if +it already has one; or use backup files or spell checking. Also +accessible by invoking \fBnano\fP with any name beginning with 'r' (e.g. +"rnano"). .TP .B \-S (\-\-smooth) Enable smooth scrolling. Text will scroll line-by-line, instead of the @@ -173,8 +174,8 @@ Preserve the XON and XOFF sequences (^Q and ^S) so they will be caught by the terminal. .TP .B \-q (\-\-quiet) -Do not report errors in the nanorc file and ask them to -be acknowledged by pressing enter at startup. +Do not report errors in the \fInanorc\fP file and ask them to be +acknowledged by pressing Enter at startup. .TP .B \-r \fIcols\fP (\-\-fill=\fIcols\fP) Wrap lines at column \fIcols\fP. If this value is 0 or less, wrapping @@ -206,11 +207,11 @@ Disable help screen at bottom of editor. Enable suspend ability. .TP .B \-$ (\-\-softwrap) -Enable 'soft wrapping'. Nano will attempt to display lines the entire -contents of a line, even if it is longer than the screen width. -Since '$' normally refers to a variable in the Unix shell, you should -specify this option last when using other options (e.g. 'nano -wS$') -or pass it separately (e.g. 'nano -wS -$'). +Enable 'soft wrapping'. \fBnano\fP will attempt to display the entire +contents of a line, even if it is longer than the screen width. Since +'$' normally refers to a variable in the Unix shell, you should specify +this option last when using other options (e.g. 'nano -wS$') or pass it +separately (e.g. 'nano -wS -$'). .TP .B \-a, \-b, \-e, \-f, \-g, \-j Ignored, for compatibility with Pico. @@ -223,7 +224,7 @@ should be provided with \fBnano\fP. .SH NOTES If no alternative spell checker command is specified on the command -line or in one of the nanorc files, \fBnano\fP will check the +line or in one of the \fInanorc\fP files, \fBnano\fP will check the \fBSPELL\fP environment variable for one. In some cases \fBnano\fP will try to dump the buffer into an emergency diff --git a/doc/man/nanorc.5 b/doc/man/nanorc.5 index dbb7a581..c172e61e 100644 --- a/doc/man/nanorc.5 +++ b/doc/man/nanorc.5 @@ -1,5 +1,5 @@ .\" Hey, EMACS: -*- nroff -*- -.\" Copyright (C) 2003, 2004, 2005, 2006, 2007 +.\" Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 .\" Free Software Foundation, Inc. .\" .\" This document is dual-licensed. You may distribute and/or modify it @@ -45,9 +45,9 @@ the command line options. Additionally, the \fBsyntax\fP, \fBcolor\fP, and \fBicolor\fP keywords are used to define syntax highlighting rules for different text patterns. \fBnano\fP will read one command per line. -Options in nanorc files take precedence over nano's defaults, and -command line options override nanorc settings. Also, options are unset -by default, except for those that take arguments. +Options in \fInanorc\fP files take precedence over nano's defaults, and +command line options override \fInanorc\fP settings. Also, options are +unset by default, except for those that take arguments. Quotes inside string parameters don't have to be escaped with backslashes. The last double quote in the string will be treated as its @@ -146,9 +146,9 @@ punctuation, optionally followed by closing brackets, can end sentences. The default value is "\fI!.?\fP". .TP .B set/unset quiet -\fBnano\fP will not report errors in the nanorc file and ask them to -be acknowledged by pressing enter at startup. If this is used it should -be placed at the top of the file to be fully effective. +\fBnano\fP will not report errors in the \fInanorc\fP file and ask them +to be acknowledged by pressing enter at startup. If this is used it +should be placed at the top of the file to be fully effective. .TP .B set/unset quickblank Do quick statusbar blanking. Statusbar messages will disappear after 1 @@ -414,7 +414,7 @@ Refresh the screen. Undo the text action peformed (add text, delete text, etc). .TP .B redo -"Re-do" the last undone action (i.e. undo an undo) +Redo the last undone action (i.e., undo an undo). .TP .B suspend Suspend the editor (if the suspend function is enabled, see the diff --git a/doc/nanorc.sample.in b/doc/nanorc.sample.in index 4d5a01d1..518c279e 100644 --- a/doc/nanorc.sample.in +++ b/doc/nanorc.sample.in @@ -141,6 +141,9 @@ ## Use smooth scrolling as the default. # set smooth +## Enable soft line wrapping (AKA full line display). +# set softwrap + ## Use this spelling checker instead of the internal one. This option ## does not properly have a default value. ## @@ -149,6 +152,10 @@ ## Allow nano to be suspended. # set suspend +## If nano is allowed to be suspended, allow the suspend key (usually +## ^Z) to actually suspend it. +# set suspendenable + ## Use this tab size instead of the default; it must be greater than 0. # set tabsize 8 @@ -158,6 +165,10 @@ ## Save automatically on exit, don't prompt. # set tempfile +## Enable the new (EXPERIMENTAL) generic undo code, not just for line +## cuts. +# set undo + ## Disallow file modification. Why would you want this in an rcfile? ;) # set view @@ -170,12 +181,6 @@ ## characters as parts of words. # set wordbounds -## Enable the new (EXPERIMENTAL) generic undo code, not just for line cuts -# set undo - -## Enable soft line wrapping (AKA full line display) -# set softwrap - ## Color setup ## diff --git a/doc/syntax/nanorc.nanorc b/doc/syntax/nanorc.nanorc index ae7baec3..4b89faf0 100644 --- a/doc/syntax/nanorc.nanorc +++ b/doc/syntax/nanorc.nanorc @@ -4,7 +4,7 @@ syntax "nanorc" "\.?nanorc$" ## Possible errors and parameters icolor brightwhite "^[[:space:]]*((un)?set|include|syntax|i?color).*$" ## Keywords -icolor brightgreen "^[[:space:]]*(set|unset)[[:space:]]+(autoindent|backup|backupdir|backwards|boldtext|brackets|casesensitive|const|cut|fill|historylog|matchbrackets|morespace|mouse|multibuffer|noconvert|nofollow|nohelp|nonewlines|nowrap|operatingdir|preserve|punct)\>" "^[[:space:]]*(set|unset)[[:space:]]+(quickblank|quotestr|rebinddelete|rebindkeypad|regexp|smarthome|smooth|speller|suspend|tabsize|tabstospaces|tempfile|view|whitespace|wordbounds)\>" +icolor brightgreen "^[[:space:]]*(set|unset)[[:space:]]+(autoindent|backup|backupdir|backwards|boldtext|brackets|casesensitive|const|cut|fill|historylog|matchbrackets|morespace|mouse|multibuffer|noconvert|nofollow|nohelp|nonewlines|nowrap|operatingdir|preserve|punct)\>" "^[[:space:]]*(set|unset)[[:space:]]+(quickblank|quotestr|rebinddelete|rebindkeypad|regexp|smarthome|smooth|softwrap|speller|suspend|suspendenable|tabsize|tabstospaces|tempfile|undo|view|whitespace|wordbounds)\>" icolor green "^[[:space:]]*(set|unset|include|syntax|header)\>" ## Colors icolor yellow "^[[:space:]]*i?color[[:space:]]*(bright)?(white|black|red|blue|green|yellow|magenta|cyan)?(,(white|black|red|blue|green|yellow|magenta|cyan))?\>" diff --git a/doc/texinfo/nano.texi b/doc/texinfo/nano.texi index 5cc1f0d1..fe12428c 100644 --- a/doc/texinfo/nano.texi +++ b/doc/texinfo/nano.texi @@ -8,8 +8,8 @@ @c Run 'makeinfo' rather than 'texinfo-format-buffer'. @smallbook @set EDITION 0.1 -@set VERSION 2.0.0 -@set UPDATED 17 Dec 2007 +@set VERSION 2.2.0 +@set UPDATED 30 Nov 2009 @dircategory Editors @direntry @@ -23,7 +23,7 @@ @titlepage @title GNU @code{nano} @subtitle a small and friendly text editor. -@subtitle version 2.0.0 +@subtitle version 2.2.0 @author Chris Allegretta @page @@ -33,8 +33,8 @@ editor. This manual is part of the GNU @code{nano} distribution.@* @sp4 -Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 -Free Software Foundation, Inc. +Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, +2008, 2009 Free Software Foundation, Inc. This document is dual-licensed. You may distribute and/or modify it under the terms of either of the following licenses: @@ -249,6 +249,10 @@ a chroot. Preserve the ^Q (XON) and ^S (XOFF) sequences so data being sent to the editor can be can be stopped and started. +@item -q, --quiet +Do not report errors in the nanorc file and ask them to be acknowledged +by pressing Enter at startup. + @item -r <#cols>, --fill=<#cols> Wrap lines at column #cols. If this value is 0 or less, wrapping will occur at the width of the screen less #cols, allowing it to vary along @@ -266,6 +270,10 @@ Don't ask whether or not to save the current contents of the file when exiting, assume yes. This is most useful when using @code{nano} as the composer of a mailer program. +@item -u, --undo +Enable experimental generic-purpose undo code. By default, the undo and +redo shortcuts are Meta-U and Meta-E, respectively. + @item -v, --view Don't allow the contents of the file to be altered. Note that this option should NOT be used in place of correct file permissions to @@ -288,6 +296,13 @@ disabled to display the help system navigation keys. Enable @code{nano}'s suspend ability using the system's suspend keystroke (usually ^Z). +@item -$, --softwrap +Enable 'soft wrapping'. @code{nano} will attempt to display the entire +contents of a line, even if it is longer than the screen width. Since +'$' normally refers to a variable in the Unix shell, you should specify +this option last when using other options (e.g. 'nano -wS$') or pass it +separately (e.g. 'nano -wS -$'). + @item -a, -b, -e, -f, -g, -j Ignored, for compatibility with Pico. @end table @@ -447,6 +462,9 @@ nanorc. See @xref{Nanorc Files}, for more info. @item Suspend Toggle (Meta-Z) toggles the -z (@code{--suspend}) command line option. +@item Soft Wrapping Toggle (Meta-$) +toggles the -$ (@code{--softwrap}) command line option. + @end table @@ -615,6 +633,9 @@ line. @item set/unset smooth Use smooth scrolling by default. +@item set/unset softwrap +Use soft wrapping by default. + @item set speller "spellprog" Use spelling checker "spellprog" instead of the built-in one, which calls "spell". @@ -622,6 +643,10 @@ calls "spell". @item set/unset suspend Allow @code{nano} to be suspended. +@item set/unset suspendenable +If @code{nano} is allowed to be suspended, allow the suspend key +(usually ^Z) to actually suspend it. + @item set tabsize "n" Use a tab size of "n" columns. The value of "n" must be greater than 0. The default value is 8. @@ -632,6 +657,9 @@ Convert typed tabs to spaces. @item set/unset tempfile Save automatically on exit, don't prompt. +@item set/unset undo +Enable experimental generic-purpose undo code. + @item set/unset view Disallow file modification. diff --git a/src/browser.c b/src/browser.c index d98c1aa3..fd5329fe 100644 --- a/src/browser.c +++ b/src/browser.c @@ -2,7 +2,7 @@ /************************************************************************** * browser.c * * * - * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 * + * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 * * Free Software Foundation, Inc. * * 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 * diff --git a/src/chars.c b/src/chars.c index 0ba29947..a401dc5a 100644 --- a/src/chars.c +++ b/src/chars.c @@ -2,7 +2,7 @@ /************************************************************************** * chars.c * * * - * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 * + * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 * * Free Software Foundation, Inc. * * 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 * diff --git a/src/color.c b/src/color.c index a8393a4d..2522f630 100644 --- a/src/color.c +++ b/src/color.c @@ -2,7 +2,7 @@ /************************************************************************** * color.c * * * - * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 * + * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 * * Free Software Foundation, Inc. * * 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 * diff --git a/src/cut.c b/src/cut.c index f65efd8c..d9a60837 100644 --- a/src/cut.c +++ b/src/cut.c @@ -2,8 +2,8 @@ /************************************************************************** * cut.c * * * - * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 * - * Free Software Foundation, Inc. * + * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, * + * 2008, 2009 Free Software Foundation, Inc. * * 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 * * the Free Software Foundation; either version 3, or (at your option) * diff --git a/src/files.c b/src/files.c index 147f23f4..f18ce246 100644 --- a/src/files.c +++ b/src/files.c @@ -2,8 +2,8 @@ /************************************************************************** * files.c * * * - * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 * - * Free Software Foundation, Inc. * + * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, * + * 2008, 2009 Free Software Foundation, Inc. * * 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 * * the Free Software Foundation; either version 3, or (at your option) * diff --git a/src/global.c b/src/global.c index f24c527e..8e49abf0 100644 --- a/src/global.c +++ b/src/global.c @@ -2,8 +2,8 @@ /************************************************************************** * global.c * * * - * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 * - * Free Software Foundation, Inc. * + * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, * + * 2008, 2009 Free Software Foundation, Inc. * * 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 * * the Free Software Foundation; either version 3, or (at your option) * diff --git a/src/help.c b/src/help.c index d3912291..950f87d2 100644 --- a/src/help.c +++ b/src/help.c @@ -2,8 +2,8 @@ /************************************************************************** * help.c * * * - * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 * - * Free Software Foundation, Inc. * + * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, * + * 2009 Free Software Foundation, Inc. * * 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 * * the Free Software Foundation; either version 3, or (at your option) * diff --git a/src/move.c b/src/move.c index 578e3ef4..49798518 100644 --- a/src/move.c +++ b/src/move.c @@ -2,8 +2,8 @@ /************************************************************************** * move.c * * * - * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 * - * Free Software Foundation, Inc. * + * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, * + * 2008, 2009 Free Software Foundation, Inc. * * 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 * * the Free Software Foundation; either version 3, or (at your option) * diff --git a/src/nano.c b/src/nano.c index b07abae3..feaabd6e 100644 --- a/src/nano.c +++ b/src/nano.c @@ -2,8 +2,8 @@ /************************************************************************** * nano.c * * * - * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 * - * Free Software Foundation, Inc. * + * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, * + * 2008, 2009 Free Software Foundation, Inc. * * 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 * * the Free Software Foundation; either version 3, or (at your option) * @@ -936,8 +936,8 @@ void version(void) { printf(_(" GNU nano version %s (compiled %s, %s)\n"), VERSION, __TIME__, __DATE__); - printf(" (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007\n"); - printf(" Free Software Foundation, Inc.\n"); + printf(" (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,\n"); + printf(" 2008, 2009 Free Software Foundation, Inc.\n"); printf( _(" Email: nano@nano-editor.org Web: http://www.nano-editor.org/")); printf(_("\n Compiled options:")); diff --git a/src/nano.h b/src/nano.h index b130ff1b..009c9f2c 100644 --- a/src/nano.h +++ b/src/nano.h @@ -2,8 +2,8 @@ /************************************************************************** * nano.h * * * - * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 * - * Free Software Foundation, Inc. * + * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, * + * 2008, 2009 Free Software Foundation, Inc. * * 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 * * the Free Software Foundation; either version 3, or (at your option) * diff --git a/src/prompt.c b/src/prompt.c index fa85d06e..9377ec67 100644 --- a/src/prompt.c +++ b/src/prompt.c @@ -2,8 +2,8 @@ /************************************************************************** * prompt.c * * * - * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 * - * Free Software Foundation, Inc. * + * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, * + * 2008, 2009 Free Software Foundation, Inc. * * 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 * * the Free Software Foundation; either version 3, or (at your option) * diff --git a/src/proto.h b/src/proto.h index 4f5eef5b..a78bacd8 100644 --- a/src/proto.h +++ b/src/proto.h @@ -2,8 +2,8 @@ /************************************************************************** * proto.h * * * - * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 * - * Free Software Foundation, Inc. * + * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, * + * 2008, 2009 Free Software Foundation, Inc. * * 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 * * the Free Software Foundation; either version 3, or (at your option) * diff --git a/src/rcfile.c b/src/rcfile.c index 4aa5894f..75d6a951 100644 --- a/src/rcfile.c +++ b/src/rcfile.c @@ -2,7 +2,7 @@ /************************************************************************** * rcfile.c * * * - * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 * + * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 * * Free Software Foundation, Inc. * * 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 * diff --git a/src/search.c b/src/search.c index bfd327cd..82cc80b0 100644 --- a/src/search.c +++ b/src/search.c @@ -2,8 +2,8 @@ /************************************************************************** * search.c * * * - * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 * - * Free Software Foundation, Inc. * + * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, * + * 2008, 2009 Free Software Foundation, Inc. * * 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 * * the Free Software Foundation; either version 3, or (at your option) * diff --git a/src/text.c b/src/text.c index 1311c3d1..332abb1e 100644 --- a/src/text.c +++ b/src/text.c @@ -2,8 +2,8 @@ /************************************************************************** * text.c * * * - * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 * - * Free Software Foundation, Inc. * + * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, * + * 2008, 2009 Free Software Foundation, Inc. * * 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 * * the Free Software Foundation; either version 3, or (at your option) * diff --git a/src/utils.c b/src/utils.c index 3d7f069b..220204ac 100644 --- a/src/utils.c +++ b/src/utils.c @@ -2,8 +2,8 @@ /************************************************************************** * utils.c * * * - * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 * - * Free Software Foundation, Inc. * + * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, * + * 2008, 2009 Free Software Foundation, Inc. * * 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 * * the Free Software Foundation; either version 3, or (at your option) * diff --git a/src/winio.c b/src/winio.c index ab16b441..6b5e6e16 100644 --- a/src/winio.c +++ b/src/winio.c @@ -2,8 +2,8 @@ /************************************************************************** * winio.c * * * - * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 * - * Free Software Foundation, Inc. * + * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, * + * 2008, 2009 Free Software Foundation, Inc. * * 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 * * the Free Software Foundation; either version 3, or (at your option) *