nano-2.3.0

ChangeLog

@@ -1,3 +1,43 @@
+2011-02-26 Chris Allegretta <chrisa@asty.org>
+	* Change RAW in function_type enum to RAWINPUT, to fix compilation on AIX, 
+	  reported by Richard G  Daniel <skunk@iskunk.org>.
+
+2011-02-23 Chris Allegretta <chrisa@asty.org>
+	* Fix some more severe warnings from 'g++ -pedantic', from patch originally 
+	  by Eitan Adler <lists@eitanadler.com>
+
+2011-02-23 Kamil Dudka <kdudka@redhat.com>
+	* doc/man/nanorc.5: Fix small typo
+
+2011-02-22 Chris Allegretta <chrisa@asty.org>
+	* color.c (nfreeregex): Fix that we were trying to set the pointer passed by value
+	  to NULL.  Fixes crashes on file save reported by Ken Tyler and Matthieu Lejeune.
+
+2011-02-18 Chris Allegretta <chrisa@asty.org>
+	* New saved cursor position history option.  Command line option -P or --poslog, rc file
+	  entry "poslog".  Search history changes to ~/.nano/search_history, cursor position log
+	  is ~/.nano/filepos_history.  Added checks to move the legacy .nano_history file to the new
+	  location.  Several new functions to files.c: load_poshistory(), save_poshistory(), 
+	  check_poshistory(), update_poshistory(), and reworking of histfilename().  New FAQ entry
+	  4.15 discussing the change and offering an interoperability workaround.
+	* files.c (load_history): Set last_search to the last search value we loaded from history,
+	  so do_research will succeed without needing to manually load the last seach in.  Fixes
+	  bug reported by Matthieu Lejeune.
+
+2011-02-12 Chris Allegretta <chrisa@asty.org>
+	* Initial libmagic implementation, adapted from Eitan Adler <eitanadlerlist@gmail.com>.
+	  New nanorc entry "magic" to enable this functionality, nanorc file and man page updates.
+
+2011-02-06 Chris Allegretta <chrisa@asty.org>
+        * src/*: Retire iso_me_harder_funcmap based on suggestion by <bernd.spaeth@gmx.net>
+	  This does add 20KB to nano's executable size but it gets rid of a lot of indirection
+	  that makes people stomach turn.  There are several new stub functions and need of more
+	  tidying as a result of this.
+	* files.c (write_file): Fix problems with writing the backup file (albeit interactively)
+	  with new function prompt_failed_backupwrite(), allows more secure handling of problems
+	  with failing to write the backup file compared to 'allow_insecure_backup'.
+	* winio.c (edit_redraw): Removed unused variable
+
 2010-11-15 Chris Allegretta <chrisa@asty.org>
 	* Add a section to the FAQ about using nanorc on Win32 systems.
 
@@ -7,8 +47,6 @@
 	  disabled in restricted mode.  Fixes Savannah bug 31625 reported by
 	  Charlie Somerville.
 
-2010-08-10 - nano 2.2 branch cut here
-
 GNU nano 2.2.5 - 2010.08.05
 2010-08-04 Lauri Kasanen <curaga@operamail.comcuraga@operamail.com>
         * doc/syntax/mgp.nanorc: New Magicpoint syntax highlighting definition

NEWS

@@ -1,12 +1,16 @@
-2010.11.22 - GNU nano 2.2.6 "Pimp my BBS" wants you to go to 
-		www.desertbus.org and donate a few bucks for the great 
-		Child's Play Charity!  This is just a small release to 
-		update a bug where restricted mode was not particularly 
-		restricted since key bindings were introduced. It also 
-		signals the return of win32 builds which now feature 
-		nanorc support; please see the FAQ for details of how
-		to enable it, this feature is a bit of a kludge for now.   
-		Remember that when all else fails, USE SPACE JUMP.
+GNU nano 2.3.0 - 2011.02.26
+2011.02.26 - GNU nano 2.3.0 "Septic surprise" is released.  This first
+		release in the 2.3 unstable series bring several new 
+		features.  First, libmagic support for syntax highlighting
+		has been added on top of the existing file extension 
+		and header support already available.  Secondly, cursor 
+		position can be saved between editing sessions with 
+		the -P or --poslog command line flags, or via "set poslog" 
+		in your .nanorc.  Also included are some fixes for 
+		compilation with g++, and better handling of issues 
+		writing the backup file, which should reduce the need 
+		for the 'set allow_insecure_backup" nanorc option.  
+		Don't stop, get it get it, don't stop, get it get it.
 
 2010.08.05 - GNU nano 2.2.5 "Inactivity timeout" is now available.
 		This release includes slightly less restrictive checkng
@@ -1315,4 +1319,4 @@
 		update your bookmarks, tell your friends, and all that
 		jazz.
 
-$Id: NEWS 4516 2010-08-11 02:42:32Z astyanax $
+$Id: NEWS 4536 2011-02-26 14:28:42Z astyanax $

TODO

@@ -96,4 +96,4 @@ For version 1.0:
 - Unjustify command (^U after ^J) [DONE =-].
 - Username completion (~user) [DONE =-].
 
-$Id: TODO 4516 2010-08-11 02:42:32Z astyanax $
+$Id: TODO 4513 2010-08-06 01:20:51Z astyanax $

config.h.in

@@ -103,9 +103,15 @@
 /* Define to 1 if you have the <libintl.h> header file. */
 #undef HAVE_LIBINTL_H
 
+/* Define to 1 if you have the `magic' library (-lmagic). */
+#undef HAVE_LIBMAGIC
+
 /* Define to 1 if you have the <limits.h> header file. */
 #undef HAVE_LIMITS_H
 
+/* Define to 1 if you have the <magic.h> header file. */
+#undef HAVE_MAGIC_H
+
 /* Define to 1 if you have the `mblen' function. */
 #undef HAVE_MBLEN
 

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for GNU nano 2.2.6.
+# Generated by GNU Autoconf 2.65 for GNU nano 2.3.0.
 #
 # Report bugs to <nano-devel@gnu.org>.
 #
@@ -552,8 +552,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='GNU nano'
 PACKAGE_TARNAME='nano'
-PACKAGE_VERSION='2.2.6'
-PACKAGE_STRING='GNU nano 2.2.6'
+PACKAGE_VERSION='2.3.0'
+PACKAGE_STRING='GNU nano 2.3.0'
 PACKAGE_BUGREPORT='nano-devel@gnu.org'
 PACKAGE_URL='http://www.gnu.org/software/nano/'
 
@@ -1300,7 +1300,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures GNU nano 2.2.6 to adapt to many kinds of systems.
+\`configure' configures GNU nano 2.3.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1371,7 +1371,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of GNU nano 2.2.6:";;
+     short | recursive ) echo "Configuration of GNU nano 2.3.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1492,7 +1492,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-GNU nano configure 2.2.6
+GNU nano configure 2.3.0
 generated by GNU Autoconf 2.65
 
 Copyright (C) 2009 Free Software Foundation, Inc.
@@ -1863,7 +1863,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by GNU nano $as_me 2.2.6, which was
+It was created by GNU nano $as_me 2.3.0, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
@@ -2782,7 +2782,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='nano'
- VERSION='2.2.6'
+ VERSION='2.3.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -6758,7 +6758,7 @@ $as_echo "#define STDC_HEADERS 1" >>confdefs.h
 
 fi
 
-for ac_header in getopt.h libintl.h limits.h regex.h sys/param.h wchar.h wctype.h stdarg.h
+for ac_header in getopt.h libintl.h limits.h regex.h sys/param.h wchar.h wctype.h stdarg.h magic.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -8316,6 +8316,51 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
 fi
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for magic_open in -lmagic" >&5
+$as_echo_n "checking for magic_open in -lmagic... " >&6; }
+if test "${ac_cv_lib_magic_magic_open+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lmagic  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char magic_open ();
+int
+main ()
+{
+return magic_open ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_magic_magic_open=yes
+else
+  ac_cv_lib_magic_magic_open=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_magic_magic_open" >&5
+$as_echo "$ac_cv_lib_magic_magic_open" >&6; }
+if test "x$ac_cv_lib_magic_magic_open" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBMAGIC 1
+_ACEOF
+
+  LIBS="-lmagic $LIBS"
+
+fi
+
 
 # Check for groff html support
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for HTML support in groff" >&5
@@ -8884,7 +8929,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by GNU nano $as_me 2.2.6, which was
+This file was extended by GNU nano $as_me 2.3.0, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -8952,7 +8997,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-GNU nano config.status 2.2.6
+GNU nano config.status 2.3.0
 configured by $0, generated by GNU Autoconf 2.65,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -18,9 +18,9 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
 # USA.
 #
-# $Id: configure.ac 4516 2010-08-11 02:42:32Z astyanax $
+# $Id: configure.ac 4536 2011-02-26 14:28:42Z astyanax $
 
-AC_INIT([GNU nano], [2.2.6], [nano-devel@gnu.org], [nano])
+AC_INIT([GNU nano], [2.3.0], [nano-devel@gnu.org], [nano])
 AC_CONFIG_SRCDIR([src/nano.c])
 AC_CANONICAL_TARGET([])
 AM_INIT_AUTOMAKE
@@ -50,7 +50,7 @@ AC_DEFINE_DIR([PKGDATADIR], [pkgdatadir], [Where data are placed to.])
 dnl Checks for header files.
 
 AC_HEADER_STDC
-AC_CHECK_HEADERS(getopt.h libintl.h limits.h regex.h sys/param.h wchar.h wctype.h stdarg.h)
+AC_CHECK_HEADERS(getopt.h libintl.h limits.h regex.h sys/param.h wchar.h wctype.h stdarg.h magic.h)
 
 dnl Checks for options.
 
@@ -583,6 +583,7 @@ AC_MSG_RESULT(yes),
 AC_MSG_RESULT(no),
 AC_MSG_WARN([*** Can't check for macro redefinability when cross-compiling]))
 
+AC_CHECK_LIB(magic, magic_open)
 
 # Check for groff html support
 AC_MSG_CHECKING([for HTML support in groff])

doc/faq.html

@@ -46,7 +46,8 @@ <h2><a href="#4">4. Running</a></h2>
   <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><br>
-  <a href="#4.14">4.14. When I paste text into a document, each line gets indented further than the last. Why does nano do this, and how can I avoid it?</a></p></blockquote>
+  <a href="#4.14">4.14. When I paste text into a document, each line gets indented further than the last. Why does nano do this, and how can I avoid it?</a><br>
+  <a href="#4.15">4.15. On startup I get a message that says "Detected a legacy nano history file".  Now other nano versionc can't find my search history!</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><br>
@@ -222,6 +223,11 @@ <h2><a name="4.13"></a>4.13. How do I select text for or paste text from the cli
 <blockquote><p>Try holding down the Shift key and selecting or pasting the text as you normally would.</p></blockquote>
 <h2><a name="4.14"></a>4.14. When I paste text into a document, each line gets indented further than the last. Why does nano do this, and how can I avoid it?</h2>
 <blockquote><p>You have the autoindent feature turned on. Hit Meta-I to turn it off, paste your text, and then hit Meta-I again to turn it back on.</p></blockquote>
+<h2><a name="4.15"></a>4.15. On startup I get a message that says "Detected a legacy nano history file".  Now other nano versionc can't find my search history!</h2>
+<blockquote><p>In nano 2.3.0, cursor position history was introduced, and both files now reside under a .nano directory in your home.  Nano was trying to move this file into the new location so it could continue to use it.  This means that if you try and use an earlier version of nano, it will be unable to see your previous search history.  To fix this, run the following commands:<br>
+mv ~/.nano/search_history ~/.nano_history<br>
+ln -sf ~/.nano_history ~/.nano/search_history<br>
+</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>
@@ -326,6 +332,6 @@ <h2><a name="8"></a>8. ChangeLog</h2>
 2000/11/18 - Previous string display (4.5).<br>
 2000/09/27 - Moved addresses to nano-editor.org.<br>
 2000/06/31 - Initial framework.</p></blockquote>
-<p>$Id: faq.html 4521 2010-11-15 06:58:22Z astyanax $</p>
+<p>$Id: faq.html 4530 2011-02-18 07:30:57Z astyanax $</p>
 </body>
 </html>