GNU nano 2.0.3

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

.cvsignore

@@ -11,6 +11,7 @@ config.h
 config.h.in
 config.log
 config.status
+config.rpath
 configure
 config.guess
 config.sub

AUTHORS

@@ -1,18 +1,18 @@
 $Id$
-This file lists people who have made significant contribution to the nano
-editor.  Please see the ChangeLog for specific changes by author.
+This file lists people who have made significant contribution to the
+nano editor.  Please see the ChangeLog for specific changes by author.
 -------------------------------------------------------------------------
 
 Chris Allegretta <chrisa@asty.org>
-	* Original program author, stable series maintainer.
+	* Original program author, former stable series maintainer.
 
-David Lawrence Ramsey <pooka_regent@sluggy.net>
-	* Development series maintainer.  Multiple buffer support, 
-	  operating dir (-o) option, bug fixes for display routines, 
-	  wrapping code, spelling fixes, const mode and various other 
-	  fixes.
+David Lawrence Ramsey <pooka109@cox.net>
+	* Current stable series maintainer.  Multiple buffer support,
+	  operating dir (-o) option, bug fixes for display routines,
+	  wrapping code, spelling fixes, const mode, parts of the UTF-8
+	  support, and various other fixes.
 
-Jordi Mallach <jordi@sindominio.net>
+Jordi Mallach <jordi@gnu.org>
 	* Debian package maintainer, fellow bug squasher.
 	* Internationalization support head, ca.po maintainer.
 
@@ -27,10 +27,17 @@ Robert Siemborski <rjs3@andrew.cmu.edu>
 	  edit display routines.
 
 Rocco Corsi <rocco.corsi@sympatico.ca>
-	* Internal spelling code, many optimizations and bug fixes for 
-	  findnextstr and search-related functions, various display and
-	  file handling fixes.
+	* Internal spelling code, many optimizations and bug fixes for
+	  findnextstr() and search-related functions, various display
+	  and file handling fixes.
 
 David Benbennick <dbenbenn@math.cornell.edu>
 	* Wrap and justify bugfixes/enhancements, new color syntax
-	  code, memleak fixes and other miscellaneous fixes.
+	  code, memleak fixes, parts of the UTF-8 support, and other
+	  miscellaneous fixes.
+
+Mike Frysinger <vapier@gentoo.org>
+	* Gentoo package maintainer.  Whitespace display mode,
+	  --enable-utf8/--disable-utf8 configure options for ncurses,
+	  many new color regexes and improvements to existing color
+	  regexes for nanorc.sample, and miscellaneous bug fixes.

BUGS

@@ -8,18 +8,18 @@
   certain col values. (9) [FIXED]
 - edit_refresh() and update_line() do not handle selecting text when the
   cursor is beyond COLS (10) [FIXED]
-- no way to do a replace with the empty string (11) [FIXED, yay!]
+- No way to do a replace with the empty string (11) [FIXED, yay!]
 - Spelling support is not elegant like Pico's integration of the 'spell'
-  program.  Nano only uses ispell (for now) (12) [FIXED]
+  program.  nano only uses ispell (for now) (12) [FIXED]
 - Moving to the end of a line when close to a multiple of COLS and at
   least COLS * 2 does not make the screen jump early like it would for
   if we were around COLS (bugs in edit_refresh, update_line) (13)
   [FIXED, mostly]
-- When at the very bottom of the edit window, do_wrap goes berserk and
+- When at the very bottom of the edit window, do_wrap() goes berserk and
   puts the cursor somewhere bad; subsequent keystrokes crash the program
   (14) [FIXED, mostly]
-- Doing a replacement of a substring of the replace string (e.g. replacing
-  "ed" with "fred" causes an infinite loop). (15) [FIXED]
+- Doing a replacement of a substring of the replace string (e.g.
+  replacing "ed" with "fred" causes an infinite loop). (15) [FIXED]
 - Cutting a file with marked text and both marker ends on the same line
   causes a random segfault (16) [FIXED]
 - Cutting more than one line resets the KEEP_CUTBUFFER flag in 0.9.3.
@@ -27,25 +27,28 @@
 - The wrapping code does not work right for lines like the following:
  *                                                                     *
   Error is in do_wrap, must be rewritten. (18) [FIXED]
-- Nano fails to follow symlinks, even though -l isn't being used (20).
+- nano fails to follow symlinks, even though -l isn't being used (20).
   [Bug in global flag init, FIXED]
-- When using --help or --version, the SIGINT character gets lost. (21) [FIXED]
+- When using --help or --version, the SIGINT character gets lost. (21)
+  [FIXED]
 - edit_refresh() and update_line() (and related functions) have 
   trouble when a tab is the character that is the boundary at COLS (23)
   [FIXED]
-- There is an off-by-one error in keeping track of totsize.  It is caused
-  by the fact that we count the newline at the end when we read in a file
-  but we do not, in fact, display this newline.  This should go away
-  implicitly when the "Magic Line" returns, but it is noted here for
-  documentation's sake. (24) [FIXED]
+- There is an off-by-one error in keeping track of totsize.  It is
+  caused by the fact that we count the newline at the end when we read
+  in a file but we do not, in fact, display this newline.  This should
+  go away implicitly when the "Magic Line" returns, but it is noted here
+  for documentation's sake. (24) [FIXED]
 - In replace with completely adjacent strings, every other search string
-  will be missed (try replace ':' in a string like ':::::::::') (28) [FIXED]
-- If nano opens a read-only file with the --tempfile option, and a change
-  is made to the buffer, and a write is attempted, nano will not give you
-  a dialog about not being able to write the file, and it will not let the
-  user exit (29, discovered by Joshua Jensen) [FIXED]
+  will be missed (try replace ':' in a string like ':::::::::') (28)
+  [FIXED]
+- If nano opens a read-only file with the --tempfile option, and a
+  change is made to the buffer, and a write is attempted, nano will not
+  give you a dialog about not being able to write the file, and it will
+  not let the user exit (29, discovered by Joshua Jensen) [FIXED]
 - Using nano -k, marked text is not cut properly. (31) [FIXED]
-- Invoking -t or -k has the effect of invoking both options. (32) [FIXED]
+- Invoking -t or -k has the effect of invoking both options. (32)
+  [FIXED]
 - totsize becomes incorrect after word-wrapping (25) [FIXED]
 - Wrapping a line with autoindent mode sometimes causes a segfault (19)
   [FIXED]
@@ -55,51 +58,52 @@
   [FIXED]
 - In replace, there is no way to accept the default replace string. (27)
   [FIXED]
-- Using nano -t, user can not exit until a filename is given via ^O. (30)
-  [FIXED]
+- Using nano -t, user can not exit until a filename is given via ^O.
+  (30) [FIXED]
 - totsize problems still abound in do_justify (33) [FIXED]
 - Using -k, cut text is not pasted properly. (34) [FIXED].
-- Using -k, pasted text is not updated properly if it goes beyond editbot. (35)
-  [FIXED]
+- Using -k, pasted text is not updated properly if it goes beyond
+  editbot. (35) [FIXED]
 - Doing a cut with -k can screw up the filestruct; fault is in cutting
- code. (36)  [FIXED]
+  code. (36) [FIXED]
 - Hitting enter on the magic line makes new lines, but they are not
   written out to disk when saved..... (37). [FIXED]
-- Page up and page down do not work the same way as in Pico (# of lines). (38)
-  [FIXED]
+- Page up and page down do not work the same way as in Pico (# of
+  lines). (38) [FIXED]
 - When doing a search and the marker is set, the screen does not always
   properly update the inverted text (39). [FIXED]
 - Searches for a string that only exists on one line multiple times will
   fail after finding the last occurrence (discovered by Ken Tyler) (40).
   [FIXED]
-- Alt-Z is currently broken to toggle suspend.  I guess I still don't know
-  signals very well =-) (41) [FIXED].
-- Unable to cut the entire file using the marker (discovered by Ken Tyler)
-  (42). [FIXED]
-- The keypad does not work when nano runs in the Gnome terminal (43). [FIXED]
-- When reading in a file, if the file is a directory, the contents of the
-  file being edited are blown away (discovered by  Chris Pimlot) (44). [FIXED]
-- in certain terms, nano will leave a "ghost" of screen upon exit
-  when called from inside mutt (among other settings) (45). [FIXED]
+- Meta-Z is currently broken to toggle suspend.  I guess I still don't
+  know signals very well =-) (41) [FIXED].
+- Unable to cut the entire file using the marker (discovered by Ken
+  Tyler) (42). [FIXED]
+- The keypad does not work when nano runs in the Gnome terminal (43).
+  [FIXED]
+- When reading in a file, if the file is a directory, the contents of
+  the file being edited are blown away (discovered by  Chris Pimlot)
+  (44). [FIXED]
+- In certain terms, nano will leave a "ghost" of screen upon exit when
+  called from inside mutt (among other settings) (45). [FIXED]
 - In replace, hitting the Goto line shortcut key does nothing after a
   search string is entered (discovered by Rocco Corsi) (46) [FIXED].
-- When typing in a string in search or replace and hitting CASE_SENSITIVE
-  or the other search string, the current string edit is blown away in
-  favor of the last stored search (47) [FIXED]
+- When typing in a string in search or replace and hitting
+  CASE_SENSITIVE or the other search string, the current string edit is
+  blown away in favor of the last stored search (47) [FIXED]
 - If nano fails to open a file when it starts up, doing almost anything
   causes a segfault (discovered by Ben Roberts) (48). [FIXED]
 - In certain terminals, nano would not work properly with keypad().
   Turned out to be the silly timeout(0) call, which is completely
-  unneeded, anyway.  (49) [FIXED]
-- With less than a page of text, doing a page down will move the
-  current line to the top of the screen, which it shouldn't do.  (50) 
-  [FIXED]
-- with PDCURSES, running meta-X turns off the keypad.  (51) [FIXED]
+  unneeded, anyway. (49) [FIXED]
+- With less than a page of text, doing a page down will move the current
+  line to the top of the screen, which it shouldn't do. (50) [FIXED]
+- With PDCurses, running Meta-X turns off the keypad. (51) [FIXED]
 - Resizing the window completely screws up the display if in any other
   mode than normal editing (help screen, search and replace, file
-  browser..) (52) [FIXED]
-- Alt speller argument (-s, --speller) does not take a string argument of
-  more than one word. (53) [FIXED].
+  browser...) (52) [FIXED]
+- Alt speller argument (-s, --speller) does not take a string argument
+  of more than one word. (53) [FIXED].
 - Cut to end cutting (-k) causes segfaults (try cutting "- Backup making
   (filename~)?" line in TODO file) (discovered by
   higuita@cadernoverde.com) (54) [FIXED].
@@ -109,29 +113,29 @@
   the first fail if no string is entered (56) [FIXED].
 - Page down on a file of editwinrows fails (again). Reported by Ryan
   Krebs (57) [FIXED].
-- File browser aborts on Solaris in qsort() call.  (Reported by
-  Matthias Andree) (58) [FIXED].
-- Can modify the current file in view mode with ^W^R (discovered by Rocco
-  Corsi) (58) [FIXED].
-- When page up is used after two page down's, the screen doesn't update
+- File browser aborts on Solaris in qsort() call. (Reported by Matthias
+  Andree) (58) [FIXED].
+- Can modify the current file in view mode with ^W^R (discovered by
+  Rocco Corsi) (58) [FIXED].
+- When page up is used after two page downs, the screen doesn't update
   properly (discovered by David Lawrence Ramsey) (59) [FIXED].
-- On BSD systems, marked cutting sna paste often screws up the
-  last line in the cutbuffer (discovered by Barry Pederson) (60) [FIXED]
+- On BSD systems, marked cutting and paste often screws up the last line
+  in the cutbuffer (discovered by Barry Pederson) (60) [FIXED]
 - Blank lines are not kept when cutting with -k (discovered by Rocco)
   (61) [FIXED].
-- Nano will not suspend properly inside of mutt (62) [FIXED].
+- nano will not suspend properly inside of mutt (62) [FIXED].
 - When switching from Pico mode to normal mode, the previous search is
   not displayed until cancelling the search (63) [FIXED].
 - If you change search options but don't change the search string in
-  normal mode, hitting  enter causes the search/replace to abort (64)
+  normal mode, hitting Enter causes the search/replace to abort (64)
   (Jordi Mallach) [FIXED].
 - Cutting one line of text causes the screen to recenter the line
   (reported and fixed by David Lawrence Ramsey) (65) [FIXED].
-- When cutting marked text including the bottom of the file, a new   
-  "magic line" is not created" (reported by David Lawrence
-  Ramsey, fixed by David Lawrence Ramsey & Chris) (66) [FIXED].
-- ^C does not work after a suspend in tcsh (discovered by
-  Trevor Cordes) (68) [FIXED].
+- When cutting marked text including the bottom of the file, a new
+  "magic line" is not created" (reported by David Lawrence Ramsey, fixed
+  by David Lawrence Ramsey & Chris) (66) [FIXED].
+- ^C does not work after a suspend in tcsh (discovered by Trevor Cordes)
+  (68) [FIXED].
 - Home and End control keys (^A, ^E) do not always work in filename
   prompt (bug found by Ian Turner) (69) [1.0 series only] [FIXED].
 - Trying to insert a file of 0 bytes will hang nano (70) [FIXED].

Makefile.am

@@ -3,9 +3,8 @@ AUTOMAKE_OPTIONS = gnu no-dependencies
 
 SUBDIRS = doc m4 po src
 
-
-EXTRA_DIST =	ABOUT-NLS AUTHORS BUGS COPYING ChangeLog INSTALL NEWS \
-		README THANKS TODO UPGRADE config.rpath install-sh missing \
-		mkinstalldirs nano.spec
+EXTRA_DIST = ABOUT-NLS AUTHORS BUGS COPYING ChangeLog INSTALL NEWS \
+		README README.CVS THANKS TODO UPGRADE config.rpath \
+		install-sh missing mkinstalldirs nano.spec
 
 ACLOCAL_AMFLAGS = -I m4

NEWS

@@ -1,3 +1,273 @@
+2007.01.29 - GNU nano 2.0.3 flows toward its ending.  This release
+		contains several minor optimizations to make the
+		executable a little smaller under some circumstances,
+		some translation updates, improvements to the color
+		syntax for Python, and still more minor documentation
+		updates.  Have fun.
+
+2006.12.20 - GNU nano 2.0.2 forges ahead.  This release fixes a segfault
+		when trying to save in a nonexistent directory; fixes
+		handling of strings containing nulls at the "Write File",
+		"Insert File", "Execute Command", and "Go to Directory"
+		prompts; fixes several minor memory leaks; fixes two
+		more potential compilation warnings; adds a few
+		translation updates; and adds a few more minor
+		documentation updates.  Enjoy.
+
+2006.11.20 - GNU nano 2.0.1 emerges from its cocoon.  This release
+		contains several bugfixes: saving one file over another
+		will now always warn about overwriting it, overwriting
+		a file is no longer possible when saving a new file in
+		restricted mode, and zero-length Unicode characters are
+		now highlighted properly when nano is built without
+		regular expression support.  It also adds several minor
+		documentation updates.  Have fun with it.
+
+2006.11.06 - GNU nano 2.0.0 does its little dance.  This release adds
+		documentation updates and a few cosmetic tweaks.
+			For those who haven't been following nano 1.3
+		development, there are a ton of new features, including
+		support for UTF-8, moving to a specified line and column
+		instead of just a line, improved color syntax
+		highlighting, inserting previously untypeable characters
+		using "Verbatim Input" mode, and copying text into the
+		cutbuffer without cutting it.  There are also fixes for
+		some long-standing bugs, such as the "NumLock glitch"
+		from nano 1.2.x, and the inability to unjustify text
+		after resizing.  Finally, there are also a ton of
+		translation updates and new translations, as well as new
+		color syntaxes.  See the UPGRADE file for more
+		information, and enjoy the new stable release.
+
+2006.10.25 - GNU nano 1.9.99pre3 learns to appreciate life.  This
+		release fixes a bug where the screen sometimes wouldn't
+		be updated properly after copying text into the
+		cutbuffer, fixes a potential warning while compiling,
+		and fixes a few other minor inconsistencies.  Have fun.
+
+2006.10.02 - GNU nano 1.9.99pre2 crosses the threshold.  This release
+		fixes a few more bugs: cursor positioning after leaving
+		the statusbar prompt has been fixed, and verbatim input
+		at the statusbar prompt now properly handles newlines.
+		Enjoy.
+
+2006.08.29 - GNU nano 1.9.99pre1 passes through the flames.  This
+		release fixes various bugs in the last version: the
+		mouse support properly ignores everything except clicks
+		of the left mouse button; the statusbar is now blanked
+		properly when it should be; indenting and unindenting
+		operate on the current line when the mark is off; nano
+		should build on Tru64, NetBSD, and other systems that
+		use termcap instead of terminfo in their curses
+		libraries; the built-in file browser now properly
+		navigates file lists that take up only one row; the
+		cursor position is now completely restored after
+		inserting a file into the current buffer, and after
+		inserting the output of a command into a new buffer; the
+		^X shortcut at the search prompt has been removed, as
+		official Pico doesn't include it and it's too easily
+		confused with Exit; the screen is updated properly after
+		scrolling a line without moving the cursor; the keyboard
+		input routines behave more consistently; and so on.
+		Have fun with it.
+
+2006.06.26 - GNU nano 1.3.12 escapes the darkness.  This release
+		contains the last new features that nano will have
+		before 2.0: copying text into the cutbuffer without
+		cutting it, indenting lines of marked text with a single
+		keystroke, reworked help text that should be easier for
+		new users, searching for filenames in the file browser,
+		the ability to include color regexes in files separate
+		from nanorc files, etc.  It also contains many bugfixes.
+		Text can now be unjustified after justifying it and
+		resizing the window; the screen is now cleared when
+		suspending; the "default" color syntax is now handled
+		properly at all times; lines of text containing tabs are
+		now wrapped at the right place; double-column characters
+		are now properly displayed when past the right edge of
+		the screen; invalid multi-line color regexes are now
+		ignored; and so on.  Enjoy.
+
+2006.03.30 - GNU nano 1.3.11 awakens from its fever dream.  This release
+		focuses mostly on bugfixes, which include better
+		handling of the cursor at the statusbar prompt, support
+		for certain combinations of Shift and keypad keys in
+		both normal and --rebind-keypad mode, a fix for a minor
+		display problem after some searches, a real fix for a
+		long-standing segfault when displaying overly long
+		lines, and a real fix for nano's not hanging up properly
+		in xterm under certain circumstances.  There are also
+		several new features, such as the ability to set the
+		characters used as brackets when searching for matching
+		brackets, and tab completion of directories at the "Go
+		To Directory" prompt.  Have fun.
+
+2005.12.23 - GNU nano 1.3.10 rises to the surface.  This release
+		contains several new features as well as fixes for
+		several longstanding bugs.  The former include the
+		ability to scroll up or down single lines without
+		scrolling the cursor, reworked bracket searching code
+		that doesn't require regular expression support,
+		reworked command execution code that uses $SHELL if
+		available instead of hardcoding "/bin/sh", and the
+		ability to no longer add newlines to files that don't
+		end in them via the -L/--nonewlines option.  The latter
+		include fixes to the statusbar prompt so that mouse
+		clicks work properly on it, fixes to the Yes/No/All
+		prompt so that mouse clicks on it work properly when
+		-O/--morespace is used, and fixes to the resize handling
+		so that nano dies properly when the terminal is too
+		small to display a prompt.  Enjoy.
+
+2005.10.23 - GNU nano 1.3.9 breaks through the wall.  This release
+		includes major enhancements as well as bugfixes.  The
+		enhancements include better handling of invalid UTF-8,
+		expansion of the word count option to also count lines
+		and characters in the file or selection, more efficient
+		screen update routines, a readded -K/--rebindkeypad
+		option to work around numeric keypad problems on
+		terminals that don't show the usual NumLock glitch, a
+		new -W/--wordbounds option to properly detect words
+		containing punctuation when moving among them, and
+		massive improvements to the color code such as handling
+		of unspecified foreground colors, more efficient memory
+		usage for color regexes, and new reserved syntaxes
+		"default" and "none".  The bugfixes include fixes for
+		the rewritten history code, fixes for potential line
+		numbering problems on 64-bit platforms, fixes for a few
+		long-standing minor display problems, a fix for erroneous
+		hangups occurring while waiting for input, and a fix for
+		a segfault when displaying certain overly long lines.
+		Have fun with it.
+
+2005.06.30 - GNU nano 1.3.8 floats at its own level.  This release
+		contains several new features.  Among other things, you
+		can now move to a specified column number as well as
+		line number within a file, file backups saved in a
+		backup directory will have unique names, the search and
+		replace history routines should work more consistently,
+		you can get a word count by pressing Meta-D at the edit
+		window, and there's a new -E/--tabstospaces option to
+		convert all typed tabs to spaces (--backupdir's short
+		option has been changed to -C).  In terms of bugfixes,
+		this release contains fixes for minor problems with
+		screen updates, UTF-8 display, and flow control; a fix
+		for a segfault when displaying some lines ending with
+		tabs; better handling of constant cursor position
+		display; improved color parsing in the rcfile; and
+		support for the "Regexp" toggle in tiny mode
+		(-R/--regexp is gone, and --restricted's short option
+		has been changed to -R), among other things.  Enjoy.
+
+2005.04.10 - GNU nano 1.3.7 claws its way to the top.  This release
+		mostly contains bugfixes for the massive amount of new
+		code in 1.3.6.  Among other things, nano builds with
+		debug support again; going into the help browser at the
+		"Read File" prompt no longer kicks you out of the prompt
+		after you exit the help browser; paragraph searching no
+		longer skips over certain cases of single-line
+		paragraphs; the titlebar no longer cuts off some UTF-8
+		strings prematurely; and the text displayed in the help
+		browser is now wrapped as it was in nano 1.2.x, taking
+		UTF-8 support into account.  New features include an
+		--enable/disable-utf8 configure option to explicitly
+		turn detection of UTF-8 support on or off, and sample
+		regexes for C++ as well as C.  Have fun.
+
+2005.03.20 - GNU nano 1.3.6 "shout it from the rooftops" is released.
+		This release finally includes the long-awaited support
+		for UTF-8.  Other new features include the ability to
+		insert UTF-8 characters using verbatim input; the
+		ability to delete all text from the cursor position to
+		the end of the file via ^W^X as (patched) Pico does;
+		improvements to input and output so that pasted text
+		displays faster, improvements to the statusbar prompt so
+		that more edit window shortcuts, including verbatim
+		input and previous/next word search, work in it; a new
+		option to allow using the formerly always-blank second
+		line of the screen as part of the edit window; and the
+		ability to refresh the help browser and file browser
+		windows via Ctrl-L.  Notable bug fixes include a fix for
+		a segfault when using full justify, and a fix for the
+		long-standing bug where nano would keep running if the
+		terminal it was in died unexpectedly.  Enjoy.
+
+2004.11.22 - GNU nano 1.3.5 hurls itself forward.  New features in this
+		release include the ability to replace only marked text
+		when the mark is on, improvements to smooth scrolling so
+		that it applies everywhere instead of just affecting the
+		movement keys, improvements to how files are opened so
+		that they are no longer displayed unnecessarily, support
+		for multiple +LINE arguments in addition to multiple
+		filenames on the command line, autodetection of the
+		format to save a file in based on the format it was in
+		when it was opened, the ability to toggle both ways
+		between the "Read File" and "Execute Command" prompts
+		and the "Search" and "Go to Line" prompts, and support
+		for cross-compiling nano.  As for bug fixes, the
+		"tabsize" nanorc option works again, mouse clicks on the
+		shortcut list trigger the right shortcuts again,
+		tab-completing a filename with %'s in it no longer
+		causes a segfault, the internal spell checker no longer
+		skips words after the cursor position when the cursor is
+		in the middle of the file, and spell checking of only
+		marked text now works properly.  Have fun with it.
+
+2004.08.17 - GNU nano 1.3.4 marches forth after a false start.  This
+		release mainly features fixes for the bugs that crept
+		into the last release.  Among other things, nano now
+		compiles again with certain options, quoted justify now
+		works properly on systems without regex.h, full justify
+		no longer segfaults when used on a file with no
+		paragraphs, previous paragraph searching works properly
+		again, tab completion is properly disabled when needed
+		in restricted mode, Ctrl-C is no longer disabled after
+		using the alternate spell checker, the permissions of a
+		newly created file now match those of nano 1.2.x again,
+		and replacing all text in a file now properly updates
+		the screen in all cases.  New features include sample
+		regexes for patch files, improvements to the sample
+		regexes for C files, and support for strings greater
+		than 1023 characters and/or containing nulls in
+		.nano_history.  Additionally, the full justify keystroke
+		has been changed to match current Pico, and whitespace
+		display mode is now turned off by default.  Enjoy.
+
+2004.06.28 - GNU nano 1.3.3 marches forth.  There are several new
+		features in this release, including a restricted mode
+		that provides better security than just setting an
+		operating directory, the ability to justify the entire
+		file at once, support for a "smart" home key that can
+		leap from the beginning of text on a line to the true
+		beginning of the line (or the reverse) in one stroke,
+		support for specifying an alternative spell checker in
+		$SPELL, the ability to specify the characters used to
+		display spaces and tabs so that they can easily be told
+		apart, and the ability to specify the characters marking
+		the ends of sentences as used in justification.  There
+		are also several bug fixes; among other things,
+		justification now keeps spaces at the ends of all but
+		the last line of a paragraph as Pico does, saving a
+		marked selection no longer changes the current filename
+		to the filename the selection was saved under, resizing
+		now works better and no longer corrupts the screen under
+		slang, and the movement functions now avoid doing
+		unnecessary redraws and hence work faster.  In short,
+		there are a lot of new things to play with.  Enjoy.
+
+2004.03.31 - GNU nano 1.3.2 is prepared for the void.  New features in
+		this release include the ability to spell-check only
+		marked text and the ability to save all backup files in
+		a specified directory instead of wherever the original
+		files are.  Bug fixes include a fix for a segfault when
+		replacing certain regular expressions, fixes for some
+		misbehavior when doing searches, minor fixes to verbatim
+		input mode and keyboard input in general, better
+		handling of window resizes at certain times, and
+		allowing the mark to be saved properly again when
+		switching between multiple file buffers.  nano has also
+		been ported to the Tandem NonStop Kernel.  Have fun.
+
 2004.01.09 - GNU nano 1.3.1 is outside the gates.  This release
 		features, among other things, fixes for the input
 		routines to deal with some problems they had, a
@@ -32,7 +302,7 @@
 		broken regex detection, search history recall, and
 		keypad handling with -K.  Debugging strings are no
 		longer translated and comments denote where translations
-		should be as short as possible (i.e, the statusbar).
+		should be as short as possible (i.e. the statusbar).
 		There are new examples for syntax highlighting, and
 		documentation updates and fixes.  The 1.3.0 CVS tree
 		will be opening soon for all your nano desires, so stay
@@ -117,7 +387,7 @@
 		direct to the development list (nano-devel@gnu.org).
 
 10/24/2002 - GNU nano 1.1.12 "Make Jordi happy" is released.  This
-		release demonstrated that nano is starting to freeze for
+		release demonstrates that nano is starting to freeze for
 		version 1.2.  New features include a Meta-Y toggle for
 		syntax highlighting, pluralized i18n, and a handler for
 		SIGTERM.  Nano now ignores XOFF (^S) to stop accidental
@@ -165,7 +435,7 @@
 		mode (^O,M-P), a new "syntax" command in the .nanorc to
 		allow multiple syntax highlighting types, and a new -Y,
 		--syntax flag to set a specific one if there's no
-		filename regex to match it against (i.e, w/mutt).  The
+		filename regex to match it against (i.e. w/mutt).  The
 		^space and M-space keys will now show up in the help
 		menu, which itself has been tweaked a bit, and many more
 		configure options should now cooperate (like the odd
@@ -195,11 +465,11 @@
 		shows column as well as character position, and
 		multibuffer allows duplicate files, even unnamed ones.
 		Also, the static shortcut and toggle lengths are
-		history, nano now reads $SYSCONFDIR/nanorc if rc file
+		history, nano now reads SYSCONFDIR/nanorc if rc file
 		support is enabled, and nano is now built with (and
 		requires for rebuilding) autoconf 2.5.
 			This release also includes fixes for some memory
-		leaks, detecting DOS and mac file format, justification,
+		leaks, detecting DOS and Mac file format, justification,
 		suspending keys, search & replace under various
 		conditions, variable width for shortcuts, and the usual
 		ton of translation updates.
@@ -305,6 +575,27 @@
 		introduce lots of bugs ;-)  Have fun with it, but be
 		careful, unstable means unstable.
 
+07/01/2001 - GNU nano 1.0.3 is the "mutt" release.  This release
+		features oodles of bug fixes with cutting text,
+		especially with the -k (cut to end) option.  There is
+		also a new suspend handler which should make nano play
+		better with mutt (the code for which came from mutt
+		itself; many many thanks to Jordi Mallach and Tom Lear
+		for working late into the night fixing this).  Nano now
+		also features mutt's case insensitive string compare
+		function for more speed and less memory usage.  Two new
+		translations are included, Ukrainian and Russian.
+	
+05/12/2001 - GNU nano 1.0.2 is the "just the bugfixes ma'am" release.
+		The most noticeable fixes are for display errors using
+		page up/down with the marker code, and view mode (-v)
+		not stopping the replace function.  Other fixes include
+		being able to use the arrow keys while holding down the
+		ctrl key in certain TERMs, and there are many
+		documentation updates and spelling tweaks.  We also have
+		a new Galician translation (provided by Jacobo Tarrío).
+		Have fun with it!
+
 04/06/2001 - GNU nano 1.0.1 is out there.  The only new feature is a
 		configure option for those who want to disable all word
 		wrapping from nano, --disable-wrapping.  Bug fixes this
@@ -345,7 +636,7 @@
 		resizing the editor in any mode other than normal edit
 		mode.  Other fixes include some more tab completion
 		segfaults, and an silly segfault that occurred when
-		successfully writing a file on the 2nd try (i.e, after
+		successfully writing a file on the 2nd try (i.e. after
 		an initial write error).  Slowly but surely, on toward
 		1.0 we travel.
 
@@ -533,7 +824,7 @@
 
 05/14/2000 - Nano 0.9.7 (the Mother's Day release) continues in the long
 		line of display fixes, and also fixes the broken symlink
-		behavior (i.e, symlinks weren't being followed by
+		behavior (i.e. symlinks weren't being followed by
 		default).  Hopefully all major bugs can be worked out
 		soon and we can have a 1.0 release before the end of the
 		year, but who knows.
@@ -586,7 +877,7 @@
 04/14/2000 - 0.9.1 has some more Pico compatibility built-in.  The
 		option to switch to/from Search and Search/Replace (^T)
 		is now available, and nano now displays the more
-		Pico-like shortcut list when invoked as 'pico' (i.e, if
+		Pico-like shortcut list when invoked as 'pico' (i.e. if
 		'pico' is a symlink to nano).  There is an important
 		change to the handling of symbolic links as well.  Now,
 		nano does the "correct" thing and automatically writes

README

@@ -7,19 +7,20 @@ Overview
      wonderfully easy-to-use and friendly Pico text editor.
 
      First and foremost is its license: the Pine suite does not use the
-     GPL or a GPL-friendly license, and has unclear restrictions on 
-     redistribution.  Because of this, Pine and Pico are not included with
-     many GNU/Linux distributions.  Also, other features (like goto line
-     number or search and replace) were unavailable until recently or
-     require a command line flag.  Yuck.
+     GPL or a GPL-friendly license, and has unclear restrictions on
+     redistribution.  Because of this, Pine and Pico are not included
+     with many GNU/Linux distributions.  Also, other features (like go
+     to line number or search and replace) were unavailable until
+     recently or require a command line flag.  Yuck.
 
      nano aims to solve these problems by emulating the functionality of
      Pico as closely as possible while addressing the problems above and
      perhaps providing other extra functionality.
 
-     The nano editor is now an official GNU package.  For more information
-     on GNU and the Free Software Foundation please see http://www.gnu.org.
-     
+     The nano editor is now an official GNU package.  For more
+     information on GNU and the Free Software Foundation, please see
+     http://www.gnu.org/.
+
 How to compile and install nano
 
      Download the nano source code, then:
@@ -28,38 +29,42 @@ How to compile and install nano
      ./configure
      make
      make install
-     
-     It's that simple. Use --prefix with configure to override the 
+
+     It's that simple.  Use --prefix with configure to override the
      default installation directory of /usr/local.
      
+     If you configured with the "--enable-nanorc" option, after
+     installation you might copy the doc/nanorc.sample to your home
+     directory, rename it to ".nanorc", and then edit it according to
+     your taste.
+
 Web Page
 
-	http://www.nano-editor.org
-     
+	http://www.nano-editor.org/
+
 Mailing List and Bug Reports
 
 	Savannah hosts all the nano-related mailing-lists.
+
 	+ info-nano@gnu.org is a very low traffic list
-	  used to announce new Nano versions or other important information
-	  about the project.
+	  used to announce new nano versions or other important
+	  information about the project.
 	+ help-nano@gnu.org is for those seeking to get help without
 	  wanting to hear about the technical details of its
 	  development.
 	+ nano-devel@gnu.org is the list used by the people
-	  that make Nano and a general development discussion list, with
+	  that make nano and a general development discussion list, with
 	  moderate traffic.
-	To subscribe, send email to nano-<name>-request@gnu.org
-	with a subject of "subscribe", where <name> is the list you want to
+
+	To subscribe, send email to nano-<name>-request@gnu.org with a
+	subject of "subscribe", where <name> is the list you want to
 	subscribe to.
+
 	For general bug reports, send a description of the problem to
 	nano@nano-editor.org or directly to the development list.
 
 Current Status
 
-	GNU nano has reaching its second major milestone, 1.2.x. Development
-	of new features will continue in the 1.3.x branch, while 1.2.x
-	versions will be dedicated to bugfixing and polishing.
-
-   Chris Allegretta (chrisa@asty.org)
+	GNU nano has reached its third stable milestone, 2.0.x.
 
 $Id$

README.CVS

@@ -1,38 +1,90 @@
 INSTRUCTIONS TO COMPILE AND INSTALL NANO CVS VERSIONS
------------------------------------------------------
+=====================================================
 
-GNU nano is available from CVS, but building this needs a bit
-more care than the official stable and unstable tarballs.
+GNU nano is available from CVS, but building this needs a bit more care
+than the official stable and unstable tarballs.
 
-To successfully compile GNU nano from CVS, you'll need the
-following packages:
 
-- autoconf (version >= 2.52)
-- automake (version >= 1.6, 1.7.x recommended)
-- gettext (version >= 0.11.5)
-- texinfo
+Prerequisites
+-------------
+
+To successfully compile GNU nano from CVS, you'll need the following
+packages:
+
+- autoconf (version >= 2.54)
+- automake (version >= 1.7)
+- gettext  (version >= 0.11.5)
+- groff    (version >= 1.12)
+- texinfo  (version >= 4.0)
 - cvs
-- glib (if your system doesn't have snprintf() and/or vsnprintf())
-- make, gcc and the normal development libraries (ncurses, etc)
-These should be available on your GNU mirror.
+- ssh (with support for the SSH version 2 protocol)
+- glib 2.x (if your system doesn't have vsnprintf(), which the configure
+  script will check for)
+- make, gcc and the normal development libraries (curses or slang, etc.)
+
+These should be available on your GNU mirror.  Note that you'll need a
+version of curses or slang with wide character support if you want nano
+to use UTF-8.
 
 
-To download the CVS tree, execute the following command:
-$ cvs -z3 -d:pserver:anoncvs@subversions.gnu.org:/cvsroot/nano login
-and press enter at the password prompt.
-Then, do
-$ cvs -z3 -d:pserver:anoncvs@subversions.gnu.org:/cvsroot/nano checkout nano
-and the nano tree will download.
-If you want to checkout the stable CVS branch, append -r nano_1_0_branch:
-$ cvs -z3 -d:pserver:anonymous@subversions.gnu.org:/cvsroot/nano checkout -r nano_1_0_branch nano
+Download the source
+-------------------
 
-Once you have the sources in the "nano" directory, cd into it, and
-execute the "autogen.sh" script in the top dir. This will setup a
-configure script and Makefile.in, and you will be ready to compile with
-$ ./configure [--add-options-here] && make
-Once it's done compiling,
-$ make install
-(as root) should put the required files in their respective directories.
+First, you need to set up cvs to download the CVS tree using ssh.  If
+you're using a Bourne shell (e.g. bash or sh), do
 
+    $ export CVS_RSH=ssh
+
+If you're using a C shell (e.g. tcsh or csh), do
+
+    $ setenv CVS_RSH ssh
+
+After that's set up, cd to your src directory and use the following
+command to download the CVS tree:
+
+    $ cvs -z3 -d:pserver:anonymous@cvs.savannah.gnu.org:/sources/nano checkout -r nano_2_0_branch nano
+
+
+Generate the configure script
+-----------------------------
+
+Once you have the sources in the "nano" directory,
+
+    $ cd nano
+    $ ./autogen.sh
+
+This will set up a configure script and a Makefile.in file.
+
+
+Configure your build
+--------------------
+
+To configure your build, run the configure script from the nano source
+directory:
+
+    $ ./configure [--add-options-here]
+
+
+Build and install
+-----------------
+
+From the nano source directory, build the code with:
+
+    $ make
+
+Then, once it's done compiling, run
+
+    $ make install
+
+which should copy various files (i.e. the nano executable, the info and
+man pages, and syntax highlighting pattern files) to their appropriate
+directories.
+
+If you're installing into the default install directory (/usr/local),
+you'll need to run that "make install" command with root privileges.
+
+
+Problems?
+---------
 
 Please submit any bugs in the CVS branch to nano-devel@gnu.org.

THANKS

@@ -1,47 +1,54 @@
 The following people have helped GNU nano in some way or another.
 If we missed you here, let us know!
 
+
 Sharuzzaman Ahmat Raslan <sharuzzaman@excite.com>
 						Malay translator
 Laurentiu Buzdugan <buzdugan@voyager.net>	Romanian translator
-Ricardo Cárdenes Medina <ricardo@conisys.com>	Spanish translator
+CHAO Wei-Lun <chaoweilun@pcmail.com.tw>		Traditional Chinese translator
+Ricardo Cárdenes Medina <ricardo@conisys.com>	Spanish translator
 Marco Colombo <magicdice@inwind.it>		Italian translator
+Yavor Doganov <yavor@doganov.org>		Bulgarian translator
 Karl Eichwalder <keichwa@gmx.net>		German translator
 Doruk Fisek <dfisek@fisek.com.tr>		Turkish translator
-Jean-Philippe Guérard <jean-philippe.guerard@laposte.net>
+Jean-Philippe Guérard <jean-philippe.guerard@laposte.net>
 						French translator
-Geir Helland					Norwegian bokmål translator
+Geir Helland					Norwegian bokmål translator
 Tedi Heriyanto <tedi_h@gmx.net>			Indonesian translator
-Václav Haisman <V.Haisman@sh.cvut.cz>		Czech translator
+Václav Haisman <V.Haisman@sh.cvut.cz>		Czech translator
 Szabolcs Horvath <horvaths@janus.gimsz.sulinet.hu>
 						Hungarian translator
 Kalle Kivimaa <kalle.kivimaa@iki.fi>		Finnish Translator
-Eivind Kjørstad <ekj@vestdata.no>		Norwegian nynorsk translator
-Florian König <floki@bigfoot.com>		German translator
+Eivind Kjørstad <ekj@vestdata.no>		Norwegian nynorsk translator
+Florian König <floki@bigfoot.com>		German translator
 Wojciech Kotwica <wkotwica@post.pl>		Polish translator
 Clement Laforet <clem_laf@wanadoo.fr>		French translator
 Gergely Nagy <algernon@debian.org>		Hungarian translator
 Kalle Olavi Niemitalo <kon@iki.fi>		Finnish Translator
 Claudio Neves <cneves@nextis.com>		Brazilian Portuguese translator
+Daniel Nylander <po@danielnylander.se>		Swedish Translator
 Michael Piefel <piefel@informatik.hu-berlin.de> German translator
 Sergey A. Ribalchenko <fisher@obu.ck.ua>	Russian, Ukrainian translator
 Michel Robitaille <robitail@IRO.UMontreal.CA>	French translator
 Christian Rose <menthos@menthos.com>		Swedish translator
-Stig E Sandoe <stig@ii.uib.no>			Norwegian bokmål translator
+Stig E Sandoe <stig@ii.uib.no>			Norwegian bokmål translator
+Benno Schulenberg <benno@nietvergeten.nl>	Dutch translator
 Danilo Segan <dsegan@gmx.net>			Serbian translator
 Keld Simonsen <keld@dkuug.dk>			Danish translator
 Guus Sliepen <guus@nl.linux.org>		Dutch translator
 Cezary Sliwa <sliwa@cft.edu.pl>			Polish translator
 Pierre Tane <tanep@bigfoot.com>			French translator
-Jacobo Tarrío <jtarrio@trasno.net>		Galician translator
+Jacobo Tarrío <jtarrio@trasno.net>		Galician translator
 Kjetil Torgrim Homme <kjetilho@linpro.no>	Norwegian nynorsk translator
 Miquel Vidal <miquel@sindominio.net>		Catalan translator
+Phan Vinh Thinh <teppi82@gmail.com>		Vietnamese translator
 Pauli Virtanen <pauli.virtanen@saunalahti.fi>	Finnish translator
 Peio Ziarsolo <peio@sindominio.net>		Basque translator
 
 Ben Armstrong <synrg@sanctuary.nslug.ns.ca>	Negative -r value idea, code
 Thomas Dickey <dickey@herndon4.his.com>		Curses help and advice
 Sven Guckes <guckes@math.fu-berlin.de>		Advice and Advocacy
+Thijs Kinkhorst <thijs@kinkhorst.com>		rnano.1 manpage
 Jim Knoble <jmknoble@pobox.com>			Pico compat for browser
 Ryan Krebs <fluffy@highwire.stanford.edu>	Many bug fixes and testing
 Roy Lanek <lanek@ranahminang.net>		Advice and advocacy
@@ -52,5 +59,4 @@ Jeremy Robichaud <robicj@yahoo.com>		Beta tester
 Bill Soudan <wes0472@rit.edu>			Regex code, etc
 Ken Tyler <kent@werple.net.au>			Search fixes and more
 
-
 $Id$

TODO

@@ -1,23 +1,56 @@
 TODO file (? means the feature may be implemented, but not definitely)
------------------------------------------------------------------------------
+------------------------------------------------------------------------
 
-For version 1.4:
-- UTF-8 support.
-- Support for Pico's paragraph searching ability. [DONE]
-- Undo/Redo key?
+For the next version:
+- Undo/Redo keys (M-U and M-E)?
 - Rebindable keys?
-- Keystroke to implement "Add next sequence as raw" like vi's ^V.
-  [DONE for edit window, needs to be done for statusbar prompt]
-- Spell check selected text only.
-- Make "To line" (^W^T) and "Read from Command" (^R^X) re-enter their
-  parent menu when their keystroke is entered a second time (^W^T^T and
-  (^R^X^X)(requires figuring out when to keep cursor pos and when not
-  to).
-- Fix resetstatuspos global which we shouldn't have.
+- FriBidi support?
+- Port to DJGPP?
+- Make matching bracket searches sophisticated enough to skip over
+  brackets inside comments?
+- Allow indentation of marked text by spaces as well as tabs?
+- Allow indentation to add just enough columns to reach the nearest
+  multiple of tabsize, rather than always adding tabsize columns?
+- Allow piping marked text to an external command and replacing it with
+  the command's output (as the internal spell checker already does with
+  the "spell" command)?
 - Rewrite the nano FAQ in SGML.
+- Allow conversion between different character sets.  Maybe use glib's
+  iconv() if the system's iconv() is inadequate, since we already use
+  glib's vsnprintf() if the system lacks vsnprintf()?
+- Handle window resizes better.  After we resize, we should stay
+  wherever we were before we resized, as Pico does.
+- Fix problems with color syntaxes' highlighting lines too aggressively.
+- Allow color syntaxes to apply to more than just color, so that we can
+  e.g. specify a different alternate spell checker depending on which
+  file type we have open.
+- Allow color syntaxes to be selected based on more than just filename
+  extension, e.g. through libmagic?
+- Allow text searches in the help browser.
+- Allow setting marks (saved positions, not to be confused with the mark
+  set via Ctrl-^) at various lines and/or columns in the buffer, and
+  allow movement between them with a single keystroke.
+- Add the ability to move to different lines of the screen with a single
+  keystroke, e.g. M-` (M-~) to go to the top line, M-& (M-7) to go to
+  the center line, and M-' (M-") to go to the last line.
+- Allow searching for and replacing newlines.
+- Allow soft wrapping as well as hard wrapping?
 
 Old requests:
 
+For version 2.0:
+- UTF-8 support. [DONE]
+- Support for paragraph searches. [DONE]
+- Support for justifying the entire file at once. [DONE]
+- Support for filename searches in the file browser. [DONE]
+- Keystroke to implement "Add next sequence as raw" like vi's ^V. [DONE]
+- Spell check selected text only. [DONE]
+- Make "To Line" (^W^T) and "Read from Command" (^R^X) reenter their
+  parent menu when their keystroke is entered a second time (^W^T^T and
+  (^R^X^X) (requires figuring out when to keep cursor position and when
+  not to). [DONE]
+- Fix resetstatuspos global which we shouldn't have. [DONE]
+
 For version 1.2:
 - Single line scroll up/down? [DONE]
 - Color syntax highlighting? (certainly seems like there's a demand for

UPGRADE

@@ -1,6 +1,73 @@
 GNU nano upgrading information
 ==============================
 
+Visible changes since 1.2
+-------------------------
+* Editor Features
+  - Support for UTF-8.
+  - Moving to a specified line and column of a file, instead of just a
+    line (+LINE,COLUMN).
+  - Smart home key (-A).
+  - Creation of unique backup files in a specified directory (-C <dir>).
+  - Insertion of spaces instead of a tab when Tab is pressed (-E).
+  - The long option for -K is now --rebindkeypad.
+  - Regular expression searching can now be toggled when nano is built
+    with --enable-tiny, so -R now means something else (see below).
+  - Restricted mode that provides more security than -o (-R).
+  - Blanking of the statusbar after 1 keystroke instead of 25 (-U).
+  - Word searches can optionally skip over punctuation (-W).
+  - Workaround for Delete's acting like Backspace (-d).
+  - Many more options are supported in the nanorc.
+  - Improvements to color syntax highlighting support: case insensitive
+    matching, the ability to include color syntaxes in separate files,
+    the ability to specify background colors without foreground colors,
+    etc.
+  - Insertion of single-byte characters via Esc Esc <000-255>.
+  - Insertion of all characters via "Verbatim Input" mode.
+  - Workaround for the "NumLock glitch".
+  - Meta-W now repeats the last search.  Wrapping is now toggled via
+    Meta-L.
+  - Replacing and spell checking only selected text.
+  - Indenting lines with one keystroke.
+  - Copying text into the cutbuffer without cutting it.
+  - Scrolling the text up and down single lines without moving the
+    cursor.
+  - PageUp and PageDown work more smoothly when using -S.
+  - Scrolling the help text up and down single lines.
+  - Cutting all text from the current position to the end of the file
+    with one keystroke.
+  - Justifying the entire file with one keystroke.
+  - Justifying without removing spaces from the ends of lines.
+  - Unjustifying after justifying and immediately resizing.
+  - Going to the first or last line of the current paragraph.
+  - Going to the first or last line of the file without having to go to
+    the "Search" prompt.
+  - Searching for filenames in the file browser.
+  - Displaying spaces and tabs differently to make it easier to tell
+    them apart.
+  - Many more functions available at the statusbar prompt: moving to the
+    next or previous word, searching for matching brackets, "Verbatim
+    Input" mode, etc.
+  - The glibc 2.2.3 crashes involving extended regular expressions are
+    no longer worked around, as they can break anything using extended
+    regular expressions, and glibc 2.2.3 is old.  You should upgrade to
+    at least glibc 2.2.4.
+
+* File Handling
+  - Automatic adding of newlines to the ends of files without them can
+    now be disabled (-L).
+  - Converting from and to DOS/Mac file format is now toggled only at
+    the "Write File" prompt, via Meta-D and Meta-M, and the default file
+    format to save in is now set depending on what format the file was
+    originally in.  -D now makes nano use bold text instead of reverse
+    video text, and Meta-D at the edit window now does a
+    word/line/character count.  -O now makes the unused second line of
+    the screen part of the edit window, and Meta-O at the edit window
+    now toggles this behavior.
+  - Converting files that contain a mix of DOS and Mac format lines.
+  - Automatic switching on of -N with binary files has been removed, as
+    it causes problems with UTF-8 support.
+
 Visible changes since 1.0
 -------------------------
 * Editor Features
@@ -8,10 +75,10 @@ Visible changes since 1.0
     something else, see below).
   - nanorc support (see nanorc.sample included in sources).
   - Smooth scrolling (-S).
-  - Searching of matching brace/bracket/etc.
+  - Support for searching for matching braces, brackets, etc.
   - Help for all editor features.
   - Color syntax highlighting support.
-  - Quote string support, useful for mail agents, etc (-Q).
+  - Quote string support, useful for mail agents, etc. (-Q).
   - Insertion of output of external commands.
   - Optional enabling of XON and XOFF control characters (-p).
   - Tons of bugfixes/enhancements for already existing features.

config.rpath

@@ -1,513 +0,0 @@
-#! /bin/sh
-# Output a system dependent set of variables, describing how to set the
-# run time search path of shared libraries in an executable.
-#
-#   Copyright 1996-2002 Free Software Foundation, Inc.
-#   Taken from GNU libtool, 2001
-#   Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-#   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 2 of the License, or
-#   (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#   General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-#   As a special exception to the GNU General Public License, if you
-#   distribute this file as part of a program that contains a
-#   configuration script generated by Autoconf, you may include it under
-#   the same distribution terms that you use for the rest of that program.
-#
-# The first argument passed to this file is the canonical host specification,
-#    CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or
-#    CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# The environment variables CC, GCC, LDFLAGS, LD, with_gnu_ld
-# should be set by the caller.
-#
-# The set of defined variables is at the end of this script.
-
-# All known linkers require a `.a' archive for static linking (except M$VC,
-# which needs '.lib').
-libext=a
-shlibext=
-
-host="$1"
-host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-wl=
-if test "$GCC" = yes; then
-  wl='-Wl,'
-else
-  case "$host_os" in
-    aix3* | aix4* | aix5*)
-      wl='-Wl,'
-      ;;
-    hpux9* | hpux10* | hpux11*)
-      wl='-Wl,'
-      ;;
-    irix5* | irix6*)
-      wl='-Wl,'
-      ;;
-    linux*)
-      echo '__INTEL_COMPILER' > conftest.$ac_ext
-      if $CC -E conftest.$ac_ext >/dev/null | grep __INTEL_COMPILER >/dev/null
-      then
-        :
-      else
-        # Intel icc
-        wl='-Qoption,ld,'
-      fi
-      ;;
-    osf3* | osf4* | osf5*)
-      wl='-Wl,'
-      ;;
-    solaris*)
-      wl='-Wl,'
-      ;;
-    sunos4*)
-      wl='-Qoption ld '
-      ;;
-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-      if test "x$host_vendor" = xsni; then
-        wl='-LD'
-      else
-        wl='-Wl,'
-      fi
-      ;;
-  esac
-fi
-
-hardcode_libdir_flag_spec=
-hardcode_libdir_separator=
-hardcode_direct=no
-hardcode_minus_L=no
-
-case "$host_os" in
-  cygwin* | mingw* | pw32*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test "$GCC" != yes; then
-      with_gnu_ld=no
-    fi
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-esac
-
-ld_shlibs=yes
-if test "$with_gnu_ld" = yes; then
-  case "$host_os" in
-    aix3* | aix4* | aix5*)
-      # On AIX, the GNU linker is very broken
-      ld_shlibs=no
-      ;;
-    amigaos*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-      # that the semantics of dynamic libraries on AmigaOS, at least up
-      # to version 4, is to share data among multiple programs linked
-      # with the same dynamic library.  Since this doesn't match the
-      # behavior of shared libraries on other platforms, we can use
-      # them.
-      ld_shlibs=no
-      ;;
-    beos*)
-      if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-        :
-      else
-        ld_shlibs=no
-      fi
-      ;;
-    cygwin* | mingw* | pw32*)
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      hardcode_libdir_flag_spec='-L$libdir'
-      ;;
-    solaris* | sysv5*)
-      if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then
-        ld_shlibs=no
-      elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-        :
-      else
-        ld_shlibs=no
-      fi
-      ;;
-    sunos4*)
-      hardcode_direct=yes
-      ;;
-    *)
-      if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-        :
-      else
-        ld_shlibs=no
-      fi
-      ;;
-  esac
-  if test "$ld_shlibs" = yes; then
-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-  fi
-else
-  case "$host_os" in
-    aix3*)
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      hardcode_minus_L=yes
-      if test "$GCC" = yes; then
-        # Neither direct hardcoding nor static linking is supported with a
-        # broken collect2.
-        hardcode_direct=unsupported
-      fi
-      ;;
-    aix4* | aix5*)
-      if test "$host_cpu" = ia64; then
-        # On IA64, the linker does run time linking by default, so we don't
-        # have to do anything special.
-        aix_use_runtimelinking=no
-      else
-        aix_use_runtimelinking=no
-        # Test if we are trying to use run time linking or normal
-        # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-        # need to do runtime linking.
-        case $host_os in aix4.[23]|aix4.[23].*|aix5*)
-          for ld_flag in $LDFLAGS; do
-            if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-              aix_use_runtimelinking=yes
-              break
-            fi
-          done
-        esac
-      fi
-      hardcode_direct=yes
-      hardcode_libdir_separator=':'
-      if test "$GCC" = yes; then
-        case $host_os in aix4.[012]|aix4.[012].*)
-          collect2name=`${CC} -print-prog-name=collect2`
-          if test -f "$collect2name" && \
-            strings "$collect2name" | grep resolve_lib_name >/dev/null
-          then
-            # We have reworked collect2
-            hardcode_direct=yes
-          else
-            # We have old collect2
-            hardcode_direct=unsupported
-            hardcode_minus_L=yes
-            hardcode_libdir_flag_spec='-L$libdir'
-            hardcode_libdir_separator=
-          fi
-        esac
-      fi
-      if test "$aix_use_runtimelinking" = yes; then
-        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib'
-      else
-        if test "$host_cpu" = ia64; then
-          hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
-        else
-          hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib'
-        fi
-      fi
-      ;;
-    amigaos*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-      # see comment about different semantics on the GNU ld section
-      ld_shlibs=no
-      ;;
-    cygwin* | mingw* | pw32*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      hardcode_libdir_flag_spec=' '
-      libext=lib
-      ;;
-    darwin* | rhapsody*)
-      hardcode_direct=yes
-      ;;
-    freebsd1*)
-      ld_shlibs=no
-      ;;
-    freebsd2.2*)
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      ;;
-    freebsd2*)
-      hardcode_direct=yes
-      hardcode_minus_L=yes
-      ;;
-    freebsd*)
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      ;;
-    hpux9* | hpux10* | hpux11*)
-      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator=:
-      hardcode_direct=yes
-      hardcode_minus_L=yes # Not in the search PATH, but as the default
-                           # location of the library.
-      ;;
-    irix5* | irix6*)
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      ;;
-    netbsd*)
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      ;;
-    newsos6)
-      hardcode_direct=yes
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      ;;
-    openbsd*)
-      hardcode_direct=yes
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-        hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-      else
-        case "$host_os" in
-          openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-            hardcode_libdir_flag_spec='-R$libdir'
-            ;;
-          *)
-            hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-            ;;
-        esac
-      fi
-      ;;
-    os2*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-      ;;
-    osf3*)
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      ;;
-    osf4* | osf5*)
-      if test "$GCC" = yes; then
-        hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      else
-        # Both cc and cxx compiler support -rpath directly
-        hardcode_libdir_flag_spec='-rpath $libdir'
-      fi
-      hardcode_libdir_separator=:
-      ;;
-    sco3.2v5*)
-      ;;
-    solaris*)
-      hardcode_libdir_flag_spec='-R$libdir'
-      ;;
-    sunos4*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_direct=yes
-      hardcode_minus_L=yes
-      ;;
-    sysv4)
-      if test "x$host_vendor" = xsno; then
-        hardcode_direct=yes # is this really true???
-      else
-        hardcode_direct=no # Motorola manual says yes, but my tests say they lie
-      fi
-      ;;
-    sysv4.3*)
-      ;;
-    sysv5*)
-      hardcode_libdir_flag_spec=
-      ;;
-    uts4*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      ;;
-    dgux*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      ;;
-    sysv4*MP*)
-      if test -d /usr/nec; then
-        ld_shlibs=yes
-      fi
-      ;;
-    sysv4.2uw2*)
-      hardcode_direct=yes
-      hardcode_minus_L=no
-      ;;
-    sysv5uw7* | unixware7*)
-      ;;
-    *)
-      ld_shlibs=no
-      ;;
-  esac
-fi
-
-# Check dynamic linker characteristics
-libname_spec='lib$name'
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-case "$host_os" in
-  aix3*)
-    shlibext=so
-    ;;
-  aix4* | aix5*)
-    shlibext=so
-    ;;
-  amigaos*)
-    shlibext=ixlibrary
-    ;;
-  beos*)
-    shlibext=so
-    ;;
-  bsdi4*)
-    shlibext=so
-    sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-    sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-    ;;
-  cygwin* | mingw* | pw32*)
-    case $GCC,$host_os in
-      yes,cygwin*)
-        shlibext=dll.a
-        ;;
-      yes,mingw*)
-        shlibext=dll
-        sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"`
-        ;;
-      yes,pw32*)
-        shlibext=dll
-        ;;
-      *)
-        shlibext=dll
-        ;;
-    esac
-    ;;
-  darwin* | rhapsody*)
-    shlibext=dylib
-    ;;
-  freebsd1*)
-    ;;
-  freebsd*)
-    shlibext=so
-    ;;
-  gnu*)
-    shlibext=so
-    ;;
-  hpux9* | hpux10* | hpux11*)
-    shlibext=sl
-    ;;
-  irix5* | irix6*)
-    shlibext=so
-    case "$host_os" in
-      irix5*)
-        libsuff= shlibsuff=
-        ;;
-      *)
-        case $LD in
-          *-32|*"-32 ") libsuff= shlibsuff= ;;
-          *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 ;;
-          *-64|*"-64 ") libsuff=64 shlibsuff=64 ;;
-          *) libsuff= shlibsuff= ;;
-        esac
-        ;;
-    esac
-    sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-    sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-    ;;
-  linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*)
-    ;;
-  linux-gnu*)
-    shlibext=so
-    ;;
-  netbsd*)
-    shlibext=so
-    ;;
-  newsos6)
-    shlibext=so
-    ;;
-  openbsd*)
-    shlibext=so
-    ;;
-  os2*)
-    libname_spec='$name'
-    shlibext=dll
-    ;;
-  osf3* | osf4* | osf5*)
-    shlibext=so
-    sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-    ;;
-  sco3.2v5*)
-    shlibext=so
-    ;;
-  solaris*)
-    shlibext=so
-    ;;
-  sunos4*)
-    shlibext=so
-    ;;
-  sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-    shlibext=so
-    case "$host_vendor" in
-      motorola)
-        sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-        ;;
-    esac
-    ;;
-  uts4*)
-    shlibext=so
-    ;;
-  dgux*)
-    shlibext=so
-    ;;
-  sysv4*MP*)
-    if test -d /usr/nec; then
-      shlibext=so
-    fi
-    ;;
-esac
-
-sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
-escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`
-escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
-escaped_sys_lib_search_path_spec=`echo "X$sys_lib_search_path_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
-escaped_sys_lib_dlsearch_path_spec=`echo "X$sys_lib_dlsearch_path_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
-
-sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF
-
-# How to pass a linker flag through the compiler.
-wl="$escaped_wl"
-
-# Static library suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally "so").
-shlibext="$shlibext"
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec"
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator="$hardcode_libdir_separator"
-
-# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct="$hardcode_direct"
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L="$hardcode_minus_L"
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec="$escaped_sys_lib_search_path_spec"
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec="$escaped_sys_lib_dlsearch_path_spec"
-
-EOF

configure.ac

@@ -2,181 +2,188 @@
 #
 # Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 #
-# GNU nano 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 2, or (at your option)
-# any later version.
+# GNU nano 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 2, or (at your option) any
+# later version.
 #
-# GNU nano is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU nano is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with GNU nano; if not, write to the Free Software
-# Foundation, Inc.
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+# USA.
 #
 # $Id$
 
-AC_INIT([GNU nano], [1.3.1], [nano-devel@gnu.org], [nano])
+AC_INIT([GNU nano], [2.0.3], [nano-devel@gnu.org], [nano])
 AC_CONFIG_SRCDIR([src/nano.c])
+AC_CANONICAL_TARGET([])
 AM_INIT_AUTOMAKE
-AM_CONFIG_HEADER([config.h:config.h.in])
+AC_CONFIG_HEADERS([config.h])
 
-AC_PREREQ(2.52)
+AC_PREREQ(2.54)
 
 dnl Checks for programs.
+
+AC_GNU_SOURCE
 AC_PROG_CC
+AC_PROG_LN_S
 AC_ISC_POSIX
 AC_SYS_LARGEFILE
 
 dnl Internationalization macros.
+
 AM_GNU_GETTEXT_VERSION(0.11.5)
 AM_GNU_GETTEXT([external], [need-ngettext])
+AM_CONDITIONAL(USE_NLS, test x$USE_NLS = xyes)
+
+dnl Data location.
+
+pkgdatadir=${datadir}/${PACKAGE}
+AC_DEFINE_DIR([PKGDATADIR], [pkgdatadir], [Where data are placed to.])
 
 dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(fcntl.h getopt.h libintl.h limits.h regex.h termio.h termios.h unistd.h)
-AC_CHECK_HEADER(regex.h,
-    AC_MSG_CHECKING([for broken regexec])
-    AC_TRY_RUN([
-#include <sys/types.h>
-#include <regex.h>
-int main () { regex_t reg; size_t n = 1; regmatch_t r; regcomp(&reg, "\\<", 0); regexec(&reg, "", n, &r, 0); regfree(&reg); return 0; }],
-	AC_MSG_RESULT(no),
-	AC_MSG_RESULT(yes); AC_DEFINE(BROKEN_REGEXEC, 1, [Define this if your regexec() function segfaults when passed an empty string under certain conditions.])
-    )
-)
 
-dnl options
+AC_HEADER_STDC
+AC_CHECK_HEADERS(getopt.h libintl.h limits.h regex.h sys/param.h wchar.h wctype.h)
+
+dnl Checks for options.
+
 AC_ARG_ENABLE(debug, 
 [  --enable-debug          Enable debugging (disabled by default)],
- [if test x$enableval = xyes; then
-    AC_DEFINE(DEBUG, 1, [Define this to enable nano debug messages and assert warnings.])
-    debug_support=yes
- fi])
+[if test x$enableval = xyes; then
+    AC_DEFINE(DEBUG, 1, [Define this to enable debug messages and assert warnings.]) debug_support=yes
+fi])
 
-if test "$debug_support" != "yes"; then
-    AC_DEFINE(NDEBUG, 1, [Shut up the assert warnings :-)])
+if test x$debug_support != xyes; then
+    AC_DEFINE(NDEBUG, 1, [Shut up assert warnings :-)])
 fi
 
 AC_ARG_ENABLE(extra,
-[  --enable-extra          Enable extra (optional) functions, including easter eggs],
+[  --enable-extra          Enable extra features, currently only easter eggs],
 [if test x$enableval = xyes; then
-    AC_DEFINE(NANO_EXTRA, 1, [Define this to enable the extra stuff.]) extra_support=yes
-    AC_DEFINE(ENABLE_MULTIBUFFER, 1, [Define this to enable multiple file buffers.]) multibuffer_support=yes
- fi])
+    AC_DEFINE(NANO_EXTRA, 1, [Define this to enable extra stuff.]) extra_support=yes
+fi])
 
 AC_ARG_ENABLE(tiny,
 [  --enable-tiny           Disable features for the sake of size],
 [if test x$enableval = xyes; then
-    AC_DEFINE(NANO_SMALL, 1, [Define this to make the nano executable as small as possible.]) tiny_support=yes
-    AC_DEFINE(DISABLE_BROWSER, 1, [Define this to disable the built-in (crappy) file browser.]) 
-    AC_DEFINE(DISABLE_HELP, 1, [Define this to disable the ^G help menu.]) 
-    AC_DEFINE(DISABLE_JUSTIFY, 1, [Define this to disable the justify routine.]) 
-    AC_DEFINE(DISABLE_MOUSE, 1, [Define this to disable the mouse functions.]) 
-    AC_DEFINE(DISABLE_OPERATINGDIR, 1, [Define this to disable setting of the operating directory (chroot of sorts).]) 
-    AC_DEFINE(DISABLE_SPELLER, 1, [Define this to disable the use(full|less) spelling functions.]) 
-    AC_DEFINE(DISABLE_TABCOMP, 1, [Define to disable the tab completion code Chris worked so hard on!]) 
- fi])
+    AC_DEFINE(NANO_TINY, 1, [Define this to make the nano executable as small as possible.]) tiny_support=yes
+    AC_DEFINE(DISABLE_BROWSER, 1, [Define this to disable the built-in file browser.])
+    AC_DEFINE(DISABLE_HELP, 1, [Define this to disable the help text display.])
+    AC_DEFINE(DISABLE_JUSTIFY, 1, [Define this to disable the justify routines.])
+    AC_DEFINE(DISABLE_MOUSE, 1, [Define this to disable the mouse functions.])
+    AC_DEFINE(DISABLE_OPERATINGDIR, 1, [Define this to disable the setting of the operating directory (chroot of sorts).])
+    AC_DEFINE(DISABLE_SPELLER, 1, [Define this to disable the spell checker functions.])
+    AC_DEFINE(DISABLE_TABCOMP, 1, [Define to disable the tab completion functions for files and search strings.])
+    AC_DEFINE(DISABLE_WRAPPING, 1, [Define this to disable all text wrapping.])
+fi])
 
 AC_ARG_ENABLE(browser,
-[  --disable-browser       Disable mini file browser],
- [if test x$enableval != xyes; then
-    AC_DEFINE(DISABLE_BROWSER, 1, [Define this to disable the built-in (crappy) file browser.])
- fi])
+[  --disable-browser       Disable built-in file browser],
+[if test x$enableval != xyes; then
+    AC_DEFINE(DISABLE_BROWSER, 1, [Define this to disable the built-in file browser.])
+fi])
 
 AC_ARG_ENABLE(help,
-[  --disable-help          Disable help function (^G)],
- [if test x$enableval != xyes; then
-    AC_DEFINE(DISABLE_HELP, 1, [Define this to disable the ^G help menu.])
- fi])
+[  --disable-help          Disable help functions],
+[if test x$enableval != xyes; then
+    AC_DEFINE(DISABLE_HELP, 1, [Define this to disable the help text display.])
+fi])
 
 AC_ARG_ENABLE(justify,
-[  --disable-justify       Disable justify/unjustify function],
- [if test x$enableval != xyes; then
-    AC_DEFINE(DISABLE_JUSTIFY, 1, [Define this to disable the justify routine.]) 
- fi])
+[  --disable-justify       Disable justify/unjustify functions],
+[if test x$enableval != xyes; then
+    AC_DEFINE(DISABLE_JUSTIFY, 1, [Define this to disable the justify routines.]) 
+fi])
 
 AC_ARG_ENABLE(mouse,
 [  --disable-mouse         Disable mouse support (and -m flag)],
- [if test x$enableval != xyes; then
-    AC_DEFINE(DISABLE_MOUSE, 1, [Define this to disable the mouse functions.])
- fi])
+[if test x$enableval != xyes; then
+    AC_DEFINE(DISABLE_MOUSE, 1, [Define this to disable the mouse support.])
+fi])
 
 AC_ARG_ENABLE(operatingdir,
 [  --disable-operatingdir  Disable setting of operating directory (chroot of sorts)],
- [if test x$enableval != xyes; then
-    AC_DEFINE(DISABLE_OPERATINGDIR, 1, [Define this to disable setting of the operating directory (chroot of sorts).])
- fi])
+[if test x$enableval != xyes; then
+    AC_DEFINE(DISABLE_OPERATINGDIR, 1, [Define this to disable the setting of the operating directory (chroot of sorts).])
+fi])
 
 AC_ARG_ENABLE(speller,
-[  --disable-speller       Disable spell checker function],
- [if test x$enableval != xyes; then
-    AC_DEFINE(DISABLE_SPELLER, 1, [Define this to disable the use(full|less) spelling functions.])
- fi])
+[  --disable-speller       Disable spell checker functions],
+[if test x$enableval != xyes; then
+    AC_DEFINE(DISABLE_SPELLER, 1, [Define this to disable the spell checker functions.])
+fi])
 
 AC_ARG_ENABLE(tabcomp,
-[  --disable-tabcomp       Disable tab completion code for a smaller binary],
- [if test x$enableval != xyes; then
-    AC_DEFINE(DISABLE_TABCOMP, 1, [Define to disable the tab completion code Chris worked so hard on!]) 
- fi])
+[  --disable-tabcomp       Disable tab completion functions],
+[if test x$enableval != xyes; then
+    AC_DEFINE(DISABLE_TABCOMP, 1, [Define to disable the tab completion functions for files and search strings.]) 
+fi])
 
 AC_ARG_ENABLE(wrapping,
 [  --disable-wrapping      Disable all wrapping of text (and -w flag)],
- [if test x$enableval != xyes; then
-    AC_DEFINE(DISABLE_WRAPPING, 1, [Define this to disable any and all text wrapping.])
- fi])
+[if test x$enableval != xyes; then
+    AC_DEFINE(DISABLE_WRAPPING, 1, [Define this to disable all text wrapping.])
+fi])
 
 AC_ARG_ENABLE(wrapping-as-root,
 [  --disable-wrapping-as-root  Disable wrapping of text as root by default],
- [if test x$enableval != xyes; then
-    AC_DEFINE(DISABLE_ROOTWRAP, 1, [Define this to disable wrapping as root by default.])
- fi])
+[if test x$enableval != xyes; then
+    AC_DEFINE(DISABLE_ROOTWRAPPING, 1, [Define this to disable text wrapping as root by default.])
+fi])
 
 AC_ARG_ENABLE(color,
 [  --enable-color          Enable color and syntax highlighting],
 [if test x$enableval = xyes; then
-    AC_DEFINE(ENABLE_NANORC, 1, [Define this to use the .nanorc file.]) nanorc_support=yes
-    AC_DEFINE(ENABLE_COLOR, 1, [Define this to have syntax highlighting, requires ENABLE_NANORC too!]) color_support=yes
-    AC_MSG_WARN([
-
-***********************************************************************
-*** WARNING: Color support is far from perfect, but functional.     ***
-*** Be careful with syntax in your .nanorc or nano may malfunction. ***
-***********************************************************************
-])
+    if test x$ac_cv_header_regex_h = xyes; then
+	AC_DEFINE(ENABLE_NANORC, 1, [Define this to use .nanorc files.]) nanorc_support=yes
+	AC_DEFINE(ENABLE_COLOR, 1, [Define this to have syntax highlighting, requires regex.h and ENABLE_NANORC too!]) color_support=yes
+    else
+	AC_MSG_ERROR([
+*** The header file regex.h was not found.  If you wish to use color
+*** support this header file is required.  Please either install C
+*** libraries that include the regex.h file or do not call the configure
+*** script with --enable-color.])
+    fi
 fi])
 
 AC_ARG_ENABLE(multibuffer,
 [  --enable-multibuffer    Enable multiple file buffers],
 [if test x$enableval = xyes; then
     AC_DEFINE(ENABLE_MULTIBUFFER, 1, [Define this to enable multiple file buffers.]) multibuffer_support=yes
- fi])
+fi])
 
 AC_ARG_ENABLE(nanorc,
-[  --enable-nanorc         Enable use of .nanorc file],
+[  --enable-nanorc         Enable use of .nanorc files],
 [if test x$enableval = xyes; then
-    AC_DEFINE(ENABLE_NANORC, 1, [Define this to use the .nanorc file.]) nanorc_support=yes
- fi])
+    AC_DEFINE(ENABLE_NANORC, 1, [Define this to use .nanorc files.]) nanorc_support=yes
+fi])
 
 AC_ARG_ENABLE(all,
 [  --enable-all            Enable ALL extra nano functionality (kitchen sink option)],
 [if test x$enableval = xyes; then
-    AC_DEFINE(ENABLE_NANORC, 1, [Define this to use the .nanorc file.]) nanorc_support=yes
-    AC_DEFINE(ENABLE_COLOR, 1, [Define this to have syntax highlighting, requires ENABLE_NANORC too!]) color_support=yes
+    AC_DEFINE(ENABLE_NANORC, 1, [Define this to use .nanorc files.]) nanorc_support=yes
+    AC_DEFINE(ENABLE_COLOR, 1, [Define this to have syntax highlighting, requires regex.h and ENABLE_NANORC too!]) color_support=yes
     AC_DEFINE(ENABLE_MULTIBUFFER, 1, [Define this to enable multiple file buffers.]) multibuffer_support=yes
-    AC_DEFINE(NANO_EXTRA, 1, [Define this to enable the extra stuff.]) extra_support=yes
-    AC_MSG_WARN([
-
-***********************************************************************
-*** WARNING: Color support is far from perfect, but functional.     ***
-*** Be careful with syntax in your .nanorc or nano may malfunction. ***
-***********************************************************************
-])
+    AC_DEFINE(NANO_EXTRA, 1, [Define this to enable extra stuff.]) extra_support=yes
 fi])
 
+AC_MSG_CHECKING([whether to enable UTF-8 support])
+AC_ARG_ENABLE(utf8,
+[  --enable-utf8           Enable UTF-8 support],
+[if test x$enableval = xyes; then
+    enable_utf8=yes
+else
+    enable_utf8=no
+fi],
+[enable_utf8=auto])
+AC_MSG_RESULT($enable_utf8)
+
 AC_MSG_CHECKING([whether to use slang])
 CURSES_LIB_NAME=""
 AC_ARG_WITH(slang,
@@ -188,98 +195,200 @@ AC_ARG_WITH(slang,
     *)
 	AC_MSG_RESULT(yes)
 
-	if test "$with_slang" != "yes"; then
+	if test x$with_slang != xyes; then
 	    # Add additional search path
 	    LDFLAGS="-L$with_slang/lib $LDFLAGS"
 	    CPPFLAGS="-I$with_slang/include $CPPFLAGS"
 	fi
 
-	AC_CHECK_HEADER(slcurses.h,
-	    AC_MSG_CHECKING([for SLtt_initialize in -lslang])
-	    _libs=$LIBS
-	    LIBS="$LIBS -lslang"
-	    AC_TRY_RUN([
-#include <stdio.h>
-#include <slcurses.h>
-int main () { SLtt_initialize (NULL); return 0; }],
-		[AC_MSG_RESULT(yes)
-		AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.])
-		slang_support=yes
-		if test "$with_slang" != "yes"; then
-		    CURSES_LIB="-L${with_slang}/lib -lslang"
-		else
-		    CURSES_LIB="-lslang"
-		fi
-		CURSES_LIB_NAME=slang], [
-		AC_MSG_RESULT(no)
-		# We might need the term library
-		for termlib in ncurses curses termcap terminfo termlib; do
-		    AC_CHECK_LIB([${termlib}], tputs, [tcap="-l$termlib"])
-		    test -n "$tcap" && break
-		done
-
-		AC_MSG_CHECKING([for SLtt_initialize in -lslang $tcap])
-		LIBS="$LIBS $tcap"
+	if test x$enable_utf8 != xno; then
+	    AC_CHECK_HEADER(slcurses.h,
+		AC_MSG_CHECKING([for SLutf8_enable in -lslang])
+		_libs=$LIBS
+		LIBS="$LIBS -lslang"
 		AC_TRY_RUN([
-#include <stdio.h>
 #include <slcurses.h>
-int main () { SLtt_initialize (NULL); return 0; }],
+int main(void)
+{
+    SLutf8_enable(1);
+    return 0;
+}],
 		    [AC_MSG_RESULT(yes)
-		    AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.])
-		    slang_support=yes
-		    if test "$with_slang" != "yes"; then
-			CURSES_LIB="-L${with_slang}/lib -lslang $tcap"
+		    AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.]) slang_support=yes
+		    CURSES_LIB_WIDE=yes
+		    if test x$with_slang != xyes; then
+			CURSES_LIB="-L${with_slang}/lib -lslang"
 		    else
-			CURSES_LIB="-lslang $tcap"
+			CURSES_LIB="-lslang"
 		    fi
-		    CURSES_LIB_NAME=slang], [
-		    AC_MSG_RESULT(no)
-		    # We might need the math library
-		    AC_MSG_CHECKING([for SLtt_initialize in -lslang $tcap -lm])
-		    LIBS="$LIBS -lm"
+		    CURSES_LIB_NAME=slang],
+		    [AC_MSG_RESULT(no)
+
+		    # We might need the term library
+		    for termlib in ncurses curses termcap terminfo termlib; do
+			AC_CHECK_LIB([${termlib}], tputs, [tcap="-l$termlib"])
+			test -n "$tcap" && break
+		    done
+
+		    AC_MSG_CHECKING([for SLutf8_enable in -lslang $tcap])
+		    LIBS="$LIBS $tcap"
 		    AC_TRY_RUN([
-#include <stdio.h>
 #include <slcurses.h>
-int main () { SLtt_initialize (NULL); return 0; }],
+int main(void)
+{
+    SLutf8_enable(1);
+    return 0;
+}],
 			[AC_MSG_RESULT(yes)
-			AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.])
-			slang_support=yes
-			if test "$with_slang" != "yes"; then
-			    CURSES_LIB="-L${with_slang}/lib -lslang $tcap -lm"
+			AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.]) slang_support=yes
+			CURSES_LIB_WIDE=yes
+			if test x$with_slang != xyes; then
+			    CURSES_LIB="-L${with_slang}/lib -lslang $tcap"
 			else
-			    CURSES_LIB="-lslang $tcap -lm"
+			    CURSES_LIB="-lslang $tcap"
 			fi
 			CURSES_LIB_NAME=slang],
-			[AC_MSG_RESULT(no)],
-AC_MSG_WARN([*** Can not use slang when cross-compiling]))],
-AC_MSG_WARN([*** Can not use slang when cross-compiling]))], 
-AC_MSG_WARN([*** Can not use slang when cross-compiling])),
+			[AC_MSG_RESULT(no)
+
+			# We might need the math library
+			AC_MSG_CHECKING([for SLutf8_enable in -lslang $tcap -lm])
+			LIBS="$LIBS -lm"
+			AC_TRY_RUN([
+#include <slcurses.h>
+int main(void)
+{
+    SLutf8_enable(1);
+    return 0;
+}],
+			    [AC_MSG_RESULT(yes)
+			    AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.]) slang_support=yes
+			    CURSES_LIB_WIDE=yes
+			    if test x$with_slang != xyes; then
+				CURSES_LIB="-L${with_slang}/lib -lslang $tcap -lm"
+			    else
+				CURSES_LIB="-lslang $tcap -lm"
+			    fi
+			    CURSES_LIB_NAME=slang],
+			    [AC_MSG_RESULT(no)],
+    AC_MSG_WARN([*** Can not use slang when cross-compiling]))],
+    AC_MSG_WARN([*** Can not use slang when cross-compiling]))],
+    AC_MSG_WARN([*** Can not use slang when cross-compiling])),
 	    AC_MSG_ERROR([
-*** The header file slcurses.h was not found. If you wish to use
-*** slang support this header file is required. Please either
+*** The header file slcurses.h was not found.  If you wish to use
+*** slang support this header file is required.  Please either
 *** install a version of slang that includes the slcurses.h file or
-*** do not call the configure script with --with-slang
-]))
+*** do not call the configure script with --with-slang.]))
+	fi
 
-	test "${_libs+set}" = "set" && LIBS=$_libs
+	if eval "test x$CURSES_LIB_NAME = x"; then
+	    # Reset libs if the above slang tests failed
+	    if test x$enable_utf8 != xno; then
+		LIBS=$_libs
+	    fi
 
-	if test "$with_slang" != "yes"; then
+	    AC_CHECK_HEADER(slcurses.h,
+		AC_MSG_CHECKING([for SLtt_initialize in -lslang])
+		_libs=$LIBS
+		LIBS="$LIBS -lslang"
+		AC_TRY_RUN([
+#include <slcurses.h>
+int main(void)
+{
+    SLtt_initialize(NULL);
+    return 0;
+}],
+		    [AC_MSG_RESULT(yes)
+		    AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.]) slang_support=yes
+		    if test x$with_slang != xyes; then
+			CURSES_LIB="-L${with_slang}/lib -lslang"
+		    else
+			CURSES_LIB="-lslang"
+		    fi
+		    CURSES_LIB_NAME=slang],
+		    [AC_MSG_RESULT(no)
+
+		    # We might need the term library
+		    for termlib in ncurses curses termcap terminfo termlib; do
+			AC_CHECK_LIB([${termlib}], tputs, [tcap="-l$termlib"])
+			test -n "$tcap" && break
+		    done
+
+		    AC_MSG_CHECKING([for SLtt_initialize in -lslang $tcap])
+		    LIBS="$LIBS $tcap"
+		    AC_TRY_RUN([
+#include <slcurses.h>
+int main(void)
+{
+    SLtt_initialize(NULL);
+    return 0;
+}],
+			[AC_MSG_RESULT(yes)
+			AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.]) slang_support=yes
+			if test x$with_slang != xyes; then
+			    CURSES_LIB="-L${with_slang}/lib -lslang $tcap"
+			else
+			    CURSES_LIB="-lslang $tcap"
+			fi
+			CURSES_LIB_NAME=slang],
+			[AC_MSG_RESULT(no)
+
+			# We might need the math library
+			AC_MSG_CHECKING([for SLtt_initialize in -lslang $tcap -lm])
+			LIBS="$LIBS -lm"
+			AC_TRY_RUN([
+#include <slcurses.h>
+int main(void)
+{
+    SLtt_initialize(NULL);
+    return 0;
+}],
+			    [AC_MSG_RESULT(yes)
+			    AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.]) slang_support=yes
+			    if test x$with_slang != xyes; then
+				CURSES_LIB="-L${with_slang}/lib -lslang $tcap -lm"
+			    else
+				CURSES_LIB="-lslang $tcap -lm"
+			    fi
+			    CURSES_LIB_NAME=slang],
+			    [AC_MSG_RESULT(no)],
+    AC_MSG_WARN([*** Can not use slang when cross-compiling]))],
+    AC_MSG_WARN([*** Can not use slang when cross-compiling]))],
+    AC_MSG_WARN([*** Can not use slang when cross-compiling])),
+	    AC_MSG_ERROR([
+*** The header file slcurses.h was not found.  If you wish to use
+*** slang support this header file is required.  Please either
+*** install a version of slang that includes the slcurses.h file or
+*** do not call the configure script with --with-slang.]))
+	fi
+
+	if test "${_libs+set}" = "set"; then
+	    LIBS=$_libs
+	fi
+
+	if test x$with_slang != xyes; then
 	    LDFLAGS=${_ldflags}
 	fi
 	;;
     esac], [AC_MSG_RESULT(no)])
 
-dnl Checks for functions
-AC_CHECK_FUNCS(snprintf vsnprintf strcasecmp strncasecmp)
-if test "x$ac_cv_func_snprintf" = "xno" -o "xac_cv_func_vsnprintf" = "xno"
-then
-	AM_PATH_GLIB_2_0(2.0.0,,
-	    [AM_PATH_GLIB(1.2.4,,
-		[AC_MSG_ERROR([
-*** snprintf() and/or vsnprintf() not found.  GLIB not found either.
-*** You need both snprintf() and vsnprintf().  Alternatively you can
-*** install the GLIB library which can be found at ftp://ftp.gtk.org/.])],
-		glib)])
+AM_CONDITIONAL(USE_COLOR, test x$color_support = xyes)
+AM_CONDITIONAL(USE_NANORC, test x$nanorc_support = xyes)
+
+dnl Checks for functions.
+
+AC_CHECK_FUNCS(getdelim getline isblank strcasecmp strcasestr strncasecmp strnlen vsnprintf)
+
+if test x$enable_utf8 != xno; then
+    AC_CHECK_FUNCS(iswalnum iswblank iswpunct iswspace mblen mbstowcs mbtowc wctomb wcwidth)
+fi
+
+if test x$ac_cv_func_vsnprintf = xno; then
+    AM_PATH_GLIB_2_0(2.0.0,,
+	AC_MSG_ERROR([
+*** vsnprintf() not found.  GLIB 2.x not found either.  You should
+*** install the GLIB 2.x library which can be found at
+*** ftp://ftp.gtk.org/.]),
+	glib)
 fi
 
 dnl Checks for typedefs, structures, and compiler characteristics.
@@ -291,66 +400,90 @@ AC_CHECK_FUNCS(getopt_long)
 
 dnl Checks for libraries.
 
+if eval "test x$CURSES_LIB_NAME = x"; then
+    AC_CHECK_HEADERS(ncurses.h)
 
-if eval "test x$CURSES_LIB_NAME = x"
-then
-    AC_CHECK_HEADERS(curses.h ncurses.h)
-    AC_CHECK_LIB(ncurses, tgetent, [CURSES_LIB="-lncurses" CURSES_LIB_NAME=ncurses])
+    if test x$enable_utf8 != xno; then
+	AC_CHECK_LIB(ncursesw, get_wch, [CURSES_LIB="-lncursesw" CURSES_LIB_NAME=ncursesw CURSES_LIB_WIDE=yes])
+    fi
+
+    if eval "test x$CURSES_LIB_NAME = x"; then
+	AC_CHECK_LIB(ncurses, initscr, [CURSES_LIB="-lncurses" CURSES_LIB_NAME=ncurses])
+    fi
 fi
 
-if eval "test x$CURSES_LIB_NAME = x"
-then
-    AC_CHECK_LIB(curses, tgetent, [CURSES_LIB="-lcurses" CURSES_LIB_NAME=curses])
+if eval "test x$CURSES_LIB_NAME = x"; then
+    AC_CHECK_HEADERS(curses.h)
+
+    if test x$enable_utf8 != xno; then
+	AC_CHECK_LIB(curses, get_wch, [CURSES_LIB="-lcurses" CURSES_LIB_NAME=curses CURSES_LIB_WIDE=yes])
+    fi
+
+    if eval "test x$CURSES_LIB_NAME = x"; then
+	 AC_CHECK_LIB(curses, initscr, [CURSES_LIB="-lcurses" CURSES_LIB_NAME=curses])
+    fi
 fi
 
-# Fallback for PDCurses and less useful curses libs...
-if eval "test x$CURSES_LIB_NAME = x"
-then
-    AC_CHECK_LIB(curses, initscr, [CURSES_LIB="-lcurses" CURSES_LIB_NAME=curses])
-fi
-
-if eval "test x$CURSES_LIB_NAME = x"
-then
-    AC_CHECK_LIB(termcap, tgetent, [CURSES_LIB="-ltermcap" CURSES_LIB_NAME=termcap])
-fi
-
-if eval "test x$CURSES_LIB_NAME = x"
-then
+if eval "test x$CURSES_LIB_NAME = x"; then
     AC_MSG_WARN([
-*** No termcap lib available, consider getting the official ncurses
+*** No curses lib available.  Consider getting the official ncurses
 *** distribution from ftp://ftp.gnu.org/pub/gnu/ncurses if you get
 *** errors compiling nano.])
 else
-    AC_MSG_RESULT([Using $CURSES_LIB_NAME as the termcap library])
+    AC_MSG_RESULT([Using $CURSES_LIB_NAME as the curses library])
 fi
 
+AC_CHECK_LIB([$CURSES_LIB_NAME], use_default_colors, AC_DEFINE(HAVE_USE_DEFAULT_COLORS, 1, [Define this if your curses library has the use_default_colors() command.]))
 
-AC_CHECK_LIB([$CURSES_LIB_NAME], use_default_colors, AC_DEFINE(HAVE_USE_DEFAULT_COLORS, 1, [Define this if your curses library has the use_default_colors command.]))
-if test x$slang_support != xyes; then
-    AC_CHECK_LIB([$CURSES_LIB_NAME], wresize, AC_DEFINE(HAVE_WRESIZE, 1, [Define this if you have the wresize function in your ncurses-type library.]))
-    AC_CHECK_LIB([$CURSES_LIB_NAME], resizeterm, AC_DEFINE(HAVE_RESIZETERM, 1, [Define this if you have the resizeterm function in your ncurses-type library.]))
-fi
-
-dnl Parse any configure options
+dnl Parse any configure options.
 
 LIBS="$LIBS $CURSES_LIB"
 
 AC_SUBST(CURSES_LIB)
 
-if test "x$GLIB_CFLAGS" != "x"
-then
-	CFLAGS="$CFLAGS $GLIB_CFLAGS"
+if test "x$GLIB_CFLAGS" != "x"; then
+    CFLAGS="$CFLAGS $GLIB_CFLAGS"
 fi
-if test "x$GLIB_LIBS" != "x"
-then
-	LDFLAGS="$LDFLAGS $GLIB_LIBS"
+if test "x$GLIB_LIBS" != "x"; then
+    LDFLAGS="$LDFLAGS $GLIB_LIBS"
+fi
+
+if test x$enable_utf8 != xno && \
+    test x$CURSES_LIB_WIDE = xyes && \
+    test x$ac_cv_func_iswalnum = xyes && \
+    test x$ac_cv_func_iswpunct = xyes && \
+    (test x$ac_cv_func_iswblank = xyes || test x$ac_cv_func_iswspace = xyes) && \
+    test x$ac_cv_func_mblen = xyes && \
+    test x$ac_cv_func_mbstowcs = xyes && \
+    test x$ac_cv_func_mbtowc = xyes && \
+    test x$ac_cv_func_wctomb = xyes && \
+    test x$ac_cv_func_wcwidth = xyes; then
+	AC_DEFINE(ENABLE_UTF8, 1, [Define this if your system has sufficient UTF-8 support (a wide curses library, iswalnum(), iswpunct(), iswblank() or iswspace(), mblen(), mbstowcs(), mbtowc(), wctomb(), and wcwidth()).])
+else
+    if test x$enable_utf8 = xyes; then
+	AC_MSG_ERROR([
+*** UTF-8 support was requested, but insufficient UTF-8 support was
+*** detected in your curses and/or C libraries.  Please verify that your
+*** slang was built with UTF-8 support or your curses was built with
+*** wide character support, and that your C library was built with wide
+*** character support.])
+    elif test x$enable_utf8 != xno; then
+	AC_MSG_WARN([
+*** Insufficient UTF-8 support was detected in your curses and/or C
+*** libraries.  If you want UTF-8 support, please verify that your slang
+*** was built with UTF-8 support or your curses was built with wide
+*** character support, and that your C library was built with wide
+*** character support.])
+    fi
 fi
 
 AC_CONFIG_FILES([
 Makefile
 doc/Makefile
+doc/nanorc.sample
 doc/man/Makefile
 doc/man/fr/Makefile
+doc/syntax/Makefile
 doc/texinfo/Makefile
 m4/Makefile
 po/Makefile.in

doc/.cvsignore

@@ -1,2 +1,3 @@
 Makefile
 Makefile.in
+nanorc.sample

doc/Makefile.am

@@ -1,3 +1,7 @@
+if USE_COLOR
+SUBDIRS = man syntax texinfo
+else
 SUBDIRS = man texinfo
+endif
 
-EXTRA_DIST = faq.html nanorc.sample
+EXTRA_DIST = faq.html

doc/faq.html

@@ -2,11 +2,10 @@
 <html>
 <head>
   <title>The GNU nano editor FAQ</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-  <meta name="GENERATOR" content="Mozilla/4.73 [en] (X11; U; Linux 2.2.16 i586) [Netscape]">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 <body text="#330000" bgcolor="#ffffff" link="#0000ef" vlink="#51188e" alink="#ff0000">
-<h1>The nano FAQ</h1>
+<h1>The GNU nano editor FAQ</h1>
 <h2>Table of Contents</h2>
 <h2><a href="#1">1. General</a></h2>
 <blockquote><p><a href="#1.1">1.1 About this FAQ</a><br>
@@ -25,25 +24,31 @@
 <blockquote><p><a href="#3.1">3.1. How do I install the RPM or DEB package?</a><br>
   <a href="#3.2">3.2. Compiling from source: WHAT THE HECK DO I DO NOW?</a><br>
   <a href="#3.3">3.3. Why does everything go into /usr/local?</a><br>
-  <a href="#3.4">3.4. I get errors about 'bindtextdomain','gettext' and/or 'gettextdomain'. What can I do about it?</a><br>
-  <a href="#3.5">3.5. Nano should automatically run strip on the binary when installing it!</a><br>
+  <a href="#3.4">3.4. I get errors about 'bindtextdomain','gettext', and/or 'gettextdomain'. What can I do about it?</a><br>
+  <a href="#3.5">3.5. nano should automatically run strip on the binary when installing it!</a><br>
   <a href="#3.6">3.6. How can I make the executable smaller? This is too bloated!</a><br>
   <a href="#3.7">3.7. Tell me more about this multibuffer stuff!</a><br>
   <a href="#3.8">3.8. Tell me more about this verbatim input stuff!</a><br>
   <a href="#3.9">3.9. How do I make a .nanorc file that nano will read when I start it?</a></p></blockquote>
 <h2><a href="#4">4. Running</a></h2>
-<blockquote><p><a href="#4.1">4.1. Ack! My backspace/delete/enter/double bucky/meta key doesn't seem to work! What can I do?</a><br>
-  <a href="#4.2">4.2. Nano crashes when I type &lt;insert keystroke here&gt;!</a><br>
-  <a href="#4.3">4.3. Nano crashes when I resize my window. How can I fix that?</a><br>
-  <a href="#4.4">4.4. [version 1.1.12 and earlier] Why does nano show ^\ in the shortcut list instead of ^J?</a><br>
-  <a href="#4.5a">4.5a. [version 1.1.12 and earlier] When I type in a search string, the string I last searched for is already in front of my cursor! What happened?!</a><br>
-  <a href="#4.5b">4.5b. [version 1.2.2 and later] Hey, the search string behavior has reverted, it's now like Pico, what happened to the consistency?</a><br>
-  <a href="#4.6">4.6. I get the message &quot;NumLock glitch detected. Keypad will malfunction with NumLock off.&quot; What gives?</a><br>
-  <a href="#4.7">4.7. How do I make nano my default editor (in Pine, mutt, etc.)?</a><br>
-  <a href="#4.8">4.8. I've compiled nano with color support, but I don't see any color when I run it!</a></p></blockquote>
+<blockquote><p><a href="#4.1">4.1. How do I open a file with a name beginning with '+' from the command line?</a><br>
+  <a href="#4.2">4.2. Ack! My Backspace/Delete/Enter/Meta/double bucky key doesn't seem to work! What can I do?</a><br>
+  <a href="#4.3">4.3. Ack! My numeric keypad's keys don't work properly when NumLock is off! What can I do?</a><br>
+  <a href="#4.4">4.4. Ack! When I hold down a Meta key combination for a while, the character of the held key gets inserted now and then. What gives?</a><br>
+  <a href="#4.5">4.5. How do I type the F13-F16 keys shown in the help browser? My keyboard only has F1-F12!</a><br>
+  <a href="#4.6">4.6. nano crashes when I type &lt;insert keystroke here&gt;!</a><br>
+  <a href="#4.7">4.7. nano crashes when I resize my window. How can I fix that?</a><br>
+  <a href="#4.8">4.8. [version 1.3.12 and later] I'm using glibc 2.2.3, and nano crashes when I use color support or do regular expression searches. How can I fix that?</a><br>
+  <a href="#4.9">4.9. [version 1.1.12 and earlier] Why does nano show ^\ in the shortcut list instead of ^J?</a><br>
+  <a href="#4.10a">4.10a. [version 1.1.12 and earlier] When I type in a search string, the string I last searched for is already in front of my cursor! What happened?!</a><br>
+  <a href="#4.10b">4.10b. [version 1.1.99pre1 and later] Hey, the search string behavior has reverted, it's now like Pico, what happened to the consistency?</a><br>
+  <a href="#4.11">4.11. How do I make nano my default editor (in Pine, mutt, etc.)?</a><br>
+  <a href="#4.12">4.12. I've compiled nano with color support, but I don't see any color when I run it!</a><br>
+  <a href="#4.13">4.13. How do I select text for or paste text from the clipboard in an X terminal when I'm running nano in one and nano's mouse support is turned on?</a></p></blockquote>
 <h2><a href="#5">5. Internationalization</a></h2>
 <blockquote><p><a href="#5.1">5.1. There's no translation for my language!</a><br>
-  <a href="#5.2">5.2. I don't like the translation for &lt;x&gt; in my language. How can I fix it?</a></p></blockquote>
+  <a href="#5.2">5.2. I don't like the translation for &lt;x&gt; in my language. How can I fix it?</a><br>
+  <a href="#5.3">5.3. What is the status of Unicode support?</a></p></blockquote>
 <h2><a href="#6">6. Advocacy and Licensing</a></h2>
 <blockquote><p><a href="#6.1">6.1. Why should I use nano instead of Pico?</a><br>
   <a href="#6.2">6.2. Why should I use Pico instead of nano?</a><br>
@@ -52,7 +57,7 @@
   <a href="#6.5">6.5. Why doesn't UW simply change their license?</a><br>
   <a href="#6.6">6.6. What if tomorrow UW changes the license to be truly Free Software?</a></p></blockquote>
 <h2><a href="#7">7. Miscellaneous</a></h2>
-<blockquote><p><a href="#7.1">7.1. Nano related mailing lists.</a><br>
+<blockquote><p><a href="#7.1">7.1. nano-related mailing lists.</a><br>
   <a href="#7.2">7.2. I want to send the development team a big load of cash (or just a thank you).</a><br>
   <a href="#7.3">7.3. How do I submit a patch?</a><br>
   <a href="#7.4">7.4. How do I join the development team?</a><br>
@@ -61,7 +66,7 @@
 <hr width="100%">
 <h1><a name="1"></a>1. General</h1>
 <h2><a name="1.1"></a>1.1 About this FAQ</h2>
-<blockquote><p>This FAQ was written and is maintained by Chris Allegretta &lt;<a href="mailto:chrisa@asty.org">chrisa@asty.org</a>&gt;, who also happens to be the creator of nano. Maybe someone else will volunteer to maintain this FAQ someday, who knows...</p></blockquote>
+<blockquote><p>This FAQ was originally written and maintained by Chris Allegretta &lt;<a href="mailto:chrisa@asty.org">chrisa@asty.org</a>&gt;, who also happens to be the creator of nano. It is currently maintained by David Lawrence Ramsey &lt;<a href="mailto:pooka109@cox.net">pooka109@cox.net</a>&gt;. Maybe someone else will volunteer to maintain this FAQ someday, who knows...</p></blockquote>
 <h2><a name="1.2"></a>1.2. How do I contribute to it?</h2>
 <blockquote><p>Your best bet is to send it to the nano email address, <a href="mailto:nano@nano-editor.org">nano@nano-editor.org</a> and if it is useful enough it will be included in future versions.</p></blockquote>
 <h2><a name="1.3"></a>1.3. What is GNU nano?</h2>
@@ -74,14 +79,14 @@
   <p>The <a href="http://www.debian.org/">Debian GNU/Linux</a> distribution, known for its strict standards in distributing truly &quot;free&quot; software (i.e. software with no restrictions on redistribution), would not include a binary package for Pine or Pico. Many people had a serious dilemma: they loved these programs, but they were not truly free software in the <a href="http://www.gnu.org/philosophy/free-sw.html">GNU</a> sense of the word.</p>
   <p><b>The event...</b></p>
   <p>It was in late 1999 when Chris Allegretta (our hero) was yet again complaining to himself about the less-than-perfect license Pico was distributed under, the 1000 makefiles that came with it and how just a few small improvements could make it the Best Editor in the World (TM). Having been a convert from Slackware to Debian, he missed having a simple binary package that included Pine and Pico, and had grown tired of downloading them himself.</p>
-  <p>Finally something snapped inside and Chris coded and hacked like a madman for many hours straight one weekend to make a (barely usable) Pico clone, at the time called TIP (Tip Isn't Pico). The program could not be invoked without a filename, could not save files, had no help menu, spell checker, and so forth. But over time it improved, and with the help of a few great coders it matured to the (hopefully) stable state it is today.</p>
-  <p>In February 2001, nano was declared an official GNU program by Richard Stallman. Nano also reached its first production release on March 22, 2001.</p></blockquote>
+  <p>Finally something snapped inside and Chris coded and hacked like a madman for many hours straight one weekend to make a (barely usable) Pico clone, at the time called TIP (Tip Isn't Pico). The program could not be invoked without a filename, could not save files, had no help text display, spell checker, and so forth. But over time it improved, and with the help of a few great coders it matured to the (hopefully) stable state it is today.</p>
+  <p>In February 2001, nano was declared an official GNU program by Richard Stallman. nano also reached its first production release on March 22, 2001.</p></blockquote>
 <h2><a name="1.5"></a>1.5. Why the name change from TIP?</h2>
 <blockquote><p>On January 10, 2000, TIP was officially renamed to nano because of a namespace conflict with another program called 'tip'. The original 'tip' program &quot;establishes a full duplex terminal connection to a remote host&quot;, 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).</p></blockquote>
 <h2><a name="1.6"></a>1.6. What is the current version of nano?</h2>
-<blockquote><p>The current version of nano *should* be 1.3.1. Of course you should always check the nano homepage to see what the latest and greatest version is.</p></blockquote>
+<blockquote><p>The current version of nano *should* be 2.0.3. Of course, you should always check the nano homepage to see what the latest and greatest version is.</p></blockquote>
 <h2><a name="1.7"></a>1.7. I want to read the man page without having to download the program!</h2>
-<blockquote><p>Jeez, demanding, aren't we? Okay, look <a href="http://www.nano-editor.org/dist/v1.2/nano.1.html">here</a>.</p></blockquote>
+<blockquote><p>Jeez, demanding, aren't we? Okay, look <a href="http://www.nano-editor.org/dist/v2.0/nano.1.html">here</a>.</p></blockquote>
 <hr width="100%">
 <h1><a name="2"></a>2. Where to get GNU nano.</h1>
 <h2><a name="2.1"></a>2.1. FTP and WWW sites that carry nano.</h2>
@@ -98,11 +103,6 @@
     <li><a href="http://www.nano-editor.org/dist/v1.2/RPMS/">http://www.nano-editor.org/dist/v1.2/RPMS/</a></li>
     <li><a href="http://www.ewtoo.org/~astyanax/nano/dist/v1.2/RPMS/">http://www.ewtoo.org/~astyanax/nano/dist/v1.2/RPMS/</a></li>
   </ul>
-  <p>Additionally, check out the RedHat contribs section at:</p>
-  <ul>
-    <li><a href="http://distro.ibiblio.org/pub/Linux/distributions/redhat/contrib/libc6/i386/">http://distro.ibiblio.org/pub/Linux/distributions/redhat/contrib/libc6/i386/</a></li>
-    <li><a href="ftp://distro.ibiblio.org/pub/Linux/distributions/redhat/contrib/libc6/i386/">ftp://distro.ibiblio.org/pub/Linux/distributions/redhat/contrib/libc6/i386/</a></li>
-  </ul>
 </blockquote>
 <h2><a name="2.3"></a>2.3. Debian (.deb) packages.</h2>
 <blockquote><p>Debian users can check out the current nano packages for:</p>
@@ -114,7 +114,7 @@
   <p>You can also have a look at the <a href="ftp://ftp.debian.org/debian/pool/main/n/nano/">Package Pool</a> to see all the available binary and source packages.</p>
   <p>Note that versions &lt; 0.9.10 are probably not for those wanting to get serious work done, so if you are using Debian 2.2, check that you have updated to 2.2r3, which comes with nano 0.9.23. If you're tracking unstable, you probably have the newest version already.</p></blockquote>
 <h2><a name="2.4"></a>2.4. By CVS (for the brave).</h2>
-<blockquote><p>For the 'bleeding edge' current version of nano, you can use CVS to download the current source code. <b>Note:</b> believe it or not, by downloading code that has not yet stabilized into an official release, there could quite possibly be bugs, in fact the code may not even compile! Anyway, see <a href="http://savannah.gnu.org/cvs/?group_id=1025">the nano CVS page</a> for info on anonymous CVS access to the nano source.</p></blockquote>
+<blockquote><p>For the 'bleeding edge' current version of nano, you can use CVS to download the current source code. <b>Note:</b> believe it or not, by downloading code that has not yet stabilized into an official release, there could quite possibly be bugs, in fact the code may not even compile! Anyway, see <a href="http://savannah.gnu.org/cvs/?group=nano">the nano CVS page</a> for info on anonymous CVS access to the nano source.</p></blockquote>
 <hr width="100%">
 <h1><a name="3"></a>3. Installation and Configuration</h1>
 <h2><a name="3.1"></a>3.1. How do install the RPM or DEB package?</h2>
@@ -134,81 +134,98 @@
 <blockquote><p>Well, that's what the <b>configure</b> script defaults to. If you wish to change this, simply do this:</p>
   <p><b>./configure --prefix=/usr</b></p>
   <p>to put nano into /usr/bin when you run <b>make install</b>.</p></blockquote>
-<h2><a name="3.4"></a>3.4. I get errors about 'bindtextdomain', 'gettext' and/or 'gettextdomain'. What can I do about it?</h2>
+<h2><a name="3.4"></a>3.4. I get errors about 'bindtextdomain', 'gettext', and/or 'gettextdomain'. What can I do about it?</h2>
 <blockquote><p>Try doing a <b>./configure --with-included-gettext</b> and see if that solves your problem. You may need to do a <b>make clean; make</b> to get it to work fully.</p></blockquote>
-<h2><a name="3.5"></a>3.5. Nano should automatically run strip on the binary when installing it!</h2>
+<h2><a name="3.5"></a>3.5. nano should automatically run strip on the binary when installing it!</h2>
 <blockquote><p>Actually, it does, but you have to use <b>make install-strip</b>. The default make install does not, and will not, run strip automatically.</p></blockquote>
 <h2><a name="3.6"></a>3.6. How can I make the executable smaller? This is too bloated!</h2>
 <blockquote><p>Actually, there are several parts of the editor that can be disabled. You can pass arguments to the <b>configure</b> script that disable certain features. Here's a brief list:</p>
   <pre>
-  <b>--disable-tabcomp</b>       Disables tab completion code for a smaller binary
-  <b>--disable-justify</b>       Disable justify/unjustify function
-  <b>--disable-speller</b>       Disables spell checker function
-  <b>--disable-help</b>          Disables help function (^G)
-  <b>--disable-browser</b>       Disables mini file browser
-  <b>--disable-wrapping</b>      Disables all wrapping of text (and -w flag)
-  <b>--disable-mouse</b>         Disables mouse support (and -m flag)
+  <b>--disable-tabcomp</b>       Disable tab completion functions
+  <b>--disable-justify</b>       Disable justify/unjustify functions
+  <b>--disable-speller</b>       Disable spell checker functions
+  <b>--disable-help</b>          Disable help functions
+  <b>--disable-browser</b>       Disable built-in file browser
+  <b>--disable-wrapping</b>      Disable all wrapping of text (and -w flag)
+  <b>--disable-mouse</b>         Disable mouse support (and -m flag)
   <b>--disable-operatingdir</b>  Disable setting of operating directory</pre>
   <p>There's also the <b>--enable-tiny</b> option which disables everything above, as well as some larger chunks of the program (like the marker code that you use Control-^ to select with). Also, if you know you aren't going to be using other languages you can use <b>--disable-nls</b> to disable internationalization and save a few K to a few dozen K depending on if you have locale support on your system. And finally there's always good old <b>strip</b> to strip all debugging code and code that exists in libraries on your system.</p>
   <p>If, on the other hand, you can't live without bells and whistles, you could try:</p>
   <pre>
-  <b>--enable-extra</b>          Enable extra functions, including easter eggs
-  <b>--enable-nanorc</b>         Enable use of .nanorc file
-  <b>--enable-color</b>          Enables color and syntax highlighting
-  <b>--enable-multibuffer</b>    Enables having multiple file buffers open
-  <b>--enable-all</b>            Enables all of the above features</pre></blockquote>
+  <b>--enable-extra</b>          Enable extra features, currently only easter eggs
+  <b>--enable-nanorc</b>         Enable use of .nanorc files
+  <b>--enable-color</b>          Enable color and syntax highlighting
+  <b>--enable-multibuffer</b>    Enable having multiple file buffers open
+  <b>--enable-all</b>            Enable all of the above features
+  <b>--disable-wrapping-as-root</b>
+                          Disable text wrapping by default when the user is
+                          root</pre></blockquote>
 <h2><a name="3.7"></a>3.7. Tell me more about this multibuffer stuff!</h2>
-<blockquote><p>To use multiple file buffers, you must be using nano 1.1.12 or newer, and you must have configured nano with <b>--enable-multibuffer</b> or <b>--enable-extra</b> (use nano -V to check). Then when you want to enable inserting a file into its own buffer instead of into the current file, just hit <b>Meta-F</b>, then insert the file as normal with <b>^R</b>.  If you always want files to be loaded into their own buffers, use the <b>--multibuffer</b> or <b>-F</b> flag when you invoke nano.</p>
+<blockquote><p>To use multiple file buffers, you must be using nano 1.1.0 or newer, and you must have configured nano with <b>--enable-multibuffer</b> (use nano -V to check). Then when you want to enable inserting a file into its own buffer instead of into the current file, just hit <b>Meta-F</b>, then insert the file as normal with <b>^R</b>. If you always want files to be loaded into their own buffers, use the <b>--multibuffer</b> or <b>-F</b> flag when you invoke nano.</p>
   <p>You can move between the buffers you have open with the <b>Meta-&lt;</b> and <b>Meta-&gt;</b> keys, or more easily with <b>Meta-,</b> and <b>Meta-.</b> (clear as mud, right? =-). When you have more than one file buffer open, the ^X shortcut will say &quot;Close&quot;, instead of the normal &quot;Exit&quot; when only one buffer is open.</p></blockquote>
 <h2><a name="3.8"></a>3.8. Tell me more about this verbatim input stuff!</h2>
-<blockquote><p>To use verbatim input, you must be using nano 1.3.1 or newer. When you want to insert a literal character into the file you're editing, such as a control character that nano usually treats as a command, first press <b>Meta-V</b>. (If you're not at a prompt, you'll get the message &quot;Verbatim input&quot;.) Then press the key(s) that generate the character you want.</p>
-  <p>Alternatively, you can press <b>Meta-V</b> and then type a three-digit ASCII code from 000 to 255, and the character with that ASCII code will be inserted instead.</p>
-  <p><b>NOTE:</b> Verbatim input doesn't work at prompts right now. This will be fixed soon.</p></blockquote>
+<blockquote><p>To use verbatim input, you must be using nano 1.3.1 or newer. When you want to insert a literal character into the file you're editing, such as a control character that nano usually treats as a command, first press <b>Meta-V</b>. (If you're not at a prompt, you'll get the message &quot;Verbatim Input&quot;.) Then press the key(s) that generate the character you want.</p>
+  <p>Alternatively, if you've enabled Unicode support (see section <a href="#5.3">5.3</a>), you can press <b>Meta-V</b> and then type a six-digit hexadecimal code from 000000 to 10FFFF (case-insensitive), and the character with the corresponding value will be inserted instead. The prompt will change to &quot;Unicode Input&quot; when you do this.</p></blockquote>
 <h2><a name="3.9"></a>3.9. How do I make a .nanorc file that nano will read when I start it?</h2>
 <blockquote><p>It's not hard at all! But, your version of nano must have been compiled with <b>--enable-nanorc</b>, and again must be version 1.1.12 or newer (use nano -V to check your version and compiled features). Then simply copy the <b>nanorc.sample</b> that came with the nano source or your nano package (most likely in /usr/doc/nano) to .nanorc in your home directory. If you didn't get one, the syntax is simple. Flags are turned on and off by using the word <b>set</b> and the getopt_long flag for the feature, for example &quot;set nowrap&quot; or &quot;set suspend&quot;.</p></blockquote>
 <hr width="100%">
 <h1><a name="4"></a>4. Running</h1>
-<h2><a name="4.1"></a>4.1. Ack! My backspace/delete/enter/double bucky/meta key doesn't seem to work! What can I do?</h2>
-<blockquote><p>Try setting your $TERM variable to 'vt100'. Nano doesn't yet support every term entry under the sun.</p>
-  <p>Bourne shell users (like bash): <b>export TERM=vt100</b><br>
+<h2><a name="4.1"></a>4.1. How do I open a file with a name beginning with '+' from the command line?</h2>
+<blockquote><p>If a command line option that begins with '+' is followed by another option, the former is always treated as a starting line and column number and the latter is always treated as a filename. If a command line option that begins with '+' isn't followed by another option, it's always treated as a filename. Examples:</p>
+  <p>To open '+filename.txt' starting on line 1: <b>nano +filename.txt</b><br>
+  To open '+filename.txt' starting on line 10: <b>nano +10 +filename.txt</b><br>
+  To open '+filename.txt' starting on line 1, column 20: <b>nano +,20 +filename.txt</b><br>
+  To open '+filename.txt' starting on line 10, column 20: <b>nano +10,20 +filename.txt</b><br>
+  To open '+filename.txt' starting on line 1 and 'filename.txt' starting on line 10 (if nano has been compiled with multibuffer support): <b>nano +1 +filename.txt +20 filename.txt</b></p></blockquote>
+<h2><a name="4.2"></a>4.2. Ack! My Backspace/Delete/Enter/Meta/double bucky key doesn't seem to work! What can I do?</h2>
+<blockquote><p>Try setting your $TERM variable to 'vt100'. nano doesn't yet support every term entry under the sun.</p>
+  <p>Bourne shell users (bash and sh): <b>export TERM=vt100</b><br>
   C Shell users (tcsh and csh): <b>setenv TERM vt100</b></p></blockquote>
-<h2><a name="4.2"></a>4.2. Nano crashes when I type &lt;insert keystroke here&gt;!</h2>
+<h2><a name="4.3"></a>4.3. Ack! My numeric keypad's keys don't work properly when NumLock is off! What can I do?</h2>
+<blockquote><p>You can use the <b>-K</b> or <b>--rebindkeypad</b> options on the command line, or add the line <b>set rebindkeypad</b> to your .nanorc. However, nano's mouse support won't work properly if you do any of these things.</p></blockquote>
+<h2><a name="4.4"></a>4.4. Ack! When I hold down a Meta key combination for a while, the character of the held key gets inserted now and then. What gives?</h2>
+<blockquote><p>This is a bug in the terminal, not in nano. When a key is repeating faster than nano can process it, the keyboard buffer becomes full and starts dropping incoming keystrokes. Unfortunately, it doesn't just drop whole keystrokes; it can also drop parts of multibyte key combinations, resulting in nano's receiving a wrong key.</p></blockquote>
+<h2><a name="4.5"></a>4.5. How do I type the F13-F16 keys shown in the help browser? My keyboard only has F1-F12!</h2>
+<blockquote><p>It depends on the terminal type you're using. On some terminals, such as the FreeBSD console, xterm, konsole, and gnome-terminal, Shift-F1 to Shift-F4 will generate F13 to F16. On other terminals, such as the Linux console, rxvt, and Eterm, Shift-F3 to Shift-F6 will generate F13 to F16.</p></blockquote>
+<h2><a name="4.6"></a>4.6. nano crashes when I type &lt;insert keystroke here&gt;!</h2>
 <blockquote><p>If you aren't trying some bizarre keystroke combination with some bizarre $TERM entry, chances are you have found a bug. You are welcome to submit it to the <a href="mailto:nano-devel@gnu.org">nano-devel</a> list or to <a href="mailto:nano@nano-editor.org">nano@nano-editor.org</a>.</p></blockquote>
-<h2><a name="4.3"></a>4.3. Nano crashes when I resize my window. How can I fix that?</h2>
+<h2><a name="4.7"></a>4.7. nano crashes when I resize my window. How can I fix that?</h2>
 <blockquote><p>Older versions of nano had this problem, please upgrade to a newer version (at least 0.9.9 would be great, 0.9.12 is recommended).</p></blockquote>
-<h2><a name="4.4"></a>4.4. [version 1.1.12 and earlier] Why does nano show ^\ in the shortcut list instead of ^J?</h2>
+<h2><a name="4.8"></a>4.8. [version 1.3.12 and later] I'm using glibc 2.2.3, and nano crashes when I use color support or do regular expression searches. How can I fix that?</h2>
+<blockquote><p>It's a bug in glibc 2.2.3. You should upgrade to at least glibc 2.2.4.</p></blockquote>
+<h2><a name="4.9"></a>4.9. [version 1.1.12 and earlier] Why does nano show ^\ in the shortcut list instead of ^J?</h2>
 <blockquote><p>The help (^G) and justify (^J) function were among the last to be written. To show the improvements that nano had over Pico (go to line # and replace), ^_ and ^\ were put on the shortcut list. Later, ^G came back in place of ^_ as it proved to be very valuable for new Unix users. If you use the <b>-p</b> option to nano (or hit Meta-P) you will get the same shortcuts at the bottom as Pico.</p></blockquote>
-<a name="4.5"></a>
-<h2><a name="4.5a"></a>4.5a. [version 1.1.12 and earlier] When I type in a search string, the string I last searched for is already in front of my cursor! What happened?!</h2>
+<h2><a name="4.10a"></a>4.10a. [version 1.1.12 and earlier] When I type in a search string, the string I last searched for is already in front of my cursor! What happened?!</h2>
 <blockquote><p>In nano version 0.9.20, the default is to have a completely consistent user interface across all user input functions. This means that regardless of whether you're being asked for a filename to insert or write, or a string to search for, the previous value is already inserted before the cursor. If you prefer the old behavior, use the Pico emulation mode (-p or --pico) or just hit Meta-P while in nano (see the ^G help text for more details).</p></blockquote>
-<h2><a name="4.5b"></a>4.5b. [version 1.2.2 and later] Hey, the search string behavior has reverted, it's now like Pico, what happened to the consistency?</h2>
-<blockquote><p>It was decided that consistency was nice, but people are used to Pico's inconsistent behavior.  Also, in version 1.1.99pre1, search and replace history was introduced.  If you wish to edit your previous search/replace entry (or any previous entry), you can do so by hitting the up arrow to cycle through your history.  This method allows the best of both worlds: You don't need to erase the previous string if you want to enter a new one, but you can with one keystroke recall previous entries for editing. Therefore there is now no "Pico mode", nano is and has always been a Pico <b>clone</b>, and clones by default should be compatible.</p></blockquote>
-<h2><a name="4.6"></a>4.6. I get the message &quot;NumLock glitch detected. Keypad will malfunction with NumLock off.&quot; What gives?</h2>
-<blockquote><p>Nano (and actually almost all console editors) has issues when cycling the NumLock key in certain X terminals (rxvt, aterm, wterm, etc...). When you switch NumLock from on to off, you put the terminal into an &quot;application mode&quot; that changes what sequences are sent by the keypad. These sequences vary sufficiently from terminal to terminal that it is nearly impossible to work around them from within nano.</p>
-  <p>In a nutshell, if you want to be able to use the keypad with the arrow and page up/down functionality, you have to exit nano and reset your terminal (presumably with &quot;reset&quot; or &quot;stty sane&quot; or similar) and then run nano again with NumLock off. If you know an easier way to restore &quot;normal mode&quot;, please mail <a href="mailto:nano@nano-editor.org">nano@nano-editor.org</a>.</p></blockquote>
-<h2><a name="4.7"></a>4.7. How do I make nano my default editor (in Pine, mutt, etc.)?</h2>
+<h2><a name="4.10b"></a>4.10b. [version 1.1.99pre1 and later] Hey, the search string behavior has reverted, it's now like Pico, what happened to the consistency?</h2>
+<blockquote><p>It was decided that consistency was nice, but people are used to Pico's inconsistent behavior. Also, in version 1.1.99pre1, search and replace history was introduced. If you wish to edit your previous search/replace entry (or any previous entry), you can do so by hitting the up arrow to cycle through your history. This method allows the best of both worlds: You don't need to erase the previous string if you want to enter a new one, but you can with one keystroke recall previous entries for editing. Therefore there is now no "Pico mode", nano is and has always been a Pico <b>clone</b>, and clones by default should be compatible.</p></blockquote>
+<h2><a name="4.11"></a>4.11. How do I make nano my default editor (in Pine, mutt, etc.)?</h2>
 <blockquote><p>You need to make nano your $EDITOR. If you want this to be saved, you should put a line like this in your <b>.bashrc</b> if you use bash (or <b>.zshrc</b> if you believe in zsh):</p>
   <p><b>export EDITOR=/usr/local/bin/nano</b></p>
-  <p>or if you use tcsh put this in your <b>.cshrc</b> file:</p>
+  <p>or, if you use tcsh, put this in your <b>.cshrc</b> file:</p>
   <p><b>setenv EDITOR /usr/local/bin/nano</b></p>
   <p>Change /usr/local/bin/nano to wherever nano is installed on your system. Type &quot;which nano&quot; to find out. This will not take effect until the next time you login. So log out and back in again.</p>
-  <p>Then on top that if you use Pine you must go into setup (type <b>S</b> at the main menu), then configure (type <b>C</b>). Hit enter on the lines that say:</p>
+  <p>Then, on top of that, if you use Pine, you must go into setup (type <b>S</b> at the main menu), and then configure (type <b>C</b>). Hit Enter on the lines that say:</p>
   <p><b>[ ] enable-alternate-editor-cmd</b><br>
   <b>[ ] enable-alternate-editor-implicitly</b></p>
   <p>Then exit (<b>E</b>) and select Yes (<b>Y</b>).</p>
-  <p>Mutt users should see an effect immediately the next time you log in, no further configuration is needed. However, if you want to let people know you use nano to compose your email messages, you can put a line like this in your <b>.muttrc</b>:</p>
+  <p>If you're a mutt user, you should see an effect immediately the next time you log in. No further configuration is needed. However, if you want to let people know you use nano to compose your email messages, you can put a line like this in your <b>.muttrc</b>:</p>
   <p><b>my_hdr X-Composer: nano x.y.z</b></p>
   <p>Again, replace x.y.z with the version of nano you use.</p></blockquote>
-<h2><a name="4.8"></a>4.8. I've compiled nano with color support, but I don't see any color when I run it!</h2>
+<h2><a name="4.12"></a>4.12. I've compiled nano with color support, but I don't see any color when I run it!</h2>
 <blockquote><p>If you want nano to actually use color, you have to specify the color configurations you want it to use in your .nanorc. Some example configurations are in the <b>nanorc.sample</b> that comes with the nano source or your nano package. See Section <a href="#3.9">3.9</a>.</p></blockquote>
+<h2><a name="4.13"></a>4.13. How do I select text for or paste text from the clipboard in an X terminal when I'm running nano in one and nano's mouse support is turned on?</h2>
+<blockquote><p>Try holding down the Shift key and selecting or pasting the text as you normally would.</p></blockquote>
 <hr width="100%">
 <h1><a name="5"></a>5. Internationalization</h1>
 <h2><a name="5.1"></a>5.1. There's no translation for my language!</h2>
-<blockquote><p>On June of 2001, GNU nano entered the <a href="http://www.iro.umontreal.ca/contrib/po/HTML/">Free Translation Project</a> and since then, translations should be managed from there.</p>
-  <p>If there isn't a translation for your language, you could ask <a href="http://www.iro.umontreal.ca/contrib/po/HTML/teams.html">your language team</a> to translate nano, or better still, join your team and do it yourself. Joining a team is easy. You just need to ask the <a href="mailto:translation@iro.umontreal.ca">TP coordinator</a> to add you to your team, and send a <a href="http://www.iro.umontreal.ca/contrib/po/HTML/disclaim.html">translation disclaimer to the FSF</a> (this is necessary as nano is an official GNU package, but it does <b>not</b> mean that you transfer the rights of your work to the FSF, it's just so the FSF can legally manage them).</p>
+<blockquote><p>On June of 2001, GNU nano entered the <a href="http://www.iro.umontreal.ca/translation/HTML/">Free Translation Project</a> and since then, translations should be managed from there.</p>
+  <p>If there isn't a translation for your language, you could ask <a href="http://www.iro.umontreal.ca/translation/HTML/teams.html">your language team</a> to translate nano, or better still, join your team and do it yourself. Joining a team is easy. You just need to ask the <a href="mailto:translation@iro.umontreal.ca">TP coordinator</a> to add you to your team, and send a <a href="http://www.iro.umontreal.ca/translation/HTML/disclaim.html">translation disclaimer to the FSF</a> (this is necessary as nano is an official GNU package, but it does <b>not</b> mean that you transfer the rights of your work to the FSF, it's just so the FSF can legally manage them).</p>
   <p>In any case, translating nano is very easy. Just grab the <b>nano.pot</b> file from the latest and greatest nano distribution (it's in the <b>po/</b> directory) and translate each line into your native language on the <b>msgstr</b> line. When you're done, you should send it to the TP's central po repository.</p></blockquote>
 <h2><a name="5.2"></a>5.2. I don't like the translation for &lt;x&gt; in my language. How can I fix it?</h2>
 <blockquote><p>The best way would probably be to e-mail the person listed in the <code>Last-Translator:</code> field in the <b>&lt;your_language&gt;.po</b> file with your suggested corrections and they can make the changes reach the nano-devel list.</p></blockquote>
+<h2><a name="5.3"></a>5.3. What is the status of Unicode support?</h2>
+<blockquote><p>In version 1.3.12 or later, Unicode should be usable. With your terminal, locale (LC_ALL and similar environment variables), and encoding configured to properly support UTF-8, you should be able to enter and save Unicode text.</p></blockquote>
 <hr width="100%">
 <h1><a name="6"></a>6. Advocacy and Licensing</h1>
 <h2><a name="6.1"></a>6.1. Why should I use nano instead of Pico?</h2>
@@ -222,16 +239,16 @@
 <h2><a name="6.5"></a>6.5. Why doesn't UW simply change their license?</h2>
 <blockquote><p>You're really not asking the right person here. I (Chris) waited a long time to see if UW would change their license because of the amount of high quality software being released and developed under the GPL without being taken advantage of by malicious corporate entities or other baddies, but no such luck so far.</p></blockquote>
 <h2><a name="6.6"></a>6.6. What if tomorrow UW changes the license to be truly Free Software?</h2>
-<blockquote><p>Honestly nothing would make me happier than to see that happen. Nano would continue to be developed independently until such time as Pico had all the features nano did or the projects merged. That just does not seem very likely given that there has been no sign of any changes in the past few years in a positive direction.</p></blockquote>
+<blockquote><p>Honestly nothing would make me happier than to see that happen. nano would continue to be developed independently until such time as Pico had all the features nano did or the projects merged. That just does not seem very likely given that there has been no sign of any changes in the past few years in a positive direction.</p></blockquote>
 <hr width="100%">
 <h1><a name="7"></a>7. Miscellaneous</h1>
-<h2><a name="7.1"></a>7.1. Nano related mailing lists.</h2>
-<blockquote><p>There are three mailing lists for nano hosted at <a href="http://savannah.gnu.org/">Savannah</a>, info-nano, help-nano and nano-devel. Info-nano is a very low traffic list where new versions of nano are announced (surprise!) Help-nano is for getting help with the editor without needing to hear all of the development issues surrounding it. Nano-devel is a normally low, sometimes high traffic list for discussing the present and future development of nano. Here are links to where you can sign up for a given list:</p>
+<h2><a name="7.1"></a>7.1. nano-related mailing lists.</h2>
+<blockquote><p>There are three mailing lists for nano hosted at <a href="http://savannah.gnu.org/">Savannah</a>, info-nano, help-nano and nano-devel. info-nano is a very low traffic list where new versions of nano are announced (surprise!). help-nano is for getting help with the editor without needing to hear all of the development issues surrounding it. nano-devel is a normally low, sometimes high traffic list for discussing the present and future development of nano. Here are links to where you can sign up for a given list:</p>
   <p>info-nano - <a href="http://mail.gnu.org/mailman/listinfo/info-nano/">http://mail.gnu.org/mailman/listinfo/info-nano/</a><br>
   help-nano - <a href="http://mail.gnu.org/mailman/listinfo/help-nano/">http://mail.gnu.org/mailman/listinfo/help-nano/</a><br>
   nano-devel - <a href="http://mail.gnu.org/mailman/listinfo/nano-devel/">http://mail.gnu.org/mailman/listinfo/nano-devel/</a></p></blockquote>
 <h2><a name="7.2"></a>7.2. I want to send the development team a big load of cash (or just a thank you).</h2>
-<blockquote><p>That's fine. Send it <a href="mailto:nano-devel@gnu.org">our way</a>! Better yet, fix a <a href="http://www.nano-editor.org/dist/v1.2/BUGS">bug</a> in the program or implement a <a href="http://www.nano-editor.org/dist/v1.2/TODO">cool feature</a> and send us that instead (though cash is fine too).</p></blockquote>
+<blockquote><p>That's fine. Send it <a href="mailto:nano-devel@gnu.org">our way</a>! Better yet, fix a <a href="http://www.nano-editor.org/dist/v2.0/BUGS">bug</a> in the program or implement a <a href="http://www.nano-editor.org/dist/v2.0/TODO">cool feature</a> and send us that instead (though cash is fine too).</p></blockquote>
 <h2><a name="7.3"></a>7.3. How do I submit a patch?</h2>
 <blockquote><p>See Section <a href="#7.2">7.2</a>.</p></blockquote>
 <h2><a name="7.4"></a>7.4. How do I join the development team?</h2>
@@ -239,9 +256,36 @@
 <h2><a name="7.5"></a>7.5. Can I have CVS write access?</h2>
 <blockquote><p>Re-read Section <a href="#7.4">7.4</a> and you should know the answer.</p></blockquote>
 <h2><a name="8"></a>8. ChangeLog</h2>
-<blockquote>
-<p>
-2003/12/31 - Added question about the new verbatim input function, and a few minor fixes.  Removed reference to &quot;set pico&quot; (DLR).<br>
+<blockquote><p>2007/01/01 - Update section 4.1 to describe how to open files with names beginning with '+' at specified columns as well as lines. (DLR)<br>
+2006/11/25 - Add miscellaneous wording and capitalization fixes. (DLR)<br>
+2006/10/28 - Update various links for the 2.0 branch of nano. (DLR)<br>
+2006/10/06 - Update the question in section 4.13 to match the version of it in the answer section. (DLR)<br>
+2006/07/25 - Update section 5.3 again to not state &quot;the latest development version&quot; before 1.3.12, as it's no longer accurate. Also add some minor spacing fixes. (DLR)<br>
+2006/06/12 - Update section 5.3, due to the display fix for two-column Unicode characters. (DLR)<br>
+2006/06/05 - Add a new section 4.8, and move all section 4 entries after it down one number, to explain how to deal with glibc 2.2.3's crashes involving extended regular expressions. (DLR)<br>
+2006/06/04 - Add minor punctuation, wording, and typo fixes. (DLR)<br>
+2006/05/27 - Update section 3.8 to mention the new "Unicode Input" prompt, and how Unicode input only works when Unicode support is enabled. (DLR)<br>
+2006/05/12 - Remove section 4.4, and move all section 4 entries after it up one number, since it no longer applies. Meta-] and Meta-[ are no longer used to indent and unindent marked text, since they require that the bracket matching key change to Ctrl-], which is used as the telnet escape key (found by Chris). Also, make the link to the nano CVS page a bit more readable. (DLR)<br>
+2006/05/08 - Add a new section 4.5, and move all section 4 entries after it down one number, to explain a problem that can occur when holding down keys to generate Meta sequences. Also add a few more capitalization and wording fixes. (Benno Schulenberg, minor tweaks by DLR)<br>
+2006/05/01 - Add a new section 4.4, and move all section 4 entries after it down one number, to explain how to deal with problems typing Meta-[. Also add a few capitalization and wording fixes. (DLR)<br>
+2006/04/14 - Clarify section 1.4: help menu -> help text display. (DLR, suggested by Benno Schulenberg)<br>
+2006/03/16 - Update the Free Translation Project's address, change the character set to UTF-8, and remove broken links to contributed RedHat nano packages. (DLR)<br>
+2005/11/21 - Clarify section 5.3 to better explain how to enable Unicode support, and remove the mention of quirks, since they turned out to not be a nano problem. (Mike Frysinger and DLR)<br>
+2005/11/19 - Add a new section 5.3 to explain the status of nano's Unicode support. (Mike Frysinger, minor tweaks by DLR)<br>
+2005/08/27 - Update email address. (DLR)<br>
+2005/08/10 - Add a new section 4.3, and move all section 4 entries after it down one number, to explain how to deal with numeric keypad problems. (DLR)<br>
+2005/08/08 - Update section 3.8 to mention that verbatim input mode now takes a six-digit hexadecimal number. (DLR)<br>
+2005/07/04 - Update section 4.10 to mention that pasting from the X clipboard via the middle mouse button also works when the Shift key is used. (DLR)<br>
+2005/06/15 - Update description of --enable-extra, and add missing line breaks. (DLR)<br>
+2005/06/13 - Minor capitalization and wording fixes. (DLR)<br>
+2005/06/08 - Updated section 1.1 to mention the current maintainer. (DLR)<br>
+2005/03/09 - Added question about opening files with names beginning with '+'s, and added a few more miscellaneous cosmetic fixes. (DLR)<br>
+2005/01/03 - Removed now-inaccurate note about verbatim input's not working at prompts, and update its description to mention that it handles hexadecimal values now. (DLR)<br>
+2004/11/21 - Listed sh as an example of a Bourne shell. (DLR)<br>
+2004/11/05 - Fixed inaccuracy: Pico compatibility mode was made the default in nano 1.1.99pre1, not 1.2.2. Also added question about how to type F13-F16 on terminals lacking keys past F12 (suggested by Chris), question about how to select text for the clipboard in X terminals with nano's mouse support turned on (answer found by Joseph Birthisel), and misc. fixes and link updates. (DLR)<br>
+2004/04/07 - Removed NumLock glitch question, as it's no longer needed. (DLR)<br>
+2004/01/30 - Fixed inaccuracy: multibuffer mode was first in nano 1.1.0, not 1.1.12. (DLR)<br>
+2003/12/31 - Added question about the new verbatim input function, and a few minor fixes. Removed reference to &quot;set pico&quot; (DLR).<br>
 2003/07/02 - Added question about nano's not showing color when it's compiled with color support (DLR; suggested by Jordi).<br>
 2003/02/23 - Updated RPM links for nano 1.2.x (DLR).<br>
 2003/01/16 - Split section 4.5 into 4.5a and 4.5b for search string behavior. Added --enable-all docs.<br>

doc/man/.cvsignore

@@ -1,4 +1,5 @@
 Makefile
 Makefile.in
-nanorc.5.html
 nano.1.html
+nanorc.5.html
+rnano.1.html

doc/man/Makefile.am

@@ -1,12 +1,25 @@
+if USE_NLS
 SUBDIRS = fr
+else
+SUBDIRS =
+endif
 
-man_MANS = nano.1 nanorc.5
+if USE_NANORC
+man_MANS = nano.1 nanorc.5 rnano.1
+BUILT_SOURCES = nano.1.html nanorc.5.html rnano.1.html
+else
+man_MANS = nano.1 rnano.1
+BUILT_SOURCES = nano.1.html rnano.1.html
+endif
 
-BUILT_SOURCES = nano.1.html nanorc.5.html
+nano_man_mans = nano.1 nanorc.5 rnano.1
+nano_built_sources = nano.1.html nanorc.5.html rnano.1.html
 
 nano.1.html: nano.1
-	cat $< | groff -t -mandoc -Thtml > $@
+	groff -t -mandoc -Thtml < $< > $@
 nanorc.5.html: nanorc.5
-	cat $< | groff -t -mandoc -Thtml > $@
+	groff -t -mandoc -Thtml < $< > $@
+rnano.1.html: rnano.1
+	groff -t -mandoc -Thtml < $< > $@
 
-EXTRA_DIST = $(man_MANS) $(BUILT_SOURCES)
+EXTRA_DIST = $(nano_man_mans) $(nano_built_sources)

doc/man/fr/.cvsignore

@@ -1,4 +1,5 @@
 Makefile
 Makefile.in
-nanorc.5.html
 nano.1.html
+nanorc.5.html
+rnano.1.html

doc/man/fr/Makefile.am

@@ -1,10 +1,21 @@
-man_MANS = nano.1 nanorc.5
+mandir = @mandir@/fr
 
-BUILT_SOURCES = nano.1.html nanorc.5.html
+if USE_NANORC
+man_MANS = nano.1 nanorc.5 rnano.1
+BUILT_SOURCES = nano.1.html nanorc.5.html rnano.1.html
+else
+man_MANS = nano.1 rnano.1
+BUILT_SOURCES = nano.1.html rnano.1.html
+endif
+
+nano_man_mans = nano.1 nanorc.5 rnano.1
+nano_built_sources = nano.1.html nanorc.5.html rnano.1.html
 
 nano.1.html: nano.1
-	cat $< | groff -t -mandoc -Thtml > $@
+	groff -t -mandoc -Thtml < $< > $@
 nanorc.5.html: nanorc.5
-	cat $< | groff -t -mandoc -Thtml > $@
+	groff -t -mandoc -Thtml < $< > $@
+rnano.1.html: rnano.1
+	groff -t -mandoc -Thtml < $< > $@
 
-EXTRA_DIST = $(man_MANS) $(BUILT_SOURCES)
+EXTRA_DIST = $(nano_man_mans) $(nano_built_sources)

doc/man/fr/nano.1

@@ -1,163 +1,210 @@
 .\" Hey, EMACS: -*- nroff -*-
-.\" nano.1 is copyright (C) 1999, 2000, 2001, 2002, 2003 by
-.\" Chris Allegretta <chrisa@asty.org>
+.\" nano.1 is copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+.\" 2006 by Chris Allegretta <chrisa@asty.org>
 .\"
-.\" (c) 2003 Jean-Philippe Guérard <jean-philippe.guerard@corbeaunoir.org>
-.\" pour l'adaptation française
+.\" Adaptation française (c) 2003-2006 par
+.\" Jean-Philippe Guérard <jean-philippe.guerard@tigreraye.org>.
 .\"
-.\" This is free documentation, see the latest version of the GNU General
-.\" Public License for copying conditions. There is NO warranty.
+.\" This is free documentation, see the latest version of the GNU
+.\" General Public License for copying conditions.  There is NO
+.\" warranty.
 .\"
 .\" Ce document est libre. Reportez-vous à la dernière version de la
-.\" licence publique générale GNU (GNU GPL) pour connaître ses 
-.\" conditions d'utilisation. AUCUNE garantie n'est offerte.
+.\" licence publique générale GNU (GNU GPL) pour connaître ses
+.\" conditions d'utilisation. Ce document est distribué sans
+.\" AUCUNE garantie.
 .\"
-.TH NANO 1 "19 juin 2003 (v.f. du 25 août 2003)"
+.\" $Id$
+.TH NANO 1 "version 2.0.0" "28\ octobre\ 2006"
 .\" Please adjust this date whenever revising the manpage.
 .\" Merci de modifier ces dates à chaque mise à jour de cette page.
+.\"
 
 .SH NOM
 nano \- NAno un NOuvel éditeur, un clone libre et amélioré de Pico
 
 .SH SYNOPSIS
 .B nano
-.I [\+LIGNE]\ [options]\ [fichier]
+.I [OPTIONS]\ [[\+LIGNE,COLONNE]\ FICHIER]...
 .br
 
 .SH DESCRIPTION
-Cette page de manuel décrit brièvement la commande \fBnano\fP.
+Cette page de manuel décrit brièvement la commande \fBnano\fR.
 .PP
 .\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invoke bold face and italics, 
+.\" \fI<whatever>\fP escape sequences to invoke bold face and italics,
 .\" respectively.
-\fBnano\fP est un petit éditeur sympathique et libre, qui vise à remplacer
-Pico, l'éditeur par défaut du paquet non-libre Pine. \fBnano\fP ne se 
-contentant pas de copier l'interface et l'ergonomie de Pico, il offre 
-également certaines fonctionnalités manquantes (ou désactivées par 
-défaut) de Pico. Ces fonctionnalités sont, par exemple, les fonctions de 
+\fBnano\fR est un éditeur petit, sympathique et libre, qui vise à remplacer
+Pico, l'éditeur par défaut du logiciel non libre Pine. \fBnano\fR ne se
+contentant pas de copier l'interface et l'ergonomie de Pico, il offre
+également certaines fonctions manquantes (ou désactivées par défaut)
+dans Pico. Ces fonctionnalités sont, par exemple, les fonctions de
 recherche et de remplacement, et la possibilité de sauter directement à 
-un numéro de ligne.
+une ligne et à une colonne précise.
 
 .SH OPTIONS
 .TP
-.B \+\fILIGNE\fP
-Démarre avec le curseur positionné à la ligne numéro \fILIGNE\fP.
+.B \+\fILIGNE\fP,\fICOLONNE\fP
+Démarre avec le curseur positionné à la colonne \fICOLONNE\fP de 
+la ligne \fILIGNE\fR (l'un des deux, au moins, devant être spécifié) au 
+lieu de démarrer à la colonne\ 1, ligne\ 1.
+.TP
+.B \-?
+Identique à \fB-h (\-\-help)\fP.
+.TP
+.B \-A (\-\-smarthome)
+Rend plus malin le fonctionnement de la touche «\ Début\ ». Lorsque l'on
+appuie sur cette touche à n'importe quel endroit excepté au tout début
+du texte d'une ligne (i.\ e. au premier caractère non blanc), le curseur
+se positionnera au début du texte de la ligne (qu'il soit en avant ou en
+arrière). Si le curseur est déjà là, il se placera au vrai début de la
+ligne.
 .TP
 .B \-B (\-\-backup)
 Lors de l'écriture d'un fichier, crée une copie de sécurité de la
 version précédente, en ajoutant un tilde (~) au nom du fichier.
 .TP
-.B \-D (\-\-dos)
-Écrit le fichier au format DOS.
+.B \-D (\-\-boldtext)
+Utilise des caractères gras à la place de la vidéo inverse.
+.TP
+.B \-C \fIrépertoire\fP (\-\-backupdir=\fIrépertoire\fP)
+Définit le répertoire utilisé par \fBnano\fP pour enregistrer les copies 
+de sécurité uniques si celles-ci sont activées.
+.TP
+.B \-E (\-\-tabstospaces)
+Convertit les tabulations clavier en espaces.
 .TP
 .B \-F (\-\-multibuffer)
-Active le mode multifichiers, autorisant l'édition simultanée de
+Active le mode multi-espace, autorisant l'édition simultanée de 
 plusieurs fichiers, si ce mode est disponible.
 .TP
 .B \-H (\-\-historylog)
 Enregistre les chaînes ayant fait l'objet d'une recherche ou d'un
-remplacement dans le fichier
-.I ~/.nano_history
-afin de permettre leur réutilisation. Ceci n'est possible que si
-.B nano
-est capable d'utiliser les fichiers
-nanorc.
+remplacement dans le fichier \fI~/.nano_history\fR afin de permettre leur
+réutilisation. Ceci n'est possible que si \fBnano\fR est configuré pour
+utiliser les fichiers nanorc.
 .TP
 .B \-I (\-\-ignorercfiles)
-N'utilise pas les fichiers
-.I $SYSCONFDIR/nanorc
-et
-.IR ~/.nanorc ,
-même si
-.B nano
-est capable de les utiliser.
+Ne pas utiliser pas les fichiers \fISYSCONFDIR/nanorc\fR et 
+\fI~/.nanorc\fR (si \fBnano\fR est capable de les utiliser).
 .TP
-.B \-K (\-\-keypad)
-Essaie au maximum de ne pas utiliser les appels keypad() de ncurses. 
-Utilisez ce paramètre si vous vous apercevez que les flèches du pavé 
-numérique ne fonctionnent pas sous nano.
+.B \-K (\-\-rebindkeypad)
+Interprète les touches du pavé numérique afin qu'elles fonctionnent 
+toutes correctement. Vous ne devriez utiliser cette option que si ce 
+n'est pas le cas, car nano ne sera plus capable d'utiliser la souris 
+correctement lorsque cette option sera activée.
 .TP
-.B \-M (\-\-mac)
-Écrit le fichier au format Mac.
+.B \-L (\-\-nonewlines)
+Ne pas ajouter de passage à la ligne à la fin des fichiers.
 .TP
 .B \-N (\-\-noconvert)
-Désactive la conversion automatique des fichiers depuis les
-formats Mac et DOS.
+Désactive la conversion automatique des fichiers depuis les formats Mac et
+DOS.
+.TP
+.B \-O (\-\-morespace)
+Utiliser la ligne blanche située sous la ligne de titre comme
+espace supplémentaire d'édition.
 .TP
 .B \-Q \fIchaîne\fP (\-\-quotestr=\fIchaîne\fP)
-Définit le préfixe par défaut des citations. Nano utilise ce préfixe 
-pour réaliser une justification correcte des citations.
-Si nano est capable d'utiliser des expressions rationnelles, le préfixe 
-par défaut sera "^([\ \\t]*[|>:}#])+", sinon, ce sera ">\ ".
+Définit le préfixe par défaut des citations. Nano utilise ce préfixe
+pour réaliser une justification correcte des citations. Si nano est
+capable d'utiliser des expressions rationnelles, le préfixe par défaut
+sera "\fI^([\ \\t]*[#:>\\|}])+\fP", sinon, ce sera "\fI>\ \fP". Dans 
+l'expression rationnelle précédente, «\ \fI\\t\fP\ » représente une 
+tabulation.
 .TP
-.B \-R (\-\-regexp)
-Active l'utilisation d'expressions rationnelles lors des recherches, 
-ainsi que la possibilité d'utiliser \\\fIn\fP dans les chaînes de 
-remplacement pour faire référence à la \fIn\fP-ième sous-expression du 
-motif de recherche, si cette fonction est disponible.
+.B \-R (\-\-restricted)
+Mode restreint\ : aucune lecture ou écriture de fichiers non indiqués 
+sur la ligne de commande, pas de lecture des fichiers nanorc, 
+interdiction de suspendre, interdiction d'ajouter au début, à la fin, 
+de sauvegarder un fichier ayant déjà un nom sous un nom différent, 
+d'utiliser une copie de sécurité ou le correcteur orthographique. Cette 
+option peut aussi être activée en appelant \fBnano\fP sous un nom 
+commençant par «\ r\ » (par exemple «\ rnano\ »).
 .TP
 .B \-S (\-\-smooth)
-Active le défilement progressif. Le texte défilera ligne-par-ligne au 
-lieu de défiler morceau-par-morceau.
+Active le défilement progressif. Le texte défilera ligne-par-ligne au lieu
+de défiler morceau-par-morceau.
 .TP
 .B \-T \fInombre\fP (\-\-tabsize=\fInombre\fP)
-Définit la taille (largeur) des tabulations.
+Définit la taille (largeur) des tabulations en nombre de colonnes. Le 
+nombre indiqué doit être strictement supérieur à 0. La valeur par défaut 
+est de 8.
+.TP
+.B \-U (\-\-quickblank)
+Effacement rapide de la ligne d'état. Les messages affichés par la ligne 
+d'état disparaîtront après une frappe clavier au lieu de 25. Notez que
+l'option \fB-c\fP prend le pas sur cette option.
 .TP
 .B \-V (\-\-version)
-Affiche le numéro de version et l'auteur.
+Affiche la version, puis s'arrête.
+.TP
+.B \-W (\-\-wordbounds)
+Détection plus précise des limites de mots, obtenue en considérant les 
+caractères de ponctuation comme faisant partie des mots.
 .TP
 .B \-Y \fIchaîne\fP (\-\-syntax=\fIchaîne\fP)
 Indique quel mode de colorisation syntaxique adopter, parmi les modes
-définis dans le fichier
-.IR .nanorc ,
-si cette fonctionnalité est disponible.
+définis dans le fichier \fI.nanorc\fR, si cette fonctionnalité est
+disponible.
 .TP
 .B \-c (\-\-const)
-Affiche en permanence la position du curseur.
+Affiche en permanence la position du curseur. Notez que cette option 
+prend le pas sur l'option \fB-U\fP.
+.TP
+.B \-d (\-\-rebinddelete)
+Interprète différemment la touche «\ Supprimer\ », afin que les touches 
+«\ Effacement arrière\ » et «\ Supprimer\ » fonctionnent correctement. 
+Vous ne devriez avoir besoin de cette option que si, sur votre système, 
+la touche «\ Effacement arrière\ » produit l'effet de la touche
+«\ Supprimer\ ».
 .TP
 .B \-h (\-\-help)
-Affiche de la liste des options disponibles en ligne de commande.
+Affiche un résumé des options de lancement de nano, puis s'arrête.
 .TP
 .B \-i (\-\-autoindent)
-Indentation automatique. Commence chaque nouvelle ligne au même niveau 
-que la ligne précédente. Utile pour l'édition de code source.
+Indentation automatique. Commence chaque nouvelle ligne au même niveau que
+la ligne précédente. Utile pour l'édition de code source.
 .TP
 .B \-k (\-\-cut)
-^K coupe le texte du curseur à la fin de la ligne, au lieu de couper la 
+Coupe le texte du curseur à la fin de la ligne, au lieu de couper la 
 ligne entière.
 .TP
 .B \-l (\-\-nofollow)
-Si le fichier édité est un lien symbolique, remplace le lien par le 
-nouveau fichier, sans le suivre. Ce mode ne serait-il pas utile pour 
-éditer les fichiers de
-.IR /tmp \ ?
+Si le fichier édité est un lien symbolique, au lieu de le suivre, 
+remplace le lien par le nouveau fichier. Sans doute utile pour éditer 
+les fichiers de \fI/tmp\fR, non\ ?
 .TP
 .B \-m (\-\-mouse)
-Active l'utilisation de la souris (si elle est disponible sur votre 
-système).
+Active l'utilisation de la souris, si elle est disponible pour votre
+système. Lorsque celle-ci est activée, il est possible d'utiliser la 
+souris pour positionner le curseur, pour marquer le texte (avec un 
+double-clic) et pour lancer les fonctions correspondant aux raccourcis. 
+Il est possible d'utiliser la souris sous X\ Window ou en mode console 
+avec gpm.
 .TP
 .B \-o \fIrépertoire\fP (\-\-operatingdir=\fIrépertoire\fP)
-Définit le répertoire de travail. Demande à nano de mettre en place 
-quelque-chose de similaire à une cage chroot.
+Définit le répertoire de travail. Demande à \fBnano\fP de mettre en place
+quelque chose de similaire à un environnement d'exécution restreint
+(\fIchroot\fR).
 .TP
 .B \-p (\-\-preserve)
-Préserve les séquences XON et XOFF (^Q et ^S), afin qu'elle soient 
-reçues par le terminal.
+Préserve les séquences XON et XOFF (^Q et ^S), afin qu'elle soient reçues
+par le terminal.
 .TP
 .B \-r \fIcolonne\fP (\-\-fill=\fIcolonne\fP)
-Passe automatiquement à la ligne à la colonne \fIcolonne\fP. Par défaut, 
-le passage à la ligne se fait à la taille de l'écran moins huit. Si la 
-valeur indiquée est négative, le point de passage à la ligne sera 
-calculé relativement au bord droit de l'écran. Cela permet de faire 
-varier le point de passage à la ligne lorsque l'on change la taille de 
-l'écran.
+Passe automatiquement à la ligne une fois arrivé à la colonne 
+\fIcolonne\fR. Si la valeur indiquée est de 0 ou moins, le point de 
+passage à la ligne aura lieu à la taille de l'écran moins \fIcolonne\fR. 
+Cela permet de faire varier le point de passage à la ligne lorsque l'on 
+change la taille de l'écran. La valeur par défaut est de -8.
 .TP
 .B \-s \fIprogramme\fP (\-\-speller=\fIprogramme\fP)
 Choix d'un correcteur orthographique de remplacement.
 .TP
 .B \-t (\-\-tempfile)
-S'il a été modifié, le fichier sera sauvegardé automatiquement sans 
-demande de confirmation. Identique à l'option -t de Pico.
+S'il a été modifié, le fichier sera sauvegardé automatiquement sans
+demande de confirmation. Identique à l'option \fB-t\fP de Pico.
 .TP
 .B \-v (\-\-view)
 Mode visualisation (lecture seule).
@@ -174,56 +221,73 @@ Autorise
 .B \-a, \-b, \-e, \-f, \-g, \-j
 Ignoré, pour être compatible avec Pico.
 
-.SH FICHIERS D'INITIALISATION
-\fBnano\fP lit les fichiers d'initialisation dans l'ordre suivant\ : 
-\fI$SYSCONFDIR/nanorc\fP, puis \fI~/.nanorc\fP. Reportez-vous à la page 
-de manuel de \fBnanorc\fP(5) et au fichier-exemple \fInanorc.sample\fP 
-qui devrait être livré avec \fBnano\fP.
+.SH "FICHIERS D'INITIALISATION"
+\fBnano\fR lit les fichiers d'initialisation dans l'ordre suivant\ : 
+\fISYSCONFDIR/nanorc\fR, puis \fI~/.nanorc\fR. Référez-vous à la page de 
+manuel de \fBnanorc(5)\fR et au fichier d'exemple \fInanorc.sample\fR, 
+qui devraient tous les deux être livrés avec \fBnano\fR.
 
 .SH NOTES
-Dans certains cas, \fBnano\fP essaiera de sauvegarder le fichier en 
-cours d'édition dans un fichier de secours. Cela arrivera 
-principalement si \fBnano\fP reçoit un signal SIGHUP ou SIGTERM, ou 
-bien se trouve à court de mémoire. Le nom de ce fichier de secours sera 
-\fInano.save\fP si le fichier en cours n'avait pas encore de nom, ou 
-sera composé du nom du fichier en cours suivi du suffixe «\ .save\ ». Si 
-un fichier de ce nom existe déjà dans le répertoire, un «\ .save\ » et 
-un nombre seront ajoutée à la fin du nom du fichier en cours afin de le 
-rendre unique (par exemple, «\ .save.1\ »). En mode multifichiers, 
-\fBnano\fP réalisera une sauvegarde de tous les fichiers en cours dans 
-leurs fichiers de secours respectifs.
+Si aucun correcteur orthographique de remplacement n'est indiqué dans la 
+ligne de commande ou dans l'un des fichiers nanorc, \fBnano\fR prendra 
+la commande indiquée par la variable d'environnement \fBSPELL\fR si 
+elle est définie.
+
+Dans certains cas, \fBnano\fR essaiera de sauvegarder le fichier en cours
+d'édition dans un fichier de secours. Cela arrivera principalement si
+\fBnano\fR reçoit un signal SIGHUP ou SIGTERM, ou bien se trouve à court de
+mémoire. Le nom de ce fichier de secours sera \fInano.save\fR si le fichier en
+cours n'avait pas encore de nom, ou sera composé du nom du fichier en cours
+suivi du suffixe «\ .save\ ». Si un fichier de ce nom existe déjà dans
+le répertoire, un «\ .save\ » et un nombre seront ajoutés à la fin du
+nom du fichier en cours afin de le rendre unique (par exemple,
+«\ .save.1\ »). En mode multi-espace, \fBnano\fR réalisera une
+sauvegarde de tous les fichiers en cours dans leurs fichiers de secours
+respectifs.
 
 .SH BOGUES
-Merci de nous faire parvenir vos commentaires et de nous signaler les 
-bogues, en écrivant, en anglais, à
-.BR nano@nano-editor.org .
+Merci de nous faire parvenir vos commentaires et de nous signaler les
+bogues, en écrivant, en anglais, à \fBnano@nano-editor.org\fR.
 
-N'hésitez pas à faire parvenir vos suggestions et commentaires relatifs 
-à la version française de \fBnano\fP à
-.BR jean-philippe.guerard@corbeaunoir.org .
+La liste de discussion anglophone \fBnano\fR est disponible à l'adresse
+\fBnano-devel@gnu.org\fR.
 
-La liste de discussion anglophone \fBnano\fP est disponible via
-.BR nano-devel@gnu.org .
 Pour vous abonner, envoyez un courrier électronique à
-.BR nano-devel-request@gnu.org ,
-ayant pour objet «\ subscribe\ ».
+\fBnano-devel-request@gnu.org\fR, ayant pour objet «\ subscribe\ ».
 
-.SH SITE INTERNET
+N'hésitez pas également à envoyez vos commentaires, suggestions et 
+corrections relatives à l'adaptation française de cette page de manuel 
+ou du logiciel à \fBjean-philippe.guerard@tigreraye.org\fR.
+
+.SH "SITE INTERNET"
 http://www.nano-editor.org/
 
-.SH VOIR AUSSI
+.SH "VOIR AUSSI"
 .PD 0
 .TP
-\fBnanorc\fP(5)
+\fBnanorc\fR(5)
 .PP
-\fI/usr/share/doc/nano/\fP (ou son équivalent sur votre système)
+\fI/usr/share/doc/nano/\fR (ou son équivalent sur votre système)
 
 .SH AUTEUR
 Chris Allegretta <chrisa@asty.org> et d'autres (voir les fichiers 
-\fIAUTHORS\fP et \fITHANKS\fP pour plus d'information). Cette page de 
-manuel a été initialement rédigée par Jordi Mallach 
-<jordi@sindominio.net> pour le système GNU Debian (mais elle peut être 
-utilisée par d'autres).
+\fIAUTHORS\fR et \fITHANKS\fR pour plus d'information). Cette page de 
+manuel a été initialement rédigée par Jordi Mallach <jordi@gnu.org> pour 
+le système Debian (mais elle peut être utilisée par d'autres).
 
 .SH TRADUCTION
-Jean-Philippe Guérard <jean-philippe.guerard@corbeaunoir.org>, 2003.
+Cette adaptation française a été réalisée par Jean-Philippe\ Guérard 
+<jean-philippe.guerard@tigreraye.org> le 28\ octobre\ 2006 à partir 
+de la version du 28\ octobre\ 2006 de la page de manuel de nano 
+2.0.0. Cette page a été relue par Gérard Delafond.
+
+Un maximum de soin a été apporté lors de l'élaboration de cette
+traduction\ ; néanmoins, quelques imperfections peuvent subsister. Si
+vous en rencontrez, que ce soit dans la version française ou dans la
+version originale, n'hésitez pas à les signaler à l'auteur ou au
+traducteur.
+
+La version originale la plus à jour de ce document est toujours 
+consultable via la commande\ :
+
+LANGUAGE=en man nano

doc/man/fr/nanorc.5

@@ -1,177 +1,306 @@
 .\" Hey, EMACS: -*- nroff -*-
-.\" nanorc.5 is Copyright (C) 2003 Free Software Foundation, Inc.
+.\" nanorc.5 is Copyright (C) 2003, 2004, 2005, 2006 by the Free 
+.\" Software Foundation, Inc.
 .\"
-.\" (c) 2003 Jean-Philippe Guérard <jean-philippe.guerard@corbeaunoir.org>
-.\" pour l'adaptation française
+.\" (c) 2003-2006 Jean-Philippe Guérard <jean-philippe.guerard@tigreraye.org>
+.\" pour l'adaptation française.
 .\"
-.\" This is free documentation, see the latest version of the GNU General
-.\" Public License for copying conditions. There is NO warranty.
+.\" This is free documentation, see the latest version of the GNU
+.\" General Public License for copying conditions.  There is NO
+.\" warranty.
 .\"
 .\" Ce document est libre. Reportez-vous à la dernière version de la
 .\" licence publique générale GNU (GNU GPL) pour connaître ses
-.\" conditions d'utilisation. AUCUNE garantie n'est offerte.
+.\" conditions d'utilisation. Ce document est distribué sans
+.\" AUCUNE garantie.
 .\"
-.TH NANORC 5 "19 juin 2003 (v.f. du 25 août 2003)"
+\" $Id$
+.TH NANORC 5 "version 2.0.0" "28\ octobre\ 2006"
 .\" Please adjust this date whenever revising the manpage.
 .\" Merci de modifier ces dates à chaque mise à jour de cette page.
 
-.SH NAME
+.SH NOM
 nanorc \- fichier de configuration de l'éditeur nano du projet GNU 
 
 .SH DESCRIPTION
 Cette page de manuel décrit brièvement le fichier de configuration de 
-l'éditeur \fBnano\fP du projet GNU.
+l'éditeur \fBnano\fP GNU.
 .PP
 \fBnano\fP est un petit éditeur sympathique et libre, qui vise à 
-remplacer Pico, l'éditeur par défaut du paquet non-libre Pine. 
+remplacer Pico, l'éditeur par défaut du logiciel non libre Pine. 
 \fBnano\fP ne se contentant pas de copier l'interface et l'ergonomie de 
 Pico, il offre également certaines fonctionnalités manquantes (ou 
 désactivées par défaut) de Pico. Ces fonctionnalités sont, par exemple, 
-les fonctions de recherche et de remplacement, et la possibilité de 
-sauter directement à un numéro de ligne.
+les fonctions de recherche et de remplacement et la possibilité de 
+sauter directement à une ligne et à une colonne précise.
 .PP
 Le fichier \fInanorc\fP contient les paramètres par défaut de 
-\fBnano\fP. Lors de son démarrage, nano commence par lire le fichier de 
-configuration général \fI$SYSCONFDIR/nanorc\fP, puis lit le fichier de 
-configuration personnel de l'utilisateur \fI~/.nanorc\fP.
+\fBnano\fP. Il ne doit pas être au format DOS ou Mac. Lors de son 
+démarrage, nano commencera par lire le fichier de configuration général 
+\fISYSCONFDIR/nanorc\fP, puis lira le fichier de configuration personnel 
+de l'utilisateur \fI~/.nanorc\fP.
 
 .SH OPTIONS
-Le fichier de configuration accepte une série de commandes «\ set\ » 
-(activer) et «\ unset\ » (désactiver), qui permettent de définir la 
-configuration de nano au démarrage sans avoir à utiliser d'options sur 
-la ligne de commande.
-De plus, les mots clefs «\ syntax\ » (syntaxe) et «\ color\ » (couleur) 
+Le fichier de configuration accepte une série de commandes \fBset\fP 
+(activer) et \fBunset\fP (désactiver), qui permettent de définir le 
+paramétrage de nano au démarrage sans avoir à utiliser d'options de
+ligne de commande. De plus, les mots clefs \fBsyntax\fP (syntaxe),
+\fBcolor\fP (couleur) et \fBicolor\fP (couleur insensible à la casse) 
 sont utilisés pour définir les règles de colorisation pour différents 
-motifs de texte. Nano lira une commande par ligne.
+motifs de texte. \fBnano\fP lit une commande par ligne.
 
 Les options du fichier de configuration ont priorité sur les valeurs par 
-défaut utilisées par nano. Les options données sur la ligne de commande 
-permettent d'outrepasser les options du fichier de configuration.
+défaut utilisées par nano. Les options de la ligne de commande sont 
+prioritaires par rapport aux options du fichier de configuration. Les 
+options sont désactivées (unset) par défaut, sauf les options prenant un 
+argument.
 
-Les options sont désactivées (unset) par défaut, sauf les options 
-prenant un argument.
+Les apostrophes («\ \fI'\fP\ ») et les guillemets droits («\ \fI"\fP\ »)
+présents dans des chaînes de caractères utilisées comme paramètres n'ont 
+pas besoin d'être précédées d'une barre oblique inversée
+(«\ \fI\\\fP\ »). La chaîne sera terminée par le dernier guillemet 
+droit. Par exemple, pour l'option \fBbrackets\fP, "\fI"')>]}\fP" 
+correspondra à \fI"\fP, \fI'\fP, \fI)\fP, \fI>\fP, \fI]\fP et \fI}\fP.
 
 Les commandes et arguments reconnus sont\ :
 
 .TP 3
-\fBset/unset autoindent\fP
+.B set/unset autoindent
 Active l'indentation automatique.
 .TP
-\fBset/unset backup\fP
-Crée des copie de sécurité appelées
+.B set/unset backup
+Crée des copies de sécurité nommées
 .IR nom_du_fichier~ .
 .TP
-\fBset/unset const\fP
-Affiche en permanence la position du curseur dans la barre 
-d'information.
+.B set backupdir "\fIrépertoire\fP"
+Définit le répertoire utilisé par \fBnano\fP pour enregistrer les copies 
+de sécurité uniques, si l'enregistrement de copies de sécurité est 
+activé.
 .TP
-\fBset/unset cut\fP
-Par défaut, utilise ^K  pour couper le texte du curseur à la fin de la 
-ligne, au lieu de couper la ligne entière.
+.B set/unset backwards
+Par défaut, les recherches se font vers l'arrière.
 .TP
-\fBset fill \fIn\fP\fP
-Passe automatiquement à la ligne à la colonne \fIn\fP. Si la valeur 
-indiquée est 0 ou moins, la longueur de la ligne sera égale à la largeur 
-de l'écran moins \fIn\fP. La valeur par défaut est -8.
+.B set/unset boldtext
+Utilise des caractères gras à la place de la vidéo inverse.
 .TP
-\fBset/unset historylog\fP
+.B set brackets "\fIchaîne\fP"
+Définit les caractères considérés comme des crochets fermants lors de la 
+justification des paragraphes. Ces caractères ne doivent pas contenir 
+d'espaces. Seules les ponctuations terminales, éventuellement suivies 
+de crochets fermants, peuvent terminer une phrase.
+
+(N.D.T.\ : reportez-vous au paragraphe sur l'option \fBpunct\fR pour 
+plus d'informations.)
+
+La valeur par défaut de cette option est\ : "\fI"')>]}\fP".
+
+.TP
+.B set/unset casesensitive
+Par défaut, les recherches ne tiennent pas compte de la casse.
+.TP
+.B set/unset const
+Affiche en permanence la position du curseur dans la ligne d'état.
+.TP
+.B set/unset cut
+Par défaut, coupe le texte du curseur à la fin de la ligne, au lieu de 
+couper la ligne entière.
+.TP
+.B set fill \fIn\fP
+Passe automatiquement à la ligne une fois arrivé à la colonne 
+\fIn\fR. Si la valeur indiquée est de 0 ou moins, le point de passage à 
+la ligne aura lieu à la taille de l'écran moins \fIn\fR. Cela permet de 
+faire varier le point de passage à la ligne lorsque l'on change la 
+taille de l'écran. La valeur par défaut est de -8.
+.TP
+.B set/unset historylog
 Active l'utilisation de
 .I ~/.nano_history
 pour enregistrer et relire les chaînes ayant fait l'objet d'une 
 recherche ou d'un remplacement.
 .TP
-\fBset/unset keypad\fP
-Utilise l'autre gestion du pavé numérique.
+.B set matchbrackets "\fIchaîne\fP"
+Définit les crochets ouvrants et fermant pour la recherche de crochets 
+correspondants. Cette liste ne doit pas contenir de blancs. L'ensemble 
+des crochets ouvrants doit être indiqué en premier, suivi de l'ensemble 
+des crochets fermant, qui doit être dans le même ordre. La valeur par 
+défaut de cette option est "\fI(<[{)>]}\fP".
 .TP
-\fBset/unset multibuffer\fP
-Permet de charger simultanément plusieurs fichiers.
+.B set/unset morespace
+Utiliser la ligne blanche située sous la ligne de titre comme espace 
+supplémentaire d'édition.
 .TP
-\fBset/unset noconvert\fP
+.B set/unset mouse
+Active l'utilisation de la souris, si elle est disponible pour votre
+système. Lorsque celle-ci est activée, il est possible d'utiliser la
+souris pour positionner le curseur, pour marquer le texte (avec un
+double-clic) et pour lancer les fonctions correspondant aux raccourcis.
+Il est possible d'utiliser la souris sous X\ Window ou en mode console
+avec gpm.
+.TP
+.B set/unset multibuffer
+Mode multi-espace\ : permet de charger les fichiers dans leur propre 
+espace.
+.TP
+.B set/unset noconvert
 Pas de conversion depuis les formats DOS et Mac.
 .TP
-\fBset/unset nofollow\fP
+.B set/unset nofollow
 Ne suit pas les liens symboliques lors de l'écriture des fichiers.
 .TP
-\fBset/unset nohelp\fP
-Désactive la barre d'aide affichée en bas de l'écran.
+.B set/unset nohelp
+Désactive les lignes d'aide affichée en bas de l'écran.
 .TP
-\fBset/unset nowrap\fP
+.B set/unset nonewlines
+Ne pas ajouter de passage à la ligne à la fin des fichiers.
+.TP
+.B set/unset nowrap
 Désactive le passage automatique à la ligne.
 .TP
-\fBset operatingdir "\fIrépertoire\fP"\fP
+.B set operatingdir "\fIrépertoire\fP"
 \fBnano\fP ne lira et n'écrira des fichiers qu'à l'intérieur du 
 \fIrépertoire\fP et de ses sous-répertoires. De plus, celui-ci devient 
-le répertoire courant, afin que les fichiers soient écrits dans ce 
-dossier. Par défaut, cette fonction est désactivée.
+le répertoire courant, afin que les fichiers soient lus depuis ce 
+répertoire. Par défaut, cette fonction est désactivée.
 .TP
-\fBset/unset preserve\fP
+.B set/unset preserve
 Préserve les séquences XON et XOFF (^Q et ^S).
 .TP
-\fBset quotestr "\fIchaîne\fP"\fP
+.B set punct "\fIchaîne\fP"
+Définit les caractères interprétés comme des ponctuations terminales 
+lors de la justification des paragraphes. Ces caractères ne peuvent 
+inclure de blancs. Seules les ponctuations terminales, éventuellement 
+suivies de crochets fermants, peuvent terminer une phrase. La valeur par 
+défaut de cette option est "\fI!.?\fP".
+
+(N.D.T.\ : ce réglage permet, lors de la justification, de conserver
+2\ espaces au lieu d'une derrière les ponctuations terminales, ce qui 
+correspond aux normes typographiques anglo-saxonnes, mais n'a pas lieu 
+d'être en français. Pour le français, le plus simple est d'indiquer, 
+dans le fichier nanorc, une chaîne vide pour ce paramètre.)
+.TP
+.B set/unset quickblank
+Effacement rapide de la ligne d'état. Les messages affichés par la ligne
+d'état disparaîtront après une frappe clavier au lieu de 25.
+.TP
+.B set quotestr "\fIchaîne\fP"
 Définit le préfixe par défaut utilisé pour les citations dans les 
 courriers électroniques. Ce préfixe est utilisé pour réaliser une 
 justification correcte de ces citations. Il s'agira, si votre système le 
-permet, d'une «\ expression rationnelle étendue\ ». Dans le cas 
+permet, d'une expression rationnelle étendue. Dans le cas 
 contraire, il s'agira d'une chaîne de texte brut. Si vous disposez des 
-expressions rationnelles, la valeur par défaut sera\ :
-
-	set quotestr "^([\ \\t]*[|>:}#])+"
-
-Sinon, ce sera ">\ ". Notez que le «\ \\t\ » ci-dessus correspond à un 
-caractère de tabulation.
+expressions rationnelles, la valeur par défaut de cette option sera 
+"\fI^([\ \\t]*[#:>\\|}])+\fP", sinon, ce sera ">\ ". Notez que le
+«\ \\t\ » ci-dessus correspond à un caractère de tabulation.
 .TP
-\fBset/unset regexp\fP
-Utilise par défaut des expressions rationnelles pour les recherches.
+.B set/unset rebinddelete
+Interprète différemment la touche «\ Supprimer\ », afin que les touches 
+«\ Effacement arrière\ » et «\ Supprimer\ » fonctionnent correctement. 
+Vous ne devriez avoir besoin de cette option que si, sur votre système, 
+la touche «\ Effacement arrière\ » produit l'effet de la touche «\ 
+Supprimer\ ».
 .TP
-\fBset/unset smooth\fP
+.B set/unset rebindkeypad
+Interprète les touches du pavé numérique afin qu'elles fonctionnent 
+toutes correctement. Vous ne devriez utiliser cette option que si ce 
+n'est pas le cas, car nano ne sera plus capable d'utiliser la souris 
+correctement lorsque cette option sera activée.
+.TP
+.B set/unset regexp
+Utilise par défaut des expressions rationnelles étendues pour les 
+recherches.
+.TP
+.B set/unset smarthome
+Rend plus malin le fonctionnement de la touche «\ Début\ ». Lorsque
+cette touche est pressée à n'importe quel endroit excepté au tout début
+du texte d'une ligne (i.\ e. au premier caractère non blanc), le curseur
+se positionnera au début du texte de la ligne (qu'il soit en avant ou en 
+arrière). Si le curseur est déjà là, il se placera au vrai début de la 
+ligne.
+.TP
+.B set/unset smooth
 Active le défilement ligne-par-ligne du texte.
 .TP
-\fBset speller \fIprogramme\fP\fP
+.B set speller "\fIprogramme\fP"
 Utilise le correcteur orthographique \fIprogramme\fP au lieu du 
 correcteur intégré, qui s'appuie sur \fIspell\fP.
 .TP
-\fBset/unset suspend\fP
-Autorise à suspendre nano avec ^Z.
+.B set/unset suspend
+Autorise à suspendre \fBnano\fP.
 .TP
-\fBset tabsize \fIn\fP\fP
-Utilise une largeur de tabulation de \fIn\fP au lieu de la valeur par 
-défaut (8). Cette valeur doit être supérieur à 0.
+.B set tabsize \fIn\fP
+Utilise une taille de tabulation de \fIn\fP colonnes. Cette valeur doit 
+être strictement supérieure à 0. La valeur par défaut est de\ 8.
 .TP
-\fBset/unset tempfile\fP
-S'il a été modifié, le fichier sera sauvegardé automatiquement
-sans demande de confirmation.
+.B set/unset tabstospaces
+Convertit les tabulations clavier en espaces.
 .TP
-\fBset/unset view\fP
-Interdit la modification du fichier.
+.B set/unset tempfile
+S'il a été modifié, le fichier sera sauvegardé automatiquement en 
+quittant, sans demande de confirmation.
+.TP
+.B set/unset view
+Interdit de modifier les fichiers.
+.TP
+.B set whitespace "\fIchaîne\fP"
+Définit les deux caractères utilisés pour afficher les premiers 
+caractères des tabulations et des espaces. Ces deux caractères doivent 
+être mono-colonne.
+.TP
+.B set/unset wordbounds
+Détection plus précise des limites de mots, obtenue en considérant les
+caractères de ponctuation comme faisant partie des mots.
 .TP
 .B syntax "\fIchaîne\fP" ["\fImotif_de_fichier\fP" ... ]
 Définit une syntaxe nommée \fIchaîne\fP qui pourra être activé via 
-l'option \fB-Y\fP, ou qui sera automatiquement activé si le nom du 
-fichier en cours correspond au \fImotif_de_fichier\fP. Toutes les 
-instructions de colorisation \fBcolor\fP suivantes s'appliqueront à cette 
-syntaxe, jusqu'à la définition d'une nouvelle syntaxe.
+l'option \fB-Y\fP (ou \fB--syntax\fP) ou qui sera automatiquement 
+activée si le nom du fichier en cours correspond à l'expression 
+rationnelle étendue \fImotif_de_fichier\fP. Toutes les instructions 
+suivantes de colorisation \fBcolor\fP ou \fBicolor\fP s'appliqueront à 
+cette syntaxe, jusqu'à la définition d'une nouvelle syntaxe.
+
+La syntaxe nommée \fInone\fP (aucune) est réservée\ ; si elle est 
+indiquée dans la ligne de commande, cela revient à ne définir aucune 
+syntaxe. La syntaxe nommée \fIdefault\fP (par défaut) est spéciale, elle 
+ne nécessite aucun motif de \fImotif_de_fichier\fP, et s'applique aux 
+fichiers ne correspondant à aucun des \fImotif_de_fichier\fP des autres 
+syntaxes.
 .TP
 .B color \fIcouleur_texte\fP[,\fIcouleur_fond\fP] "\fImotif\fP" ...
 Pour la syntaxe en cours, affiche toutes les expressions correspondant à 
-l'expression rationnelle \fImotif\fP en utilisant la couleur de texte 
-\fIcouleur_texte\fP et éventuellement la couleur de fond 
-\fIcouleur_fond\fP. Les couleurs acceptées par \fBnano\fP pour le 
-texte et le fond sont\ : \fIwhite\fP (blanc), \fIblack\fP (noir), 
-\fIred\fP (rouge), \fIblue\fP (bleu), \fIgreen\fP (vert), \fIyellow\fP 
-(jaune), \fImagenta\fP, et \fIcyan\fP. Vous pouvez ajouter à 
-ces couleurs le préfixe \fIbright\fP pour obtenir une couleur plus 
-lumineuse. Si votre terminal est capable de gérer la transparence, ne 
-pas spécifier de \fIcouleur_fond\fP indique à \fBnano\fP d'essayer 
-d'utiliser un fond transparent.
+l'expression rationnelle étendue \fImotif\fP en utilisant la couleur de 
+texte \fIcouleur_texte\fP et la couleur de fond \fIcouleur_fond\fP, 
+l'une de ces deux couleurs au moins devant être définie. Les couleurs 
+acceptées par \fBnano\fP pour le texte et le fond sont\ : \fIwhite\fP 
+(blanc), \fIblack\fP (noir), \fIred\fP (rouge), \fIblue\fP (bleu), 
+\fIgreen\fP (vert), \fIyellow\fP (jaune), \fImagenta\fP, et \fIcyan\fP. 
+Pour la couleur du texte, vous pouvez ajouter à ces couleurs le préfixe 
+\fIbright\fP (lumineux) pour obtenir une couleur plus lumineuse. Si 
+votre terminal est capable de gérer la transparence, ne pas spécifier de 
+\fIcouleur_fond\fP indique à \fBnano\fP d'essayer d'utiliser un fond 
+transparent.
+.TP
+.B icolor \fIcouleur_texte\fP[,\fIcouleur_fond\fP] "\fImotif\fP" ...
+Comme ci-dessus, mais la recherche des motifs est effectuée sans tenir 
+compte de la casse.
 .TP
 .B color \fIcouleur_texte\fP[,\fIcouleur_fond\fP] start="\fImotif_début\fP" end="\fImotif_fin\fP"
-Affiche les expressions commençant par \fImotif_début\fP et se terminant 
-par \fImotif_fin\fP en utilisant la couleur de texte \fIcouleur_texte\fP 
-et éventuellement la couleur de fond \fIcouleur_fond\fP. Cela permet à 
-la colorisation syntaxique de s'étendre sur plusieurs lignes. Notez que 
-toutes les occurrences successives de \fImotif_début\fP après le 
-\fImotif_début\fP initial seront colorées jusqu'à la prochaine instance 
-de \fImotif_fin\fP.
+Affiche les expressions commençant par l'expression rationnelle étendue 
+\fImotif_début\fP et se terminant par l'expression rationnelle étendue 
+\fImotif_fin\fP en utilisant la couleur de texte \fIcouleur_texte\fP 
+et la couleur de fond \fIcouleur_fond\fP, l'une de ces deux couleurs au 
+moins devant être définie. Cela permet à la colorisation syntaxique de 
+s'étendre sur plusieurs lignes. Notez que toutes les occurrences 
+successives de \fImotif_début\fP après le \fImotif_début\fP initial 
+seront surlignées jusqu'à la prochaine instance de \fImotif_fin\fP.
+.TP
+.B icolor \fIcouleur_texte\fP[,\fIcouleur_fond\fP] start="\fImotif_début\fP" end="\fImotif_fin\fP"
+Comme ci-dessus, mais la recherche des motifs est effectuée sans tenir 
+compte de la casse.
+.TP
+.B include "\fIfichier_de_syntaxes\fP"
+Lit le fichier \fIfichier_de_syntaxes\fP contenant une liste 
+autosuffisante de définitions de syntaxes. Ce fichier ne doit contenir 
+que des commandes \fBsyntax\fP, \fBcolor\fP et \fBicolor\fP.
 
 .SH FICHIERS
 .TP
@@ -192,7 +321,23 @@ votre syst
 .SH AUTEUR
 Chris Allegretta <chrisa@asty.org> et d'autres (voir les fichiers
 \fIAUTHORS\fP et \fITHANKS\fP pour plus d'information). Cette page de
-manuel a été rédigée par Jordi Mallach <jordi@gnu.org>.
+manuel a été initialement rédigée par Jordi Mallach <jordi@gnu.org> pour
+le système Debian (mais elle peut être utilisée par d'autres).
 
 .SH TRADUCTION
-Jean-Philippe Guérard <jean-philippe.guerard@corbeaunoir.org>, 2003.
+Cette adaptation française a été réalisée par Jean-Philippe\ Guérard
+<jean-philippe.guerard@tigreraye.org> le 28\ octobre\ 2006 à partir de
+la version du 28\ octobre\ 2006 de la page de manuel de nanorc (pour la 
+version 2.0.0 de nano). Cette page a été relue par Gérard 
+Delafond.
+
+Un maximum de soin a été apporté lors de l'élaboration de cette
+traduction\ ; néanmoins, quelques imperfections peuvent subsister. Si
+vous en rencontrez, que ce soit dans la version française ou dans la
+version originale, n'hésitez pas à les signaler à l'auteur ou au
+traducteur.
+
+La version originale la plus à jour de ce document est toujours 
+consultable via la commande\ :
+
+LANGUAGE=en man nano

doc/man/fr/rnano.1

@@ -0,0 +1,122 @@
+.\" Hey, EMACS: -*- nroff -*-
+.\" rnano.1 is Copyright (C) 2005, 2006 by Thijs Kinkhorst
+.\" <thijs@kinkhorst.com>; skeleton based on nano-tiny.1 by Jordi
+.\" Mallach <jordi@gnu.org>.
+.\"
+.\" Adaptation française (c) 2006 par
+.\" Jean-Philippe Guérard <jean-philippe.guerard@tigreraye.org>.
+.\"
+.\" This is free documentation, see the latest version of the GNU
+.\" General Public License for copying conditions.  There is NO
+.\" warranty.
+.\"
+.\" Ce document est libre. Reportez-vous à la dernière version de la
+.\" licence publique générale GNU (GNU GPL) pour connaître ses
+.\" conditions d'utilisation. Ce document est distribué sans
+.\" AUCUNE garantie.
+.\"
+.\" $Id$
+.TH RNANO 1 "version 2.0.0" "28\ octobre\ 20O6"
+.\" Please adjust this date whenever revising the manpage.
+.\" Merci de modifier ces dates à chaque mise à jour de cette page.
+.\"
+.SH NOM
+rnano \- Le mode restreint de NAno un NOuvel éditeur, un clone libre et 
+amélioré de Pico
+
+.SH SYNOPSIS
+.B rnano
+.I [OPTIONS]\ [[\+LIGNE,COLONNE]\ FICHIER]...
+.br
+
+.SH DESCRIPTION
+Cette page de manuel décrit brièvement la commande \fBrnano\fR.
+.PP
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invoke bold face and italics, 
+.\" respectively.
+\fBnano\fR est un éditeur petit, sympathique et libre, qui vise à 
+remplacer Pico, l'éditeur par défaut du logiciel non libre Pine. 
+\fBnano\fR ne se contentant pas de copier l'interface et l'ergonomie de 
+Pico, il offre également certaines fonctions manquantes (ou désactivées 
+par défaut) dans Pico. Ces fonctionnalités sont, par exemple, les 
+fonctions de recherche et de remplacement, et la possibilité de sauter 
+directement à une ligne et à une colonne précise..
+.PP
+\fBrnano\fP est une version de \fBnano\fP fonctionnant en mode 
+restreint, qui ne permet d'éditer que les fichiers indiqués et qui 
+n'autorise pas l'utilisateur à accéder au système de fichier ou à un 
+interpréteur de commandes.
+.PP
+En mode restreint, \fBnano\fP refusera\ :
+.IP \[bu] 2
+de lire ou d'écrire dans un fichier n'ayant pas été indiqué dans la 
+ligne de commande\ ;
+.IP \[bu]
+de lire un fichier nanorc\ ;
+.IP \[bu]
+de permettre de suspendre l'édition\ ;
+.IP \[bu]
+de permettre d'ajouter en début ou en fin d'un fichier, ou de 
+l'enregistrer sous un nom différent\ ;
+.IP \[bu]
+l'utilisation de copies de sécurité ou de la correction orthographique.
+
+.SH OPTIONS
+.TP
+.B \+\fILIGNE\fP,\fICOLONNE\fP
+Démarre avec le curseur positionné à la colonne \fICOLONNE\fP de
+la ligne \fILIGNE\fR (l'un des deux, au moins, devant être spécifié) au
+lieu de démarrer à la colonne\ 1, ligne\ 1.
+.TP
+.B \-?
+Identique à \fB-h (\-\-help)\fP.
+.TP
+.B \-h (\-\-help)
+Affiche un résumé des options de lancement de nano, puis s'arrête.
+.TP
+.B \-V (\-\-version)
+Affiche la version, puis s'arrête.
+.PP
+Reportez-vous à la page de manuel \fBnano\fP(1) si vous souhaitez 
+consulter la documentation complète de \fBnano\fP.
+
+.SH BOGUES
+Merci de nous faire parvenir vos commentaires et de nous signaler les
+bogues, en écrivant, en anglais, à \fBnano@nano-editor.org\fR.
+
+La liste de discussion anglophone \fBnano\fR est disponible à l'adresse
+\fBnano-devel@gnu.org\fR.
+
+Pour vous abonner, envoyez un courrier électronique à
+\fBnano-devel-request@gnu.org\fR, ayant pour objet «\ subscribe\ ».
+
+N'hésitez pas également à envoyez vos commentaires, suggestions et
+corrections relatives à l'adaptation française de cette page de manuel
+ou du logiciel à \fBjean-philippe.guerard@tigreraye.org\fR.
+
+.SH "SITE INTERNET"
+http://www.nano-editor.org/
+
+.SH AUTEUR
+Chris Allegretta <chrisa@asty.org> et d'autres (voir le fichier
+\fIAUTHORS\fR). Cette page de manuel a été initialement rédigée par 
+Thijs Kinkhorst <thijs@kinkhorst.com>, pour le système GNU Debian (mais 
+elle peut être utilisée par d'autres).
+
+.SH TRADUCTION
+Cette adaptation française a été réalisée par Jean-Philippe\ Guérard
+<jean-philippe.guerard@tigreraye.org> le 28\ octobre\ 2006 à partir
+de la version du 28\ octobre\ 2006 de la page de manuel de rnano 
+(pour la version 2.0.0 de nano).
+
+Un maximum de soin a été apporté lors de l'élaboration de cette
+traduction\ ; néanmoins, quelques imperfections peuvent subsister. Si
+vous en rencontrez, que ce soit dans la version française ou dans la
+version originale, n'hésitez pas à les signaler à l'auteur ou au
+traducteur.
+
+La version originale la plus à jour de ce document est toujours
+consultable via la commande\ :
+
+LANGUAGE=en man nano

doc/man/nano.1

@@ -1,12 +1,13 @@
 .\" Hey, EMACS: -*- nroff -*-
-.\" nano.1 is copyright (C) 1999, 2000, 2001, 2002, 2003 by
-.\" Chris Allegretta <chrisa@asty.org>
+.\" nano.1 is Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+.\" 2006 by Chris Allegretta <chrisa@asty.org>
 .\"
-.\" This is free documentation, see the latest version of the GNU General
-.\" Public License for copying conditions.  There is NO warranty.
+.\" This is free documentation, see the latest version of the GNU
+.\" General Public License for copying conditions.  There is NO
+.\" warranty.
 .\"
 .\" $Id$
-.TH NANO 1 "version 1.3.1" "January 09, 2004"
+.TH NANO 1 "version 2.0.0" "October 28, 2006"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 
@@ -15,11 +16,11 @@ nano \- Nano's ANOther editor, an enhanced free Pico clone
 
 .SH SYNOPSIS
 .B nano
-.I [\+LINE]\ [options]\ [file]
+.I [OPTIONS]\ [[\+LINE,COLUMN]\ FILE]...
 .br
 
 .SH DESCRIPTION
-This manual page documents briefly the \fBnano\fP command.
+This manual page briefly documents the \fBnano\fP command.
 .PP
 .\" TeX users may be more comfortable with the \fB<whatever>\fP and
 .\" \fI<whatever>\fP escape sequences to invoke bold face and italics,
@@ -28,68 +29,102 @@ This manual page documents briefly the \fBnano\fP command.
 Pico, the default editor included in the non-free Pine package.  Rather
 than just copying Pico's look and feel, \fBnano\fP also implements some
 missing (or disabled by default) features in Pico, such as "search and
-replace" and "go to line number".
+replace" and "go to line and column number".
 
 .SH OPTIONS
 .TP
-.B \+\fILINE\fP
-Places cursor at \fILINE\fP on startup.
+.B \+\fILINE\fP,\fICOLUMN\fP
+Places cursor at line number \fILINE\fP and column number \fICOLUMN\fP
+(at least one of which must be specified) on startup, instead of the
+default of line 1, column 1.
+.TP
+.B \-?
+Same as \fB-h (\-\-help)\fP.
+.TP
+.B \-A (\-\-smarthome)
+Make the Home key smarter.  When Home is pressed anywhere but at the
+very beginning of non-whitespace characters on a line, the cursor will
+jump to that beginning (either forwards or backwards).  If the cursor is
+already at that position, it will jump to the true beginning of the
+line.
 .TP
 .B \-B (\-\-backup)
 When saving a file, back up the previous version of it to the current
 filename suffixed with a ~.
 .TP
-.B \-D (\-\-dos)
-Write file in DOS format.
+.B \-C \fIdir\fP (\-\-backupdir=\fIdir\fP)
+Set the directory where \fBnano\fP puts unique backup files if file
+backups are enabled.
+.TP
+.B \-D (\-\-boldtext)
+Use bold text instead of reverse video text.
+.TP
+.B \-E (\-\-tabstospaces)
+Convert typed tabs to spaces.
 .TP
 .B \-F (\-\-multibuffer)
 Enable multiple file buffers, if available.
 .TP
 .B \-H (\-\-historylog)
-Log search and replace strings to
-.I ~/.nano_history
-so they may be stored for later editing, if nanorc support is
-configured.
+Log search and replace strings to \fI~/.nano_history\fP, so they can be
+retrieved in later sessions, if nanorc support is available.
 .TP
 .B \-I (\-\-ignorercfiles)
-Don't look at
-.I SYSCONFDIR/nanorc
-or
-.IR ~/.nanorc ,
-if nanorc support is available.
+Don't look at \fISYSCONFDIR/nanorc\fP or \fI~/.nanorc\fP, if nanorc
+support is available.
 .TP
-.B \-M (\-\-mac)
-Write file in Mac format.
+.B \-K (\-\-rebindkeypad)
+Interpret the numeric keypad keys so that they all work properly.  You
+should only need to use this option if they don't, as mouse support
+won't work properly with this option enabled.
+.TP
+.B \-L (\-\-nonewlines)
+Don't add newlines to the ends of files.
 .TP
 .B \-N (\-\-noconvert)
 Disable automatic conversion of files from DOS/Mac format.
 .TP
+.B \-O (\-\-morespace)
+Use the blank line below the titlebar as extra editing space.
+.TP
 .B \-Q \fIstr\fP (\-\-quotestr=\fIstr\fP)
 Set the quoting string for justifying.  The default is
-"^([\ \\t]*[|>:}#])+" if regular expression support is available, or
-">\ " otherwise.
+"\fI^([\ \\t]*[#:>\\|}])+\fP" if extended regular expression support is
+available, or "\fI>\ \fP" otherwise.  Note that \fI\\t\fP stands for a
+Tab.
 .TP
-.B \-R (\-\-regexp)
-Enable regular expression matching for search strings, as well as
-\\n subexpression replacement for replace strings, if available.
+.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").
 .TP
 .B \-S (\-\-smooth)
 Enable smooth scrolling.  Text will scroll line-by-line, instead of the
 usual chunk-by-chunk behavior.
 .TP
-.B \-T \fInum\fP (\-\-tabsize=\fInum\fP)
-Set the size (width) of a tab.
+.B \-T \fIcols\fP (\-\-tabsize=\fIcols\fP)
+Set the size (width) of a tab to \fIcols\fP columns.  The value of
+\fIcols\fP must be greater than 0.  The default value is 8.
+.TP
+.B \-U (\-\-quickblank)
+Do quick statusbar blanking.  Statusbar messages will disappear after 1
+keystroke instead of 25.  Note that \fB-c\fP overrides this.
 .TP
 .B \-V (\-\-version)
-Show the current version number and author.
+Show the current version number and exit.
+.TP
+.B \-W (\-\-wordbounds)
+Detect word boundaries more accurately by treating punctuation
+characters as part of a word.
 .TP
 .B \-Y \fIstr\fP (\-\-syntax=\fIstr\fP)
-Specify a specific syntax highlighting from the
-.I .nanorc
-to use, if available.
+Specify a specific syntax highlighting from the \fInanorc\fP to use, if
+available.
 .TP
 .B \-c (\-\-const)
-Constantly show the cursor position.
+Constantly show the cursor position.  Note that this overrides \fB-U\fP.
 .TP
 .B \-d (\-\-rebinddelete)
 Interpret the Delete key differently so that both Backspace and Delete
@@ -97,26 +132,28 @@ work properly.  You should only need to use this option if Backspace
 acts like Delete on your system.
 .TP
 .B \-h (\-\-help)
-Display a summary of command line options.
+Show a summary of command line options and exit.
 .TP
 .B \-i (\-\-autoindent)
-Indent new lines to the previous line's indentation.  Useful when editing
-source code.
+Indent new lines to the previous line's indentation.  Useful when
+editing source code.
 .TP
 .B \-k (\-\-cut)
-Enable cut from cursor to end of line with ^K.
+Enable cut from cursor to end of line.
 .TP
 .B \-l (\-\-nofollow)
 If the file being edited is a symbolic link, replace the link with
-a new file, do not follow it.  Good for editing files in
-.IR /tmp ,
-perhaps?
+a new file instead of following it.  Good for editing files in
+\fI/tmp\fP, perhaps?
 .TP
 .B \-m (\-\-mouse)
-Enable mouse support (if available for your system).
+Enable mouse support, if available for your system.  When enabled, mouse
+clicks can be used to place the cursor, set the mark (with a double
+click), and execute shortcuts.  The mouse will work in the X Window
+System, and on the console when gpm is running.
 .TP
 .B \-o \fIdir\fP (\-\-operatingdir=\fIdir\fP)
-Set operating directory.  Makes nano set up something similar to a
+Set operating directory.  Makes \fBnano\fP set up something similar to a
 chroot.
 .TP
 .B \-p (\-\-preserve)
@@ -124,16 +161,17 @@ Preserve the XON and XOFF sequences (^Q and ^S) so they will be caught
 by the terminal.
 .TP
 .B \-r \fIcols\fP (\-\-fill=\fIcols\fP)
-Wrap lines at column \fIcols\fP.  By default, this is the width of the
-screen, less eight.  If this value is negative, wrapping will occur at
-\fIcols\fP columns from the right of the screen, allowing the wrap point
-to vary along with the screen width if resized.
+Wrap lines at column \fIcols\fP.  If this value is 0 or less, wrapping
+will occur at the width of the screen less \fIcols\fP columns, allowing
+the wrap point to vary along with the width of the screen if the screen
+is resized.  The default value is -8.
 .TP
 .B \-s \fIprog\fP (\-\-speller=\fIprog\fP)
 Enable alternative spell checker command.
 .TP
 .B \-t (\-\-tempfile)
-Always save changed buffer without prompting.  Same as Pico -t option.
+Always save changed buffer without prompting.  Same as Pico's \fB-t\fP
+option.
 .TP
 .B \-v (\-\-view)
 View file (read only) mode.
@@ -152,37 +190,32 @@ Ignored, for compatibility with Pico.
 
 .SH INITIALIZATION FILE
 \fBnano\fP will read initialization files in the following order:
-.IR SYSCONFDIR/nanorc ,
-then
-.IR ~/.nanorc .
-Please see
-.BR nanorc (5)
-and the example file \fBnanorc.sample\fP which should be provided with
-\fBnano\fP.
+\fISYSCONFDIR/nanorc\fP, then \fI~/.nanorc\fP.  Please see
+\fBnanorc(5)\fP and the example file \fBnanorc.sample\fP, both of which
+should be provided with \fBnano\fP.
 
 .SH NOTES
-\fBnano\fP will try to dump the buffer into an emergency file in some
-cases.  Mainly, this will happen if \fBnano\fP receives a SIGHUP or
-SIGTERM or runs out of memory, when it will write the buffer into a file
-named
-.I nano.save
-if the buffer didn't have a name already, or will add a ".save" suffix
-to the current filename.  If an emergency file with that name already
-exists in the current directory, ".save" and a number (e.g. ".save.1")
-will be suffixed to the current filename in order to make it unique.  In
-multibuffer mode, \fBnano\fP will write all the open buffers to the
-respective emergency files.
+If no alternative spell checker command is specified on the command
+line or in one of the nanorc 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
+file.  This will happen mainly if \fBnano\fP receives a SIGHUP or
+SIGTERM or runs out of memory.  It will write the buffer into a file
+named \fInano.save\fP if the buffer didn't have a name already, or will
+add a ".save" suffix to the current filename.  If an emergency file with
+that name already exists in the current directory, it will add ".save"
+plus a number (e.g. ".save.1") to the current filename in order to make
+it unique.  In multibuffer mode, \fBnano\fP will write all the open
+buffers to their respective emergency files.
 
 .SH BUGS
-Please send any comments or bug reports to
-.BR nano@nano-editor.org .
+Please send any comments or bug reports to \fBnano@nano-editor.org\fP.
 
-The \fBnano\fP mailing list is available from
-.BR nano-devel@gnu.org .
+The \fBnano\fP mailing list is available from \fBnano-devel@gnu.org\fP.
 
-To subscribe, email to
-.B nano-devel-request@gnu.org
-with a subject of "subscribe".
+To subscribe, email to \fBnano-devel-request@gnu.org\fP with a subject
+of "subscribe".
 
 .SH HOMEPAGE
 http://www.nano-editor.org/
@@ -195,10 +228,7 @@ http://www.nano-editor.org/
 \fI/usr/share/doc/nano/\fP (or equivalent on your system)
 
 .SH AUTHOR
-Chris Allegretta <chrisa@asty.org>, et al (see
-.I AUTHORS
-and
-.I THANKS
-for details). This manual page was originally written by Jordi Mallach
-<jordi@sindominio.net>, for the Debian GNU system (but may be used by
+Chris Allegretta <chrisa@asty.org>, et al (see \fIAUTHORS\fP and
+\fITHANKS\fP for details).  This manual page was originally written by
+Jordi Mallach <jordi@gnu.org>, for the Debian system (but may be used by
 others).

doc/man/nanorc.5

@@ -1,152 +1,243 @@
 .\" Hey, EMACS: -*- nroff -*-
-.\" nanorc.5 is Copyright (C) 2003 Free Software Foundation, Inc.
+.\" nanorc.5 is Copyright (C) 2003, 2004, 2005, 2006 by the Free
+.\" Software Foundation, Inc.
 .\"
-.\" This is free documentation, see the latest version of the GNU General
-.\" Public License for copying conditions.  There is NO warranty.
+.\" This is free documentation, see the latest version of the GNU
+.\" General Public License for copying conditions.  There is NO
+.\" warranty.
 .\"
 .\" $Id$
-.TH NANORC 5 "version 1.3.1" "January 09, 2004"
+.TH NANORC 5 "version 2.0.0" "October 28, 2006"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .SH NAME
 nanorc \- GNU nano's rcfile
 .SH DESCRIPTION
-This manual page documents GNU \fBnano\fP's rcfile.
+This manual page briefly documents GNU \fBnano\fP's rcfile.
 .PP
 \fBnano\fP is a small, free and friendly editor which aims to replace
 Pico, the default editor included in the non-free Pine package.  Rather
 than just copying Pico's look and feel, \fBnano\fP also implements some
 missing (or disabled by default) features in Pico, such as "search and
-replace" and "go to line number".
+replace" and "go to line and column number".
 .PP
-The \fInanorc\fP file contains the default settings for \fBnano\fP.
-During startup, \fBnano\fP will first read its system-wide settings from
-.IR SYSCONFDIR/nanorc ,
-and then user-specific settings from
-.IR ~/.nanorc .
+The \fInanorc\fP file contains the default settings for \fBnano\fP.  It
+should not be in DOS or Mac format.  During startup, \fBnano\fP will
+first read its system-wide settings from \fISYSCONFDIR/nanorc\fP, and
+then user-specific settings from \fI~/.nanorc\fP.
 
 .SH OPTIONS
-The configuration file accepts a series of "set" and "unset" commands,
-which can be used to configure nano on startup without using the
-command-line options.  Additionally, the "syntax" and "color" keywords
-are used to define syntax highlighting rules for different text
-patterns.  GNU nano will read one command per line.
+The configuration file accepts a series of \fBset\fP and \fBunset\fP
+commands, which can be used to configure nano on startup without using
+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 rcfiles take precedence over nano's defaults, and command
-line options override rcfile settings.
+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 are unset by default, except for options that take an argument.
+Quotes inside string parameters don't have to be escaped with
+backslashes.  The last double quote in the string will be treated as its
+end.  For example, for the \fBbrackets\fP option, "\fI"')>]}\fP" will
+match \fI"\fP, \fI'\fP, \fI)\fP, \fI>\fP, \fI]\fP, and \fI}\fP.
 
 The supported commands and arguments are:
 
 .TP 3
-\fBset/unset autoindent\fP
+.B set/unset autoindent
 Use auto-indentation.
 .TP
-\fBset/unset backup\fP
-Create backup files in
-.IR filename~ .
+.B set/unset backup
+Create backup files in \fIfilename~\fP.
 .TP
-\fBset/unset const\fP
+.B set backupdir "\fIdirectory\fP"
+Set the directory where \fBnano\fP puts unique backup files if file
+backups are enabled.
+.TP
+.B set/unset backwards
+Do backwards searches by default.
+.TP
+.B set/unset boldtext
+Use bold text instead of reverse video text.
+.TP
+.B set brackets "\fIstring\fP"
+Set the characters treated as closing brackets when justifying
+paragraphs.  They cannot contain blank characters.  Only closing
+punctuation, optionally followed by closing brackets, can end sentences.
+The default value is "\fI"')>]}\fP".
+.TP
+.B set/unset casesensitive
+Do case sensitive searches by default.
+.TP
+.B set/unset const
 Constantly display the cursor position in the status bar.
 .TP
-\fBset/unset cut\fP
-Use cut to end of line with ^K by default.
+.B set/unset cut
+Use cut to end of line by default.
 .TP
-\fBset fill \fIn\fP\fP
-Wrap lines at column number \fIn\fP.  If \fIn\fP is 0 or less, the line
-length will be the screen width less \fIn\fP.  The default value is -8.
+.B set fill \fIn\fP
+Wrap lines at column number \fIn\fP.  If \fIn\fP is 0 or less, the
+maximum line length will be the screen width less \fIn\fP columns.  The
+default value is -8.
 .TP
-\fBset/unset historylog\fP
-Enable
-.I ~/.nano_history
-for saving and reading search/replace strings.
+.B set/unset historylog
+Enable \fI~/.nano_history\fP for saving and reading search/replace
+strings.
 .TP
-\fBset/unset multibuffer\fP
+.B set matchbrackets "\fIstring\fP"
+Set the opening and closing brackets that can be found by bracket
+searches.  They cannot contain blank characters.  The former set must
+come before the latter set, and both must be in the same order.  The
+default value is "\fI(<[{)>]}\fP".
+.TP
+.B set/unset morespace
+Use the blank line below the titlebar as extra editing space.
+.TP
+.B set/unset mouse
+Enable mouse support, if available for your system.  When enabled, mouse
+clicks can be used to place the cursor, set the mark (with a double
+click), and execute shortcuts.  The mouse will work in the X Window
+System, and on the console when gpm is running.
+.TP
+.B set/unset multibuffer
 Allow inserting files into their own buffers.
 .TP
-\fBset/unset noconvert\fP
+.B set/unset noconvert
 Don't convert files from DOS/Mac format.
 .TP
-\fBset/unset nofollow\fP
+.B set/unset nofollow
 Don't follow symlinks when writing files.
 .TP
-\fBset/unset nohelp\fP
+.B set/unset nohelp
 Don't display the help lists at the bottom of the screen.
 .TP
-\fBset/unset nowrap\fP
+.B set/unset nonewlines
+Don't add newlines to the ends of files.
+.TP
+.B set/unset nowrap
 Don't wrap text at all.
 .TP
-\fBset operatingdir "\fIdirectory\fP"\fP
+.B set operatingdir "\fIdirectory\fP"
 \fBnano\fP will only read and write files inside \fIdirectory\fP and its
 subdirectories.  Also, the current directory is changed to here, so
-files are inserted from this dir.  By default the operating directory
-feature is turned off.
+files are inserted from this diractory.  By default, the operating
+directory feature is turned off.
 .TP
-\fBset/unset preserve\fP
+.B set/unset preserve
 Preserve the XON and XOFF keys (^Q and ^S).
 .TP
-\fBset quotestr "\fIstring\fP"\fP
-The email-quote string, used to justify email-quoted paragraphs.  This
-is an "extended regular expression" if your system supports them,
-otherwise a literal string.  The default value is
-
-	set quotestr "^([\ \\t]*[|>:}#])+"
-
-if you have regexps, otherwise set quotestr ">\ ".  Note that '\\t'
-above stands for a literal Tab character.
+.B set punct "\fIstring\fP"
+Set the characters treated as closing punctuation when justifying
+paragraphs.  They cannot contain blank characters.  Only closing
+punctuation, optionally followed by closing brackets, can end sentences.
+The default value is "\fI!.?\fP".
 .TP
-\fBset/unset rebinddelete\fP
+.B set/unset quickblank
+Do quick statusbar blanking.  Statusbar messages will disappear after 1
+keystroke instead of 25.
+.TP
+.B set quotestr "\fIstring\fP"
+The email-quote string, used to justify email-quoted paragraphs.  This
+is an extended regular expression if your system supports them,
+otherwise a literal string.  The default value is
+"\fI^([\ \\t]*[#:>\\|}])+\fP" if you have extended regular expression
+support, or "\fI>\ \fP" otherwise.  Note that '\\t' stands for a literal
+Tab character.
+.TP
+.B set/unset rebinddelete
 Interpret the Delete key differently so that both Backspace and Delete
 work properly.  You should only need to use this option if Backspace
 acts like Delete on your system.
 .TP
-\fBset/unset regexp\fP
-Do regular expression searches by default.
+.B set/unset rebindkeypad
+Interpret the numeric keypad keys so that they all work properly.  You
+should only need to use this option if they don't, as mouse support
+won't work properly with this option enabled.
 .TP
-\fBset/unset smooth\fP
+.B set/unset regexp
+Do extended regular expression searches by default.
+.TP
+.B set/unset smarthome
+Make the Home key smarter.  When Home is pressed anywhere but at the
+very beginning of non-whitespace characters on a line, the cursor will
+jump to that beginning (either forwards or backwards).  If the cursor is
+already at that position, it will jump to the true beginning of the
+line.
+.TP
+.B set/unset smooth
 Use smooth scrolling by default.
 .TP
-\fBset speller \fIspellprog\fP\fP
+.B set speller "\fIspellprog\fP"
 Use spelling checker \fIspellprog\fP instead of the built-in one, which
 calls \fIspell\fP.
 .TP
-\fBset/unset suspend\fP
-Allow nano to be suspended with ^Z.
+.B set/unset suspend
+Allow \fBnano\fP to be suspended.
 .TP
-\fBset tabsize \fIn\fP\fP
-Use a tab size of \fIn\fP instead of the default (8); must be greater
-than 0.
+.B set tabsize \fIn\fP
+Use a tab size of \fIn\fP columns.  The value of \fIn\fP must be greater
+than 0.  The default value is 8.  
 .TP
-\fBset/unset tempfile\fP
+.B set/unset tabstospaces
+Convert typed tabs to spaces.
+.TP
+.B set/unset tempfile
 Save automatically on exit, don't prompt.
 .TP
-\fBset/unset view\fP
+.B set/unset view
 Disallow file modification.
 .TP
+.B set whitespace "\fIstring\fP"
+Set the two characters used to display the first characters of tabs and
+spaces.  They must be single-column characters.
+.TP
+.B set/unset wordbounds
+Detect word boundaries more accurately by treating punctuation
+characters as parts of words.
+.TP
 .B syntax "\fIstr\fP" ["\fIfileregex\fP" ... ]
-Defines a syntax named \fIstr\fP which can be activated via the \fB-Y\fP
-flag, or will be automatically activated if the current filename matches
-\fIfileregex\fP.  All following \fBcolor\fP statements will apply to
-\fIsyntax\fP until a new syntax is defined.
-.TP
-.B color \fIfgcolor\fP[,\fIbgcolor\fP] "\fIregex\fP" ...
-For the currently defined syntax, display all expressions matching
-\fIregex\fP with foreground color \fIfgcolor\fP and optional background
-color \fIbgcolor\fP.  Legal colors for foreground and background color
-are: white, black, red, blue, green, yellow, magenta, and cyan.  You may
-use the prefix "bright" to force a stronger color highlight.  If your
-terminal supports transparency, not specifying a \fIbgcolor\fP tells
-\fBnano\fP to attempt to use a transparent background.
-.TP
-.B color \fIfgcolor\fP[,\fIbgcolor\fP] start="\fIsr\fP" end="\fIer\fP"
-Display expressions which start with \fIsr\fP and end with \fIer\fP
-with foreground color \fIfgcolor\fP and optional background color
-\fIbgcolor\fP.  This allows syntax highlighting to span multiple lines.
-Note that all subsequent instances of \fIsr\fP after an initial \fIsr\fP
-is found will be highlighted until the first instance of \fIer\fP.
-\fI
+Defines a syntax named \fIstr\fP which can be activated via the
+-Y/--syntax command line option, or will be automatically activated if
+the current filename matches the extended regular expression
+\fIfileregex\fP.  All following \fBcolor\fP and \fBicolor\fP statements
+will apply to \fIsyntax\fP until a new syntax is defined.
 
+The \fInone\fP syntax is reserved; specifying it on the command line is
+the same as not having a syntax at all.  The \fIdefault\fP syntax is
+special: it takes no \fIfileregex\fP, and applies to files that don't
+match any other syntax's \fIfileregex\fP.
+.TP
+.B color \fIfgcolor\fP,\fIbgcolor\fP "\fIregex\fP" ...
+For the currently defined syntax, display all expressions matching
+the extended regular expression \fIregex\fP with foreground color
+\fIfgcolor\fP and background color \fIbgcolor\fP, at least one of which
+must be specified.  Legal colors for foreground and background color
+are: white, black, red, blue, green, yellow, magenta, and cyan.  You may
+use the prefix "bright" to force a stronger color highlight for the
+foreground.  If your terminal supports transparency, not specifying a
+\fIbgcolor\fP tells \fBnano\fP to attempt to use a transparent
+background.
+.TP
+.B icolor \fIfgcolor\fP,\fIbgcolor\fP "\fIregex\fP" ...
+Same as above, except that the expression matching is case insensitive.
+.TP
+.B color \fIfgcolor\fP,\fIbgcolor\fP start="\fIsr\fP" end="\fIer\fP"
+Display expressions which start with the extended regular expression
+\fIsr\fP and end with the extended regular expression \fIer\fP with
+foreground color \fIfgcolor\fP and background color \fIbgcolor\fP,
+at least one of which must be specified.  This allows syntax
+highlighting to span multiple lines.  Note that all subsequent instances
+of \fIsr\fP after an initial \fIsr\fP is found will be highlighted until
+the first instance of \fIer\fP.
+.TP
+.B icolor \fIfgcolor\fP,\fIbgcolor\fP start="\fIsr\fP" end="\fIer\fP"
+Same as above, except that the expression matching is case insensitive.
+.TP
+.B include "\fIsyntaxfile\fP"
+Read in self-contained color syntaxes from \fIsyntaxfile\fP.  Note that
+\fIsyntaxfile\fP can only contain \fBsyntax\fP, \fBcolor\fP, and
+\fBicolor\fP commands.
 .SH FILES
 .TP
 .I SYSCONFDIR/nanorc
@@ -162,9 +253,7 @@ Per-user configuration file
 \fI/usr/share/doc/nano/examples/nanorc.sample\fP (or equivalent on your
 system)
 .SH AUTHOR
-Chris Allegretta <chrisa@asty.org>, et al (see
-.I AUTHORS
-and
-.I THANKS
-for details).
-This manual page was written by Jordi Mallach <jordi@gnu.org>.
+Chris Allegretta <chrisa@asty.org>, et al (see \fIAUTHORS\fP and
+\fITHANKS\fP for details).  This manual page was originally written by
+Jordi Mallach <jordi@gnu.org>, for the Debian system (but may be used by
+others).

doc/man/rnano.1

@@ -0,0 +1,86 @@
+.\" Hey, EMACS: -*- nroff -*-
+.\" rnano.1 is Copyright (C) 2005, 2006 by Thijs Kinkhorst
+.\" <thijs@kinkhorst.com>; skeleton based on nano-tiny.1 by Jordi
+.\" Mallach <jordi@gnu.org>.
+.\"
+.\" This is free documentation, see the latest version of the GNU
+.\" General Public License for copying conditions.  There is NO
+.\" warranty.
+.\"
+.\" $Id$
+.TH RNANO 1 "version 2.0.0" "October 28, 2006"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.SH NAME
+rnano \- Restricted mode for Nano's ANOther editor, an enhanced free
+Pico clone
+
+.SH SYNOPSIS
+.B rnano
+.I [OPTIONS]\ [[\+LINE,COLUMN]\ FILE]...
+.br
+
+.SH DESCRIPTION
+This manual page briefly documents the \fBrnano\fP command.
+.PP
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invoke bold face and italics, 
+.\" respectively.
+\fBnano\fP is a small, free and friendly editor which aims to replace
+Pico, the default editor included in the non-free Pine package. Rather
+than just copying Pico's look and feel, \fBnano\fP also implements some
+missing (or disabled by default) features in Pico, such as "search and
+replace" and "go to line and column number".
+.PP
+\fBrnano\fP is a restricted version of \fBnano\fP, which only edits
+specific files and doesn't allow the user access to the filesystem or a
+command shell.
+.PP
+In restricted mode, \fBnano\fP will \fInot\fP:
+.IP \[bu] 2
+read or write to any file not specified on the command line;
+.IP \[bu]
+read any nanorc files;
+.IP \[bu]
+allow suspending;
+.IP \[bu]
+allow a file to be appended to, prepended to, or saved under a different
+name;
+.IP \[bu]
+use backup files or spell checking.
+
+.SH OPTIONS
+.TP
+.B \+\fILINE\fP,\fICOLUMN\fP
+Places cursor at line number \fILINE\fP and column number \fICOLUMN\fP
+(at least one of which must be specified) on startup, instead of the
+default of line 1, column 1.
+.TP
+.B \-?
+Same as \fB-h (\-\-help)\fP.
+.TP
+.B \-h (\-\-help)
+Show a summary of command line options and exit.
+.TP
+.B \-V (\-\-version)
+Show the current version number and exit.
+.PP
+See the \fBnano\fP(1) manpage for the complete documentation of
+\fBnano\fP.
+
+.SH BUGS
+Please send any comments or bug reports to \fBnano@nano-editor.org\fP.
+
+The \fBnano\fP mailing list is available from \fBnano-devel@gnu.org\fP.
+
+To subscribe, email to \fBnano-devel-request@gnu.org\fP with a subject
+of "subscribe".
+
+.SH HOMEPAGE
+http://www.nano-editor.org/
+
+.SH AUTHOR
+Chris Allegretta <chrisa@asty.org>, et al (see AUTHORS for details).
+This manual page was originally written by Thijs Kinkhorst
+<thijs@kinkhorst.com>, for the Debian system (but may be used by
+others).

doc/nanorc.sample

@@ -1,212 +0,0 @@
-## Sample initialization file for GNU nano
-## Please note that you must have configured nano with --enable-nanorc
-## for this file to be read!  Also note that characters specially
-## interpreted by the shell should not be escaped here.
-##
-## To make sure a value is not enabled, use "unset <option>"
-##
-## For the options that take parameters, the default value is given.
-## Other options are unset by default.
-
-## Use auto-indentation
-# set autoindent
-
-## Backup files to filename~
-# set backup
-
-## Constantly display the cursor position in the status bar.
-# set const
-
-## Use cut to end of line with ^K by default
-# set cut
-
-## Set the line length for wrapping text and justifying paragraphs.
-## If fill is negative, the line length will be the screen width less
-## this number.
-##
-# set fill -8
-
-## Enable ~/.nano_history for saving and reading search/replace strings.
-# set historylog
-
-## Allow multiple file buffers (using ^R inserts into separate buffer).
-## You must have configured with --enable-multibuffer or --enable-extra
-## for this to work.
-##
-## set multibuffer
-
-## Don't convert files from DOS/Mac format
-# set noconvert
-
-## Don't follow symlinks when writing files
-# set nofollow
-
-## Don't display the help lists at the bottom of the screen
-# set nohelp
-
-## Don't wrap text at all
-# set nowrap
-
-## Set operating directory.  nano will not read or write files outside
-## this directory and its subdirectories.  Also, the current directory
-## is changed to here, so files are inserted from this dir.  A blank
-## string means the operating directory feature is turned off.
-##
-# set operatingdir ""
-
-## Preserve the XON and XOFF keys (^Q and ^S)
-# set preserve
-
-## The email-quote string, used to justify email-quoted paragraphs.
-## This is an extended regular expression if your system supports them,
-## otherwise a literal string.  Default:
-# set quotestr "^([ 	]*[\|>:}#])+"
-## if you have regexps, otherwise:
-# set quotestr "> "
-## You can get old nano quoted-justify behavior via:
-# set quotestr "(> )+"
-
-## Fix Backspace/Delete confusion problem
-# set rebinddelete
-
-## Do extended regular expression searches by default 
-# set regexp
-
-## Use smooth scrolling as the default
-# set smooth
-
-## Use this spelling checker instead of the internal one.  This option
-## does not properly have a default value.
-##
-# set speller "aspell -c"
-
-## Allow nano to be suspended with ^Z
-# set suspend
-
-## Use this tab size instead of the default; it must be greater than 0
-# set tabsize 8
-
-## Save automatically on exit, don't prompt
-# set tempfile
-
-## Disallow file modification, why would you want this in an rc file? ;)
-# set view
-
-## Color setup
-## Format:
-## syntax "short description" ["filename regex" ...]
-## color foreground,background "regex" ["regex"...]
-##
-## Legal colors: white, black, red, blue, green, yellow, magenta, cyan.
-## You may use the prefix "bright" to mean a stronger color highlight.
-##
-## To use multi-line regexes use the start="regex" end="regex" format.
-##
-## If your system supports transparency, not specifying a background
-## color will use a transparent color.  If you don't want this, be sure
-## to set the background color to black or white.
-##
-# syntax "c-file" "\.(c|h)$"
-# color red "\<[A-Z_]{2,}\>" 
-# color green "\<(float|char|int|void|static|const|struct)\>" 
-# color brightyellow "\<(if|while|do|else|case|switch)\>"
-# color brightcyan "^ *# *(define|include|ifn?def|endif|elif|else|if)" 
-##
-## You will in general want your comments and strings to come last,
-## because syntax highlighting rules will be applied in the order they
-## are read in.
-##
-# color brightyellow "<[^= ]*>" ""(\\.|[^\"])*""
-##
-## This string is VERY resource intensive!!!
-# color brightyellow start=""(\\.|[^\"])*\\ *$" end="^(\\.|[^\"])*""
-##
-## And we want to have some nice comment highlighting too
-# color brightblue "//.*"
-# color brightblue start="/\*" end="\*/"
-
-## Here is a short example for HTML
-# syntax "HTML" "\.html$"
-# color blue start="<" end=">"
-# color red "&[^; ]*;"
-
-## Here is a short example for TeX files
-# syntax "TeX" "\.tex$"
-# color green "\\.|\\[A-Za-z]*"
-# color magenta "[{}]"
-# color blue "%.*"
-
-## Here is an example for quoted emails (under e.g. mutt)
-# syntax "mutt"
-# color green "^>.*"
-
-## Here is an example for groff
-##
-# syntax "groff" "\.ms$" "\.mm$" "\.me$" "\.tmac$" "^tmac." ".rof"
-## The argument of .nr or .ds
-# color cyan "^\.ds [^ ]*"
-# color cyan "^\.nr [^ ]*"
-## Single character escapes
-# color brightmagenta "\\."
-## Highlight the argument of \f or \s in the same color
-# color brightmagenta "\\f."
-# color brightmagenta "\\f\(.."
-# color brightmagenta "\\s(\+|\-)?[0-9]"
-## \n
-# color cyan "(\\|\\\\)n."
-# color cyan "(\\|\\\\)n\(.."
-# color cyan start="(\\|\\\\)n\[" end="]"
-## Requests
-# color brightgreen "^\. *[^ ]*"
-## Comments
-# color yellow "^\.\\\".*$"
-## Strings
-# color green "(\\|\\\\)\*."
-# color green "(\\|\\\\)\*\(.."
-# color green start="(\\|\\\\)\*\[" end="]"
-## Characters
-# color brightred "\\\(.."
-# color brightred start="\\\[" end="]"
-## Macro arguments
-# color brightcyan "\\\\\$[1-9]"
-
-## Here is an example for perl
-##
-# syntax "perl" "\.p[lm]$"
-# color red "\<(accept|alarm|atan2|bin(d|mode)|c(aller|h(dir|mod|op|own|root)|lose(dir)?|onnect|os|rypt)|d(bm(close|open)|efined|elete|ie|o|ump)|e(ach|of|val|x(ec|ists|it|p))|f(cntl|ileno|lock|ork)|get(c|login|peername|pgrp|ppid|priority|pwnam|(host|net|proto|serv)byname|pwuid|grgid|(host|net)byaddr|protobynumber|servbyport)|([gs]et|end)(pw|gr|host|net|proto|serv)ent|getsock(name|opt)|gmtime|goto|grep|hex|index|int|ioctl|join|keys|kill|last|length|link|listen|local(time)?|log|lstat|m|mkdir|msg(ctl|get|snd|rcv)|next|oct|open(dir)?|ord|pack|pipe|pop|printf?|push|q|qq|qx|rand|re(ad(dir|link)?|cv|do|name|quire|set|turn|verse|winddir)|rindex|rmdir|s|scalar|seek|seekdir|se(lect|mctl|mget|mop|nd|tpgrp|tpriority|tsockopt)|shift|shm(ctl|get|read|write)|shutdown|sin|sleep|socket(pair)?|sort|spli(ce|t)|sprintf|sqrt|srand|stat|study|substr|symlink|sys(call|read|tem|write)|tell(dir)?|time|tr|y|truncate|umask|un(def|link|pack|shift)|utime|values|vec|wait(pid)?|wantarray|warn|write)\>"
-# color magenta "\<(continue|else|elsif|do|for|foreach|if|unless|until|while|eq|ne|lt|gt|le|ge|cmp|x|my|sub|use|package|can|isa)\>"
-# color cyan start="[$@%]" end="( |\\W|-)"
-# color yellow "".*"|qq\|.*\|"
-# color white "[sm]/.*/"
-# color white start="(^use| = new)" end=";"
-# color green "#.*"
-# color yellow start="<< 'STOP'" end="STOP"
-
-## Here is an example for Java source
-##
-# syntax "Java source" "\.java$"
-# color green "\<(boolean|byte|char|double|float|int|long|new|short|this|transient|void)\>"
-# color red "\<(break|case|catch|continue|default|do|else|finally|for|if|return|switch|throw|try|while)\>"
-# color cyan "\<(abstract|class|extends|final|implements|import|instanceof|interface|native|package|private|protected|public|static|strictfp|super|synchronized|throws|volatile)\>"
-# color red ""[^\"]*""
-# color yellow "\<(true|false|null)\>"
-# color blue "//.*"
-# color blue start="/\*" end="\*/"
-# color brightblue start="/\*\*" end="\*/"
-# color brightgreen,green " +$"
-
-## Here is an example for your .nanorc
-##
-#syntax "nanorc" "(\.|/|)nanorc$"
-## highlight possible errors and parameters
-#color brightwhite "^ *(set|unset|syntax|color).*$"
-## set, unset and syntax
-#color cyan "^ *(set|unset) +(autoindent|backup|const|cut|fill|historylog|multibuffer|noconvert|nofollow|nohelp|nowrap|operatingdir|preserve|quotestr|rebinddelete|regexp|smooth|speller|suspend|tabsize|tempfile|view)"
-#color green "^ *(set|unset|syntax)\>"
-## colors
-#color yellow "^ *color +(bright)?(white|black|red|blue|green|yellow|magenta|cyan)(,(white|black|red|blue|green|yellow|magenta|cyan))?\>"
-#color magenta "^ *color\>" "\<(start|end)="
-## strings
-#color white "\"(\\.|[^\"])*\""
-## comments
-#color blue "^ *#.*$"

doc/nanorc.sample.in

@@ -0,0 +1,260 @@
+## Sample initialization file for GNU nano.
+##
+## Please note that you must have configured nano with --enable-nanorc
+## for this file to be read!  Also note that this file should not be in
+## DOS or Mac format, and that characters specially interpreted by the
+## shell should not be escaped here.
+##
+## To make sure a value is disabled, use "unset <option>".
+##
+## For the options that take parameters, the default value is given.
+## Other options are unset by default.
+##
+## Quotes inside string parameters don't have to be escaped with
+## backslashes.  The last double quote in the string will be treated as
+## its end.  For example, for the "brackets" option, ""')>]}" will match
+## ", ', ), >, ], and }.
+
+## Use auto-indentation.
+# set autoindent
+
+## Backup files to filename~.
+# set backup
+
+## The directory to put unique backup files in.
+# set backupdir ""
+
+## Do backwards searches by default.
+# set backwards
+
+## Use bold text instead of reverse video text.
+# set boldtext
+
+## The characters treated as closing brackets when justifying
+## paragraphs.  They cannot contain blank characters.  Only closing
+## punctuation, optionally followed by closing brackets, can end
+## sentences.
+##
+# set brackets ""')>]}"
+
+## Do case sensitive searches by default.
+# set casesensitive
+
+## Constantly display the cursor position in the statusbar.  Note that
+## this overrides "quickblank".
+# set const
+
+## Use cut to end of line by default.
+# set cut
+
+## Set the line length for wrapping text and justifying paragraphs.
+## If fill is 0 or less, the line length will be the screen width less
+## this number.
+##
+# set fill -8
+
+## Enable ~/.nano_history for saving and reading search/replace strings.
+# set historylog
+
+## The opening and closing brackets that can be found by bracket
+## searches.  They cannot contain blank characters.  The former set must
+## come before the latter set, and both must be in the same order.
+##
+# set matchbrackets "(<[{)>]}"
+
+## Use the blank line below the titlebar as extra editing space.
+# set morespace
+
+## Enable mouse support, if available for your system.  When enabled,
+## mouse clicks can be used to place the cursor, set the mark (with a
+## double click), and execute shortcuts.  The mouse will work in the X
+## Window System, and on the console when gpm is running.
+##
+# set mouse
+
+## Allow multiple file buffers (inserting a file will put it into a
+## separate buffer).  You must have configured with --enable-multibuffer
+## for this to work.
+##
+# set multibuffer
+
+## Don't convert files from DOS/Mac format.
+# set noconvert
+
+## Don't follow symlinks when writing files.
+# set nofollow
+
+## Don't display the helpful shortcut lists at the bottom of the screen.
+# set nohelp
+
+## Don't add newlines to the ends of files.
+# set nonewlines
+
+## Don't wrap text at all.
+# set nowrap
+
+## Set operating directory.  nano will not read or write files outside
+## this directory and its subdirectories.  Also, the current directory
+## is changed to here, so any files are inserted from this dir.  A blank
+## string means the operating directory feature is turned off.
+##
+# set operatingdir ""
+
+## Preserve the XON and XOFF keys (^Q and ^S).
+# set preserve
+
+## The characters treated as closing punctuation when justifying
+## paragraphs.  They cannot contain blank characters.  Only closing
+## punctuation, optionally followed by closing brackets, can end
+## sentences.
+##
+# set punct "!.?"
+
+## Do quick statusbar blanking.  Statusbar messages will disappear after
+## 1 keystroke instead of 26.  Note that "const" overrides this.
+##
+# set quickblank
+
+## The email-quote string, used to justify email-quoted paragraphs.
+## This is an extended regular expression if your system supports them,
+## otherwise a literal string.  Default:
+# set quotestr "^([ 	]*[#:>\|}])+"
+## if you have extended regular expression support, otherwise:
+# set quotestr "> "
+
+## Fix Backspace/Delete confusion problem.
+# set rebinddelete
+
+## Fix numeric keypad key confusion problem.
+# set rebindkeypad
+
+## Do extended regular expression searches by default.
+# set regexp
+
+## Make the Home key smarter.  When Home is pressed anywhere but at the
+## very beginning of non-whitespace characters on a line, the cursor
+## will jump to that beginning (either forwards or backwards).  If the
+## cursor is already at that position, it will jump to the true
+## beginning of the line.
+# set smarthome
+
+## Use smooth scrolling as the default.
+# set smooth
+
+## Use this spelling checker instead of the internal one.  This option
+## does not properly have a default value.
+##
+# set speller "aspell -x -c"
+
+## Allow nano to be suspended.
+# set suspend
+
+## Use this tab size instead of the default; it must be greater than 0.
+# set tabsize 8
+
+## Convert typed tabs to spaces.
+# set tabstospaces
+
+## Save automatically on exit, don't prompt.
+# set tempfile
+
+## Disallow file modification.  Why would you want this in an rcfile? ;)
+# set view
+
+## The two single-column characters used to display the first characters
+## of tabs and spaces.  187 in ISO 8859-1 (0000BB in Unicode) and 183 in
+## ISO-8859-1 (0000B7 in Unicode) seem to be good values for these.
+# set whitespace "  "
+
+## Detect word boundaries more accurately by treating punctuation
+## characters as parts of words.
+# set wordbounds
+
+
+## Color setup
+##
+## Format:
+##
+## syntax "short description" ["filename regex" ...]
+##
+## The "none" syntax is reserved; specifying it on the command line is
+## the same as not having a syntax at all.  The "default" syntax is
+## special: it takes no filename regexes, and applies to files that
+## don't match any other syntax's filename regexes.
+##
+## color foreground,background "regex" ["regex"...]
+## or
+## icolor foreground,background "regex" ["regex"...]
+##
+## "color" will do case sensitive matches, while "icolor" will do case
+## insensitive matches.
+##
+## Valid colors: white, black, red, blue, green, yellow, magenta, cyan.
+## For foreground colors, you may use the prefix "bright" to get a
+## stronger highlight.
+##
+## To use multi-line regexes, use the start="regex" end="regex"
+## [start="regex" end="regex"...] format.
+##
+## If your system supports transparency, not specifying a background
+## color will use a transparent color.  If you don't want this, be sure
+## to set the background color to black or white.
+##
+## If you wish, you may put your syntaxes in separate files.  You can
+## make use of such files (which can only include "syntax", "color", and
+## "icolor" commands) as follows:
+##
+## include "/path/to/syntax_file.nanorc"
+##
+## Unless otherwise noted, the name of the syntax file (without the
+## ".nanorc" extension) should be the same as the "short description"
+## name inside that file.  These names are kept fairly short to make
+## them easier to remember and faster to type using nano's -Y option.
+##
+## All regexes should be extended regular expressions.
+
+
+## Nanorc files
+# include "@PKGDATADIR@/nanorc.nanorc"
+
+## C/C++
+# include "@PKGDATADIR@/c.nanorc"
+
+## HTML
+# include "@PKGDATADIR@/html.nanorc"
+
+## TeX
+# include "@PKGDATADIR@/tex.nanorc"
+
+## Quoted emails (under e.g. mutt)
+# include "@PKGDATADIR@/mutt.nanorc"
+
+## Patch files
+# include "@PKGDATADIR@/patch.nanorc"
+
+## Manpages
+# include "@PKGDATADIR@/man.nanorc"
+
+## Groff
+# include "@PKGDATADIR@/groff.nanorc"
+
+## Perl
+# include "@PKGDATADIR@/perl.nanorc"
+
+## Python
+# include "@PKGDATADIR@/python.nanorc"
+
+## Ruby
+# include "@PKGDATADIR@/ruby.nanorc"
+
+## Java
+# include "@PKGDATADIR@/java.nanorc"
+
+## Assembler
+# include "@PKGDATADIR@/asm.nanorc"
+
+## Bourne shell scripts
+# include "@PKGDATADIR@/sh.nanorc"
+
+## POV-Ray
+# include "@PKGDATADIR@/pov.nanorc"

doc/syntax/.cvsignore

@@ -0,0 +1,2 @@
+Makefile
+Makefile.in

doc/syntax/Makefile.am

@@ -0,0 +1,17 @@
+pkgdata_DATA =	asm.nanorc \
+		c.nanorc \
+		groff.nanorc \
+		html.nanorc \
+		java.nanorc \
+		man.nanorc \
+		mutt.nanorc \
+		nanorc.nanorc \
+		patch.nanorc \
+		perl.nanorc \
+		pov.nanorc \
+		python.nanorc \
+		ruby.nanorc \
+		sh.nanorc \
+		tex.nanorc
+
+EXTRA_DIST = $(pkgdata_DATA)

doc/syntax/asm.nanorc

@@ -0,0 +1,15 @@
+## Here is an example for assembler.
+##
+syntax "asm" "\.(S|s|asm)$"
+color red "\<[A-Z_]{2,}\>"
+color brightgreen "\.(data|subsection|text)"
+color green "\.(align|file|globl|global|hidden|section|size|type|weak)"
+color brightyellow "\.(ascii|asciz|byte|double|float|hword|int|long|short|single|struct|word)"
+icolor brightred "^[[:space:]]*[.0-9A-Z_]*:"
+color brightcyan "^[[:space:]]*#[[:space:]]*(define|undef|include|ifn?def|endif|elif|else|if|warning|error)"
+## Highlight strings (note: VERY resource intensive)
+color brightyellow "<[^= 	]*>" ""(\\.|[^"])*""
+color brightyellow start=""(\\.|[^"])*\\[[:space:]]*$" end="^(\\.|[^"])*""
+## Highlight comments
+color brightblue "//.*"
+color brightblue start="/\*" end="\*/"

doc/syntax/c.nanorc

@@ -0,0 +1,27 @@
+## Here is an example for C/C++.
+##
+syntax "c" "\.(c(c|pp|xx)?|C)$" "\.(h(h|pp|xx)?|H)$" "\.ii?$"
+color brightred "\<[A-Z_][0-9A-Z_]+\>" 
+color green "\<(float|double|bool|char|int|short|long|sizeof|enum|void|static|const|struct|union|typedef|extern|(un)?signed|inline)\>"
+color green "\<((s?size)|((u_?)?int(8|16|32|64|ptr)))_t\>"
+color green "\<(class|namespace|template|public|protected|private|typename|this|friend|virtual|using|mutable|volatile|register|explicit)\>"
+color brightyellow "\<(for|if|while|do|else|case|default|switch)\>"
+color brightyellow "\<(try|throw|catch|operator|new|delete)\>"
+color magenta "\<(goto|continue|break|return)\>"
+color brightcyan "^[[:space:]]*#[[:space:]]*(define|include|(un|ifn?)def|endif|el(if|se)|if|warning|error)"
+color brightmagenta "'([^'\]|(\\["'abfnrtv\\]))'" "'\\(([0-3]?[0-7]{1,2}))'" "'\\x[0-9A-Fa-f]{1,2}'"
+##
+## GCC builtins
+color cyan "__attribute__[[:space:]]*\(\([^)]*\)\)" "__(aligned|asm|builtin|hidden|inline|packed|restrict|section|typeof|weak)__"
+##
+## String highlighting.  You will in general want your comments and
+## strings to come last, because syntax highlighting rules will be
+## applied in the order they are read in.
+color brightyellow "<[^= 	]*>" ""(\\.|[^"])*""
+##
+## This string is VERY resource intensive!
+color brightyellow start=""(\\.|[^"])*\\[[:space:]]*$" end="^(\\.|[^"])*""
+
+## Comment highlighting
+color brightblue "//.*"
+color brightblue start="/\*" end="\*/"

doc/syntax/groff.nanorc

@@ -0,0 +1,24 @@
+## Here is an example for groff.
+##
+syntax "groff" "\.m[ems]$" "\.rof" "\.tmac$" "^tmac."
+## The argument of .ds or .nr
+color cyan "^\.(ds|nr) [^[[:space:]]]*"
+## Single character escapes
+color brightmagenta "\\."
+## Highlight the argument of \f or \s in the same color
+color brightmagenta "\\f." "\\f\(.." "\\s(\+|\-)?[0-9]"
+## Newlines
+color cyan "(\\|\\\\)n(.|\(..)"
+color cyan start="(\\|\\\\)n\[" end="]"
+## Requests
+color brightgreen "^\.[[:space:]]*[^[[:space:]]]*"
+## Comments
+color yellow "^\.\\".*$"
+## Strings
+color green "(\\|\\\\)\*(.|\(..)"
+color green start="(\\|\\\\)\*\[" end="]"
+## Characters
+color brightred "\\\(.."
+color brightred start="\\\[" end="]"
+## Macro arguments
+color brightcyan "\\\\\$[1-9]"

doc/syntax/html.nanorc

@@ -0,0 +1,5 @@
+## Here is a short example for HTML.
+##
+syntax "html" "\.html$"
+color blue start="<" end=">"
+color red "&[^;[[:space:]]]*;"

doc/syntax/java.nanorc

@@ -0,0 +1,12 @@
+## Here is an example for Java.
+##
+syntax "java" "\.java$"
+color green "\<(boolean|byte|char|double|float|int|long|new|short|this|transient|void)\>"
+color red "\<(break|case|catch|continue|default|do|else|finally|for|if|return|switch|throw|try|while)\>"
+color cyan "\<(abstract|class|extends|final|implements|import|instanceof|interface|native|package|private|protected|public|static|strictfp|super|synchronized|throws|volatile)\>"
+color red ""[^"]*""
+color yellow "\<(true|false|null)\>"
+color blue "//.*"
+color blue start="/\*" end="\*/"
+color brightblue start="/\*\*" end="\*/"
+color ,green "[[:space:]]+$"

doc/syntax/man.nanorc

@@ -0,0 +1,9 @@
+## Here is an example for manpages.
+##
+syntax "man" "\.[1-9]x?$"
+color green "\.(S|T)H.*$"
+color brightgreen "\.(S|T)H" "\.TP"
+color brightred "\.(BR?|I[PR]?).*$"
+color brightblue "\.(BR?|I[PR]?|PP)"
+color brightwhite "\\f[BIPR]"
+color yellow "\.(br|DS|RS|RE|PD)"

doc/syntax/mutt.nanorc

@@ -0,0 +1,4 @@
+## Here is an example for quoted emails (under e.g. mutt).
+##
+syntax "mutt"
+color green "^>.*"

doc/syntax/nanorc.nanorc

@@ -0,0 +1,16 @@
+## Here is an example for nanorc files.
+##
+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 green "^[[:space:]]*(set|unset|include|syntax)\>"
+## Colors
+icolor yellow "^[[:space:]]*i?color[[:space:]]*(bright)?(white|black|red|blue|green|yellow|magenta|cyan)?(,(white|black|red|blue|green|yellow|magenta|cyan))?\>"
+icolor magenta "^[[:space:]]*i?color\>" "\<(start|end)="
+## Strings
+icolor white ""(\\.|[^"])*""
+## Comments
+icolor brightblue "^[[:space:]]*#.*$"
+icolor cyan "^[[:space:]]*##.*$"

doc/syntax/patch.nanorc

@@ -0,0 +1,10 @@
+## Here is an example for patch files.
+##
+syntax "patch" "\.(patch|diff)$"
+color brightgreen "^\+.*"
+color green "^\+\+\+.*"
+color brightblue "^ .*"
+color brightred "^-.*"
+color red "^---.*"
+color brightyellow "^@@.*"
+color magenta "^diff.*"

doc/syntax/perl.nanorc

@@ -0,0 +1,11 @@
+## Here is an example for Perl.
+##
+syntax "perl" "\.p[lm]$"
+color red "\<(accept|alarm|atan2|bin(d|mode)|c(aller|h(dir|mod|op|own|root)|lose(dir)?|onnect|os|rypt)|d(bm(close|open)|efined|elete|ie|o|ump)|e(ach|of|val|x(ec|ists|it|p))|f(cntl|ileno|lock|ork))\>" "\<(get(c|login|peername|pgrp|ppid|priority|pwnam|(host|net|proto|serv)byname|pwuid|grgid|(host|net)byaddr|protobynumber|servbyport)|([gs]et|end)(pw|gr|host|net|proto|serv)ent|getsock(name|opt)|gmtime|goto|grep|hex|index|int|ioctl|join)\>" "\<(keys|kill|last|length|link|listen|local(time)?|log|lstat|m|mkdir|msg(ctl|get|snd|rcv)|next|oct|open(dir)?|ord|pack|pipe|pop|printf?|push|q|qq|qx|rand|re(ad(dir|link)?|cv|do|name|quire|set|turn|verse|winddir)|rindex|rmdir|s|scalar|seek(dir)?)\>" "\<(se(lect|mctl|mget|mop|nd|tpgrp|tpriority|tsockopt)|shift|shm(ctl|get|read|write)|shutdown|sin|sleep|socket(pair)?|sort|spli(ce|t)|sprintf|sqrt|srand|stat|study|substr|symlink|sys(call|read|tem|write)|tell(dir)?|time|tr(y)?|truncate|umask)\>" "\<(un(def|link|pack|shift)|utime|values|vec|wait(pid)?|wantarray|warn|write)\>"
+color magenta "\<(continue|else|elsif|do|for|foreach|if|unless|until|while|eq|ne|lt|gt|le|ge|cmp|x|my|sub|use|package|can|isa)\>"
+icolor cyan start="[$@%]" end="( |[^0-9A-Z_]|-)"
+color yellow "".*"|qq\|.*\|"
+color white "[sm]/.*/"
+color white start="(^use| = new)" end=";"
+color green "#.*"
+color yellow start="<< 'STOP'" end="STOP"

doc/syntax/pov.nanorc

@@ -0,0 +1,15 @@
+## Here is an example for POV-Ray.
+##
+syntax "pov" "\.(pov|POV|povray|POVRAY)$"
+color brightcyan "^[[:space:]]*#[[:space:]]*(declare)"
+color brightyellow "\<(sphere|cylinder|translate|matrix|rotate|scale)\>"
+color brightyellow "\<(orthographic|location|up|right|direction|clipped_by)\>"
+color brightyellow "\<(fog_type|fog_offset|fog_alt|rgb|distance|transform)\>"
+color brightred "^\<(texture)\>"
+color brightred "\<(light_source|background)\>"
+color brightred "\<(fog|object|camera)\>"
+color green "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)"
+color brightmagenta "\<(union|group|subgroup)\>"
+## Comment highlighting
+color brightblue "//.*"
+color brightblue start="/\*" end="\*/"

doc/syntax/python.nanorc

@@ -0,0 +1,9 @@
+## Here is an example for Python.
+##
+syntax "python" "\.py$"
+icolor brightblue "def [0-9A-Z_]+"
+color brightcyan "\<(and|assert|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|map|not|or|pass|print|raise|return|try|while)\>"
+color brightgreen "['][^']*[^\\][']" "[']{3}.*[^\\][']{3}"
+color brightgreen "["][^"]*[^\\]["]" "["]{3}.*[^\\]["]{3}"
+color brightgreen start=""""[^"]" end=""""" start="'''[^']" end="'''"
+color brightred "#.*$"

doc/syntax/ruby.nanorc

@@ -0,0 +1,30 @@
+## Here is an example for Ruby.
+##
+syntax "ruby" "\.rb$"
+## Asciibetical list of reserved words
+color yellow "\<(BEGIN|END|alias|and|begin|break|case|class|def|defined\?|do|else|elsif|end|ensure|false|for|if|in|module|next|nil|not|or|redo|rescue|retry|return|self|super|then|true|undef|unless|until|when|while|yield)\>"
+## Constants
+color brightblue "(\$|@|@@)?\<[A-Z]+[0-9A-Z_a-z]*"
+## Ruby "symbols"
+icolor magenta "([ 	]|^):[0-9A-Z_]+\>"
+## Some unique things we want to stand out
+color brightyellow "\<(__FILE__|__LINE__)\>"
+## Regular expressions
+color brightmagenta "/([^/]|(\\/))*/[iomx]*" "%r\{([^}]|(\\}))*\}[iomx]*"
+## Shell command expansion is in `backticks` or like %x{this}.  These are
+## "double-quotish" (to use a perlism).
+color brightblue "`[^`]*`" "%x\{[^}]*\}"
+## Strings, double-quoted
+color green ""([^"]|(\\"))*"" "%[QW]?\{[^}]*\}" "%[QW]?\([^)]*\)" "%[QW]?<[^>]*>" "%[QW]?\[[^]]*\]" "%[QW]?\$[^$]*\$" "%[QW]?\^[^^]*\^" "%[QW]?![^!]*!"
+## Expression substitution.  These go inside double-quoted strings,
+## "like #{this}".
+color brightgreen "#\{[^}]*\}"
+## Strings, single-quoted
+color green "'([^']|(\\'))*'" "%[qw]\{[^}]*\}" "%[qw]\([^)]*\)" "%[qw]<[^>]*>" "%[qw]\[[^]]*\]" "%[qw]\$[^$]*\$" "%[qw]\^[^^]*\^" "%[qw]![^!]*!"
+## Comments
+color cyan "#[^{].*$" "#$"
+color brightcyan "##[^{].*$" "##$"
+## "Here" docs
+color green start="<<-?'?EOT'?" end="^EOT"
+## Some common markers
+color brightcyan "(XXX|TODO|FIXME|\?\?\?)"

doc/syntax/sh.nanorc

@@ -0,0 +1,12 @@
+## Here is an example for Bourne shell scripts.
+##
+syntax "sh" "\.sh$"
+icolor brightgreen "^[0-9A-Z_]+\(\)"
+color green "\<(case|do|done|elif|else|esac|exit|fi|for|function|if|in|local|read|return|select|shift|then|time|until|while)\>"
+color green "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)"
+color green "-[Ldefgruwx]\>"
+color green "-(eq|ne|gt|lt|ge|le|s|n|z)\>"
+color brightblue "\<(cat|cd|chmod|chown|cp|echo|env|export|grep|install|let|ln|make|mkdir|mv|rm|sed|set|tar|touch|umask|unset)\>"
+icolor brightred "\$\{?[0-9A-Z_!@#$*?-]+\}?"
+color cyan "(^|[[:space:]])#.*$"
+color brightyellow ""(\\.|[^"])*"" "'(\\.|[^'])*'"

doc/syntax/tex.nanorc

@@ -0,0 +1,6 @@
+## Here is a short example for TeX files.
+##
+syntax "tex" "\.tex$"
+icolor green "\\.|\\[A-Z]*"
+color magenta "[{}]"
+color blue "%.*"

doc/texinfo/.cvsignore

@@ -1,4 +1,5 @@
 Makefile
 Makefile.in
 nano.info
+nano.html
 texinfo.tex

doc/texinfo/Makefile.am

@@ -1,5 +1,10 @@
-
 info_TEXINFOS = nano.texi
+
 MAKEINFO = makeinfo --no-split
 
-EXTRA_DIST = nano.info
+BUILT_SOURCES = nano.html
+
+nano.html: nano.texi
+	makeinfo --no-split --html < $< > $@
+
+EXTRA_DIST = $(info_TEXINFOS) $(BUILT_SOURCES)

m4/Makefile.am

@@ -1,4 +1,5 @@
-EXTRA_DIST = ulonglong.m4 intdiv0.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 \
-	     stdint_h.m4 uintmax_t.m4 isc-posix.m4 lib-ld.m4 lib-link.m4 \
-	     lib-prefix.m4 codeset.m4 glibc21.m4 progtest.m4 gettext.m4 \
-	     iconv.m4 lcmessage.m4
+EXTRA_DIST = ac_define_dir.m4 codeset.m4 gettext.m4 glib-2.0.m4 \
+		glibc21.m4 iconv.m4 intdiv0.m4 inttypes_h.m4 \
+		inttypes.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 \
+		lib-ld.m4 lib-link.m4 lib-prefix.m4 progtest.m4 \
+		stdint_h.m4 uintmax_t.m4 ulonglong.m4

m4/ac_define_dir.m4

@@ -0,0 +1,34 @@
+dnl @synopsis AC_DEFINE_DIR(VARNAME, DIR [, DESCRIPTION])
+dnl
+dnl This macro sets VARNAME to the expansion of the DIR variable,
+dnl taking care of fixing up ${prefix} and such.
+dnl
+dnl VARNAME is then offered as both an output variable and a C
+dnl preprocessor symbol.
+dnl
+dnl Example:
+dnl
+dnl    AC_DEFINE_DIR([DATADIR], [datadir], [Where data are placed to.])
+dnl
+dnl @category Misc
+dnl @author Stepan Kasal <kasal@ucw.cz>
+dnl @author Andreas Schwab <schwab@suse.de>
+dnl @author Guido U. Draheim <guidod@gmx.de>
+dnl @author Alexandre Oliva
+dnl @version 2006-10-13
+dnl @license AllPermissive
+
+AC_DEFUN([AC_DEFINE_DIR], [
+  prefix_NONE=
+  exec_prefix_NONE=
+  test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
+  test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
+dnl In Autoconf 2.60, ${datadir} refers to ${datarootdir}, which in turn
+dnl refers to ${prefix}.  Thus we have to use `eval' twice.
+  eval ac_define_dir="\"[$]$2\""
+  eval ac_define_dir="\"$ac_define_dir\""
+  AC_SUBST($1, "$ac_define_dir")
+  AC_DEFINE_UNQUOTED($1, "$ac_define_dir", [$3])
+  test "$prefix_NONE" && prefix=NONE
+  test "$exec_prefix_NONE" && exec_prefix=NONE
+])

m4/glib-2.0.m4

@@ -0,0 +1,215 @@
+# Configure paths for GLIB
+# Owen Taylor     1997-2001
+
+dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
+dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject or 
+dnl gthread is specified in MODULES, pass to pkg-config
+dnl
+AC_DEFUN([AM_PATH_GLIB_2_0],
+[dnl 
+dnl Get the cflags and libraries from pkg-config
+dnl
+AC_ARG_ENABLE(glibtest, [  --disable-glibtest      do not try to compile and run a test GLIB program],
+		    , enable_glibtest=yes)
+
+  pkg_config_args=glib-2.0
+  for module in . $4
+  do
+      case "$module" in
+         gmodule) 
+             pkg_config_args="$pkg_config_args gmodule-2.0"
+         ;;
+         gmodule-no-export) 
+             pkg_config_args="$pkg_config_args gmodule-no-export-2.0"
+         ;;
+         gobject) 
+             pkg_config_args="$pkg_config_args gobject-2.0"
+         ;;
+         gthread) 
+             pkg_config_args="$pkg_config_args gthread-2.0"
+         ;;
+      esac
+  done
+
+  AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+
+  no_glib=""
+
+  if test x$PKG_CONFIG != xno ; then
+    if $PKG_CONFIG --atleast-pkgconfig-version 0.7 ; then
+      :
+    else
+      echo *** pkg-config too old; version 0.7 or better required.
+      no_glib=yes
+      PKG_CONFIG=no
+    fi
+  else
+    no_glib=yes
+  fi
+
+  min_glib_version=ifelse([$1], ,2.0.0,$1)
+  AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
+
+  if test x$PKG_CONFIG != xno ; then
+    ## don't try to run the test against uninstalled libtool libs
+    if $PKG_CONFIG --uninstalled $pkg_config_args; then
+	  echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH"
+	  enable_glibtest=no
+    fi
+
+    if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then
+	  :
+    else
+	  no_glib=yes
+    fi
+  fi
+
+  if test x"$no_glib" = x ; then
+    GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
+    GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0`
+    GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
+
+    GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args`
+    GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args`
+    glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+    glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+    glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+    if test "x$enable_glibtest" = "xyes" ; then
+      ac_save_CFLAGS="$CFLAGS"
+      ac_save_LIBS="$LIBS"
+      CFLAGS="$CFLAGS $GLIB_CFLAGS"
+      LIBS="$GLIB_LIBS $LIBS"
+dnl
+dnl Now check if the installed GLIB is sufficiently new. (Also sanity
+dnl checks the results of pkg-config to some extent)
+dnl
+      rm -f conf.glibtest
+      AC_TRY_RUN([
+#include <glib.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+int 
+main ()
+{
+  int major, minor, micro;
+  char *tmp_version;
+
+  system ("touch conf.glibtest");
+
+  /* HP/UX 9 (%@#!) writes to sscanf strings */
+  tmp_version = g_strdup("$min_glib_version");
+  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
+     printf("%s, bad version string\n", "$min_glib_version");
+     exit(1);
+   }
+
+  if ((glib_major_version != $glib_config_major_version) ||
+      (glib_minor_version != $glib_config_minor_version) ||
+      (glib_micro_version != $glib_config_micro_version))
+    {
+      printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", 
+             $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
+             glib_major_version, glib_minor_version, glib_micro_version);
+      printf ("*** was found! If pkg-config was correct, then it is best\n");
+      printf ("*** to remove the old version of GLib. You may also be able to fix the error\n");
+      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
+      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
+      printf("*** required on your system.\n");
+      printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
+      printf("*** to point to the correct configuration files\n");
+    } 
+  else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
+	   (glib_minor_version != GLIB_MINOR_VERSION) ||
+           (glib_micro_version != GLIB_MICRO_VERSION))
+    {
+      printf("*** GLIB header files (version %d.%d.%d) do not match\n",
+	     GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
+      printf("*** library (version %d.%d.%d)\n",
+	     glib_major_version, glib_minor_version, glib_micro_version);
+    }
+  else
+    {
+      if ((glib_major_version > major) ||
+        ((glib_major_version == major) && (glib_minor_version > minor)) ||
+        ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
+      {
+        return 0;
+       }
+     else
+      {
+        printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n",
+               glib_major_version, glib_minor_version, glib_micro_version);
+        printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n",
+	       major, minor, micro);
+        printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
+        printf("***\n");
+        printf("*** If you have already installed a sufficiently new version, this error\n");
+        printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
+        printf("*** being found. The easiest way to fix this is to remove the old version\n");
+        printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n");
+        printf("*** correct copy of pkg-config. (In this case, you will have to\n");
+        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
+        printf("*** so that the correct libraries are found at run-time))\n");
+      }
+    }
+  return 1;
+}
+],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+     fi
+  fi
+  if test "x$no_glib" = x ; then
+     AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version))
+     ifelse([$2], , :, [$2])     
+  else
+     AC_MSG_RESULT(no)
+     if test "$PKG_CONFIG" = "no" ; then
+       echo "*** A new enough version of pkg-config was not found."
+       echo "*** See http://www.freedesktop.org/software/pkgconfig/"
+     else
+       if test -f conf.glibtest ; then
+        :
+       else
+          echo "*** Could not run GLIB test program, checking why..."
+          ac_save_CFLAGS="$CFLAGS"
+          ac_save_LIBS="$LIBS"
+          CFLAGS="$CFLAGS $GLIB_CFLAGS"
+          LIBS="$LIBS $GLIB_LIBS"
+          AC_TRY_LINK([
+#include <glib.h>
+#include <stdio.h>
+],      [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
+        [ echo "*** The test program compiled, but did not run. This usually means"
+          echo "*** that the run-time linker is not finding GLIB or finding the wrong"
+          echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
+          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+          echo "*** is required on your system"
+	  echo "***"
+          echo "*** If you have an old version installed, it is best to remove it, although"
+          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
+        [ echo "*** The test program failed to compile or link. See the file config.log for the"
+          echo "*** exact error that occured. This usually means GLIB is incorrectly installed."])
+          CFLAGS="$ac_save_CFLAGS"
+          LIBS="$ac_save_LIBS"
+       fi
+     fi
+     GLIB_CFLAGS=""
+     GLIB_LIBS=""
+     GLIB_GENMARSHAL=""
+     GOBJECT_QUERY=""
+     GLIB_MKENUMS=""
+     ifelse([$3], , :, [$3])
+  fi
+  AC_SUBST(GLIB_CFLAGS)
+  AC_SUBST(GLIB_LIBS)
+  AC_SUBST(GLIB_GENMARSHAL)
+  AC_SUBST(GOBJECT_QUERY)
+  AC_SUBST(GLIB_MKENUMS)
+  rm -f conf.glibtest
+])

nano.spec.in

@@ -1,44 +1,39 @@
 %define name	@PACKAGE@
-%define ver	@VERSION@
-%define rel	1
+%define version	@VERSION@
+%define release	1
 
 Summary	: Pico editor clone with enhancements
 Name		: %{name}
-Version		: %{ver}
-Release		: %{rel}
-Copyright	: GPL
-Group		: Console/Editors
-URL		: http://www.nano-editor.org
-Source		: http://www.nano-editor.org/dist/v1.3/%{name}-%{ver}.tar.gz
-BuildRoot	: /var/tmp/%{name}-buildroot
-Requires	: ncurses
+Version		: %{version}
+Release		: %{release}
+License		: GPL
+Group		: Applications/Editors
+URL		: http://www.nano-editor.org/
+Source		: http://www.nano-editor.org/dist/v2.0/%{name}-%{version}.tar.gz
+BuildRoot	: %{_tmppath}/%{name}-%{version}-root
+BuildRequires	: autoconf, automake, gettext-devel, ncurses-devel
 
 %description
-GNU nano is a small and friendly text editor.  It aims to emulate the Pico
-text editor while also offering a few enhancements.
+GNU nano is a small and friendly text editor.  It aims to emulate the
+Pico text editor while also offering a few enhancements.
 
 %prep
 %setup -q
 
 %build
 %configure --enable-all
-make RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
+make
 
 %install
-rm -rf "$RPM_BUILD_ROOT"
-make DESTDIR="$RPM_BUILD_ROOT" install
+rm -rf %{buildroot}
+make DESTDIR="%{buildroot}" install
 
 %files
 %defattr(-,root,root)
 %doc AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README THANKS TODO doc/faq.html doc/nanorc.sample
-%{_bindir}/nano
-%{_mandir}/*/*
-%{_datadir}/locale/*/LC_MESSAGES/nano.mo
+%{_bindir}/*
+%{_mandir}/man*/*
+%{_mandir}/fr/man*/*
 %{_infodir}/nano.info*
-
-%changelog
-* Sat Mar 30 2002 Chris Allegretta <chrisa@asty.org>
-- Accepted into main distribution
-- Added Packager and URL tage from original spec file.
-* Tue Mar 06 2002 Brett Pemberton <generica@email.com>
-- Initial spec-file
+%{_datadir}/locale/*/LC_MESSAGES/nano.mo
+%{_datadir}/nano/*

po/ChangeLog

@@ -1,3 +1,407 @@
+2007-01-29  David Lawrence Ramsey  <pooka109@cox.net>
+
+	* ru.po: Updated Russian translation by Dimitriy Ryazantcev.
+	* ru.po: Fix incorrect "Project-Id-Version" entry and misplaced
+	space.
+
+2007-01-13  David Lawrence Ramsey  <pooka109@cox.net>
+
+	* es.po: Fix misplaced space.
+	* eu.po: Fix typos and misplaced space.
+	* fr.po: Fix misplaced space.
+	* gl.po: Fix typos and misplaced space.
+	* nb.po: Fix typos and more misplaced space.
+
+2007-01-06  David Lawrence Ramsey  <pooka109@cox.net>
+
+	* nb.po: Fix misplaced space.
+
+2006-12-06  David Lawrence Ramsey  <pooka109@cox.net>
+
+	* hu.po: Removed unneeded duplicate plural forms again.
+	* ms.po: Fix incorrect "Project-Id-Version" entry.
+
+2006-12-06  Jordi Mallach <jordi@gnu.org>
+
+	* hu.po: Updated Hungarian translation by Gabor Kelemen.
+	* ms.po: Updated Malay translation by
+	Sharuzzaman Ahmat Raslan.
+
+2006-11-20  David Lawrence Ramsey  <pooka109@cox.net>
+
+	* tr.po: Removed unneeded blank plural forms, as gettext 0.15
+	generates errors upon encountering them.
+
+2006-10-25  Jordi Mallach  <jordi@gnu.org>
+
+	* fr.po: Updated French translation by Jean-Philippe Guérard.
+	* nb.po: Updated Norwegian bokmål translation by
+	Geir Helland.
+
+2006-10-16  Jordi Mallach  <jordi@gnu.org>
+
+	* gl.po: Updated Galician translation by
+	Francisco Javier Tsao Santín.
+
+2006-10-16  Jordi Mallach  <jordi@gnu.org>
+
+	* eu.po: Updated Basque translation by Mikel Olasagasti.
+
+2006-10-10  Jordi Mallach  <jordi@gnu.org>
+
+	* gl.po: Updated Galician translation by
+	Francisco Javier Tsao Santín.
+
+2006-10-02  Jordi Mallach  <jordi@gnu.org>
+
+	* pt_BR.po: Refetch the current nano 1.9.99pre0 pt_BR file from
+	the TP, as the latest file offered is apparently for 1.3.11pre1.
+
+2006-10-02  David Lawrence Ramsey  <pooka109@cox.net>
+
+	* pt_BR.po: Restore previous version of pt_BR, as it was for
+	nano 1.9.99pre0, and the current version is for 1.3.11pre1.
+
+2006-09-27  Jordi Mallach  <jordi@gnu.org>
+
+	* pt_BR.po: Updated Brazilian Portuguese translation by
+	Joao Victor Duarte Martins.
+
+2006-09-10  David Lawrence Ramsey  <pooka109@cox.net>
+
+	* hu.po: Removed unneeded duplicate plural forms again.
+
+2006-09-10  Jordi Mallach  <jordi@gnu.org>
+
+	* hu.po: Updated Hungarian translation by Gabor Kelemen.
+
+2006-09-02  Jordi Mallach  <jordi@gnu.org>
+
+	* pt_BR.po: Updated Brazilian Portuguese translation by
+	Joao Victor Duarte Martins.
+
+2006-09-01  Benno Schulenberg  <bensberg@justemail.net>
+
+	* ChangeLog: Fix incorrect years in two entries.
+
+2006-08-31  David Lawrence Ramsey  <pooka109@cox.net>
+
+	* bg.po: Fix misplaced space.
+
+2006-08-31  Jordi Mallach  <jordi@gnu.org>
+
+	* ca.po: Updated Catalan translation.
+	* de.po: Updated German translation by Michael Piefel.
+	* es.po: Updated Spanish translation by
+	Ricardo Javier Cardenes Medina.
+
+2006-08-28  Jordi Mallach  <jordi@gnu.org>
+
+	* fr.po: Updated French translation by Jean-Philippe Guérard.
+
+2006-08-25  Jordi Mallach  <jordi@gnu.org>
+
+	* bg.po: Updated Bulgarian translation by Anton Zinoviev.
+	* ca.po: Updated Catalan translation.
+	* ga.po: Updated Irish translation by Kevin Patrick Scannell.
+	* it.po: Updated Italian translation by Marco Colombo.
+	* nl.po: Updated Dutch translation by Benno Schulenberg.
+	* sv.po: Updated Swedish translation by Daniel Nylander.
+
+2006-08-15  David Lawrence Ramsey  <pooka109@cox.net>
+
+	* hu.po: Removed unneeded duplicate plural forms, as gettext
+	0.15 generates errors upon encountering them.
+	* id.po: Removed unneeded duplicate plural forms, as gettext
+	0.15 generates errors upon encountering them.
+
+2006-06-20  Jordi Mallach  <jordi@gnu.org>
+
+	* ca.po: Updated Catalan translation.
+	* fr.po: Updated French translation by Jean-Philippe Guérard.
+	* hu.po: Updated Hungarian translation by Gabor Kelemen.
+	* nl.po: Updated Dutch translation by Benno Schulenberg.
+
+2006-06-20  David Lawrence Ramsey  <pooka109@cox.net>
+
+	* fr.po: Fix incorrect "Project-Id-Version" entry.
+	* hu.po: Fix incorrect "Project-Id-Version" entry.
+	* it.po: Fix incorrect "Project-Id-Version" entry.
+
+2006-06-19  Jordi Mallach  <jordi@gnu.org>
+
+	* bg.po: Updated Bulgarian translation by Anton Zinoviev.
+	* ga.po: Updated Irish translation by Kevin Patrick Scannell.
+
+2006-06-17  Jordi Mallach  <jordi@gnu.org>
+
+	* ca.po: Updated Catalan translation.
+	* de.po: Updated German translation by Michael Piefel.
+	* fr.po: Updated French translation by Jean-Philippe Guérard.
+	* hu.po: Updated Hungarian translation by Gabor Kelemen.
+	* it.po: Updated Italian translation by Marco Colombo.
+	* nl.po: Updated Dutch translation by Benno Schulenberg.
+
+2006-06-12  Jordi Mallach  <jordi@gnu.org>
+
+	* fr.po: Updated French translation by Jean-Philippe Guérard.
+	* hu.po: Updated Hungarian translation by Gabor Kelemen.
+
+2006-06-09  Jordi Mallach  <jordi@gnu.org>
+
+	* ca.po: Updated Catalan translation.
+	* ga.po: Updated Irish translation by Kevin Patrick Scannell.
+	* it.po: Updated Italian translation by Marco Colombo.
+	* nl.po: Updated Dutch translation by Benno Schulenberg.
+
+2006-05-17  Jordi Mallach  <jordi@gnu.org>
+
+	* LINGUAS: Added "ga".
+	* ga.po: New Irish translation by
+	Kevin Patrick Scannell <scannell@SLU.EDU>.
+
+2006-05-10  Jordi Mallach  <jordi@gnu.org>
+
+	* nl.po: Updated Dutch translation by Benno Schulenberg.
+
+2006-03-15  Jordi Mallach  <jordi@gnu.org>
+
+	* sv.po: Updated Swedish translation by Daniel Nylander.
+
+2006-03-06  Jordi Mallach  <jordi@gnu.org>
+
+	* ca.po: Updated Vietnamese translation by
+	Phan Vinh Thinh.
+
+2005-12-21  Jordi Mallach  <jordi@gnu.org>
+
+	* bg.po: Updated Bulgarian translation by Anton Zinoviev.
+	* ca.po: Updated Catalan translation.
+	* fr.po: Updated French translation by Jean-Philippe Guérard.
+	* ms.po: Updated Malay translation by Sharuzzaman Ahmat Raslan.
+	* zh_TW: Updated Traditional Chinese translation by
+	Wei-Lun Chao.
+
+2005-12-13  Jordi Mallach  <jordi@gnu.org>
+
+	* it.po: Updated Italian translation by Marco Colombo.
+	* de.po: Updated German translation by Michael Piefel.
+	* nl.po: Updated Dutch translation by Benno Schulenberg.
+
+2005-11-08  David Lawrence Ramsey  <pooka109@cox.net>
+
+	* POTFILES.in: Add prompt.c.
+
+2005-11-05  David Lawrence Ramsey  <pooka109@cox.net>
+
+	* POTFILES.in: Add browser.c.
+
+2005-11-01  David Lawrence Ramsey  <pooka109@cox.net>
+
+	* POTFILES.in: Add help.c.
+
+2005-10-23  Jordi Mallach  <jordi@gnu.org>
+
+	* ca.po: Updated Catalan translation.
+	* eu.po: Updated Basque translation by Mikel Olasagasti.
+	* fr.po: Updated French translation by Jean-Philippe Guérard.
+	* it.po: Updated Italian translation by Marco Colombo.
+	* ms.po: Updated Malay translation by Sharuzzaman Ahmat Raslan.
+	* nl.po: Updated Dutch translation by Benno Schulenberg.
+	* zh_TW: Updated Traditional Chinese translation by
+	Wei-Lun Chao.
+	
+2005-08-22  Jordi Mallach  <jordi@gnu.org>
+	* bg.po: New Bulgarian translation by
+	Yavor Doganov <yavor@doganov.org>.
+
+	* LINGUAS: Added "bg".
+
+2005-08-16  Jordi Mallach  <jordi@gnu.org>
+
+	* ca.po: Updated Catalan translation.
+
+2005-08-16  Jordi Mallach  <jordi@gnu.org>
+
+	* nl.po: Updated Dutch translation by
+	Benno Schulenberg and Reinout van Schouwen.
+
+2005-07-24  David Lawrence Ramsey  <pooka109@cox.net>
+
+	* POTFILES.in: Add text.c.
+
+2005-07-19  Jordi Mallach  <jordi@gnu.org>
+
+	* ms.po: Updated Malay translation by
+	Sharuzzaman Ahmat Raslan.
+
+2005-07-18  Jordi Mallach  <jordi@gnu.org>
+
+	* fr.po: Updated French translation by
+	Jean-Philippe Guérard.
+
+2005-07-07  Jordi Mallach  <jordi@gnu.org>
+
+	* it.po: Updated Italian translation by Marco Colombo.
+	* ca.po: Updated Catalan translation.
+
+2005-06-28  David Lawrence Ramsey  <pooka109@cox.net>
+
+	* POTFILES.in: Remove source files that contain no translatable
+	strings.
+
+2005-06-19  David Lawrence Ramsey  <pooka109@cox.net>
+
+	* pt_BR.po: Typo fix.
+
+2005-06-15  Jordi Mallach  <jordi@gnu.org>
+
+	* de.po: Typo fix by Jens Seidel.
+
+2005-05-23  Jordi Mallach  <jordi@gnu.org>
+
+	* fr.po: Updated French translation by
+	Jean-Philippe Guérard.
+
+2005-04-27  Jordi Mallach  <jordi@gnu.org>
+
+	* ms.po: Updated Malay translation by
+	Sharuzzaman Ahmat Raslan.
+
+2005-04-22  Jordi Mallach  <jordi@gnu.org>
+
+	* nb.po: Updated Norwegian bokmål translation by
+	Geir Helland.
+
+2005-04-20  Jordi Mallach  <jordi@gnu.org>
+
+	* ms.po: Updated Malay translation by
+	Sharuzzaman Ahmat Raslan.
+	* ro.po: Updated Romanian translation by Laurentiu Buzdugan.
+	* zh_TW.po: Updated Traditional Chinese translation by
+	CHAO Wei-Lun.
+
+2005-04-18  Jordi Mallach  <jordi@gnu.org>
+
+	* vi.po: Updated Vietnamese translation by Phan Vinh Thinh.
+
+2005-04-18  Jordi Mallach  <jordi@gnu.org>
+
+	* ca.po: Updated Catalan translation.
+	* it.po: Updated Italian translation by Marco Colombo.
+	* ro.po: Updated Romanian translation by Laurentiu Buzdugan.
+
+2005-04-14  Jordi Mallach  <jordi@gnu.org>
+
+	* es.po: Updated Spanish translation by
+	Ricardo Javier Cárdenes Medina.
+
+2005-04-13  Jordi Mallach  <jordi@gnu.org>
+
+	* vi.po: New Vietnamese translation by Phan Vinh Thinh.
+	* LINGUAS: Added "vi".
+
+2005-04-09  Jordi Mallach  <jordi@gnu.org>
+
+	* zh_TW.po: Added Plural-Forms header and fix format specification
+	typos.
+
+2005-04-08  Jordi Mallach  <jordi@gnu.org>
+
+	* ca.po: Updated Catalan translation.
+	* it.po: Updated Italian translation by Marco Colombo.
+	* zh_TW.po: Updated Traditional Chinese translation by
+	CHAO Wei-Lun.
+
+2005-04-06  Jordi Mallach  <jordi@gnu.org>
+
+	* rw.po: New Kinyarwanda translation by Steve Murphy.
+	* LINGUAS: Added "rw".
+
+2005-04-05  Jordi Mallach  <jordi@gnu.org>
+
+	* fr.po: Updated French translation by
+	Jean-Philippe Guérard.
+	* ro.po: Updated Romanian translation by
+	Laurentiu Buzdugan.
+
+2005-03-11  Jordi Mallach  <jordi@gnu.org>
+
+	* ms.po: Updated Malay translation by
+	Sharuzzaman Ahmat Raslan.
+
+2005-01-17  Jordi Mallach  <jordi@gnu.org>
+
+	* pt_BR.po: Updated Brazilian Portuguese translation by
+	Joao Victor Duarte Martins.
+
+2004-12-15  Jordi Mallach  <jordi@gnu.org>
+
+	* it.po: Updated Italian translation by Marco Colombo.
+
+2004-12-15  Jordi Mallach  <jordi@gnu.org>
+
+	* sv.po: Updated Swedish translation by Christian Rose.
+
+2004-12-13  Jordi Mallach  <jordi@gnu.org>
+
+	* sv.po: Updated Swedish translation by Christian Rose.
+
+2004-12-07  Jordi Mallach  <jordi@gnu.org>
+
+	* it.po: Updated Italian translation by
+	Marco Colombo.
+	* ro.po: Updated Romanian translation by
+	Laurentiu Buzdugan.
+
+2004-12-01  Jordi Mallach  <jordi@gnu.org>
+
+	* ca.po: Updated Catalan translation.
+	* nb: Updated Norwegian bokmål translation by
+	Geir Helland.
+	* fr.po: Updated French translation by
+	Jean-Philippe Guérard.
+
+2004-11-18  Jordi Mallach  <jordi@gnu.org>
+
+	* fr.po: Updated French translation by
+	Jean-Philippe Guérard.
+
+2004-11-18  Jordi Mallach  <jordi@gnu.org>
+
+	* ms.po: Updated Malay translation by
+	Sharuzzaman Ahmat Raslan.
+
+2004-10-07  Jordi Mallach  <jordi@gnu.org>
+
+	* eu.po: Updated Basque translation by
+	Mikel Olasagasti.
+
+2004-08-31  Jordi Mallach  <jordi@gnu.org>
+
+	* es.po: Updated Spanish translation by
+	Ricardo Javier Cárdenes Medina.
+
+2004-08-31  Jordi Mallach  <jordi@gnu.org>
+
+	* fr.po: Updated Catalan translation by
+	Jean-Philippe Guérard.
+
+2004-08-27  Jordi Mallach  <jordi@gnu.org>
+
+	* ca.po: Updated Catalan translation.
+	* de.po: Updated German translation by Michael Piefel.
+
+2004-06-01  Jordi Mallach  <jordi@gnu.org>
+
+	* zh_TW.po: Added Traditional Chinese translation by
+	CHAO Wei-Lun <chaoweilun@pcmail.com.tw>.
+	* LINGUAS: Added "zh_TW".
+
+2004-02-24  Jordi Mallach  <jordi@gnu.org>
+
+	* ms.po: Updated Malay translation by Sharuzzaman Ahmat Raslan.
+
 2003-11-25  Jordi Mallach  <jordi@gnu.org>
 
 	* ro.po: Updated Romanian translation by Laurentiu Buzdugan.
@@ -48,7 +452,7 @@
 
 2003-05-06  Jordi Mallach  <jordi@gnu.org>
 
-	* ms.po: Malay translation by Sharuzzaman Ahmat Raslan.
+	* ms.po: Updated Malay translation by Sharuzzaman Ahmat Raslan.
 
 2003-04-24  Jordi Mallach  <jordi@gnu.org>
 

po/LINGUAS

@@ -1,2 +1,2 @@
 # List of available languages.
-ca cs da de es eu fi fr gl hu id it ms nb nl nn pl pt_BR ro ru sr sv tr uk
+bg ca cs da de es eu fi fr ga gl hu id it ms nb nl nn pl pt_BR ro ru rw sr sv tr uk vi zh_TW

po/POTFILES.in

@@ -1,17 +1,14 @@
 # $Id$
 # List of source files containing translatable strings.
 
-# Package source files
-src/cut.c
+src/browser.c
 src/files.c
 src/global.c
-src/move.c
+src/help.c
 src/nano.c
+src/prompt.c
 src/rcfile.c
 src/search.c
+src/text.c
 src/utils.c
 src/winio.c
-
-# Package header files
-src/nano.h
-src/proto.h

po/update.pl

@@ -5,19 +5,20 @@
 #
 #  Copyright (C) 2000 Free Software Foundation.
 #
-#  This script 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 2 of the
-#  License, or (at your option) any later version.
+#  This script 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 2 of the License, or (at
+#  your option) any later version.
 #
-#  This script is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  This script is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
 #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 #  General Public License for more details.
 #
 #  You should have received a copy of the GNU General Public License
 #  along with this library; if not, write to the Free Software
-#  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+#  USA.
 #
 #  Authors: Kenneth Christiansen <kenneth@gnu.org>
 #

src/Makefile.am

@@ -1,22 +1,30 @@
-
-DEFS= -DSYSCONFDIR=\"$(sysconfdir)\"
 localedir = $(datadir)/locale
-INCLUDES = -Iintl -DLOCALEDIR=\"$(localedir)\" -I@includedir@
+INCLUDES = -DLOCALEDIR=\"$(localedir)\" -DSYSCONFDIR=\"$(sysconfdir)\"
 
 ACLOCAL_AMFLAGS = -I m4
 
 bin_PROGRAMS = 	nano
-nano_SOURCES =	color.c \
+nano_SOURCES =	browser.c \
+		chars.c \
+		color.c \
 		cut.c \
 		files.c \
 		global.c \
+		help.c \
 		move.c \
 		nano.c \
 		nano.h \
+		prompt.c \
 		proto.h \
 		rcfile.c \
 		search.c \
+		text.c \
 		utils.c \
 		winio.c 
 
 nano_LDADD = @GLIB_LIBS@ @LIBINTL@
+
+install-exec-hook:
+	cd $(DESTDIR)$(bindir) && rm -f rnano && $(LN_S) nano rnano
+uninstall-hook:
+	cd $(DESTDIR)$(bindir) && rm -f rnano

src/color.c

@@ -2,39 +2,34 @@
 /**************************************************************************
  *   color.c                                                              *
  *                                                                        *
- *   Copyright (C) 1999-2004 Chris Allegretta                             *
+ *   Copyright (C) 2001, 2002, 2003, 2004 Chris Allegretta                *
+ *   Copyright (C) 2005, 2006, 2007 David Lawrence Ramsey                 *
  *   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 2, or (at your option)  *
  *   any later version.                                                   *
  *                                                                        *
- *   This program is distributed in the hope that it will be useful,      *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of       *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
- *   GNU General Public License for more details.                         *
+ *   This program is distributed in the hope that it will be useful, but  *
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of           *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU    *
+ *   General Public License for more details.                             *
  *                                                                        *
  *   You should have received a copy of the GNU General Public License    *
  *   along with this program; if not, write to the Free Software          *
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.            *
+ *   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA            *
+ *   02110-1301, USA.                                                     *
  *                                                                        *
  **************************************************************************/
 
-#include "config.h"
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
 #include "proto.h"
-#include "nano.h"
+
+#include <stdio.h>
+#include <string.h>
 
 #ifdef ENABLE_COLOR
 
-/* For each syntax list entry, we go through the list of colors and
- * assign color pairs. */
+/* For each syntax list entry, go through the list of colors and assign
+ * the color pairs. */
 void set_colorpairs(void)
 {
     const syntaxtype *this_syntax = syntaxes;
@@ -46,14 +41,14 @@ void set_colorpairs(void)
 	for (; this_color != NULL; this_color = this_color->next) {
 	    const colortype *beforenow = this_syntax->color;
 
-	    for (; beforenow != NULL && beforenow != this_color && 
-			(beforenow->fg != this_color->fg ||
-			 beforenow->bg != this_color->bg ||
-			 beforenow->bright != this_color->bright);
-		    beforenow = beforenow->next)
+	    for (; beforenow != this_color &&
+		(beforenow->fg != this_color->fg ||
+		beforenow->bg != this_color->bg ||
+		beforenow->bright != this_color->bright);
+		beforenow = beforenow->next)
 		;
 
-	    if (beforenow != NULL && beforenow != this_color)
+	    if (beforenow != this_color)
 		this_color->pairnum = beforenow->pairnum;
 	    else {
 		this_color->pairnum = color_pair;
@@ -63,69 +58,146 @@ void set_colorpairs(void)
     }
 }
 
-void do_colorinit(void)
+/* Initialize the color information. */
+void color_init(void)
 {
+    assert(openfile != NULL);
+
     if (has_colors()) {
-	const colortype *tmpcolor = NULL;
+	const colortype *tmpcolor;
 #ifdef HAVE_USE_DEFAULT_COLORS
-	int defok;
+	bool defok;
 #endif
 
 	start_color();
-	/* Add in colors, if available */
 
 #ifdef HAVE_USE_DEFAULT_COLORS
-	defok = use_default_colors() != ERR;
+	/* Use the default colors, if available. */
+	defok = (use_default_colors() != ERR);
 #endif
 
-	for (tmpcolor = colorstrings; tmpcolor != NULL;
+	for (tmpcolor = openfile->colorstrings; tmpcolor != NULL;
 		tmpcolor = tmpcolor->next) {
-	    short background = tmpcolor->bg;
+	    short foreground = tmpcolor->fg, background = tmpcolor->bg;
+	    if (foreground == -1) {
+#ifdef HAVE_USE_DEFAULT_COLORS
+		if (!defok)
+#endif
+		    foreground = COLOR_WHITE;
+	    }
 
-	    if (background == -1)
+	    if (background == -1) {
 #ifdef HAVE_USE_DEFAULT_COLORS
 		if (!defok)
 #endif
 		    background = COLOR_BLACK;
+	    }
 
-	    init_pair(tmpcolor->pairnum, tmpcolor->fg, background);
+	    init_pair(tmpcolor->pairnum, foreground, background);
 
 #ifdef DEBUG
-	    fprintf(stderr, "Running %s with fg = %d and bg = %d\n",
-		"init_pair()", tmpcolor->fg, tmpcolor->bg);
+	    fprintf(stderr, "init_pair(): fg = %hd, bg = %hd\n", tmpcolor->fg, tmpcolor->bg);
 #endif
 	}
     }
 }
 
 /* Update the color information based on the current filename. */
-void update_color(void)
+void color_update(void)
 {
     const syntaxtype *tmpsyntax;
+    colortype *tmpcolor, *defcolor = NULL;
 
-    colorstrings = NULL;
-    for (tmpsyntax = syntaxes; tmpsyntax != NULL; tmpsyntax = tmpsyntax->next) {
-	const exttype *e;
+    assert(openfile != NULL);
 
-	for (e = tmpsyntax->extensions; e != NULL; e = e->next) {
-	    /* Set colorstrings if we matched the extension regex */
-	    if (regexec(&e->val, filename, 0, NULL, 0) == 0)
-		colorstrings = tmpsyntax->color;
+    openfile->colorstrings = NULL;
 
-	    if (colorstrings != NULL)
+    /* If we specified a syntax override string, use it. */
+    if (syntaxstr != NULL) {
+	/* If the syntax override is "none", it's the same as not having
+	 * a syntax at all, so get out. */
+	if (strcmp(syntaxstr, "none") == 0)
+	    return;
+
+	for (tmpsyntax = syntaxes; tmpsyntax != NULL;
+		tmpsyntax = tmpsyntax->next) {
+	    if (strcmp(tmpsyntax->desc, syntaxstr) == 0)
+		openfile->colorstrings = tmpsyntax->color;
+
+	    if (openfile->colorstrings != NULL)
 		break;
 	}
     }
 
-    /* if we haven't found a match, use the override string */
-    if (colorstrings == NULL && syntaxstr != NULL) {
-	for (tmpsyntax = syntaxes; tmpsyntax != NULL; 
-	     tmpsyntax = tmpsyntax->next) {
-	    if (!strcasecmp(tmpsyntax->desc, syntaxstr))
-		colorstrings = tmpsyntax->color;
+    /* If we didn't specify a syntax override string, or if we did and
+     * there was no syntax by that name, get the syntax based on the
+     * file extension. */
+    if (openfile->colorstrings == NULL) {
+	for (tmpsyntax = syntaxes; tmpsyntax != NULL;
+		tmpsyntax = tmpsyntax->next) {
+	    exttype *e;
+
+	    /* If this is the default syntax, it has no associated
+	     * extensions, which we've checked for elsewhere.  Skip over
+	     * it here, but keep track of its color regexes. */
+	    if (strcmp(tmpsyntax->desc, "default") == 0) {
+		defcolor = tmpsyntax->color;
+		continue;
+	    }
+
+	    for (e = tmpsyntax->extensions; e != NULL; e = e->next) {
+		bool not_compiled = (e->ext == NULL);
+
+		/* e->ext_regex has already been checked for validity
+		 * elsewhere.  Compile its specified regex if we haven't
+		 * already. */
+		if (not_compiled) {
+		    e->ext = (regex_t *)nmalloc(sizeof(regex_t));
+		    regcomp(e->ext, e->ext_regex, REG_EXTENDED);
+		}
+
+		/* Set colorstrings if we matched the extension
+		 * regex. */
+		if (regexec(e->ext, openfile->filename, 0, NULL,
+			0) == 0)
+		    openfile->colorstrings = tmpsyntax->color;
+
+		if (openfile->colorstrings != NULL)
+		    break;
+
+		/* Decompile e->ext_regex's specified regex if we aren't
+		 * going to use it. */
+		if (not_compiled) {
+		    regfree(e->ext);
+		    free(e->ext);
+		    e->ext = NULL;
+		}
+	    }
+	}
+    }
+
+    /* If we didn't get a syntax based on the file extension, and we
+     * have a default syntax, use it. */
+    if (openfile->colorstrings == NULL && defcolor != NULL)
+	openfile->colorstrings = defcolor;
+
+    for (tmpcolor = openfile->colorstrings; tmpcolor != NULL;
+	tmpcolor = tmpcolor->next) {
+	/* tmpcolor->start_regex and tmpcolor->end_regex have already
+	 * been checked for validity elsewhere.  Compile their specified
+	 * regexes if we haven't already. */
+	if (tmpcolor->start == NULL) {
+	    tmpcolor->start = (regex_t *)nmalloc(sizeof(regex_t));
+	    regcomp(tmpcolor->start, tmpcolor->start_regex,
+		REG_EXTENDED | (tmpcolor->icase ? REG_ICASE : 0));
+	}
+
+	if (tmpcolor->end_regex != NULL && tmpcolor->end == NULL) {
+	    tmpcolor->end = (regex_t *)nmalloc(sizeof(regex_t));
+	    regcomp(tmpcolor->end, tmpcolor->end_regex,
+		REG_EXTENDED | (tmpcolor->icase ? REG_ICASE : 0));
 	}
     }
-    do_colorinit();
 }
 
 #endif /* ENABLE_COLOR */

src/cut.c

@@ -2,466 +2,271 @@
 /**************************************************************************
  *   cut.c                                                                *
  *                                                                        *
- *   Copyright (C) 1999-2004 Chris Allegretta                             *
+ *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta    *
+ *   Copyright (C) 2005, 2006, 2007 David Lawrence Ramsey                 *
  *   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 2, or (at your option)  *
  *   any later version.                                                   *
  *                                                                        *
- *   This program is distributed in the hope that it will be useful,      *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of       *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
- *   GNU General Public License for more details.                         *
+ *   This program is distributed in the hope that it will be useful, but  *
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of           *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU    *
+ *   General Public License for more details.                             *
  *                                                                        *
  *   You should have received a copy of the GNU General Public License    *
  *   along with this program; if not, write to the Free Software          *
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.            *
+ *   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA            *
+ *   02110-1301, USA.                                                     *
  *                                                                        *
  **************************************************************************/
 
-#include "config.h"
+#include "proto.h"
 
-#include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
-#include <assert.h>
-#include "proto.h"
-#include "nano.h"
-
-static int marked_cut;		/* Is the cutbuffer from a mark?
-				 * 0 means whole-line cut, 1 means mark,
-				 * 2 means cut-from-cursor. */
-
-#ifndef NANO_SMALL
-static int concatenate_cut;	/* Should we add this cut string to the
-				 * end of the last one? */
-#endif
 
+static bool keep_cutbuffer = FALSE;
+	/* Should we keep the contents of the cutbuffer? */
 static filestruct *cutbottom = NULL;
-				/* Pointer to end of cutbuffer. */
+	/* Pointer to the end of the cutbuffer. */
 
-filestruct *get_cutbottom(void)
+/* Indicate that we should no longer keep the contents of the
+ * cutbuffer. */
+void cutbuffer_reset(void)
 {
-    return cutbottom;
+    keep_cutbuffer = FALSE;
 }
 
-void add_to_cutbuffer(filestruct *inptr)
+/* If we aren't on the last line of the file, move all the text of the
+ * current line, plus the newline at the end, into the cutbuffer.  If we
+ * are, move all of the text of the current line into the cutbuffer.  In
+ * both cases, set the current place we want to the beginning of the
+ * current line. */
+void cut_line(void)
 {
-#ifdef DEBUG
-    fprintf(stderr, "add_to_cutbuffer(): inptr->data = %s\n", inptr->data);
-#endif
-
-    if (cutbuffer == NULL)
-	cutbuffer = inptr;
-#ifndef NANO_SMALL
-    else if (concatenate_cut && !ISSET(JUSTIFY_MODE)) {
-	/* Just tack the text in inptr onto the text in cutbottom,
-	 * unless we're backing up lines while justifying text. */
-	cutbottom->data = charealloc(cutbottom->data,
-		strlen(cutbottom->data) + strlen(inptr->data) + 1);
-	strcat(cutbottom->data, inptr->data);
-	return;
-    }
-#endif
-    else {
-	cutbottom->next = inptr;
-	inptr->prev = cutbottom;
-    }
-    cutbottom = inptr;
-    cutbottom->next = NULL;
+    if (openfile->current != openfile->filebot)
+	move_to_filestruct(&cutbuffer, &cutbottom, openfile->current, 0,
+		openfile->current->next, 0);
+    else
+	move_to_filestruct(&cutbuffer, &cutbottom, openfile->current, 0,
+		openfile->current, strlen(openfile->current->data));
+    openfile->placewewant = 0;
 }
 
-#ifndef NANO_SMALL
-/* Cut a marked segment instead of a whole line.
- *
- * The first cut character is top->data[top_x].  Unless top == bot, the
- * last cut line has length bot_x.  That is, if bot_x > 0 then we cut to
- * bot->data[bot_x - 1].
- *
- * We maintain totsize, totlines, filebot, the magicline, and line
- * numbers.  Also, we set current and current_x so the cursor will be on
- * the first character after what was cut.  We do not do any screen
- * updates.
- *
- * Note cutbuffer might not be NULL if cut to end is used. */
-void cut_marked_segment(void)
+#ifndef NANO_TINY
+/* Move all currently marked text into the cutbuffer, and set the
+ * current place we want to where the text used to start. */
+void cut_marked(void)
 {
-    filestruct *top;
-    filestruct *bot;
-    filestruct *tmp;
-    size_t top_x;
-    size_t bot_x;
-    size_t newsize;
+    filestruct *top, *bot;
+    size_t top_x, bot_x;
 
-    /* If the mark doesn't cover any text, get out. */
-    if (current == mark_beginbuf && current_x == mark_beginx)
-	return;
-    assert(current != NULL && mark_beginbuf != NULL);
-
-    /* Set up the top and bottom lines and coordinates of the marked
-     * text. */
     mark_order((const filestruct **)&top, &top_x,
-		(const filestruct **)&bot, &bot_x);
+	(const filestruct **)&bot, &bot_x, NULL);
 
-    /* Make the first cut line manually.  Move the cut part of the top
-     * line into tmp, and set newsize to that partial line's length. */
-    tmp = copy_node(top);
-    newsize = (top == bot ? bot_x - top_x : strlen(top->data + top_x));
-    charmove(tmp->data, tmp->data + top_x, newsize);
-    null_at(&tmp->data, newsize);
-
-    /* Add the contents of tmp to the cutbuffer.  Note that cutbuffer
-     * might be non-NULL if we have cut to end enabled. */
-    if (cutbuffer == NULL) {
-	cutbuffer = tmp;
-	cutbottom = tmp;
-    } else {
-	cutbottom->next = tmp;
-	tmp->prev = cutbottom;
-	cutbottom = tmp;
-    }
-
-    /* And make the top remainder line manually too.  Update current_x
-     * and totlines to account for all the cut text, and update totsize
-     * to account for the length of the cut part of the first line. */
-    current_x = top_x;
-    totsize -= newsize;
-    totlines -= bot->lineno - top->lineno;
-
-    /* Now set newsize to be the length of the top remainder line plus
-     * the bottom remainder line, plus one for the null terminator. */
-    newsize = top_x + strlen(bot->data + bot_x) + 1;
-
-    if (top == bot) {
-	/* In this case, we're only cutting one line or part of one
-	 * line, so the remainder line is shorter.  This means that we
-	 * must move text from the end forward first. */
-	charmove(top->data + top_x, bot->data + bot_x, newsize - top_x);
-	top->data = charealloc(top->data, newsize);
-
-	cutbottom->next = NULL;
-#ifdef DEBUG
-	dump_buffer(cutbuffer);
-#endif
-	return;
-    }
-
-    /* Update totsize to account for the cut part of the last line. */
-    totsize -= bot_x + 1;
-
-    /* Here, the top remainder line might get longer (if the bottom
-     * remainder line is added to the end of it), so we realloc() it
-     * first. */
-    top->data = charealloc(top->data, newsize);
-    charmove(top->data + top_x, bot->data + bot_x, newsize - top_x);
-
-    assert(cutbottom != NULL && cutbottom->next != NULL);
-    /* We're cutting multiple lines, so in particular the next line is
-     * cut too. */
-    cutbottom->next->prev = cutbottom;
-
-    /* Update totsize to account for all the complete lines that have
-     * been cut.  After this, totsize is fully up to date. */
-    for (tmp = top->next; tmp != bot; tmp = tmp->next)
-	totsize -= strlen(tmp->data) + 1;
-
-    /* Make the last cut line manually. */
-    null_at(&bot->data, bot_x);
-
-    /* Move the rest of the cut text (other than the cut part of the top
-     * line) from the buffer to the end of the cutbuffer, and fix the
-     * edit buffer to account for the cut text. */
-    top->next = bot->next;
-    cutbottom = bot;
-    cutbottom->next = NULL;
-    if (top->next != NULL)
-	top->next->prev = top;
-    renumber(top);
-    current = top;
-
-    /* If the bottom line of the cut was the magicline, set filebot
-     * properly, and add a new magicline if the top remainder line
-     * (which is now the new bottom line) is non-blank. */
-    if (bot == filebot) {
-	filebot = top;
-	assert(bot_x == 0);
-	if (top_x > 0)
-	    new_magicline();
-    }
-#ifdef DEBUG
-    dump_buffer(cutbuffer);
-#endif
+    move_to_filestruct(&cutbuffer, &cutbottom, top, top_x, bot, bot_x);
+    openfile->placewewant = xplustabs();
 }
+
+/* If we aren't at the end of the current line, move all the text from
+ * the current cursor position to the end of the current line, not
+ * counting the newline at the end, into the cutbuffer.  If we are, and
+ * we're not on the last line of the file, move the newline at the end
+ * into the cutbuffer, and set the current place we want to where the
+ * newline used to be. */
+void cut_to_eol(void)
+{
+    size_t data_len = strlen(openfile->current->data);
+
+    assert(openfile->current_x <= data_len);
+
+    if (openfile->current_x < data_len)
+	/* If we're not at the end of the line, move all the text from
+	 * the current position up to it, not counting the newline at
+	 * the end, into the cutbuffer. */
+	move_to_filestruct(&cutbuffer, &cutbottom, openfile->current,
+		openfile->current_x, openfile->current, data_len);
+    else if (openfile->current != openfile->filebot) {
+	/* If we're at the end of the line, and it isn't the last line
+	 * of the file, move all the text from the current position up
+	 * to the beginning of the next line, i.e. the newline at the
+	 * end, into the cutbuffer. */
+	move_to_filestruct(&cutbuffer, &cutbottom, openfile->current,
+		openfile->current_x, openfile->current->next, 0);
+	openfile->placewewant = xplustabs();
+    }
+}
+
+/* Move all the text from the current cursor position to the end of the
+ * file into the cutbuffer. */
+void cut_to_eof(void)
+{
+    move_to_filestruct(&cutbuffer, &cutbottom, openfile->current,
+	openfile->current_x, openfile->filebot,
+	strlen(openfile->filebot->data));
+}
+#endif /* !NANO_TINY */
+
+/* Move text from the current filestruct into the cutbuffer.  If
+ * copy_text is TRUE, copy the text back into the filestruct afterward.
+ * If cut_till_end is TRUE, move all text from the current cursor
+ * position to the end of the file into the cutbuffer. */
+void do_cut_text(
+#ifndef NANO_TINY
+	bool copy_text, bool cut_till_end
+#else
+	void
+#endif
+	)
+{
+#ifndef NANO_TINY
+    filestruct *cb_save = NULL;
+	/* The current end of the cutbuffer, before we add text to
+	 * it. */
+    size_t cb_save_len = 0;
+	/* The length of the string at the current end of the cutbuffer,
+	 * before we add text to it.  */
+    bool old_no_newlines = ISSET(NO_NEWLINES);
 #endif
 
-int do_cut_text(void)
-{
-    filestruct *fileptr;
+    assert(openfile->current != NULL && openfile->current->data != NULL);
 
-    assert(current != NULL && current->data != NULL);
-
-    check_statblank();
-
-    if (!ISSET(KEEP_CUTBUFFER)) {
+    /* If keep_cutbuffer is FALSE and the cutbuffer isn't empty, blow
+     * away the text in the cutbuffer. */
+    if (!keep_cutbuffer && cutbuffer != NULL) {
 	free_filestruct(cutbuffer);
 	cutbuffer = NULL;
-	marked_cut = 0;
-#ifndef NANO_SMALL
-	concatenate_cut = 0;
-#endif
 #ifdef DEBUG
 	fprintf(stderr, "Blew away cutbuffer =)\n");
 #endif
     }
 
-    /* You can't cut the magicline except with the mark.  But trying
-     * does clear the cutbuffer if KEEP_CUTBUFFER is not set. */
-    if (current == filebot
-#ifndef NANO_SMALL
-			&& !ISSET(MARK_ISSET)
-#endif
-						)
-	return 0;
-
-    SET(KEEP_CUTBUFFER);
-
-#ifndef NANO_SMALL
-    if (ISSET(CUT_TO_END) && !ISSET(MARK_ISSET)) {
-	assert(current_x >= 0 && current_x <= strlen(current->data));
-
-	if (current->data[current_x] == '\0') {
-	    /* If the line is empty and we didn't just cut a non-blank
-	     * line, create a dummy blank line and add it to the
-	     * cutbuffer. */
-	    if (marked_cut != 1 && current->next != filebot) {
-		filestruct *junk = make_new_node(current);
-
-		junk->data = charalloc(1);
-		junk->data[0] = '\0';
-		add_to_cutbuffer(junk);
-#ifdef DEBUG
-		dump_buffer(cutbuffer);
-#endif
-	    }
-
-	    do_delete();
-	    marked_cut = 2;
-	    return 1;
-	} else {
-	    SET(MARK_ISSET);
-
-	    mark_beginx = strlen(current->data);
-	    mark_beginbuf = current;
+#ifndef NANO_TINY
+    if (copy_text) {
+	if (cutbuffer != NULL) {
+	    /* If the cutbuffer isn't empty, save where it currently
+	     * ends.  This is where we'll add the new text. */
+	    cb_save = cutbottom;
+	    cb_save_len = strlen(cutbottom->data);
 	}
+
+	/* Set NO_NEWLINES to TRUE, so that we don't disturb the last
+	 * line of the file when moving text to the cutbuffer. */
+	SET(NO_NEWLINES);
     }
-
-    if (ISSET(MARK_ISSET)) {
-	cut_marked_segment();
-
-	placewewant = xplustabs();
-	UNSET(MARK_ISSET);
-
-	/* If we just did a marked cut of part of a line, we should add
-	 * the first line of any cut done immediately afterward to the
-	 * end of this cut, as Pico does. */
-	if (current == mark_beginbuf && current_x < strlen(current->data))
-	    concatenate_cut = 1;
-	marked_cut = 1;
-	edit_refresh();
-	set_modified();
-
-	return 1;
-    }
-#endif /* !NANO_SMALL */
-
-    totlines--;
-    totsize -= strlen(current->data) + 1;
-    fileptr = current;
-    current = current->next;
-    current->prev = fileptr->prev;
-    add_to_cutbuffer(fileptr);
-#ifdef DEBUG
-    dump_buffer(cutbuffer);
 #endif
 
-    if (fileptr == fileage)
-	fileage = current;
+    /* Set keep_cutbuffer to TRUE, so that the text we're going to move
+     * into the cutbuffer will be added to the text already in the
+     * cutbuffer instead of replacing it. */
+    keep_cutbuffer = TRUE;
+
+#ifndef NANO_TINY
+    if (cut_till_end) {
+	/* If cut_till_end is TRUE, move all text up to the end of the
+	 * file into the cutbuffer. */
+	cut_to_eof();
+    } else if (openfile->mark_set) {
+	/* If the mark is on, move the marked text to the cutbuffer, and
+	 * turn the mark off. */
+	cut_marked();
+	openfile->mark_set = FALSE;
+    } else if (ISSET(CUT_TO_END))
+	/* If the CUT_TO_END flag is set, move all text up to the end of
+	 * the line into the cutbuffer. */
+	cut_to_eol();
     else
-	current->prev->next = current;
-
-    if (fileptr == edittop)
-	edittop = current;
-
-    renumber(current);
-    current_x = 0;
-    edit_refresh();
-    set_modified();
-    marked_cut = 0;
-#ifndef NANO_SMALL
-    concatenate_cut = 0;
 #endif
-    return 1;
-}
+	/* Move the entire line into the cutbuffer. */
+	cut_line();
 
-int do_uncut_text(void)
-{
-    filestruct *tmp = current;
-    filestruct *newbuf = NULL;
-    filestruct *newend = NULL;
+#ifndef NANO_TINY
+    if (copy_text) {
+	/* Copy the text in the cutbuffer, starting at its saved end if
+	 * there is one, back into the filestruct.  This effectively
+	 * uncuts the text we just cut without marking the file as
+	 * modified. */
+	if (cutbuffer != NULL) {
+	    if (cb_save != NULL) {
+		cb_save->data += cb_save_len;
+		copy_from_filestruct(cb_save, cutbottom);
+		cb_save->data -= cb_save_len;
+	    } else
+		copy_from_filestruct(cutbuffer, cutbottom);
 
-#ifndef DISABLE_WRAPPING
-    wrap_reset();
-#endif
-    check_statblank();
-    if (cutbuffer == NULL || current == NULL)
-	return 0;		/* AIEEEEEEEEEEEE */
-
-    /* If we're uncutting a previously non-marked block, uncut to end if
-     * we're not at the beginning of the line.  If we are at the
-     * beginning of the line, set placewewant to 0.  Pico does both of
-     * these. */
-    if (marked_cut == 0) {
-	if (current_x != 0)
-	    marked_cut = 2;
-	else
-	    placewewant = 0;
-    }
-
-    /* If we're going to uncut on the magicline, always make a new
-     * magicline in advance, as Pico does. */
-    if (current->next == NULL)
-	new_magicline();
-
-    if (marked_cut == 0 || cutbuffer->next != NULL) {
-	newbuf = copy_filestruct(cutbuffer);
-	for (newend = newbuf; newend->next != NULL && newend != NULL;
-		newend = newend->next)
-	    totlines++;
-    }
-
-    /* Hook newbuf in at current. */
-    if (marked_cut != 0) {
-	filestruct *hold = current;
-
-	/* If there's only one line in the cutbuffer... */
-	if (cutbuffer->next == NULL) {
-	    size_t buf_len = strlen(cutbuffer->data);
-	    size_t cur_len = strlen(current->data);
-
-	    current->data = charealloc(current->data, cur_len + buf_len + 1);
-	    charmove(current->data + current_x + buf_len,
-			current->data + current_x, cur_len - current_x + 1);
-	    strncpy(current->data + current_x, cutbuffer->data, buf_len);
-		/* Use strncpy() to not copy the null terminator. */
-
-	    current_x += buf_len;
-	    totsize += buf_len;
-
-	    placewewant = xplustabs();
-	} else {		/* Yuck -- no kidding! */
-	    char *tmpstr, *tmpstr2;
-
-	    tmp = current->next;
-
-	    /* New beginning. */
-	    tmpstr = charalloc(current_x + strlen(newbuf->data) + 1);
-	    strncpy(tmpstr, current->data, current_x);
-	    strcpy(&tmpstr[current_x], newbuf->data);
-	    totsize += strlen(newbuf->data) + strlen(newend->data) + 1;
-
-	    /* New end. */
-	    tmpstr2 = charalloc(strlen(newend->data) +
-			      strlen(&current->data[current_x]) + 1);
-	    strcpy(tmpstr2, newend->data);
-	    strcat(tmpstr2, &current->data[current_x]);
-
-	    free(current->data);
-	    current->data = tmpstr;
-	    current->next = newbuf->next;
-	    newbuf->next->prev = current;
-	    delete_node(newbuf);
-
-	    current_x = strlen(newend->data);
-	    placewewant = xplustabs();
-	    free(newend->data);
-	    newend->data = tmpstr2;
-
-	    newend->next = tmp;
-
-	    /* If tmp isn't NULL, we're in the middle: update the
-	     * prev pointer.  If it IS NULL, we're at the end; update
-	     * the filebot pointer. */
-	    if (tmp != NULL)
-		tmp->prev = newend;
-	    else {
-		filebot = newend;
-		new_magicline();
-	    }
-
-	    /* Now why don't we update the totsize also? */
-	    for (tmp = current->next; tmp != newend; tmp = tmp->next)
-		totsize += strlen(tmp->data) + 1;
-
-	    current = newend;
+	    /* Set the current place we want to where the text from the
+	     * cutbuffer ends. */
+	    openfile->placewewant = xplustabs();
 	}
 
-	/* If marked cut == 2, that means that we're doing a cut to end
-	 * and we don't want anything else on the line, so we have to
-	 * screw up all the work we just did and separate the line.
-	 * There must be a better way to do this, but not at 1 AM on a
-	 * work night. */
-	if (marked_cut == 2) {
-	    tmp = make_new_node(current);
-	    tmp->data = mallocstrcpy(NULL, current->data + current_x);
-	    splice_node(current, tmp, current->next);
-	    null_at(&current->data, current_x);
-	    current = current->next;
-	    current_x = 0;
-	    placewewant = 0;
-
-	    /* Extra line added; update stuff. */
-	    totlines++;
-	    totsize++;
-	}
-	/* Renumber from BEFORE where we pasted ;) */
-	renumber(hold);
-
-#ifdef DEBUG
-	dump_buffer(fileage);
-	dump_buffer(cutbuffer);
-#endif
-	set_modified();
-	edit_refresh();
-	return 0;
-    }
-
-    if (current != fileage) {
-	tmp = current->prev;
-	tmp->next = newbuf;
-	newbuf->prev = tmp;
+	/* Set NO_NEWLINES back to what it was before, since we're done
+	 * disturbing the text. */
+	if (!old_no_newlines)
+	    UNSET(NO_NEWLINES);
     } else
-	fileage = newbuf;
-    totlines++;		/* Unmarked uncuts don't split lines. */
+#endif
+	/* Leave the text in the cutbuffer, and mark the file as
+	 * modified. */
+	set_modified();
 
-    /* This is so uncutting at the top of the buffer will work => */
-    if (current_y == 0)
-	edittop = newbuf;
-
-    /* Connect the end of the buffer to the filestruct. */
-    newend->next = current;
-    current->prev = newend;
-
-    /* Recalculate size *sigh* */
-    for (tmp = newbuf; tmp != current; tmp = tmp->next)
-	totsize += strlen(tmp->data) + 1;
-
-    renumber(newbuf);
+    /* Update the screen. */
     edit_refresh();
 
 #ifdef DEBUG
-    dump_buffer_reverse();
+    dump_filestruct(cutbuffer);
+#endif
+}
+
+/* Move text from the current filestruct into the cutbuffer. */
+void do_cut_text_void(void)
+{
+    do_cut_text(
+#ifndef NANO_TINY
+	FALSE, FALSE
+#endif
+	);
+}
+
+#ifndef NANO_TINY
+/* Move text from the current filestruct into the cutbuffer, and copy it
+ * back into the filestruct afterward. */
+void do_copy_text(void)
+{
+    do_cut_text(TRUE, FALSE);
+}
+
+/* Cut from the current cursor position to the end of the file. */
+void do_cut_till_end(void)
+{
+    do_cut_text(FALSE, TRUE);
+}
+#endif /* !NANO_TINY */
+
+/* Copy text from the cutbuffer into the current filestruct. */
+void do_uncut_text(void)
+{
+    assert(openfile->current != NULL && openfile->current->data != NULL);
+
+    /* If the cutbuffer is empty, get out. */
+    if (cutbuffer == NULL)
+	return;
+
+    /* Add a copy of the text in the cutbuffer to the current filestruct
+     * at the current cursor position. */
+    copy_from_filestruct(cutbuffer, cutbottom);
+
+    /* Set the current place we want to where the text from the
+     * cutbuffer ends. */
+    openfile->placewewant = xplustabs();
+
+    /* Mark the file as modified. */
+    set_modified();
+
+    /* Update the screen. */
+    edit_refresh();
+
+#ifdef DEBUG
+    dump_filestruct_reverse();
 #endif
-
-    set_modified();
-    return 1;
 }

src/help.c

@@ -0,0 +1,621 @@
+/* $Id$ */
+/**************************************************************************
+ *   help.c                                                               *
+ *                                                                        *
+ *   Copyright (C) 2000, 2001, 2002, 2003, 2004 Chris Allegretta          *
+ *   Copyright (C) 2005, 2006, 2007 David Lawrence Ramsey                 *
+ *   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 2, or (at your option)  *
+ *   any later version.                                                   *
+ *                                                                        *
+ *   This program is distributed in the hope that it will be useful, but  *
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of           *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU    *
+ *   General Public License for more details.                             *
+ *                                                                        *
+ *   You should have received a copy of the GNU General Public License    *
+ *   along with this program; if not, write to the Free Software          *
+ *   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA            *
+ *   02110-1301, USA.                                                     *
+ *                                                                        *
+ **************************************************************************/
+
+#include "proto.h"
+
+#include <stdio.h>
+#include <string.h>
+#include <ctype.h>
+
+#ifndef DISABLE_HELP
+
+static char *help_text = NULL;
+	/* The text displayed in the help window. */
+
+/* Our main help browser function.  refresh_func is the function we will
+ * call to refresh the edit window. */
+void do_help(void (*refresh_func)(void))
+{
+    int kbinput = ERR;
+    bool meta_key, func_key, old_no_help = ISSET(NO_HELP);
+    bool abort = FALSE;
+	/* Whether we should abort the help browser. */
+    size_t line = 0;
+	/* The line number in help_text of the first displayed help
+	 * line.  This variable is zero-based. */
+    size_t last_line = 0;
+	/* The line number in help_text of the last help line.  This
+	 * variable is zero-based. */
+#ifndef DISABLE_MOUSE
+    const shortcut *oldshortcut = currshortcut;
+	/* The current shortcut list. */
+#endif
+    const char *ptr;
+	/* The current line of the help text. */
+    size_t old_line = (size_t)-1;
+	/* The line we were on before the current line. */
+
+    curs_set(0);
+    blank_edit();
+    wattroff(bottomwin, reverse_attr);
+    blank_statusbar();
+
+    /* Set help_text as the string to display. */
+    help_init();
+
+    assert(help_text != NULL);
+
+#ifndef DISABLE_MOUSE
+    /* Set currshortcut to allow clicking on the help screen's shortcut
+     * list, after help_init() is called. */
+    currshortcut = help_list;
+#endif
+
+    if (ISSET(NO_HELP)) {
+	/* Make sure that the help screen's shortcut list will actually
+	 * be displayed. */
+	UNSET(NO_HELP);
+	window_init();
+    }
+
+    bottombars(help_list);
+    wnoutrefresh(bottomwin);
+
+    /* Get the last line of the help text. */
+    ptr = help_text;
+
+    for (; *ptr != '\0'; last_line++) {
+	ptr += help_line_len(ptr);
+	if (*ptr == '\n')
+	    ptr++;
+    }
+    if (last_line > 0)
+	last_line--;
+
+    while (!abort) {
+	size_t i;
+
+	/* Display the help text if we don't have a key, or if the help
+	 * text has moved. */
+	if (kbinput == ERR || line != old_line) {
+	    blank_edit();
+
+	    ptr = help_text;
+
+	    /* Calculate where in the text we should be, based on the
+	     * page. */
+	    for (i = 0; i < line; i++) {
+		ptr += help_line_len(ptr);
+		if (*ptr == '\n')
+		    ptr++;
+	    }
+
+	    for (i = 0; i < editwinrows && *ptr != '\0'; i++) {
+		size_t j = help_line_len(ptr);
+
+		mvwaddnstr(edit, i, 0, ptr, j);
+		ptr += j;
+		if (*ptr == '\n')
+		    ptr++;
+	    }
+	}
+
+	wnoutrefresh(edit);
+
+	old_line = line;
+
+	kbinput = get_kbinput(edit, &meta_key, &func_key);
+	parse_help_input(&kbinput, &meta_key, &func_key);
+
+	switch (kbinput) {
+#ifndef DISABLE_MOUSE
+	    case KEY_MOUSE:
+		{
+		    int mouse_x, mouse_y;
+
+		    get_mouseinput(&mouse_x, &mouse_y, TRUE);
+		}
+		break;
+#endif
+	    /* Redraw the screen. */
+	    case NANO_REFRESH_KEY:
+		total_redraw();
+		break;
+	    case NANO_PREVPAGE_KEY:
+		if (line > editwinrows - 2)
+		    line -= editwinrows - 2;
+		else
+		    line = 0;
+		break;
+	    case NANO_NEXTPAGE_KEY:
+		if (line + (editwinrows - 1) < last_line)
+		    line += editwinrows - 2;
+		break;
+	    case NANO_PREVLINE_KEY:
+		if (line > 0)
+		    line--;
+		break;
+	    case NANO_NEXTLINE_KEY:
+		if (line + (editwinrows - 1) < last_line)
+		    line++;
+		break;
+	    case NANO_FIRSTLINE_METAKEY:
+		if (meta_key)
+		    line = 0;
+		break;
+	    case NANO_LASTLINE_METAKEY:
+		if (meta_key) {
+		    if (line + (editwinrows - 1) < last_line)
+			line = last_line - (editwinrows - 1);
+		}
+		break;
+	    /* Abort the help browser. */
+	    case NANO_EXIT_KEY:
+		abort = TRUE;
+		break;
+	}
+    }
+
+#ifndef DISABLE_MOUSE
+    currshortcut = oldshortcut;
+#endif
+
+    if (old_no_help) {
+	blank_bottombars();
+	wnoutrefresh(bottomwin);
+	SET(NO_HELP);
+	window_init();
+    } else
+	bottombars(currshortcut);
+
+    curs_set(1);
+    refresh_func();
+
+    /* The help_init() at the beginning allocated help_text.  Since 
+     * help_text has now been written to the screen, we don't need it
+     * anymore. */
+    free(help_text);
+    help_text = NULL;
+}
+
+/* Start the help browser for the edit window. */
+void do_help_void(void)
+{
+    do_help(&edit_refresh);
+}
+
+#ifndef DISABLE_BROWSER
+/* Start the help browser for the file browser. */
+void do_browser_help(void)
+{
+    do_help(&browser_refresh);
+}
+#endif
+
+/* This function allocates help_text, and stores the help string in it. 
+ * help_text should be NULL initially. */
+void help_init(void)
+{
+    size_t allocsize = 0;	/* Space needed for help_text. */
+    const char *htx[3];		/* Untranslated help message.  We break
+				 * it up into three chunks in case the
+				 * full string is too long for the
+				 * compiler to handle. */
+    char *ptr;
+    const shortcut *s;
+#ifndef NANO_TINY
+    const toggle *t;
+#ifdef ENABLE_NANORC
+    bool old_whitespace = ISSET(WHITESPACE_DISPLAY);
+
+    UNSET(WHITESPACE_DISPLAY);
+#endif
+#endif
+
+    /* First, set up the initial help text for the current function. */
+    if (currshortcut == whereis_list || currshortcut == replace_list ||
+	currshortcut == replace_list_2) {
+	htx[0] = N_("Search Command Help Text\n\n "
+		"Enter the words or characters you would like to "
+		"search for, and then press Enter.  If there is a "
+		"match for the text you entered, the screen will be "
+		"updated to the location of the nearest match for the "
+		"search string.\n\n The previous search string will be "
+		"shown in brackets after the search prompt.  Hitting "
+		"Enter without entering any text will perform the "
+		"previous search.  ");
+	htx[1] = N_("If you have selected text with the mark and then "
+		"search to replace, only matches in the selected text "
+		"will be replaced.\n\n The following function keys are "
+		"available in Search mode:\n\n");
+	htx[2] = NULL;
+    } else if (currshortcut == gotoline_list) {
+	htx[0] = N_("Go To Line Help Text\n\n "
+		"Enter the line number that you wish to go to and hit "
+		"Enter.  If there are fewer lines of text than the "
+		"number you entered, you will be brought to the last "
+		"line of the file.\n\n The following function keys are "
+		"available in Go To Line mode:\n\n");
+	htx[1] = NULL;
+	htx[2] = NULL;
+    } else if (currshortcut == insertfile_list) {
+	htx[0] = N_("Insert File Help Text\n\n "
+		"Type in the name of a file to be inserted into the "
+		"current file buffer at the current cursor "
+		"location.\n\n If you have compiled nano with multiple "
+		"file buffer support, and enable multiple file buffers "
+		"with the -F or --multibuffer command line flags, the "
+		"Meta-F toggle, or a nanorc file, inserting a file "
+		"will cause it to be loaded into a separate buffer "
+		"(use Meta-< and > to switch between file buffers).  ");
+	htx[1] = N_("If you need another blank buffer, do not enter "
+		"any filename, or type in a nonexistent filename at "
+		"the prompt and press Enter.\n\n The following "
+		"function keys are available in Insert File mode:\n\n");
+	htx[2] = NULL;
+    } else if (currshortcut == writefile_list) {
+	htx[0] = N_("Write File Help Text\n\n "
+		"Type the name that you wish to save the current file "
+		"as and press Enter to save the file.\n\n If you have "
+		"selected text with the mark, you will be prompted to "
+		"save only the selected portion to a separate file.  To "
+		"reduce the chance of overwriting the current file with "
+		"just a portion of it, the current filename is not the "
+		"default in this mode.\n\n The following function keys "
+		"are available in Write File mode:\n\n");
+	htx[1] = NULL;
+	htx[2] = NULL;
+    }
+#ifndef DISABLE_BROWSER
+    else if (currshortcut == browser_list) {
+	htx[0] = N_("File Browser Help Text\n\n "
+		"The file browser is used to visually browse the "
+		"directory structure to select a file for reading "
+		"or writing.  You may use the arrow keys or Page Up/"
+		"Down to browse through the files, and S or Enter to "
+		"choose the selected file or enter the selected "
+		"directory.  To move up one level, select the "
+		"directory called \"..\" at the top of the file "
+		"list.\n\n The following function keys are available "
+		"in the file browser:\n\n");
+	htx[1] = NULL;
+	htx[2] = NULL;
+    } else if (currshortcut == whereis_file_list) {
+	htx[0] = N_("Browser Search Command Help Text\n\n "
+		"Enter the words or characters you would like to "
+		"search for, and then press Enter.  If there is a "
+		"match for the text you entered, the screen will be "
+		"updated to the location of the nearest match for the "
+		"search string.\n\n The previous search string will be "
+		"shown in brackets after the search prompt.  Hitting "
+		"Enter without entering any text will perform the "
+		"previous search.\n\n");
+	htx[1] = N_(" The following function keys are available in "
+		"Browser Search mode:\n\n");
+	htx[2] = NULL;
+    } else if (currshortcut == gotodir_list) {
+	htx[0] = N_("Browser Go To Directory Help Text\n\n "
+		"Enter the name of the directory you would like to "
+		"browse to.\n\n If tab completion has not been "
+		"disabled, you can use the Tab key to (attempt to) "
+		"automatically complete the directory name.\n\n The "
+		"following function keys are available in Browser Go "
+		"To Directory mode:\n\n");
+	htx[1] = NULL;
+	htx[2] = NULL;
+    }
+#endif /* !DISABLE_BROWSER */
+#ifndef DISABLE_SPELLER
+    else if (currshortcut == spell_list) {
+	htx[0] = N_("Spell Check Help Text\n\n "
+		"The spell checker checks the spelling of all text in "
+		"the current file.  When an unknown word is "
+		"encountered, it is highlighted and a replacement can "
+		"be edited.  It will then prompt to replace every "
+		"instance of the given misspelled word in the current "
+		"file, or, if you have selected text with the mark, in "
+		"the selected text.\n\n The following function keys "
+		"are available in Spell Check mode:\n\n");
+	htx[1] = NULL;
+	htx[2] = NULL;
+    }
+#endif /* !DISABLE_SPELLER */
+#ifndef NANO_TINY
+    else if (currshortcut == extcmd_list) {
+	htx[0] = N_("Execute Command Help Text\n\n "
+		"This mode allows you to insert the output of a "
+		"command run by the shell into the current buffer (or "
+		"a new buffer in multiple file buffer mode). If you "
+		"need another blank buffer, do not enter any "
+		"command.\n\n The following function keys are "
+		"available in Execute Command mode:\n\n");
+	htx[1] = NULL;
+	htx[2] = NULL;
+    }
+#endif /* !NANO_TINY */
+    else {
+	/* Default to the main help list. */
+	htx[0] = N_("Main nano help text\n\n "
+		"The nano editor is designed to emulate the "
+		"functionality and ease-of-use of the UW Pico text "
+		"editor.  There are four main sections of the editor.  "
+		"The top line shows the program version, the current "
+		"filename being edited, and whether or not the file "
+		"has been modified.  Next is the main editor window "
+		"showing the file being edited.  The status line is "
+		"the third line from the bottom and shows important "
+		"messages.  ");
+	htx[1] = N_("The bottom two lines show the most commonly used "
+		"shortcuts in the editor.\n\n The notation for "
+		"shortcuts is as follows: Control-key sequences are "
+		"notated with a caret (^) symbol and can be entered "
+		"either by using the Control (Ctrl) key or pressing "
+		"the Escape (Esc) key twice.  Escape-key sequences are "
+		"notated with the Meta (M-) symbol and can be entered "
+		"using either the Esc, Alt, or Meta key depending on "
+		"your keyboard setup.  ");
+	htx[2] = N_("Also, pressing Esc twice and then typing a "
+		"three-digit decimal number from 000 to 255 will enter "
+		"the character with the corresponding value.  The "
+		"following keystrokes are available in the main editor "
+		"window.  Alternative keys are shown in "
+		"parentheses:\n\n");
+    }
+
+    htx[0] = _(htx[0]);
+    if (htx[1] != NULL)
+	htx[1] = _(htx[1]);
+    if (htx[2] != NULL)
+	htx[2] = _(htx[2]);
+
+    allocsize += strlen(htx[0]);
+    if (htx[1] != NULL)
+	allocsize += strlen(htx[1]);
+    if (htx[2] != NULL)
+	allocsize += strlen(htx[2]);
+
+    /* Count the shortcut help text.  Each entry has up to three keys,
+     * which fill 24 columns, plus translated text, plus one or two
+     * \n's. */
+	for (s = currshortcut; s != NULL; s = s->next)
+	    allocsize += (24 * mb_cur_max()) + strlen(s->help) + 2;
+
+#ifndef NANO_TINY
+    /* If we're on the main list, we also count the toggle help text.
+     * Each entry has "M-%c\t\t\t", which fills 24 columns, plus a
+     * space, plus translated text, plus one or two '\n's. */
+    if (currshortcut == main_list) {
+	size_t endis_len = strlen(_("enable/disable"));
+
+	for (t = toggles; t != NULL; t = t->next)
+	    allocsize += strlen(t->desc) + endis_len + 9;
+    }
+#endif
+
+    /* help_text has been freed and set to NULL unless the user resized
+     * while in the help screen. */
+    if (help_text != NULL)
+	free(help_text);
+
+    /* Allocate space for the help text. */
+    help_text = charalloc(allocsize + 1);
+
+    /* Now add the text we want. */
+    strcpy(help_text, htx[0]);
+    if (htx[1] != NULL)
+	strcat(help_text, htx[1]);
+    if (htx[2] != NULL)
+	strcat(help_text, htx[2]);
+
+    ptr = help_text + strlen(help_text);
+
+    /* Now add our shortcut info.  Assume that each shortcut has, at the
+     * very least, an equivalent control key, an equivalent primary meta
+     * key sequence, or both.  Also assume that the meta key values are
+     * not control characters.  We can display a maximum of three
+     * shortcut entries. */
+    for (s = currshortcut; s != NULL; s = s->next) {
+	int entries = 0;
+
+	/* Control key. */
+	if (s->ctrlval != NANO_NO_KEY) {
+	    entries++;
+	    /* Yucky sentinel values that we can't handle a better
+	     * way. */
+	    if (s->ctrlval == NANO_CONTROL_SPACE) {
+		char *space_ptr = display_string(_("Space"), 0, 14,
+			FALSE);
+
+		if (s->funcval == NANO_NO_KEY && (s->metaval ==
+			NANO_NO_KEY || s->miscval == NANO_NO_KEY)) {
+		    /* If we're here, we have at least two entries worth
+		     * of blank space.  If this entry takes up more than
+		     * one entry's worth of space, use two to display
+		     * it. */
+		    if (mbstrlen(space_ptr) > 6)
+			entries++;
+		} else
+		    /* Otherwise, truncate it so that it takes up only
+		     * one entry's worth of space. */
+		    space_ptr[6] = '\0';
+
+		ptr += sprintf(ptr, "^%s", space_ptr);
+
+		free(space_ptr);
+	    } else if (s->ctrlval == NANO_CONTROL_8)
+		ptr += sprintf(ptr, "^?");
+	    /* Normal values. */
+	    else
+		ptr += sprintf(ptr, "^%c", s->ctrlval + 64);
+	    *(ptr++) = '\t';
+	}
+
+	/* Function key. */
+	if (s->funcval != NANO_NO_KEY) {
+	    entries++;
+	    /* If this is the first entry, put it in the middle. */
+	    if (entries == 1) {
+		entries++;
+		*(ptr++) = '\t';
+	    }
+	    ptr += sprintf(ptr, "(F%d)", s->funcval - KEY_F0);
+	    *(ptr++) = '\t';
+	}
+
+	/* Primary meta key sequence.  If it's the first entry, don't
+	 * put parentheses around it. */
+	if (s->metaval != NANO_NO_KEY) {
+	    entries++;
+	    /* If this is the last entry, put it at the end. */
+	    if (entries == 2 && s->miscval == NANO_NO_KEY) {
+		entries++;
+		*(ptr++) = '\t';
+	    }
+	    /* Yucky sentinel values that we can't handle a better
+	     * way. */
+	    if (s->metaval == NANO_META_SPACE && entries == 1) {
+		char *space_ptr = display_string(_("Space"), 0, 13,
+			FALSE);
+
+		/* If we're here, we have at least two entries worth of
+		 * blank space.  If this entry takes up more than one
+		 * entry's worth of space, use two to display it. */
+		if (mbstrlen(space_ptr) > 5)
+		    entries++;
+
+		ptr += sprintf(ptr, "M-%s", space_ptr);
+
+		free(space_ptr);
+	    } else
+		/* Normal values. */
+		ptr += sprintf(ptr, (entries == 1) ? "M-%c" : "(M-%c)",
+			toupper(s->metaval));
+	    *(ptr++) = '\t';
+	}
+
+	/* Miscellaneous meta key sequence. */
+	if (entries < 3 && s->miscval != NANO_NO_KEY) {
+	    entries++;
+	    /* If this is the last entry, put it at the end. */
+	    if (entries == 2) {
+		entries++;
+		*(ptr++) = '\t';
+	    }
+	    ptr += sprintf(ptr, "(M-%c)", toupper(s->miscval));
+	    *(ptr++) = '\t';
+	}
+
+	/* If this entry isn't blank, make sure all the help text starts
+	 * at the same place. */
+	if (s->ctrlval != NANO_NO_KEY || s->funcval != NANO_NO_KEY ||
+		s->metaval != NANO_NO_KEY || s->miscval !=
+		NANO_NO_KEY) {
+	    while (entries < 3) {
+		entries++;
+		*(ptr++) = '\t';
+	    }
+	}
+
+	/* The shortcut's help text. */
+	ptr += sprintf(ptr, "%s\n", s->help);
+
+	if (s->blank_after)
+	    ptr += sprintf(ptr, "\n");
+    }
+
+#ifndef NANO_TINY
+    /* And the toggles... */
+    if (currshortcut == main_list) {
+	for (t = toggles; t != NULL; t = t->next) {
+	    ptr += sprintf(ptr, "M-%c\t\t\t%s %s\n",
+		toupper(t->val), t->desc, _("enable/disable"));
+
+	    if (t->blank_after)
+		ptr += sprintf(ptr, "\n");
+	}
+    }
+
+#ifdef ENABLE_NANORC
+    if (old_whitespace)
+	SET(WHITESPACE_DISPLAY);
+#endif
+#endif
+
+    /* If all went well, we didn't overwrite the allocated space for
+     * help_text. */
+    assert(strlen(help_text) <= allocsize + 1);
+}
+
+/* Determine the shortcut key corresponding to the values of kbinput
+ * (the key itself), meta_key (whether the key is a meta sequence), and
+ * func_key (whether the key is a function key), if any.  In the
+ * process, convert certain non-shortcut keys into their corresponding
+ * shortcut keys. */
+void parse_help_input(int *kbinput, bool *meta_key, bool *func_key)
+{
+    get_shortcut(help_list, kbinput, meta_key, func_key);
+
+    if (!*meta_key) {
+	switch (*kbinput) {
+	    /* For consistency with the file browser. */
+	    case ' ':
+		*kbinput = NANO_NEXTPAGE_KEY;
+		break;
+	    case '-':
+		*kbinput = NANO_PREVPAGE_KEY;
+		break;
+	    /* Cancel is equivalent to Exit here. */
+	    case NANO_CANCEL_KEY:
+	    case 'E':
+	    case 'e':
+		*kbinput = NANO_EXIT_KEY;
+		break;
+	}
+    }
+}
+
+/* Calculate the next line of help_text, starting at ptr. */
+size_t help_line_len(const char *ptr)
+{
+    int help_cols = (COLS > 24) ? COLS - 1 : 24;
+
+    /* Try to break the line at (COLS - 1) columns if we have more than
+     * 24 columns, and at 24 columns otherwise. */
+    ssize_t wrap_loc = break_line(ptr, help_cols, TRUE);
+    size_t retval = (wrap_loc < 0) ? 0 : wrap_loc;
+    size_t retval_save = retval;
+
+    /* Get the length of the entire line up to a null or a newline. */
+    while (*(ptr + retval) != '\0' && *(ptr + retval) != '\n')
+	retval += move_mbright(ptr + retval, 0);
+
+    /* If the entire line doesn't go more than one column beyond where
+     * we tried to break it, we should display it as-is.  Otherwise, we
+     * should display it only up to the break. */
+    if (strnlenpt(ptr, retval) > help_cols + 1)
+	retval = retval_save;
+
+    return retval;
+}
+
+#endif /* !DISABLE_HELP */

src/move.c

@@ -2,224 +2,646 @@
 /**************************************************************************
  *   move.c                                                               *
  *                                                                        *
- *   Copyright (C) 1999-2004 Chris Allegretta                             *
+ *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta    *
+ *   Copyright (C) 2005, 2006, 2007 David Lawrence Ramsey                 *
  *   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 2, or (at your option)  *
  *   any later version.                                                   *
  *                                                                        *
- *   This program is distributed in the hope that it will be useful,      *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of       *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
- *   GNU General Public License for more details.                         *
+ *   This program is distributed in the hope that it will be useful, but  *
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of           *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU    *
+ *   General Public License for more details.                             *
  *                                                                        *
  *   You should have received a copy of the GNU General Public License    *
  *   along with this program; if not, write to the Free Software          *
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.            *
+ *   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA            *
+ *   02110-1301, USA.                                                     *
  *                                                                        *
  **************************************************************************/
 
-#include "config.h"
-
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
 #include "proto.h"
-#include "nano.h"
 
-int do_home(void)
+#include <string.h>
+#include <ctype.h>
+
+/* Move to the first line of the file. */
+void do_first_line(void)
 {
-    current_x = 0;
-    placewewant = 0;
-    check_statblank();
-    update_line(current, current_x);
-    return 1;
+    const filestruct *current_save = openfile->current;
+    size_t pww_save = openfile->placewewant;
+
+    openfile->current = openfile->fileage;
+    openfile->current_x = 0;
+    openfile->placewewant = 0;
+
+    edit_redraw(current_save, pww_save);
 }
 
-int do_end(void)
+/* Move to the last line of the file. */
+void do_last_line(void)
 {
-    current_x = strlen(current->data);
-    placewewant = xplustabs();
-    check_statblank();
-    update_line(current, current_x);
-    return 1;
+    const filestruct *current_save = openfile->current;
+    size_t pww_save = openfile->placewewant;
+
+    openfile->current = openfile->filebot;
+    openfile->current_x = strlen(openfile->filebot->data);
+    openfile->placewewant = xplustabs();
+    openfile->current_y = editwinrows - 1;
+
+    edit_redraw(current_save, pww_save);
 }
 
-int do_page_up(void)
+/* Move up one page. */
+void do_page_up(void)
 {
     int i;
 
-#ifndef DISABLE_WRAPPING
-    wrap_reset();
-#endif
-
-    /* If edittop is the first line of the file, move current up there
-     * and put the cursor at the beginning of the line. */
-    if (edittop == fileage) {
-	current = fileage;
-	placewewant = 0;
-    } else {
-	/* Move the top line of the edit window up a page. */
-	for (i = 0; i < editwinrows - 2 && edittop->prev != NULL; i++)
-	    edittop = edittop->prev;
-#ifndef NANO_SMALL
-	/* If we're in smooth scrolling mode and there was at least one
-	 * page of text left, move the current line of the edit window
-	 * up a page. */
-	if (ISSET(SMOOTHSCROLL) && current->lineno > editwinrows - 2)
-	    for (i = 0; i < editwinrows - 2; i++)
-		current = current->prev;
-	/* If we're not in smooth scrolling mode and there was at least
-	 * one page of text left, put the cursor at the beginning of the
-	 * top line of the edit window, as Pico does. */
-	else {
-#endif
-	    current = edittop;
-	    placewewant = 0;
-#ifndef NANO_SMALL
-	}
-#endif
+    /* If there's less than a page of text left on the screen, put the
+     * cursor at the beginning of the first line of the file, and then
+     * update the edit window. */
+    if (openfile->current->lineno <= editwinrows - 2) {
+	do_first_line();
+	return;
     }
-    /* Get the equivalent x-coordinate of the new line. */
-    current_x = actual_x(current->data, placewewant);
 
-    edit_refresh();
+    /* If we're not in smooth scrolling mode, put the cursor at the
+     * beginning of the top line of the edit window, as Pico does. */
+#ifndef NANO_TINY
+    if (!ISSET(SMOOTH_SCROLL)) {
+#endif
+	openfile->current = openfile->edittop;
+	openfile->placewewant = 0;
+#ifndef NANO_TINY
+    }
+#endif
 
-    check_statblank();
-    return 1;
+    for (i = editwinrows - 2; i > 0 && openfile->current !=
+	openfile->fileage; i--)
+	openfile->current = openfile->current->prev;
+
+    openfile->current_x = actual_x(openfile->current->data,
+	openfile->placewewant);
+
+    /* Scroll the edit window up a page. */
+    edit_scroll(UP_DIR, editwinrows - 2);
 }
 
-int do_page_down(void)
+/* Move down one page. */
+void do_page_down(void)
 {
     int i;
 
-#ifndef DISABLE_WRAPPING
-    wrap_reset();
+    /* If there's less than a page of text left on the screen, put the
+     * cursor at the beginning of the last line of the file, and then
+     * update the edit window. */
+    if (openfile->current->lineno + editwinrows - 2 >=
+	openfile->filebot->lineno) {
+	do_last_line();
+	return;
+    }
+
+    /* If we're not in smooth scrolling mode, put the cursor at the
+     * beginning of the top line of the edit window, as Pico does. */
+#ifndef NANO_TINY
+    if (!ISSET(SMOOTH_SCROLL)) {
+#endif
+	openfile->current = openfile->edittop;
+	openfile->placewewant = 0;
+#ifndef NANO_TINY
+    }
 #endif
 
-    /* If the last line of the file is onscreen, move current down
-     * there and put the cursor at the beginning of the line. */
-    if (edittop->lineno + editwinrows > filebot->lineno) {
-	current = filebot;
-	placewewant = 0;
+    for (i = editwinrows - 2; i > 0 && openfile->current !=
+	openfile->filebot; i--)
+	openfile->current = openfile->current->next;
+
+    openfile->current_x = actual_x(openfile->current->data,
+	openfile->placewewant);
+
+    /* Scroll the edit window down a page. */
+    edit_scroll(DOWN_DIR, editwinrows - 2);
+}
+
+#ifndef DISABLE_JUSTIFY
+/* Move up to the beginning of the last beginning-of-paragraph line
+ * before the current line.  If allow_update is TRUE, update the screen
+ * afterwards. */
+void do_para_begin(bool allow_update)
+{
+    const filestruct *current_save = openfile->current;
+    const size_t pww_save = openfile->placewewant;
+
+    if (openfile->current != openfile->fileage) {
+	do {
+	    openfile->current = openfile->current->prev;
+	    openfile->current_y--;
+	} while (!begpar(openfile->current));
+    }
+
+    openfile->current_x = 0;
+    openfile->placewewant = 0;
+
+    if (allow_update)
+	edit_redraw(current_save, pww_save);
+}
+
+/* Move up to the beginning of the last beginning-of-paragraph line
+ * before the current line, and update the screen afterwards. */
+void do_para_begin_void(void)
+{
+    do_para_begin(TRUE);
+}
+
+/* Move down to the beginning of the last line of the current paragraph.
+ * Then move down one line farther if there is such a line, or to the
+ * end of the current line if not.  If allow_update is TRUE, update the
+ * screen afterwards.  A line is the last line of a paragraph if it is
+ * in a paragraph, and the next line either is the beginning line of a
+ * paragraph or isn't in a paragraph. */
+void do_para_end(bool allow_update)
+{
+    const filestruct *const current_save = openfile->current;
+    const size_t pww_save = openfile->placewewant;
+
+    while (openfile->current != openfile->filebot &&
+	!inpar(openfile->current))
+	openfile->current = openfile->current->next;
+
+    while (openfile->current != openfile->filebot &&
+	inpar(openfile->current->next) &&
+	!begpar(openfile->current->next)) {
+	openfile->current = openfile->current->next;
+	openfile->current_y++;
+    }
+
+    if (openfile->current != openfile->filebot) {
+	openfile->current = openfile->current->next;
+	openfile->current_x = 0;
+	openfile->placewewant = 0;
     } else {
-	/* Move the top line of the edit window down a page. */
-	for (i = 0; i < editwinrows - 2; i++)
-	    edittop = edittop->next;
-#ifndef NANO_SMALL
-	/* If we're in smooth scrolling mode and there was at least one
-	 * page of text left, move the current line of the edit window
-	 * down a page. */
-	if (ISSET(SMOOTHSCROLL) && current->lineno + editwinrows - 2 <= filebot->lineno)
-	    for (i = 0; i < editwinrows - 2; i++)
-		current = current->next;
-	/* If we're not in smooth scrolling mode and there was at least
-	 * one page of text left, put the cursor at the beginning of the
-	 * top line of the edit window, as Pico does. */
-	else {
-#endif
-	    current = edittop;
-	    placewewant = 0;
-#ifndef NANO_SMALL
+	openfile->current_x = strlen(openfile->current->data);
+	openfile->placewewant = xplustabs();
+    }
+
+    if (allow_update)
+	edit_redraw(current_save, pww_save);
+}
+
+/* Move down to the beginning of the last line of the current paragraph.
+ * Then move down one line farther if there is such a line, or to the
+ * end of the current line if not, and update the screen afterwards. */
+void do_para_end_void(void)
+{
+    do_para_end(TRUE);
+}
+#endif /* !DISABLE_JUSTIFY */
+
+#ifndef NANO_TINY
+/* Move to the next word in the file.  If allow_punct is TRUE, treat
+ * punctuation as part of a word.  If allow_update is TRUE, update the
+ * screen afterwards.  Return TRUE if we started on a word, and FALSE
+ * otherwise. */
+bool do_next_word(bool allow_punct, bool allow_update)
+{
+    size_t pww_save = openfile->placewewant;
+    const filestruct *current_save = openfile->current;
+    char *char_mb;
+    int char_mb_len;
+    bool end_line = FALSE, started_on_word = FALSE;
+
+    assert(openfile->current != NULL && openfile->current->data != NULL);
+
+    char_mb = charalloc(mb_cur_max());
+
+    /* Move forward until we find the character after the last letter of
+     * the current word. */
+    while (!end_line) {
+	char_mb_len = parse_mbchar(openfile->current->data +
+		openfile->current_x, char_mb, NULL);
+
+	/* If we've found it, stop moving forward through the current
+	 * line. */
+	if (!is_word_mbchar(char_mb, allow_punct))
+	    break;
+
+	/* If we haven't found it, then we've started on a word, so set
+	 * started_on_word to TRUE. */
+	started_on_word = TRUE;
+
+	if (openfile->current->data[openfile->current_x] == '\0')
+	    end_line = TRUE;
+	else
+	    openfile->current_x += char_mb_len;
+    }
+
+    /* Move forward until we find the first letter of the next word. */
+    if (openfile->current->data[openfile->current_x] == '\0')
+	end_line = TRUE;
+    else
+	openfile->current_x += char_mb_len;
+
+    for (; openfile->current != NULL;
+	openfile->current = openfile->current->next) {
+	while (!end_line) {
+	    char_mb_len = parse_mbchar(openfile->current->data +
+		openfile->current_x, char_mb, NULL);
+
+	    /* If we've found it, stop moving forward through the
+	     * current line. */
+	    if (is_word_mbchar(char_mb, allow_punct))
+		break;
+
+	    if (openfile->current->data[openfile->current_x] == '\0')
+		end_line = TRUE;
+	    else
+		openfile->current_x += char_mb_len;
+	}
+
+	/* If we've found it, stop moving forward to the beginnings of
+	 * subsequent lines. */
+	if (!end_line)
+	    break;
+
+	if (openfile->current != openfile->filebot) {
+	    end_line = FALSE;
+	    openfile->current_x = 0;
 	}
-#endif
     }
-    /* Get the equivalent x-coordinate of the new line. */
-    current_x = actual_x(current->data, placewewant);
 
-    edit_refresh();
+    free(char_mb);
 
-    check_statblank();
-    return 1;
+    /* If we haven't found it, move to the end of the file. */
+    if (openfile->current == NULL)
+	openfile->current = openfile->filebot;
+
+    openfile->placewewant = xplustabs();
+
+    /* If allow_update is TRUE, update the screen. */
+    if (allow_update)
+	edit_redraw(current_save, pww_save);
+
+    /* Return whether we started on a word. */
+    return started_on_word;
 }
 
-int do_up(void)
+/* Move to the next word in the file, treating punctuation as part of a
+ * word if the WORD_BOUNDS flag is set, and update the screen
+ * afterwards. */
+void do_next_word_void(void)
 {
-#ifndef DISABLE_WRAPPING
-    wrap_reset();
-#endif
-    check_statblank();
+    do_next_word(ISSET(WORD_BOUNDS), TRUE);
+}
 
-    if (current->prev == NULL)
-	return 0;
+/* Move to the previous word in the file.  If allow_punct is TRUE, treat
+ * punctuation as part of a word.  If allow_update is TRUE, update the
+ * screen afterwards.  Return TRUE if we started on a word, and FALSE
+ * otherwise. */
+bool do_prev_word(bool allow_punct, bool allow_update)
+{
+    size_t pww_save = openfile->placewewant;
+    const filestruct *current_save = openfile->current;
+    char *char_mb;
+    int char_mb_len;
+    bool begin_line = FALSE, started_on_word = FALSE;
 
-    assert(current_y == current->lineno - edittop->lineno);
-    current = current->prev;
-    current_x = actual_x(current->data, placewewant);
-    if (current_y > 0) {
-	update_line(current->next, 0);
-	    /* It was necessary to change current first, so that the
-	     * mark display will change! */
-	update_line(current, current_x);
-    } else
-#ifndef NANO_SMALL
-    if (ISSET(SMOOTHSCROLL))
-	edit_update(current, TOP);
+    assert(openfile->current != NULL && openfile->current->data != NULL);
+
+    char_mb = charalloc(mb_cur_max());
+
+    /* Move backward until we find the character before the first letter
+     * of the current word. */
+    while (!begin_line) {
+	char_mb_len = parse_mbchar(openfile->current->data +
+		openfile->current_x, char_mb, NULL);
+
+	/* If we've found it, stop moving backward through the current
+	 * line. */
+	if (!is_word_mbchar(char_mb, allow_punct))
+	    break;
+
+	/* If we haven't found it, then we've started on a word, so set
+	 * started_on_word to TRUE. */
+	started_on_word = TRUE;
+
+	if (openfile->current_x == 0)
+	    begin_line = TRUE;
+	else
+	    openfile->current_x = move_mbleft(openfile->current->data,
+		openfile->current_x);
+    }
+
+    /* Move backward until we find the last letter of the previous
+     * word. */
+    if (openfile->current_x == 0)
+	begin_line = TRUE;
     else
-#endif
-	edit_update(current, CENTER);
-    return 1;
-}
+	openfile->current_x = move_mbleft(openfile->current->data,
+		openfile->current_x);
 
-/* Return value 1 means we moved down, 0 means we were already at the
- * bottom. */
-int do_down(void)
-{
-#ifndef DISABLE_WRAPPING
-    wrap_reset();
-#endif
-    check_statblank();
+    for (; openfile->current != NULL;
+	openfile->current = openfile->current->prev) {
+	while (!begin_line) {
+	    char_mb_len = parse_mbchar(openfile->current->data +
+		openfile->current_x, char_mb, NULL);
 
-    if (current->next == NULL)
-	return 0;
+	    /* If we've found it, stop moving backward through the
+	     * current line. */
+	    if (is_word_mbchar(char_mb, allow_punct))
+		break;
 
-    assert(current_y == current->lineno - edittop->lineno);
-    current = current->next;
-    current_x = actual_x(current->data, placewewant);
+	    if (openfile->current_x == 0)
+		begin_line = TRUE;
+	    else
+		openfile->current_x =
+			move_mbleft(openfile->current->data,
+			openfile->current_x);
+	}
 
-    /* Note that current_y is zero-based.  This test checks for the
-     * cursor's being not on the last row of the edit window. */
-    if (current_y != editwinrows - 1) {
-	update_line(current->prev, 0);
-	update_line(current, current_x);
-    } else
-#ifndef NANO_SMALL
-    if (ISSET(SMOOTHSCROLL))
-	/* In this case current_y does not change.  The cursor remains
-	 * at the bottom of the edit window. */
-	edit_update(edittop->next, TOP);
-    else
-#endif
-	edit_update(current, CENTER);
-    return 1;
-}
+	/* If we've found it, stop moving backward to the ends of
+	 * previous lines. */
+	if (!begin_line)
+	    break;
 
-int do_left(void)
-{
-    if (current_x > 0)
-	current_x--;
-    else if (current != fileage) {
-	do_up();
-	current_x = strlen(current->data);
+	if (openfile->current != openfile->fileage) {
+	    begin_line = FALSE;
+	    openfile->current_x = strlen(openfile->current->prev->data);
+	}
     }
-    placewewant = xplustabs();
-    check_statblank();
-    update_line(current, current_x);
-    return 1;
-}
 
-int do_right(void)
-{
-    assert(current_x <= strlen(current->data));
+    /* If we haven't found it, move to the beginning of the file. */
+    if (openfile->current == NULL)
+	openfile->current = openfile->fileage;
+    /* If we've found it, move backward until we find the character
+     * before the first letter of the previous word. */
+    else if (!begin_line) {
+	if (openfile->current_x == 0)
+	    begin_line = TRUE;
+	else
+	    openfile->current_x = move_mbleft(openfile->current->data,
+		openfile->current_x);
 
-    if (current->data[current_x] != '\0')
-	current_x++;
-    else if (current->next != NULL) {
-	do_down();
-	current_x = 0;
+	while (!begin_line) {
+	    char_mb_len = parse_mbchar(openfile->current->data +
+		openfile->current_x, char_mb, NULL);
+
+	    /* If we've found it, stop moving backward through the
+	     * current line. */
+	    if (!is_word_mbchar(char_mb, allow_punct))
+		break;
+
+	    if (openfile->current_x == 0)
+		begin_line = TRUE;
+	    else
+		openfile->current_x =
+			move_mbleft(openfile->current->data,
+			openfile->current_x);
+	}
+
+	/* If we've found it, move forward to the first letter of the
+	 * previous word. */
+	if (!begin_line)
+	    openfile->current_x += char_mb_len;
     }
-    placewewant = xplustabs();
-    check_statblank();
-    update_line(current, current_x);
-    return 1;
+
+    free(char_mb);
+
+    openfile->placewewant = xplustabs();
+
+    /* If allow_update is TRUE, update the screen. */
+    if (allow_update)
+	edit_redraw(current_save, pww_save);
+
+    /* Return whether we started on a word. */
+    return started_on_word;
+}
+
+/* Move to the previous word in the file, treating punctuation as part
+ * of a word if the WORD_BOUNDS flag is set, and update the screen
+ * afterwards. */
+void do_prev_word_void(void)
+{
+    do_prev_word(ISSET(WORD_BOUNDS), TRUE);
+}
+#endif /* !NANO_TINY */
+
+/* Move to the beginning of the current line.  If the SMART_HOME flag is
+ * set, move to the first non-whitespace character of the current line
+ * if we aren't already there, or to the beginning of the current line
+ * if we are. */
+void do_home(void)
+{
+    size_t pww_save = openfile->placewewant;
+
+#ifndef NANO_TINY
+    if (ISSET(SMART_HOME)) {
+	size_t current_x_save = openfile->current_x;
+
+	openfile->current_x = indent_length(openfile->current->data);
+
+	if (openfile->current_x == current_x_save ||
+		openfile->current->data[openfile->current_x] == '\0')
+	    openfile->current_x = 0;
+
+	openfile->placewewant = xplustabs();
+    } else {
+#endif
+	openfile->current_x = 0;
+	openfile->placewewant = 0;
+#ifndef NANO_TINY
+    }
+#endif
+
+    if (need_horizontal_update(pww_save))
+	update_line(openfile->current, openfile->current_x);
+}
+
+/* Move to the end of the current line. */
+void do_end(void)
+{
+    size_t pww_save = openfile->placewewant;
+
+    openfile->current_x = strlen(openfile->current->data);
+    openfile->placewewant = xplustabs();
+
+    if (need_horizontal_update(pww_save))
+	update_line(openfile->current, openfile->current_x);
+}
+
+/* If scroll_only is FALSE, move up one line.  If scroll_only is TRUE,
+ * scroll up one line without scrolling the cursor. */
+void do_up(
+#ifndef NANO_TINY
+	bool scroll_only
+#else
+	void
+#endif
+	)
+{
+    /* If we're at the top of the file, or if scroll_only is TRUE and
+     * the top of the file is onscreen, get out. */
+    if (openfile->current == openfile->fileage
+#ifndef NANO_TINY
+	|| (scroll_only && openfile->edittop == openfile->fileage)
+#endif
+	)
+	return;
+
+    assert(openfile->current_y == openfile->current->lineno - openfile->edittop->lineno);
+
+    /* Move the current line of the edit window up. */
+    openfile->current = openfile->current->prev;
+    openfile->current_x = actual_x(openfile->current->data,
+	openfile->placewewant);
+
+    /* If scroll_only is FALSE and if we're on the first line of the
+     * edit window, scroll the edit window up one line if we're in
+     * smooth scrolling mode, or up half a page if we're not.  If
+     * scroll_only is TRUE, scroll the edit window up one line
+     * unconditionally. */
+    if (openfile->current_y == 0
+#ifndef NANO_TINY
+	|| scroll_only
+#endif
+	)
+	edit_scroll(UP_DIR,
+#ifndef NANO_TINY
+		(ISSET(SMOOTH_SCROLL) || scroll_only) ? 1 :
+#endif
+		editwinrows / 2);
+
+    /* If we're below the first line of the edit window, update the
+     * line we were on before and the line we're on now.  The former
+     * needs to be redrawn if we're not on the first page, and the
+     * latter needs to be drawn unconditionally. */
+    if (openfile->current_y > 0) {
+	if (need_vertical_update(0))
+	    update_line(openfile->current->next, 0);
+	update_line(openfile->current, openfile->current_x);
+    }
+}
+
+/* Move up one line. */
+void do_up_void(void)
+{
+    do_up(
+#ifndef NANO_TINY
+	FALSE
+#endif
+	);
+}
+
+#ifndef NANO_TINY
+/* Scroll up one line without scrolling the cursor. */
+void do_scroll_up(void)
+{
+    do_up(TRUE);
+}
+#endif
+
+/* If scroll_only is FALSE, move down one line.  If scroll_only is TRUE,
+ * scroll down one line without scrolling the cursor. */
+void do_down(
+#ifndef NANO_TINY
+	bool scroll_only
+#else
+	void
+#endif
+	)
+{
+    /* If we're at the bottom of the file, get out. */
+    if (openfile->current == openfile->filebot)
+	return;
+
+    assert(openfile->current_y == openfile->current->lineno - openfile->edittop->lineno);
+
+    /* Move the current line of the edit window down. */
+    openfile->current = openfile->current->next;
+    openfile->current_x = actual_x(openfile->current->data,
+	openfile->placewewant);
+
+    /* If scroll_only is FALSE and if we're on the first line of the
+     * edit window, scroll the edit window down one line if we're in
+     * smooth scrolling mode, or down half a page if we're not.  If
+     * scroll_only is TRUE, scroll the edit window down one line
+     * unconditionally. */
+    if (openfile->current_y == editwinrows - 1
+#ifndef NANO_TINY
+	|| scroll_only
+#endif
+	)
+	edit_scroll(DOWN_DIR,
+#ifndef NANO_TINY
+		(ISSET(SMOOTH_SCROLL) || scroll_only) ? 1 :
+#endif
+		editwinrows / 2);
+
+    /* If we're above the last line of the edit window, update the line
+     * we were on before and the line we're on now.  The former needs to
+     * be redrawn if we're not on the first page, and the latter needs
+     * to be drawn unconditionally. */
+    if (openfile->current_y < editwinrows - 1) {
+	if (need_vertical_update(0))
+	    update_line(openfile->current->prev, 0);
+	update_line(openfile->current, openfile->current_x);
+    }
+}
+
+/* Move down one line. */
+void do_down_void(void)
+{
+    do_down(
+#ifndef NANO_TINY
+	FALSE
+#endif
+	);
+}
+
+#ifndef NANO_TINY
+/* Scroll down one line without scrolling the cursor. */
+void do_scroll_down(void)
+{
+    do_down(TRUE);
+}
+#endif
+
+/* Move left one character. */
+void do_left(void)
+{
+    size_t pww_save = openfile->placewewant;
+
+    if (openfile->current_x > 0)
+	openfile->current_x = move_mbleft(openfile->current->data,
+		openfile->current_x);
+    else if (openfile->current != openfile->fileage) {
+	do_up_void();
+	openfile->current_x = strlen(openfile->current->data);
+    }
+
+    openfile->placewewant = xplustabs();
+
+    if (need_horizontal_update(pww_save))
+	update_line(openfile->current, openfile->current_x);
+}
+
+/* Move right one character. */
+void do_right(void)
+{
+    size_t pww_save = openfile->placewewant;
+
+    assert(openfile->current_x <= strlen(openfile->current->data));
+
+    if (openfile->current->data[openfile->current_x] != '\0')
+	openfile->current_x = move_mbright(openfile->current->data,
+		openfile->current_x);
+    else if (openfile->current != openfile->filebot) {
+	do_down_void();
+	openfile->current_x = 0;
+    }
+
+    openfile->placewewant = xplustabs();
+
+    if (need_horizontal_update(pww_save))
+	update_line(openfile->current, openfile->current_x);
 }

src/nano.h

@@ -2,133 +2,144 @@
 /**************************************************************************
  *   nano.h                                                               *
  *                                                                        *
- *   Copyright (C) 1999-2004 Chris Allegretta                             *
+ *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta    *
+ *   Copyright (C) 2005, 2006, 2007 David Lawrence Ramsey                 *
  *   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 2, or (at your option)  *
  *   any later version.                                                   *
  *                                                                        *
- *   This program is distributed in the hope that it will be useful,      *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of       *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
- *   GNU General Public License for more details.                         *
+ *   This program is distributed in the hope that it will be useful, but  *
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of           *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU    *
+ *   General Public License for more details.                             *
  *                                                                        *
  *   You should have received a copy of the GNU General Public License    *
  *   along with this program; if not, write to the Free Software          *
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.            *
+ *   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA            *
+ *   02110-1301, USA.                                                     *
  *                                                                        *
  **************************************************************************/
 
+#ifndef NANO_H
+#define NANO_H 1
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#ifdef __TANDEM
+/* Tandem NonStop Kernel support. */
+#include <floss.h>
+#define NANO_ROOT_UID 65535
+#else
+#define NANO_ROOT_UID 0
+#endif
+
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
 #endif
 
-#ifndef NANO_H
-#define NANO_H 1
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
 
-/* Macros for the flags int... */
+/* Macros for flags. */
 #define SET(bit) flags |= bit
 #define UNSET(bit) flags &= ~bit
 #define ISSET(bit) ((flags & bit) != 0)
 #define TOGGLE(bit) flags ^= bit
 
-/* Define charalloc as a macro rather than duplicating code */
+/* Macros for character allocation and more. */
 #define charalloc(howmuch) (char *)nmalloc((howmuch) * sizeof(char))
 #define charealloc(ptr, howmuch) (char *)nrealloc(ptr, (howmuch) * sizeof(char))
 #define charmove(dest, src, n) memmove(dest, src, (n) * sizeof(char))
-#ifdef BROKEN_REGEXEC
-#define regexec(preg, string, nmatch, pmatch, eflags) regexec_safe(preg, string, nmatch, pmatch, eflags)
-#endif
+#define charset(dest, src, n) memset(dest, src, (n) * sizeof(char))
 
-#ifndef NANO_SMALL
-/* For the backup file copy ... */
-#define COPYFILEBLOCKSIZE 1024
+/* Set a default value for PATH_MAX if there isn't one. */
+#ifndef PATH_MAX
+#define PATH_MAX 4096
 #endif
 
 #ifdef USE_SLANG
-/* Slang support enabled.  Work around Slang's not defining KEY_DC or
- * KEY_IC. */
+/* Slang support. */
 #include <slcurses.h>
+/* Slang curses emulation brain damage, part 3: Slang doesn't define the
+ * curses equivalents of the Insert or Delete keys. */
 #define KEY_DC SL_KEY_DELETE
 #define KEY_IC SL_KEY_IC
+/* Ncurses support. */
 #elif defined(HAVE_NCURSES_H)
 #include <ncurses.h>
-#else /* Uh oh. */
+#else
+/* Curses support. */
 #include <curses.h>
 #endif /* CURSES_H */
 
 #ifdef ENABLE_NLS
-#  ifdef HAVE_LIBINTL_H
-#    include <libintl.h>
-#  endif
-#  define _(string) gettext(string)
-#  define P_(singular, plural, number) ngettext(singular, plural, number)
-#else
-#  define _(string) (string)
-#  define P_(singular, plural, number) (number == 1 ? singular : plural)
+/* Native language support. */
+#ifdef HAVE_LIBINTL_H
+#include <libintl.h>
 #endif
+#define _(string) gettext(string)
+#define P_(singular, plural, number) ngettext(singular, plural, number)
+#else
+#define _(string) (string)
+#define P_(singular, plural, number) (number == 1 ? singular : plural)
+#endif
+#define gettext_noop(string) (string)
+#define N_(string) gettext_noop(string)
+	/* Mark a string that will be sent to gettext() later. */
 
+#include <stddef.h>
+#include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include "config.h"
+#include <dirent.h>
+#ifdef HAVE_REGEX_H
+#include <regex.h>
+#endif
+#ifndef NANO_TINY
+#include <setjmp.h>
+#endif
+#include <assert.h>
 
-/* If no snprintf()/vsnprintf(), use the versions from glib. */
-#if !defined(HAVE_SNPRINTF) || !defined(HAVE_VSNPRINTF)
+/* If no vsnprintf(), use the version from glib 2.x. */
+#ifndef HAVE_VSNPRINTF
 #include <glib.h>
-# ifndef HAVE_SNPRINTF
-#  define snprintf g_snprintf
-# endif
-# ifndef HAVE_VSNPRINTF
-#  define vsnprintf g_vsnprintf
-# endif
+#define vsnprintf g_vsnprintf
 #endif
 
-/* If no strcasecmp()/strncasecmp(), use the versions we have. */
+/* If no isblank(), iswblank(), strcasecmp(), strncasecmp(),
+ * strcasestr(), strnlen(), getdelim(), or getline(), use the versions
+ * we have. */
+#ifndef HAVE_ISBLANK
+#define isblank nisblank
+#endif
+#ifndef HAVE_ISWBLANK
+#define iswblank niswblank
+#endif
 #ifndef HAVE_STRCASECMP
-#define strcasecmp nstricmp
+#define strcasecmp nstrcasecmp
 #endif
-
 #ifndef HAVE_STRNCASECMP
-#define strncasecmp nstrnicmp
+#define strncasecmp nstrncasecmp
+#endif
+#ifndef HAVE_STRCASESTR
+#define strcasestr nstrcasestr
+#endif
+#ifndef HAVE_STRNLEN
+#define strnlen nstrnlen
+#endif
+#ifndef HAVE_GETDELIM
+#define getdelim ngetdelim
+#endif
+#ifndef HAVE_GETLINE
+#define getline ngetline
 #endif
 
-/* Assume ERR is defined as -1.  To avoid duplicate case values when
- * some key definitions are missing, we have to set all of these, and
- * all of the special sentinel values below, to different negative
- * values other than -1. */
-
-/* HP-UX 10 & 11 do not seem to support KEY_HOME and KEY_END. */
-#ifndef KEY_HOME
-#define KEY_HOME -2
-#endif
-
-#ifndef KEY_END
-#define KEY_END -3
-#endif
-
-/* Slang and SunOS 5.7-5.9 do not seem to support KEY_RESIZE. */
-#ifndef KEY_RESIZE
-#define KEY_RESIZE -4
-#endif
-
-/* Slang does not seem to support KEY_SUSPEND, KEY_SLEFT, or
- * KEY_SRIGHT. */
-#ifndef KEY_SUSPEND
-#define KEY_SUSPEND -5
-#endif
-
-#ifndef KEY_SLEFT
-#define KEY_SLEFT -6
-#endif
-
-#ifndef KEY_SRIGHT
-#define KEY_SRIGHT -7
-#endif
-
-#define VERMSG "GNU nano " VERSION
-
-/* If we aren't using ncurses, turn the mouse support off, as it's
- * ncurses-specific. */
+/* If we aren't using ncurses with mouse support, turn the mouse support
+ * off, as it's useless then. */
 #ifndef NCURSES_MOUSE_VERSION
 #define DISABLE_MOUSE 1
 #endif
@@ -137,160 +148,235 @@
 #define DISABLE_WRAPJUSTIFY 1
 #endif
 
+/* Enumeration types. */
+typedef enum {
+    NIX_FILE, DOS_FILE, MAC_FILE
+} file_format;
+
+typedef enum {
+    OVERWRITE, APPEND, PREPEND
+} append_type;
+
+typedef enum {
+    UP_DIR, DOWN_DIR
+} scroll_dir;
+
+typedef enum {
+    CENTER, NONE
+} update_type;
+
 /* Structure types. */
 typedef struct filestruct {
     char *data;
-    struct filestruct *next;	/* Next node. */
-    struct filestruct *prev;	/* Previous node. */
-    int lineno;			/* The line number. */
+	/* The text of this line. */
+    ssize_t lineno;
+	/* The number of this line. */
+    struct filestruct *next;
+	/* Next node. */
+    struct filestruct *prev;
+	/* Previous node. */
 } filestruct;
 
-#ifdef ENABLE_MULTIBUFFER
+typedef struct partition {
+    filestruct *fileage;
+	/* The top line of this portion of the file. */
+    filestruct *top_prev;
+	/* The line before the top line of this portion of the file. */
+    char *top_data;
+	/* The text before the beginning of the top line of this portion
+	 * of the file. */
+    filestruct *filebot;
+	/* The bottom line of this portion of the file. */
+    filestruct *bot_next;
+	/* The line after the bottom line of this portion of the
+	 * file. */
+    char *bot_data;
+	/* The text after the end of the bottom line of this portion of
+	 * the file. */
+} partition;
+
+#ifdef ENABLE_COLOR
+typedef struct colortype {
+    short fg;
+	/* This syntax's foreground color. */
+    short bg;
+	/* This syntax's background color. */
+    bool bright;
+	/* Is this color A_BOLD? */
+    bool icase;
+	/* Is this regex string case insensitive? */
+    int pairnum;
+	/* The color pair number used for this foreground color and
+	 * background color. */
+    char *start_regex;
+	/* The start (or all) of the regex string. */
+    regex_t *start;
+	/* The compiled start (or all) of the regex string. */
+    char *end_regex;
+	/* The end (if any) of the regex string. */
+    regex_t *end;
+	/* The compiled end (if any) of the regex string. */
+    struct colortype *next;
+	/* Next set of colors. */
+} colortype;
+
+typedef struct exttype {
+    char *ext_regex;
+	/* The extensions that match this syntax. */
+    regex_t *ext;
+	/* The compiled extensions that match this syntax. */
+    struct exttype *next;
+	/* Next set of extensions. */
+} exttype;
+
+typedef struct syntaxtype {
+    char *desc;
+	/* The name of this syntax. */
+    exttype *extensions;
+	/* The list of extensions that this syntax applies to. */
+    colortype *color;
+	/* The colors used in this syntax. */
+    struct syntaxtype *next;
+	/* Next syntax. */
+} syntaxtype;
+#endif /* ENABLE_COLOR */
+
 typedef struct openfilestruct {
     char *filename;
-#ifndef NANO_SMALL
-    struct stat originalfilestat;
+	/* The current file's name. */
+    filestruct *fileage;
+	/* The current file's first line. */
+    filestruct *filebot;
+	/* The current file's last line. */
+    filestruct *edittop;
+	/* The current top of the edit window. */
+    filestruct *current;
+	/* The current file's current line. */
+    size_t totsize;
+	/* The current file's total number of characters. */
+    size_t current_x;
+	/* The current file's x-coordinate position. */
+    size_t placewewant;
+	/* The current file's place we want. */
+    ssize_t current_y;
+	/* The current file's y-coordinate position. */
+    bool modified;
+	/* Whether the current file has been modified. */
+#ifndef NANO_TINY
+    bool mark_set;
+	/* Whether the mark is on in the current file. */
+    filestruct *mark_begin;
+	/* The current file's beginning marked line, if any. */
+    size_t mark_begin_x;
+	/* The current file's beginning marked line's x-coordinate
+	 * position, if any. */
+    file_format fmt;
+	/* The current file's format. */
+    struct stat *current_stat;
+	/* The current file's stat. */
 #endif
-    struct openfilestruct *next;	/* Next node. */
-    struct openfilestruct *prev;	/* Previous node. */
-    struct filestruct *fileage;	/* Current file. */
-    struct filestruct *filebot;	/* Current file's last line. */
-#ifndef NANO_SMALL
-    struct filestruct *file_mark_beginbuf;
-				/* Current file's beginning marked
-				 * line. */
-    int file_mark_beginx;	/* Current file's beginning marked
-				 * line's x-coordinate position. */
+#ifdef ENABLE_COLOR
+    colortype *colorstrings;
+	/* The current file's associated colors. */
 #endif
-    int file_current_x;		/* Current file's x-coordinate
-				 * position. */
-    int file_current_y;		/* Current file's y-coordinate
-				 * position. */
-    int file_flags;		/* Current file's flags: modification
-				 * status (and marking status, if
-				 * available). */
-    int file_placewewant;	/* Current file's place we want. */
-    int file_totlines;		/* Current file's total number of
-				 * lines. */
-    long file_totsize;		/* Current file's total size. */
-    int file_lineno;		/* Current file's line number. */
+    struct openfilestruct *next;
+	/* Next node. */
+    struct openfilestruct *prev;
+	/* Previous node. */
 } openfilestruct;
-#endif
 
 typedef struct shortcut {
-    /* Key values that aren't used should be set to NANO_NO_KEY. */
-    int val;		/* Special sentinel key or control key we want
-			 * bound. */
-    int metaval;		/* Meta key we want bound. */
-    int func_key;	/* Function key we want bound. */
-    int misc;		/* Other Meta key we want bound. */
-    int viewok;		/* Is this function legal in view mode? */
-    int (*func) (void);	/* Function to call when we catch this key. */
-    const char *desc;	/* Description, e.g. "Page Up". */
+    const char *desc;
+	/* The function's description, e.g. "Page Up". */
 #ifndef DISABLE_HELP
-    const char *help;	/* Help file entry text. */
+    const char *help;
+	/* The help file entry text for this function. */
+    bool blank_after;
+	/* Whether there should be a blank line after the help entry
+	 * text for this function. */
 #endif
+    /* Note: Key values that aren't used should be set to
+     * NANO_NO_KEY. */
+    int ctrlval;
+	/* The special sentinel key or control key we want bound, if
+	 * any. */
+    int metaval;
+	/* The meta key we want bound, if any. */
+    int funcval;
+	/* The function key we want bound, if any. */
+    int miscval;
+	/* The other meta key we want bound, if any. */
+    bool viewok;
+	/* Is this function allowed when in view mode? */
+    void (*func)(void);
+	/* The function to call when we get this key. */
     struct shortcut *next;
+	/* Next shortcut. */
 } shortcut;
 
-#ifndef NANO_SMALL
+#ifndef NANO_TINY
 typedef struct toggle {
-   int val;		/* Sequence to toggle the key.  Should only need
-			 * one. */
-   const char *desc;	/* Description for when toggle is, uh, toggled,
-			 * e.g. "Cut to end"; we'll append Enabled or
-			 * Disabled. */
-   int flag;		/* What flag actually gets toggled. */
+   int val;
+	/* The sequence to toggle the key.  We should only need one. */
+   const char *desc;
+	/* The description of the toggle, e.g. "Cut to end"; we'll
+	 * append Enabled or Disabled to it. */
+#ifndef DISABLE_HELP
+   bool blank_after;
+	/* Whether there should be a blank line after the description of
+	 * the toggle. */
+#endif
+   long flag;
+	/* Which flag actually gets toggled. */
    struct toggle *next;
+	/* Next toggle. */
 } toggle;
-#endif /* !NANO_SMALL */
+#endif
 
 #ifdef ENABLE_NANORC
 typedef struct rcoption {
    const char *name;
-   int flag;
+	/* The name of the rcfile option. */
+   long flag;
+	/* The flag associated with it, if any. */
 } rcoption;
-#endif /* ENABLE_NANORC */
+#endif
 
-#ifdef ENABLE_COLOR
+/* Bitwise flags so that we can save space (or, more correctly, not
+ * waste it). */
+#define CASE_SENSITIVE			(1<<0)
+#define CONST_UPDATE			(1<<1)
+#define NO_HELP				(1<<2)
+#define NOFOLLOW_SYMLINKS		(1<<3)
+#define SUSPEND				(1<<4)
+#define NO_WRAP				(1<<5)
+#define AUTOINDENT			(1<<6)
+#define VIEW_MODE			(1<<7)
+#define USE_MOUSE			(1<<8)
+#define USE_REGEXP			(1<<9)
+#define TEMP_FILE			(1<<10)
+#define CUT_TO_END			(1<<11)
+#define BACKWARDS_SEARCH		(1<<12)
+#define MULTIBUFFER			(1<<13)
+#define SMOOTH_SCROLL			(1<<14)
+#define REBIND_DELETE			(1<<15)
+#define REBIND_KEYPAD			(1<<16)
+#define NO_CONVERT			(1<<17)
+#define BACKUP_FILE			(1<<18)
+#define NO_COLOR_SYNTAX			(1<<19)
+#define PRESERVE			(1<<20)
+#define HISTORYLOG			(1<<21)
+#define RESTRICTED			(1<<22)
+#define SMART_HOME			(1<<23)
+#define WHITESPACE_DISPLAY		(1<<24)
+#define MORE_SPACE			(1<<25)
+#define TABS_TO_SPACES			(1<<26)
+#define QUICK_BLANK			(1<<27)
+#define WORD_BOUNDS			(1<<28)
+#define NO_NEWLINES			(1<<29)
+#define BOLD_TEXT			(1<<30)
 
-typedef struct colortype {
-    int fg;			/* fg color */
-    int bg;			/* bg color */
-    int bright;			/* Is this color A_BOLD? */
-    int pairnum;		/* Color pair number used for this fg/bg */
-    regex_t start;		/* Start (or all) of the regex string */
-    regex_t *end;		/* End of the regex string */
-    struct colortype *next;
-} colortype;
-
-typedef struct exttype {
-    regex_t val;		/* The extensions that match this syntax. */
-    struct exttype *next;
-} exttype;
-
-typedef struct syntaxtype {
-    char *desc;			/* Name of this syntax type */
-    exttype *extensions;	/* List of extensions that this applies to */
-    colortype *color;		/* color struct for this syntax */
-    struct syntaxtype *next;
-} syntaxtype;
-
-#endif /* ENABLE_COLOR */
-
-#ifndef NANO_SMALL
-typedef struct historytype {
-    struct historytype *next;
-    struct historytype *prev;
-    char *data;
-} historytype;
-typedef struct historyheadtype {
-    struct historytype *next;	/* Keep *next and *prev members
-				 * together. */
-    struct historytype *prev;	/* And in same order as in
-				 * historytype. */
-    struct historytype *tail;
-    struct historytype *current;
-    int count;
-    int len;
-} historyheadtype;
-#endif /* !NANO_SMALL */
-
-/* Bitwise flags so we can save space (or more correctly, not waste
- * it). */
-#define MODIFIED		(1<<0)
-#define KEEP_CUTBUFFER		(1<<1)
-#define CASE_SENSITIVE		(1<<2)
-#define MARK_ISSET		(1<<3)
-#define CONSTUPDATE		(1<<4)
-#define NO_HELP			(1<<5)
-#define NOFOLLOW_SYMLINKS	(1<<6)
-#define SUSPEND			(1<<7)
-#define NO_WRAP			(1<<8)
-#define AUTOINDENT		(1<<9)
-#define VIEW_MODE		(1<<10)
-#define USE_MOUSE		(1<<11)
-#define USE_REGEXP		(1<<12)
-#define REGEXP_COMPILED		(1<<13)
-#define TEMP_OPT		(1<<14)
-#define CUT_TO_END		(1<<15)
-#define REVERSE_SEARCH		(1<<16)
-#define MULTIBUFFER		(1<<17)
-#define DOS_FILE		(1<<18)
-#define MAC_FILE		(1<<19)
-#define SMOOTHSCROLL		(1<<20)
-#define DISABLE_CURPOS		(1<<21)	/* Damn, we still need it. */
-#define REBIND_DELETE		(1<<22)
-#define NO_CONVERT		(1<<23)
-#define BACKUP_FILE		(1<<24)
-#define NO_RCFILE		(1<<25)
-#define COLOR_SYNTAX		(1<<26)
-#define PRESERVE		(1<<27)
-#define HISTORY_CHANGED		(1<<28)
-#define HISTORYLOG		(1<<29)
-#define JUSTIFY_MODE		(1<<30)
-
-/* Control key sequences, changing these would be very very bad. */
+/* Control key sequences.  Changing these would be very, very bad. */
 #define NANO_CONTROL_SPACE 0
 #define NANO_CONTROL_A 1
 #define NANO_CONTROL_B 2
@@ -325,157 +411,221 @@ typedef struct historyheadtype {
 #define NANO_CONTROL_7 31
 #define NANO_CONTROL_8 127
 
-#define NANO_ALT_A 'a'
-#define NANO_ALT_B 'b'
-#define NANO_ALT_C 'c'
-#define NANO_ALT_D 'd'
-#define NANO_ALT_E 'e'
-#define NANO_ALT_F 'f'
-#define NANO_ALT_G 'g'
-#define NANO_ALT_H 'h'
-#define NANO_ALT_I 'i'
-#define NANO_ALT_J 'j'
-#define NANO_ALT_K 'k'
-#define NANO_ALT_L 'l'
-#define NANO_ALT_M 'm'
-#define NANO_ALT_N 'n'
-#define NANO_ALT_O 'o'
-#define NANO_ALT_P 'p'
-#define NANO_ALT_Q 'q'
-#define NANO_ALT_R 'r'
-#define NANO_ALT_S 's'
-#define NANO_ALT_T 't'
-#define NANO_ALT_U 'u'
-#define NANO_ALT_V 'v'
-#define NANO_ALT_W 'w'
-#define NANO_ALT_X 'x'
-#define NANO_ALT_Y 'y'
-#define NANO_ALT_Z 'z'
-#define NANO_ALT_PERIOD '.'
-#define NANO_ALT_COMMA ','
-#define NANO_ALT_LCARAT '<'
-#define NANO_ALT_RCARAT '>'
-#define NANO_ALT_RBRACKET ']'
-#define NANO_ALT_SPACE ' '
+/* Meta key sequences. */
+#define NANO_META_SPACE ' '
+#define NANO_META_LPARENTHESIS '('
+#define NANO_META_RPARENTHESIS ')'
+#define NANO_META_PLUS '+'
+#define NANO_META_COMMA ','
+#define NANO_META_MINUS '-'
+#define NANO_META_PERIOD '.'
+#define NANO_META_SLASH '/'
+#define NANO_META_0 '0'
+#define NANO_META_6 '6'
+#define NANO_META_9 '9'
+#define NANO_META_LCARET '<'
+#define NANO_META_EQUALS '='
+#define NANO_META_RCARET '>'
+#define NANO_META_QUESTION '?'
+#define NANO_META_BACKSLASH '\\'
+#define NANO_META_RBRACKET ']'
+#define NANO_META_CARET '^'
+#define NANO_META_UNDERSCORE '_'
+#define NANO_META_A 'a'
+#define NANO_META_B 'b'
+#define NANO_META_C 'c'
+#define NANO_META_D 'd'
+#define NANO_META_E 'e'
+#define NANO_META_F 'f'
+#define NANO_META_G 'g'
+#define NANO_META_H 'h'
+#define NANO_META_I 'i'
+#define NANO_META_J 'j'
+#define NANO_META_K 'k'
+#define NANO_META_L 'l'
+#define NANO_META_M 'm'
+#define NANO_META_N 'n'
+#define NANO_META_O 'o'
+#define NANO_META_P 'p'
+#define NANO_META_Q 'q'
+#define NANO_META_R 'r'
+#define NANO_META_S 's'
+#define NANO_META_T 't'
+#define NANO_META_U 'u'
+#define NANO_META_V 'v'
+#define NANO_META_W 'w'
+#define NANO_META_X 'x'
+#define NANO_META_Y 'y'
+#define NANO_META_Z 'z'
+#define NANO_META_LCURLYBRACKET '{'
+#define NANO_META_PIPE '|'
+#define NANO_META_RCURLYBRACKET '}'
 
 /* Some semi-changeable keybindings; don't play with these unless you're
- * sure you know what you're doing. */
+ * sure you know what you're doing.  Assume ERR is defined as -1. */
 
 /* No key at all. */
-#define NANO_NO_KEY		-8
-
-/* Special sentinel key used for search string history. */
-#define NANO_HISTORY_KEY	-9
+#define NANO_NO_KEY			-2
 
 /* Normal keys. */
-#define NANO_INSERTFILE_KEY	NANO_CONTROL_R
-#define NANO_INSERTFILE_FKEY	KEY_F(5)
-#define NANO_EXIT_KEY		NANO_CONTROL_X
-#define NANO_EXIT_FKEY		KEY_F(2)
-#define NANO_WRITEOUT_KEY	NANO_CONTROL_O
-#define NANO_WRITEOUT_FKEY	KEY_F(3)
-#define NANO_GOTO_KEY		NANO_CONTROL_7
-#define NANO_GOTO_FKEY		KEY_F(13)
-#define NANO_ALT_GOTO_KEY	NANO_ALT_G
-#define NANO_HELP_KEY		NANO_CONTROL_G
-#define NANO_HELP_FKEY		KEY_F(1)
-#define NANO_WHEREIS_KEY	NANO_CONTROL_W
-#define NANO_WHEREIS_FKEY	KEY_F(6)
-#define NANO_WHEREIS_NEXT_KEY	NANO_ALT_W
-#define NANO_REPLACE_KEY	NANO_CONTROL_4
-#define NANO_REPLACE_FKEY	KEY_F(14)
-#define NANO_ALT_REPLACE_KEY	NANO_ALT_R
-#define NANO_OTHERSEARCH_KEY	NANO_CONTROL_R
-#define NANO_PREVPAGE_KEY	NANO_CONTROL_Y
-#define NANO_PREVPAGE_FKEY	KEY_F(7)
-#define NANO_NEXTPAGE_KEY	NANO_CONTROL_V
-#define NANO_NEXTPAGE_FKEY	KEY_F(8)
-#define NANO_CUT_KEY		NANO_CONTROL_K
-#define NANO_CUT_FKEY		KEY_F(9)
-#define NANO_UNCUT_KEY		NANO_CONTROL_U
-#define NANO_UNCUT_FKEY		KEY_F(10)
-#define NANO_CURSORPOS_KEY	NANO_CONTROL_C
-#define NANO_CURSORPOS_FKEY	KEY_F(11)
-#define NANO_SPELL_KEY		NANO_CONTROL_T
-#define NANO_SPELL_FKEY		KEY_F(12)
-#define NANO_FIRSTLINE_KEY	NANO_PREVPAGE_KEY
-#define NANO_LASTLINE_KEY	NANO_NEXTPAGE_KEY
-#define NANO_CANCEL_KEY		NANO_CONTROL_C
-#define NANO_REFRESH_KEY	NANO_CONTROL_L
-#define NANO_JUSTIFY_KEY	NANO_CONTROL_J
-#define NANO_JUSTIFY_FKEY	KEY_F(4)
-#define NANO_UNJUSTIFY_KEY	NANO_CONTROL_U
-#define NANO_UP_KEY		NANO_CONTROL_P
-#define NANO_DOWN_KEY		NANO_CONTROL_N
-#define NANO_FORWARD_KEY	NANO_CONTROL_F
-#define NANO_BACK_KEY		NANO_CONTROL_B
-#define NANO_MARK_KEY		NANO_CONTROL_6
-#define NANO_ALT_MARK_KEY	NANO_ALT_A
-#define NANO_HOME_KEY		NANO_CONTROL_A
-#define NANO_END_KEY		NANO_CONTROL_E
-#define NANO_DELETE_KEY		NANO_CONTROL_D
-#define NANO_BACKSPACE_KEY	NANO_CONTROL_H
-#define NANO_TAB_KEY		NANO_CONTROL_I
-#define NANO_SUSPEND_KEY	NANO_CONTROL_Z
-#define NANO_ENTER_KEY		NANO_CONTROL_M
-#define NANO_FROMSEARCHTOGOTO_KEY NANO_CONTROL_T
-#define NANO_TOFILES_KEY	NANO_CONTROL_T
-#define NANO_APPEND_KEY		NANO_ALT_A
-#define NANO_PREPEND_KEY	NANO_ALT_P
-#define NANO_OPENPREV_KEY	NANO_ALT_LCARAT
-#define NANO_OPENNEXT_KEY	NANO_ALT_RCARAT
-#define NANO_OPENPREV_ALTKEY	NANO_ALT_COMMA
-#define NANO_OPENNEXT_ALTKEY	NANO_ALT_PERIOD
-#define NANO_BRACKET_KEY	NANO_ALT_RBRACKET
-#define NANO_EXTCMD_KEY		NANO_CONTROL_X
-#define NANO_NEXTWORD_KEY	NANO_CONTROL_SPACE
-#define NANO_PREVWORD_KEY	NANO_ALT_SPACE
-#define NANO_PARABEGIN_KEY	NANO_CONTROL_W
-#define NANO_PARAEND_KEY	NANO_CONTROL_O
-#define NANO_VERBATIM_KEY	NANO_ALT_V
+#define NANO_XON_KEY			NANO_CONTROL_Q
+#define NANO_XOFF_KEY			NANO_CONTROL_S
+#define NANO_CANCEL_KEY			NANO_CONTROL_C
+#define NANO_EXIT_KEY			NANO_CONTROL_X
+#define NANO_EXIT_FKEY			KEY_F(2)
+#define NANO_INSERTFILE_KEY		NANO_CONTROL_R
+#define NANO_INSERTFILE_FKEY		KEY_F(5)
+#define NANO_TOOTHERINSERT_KEY		NANO_CONTROL_X
+#define NANO_WRITEOUT_KEY		NANO_CONTROL_O
+#define NANO_WRITEOUT_FKEY		KEY_F(3)
+#define NANO_GOTOLINE_KEY		NANO_CONTROL_7
+#define NANO_GOTOLINE_FKEY		KEY_F(13)
+#define NANO_GOTOLINE_METAKEY		NANO_META_G
+#define NANO_GOTODIR_KEY		NANO_CONTROL_7
+#define NANO_GOTODIR_FKEY		KEY_F(13)
+#define NANO_GOTODIR_METAKEY		NANO_META_G
+#define NANO_TOGOTOLINE_KEY		NANO_CONTROL_T
+#define NANO_HELP_KEY			NANO_CONTROL_G
+#define NANO_HELP_FKEY			KEY_F(1)
+#define NANO_WHEREIS_KEY		NANO_CONTROL_W
+#define NANO_WHEREIS_FKEY		KEY_F(6)
+#define NANO_WHEREIS_NEXT_KEY		NANO_META_W
+#define NANO_WHEREIS_NEXT_FKEY		KEY_F(16)
+#define NANO_TOOTHERWHEREIS_KEY		NANO_CONTROL_T
+#define NANO_REGEXP_KEY			NANO_META_R
+#define NANO_REPLACE_KEY		NANO_CONTROL_4
+#define NANO_REPLACE_FKEY		KEY_F(14)
+#define NANO_REPLACE_METAKEY		NANO_META_R
+#define NANO_TOOTHERSEARCH_KEY		NANO_CONTROL_R
+#define NANO_PREVPAGE_KEY		NANO_CONTROL_Y
+#define NANO_PREVPAGE_FKEY		KEY_F(7)
+#define NANO_NEXTPAGE_KEY		NANO_CONTROL_V
+#define NANO_NEXTPAGE_FKEY		KEY_F(8)
+#define NANO_CUT_KEY			NANO_CONTROL_K
+#define NANO_CUT_FKEY			KEY_F(9)
+#define NANO_COPY_KEY			NANO_META_CARET
+#define NANO_COPY_METAKEY		NANO_META_6
+#define NANO_UNCUT_KEY			NANO_CONTROL_U
+#define NANO_UNCUT_FKEY			KEY_F(10)
+#define NANO_CURSORPOS_KEY		NANO_CONTROL_C
+#define NANO_CURSORPOS_FKEY		KEY_F(11)
+#define NANO_SPELL_KEY			NANO_CONTROL_T
+#define NANO_SPELL_FKEY			KEY_F(12)
+#define NANO_FIRSTLINE_KEY		NANO_PREVPAGE_KEY
+#define NANO_FIRSTLINE_FKEY		NANO_PREVPAGE_FKEY
+#define NANO_FIRSTLINE_METAKEY		NANO_META_BACKSLASH
+#define NANO_FIRSTLINE_METAKEY2		NANO_META_PIPE
+#define NANO_FIRSTFILE_KEY		NANO_FIRSTLINE_KEY
+#define NANO_FIRSTFILE_FKEY		NANO_FIRSTLINE_FKEY
+#define NANO_FIRSTFILE_METAKEY		NANO_FIRSTLINE_METAKEY
+#define NANO_FIRSTFILE_METAKEY2		NANO_FIRSTLINE_METAKEY2
+#define NANO_LASTLINE_KEY		NANO_NEXTPAGE_KEY
+#define NANO_LASTLINE_FKEY		NANO_NEXTPAGE_FKEY
+#define NANO_LASTLINE_METAKEY		NANO_META_SLASH
+#define NANO_LASTLINE_METAKEY2		NANO_META_QUESTION
+#define NANO_LASTFILE_KEY		NANO_LASTLINE_KEY
+#define NANO_LASTFILE_FKEY		NANO_LASTLINE_FKEY
+#define NANO_LASTFILE_METAKEY		NANO_LASTLINE_METAKEY
+#define NANO_LASTFILE_METAKEY2		NANO_LASTLINE_METAKEY2
+#define NANO_REFRESH_KEY		NANO_CONTROL_L
+#define NANO_JUSTIFY_KEY		NANO_CONTROL_J
+#define NANO_JUSTIFY_FKEY		KEY_F(4)
+#define NANO_UNJUSTIFY_KEY		NANO_UNCUT_KEY
+#define NANO_UNJUSTIFY_FKEY		NANO_UNCUT_FKEY
+#define NANO_PREVLINE_KEY		NANO_CONTROL_P
+#define NANO_NEXTLINE_KEY		NANO_CONTROL_N
+#define NANO_FORWARD_KEY		NANO_CONTROL_F
+#define NANO_BACK_KEY			NANO_CONTROL_B
+#define NANO_MARK_KEY			NANO_CONTROL_6
+#define NANO_MARK_METAKEY		NANO_META_A
+#define NANO_MARK_FKEY			KEY_F(15)
+#define NANO_HOME_KEY			NANO_CONTROL_A
+#define NANO_END_KEY			NANO_CONTROL_E
+#define NANO_DELETE_KEY			NANO_CONTROL_D
+#define NANO_BACKSPACE_KEY		NANO_CONTROL_H
+#define NANO_TAB_KEY			NANO_CONTROL_I
+#define NANO_INDENT_KEY			NANO_META_RCURLYBRACKET
+#define NANO_UNINDENT_KEY		NANO_META_LCURLYBRACKET
+#define NANO_SUSPEND_KEY		NANO_CONTROL_Z
+#define NANO_ENTER_KEY			NANO_CONTROL_M
+#define NANO_TOFILES_KEY		NANO_CONTROL_T
+#define NANO_APPEND_KEY			NANO_META_A
+#define NANO_PREPEND_KEY		NANO_META_P
+#define NANO_PREVFILE_KEY		NANO_META_LCARET
+#define NANO_PREVFILE_METAKEY		NANO_META_COMMA
+#define NANO_NEXTFILE_KEY		NANO_META_RCARET
+#define NANO_NEXTFILE_METAKEY		NANO_META_PERIOD
+#define NANO_BRACKET_KEY		NANO_META_RBRACKET
+#define NANO_NEXTWORD_KEY		NANO_CONTROL_SPACE
+#define NANO_PREVWORD_KEY		NANO_META_SPACE
+#define NANO_WORDCOUNT_KEY		NANO_META_D
+#define NANO_SCROLLUP_KEY		NANO_META_MINUS
+#define NANO_SCROLLDOWN_KEY		NANO_META_PLUS
+#define NANO_SCROLLUP_METAKEY		NANO_META_UNDERSCORE
+#define NANO_SCROLLDOWN_METAKEY		NANO_META_EQUALS
+#define NANO_CUTTILLEND_METAKEY		NANO_META_T
+#define NANO_PARABEGIN_KEY		NANO_CONTROL_W
+#define NANO_PARABEGIN_METAKEY		NANO_META_LPARENTHESIS
+#define NANO_PARABEGIN_METAKEY2		NANO_META_9
+#define NANO_PARAEND_KEY		NANO_CONTROL_O
+#define NANO_PARAEND_METAKEY		NANO_META_RPARENTHESIS
+#define NANO_PARAEND_METAKEY2		NANO_META_0
+#define NANO_FULLJUSTIFY_KEY		NANO_CONTROL_U
+#define NANO_FULLJUSTIFY_METAKEY	NANO_META_J
+#define NANO_VERBATIM_KEY		NANO_META_V
 
-#ifndef NANO_SMALL
-/* Toggles do not exist with NANO_SMALL. */
-#define TOGGLE_CONST_KEY	NANO_ALT_C
-#define TOGGLE_AUTOINDENT_KEY	NANO_ALT_I
-#define TOGGLE_SUSPEND_KEY	NANO_ALT_Z
-#define TOGGLE_NOHELP_KEY	NANO_ALT_X
-#define TOGGLE_MOUSE_KEY	NANO_ALT_M
-#define TOGGLE_CUTTOEND_KEY	NANO_ALT_K
-#define TOGGLE_REGEXP_KEY	NANO_ALT_R
-#define TOGGLE_WRAP_KEY		NANO_ALT_L
-#define TOGGLE_BACKWARDS_KEY	NANO_ALT_B
-#define TOGGLE_CASE_KEY		NANO_ALT_C
-#define TOGGLE_MULTIBUFFER_KEY	NANO_ALT_F
-#define TOGGLE_DOS_KEY		NANO_ALT_D
-#define TOGGLE_MAC_KEY		NANO_ALT_O
-#define TOGGLE_SMOOTH_KEY	NANO_ALT_S
-#define TOGGLE_NOCONVERT_KEY	NANO_ALT_N
-#define TOGGLE_BACKUP_KEY	NANO_ALT_B
-#define TOGGLE_SYNTAX_KEY	NANO_ALT_Y
-#endif /* !NANO_SMALL */
+/* Toggles do not exist if NANO_TINY is defined. */
+#ifndef NANO_TINY
 
+/* No toggle at all. */
+#define TOGGLE_NO_KEY			-2
+
+/* Normal toggles. */
+#define TOGGLE_NOHELP_KEY		NANO_META_X
+#define TOGGLE_CONST_KEY		NANO_META_C
+#define TOGGLE_MORESPACE_KEY		NANO_META_O
+#define TOGGLE_SMOOTH_KEY		NANO_META_S
+#define TOGGLE_WHITESPACE_KEY		NANO_META_P
+#define TOGGLE_SYNTAX_KEY		NANO_META_Y
+#define TOGGLE_SMARTHOME_KEY		NANO_META_H
+#define TOGGLE_AUTOINDENT_KEY		NANO_META_I
+#define TOGGLE_CUTTOEND_KEY		NANO_META_K
+#define TOGGLE_WRAP_KEY			NANO_META_L
+#define TOGGLE_TABSTOSPACES_KEY		NANO_META_Q
+#define TOGGLE_BACKUP_KEY		NANO_META_B
+#define TOGGLE_MULTIBUFFER_KEY		NANO_META_F
+#define TOGGLE_MOUSE_KEY		NANO_META_M
+#define TOGGLE_NOCONVERT_KEY		NANO_META_N
+#define TOGGLE_SUSPEND_KEY		NANO_META_Z
+#define TOGGLE_CASE_KEY			NANO_META_C
+#define TOGGLE_BACKWARDS_KEY		NANO_META_B
+#define TOGGLE_DOS_KEY			NANO_META_D
+#define TOGGLE_MAC_KEY			NANO_META_M
+#endif /* !NANO_TINY */
+
+#define VIEW TRUE
+#define NOVIEW FALSE
+
+/* The maximum number of entries displayed in the main shortcut list. */
 #define MAIN_VISIBLE 12
 
-#define VIEW 1
-#define NOVIEW 0
+/* The minimum editor window columns and rows required for nano to work
+ * correctly. */
+#define MIN_EDITOR_COLS 4
+#define MIN_EDITOR_ROWS 1
 
-typedef enum {
-    TOP, CENTER, NONE
-} topmidnone;
-
-/* Minimum editor window rows required for nano to work correctly. */
-#define MIN_EDITOR_ROWS 3
-
-/* Minimum editor window cols required for nano to work correctly. */
-#define MIN_EDITOR_COLS 10
-
-/* Default number of characters from end-of-line where text wrapping
- * occurs. */
+/* The default number of characters from the end of the line where
+ * wrapping occurs. */
 #define CHARS_FROM_EOL 8
 
-/* Maximum number of search history strings saved, same value used for
- * replace history. */
+/* The default width of a tab in spaces. */
+#define WIDTH_OF_TAB 8
+
+/* The maximum number of search/replace history strings saved, not
+ * counting the blank lines at their ends. */
 #define MAX_SEARCH_HISTORY 100
 
+/* The maximum number of bytes buffered at one time. */
+#define MAX_BUF_SIZE 128
+
 #endif /* !NANO_H */