GNU nano 1.1.5 release

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

AUTHORS

@@ -24,3 +24,8 @@ 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.
+
+David Lawrence Ramsey <pooka_regent@sluggy.net>
+	* Multiple buffer support, operating dir (-o) option, bug fixes
+	  for display routines, wrapping code, spelling fixes, const
+	  mode and various other fixes.

ChangeLog

@@ -1,3 +1,78 @@
+nano-1.1.5 - 01/05/2002
+- General
+	- Better integration of View mode (-v) and multibuffer.
+	  Fixes to new_file(), do_insertfile_void(), shortcut_init()
+	  (David Lawrence Ramsey).
+	- The keypad handling has changed (again).  We now use 
+	  the keypad() function by default.  New flag -K, --keypad
+	  allows the old behavior for those using the keypad arrow keys
+	  and rxvt-based terminals.
+	- Updated copyright notices to 2002 (Jordi).
+- nano.c:
+  die()
+	- Only save files that were modified (David Lawrence Ramsey).
+  do_cont()
+	- Run signal_init() after doupdate() so ^Y wont suddenly
+	  start suspending after returning from ^Z suspend in Hurd.
+  signal_init()
+	- Unconditionally disable VDSUSP if it exists, stops ^Y
+	  suspending nano on the Hurd.
+  help_init()
+	- Typo fixes in help strings (Jordi).
+	- New variable helplen needes cause currslen is not always
+	  the length we want (bug found by David Lawrence Ramsey).
+	- Typo in file switch string (found by David Lawrence Ramsey).
+  main()
+	- Handle Alt prev/next file keys (,.), as well as normal ones (<>).
+	- Handle OS-specific insert keys by jump to do_insertkey (David
+	  Lawrence Ramsey).
+- files.c:
+  read_file()
+	- Make conversion message less confusing (suggested by Jordi).
+- rcfile.c:
+  parse_next_word()
+	- Get rid of ptr == \n check to abort, screws up option
+	  parsing (bug found by David Lawrence Ramsey)
+- winio.c:
+  update_line()
+	- set realdata check to >= 1 && <= 31, lack of > 0 check screwed
+	  high ascii characters.
+  titlebar()
+	- gettextized a pair of strings.
+  bottombars()
+	- Get rid of that annoying reversed line when color is on! :)
+  edit_add()
+	- Little fixes to let color highlights not bleed onto the next line.
+  statusq()
+	- Initialize "list".
+- m4/gettext.m4:
+	- Back down to 1.1.3 version.
+- faq.html:
+	- Various link updates and other fixes (Aaron S. Hawley).
+	- Typo fixes (David Lawrence Ramsey).
+- AUTHORS
+	- Add DLR.
+- po/sv.po:
+	- Swedish translation update (Christian Rose).
+- po/ru.po, uk.po:
+	- Russian and Ukrainian translations updates (Sergey A. Ribalchenko).
+- po/ca.po, es.po:
+	- Catalan and Spanish translations updates (Jordi).
+- po/pl.po:
+	- New Polish, partial translation, by Cezary Sliwa <sliwa@cft.edu.pl>.
+	- Wojciech Kotwica <wkotwica@post.pl> completed it and is the new
+	  official maintainer.
+- po/fr.po:
+	- French translation update (Michel Robitaille).
+- po/gl.po:
+	- Galician translation update (Jacobo Tarrío).
+- po/it.po:
+	- Italian translation update (Marco Colombo).
+- po/de.po:
+	- German translation update (Michael Piefel).
+- po/fr.po:
+	- French translation update (Jean-Philippe Guérard).
+
 nano-1.1.4 - 12/11/2001
 - General
 	- Preliminary syntax highlighting support.  New functions

NEWS

@@ -1,3 +1,17 @@
+01/05/2002 - GNU nano 1.1.5 is out.  The main new feature in this 
+		release if the changed behavior of the keypad.  Nano now 
+		does the Right Thing and used keypad() by default.  If
+		you wish to use the keypad arrow keys in certain 
+		terminals, you may use the -K or --keypad flag to
+		use the old behavior.  Users of other OSes should see 
+		better handling of their non-keypad keys in this 
+		release.  Other changes include more Hurd fixes, fixes
+		parsing the .nanorc, display fixes for the color syntax
+		highlighting, gettext stabilization and many translation
+		updates.  This is amost like a stable release, much like
+		in the 0.9.x series when every other release was the
+		mosts stable one :)  Have fun!
+		
 12/11/2001 - GNU nano 1.1.4 is released.  This release contains 
 		rudimentary color syntax support (but it's still
 		broken), compatibility fixes for the Hurd and FreeBSD,

THANKS

@@ -3,18 +3,23 @@ If we missed you here, let us now!
 
 Marco Colombo <magicdice@inwind.it>		Italian Translator
 Karl Eichwalder <keichwa@gmx.net>		German Translator
+Jean-Philippe Guérard <jean-philippe.guerard@laposte.net>
+						French Translator
 Tedi Heriyanto <tedi_h@gmx.net>			Indonesian Translator
 Václav Haisman <V.Haisman@sh.cvut.cz>		Czech Translator
 Szabolcs Horvath <horvaths@janus.gimsz.sulinet.hu>
 						Hungarian Translator
 Eivind Kjørstad <ekj@vestdata.no>		Norwegian (Bokmål) Translator
 Florian König <floki@bigfoot.com>		German Translator
+Wojciech Kotwica <wkotwica@post.pl>		Polish Translator
 Clement Laforet <clem_laf@wanadoo.fr>		French 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
 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
 Miquel Vidal <miquel@sindominio.net>		Catalan Translator
@@ -24,7 +29,6 @@ Jim Knoble <jmknoble@pobox.com>			Pico compat for browser
 Thomas Dickey <dickey@herndon4.his.com>		Curses help and advice
 Ryan Krebs <fluffy@highwire.stanford.edu>	Many bug fixes and testing
 Ken Tyler <kent@werple.net.au>			Super bug tester and advice
-David Lawrence Ramsey <pooka_regent@sluggy.net>	Patches galore
 Bill Soudan <wes0472@rit.edu>			Regex code, etc
 Ben Armstrong <synrg@sanctuary.nslug.ns.ca>	Negative -r value idea, code
 Jeremy Robichaud <robicj@yahoo.com>		Beta tester

TODO

@@ -20,16 +20,16 @@ Current Version:
 
 For Next Version:
 - Undo/Redo key?
-- Single line scroll up/down?
+- Single line scroll up/down? [DONE]
 - Color syntax highlighting? (certainly seems like there's a demand for it.)
-- .nanorc ?????
+- .nanorc [DONE]
 - Backup making (filename~)?
 - Search (etc) string history [1.1]
-- Implement Pico's -j and -g flags, as they are pretty easy to do.
+- Implement Pico's -j and -g flags, as they are pretty easy to do. [DONE]
 - Make mouse support work with clicking on the shortcuts (-m).  Must
   make global variable pointing to current shortcut list to determine what
   keystroke to ungetch(). [DONE].
-- Implement -o (chroot of sorts)
+- Implement -o (chroot of sorts) [DONE]
 - Allow -r to take a negative argument, meaning right margin instead of
   left (allows resizing that way), formerly -W arg. [DONE]
 - UTF-8 support.

color.c

@@ -2,7 +2,7 @@
 /**************************************************************************
  *   color.c                                                              *
  *                                                                        *
- *   Copyright (C) 1999 Chris Allegretta                                  *
+ *   Copyright (C) 1999-2002 Chris Allegretta                             *
  *   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)  *

config.sub

@@ -1,8 +1,10 @@
 #! /bin/sh
-# Configuration validation subroutine script, version 1.1.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
-#   Free Software Foundation, Inc.
-#
+# Configuration validation subroutine script.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002 Free Software Foundation, Inc.
+
+timestamp='2002-01-02'
+
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
 # can handle that machine.  It does not imply ALL GNU software can.
@@ -27,8 +29,8 @@
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
-# Written by Per Bothner <bothner@cygnus.com>.
-# Please send patches to <config-patches@gnu.org>.
+# Please send patches to <config-patches@gnu.org>.  Submit a context
+# diff and a properly formatted ChangeLog entry.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
@@ -50,30 +52,73 @@
 #	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
 # It is wrong to echo any other type of specification.
 
-if [ x$1 = x ]
-then
-	echo Configuration name missing. 1>&2
-	echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
-	echo "or     $0 ALIAS" 1>&2
-	echo where ALIAS is a recognized configuration type. 1>&2
-	exit 1
-fi
+me=`echo "$0" | sed -e 's,.*/,,'`
 
-# First pass through any local machine types.
-case $1 in
-	*local*)
-		echo $1
-		exit 0
-		;;
-	*)
-	;;
+usage="\
+Usage: $0 [OPTION] CPU-MFR-OPSYS
+       $0 [OPTION] ALIAS
+
+Canonicalize a configuration name.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.sub ($timestamp)
+
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit 0 ;;
+    --version | -v )
+       echo "$version" ; exit 0 ;;
+    --help | --h* | -h )
+       echo "$usage"; exit 0 ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help"
+       exit 1 ;;
+
+    *local*)
+       # First pass through any local machine types.
+       echo $1
+       exit 0;;
+
+    * )
+       break ;;
+  esac
+done
+
+case $# in
+ 0) echo "$me: missing argument$help" >&2
+    exit 1;;
+ 1) ;;
+ *) echo "$me: too many arguments$help" >&2
+    exit 1;;
 esac
 
 # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu*)
+  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -99,7 +144,7 @@ case $os in
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple)
+	-apple | -axis)
 		os=
 		basic_machine=$1
 		;;
@@ -113,6 +158,14 @@ case $os in
 		os=-vxworks
 		basic_machine=$1
 		;;
+	-chorusos*)
+		os=-chorusos
+		basic_machine=$1
+		;;
+ 	-chorusrdb)
+ 		os=-chorusrdb
+		basic_machine=$1
+ 		;;
 	-hiux*)
 		os=-hiuxwe2
 		;;
@@ -171,30 +224,50 @@ esac
 case $basic_machine in
 	# Recognize the basic CPU types without company name.
 	# Some are omitted here because they have special meanings below.
-	tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
-		| arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
-		| 580 | i960 | h8300 \
-		| x86 | ppcbe | mipsbe | mipsle | shbe | shle | armbe | armle \
-		| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
-		| hppa64 \
-		| alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
-		| alphaev6[78] \
-		| we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
-		| 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
-		| mips64orion | mips64orionel | mipstx39 | mipstx39el \
-		| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
-		| mips64vr5000 | miprs64vr5000el | mcore \
-		| sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
-		| thumb | d10v | fr30 | avr)
+	1750a | 580 \
+	| a29k \
+	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+	| c4x | clipper \
+	| d10v | d30v | dsp16xx \
+	| fr30 \
+	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+	| i370 | i860 | i960 | ia64 \
+	| m32r | m68000 | m68k | m88k | mcore \
+	| mips16 | mips64 | mips64el | mips64orion | mips64orionel \
+	| mips64vr4100 | mips64vr4100el | mips64vr4300 \
+	| mips64vr4300el | mips64vr5000 | mips64vr5000el \
+	| mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
+	| mipsisa32 \
+	| mn10200 | mn10300 \
+	| ns16k | ns32k \
+	| openrisc \
+	| pdp10 | pdp11 | pj | pjl \
+	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+	| pyramid \
+	| sh | sh[34] | sh[34]eb | shbe | shle \
+	| sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \
+	| strongarm \
+	| tahoe | thumb | tic80 | tron \
+	| v850 | v850e \
+	| we32k \
+	| x86 | xscale | xstormy16 | xtensa \
+	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65 | pj | pjl)
+	m6811 | m68hc11 | m6812 | m68hc12)
+		# Motorola 68HC11/12.
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
 		;;
 
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
 	# (2) the word "unknown" tends to confuse beginning users.
-	i[34567]86)
+	i*86 | x86_64)
 	  basic_machine=$basic_machine-pc
 	  ;;
 	# Object if more than one company name word.
@@ -203,28 +276,45 @@ case $basic_machine in
 		exit 1
 		;;
 	# Recognize the basic CPU types with company name.
-	# FIXME: clean up the formatting here.
-	vax-* | tahoe-* | i[34567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
-	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
-	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
-	      | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
-	      | xmp-* | ymp-* \
-	      | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* | armbe-* | armle-* \
-	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \
-	      | hppa2.0n-* | hppa64-* \
-	      | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \
-	      | alphaev6[78]-* \
-	      | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
-	      | clipper-* | orion-* \
-	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
-	      | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
-	      | mips64el-* | mips64orion-* | mips64orionel-* \
-	      | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
-	      | mipstx39-* | mipstx39el-* | mcore-* \
-	      | f301-* | armv*-* | s390-* | sv1-* | t3e-* \
-	      | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
-	      | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* \
-	      | bs2000-*)
+	580-* \
+	| a29k-* \
+	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+	| arm-*  | armbe-* | armle-* | armv*-* \
+	| avr-* \
+	| bs2000-* \
+	| c[123]* | c30-* | [cjt]90-* | c54x-* \
+	| clipper-* | cray2-* | cydra-* \
+	| d10v-* | d30v-* \
+	| elxsi-* \
+	| f30[01]-* | f700-* | fr30-* | fx80-* \
+	| h8300-* | h8500-* \
+	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+	| i*86-* | i860-* | i960-* | ia64-* \
+	| m32r-* \
+	| m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \
+	| m88110-* | m88k-* | mcore-* \
+	| mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
+	| mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
+	| mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
+	| mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \
+	| none-* | np1-* | ns16k-* | ns32k-* \
+	| orion-* \
+	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+	| pyramid-* \
+	| romp-* | rs6000-* \
+	| sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \
+	| sparc-* | sparc64-* | sparc86x-* | sparclite-* \
+	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* \
+	| t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
+	| v850-* | v850e-* | vax-* \
+	| we32k-* \
+	| x86-* | x86_64-* | xmp-* | xps100-* | xscale-* | xstormy16-* \
+	| xtensa-* \
+	| ymp-* \
+	| z8k-*)
 		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
@@ -261,14 +351,14 @@ case $basic_machine in
 		os=-sysv
 		;;
 	amiga | amiga-*)
-		basic_machine=m68k-cbm
+		basic_machine=m68k-unknown
 		;;
 	amigaos | amigados)
-		basic_machine=m68k-cbm
+		basic_machine=m68k-unknown
 		os=-amigaos
 		;;
 	amigaunix | amix)
-		basic_machine=m68k-cbm
+		basic_machine=m68k-unknown
 		os=-sysv4
 		;;
 	apollo68)
@@ -315,19 +405,30 @@ case $basic_machine in
 		basic_machine=cray2-cray
 		os=-unicos
 		;;
-	[ctj]90-cray)
-		basic_machine=c90-cray
+	[cjt]90)
+		basic_machine=${basic_machine}-cray
 		os=-unicos
 		;;
 	crds | unos)
 		basic_machine=m68k-crds
 		;;
+	cris | cris-* | etrax*)
+		basic_machine=cris-axis
+		;;
 	da30 | da30-*)
 		basic_machine=m68k-da30
 		;;
 	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
 		basic_machine=mips-dec
 		;;
+	decsystem10* | dec10*)
+		basic_machine=pdp10-dec
+		os=-tops10
+		;;
+	decsystem20* | dec20*)
+		basic_machine=pdp10-dec
+		os=-tops20
+		;;
 	delta | 3300 | motorola-3300 | motorola-delta \
 	      | 3300-motorola | delta-motorola)
 		basic_machine=m68k-motorola
@@ -369,6 +470,10 @@ case $basic_machine in
 		basic_machine=tron-gmicro
 		os=-sysv
 		;;
+	go32)
+		basic_machine=i386-pc
+		os=-go32
+		;;
 	h3050r* | hiux*)
 		basic_machine=hppa1.1-hitachi
 		os=-hiuxwe2
@@ -444,19 +549,19 @@ case $basic_machine in
 		basic_machine=i370-ibm
 		;;
 # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-	i[34567]86v32)
+	i*86v32)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv32
 		;;
-	i[34567]86v4*)
+	i*86v4*)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv4
 		;;
-	i[34567]86v)
+	i*86v)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv
 		;;
-	i[34567]86sol2)
+	i*86sol2)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-solaris2
 		;;
@@ -468,14 +573,6 @@ case $basic_machine in
 		basic_machine=i386-unknown
 		os=-vsta
 		;;
-	i386-go32 | go32)
-		basic_machine=i386-unknown
-		os=-go32
-		;;
-	i386-mingw32 | mingw32)
-		basic_machine=i386-unknown
-		os=-mingw32
-		;;
 	iris | iris4d)
 		basic_machine=mips-sgi
 		case $os in
@@ -501,6 +598,10 @@ case $basic_machine in
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
+	mingw32)
+		basic_machine=i386-pc
+		os=-mingw32
+		;;
 	miniframe)
 		basic_machine=m68000-convergent
 		;;
@@ -530,8 +631,12 @@ case $basic_machine in
 		basic_machine=m68k-rom68k
 		os=-coff
 		;;
+	morphos)
+		basic_machine=powerpc-unknown
+		os=-morphos
+		;;
 	msdos)
-		basic_machine=i386-unknown
+		basic_machine=i386-pc
 		os=-msdos
 		;;
 	mvs)
@@ -595,6 +700,10 @@ case $basic_machine in
 		basic_machine=i960-intel
 		os=-mon960
 		;;
+	nonstopux)
+		basic_machine=mips-compaq
+		os=-nonstopux
+		;;
 	np1)
 		basic_machine=np1-gould
 		;;
@@ -630,28 +739,28 @@ case $basic_machine in
         pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
-	pentium | p5 | k5 | k6 | nexen)
+	pentium | p5 | k5 | k6 | nexgen | viac3)
 		basic_machine=i586-pc
 		;;
-	pentiumpro | p6 | 6x86)
+	pentiumpro | p6 | 6x86 | athlon)
 		basic_machine=i686-pc
 		;;
 	pentiumii | pentium2)
-		basic_machine=i786-pc
+		basic_machine=i686-pc
 		;;
-	pentium-* | p5-* | k5-* | k6-* | nexen-*)
+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	pentiumpro-* | p6-* | 6x86-*)
+	pentiumpro-* | p6-* | 6x86-* | athlon-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pentiumii-* | pentium2-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pn)
 		basic_machine=pn-gould
 		;;
-	power)	basic_machine=rs6000-ibm
+	power)	basic_machine=power-ibm
 		;;
 	ppc)	basic_machine=powerpc-unknown
 	        ;;
@@ -663,9 +772,23 @@ case $basic_machine in
 	ppcle-* | powerpclittle-*)
 		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
+	ppc64)	basic_machine=powerpc64-unknown
+	        ;;
+	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+		basic_machine=powerpc64le-unknown
+	        ;;
+	ppc64le-* | powerpc64little-*)
+		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	ps2)
 		basic_machine=i386-ibm
 		;;
+	pw32)
+		basic_machine=i586-unknown
+		os=-pw32
+		;;
 	rom68k)
 		basic_machine=m68k-rom68k
 		os=-coff
@@ -676,6 +799,12 @@ case $basic_machine in
 	rtpc | rtpc-*)
 		basic_machine=romp-ibm
 		;;
+	s390 | s390-*)
+		basic_machine=s390-ibm
+		;;
+	s390x | s390x-*)
+		basic_machine=s390x-ibm
+		;;
 	sa29200)
 		basic_machine=a29k-amd
 		os=-udi
@@ -687,7 +816,7 @@ case $basic_machine in
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
-	sparclite-wrs)
+	sparclite-wrs | simso-wrs)
 		basic_machine=sparclite-wrs
 		os=-vxworks
 		;;
@@ -757,12 +886,20 @@ case $basic_machine in
 		basic_machine=t3e-cray
 		os=-unicos
 		;;
+	tic54x | c54x*)
+		basic_machine=tic54x-unknown
+		os=-coff
+		;;
 	tx39)
 		basic_machine=mipstx39-unknown
 		;;
 	tx39el)
 		basic_machine=mipstx39el-unknown
 		;;
+	toad1)
+		basic_machine=pdp10-xkl
+		os=-tops20
+		;;
 	tower | tower-32)
 		basic_machine=m68k-ncr
 		;;
@@ -809,6 +946,10 @@ case $basic_machine in
 		basic_machine=hppa1.1-winbond
 		os=-proelf
 		;;
+	windows32)
+		basic_machine=i386-pc
+		os=-windows32-msvcrt
+		;;
 	xmp)
 		basic_machine=xmp-cray
 		os=-unicos
@@ -852,13 +993,20 @@ case $basic_machine in
 	vax)
 		basic_machine=vax-dec
 		;;
+	pdp10)
+		# there are many clones, so DEC is not a safe bet
+		basic_machine=pdp10-unknown
+		;;
 	pdp11)
 		basic_machine=pdp11-dec
 		;;
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sparc | sparcv9)
+	sh3 | sh4 | sh3eb | sh4eb)
+		basic_machine=sh-unknown
+		;;
+	sparc | sparcv9 | sparcv9b)
 		basic_machine=sparc-sun
 		;;
         cydra)
@@ -880,6 +1028,9 @@ case $basic_machine in
 		basic_machine=c4x-none
 		os=-coff
 		;;
+	*-unknown)
+		# Make sure to match an already-canonicalized machine name.
+		;;
 	*)
 		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
 		exit 1
@@ -936,15 +1087,18 @@ case $os in
 	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+	      | -chorusos* | -chorusrdb* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
-	      | -openstep* | -oskit*)
+	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* | -morphos*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
 		case $basic_machine in
-		    x86-* | i[34567]86-*)
+		    x86-* | i*86-*)
 			;;
 		    *)
 			os=-nto$os
@@ -991,6 +1145,9 @@ case $os in
 	-acis*)
 		os=-aos
 		;;
+	-atheos*)
+		os=-atheos
+		;;
 	-386bsd)
 		os=-bsd
 		;;
@@ -1000,7 +1157,7 @@ case $os in
 	-ns2 )
 	        os=-nextstep2
 		;;
-	-nsk)
+	-nsk*)
 		os=-nsk
 		;;
 	# Preserve the version number of sinix5.
@@ -1037,7 +1194,7 @@ case $os in
 	-xenix)
 		os=-xenix
 		;;
-        -*mint | -*MiNT)
+        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
 	        os=-mint
 		;;
 	-none)
@@ -1071,6 +1228,10 @@ case $basic_machine in
 	arm*-semi)
 		os=-aout
 		;;
+	# This must come before the *-dec entry.
+	pdp10-*)
+		os=-tops20
+		;;
         pdp11-*)
 		os=-none
 		;;
@@ -1179,7 +1340,7 @@ case $basic_machine in
 	*-masscomp)
 		os=-rtu
 		;;
-	f301-fujitsu)
+	f30[01]-fujitsu | f700-fujitsu)
 		os=-uxpv
 		;;
 	*-rom68k)
@@ -1257,12 +1418,23 @@ case $basic_machine in
 			-mpw* | -macos*)
 				vendor=apple
 				;;
-			-*mint | -*MiNT)
+			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
 				vendor=atari
 				;;
+			-vos*)
+				vendor=stratus
+				;;
 		esac
 		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
 		;;
 esac
 
 echo $basic_machine$os
+exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:

configure.in

@@ -1,9 +1,9 @@
 # $Id$
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(nano.c)
-AM_INIT_AUTOMAKE(nano, 1.1.4)
+AM_INIT_AUTOMAKE(nano, 1.1.5)
 AM_CONFIG_HEADER(config.h:config.h.in)
-ALL_LINGUAS="es de fr it id fi hu ca cs gl uk ru sv no nl da"
+ALL_LINGUAS="es de fr it id fi hu ca cs gl uk ru sv no nl da pl"
 
 dnl Checks for programs.
 AC_PROG_CC

cut.c

@@ -2,7 +2,7 @@
 /**************************************************************************
  *   cut.c                                                                *
  *                                                                        *
- *   Copyright (C) 1999 Chris Allegretta                                  *
+ *   Copyright (C) 1999-2002 Chris Allegretta                             *
  *   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)  *

faq.html

@@ -45,7 +45,7 @@ packages.</a></font>
 RPM or DEB package?</a></font>
 <br><font color="#330000"><a href="#3.2">3.2. Compiling from source: WHAT
 THE HECK DO I DO NOW?</a></font>
-<br><font color="#330000"><a href="#3.2">3.3. Why does everything go into
+<br><font color="#330000"><a href="#3.3">3.3. Why does everything go into
 /usr/local?</a></font>
 <br><font color="#330000"><a href="#3.4">3.4. I get errors about 'bindtextdomain',
 'gettext' and/or 'gettextdomain'.&nbsp; What can I do about it?</a></font>
@@ -94,7 +94,7 @@ nano instead of Pico?</a></font>
 <br><font color="#330000"><a href="#6.2">6.2. Why should I use Pico instead
 of nano?</a></font>
 <br><font color="#330000"><a href="#6.3">6.3. What is so bad about the
-PINE license?</a></font>
+Pine license?</a></font>
 <br><font color="#330000"><a href="#6.4">6.4. Okay, well what mail program
 should I use then?</a></font>
 <br><font color="#330000"><a href="#6.5">6.5. Why doesn't UW simply change
@@ -142,7 +142,7 @@ it is useful enough it will be included in future versions.</font></blockquote>
 <a NAME="1.3"></a><font color="#330000">1.3. What is GNU nano?</font></h2>
 
 <blockquote><font color="#330000">GNU Nano is designed to be a free
-replacement for the Pico text editor, part of the PINE email suite from <a
+replacement for the Pico text editor, part of the Pine email suite from <a
 href="http://www.washington.edu/pine">The University of
 Washington</a>.&nbsp; It aims to "emulate Pico as closely as possible and
 perhaps include extra functionality.</font></blockquote>
@@ -203,7 +203,7 @@ nano was developed).</font></blockquote>
 of nano?</font></h2>
 
 <blockquote><font color="#330000">The current version of nano *should*
-be 1.1.4.&nbsp; Of course you should always check the nano hompage to
+be 1.1.5.&nbsp; Of course you should always check the nano homepage to
 see what the latest and greatest version is.</font></blockquote>
 
 <h2>
@@ -252,10 +252,10 @@ packages.</font></h2>
 at:</font>
 <ul>
 <li>
-<font color="#330000"><a href="http://metalab.unc.edu/pub/Linux/distributions/redhat/contrib/libc6/i386">http://metalab.unc.edu/pub/Linux/distributions/redhat/contrib/libc6/i386</a></font></li>
+<font color="#330000"><a href="http://distro.ibiblio.org/pub/Linux/distributions/redhat/contrib/libc6/i386">http://metalab.unc.edu/pub/Linux/distributions/redhat/contrib/libc6/i386</a></font></li>
 
 <li>
-<font color="#330000"><a href="ftp://metalab.unc.edu/pub/Linux/distributions/redhat/contrib/libc6/i386">ftp://metalab.unc.edu/pub/Linux/distributions/redhat/contrib/libc6/i386</a></font></li>
+<font color="#330000"><a href="ftp://distro.ibiblio.org/pub/Linux/distributions/redhat/contrib/libc6/i386">ftp://metalab.unc.edu/pub/Linux/distributions/redhat/contrib/libc6/i386</a></font></li>
 </ul>
 </blockquote>
 
@@ -394,7 +394,7 @@ try:
 3.7. Tell me more about this multibuffer stuff!</font></h2>
 
 <blockquote><font color="#330000"> To use multiple file buffers, you must
-be using nano 1.1.4 or newer, and you must have configured nano with
+be using nano 1.1.5 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
@@ -414,7 +414,7 @@ buffer is open.
 
 <blockquote><font color="#330000"> It's not hard at all!  But, your version
 of nano must have beem compiled with <b>--enable-nanorc</b>, and again must
-be version 1.1.4 or newer (use nano -V to check your version and compiled
+be version 1.1.5 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,
@@ -585,7 +585,7 @@ mailer integration with Pine), nano is the way to go.
 </blockquote>
 
 <h2>
-<a NAME="6.3"></a><font color="#330000">6.3. What is so bad about the PINE
+<a NAME="6.3"></a><font color="#330000">6.3. What is so bad about the Pine
 license?</font></h2>
 
 <blockquote><font color="#330000">The U of W license for Pine and
@@ -602,7 +602,7 @@ both, i.e. distribute modified binaries.</blockquote>
 should I use then?</font></h2>
 
 <blockquote><font color="#330000"> If you are looking to use a Free
-Software program similar to PINE and emacs is not your thing, you should
+Software program similar to Pine and emacs is not your thing, you should
 definitely take a look at <a href="http://www.mutt.org">mutt</a>.&nbsp; It
 is a full-screen, console based mail program that actually has a lot more
 flexibility than Pine, but has a keymap included in the distribution that
@@ -682,6 +682,7 @@ and you should know the answer.</font></blockquote>
 <a NAME="8"></a><font color="#330000">8. ChangeLog</font>
 </h2>
 
+<blockquote>2001/12/26 - Misc. fixes (Aaron S. Hawley, DLR).</blockquote>
 <blockquote>2001/10/02 - Update for Free Translation Project.</blockquote>
 <blockquote>2001/10/02 - Assorted fixes, Debian additions.</blockquote>
 <blockquote>2001/06/30 - Silly typo fix.</blockquote>

files.c

@@ -2,7 +2,7 @@
 /**************************************************************************
  *   files.c                                                              *
  *                                                                        *
- *   Copyright (C) 1999 Chris Allegretta                                  *
+ *   Copyright (C) 1999-2002 Chris Allegretta                             *
  *   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)  *
@@ -93,11 +93,19 @@ void new_file(void)
        duplicates; without this, if nano is started without a filename on
        the command line, a new file will be created, but it will be given
        no open_files entry, leading to problems later on */
-    if (!open_files)
+    if (!open_files) {
 	add_open_file(0, 0);
+	/* turn off view mode in this case; this is for consistency
+	   whether multibuffers are compiled in or not */
+	UNSET(VIEW_MODE);
+    }
+#else
+    /* if multibuffers haven't been compiled in, turn off view mode
+       unconditionally; otherwise, don't turn them off (except in the
+       above case), so that we can view multiple files properly */
+    UNSET(VIEW_MODE);
 #endif
 
-    UNSET(VIEW_MODE);
 }
 
 
@@ -259,9 +267,9 @@ int read_file(int fd, char *filename, int quiet)
 
 #ifndef NANO_SMALL
     if (fileformat == 2)
-	statusbar(_("Read %d lines (Converted Mac format)"), num_lines);
+	statusbar(_("Read %d lines (Converted from Mac format)"), num_lines);
     else if (fileformat == 1)
-	statusbar(_("Read %d lines (Converted DOS format)"), num_lines);
+	statusbar(_("Read %d lines (Converted from DOS format)"), num_lines);
     else
 #endif
 	statusbar(_("Read %d lines"), num_lines);
@@ -440,7 +448,14 @@ int do_insertfile_void(void)
 {
     int result = 0;
 #ifdef ENABLE_MULTIBUFFER
-    result = do_insertfile(ISSET(MULTIBUFFER));
+    if (ISSET(VIEW_MODE)) {
+	if (ISSET(MULTIBUFFER))
+	    result = do_insertfile(1);
+	else
+	    statusbar(_("Key illegal in non-multibuffer mode"));
+    }
+    else
+	result = do_insertfile(ISSET(MULTIBUFFER));
 #else
     result = do_insertfile(0);
 #endif
@@ -523,10 +538,16 @@ int add_open_file(int update, int dup_fix)
     /* save current line number */
     open_files->lineno = current->lineno;
 
-    /* save current filestruct and restore full file position afterward */
-    open_files->file = nmalloc(sizeof(filestruct));
-    open_files->file = copy_filestruct(fileage);
-    do_gotopos(open_files->lineno, open_files->file_current_x, open_files->file_current_y, open_files->file_placewewant);
+    /* if we're in view mode and updating, the file contents won't
+       have changed, so we won't bother resaving the filestruct
+       then; otherwise, we will */
+    if (!(ISSET(VIEW_MODE) && !update)) {
+	/* save current filestruct and restore full file position
+	   afterward */
+	open_files->file = nmalloc(sizeof(filestruct));
+	open_files->file = copy_filestruct(fileage);
+	do_gotopos(open_files->lineno, open_files->file_current_x, open_files->file_current_y, open_files->file_placewewant);
+    }
 
     /* save current modification status */
     open_files->file_modified = ISSET(MODIFIED);

global.c

@@ -2,7 +2,7 @@
 /**************************************************************************
  *   global.c                                                             *
  *                                                                        *
- *   Copyright (C) 1999 Chris Allegretta                                  *
+ *   Copyright (C) 1999-2002 Chris Allegretta                             *
  *   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)  *
@@ -324,15 +324,31 @@ void shortcut_init(int unjustify)
 		    nano_justify_msg, 0, NANO_JUSTIFY_FKEY, 0,
 		    NOVIEW, do_justify);
     else
+
+#ifdef ENABLE_MULTIBUFFER
+	/* this is so we can view multiple files */
+	sc_init_one(&main_list[3], NANO_INSERTFILE_KEY, _("Read File"),
+		nano_insert_msg,
+		0, NANO_INSERTFILE_FKEY, 0, VIEW, do_insertfile_void);
+#else
 	sc_init_one(&main_list[3], NANO_INSERTFILE_KEY, _("Read File"),
 		nano_insert_msg,
 		0, NANO_INSERTFILE_FKEY, 0, NOVIEW, do_insertfile_void);
-
+#endif
 
     if (ISSET(PICO_MODE))
+
+#ifdef ENABLE_MULTIBUFFER
+	/* this is so we can view multiple files */
+	sc_init_one(&main_list[4], NANO_INSERTFILE_KEY, _("Read File"),
+		nano_insert_msg,
+		0, NANO_INSERTFILE_FKEY, 0, VIEW, do_insertfile_void);
+#else
 	sc_init_one(&main_list[4], NANO_INSERTFILE_KEY, _("Read File"),
 		nano_insert_msg,
 		0, NANO_INSERTFILE_FKEY, 0, NOVIEW, do_insertfile_void);
+#endif
+
     else
 	sc_init_one(&main_list[4], NANO_REPLACE_KEY, _("Replace"),
 		    nano_replace_msg,

m4/gettext.m4

@@ -21,9 +21,21 @@ AC_DEFUN(NANO_AM_WITH_NLS,
 
     USE_INCLUDED_LIBINTL=no
 
+    AC_ARG_WITH(locale-dir,
+      [  --with-locale-dir=DIR   specify locale directory],
+      LOCALE_DIR=$withval)
+    test -z "$LOCALE_DIR" && LOCALE_DIR='$(datadir)/locale'
+    AC_SUBST(LOCALE_DIR)
+
+    AC_ARG_WITH(gnu-locale-dir,
+      [  --with-gnu-locale-dir=DIR specify GNU locale directory],
+      GNU_LOCALE_DIR=$withval)
+    test -z "$GNU_LOCALE_DIR" && GNU_LOCALE_DIR='$(prefix)/share/locale'
+    AC_SUBST(GNU_LOCALE_DIR)
+
     dnl If we use NLS figure out what method
     if test "$USE_NLS" = "yes"; then
-      AC_DEFINE(ENABLE_NLS)
+      AC_DEFINE(ENABLE_NLS, 1, [Define to 1 if NLS is requested.])
       AC_MSG_CHECKING([whether included gettext is requested])
       AC_ARG_WITH(included-gettext,
         [  --with-included-gettext use the GNU gettext library included here],
@@ -48,18 +60,13 @@ AC_DEFUN(NANO_AM_WITH_NLS,
 
 	   if test "$gt_cv_func_gettext_libc" != "yes"; then
 	     AC_CHECK_LIB(intl, bindtextdomain,
-	       [AC_CHECK_LIB(intl, gettext,
-	         gt_cv_func_gettext_libintl=yes,
-		 gt_cv_func_gettext_libintl=no)])
-	   fi
-	   
-	   if test "$gt_cv_func_gettext_libintl" = yes; then
-	     LIBS="$LIBS -lintl"
+	       [AC_CHECK_LIB(intl, gettext)])
 	   fi
 
 	   if test "$gt_cv_func_gettext_libc" = "yes" \
-	      || test "$gt_cv_func_gettext_libintl" = "yes"; then
-	      AC_DEFINE(HAVE_GETTEXT)
+	      || test "$ac_cv_lib_intl_gettext" = "yes"; then
+	      AC_DEFINE(HAVE_GETTEXT, 1,
+	  [Define to 1 if you have gettext and don't want to use GNU gettext.])
 	      NANO_AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
 		[test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
 	      if test "$MSGFMT" != "no"; then

move.c

@@ -2,7 +2,7 @@
 /**************************************************************************
  *   move.c                                                               *
  *                                                                        *
- *   Copyright (C) 1999 Chris Allegretta                                  *
+ *   Copyright (C) 1999-2002 Chris Allegretta                             *
  *   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)  *

nano.1

@@ -1,12 +1,12 @@
 .\" Hey, EMACS: -*- nroff -*-
-.\" nano.1 is copyright 1999-2000 by
+.\" nano.1 is copyright 1999-2002 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.
 .\"
 .\" $Id$
-.TH NANO 1 "October 3, 2001"
+.TH NANO 1 "January 3, 2002"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .SH NAME
@@ -37,6 +37,11 @@ Write file in DOS format.
 .B \-F (\-\-multibuffer)
 Enable multiple file buffers (if available).
 .TP
+.B \-K (\-\-keypad)
+Do not use the ncurses keypad() call unless necessary.  Try this flag if 
+you find that the arrow keys on the numeric keypad do not work for you 
+under nano.
+.TP
 .B \-M (\-\-mac)
 Write file in Mac format.
 .TP

nano.1.html

@@ -3,7 +3,7 @@ Content-type: text/html
 <HTML><HEAD><TITLE>Manpage of NANO</TITLE>
 </HEAD><BODY>
 <H1>NANO</H1>
-Section: User Commands  (1)<BR>Updated: October 3, 2001<BR><A HREF="#index">Index</A>
+Section: User Commands  (1)<BR>Updated: January 3, 2002<BR><A HREF="#index">Index</A>
 <A HREF="http://localhost/cgi-bin/man/man2html">Return to Main Contents</A><HR>
 
 
@@ -52,6 +52,12 @@ Write file in DOS format.
 
 <DD>
 Enable multiple file buffers (if available).
+<DT><B>-K (--keypad)</B>
+
+<DD>
+Do not use the ncurses keypad() call unless necessary.  Try this flag if 
+you find that the arrow keys on the numeric keypad do not work for you 
+under nano.
 <DT><B>-M (--mac)</B>
 
 <DD>
@@ -207,6 +213,6 @@ used by others).
 This document was created by
 <A HREF="http://localhost/cgi-bin/man/man2html">man2html</A>,
 using the manual pages.<BR>
-Time: 01:18:43 GMT, October 04, 2001
+Time: 04:02:51 GMT, January 05, 2002
 </BODY>
 </HTML>

nano.c

@@ -2,7 +2,7 @@
 /**************************************************************************
  *   nano.c                                                               *
  *                                                                        *
- *   Copyright (C) 1999 Chris Allegretta                                  *
+ *   Copyright (C) 1999-2002 Chris Allegretta                             *
  *   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)  *
@@ -122,12 +122,12 @@ void die(char *msg, ...)
 
     fprintf(stderr, msg);
 
-    /* save the currently loaded file (if modified, its open_files entry
-       isn't up to date) */
-    die_save_file(filename);
+    /* save the currently loaded file if it's been modified */
+    if (ISSET(MODIFIED))
+	die_save_file(filename);
 
 #ifdef ENABLE_MULTIBUFFER
-    /* then save all of the other loaded files, if any */
+    /* then save all of the other modified loaded files, if any */
     if (open_files) {
         filestruct *tmp;
 
@@ -142,7 +142,9 @@ void die(char *msg, ...)
 	       currently loaded file), don't save it again */
 	    if (tmp != open_files) {
 		fileage = open_files->file;
-		die_save_file(open_files->data);
+		/* save the file if it's been modified */
+		if (open_files->file_modified)
+		    die_save_file(open_files->data);
 	    }
 
 	    open_files = open_files->next;
@@ -417,6 +419,8 @@ void usage(void)
 	(_
 	 (" -F 		--multibuffer		Enable multiple file buffers\n"));
 #endif
+    printf(_
+	 (" -K 		--keypad		Use alternate keypad routines\n"));
 #ifndef NANO_SMALL
     printf
 	(_
@@ -491,14 +495,15 @@ void usage(void)
 #ifdef ENABLE_MULTIBUFFER
     printf(_(" -F 		Enable multiple file buffers\n"));
 #endif
+    printf(_(" -K		Use alternate keypad routines\n\n"));
 #ifndef NANO_SMALL
     printf(_(" -M 		Write file in Mac format\n"));
 #endif
-    printf(_(" -T [num]	Set width of a tab to num\n"));
     printf(_(" -R		Use regular expressions for search\n"));
 #ifndef NANO_SMALL
     printf(_(" -S		Smooth scrolling\n"));
 #endif
+    printf(_(" -T [num]	Set width of a tab to num\n"));
     printf(_(" -V 		Print version information and exit\n"));
     printf(_(" -c 		Constantly show cursor position\n"));
     printf(_(" -h 		Show this message\n"));
@@ -1937,6 +1942,9 @@ RETSIGTYPE do_cont(int signal)
 	SIGTSTP handler */
 
     doupdate();
+    /* The Hurd seems to need this, otherwise a ^Y after a ^Z will
+	start suspending again */
+   signal_init();
 }
 
 void handle_sigwinch(int s)
@@ -2033,18 +2041,25 @@ void signal_init(void)
     act.sa_handler = handle_sigwinch;
     sigaction(SIGWINCH, &act, NULL);
 
+
+#ifdef _POSIX_VDISABLE
+    tcgetattr(0, &term);
+
+#ifdef VDSUSP
+    term.c_cc[VDSUSP] = _POSIX_VDISABLE;
+#endif /* VDSUSP */
+
+#endif /* _POSIX_VDISABLE */
+
     if (!ISSET(SUSPEND)) {
 
 /* Insane! */
 #ifdef _POSIX_VDISABLE
-	tcgetattr(0, &term);
 	term.c_cc[VSUSP] = _POSIX_VDISABLE;
-	tcsetattr(0, TCSANOW, &term);
-#endif
-
-	/* The HURD seems to need this anyway! */
+#else
 	act.sa_handler = SIG_IGN;
 	sigaction(SIGTSTP, &act, NULL);
+#endif
 
     } else {
 	/* if we don't do this, it seems other stuff interrupts the
@@ -2058,6 +2073,12 @@ void signal_init(void)
 	sigaction(SIGCONT, &act, NULL);
     }
 
+
+#ifdef _POSIX_VDISABLE
+    tcsetattr(0, TCSANOW, &term);
+#endif
+
+
 }
 
 void window_init(void)
@@ -2367,10 +2388,15 @@ int do_justify(void)
 #ifndef DISABLE_HELP
 void help_init(void)
 {
-    int i, sofar = 0;
+    int i, sofar = 0, helplen;
     long allocsize = 1;		/* How much space we're gonna need for the help text */
     char buf[BUFSIZ] = "", *ptr = NULL;
 
+    if (currslen == MAIN_VISIBLE)
+	helplen = MAIN_LIST_LEN;
+    else 
+	helplen = currslen;
+
     /* First set up the initial help text for the current function */
     if (currshortcut == whereis_list || currshortcut == replace_list
 	     || currshortcut == replace_list_2)
@@ -2382,7 +2408,7 @@ void help_init(void)
 		"If using Pico Mode via the -p or --pico flags, using the "
 		"Meta-P toggle or using a nanorc file, the previous search "
 		"string will be shown in brackets after the Search: prompt.  "
-		"Hitting enter without entering any text will preform the "
+		"Hitting enter without entering any text will perform the "
 		"previous search. Otherwise, the previous string will be "
 		"placed in front of the cursor, and can be edited or deleted "
 		"before hitting enter.\n\n The following functions keys are "
@@ -2402,7 +2428,7 @@ void help_init(void)
 		"support, and enable multiple buffers with the -F "
 		"or --multibuffer command line flags, the Meta-F toggle or "
 		"using a nanorc file, inserting a file will cause it to be "
-		"loaded into a separate buffer (use Ctrl-< and > to switch "
+		"loaded into a separate buffer (use Meta-< and > to switch "
 		"between file buffers).\n\n The following function keys are "
 		"available in Insert File mode:\n\n");
     else if (currshortcut == writefile_list)
@@ -2450,7 +2476,7 @@ void help_init(void)
 
     /* Compute the space needed for the shortcut lists - we add 15 to
        have room for the shortcut abbrev and its possible alternate keys */
-    for (i = 0; i <= currslen - 1; i++)
+    for (i = 0; i <= helplen - 1; i++)
 	if (currshortcut[i].help != NULL)
 	    allocsize += strlen(currshortcut[i].help) + 15;
 
@@ -2475,7 +2501,7 @@ void help_init(void)
     strcpy(help_text, ptr);
 
     /* Now add our shortcut info */
-    for (i = 0; i <= currslen - 1; i++) {
+    for (i = 0; i <= helplen - 1; i++) {
 	if (currshortcut[i].val > 0 && currshortcut[i].val < 'a')
 	   sofar = snprintf(buf, BUFSIZ, "^%c	", currshortcut[i].val + 64);
 	else
@@ -2687,6 +2713,8 @@ int main(int argc, char *argv[])
 #ifndef NANO_SMALL
 	{"smooth", 0, 0, 'S'},
 #endif
+	{"keypad", 0, 0, 'K'},
+
 	{0, 0, 0, 0}
     };
 #endif
@@ -2707,11 +2735,11 @@ int main(int argc, char *argv[])
 #endif /* ENABLE_NANORC */
 
 #ifdef HAVE_GETOPT_LONG
-    while ((optchr = getopt_long(argc, argv, "h?DFMRST:Vabcefgijklmo:pr:s:tvwxz",
+    while ((optchr = getopt_long(argc, argv, "h?DFKMRST:Vabcefgijklmo:pr:s:tvwxz",
 				 long_options, &option_index)) != EOF) {
 #else
     while ((optchr =
-	    getopt(argc, argv, "h?DFMRST:Vabcefgijklmo:pr:s:tvwxz")) != EOF) {
+	    getopt(argc, argv, "h?DFKMRST:Vabcefgijklmo:pr:s:tvwxz")) != EOF) {
 #endif
 
 	switch (optchr) {
@@ -2726,6 +2754,9 @@ int main(int argc, char *argv[])
 	    SET(MULTIBUFFER);
 	    break;
 #endif
+	case 'K':
+	    SET(ALT_KEYPAD);
+	    break;
 #ifndef NANO_SMALL
 	case 'M':
 	    SET(MAC_FILE);
@@ -2903,6 +2934,11 @@ int main(int argc, char *argv[])
     window_init();
     mouse_init();
 
+    if (!ISSET(ALT_KEYPAD)) {
+	keypad(edit, TRUE);
+	keypad(bottomwin, TRUE);
+    }
+
 #ifdef ENABLE_COLOR
     do_colorinit();
 
@@ -3080,16 +3116,10 @@ int main(int argc, char *argv[])
 		case '9':	/* Alt-[-9 = Delete in Hurd Console */
 		    kbinput = KEY_DC;
 		    break;
-		case '@':	/* Alt-[-9 = Insert in Hurd Console */
-		case 'L':		/* Insert Key - FreeBSD Console */
-#ifdef ENABLE_MULTIBUFFER
-		    do_insertfile(ISSET(MULTIBUFFER));
-#else
-		    do_insertfile(0);
-#endif
-		    keyhandled = 1;
-		    break;
-		case '[':	/* Alt-[-[-[A-E], F1-F5 in linux console */
+		case '@':	/* Alt-[-@ = Insert in Hurd Console */
+		case 'L':	/* Alt-[-L = Insert - FreeBSD Console */
+		    goto do_insertkey;
+		case '[':	/* Alt-[-[-[A-E], F1-F5 in Linux console */
 		    kbinput = wgetch(edit);
 		    if (kbinput >= 'A' && kbinput <= 'E')
 			kbinput = KEY_F(kbinput - 64);
@@ -3121,10 +3151,12 @@ int main(int argc, char *argv[])
 		break;
 #ifdef ENABLE_MULTIBUFFER
 	    case NANO_OPENPREV_KEY:
+	    case NANO_OPENPREV_ALTKEY:
 		open_prevfile(0);
 		keyhandled = 1;
 		break;
 	    case NANO_OPENNEXT_KEY:
+	    case NANO_OPENNEXT_ALTKEY:
 		open_nextfile(0);
 		keyhandled = 1;
 		break;
@@ -3201,9 +3233,12 @@ int main(int argc, char *argv[])
 	  do_insertkey:
 
 #ifdef ENABLE_MULTIBUFFER
-	    do_insertfile(ISSET(MULTIBUFFER));
+	    /* do_insertfile_void() contains the logic needed to
+	       handle view mode with the view mode/multibuffer
+	       exception, so use it here */
+	    do_insertfile_void();
 #else
-	    do_insertfile(0);
+	    print_view_warning();
 #endif
 
 	    keyhandled = 1;

nano.h

@@ -2,7 +2,7 @@
 /**************************************************************************
  *   nano.h                                                               *
  *                                                                        *
- *   Copyright (C) 1999 Chris Allegretta                                  *
+ *   Copyright (C) 1999-2002 Chris Allegretta                             *
  *   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)  *
@@ -165,6 +165,7 @@ typedef struct colortype {
 #define MAC_FILE		(1<<22)
 #define SMOOTHSCROLL		(1<<23)
 #define DISABLE_CURPOS		(1<<24)	/* Damn, we still need it */
+#define ALT_KEYPAD		(1<<25)	/* Damn, we still need it */
 
 /* Control key sequences, changing these would be very very bad */
 
@@ -226,8 +227,10 @@ typedef struct colortype {
 #define NANO_ALT_X 'x'
 #define NANO_ALT_Y 'y'
 #define NANO_ALT_Z 'z'
-#define NANO_ALT_LCARAT ','
-#define NANO_ALT_RCARAT '.'
+#define NANO_ALT_PERIOD ','
+#define NANO_ALT_COMMA '.'
+#define NANO_ALT_LCARAT '<'
+#define NANO_ALT_RCARAT '>'
 #define NANO_ALT_BRACKET ']'
 
 /* Some semi-changeable keybindings; don't play with unless you're sure you
@@ -286,6 +289,8 @@ know what you're doing */
 #define NANO_APPEND_KEY		NANO_ALT_A
 #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_BRACKET
 
 #define TOGGLE_CONST_KEY	NANO_ALT_C

nano.texi

@@ -8,8 +8,8 @@
 @c Run `makeinfo' rather than `texinfo-format-buffer'.
 @smallbook
 @set EDITION 0.1
-@set VERSION 1.1.4
-@set UPDATED 3 Oct 2001
+@set VERSION 1.1.5
+@set UPDATED 4 Jan 2002
 
 @dircategory Editors
 @direntry
@@ -23,7 +23,7 @@
 @titlepage
 @title GNU @code{nano}
 @subtitle a small and friendly text editor.
-@subtitle version 1.1.4
+@subtitle version 1.1.5
 
 @author Chris Allegretta
 @page
@@ -33,7 +33,7 @@ editor.
 
 This manual is part of the GNU @code{nano} distribution.@*
 @sp4
-Copyright (C) 1999, 2000, 2001 Chris Allegretta.
+Copyright (C) 1999, 2000, 2001, 2002 Chris Allegretta.
 
 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
@@ -114,6 +114,11 @@ Write file in DOS format.
 @item -F, --multibuffer
 Enable multiple file buffers.
 
+@item -K, --keypad
+Do not use the ncurses keypad() call unless necessary.  Try this flag if
+you find that the arrow keys on the numeric keypad do not work for you
+under nano.
+
 @item -M, --mac
 Write file in Mac format.
 

proto.h

@@ -2,7 +2,7 @@
 /**************************************************************************
  *   proto.h                                                              *
  *                                                                        *
- *   Copyright (C) 1999 Chris Allegretta                                  *
+ *   Copyright (C) 1999-2002 Chris Allegretta                             *
  *   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)  *
@@ -133,6 +133,7 @@ char *input_tab(char *buf, int place, int *lastWasTab, int *newplace, int *list)
 char *real_dir_from_tilde(char *buf);
 
 void shortcut_init(int unjustify);
+void signal_init(void);
 void lowercase(char *src);
 void blank_bottombars(void);
 void check_wrap(filestruct * inptr, char ch);

rcfile.c

@@ -2,7 +2,7 @@
 /**************************************************************************
  *   rcfile.c                                                             *
  *                                                                        *
- *   Copyright (C) 1999 Chris Allegretta                                  *
+ *   Copyright (C) 1999-2002 Chris Allegretta                             *
  *   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)  *
@@ -40,9 +40,9 @@
 #endif
 
 #ifndef DISABLE_WRAPJUSTIFY
-    #define NUM_RCOPTS 18
+    #define NUM_RCOPTS 19
 #else
-    #define NUM_RCOPTS 17
+    #define NUM_RCOPTS 18
 #endif
 
 /* Static stuff for the nanorc file */
@@ -69,7 +69,8 @@ rcoption rcopts[NUM_RCOPTS] =
 {"nohelp", NO_HELP}, 
 {"suspend", SUSPEND},
 {"multibuffer", MULTIBUFFER},
-{"smooth", SMOOTHSCROLL}};
+{"smooth", SMOOTHSCROLL},
+{"keypad", ALT_KEYPAD}};
 
 /* We have an error in some part of the rcfile; put it on stderr and
   make the user hit return to continue starting up nano */
@@ -107,10 +108,10 @@ void rcfile_msg(int *errors, char *msg, ...)
 /* Parse the next word from the string.  Returns NULL if we hit EOL */
 char *parse_next_word(char *ptr)
 {
-    while (*ptr != ' ' && *ptr != '\t' && *ptr != '\n' && ptr != '\0')
+    while (*ptr != ' ' && *ptr != '\t' && *ptr != '\n' && *ptr != '\0')
 	ptr++;
 
-    if (*ptr == '\0' || *ptr == '\n')
+    if (*ptr == '\0')
 	return NULL;
 	
     /* Null terminate and advance ptr */

search.c

@@ -2,7 +2,7 @@
 /**************************************************************************
  *   search.c                                                             *
  *                                                                        *
- *   Copyright (C) 2000 Chris Allegretta                                  *
+ *   Copyright (C) 2000-2002 Chris Allegretta                             *
  *   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)  *

utils.c

@@ -2,7 +2,7 @@
 /**************************************************************************
  *   utils.c                                                              *
  *                                                                        *
- *   Copyright (C) 1999 Chris Allegretta                                  *
+ *   Copyright (C) 1999-2002 Chris Allegretta                             *
  *   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)  *

winio.c

@@ -2,7 +2,7 @@
 /**************************************************************************
  *   winio.c                                                              *
  *                                                                        *
- *   Copyright (C) 1999 Chris Allegretta                                  *
+ *   Copyright (C) 1999-2002 Chris Allegretta                             *
  *   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)  *
@@ -553,9 +553,9 @@ void titlebar(char *path)
 	    waddstr(topwin, &what[namelen - space]);
 	} else {
 	    if (path == NULL)
-		mvwaddstr(topwin, 0, COLS / 2 - (namelen / 2 + 1), "File: ");
+		mvwaddstr(topwin, 0, COLS / 2 - (namelen / 2 + 1), _("File: "));
 	    else
-	 	mvwaddstr(topwin, 0, COLS / 2 - (namelen / 2 + 1), " DIR: ");
+	 	mvwaddstr(topwin, 0, COLS / 2 - (namelen / 2 + 1), _(" DIR: "));
 	    waddstr(topwin, what);
 	}
     }
@@ -603,6 +603,9 @@ void bottombars(shortcut s[], int slen)
 
 #ifdef ENABLE_COLOR    
     color_on(bottomwin, COLOR_BOTTOMBARS);
+    if (!colors[COLOR_BOTTOMBARS - FIRST_COLORNUM].set ||
+	 colors[COLOR_BOTTOMBARS - FIRST_COLORNUM].fg != COLOR_BLACK)
+   	wattroff(bottomwin, A_REVERSE);
 #endif
 
     /* Determine how many extra spaces are needed to fill the bottom of the screen */
@@ -801,12 +804,10 @@ void edit_add(filestruct * fileptr, int yval, int start, int virt_cur_x,
 			    wattron(edit, A_BOLD);
 			wattron(edit, COLOR_PAIR(tmpcolor->pairnum));
 
-			if (regmatches[0].rm_eo - regmatches[0].rm_so 
-			    + k <= COLS)
+			if (regmatches[0].rm_eo + k <= COLS)
 			    paintlen = regmatches[0].rm_eo - regmatches[0].rm_so;
 			else
-			    paintlen = COLS - (regmatches[0].rm_eo 
-					-  regmatches[0].rm_so);
+			    paintlen = COLS - k - regmatches[0].rm_so - 1;
 
 			mvwaddnstr(edit, yval, regmatches[0].rm_so + k,
 			    &fileptr->data[k + regmatches[0].rm_so], 
@@ -1027,7 +1028,7 @@ void update_line(filestruct * fileptr, int index)
 		virt_cur_x--;
 	    if (i < mark_beginx)
 		virt_mark_beginx--;
-	} else if (realdata[i] < 32) {
+	} else if (realdata[i] >= 1 && realdata[i] <= 31) {
 	    /* Treat control characters as ^letter */
 	    fileptr->data[pos++] = '^';
 	    fileptr->data[pos++] = realdata[i] + 64;
@@ -1193,7 +1194,7 @@ int statusq(int tabs, shortcut s[], int slen, char *def, char *msg, ...)
     int ret;
 
 #ifndef DISABLE_TABCOMP
-    int list;
+    int list = 0;
 #endif
 
     bottombars(s, slen);
@@ -1808,7 +1809,7 @@ void do_credits(void)
 			anyonelse,
 			thankyou,
 			"", "", "", "",
-			"(c) 2000 Chris Allegretta",
+			"(c) 1999-2002 Chris Allegretta",
 			"", "", "", "",
 			"www.nano-editor.org"
     };