GNU nano 1.9.99pre3

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

ChangeLog

@@ -1,3 +1,32 @@
+GNU nano 1.9.99pre3 - 2006.10.25
+- chars.c:
+  nstrncasecmp()
+	- When returning, use the "?" operator instead of an if/else
+	  clause. (DLR)
+- cut.c:
+  do_cut_text()
+	- When uncutting text in the process of copying it, always set
+	  placewewant, as do_uncut_text() does, so that the current line
+	  is always updated properly. (DLR)
+- files.c:
+  input_tab()
+	- Since the field precision operator used in the sprintf() uses
+	  ints and not size_t's, replace it with two strncpy()s, which
+	  use size_t's, and a null termination. (DLR)
+- help.c:
+  parse_help_input()
+	- Add 'E' and 'e' as aliases for Exit, for consistency with the
+	  file browser. (DLR)
+- m4/ac_define_dir.m4:
+	- Import the latest version of this file from
+	  http://autoconf-archive.cryp.to/ac_define_dir.m4.
+- doc/faq.html:
+	- Update the question in section 4.13 to match the version of it
+	  in the answer section. (DLR)
+- doc/syntax/c.nanorc:
+	- Simplify "undef", "ifn?def", "elif", and "else" in the
+	  preprocessor regexes. (DLR)
+
 GNU nano 1.9.99pre2 - 2006.10.02
 - General:
 	- Miscellaneous comment fixes. (DLR)
@@ -541,7 +570,7 @@ GNU nano 1.3.12 - 2006.06.26
 	  have fewer than 24 columns, for consistency with the toggle
 	  help text. (DLR, suggested by Benno Schulenberg)
   parse_help_input()
-	- Add Space and - as aliases for PageDown and PageUp, for
+	- Add Space and '-' as aliases for PageDown and PageUp, for
 	  consistency with the file browser. (DLR, suggested by Benno
 	  Schulenberg)
 	- Remove redundant key checks. (DLR)

NEWS

@@ -1,3 +1,9 @@
+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

TODO

@@ -34,6 +34,7 @@ For the next version:
   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:
 

configure.ac

@@ -19,7 +19,7 @@
 #
 # $Id$
 
-AC_INIT([GNU nano], [1.9.99pre2], [nano-devel@gnu.org], [nano])
+AC_INIT([GNU nano], [1.9.99pre3], [nano-devel@gnu.org], [nano])
 AC_CONFIG_SRCDIR([src/nano.c])
 AC_CANONICAL_TARGET([])
 AM_INIT_AUTOMAKE

doc/faq.html

@@ -44,7 +44,7 @@
   <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 the clipboard in an X terminal when I'm running nano in one and nano's mouse support is turned on?</a></p></blockquote>
+  <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><br>
@@ -84,7 +84,7 @@
 <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.9.99pre2. 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 1.9.99pre3. 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.3/nano.1.html">here</a>.</p></blockquote>
 <hr width="100%">
@@ -255,8 +255,8 @@
 <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>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>
+<blockquote><p>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>

doc/syntax/c.nanorc

@@ -8,7 +8,7 @@ color green "\<(class|namespace|template|public|protected|private|typename|this|
 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|undef|include|ifn?def|endif|elif|else|if|warning|error)"
+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

m4/ac_define_dir.m4

@@ -13,9 +13,9 @@ dnl
 dnl @category Misc
 dnl @author Stepan Kasal <kasal@ucw.cz>
 dnl @author Andreas Schwab <schwab@suse.de>
-dnl @author Guido Draheim <guidod@gmx.de>
+dnl @author Guido U. Draheim <guidod@gmx.de>
 dnl @author Alexandre Oliva
-dnl @version 2005-07-29
+dnl @version 2006-10-13
 dnl @license AllPermissive
 
 AC_DEFUN([AC_DEFINE_DIR], [

po/ChangeLog

@@ -1,10 +1,36 @@
+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: Restore previous version of pt_BR, as it was for
+
+	* 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: Updated Brazilian Portuguese translation by
+	* pt_BR.po: Updated Brazilian Portuguese translation by
 	Joao Victor Duarte Martins.
 
 2006-09-10  David Lawrence Ramsey  <pooka109@cox.net>
@@ -17,7 +43,7 @@
 
 2006-09-02  Jordi Mallach  <jordi@gnu.org>
 
-	* pt_BR: Updated Brazilian Portuguese translation by
+	* pt_BR.po: Updated Brazilian Portuguese translation by
 	Joao Victor Duarte Martins.
 
 2006-09-01  Benno Schulenberg  <bensberg@justemail.net>
@@ -210,7 +236,7 @@
 
 2005-04-22  Jordi Mallach  <jordi@gnu.org>
 
-	* ca.po: Updated Norwegian bokmål translation by
+	* nb.po: Updated Norwegian bokmål translation by
 	Geir Helland.
 
 2005-04-20  Jordi Mallach  <jordi@gnu.org>

po/fr.po

@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: nano 1.9.99pre0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-08-19 07:34-0400\n"
-"PO-Revision-Date: 2006-08-28 00:52+0200\n"
+"PO-Revision-Date: 2006-10-16 23:32+0200\n"
 "Last-Translator: Jean-Philippe Guérard <jean-philippe.guerard@corbeaunoir.org>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "MIME-Version: 1.0\n"
@@ -2168,7 +2168,7 @@ msgstr "--syntax=<cha
 # File: src/nano.c, line: 791
 #: src/nano.c:792
 msgid "Syntax definition to use for coloring"
-msgstr "Définition de la syntaxe de colorisation"
+msgstr "Définit la syntaxe de colorisation"
 
 #
 # File: src/nano.c, line: 793

po/pt_BR.po

@@ -1,15 +1,15 @@
 # Portugueses Translation for the nano textual domain
 # Copyright (C) 2006 Free Software Foundation, Inc.
 # This file is distributed under the same license as the nano package.
-# Joao Victor Duarte Martins <jvdm@sdf.lonestar.org>, 2006.
+# J. Victor D. Martins <jvdm@sdf.lonestar.org>, 2006.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: nano 1.9.99pre0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-08-19 07:34-0400\n"
-"PO-Revision-Date: 2006-09-02 12:06-0300\n"
-"Last-Translator: Joao Victor Duarte Martins <jvdm@sdf.lonestar.org>\n"
+"PO-Revision-Date: 2006-09-27 02:13-0300\n"
+"Last-Translator: J. Victor D. Martins <jvdm@sdf.lonestar.org>\n"
 "Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
@@ -1553,10 +1553,9 @@ msgstr "Falta o nome da cor"
 msgid "Background color \"%s\" cannot be bright"
 msgstr "Cor do fundo \"%s\" não pode ser clara"
 
-# regex?
 #: src/rcfile.c:503
 msgid "Missing regex string"
-msgstr "Falta string da regex"
+msgstr "Falta a expressão regular"
 
 #: src/rcfile.c:575
 msgid "\"start=\" requires a corresponding \"end=\""
@@ -1820,26 +1819,26 @@ msgstr "Obrigado por utilizar o nano!"
 #~ msgstr "Encontrar outro parenteses"
 
 #~ msgid "Make the current search/replace case (in)sensitive"
-#~ msgstr "Tornar a busca/substitução atual sensível a caixa"
+#~ msgstr "Tornar a busca/reposição atual sensível a caixa"
 
 #~ msgid "Make the current search/replace go backwards"
-#~ msgstr "Tornar a busca/substituição atual de trás pra frente"
+#~ msgstr "Tornar a busca/reposição atual ao contrário"
 
 #~ msgid "Prepend to the current file"
-#~ msgstr "Pré-Adicionar para a arquivo atual"
+#~ msgstr "Pre-adicionar ao arquivo atual"
 
 #~ msgid "Back up original file when saving"
 #~ msgstr "Fazer o bacape do arquivo original quando salvá-lo"
 
 #~ msgid "Insert into new buffer"
-#~ msgstr "Inserir no novo buffer"
+#~ msgstr "Inserir em um novo buffer"
 
 #~ msgid ""
 #~ "\n"
 #~ "Buffer not written to %s (too many backup files?)\n"
 #~ msgstr ""
 #~ "\n"
-#~ "Buffer não foi escrito no %s (muitos arquivos de bacape?)\n"
+#~ "Buffer não foi escrito no %s (talvez muitos arquivos de segurança?)\n"
 
 #~ msgid ""
 #~ " nano help text\n"
@@ -1851,23 +1850,9 @@ msgstr "Obrigado por utilizar o nano!"
 #~ msgstr ""
 #~ " texto de ajuda do nano\n"
 #~ "\n"
-#~ "O editor nano foi projetado para emular as funcionalidades e as facilidades de uso\n"
-#~ "do editor de texto UW Pico.  Existem quatro grandes seções no editor editor: A\n"
-#~ "linha superior mostra a versão do programa, o arquivo editado atualmente, e se\n"
-#~ "o arquivo foi modificado ou não.  A próxima é a a seção principal da tela do\n"
-#~ "editor, mostrando o arquivo que está sendo editado.  A linha de avisos é a\n"
-#~ "terceira apartir da última e mostra mensagens importantes.  As outras duas mostram\n"
-#~ "os atalhos mais comuns utilizados no editor.\n"
+#~ "O editor nano foi projetado para emular as funcionalidades e as facilidades de uso do editor de texto UW Pico.  Existem quatro grandes seções no editor editor: A linha superior mostra a versão do programa, o arquivo editado atualmente, e se o arquivo foi modificado ou não.  A próxima é a a seção principal da tela do editor, mostrando o arquivo que está sendo editado.  A linha de avisos é a terceira apartir da última e mostra mensagens importantes.  As outras duas mostram os atalhos mais comuns utilizados no editor.\n"
 #~ "\n"
-#~ " A notação para atalhos é a seguinte: Sequências de tecla-<Control> são grafadas\n"
-#~ "com o cirfunflexo (^) e podem ser inseridas tanto utilizando as teclas <Ctrl> ou\n"
-#~ "precionando <ESC> duas vezes.  Sequências com teclas de escape são grafadas\n"
-#~ "com o símbolo Meta (M) e podem tanto ser inseridas utilizando a telca <ESC>, <Alt>\n"
-#~ "ou tecla meta, dependendo da configuração do seu teclado.  Também precionando <ESC>\n"
-#~ "duas vezes ou digitando um número de três dígitos de 000 à 255 você irá inserir\n"
-#~ "um caractere correspondende ao respectivo código ASCII. Os seguintes atalhos de\n"
-#~ "teclado estão disponíveis na tela principal do editor.  Teclas alternativas são\n"
-#~ "mostradas entre parenteses:\n"
+#~ " A notação para atalhos é a seguinte: Sequências de tecla-<Control> são grafadas com o cirfunflexo (^) e podem ser inseridas tanto utilizando as teclas <Ctrl> ou precionando <ESC> duas vezes.  Sequências com teclas de escape são grafadas com o símbolo Meta (M) e podem tanto ser inseridas utilizando a telca <ESC>, <Alt> ou tecla meta, dependendo da configuração do seu teclado.  \"\n"
 #~ "\n"
 
 #~ msgid "Up"
@@ -1891,7 +1876,7 @@ msgstr "Obrigado por utilizar o nano!"
 #~ msgstr "+LINHA"
 
 #~ msgid "Do regular expression searches"
-#~ msgstr "Expressão regular procurada"
+#~ msgstr "Buscar por expressões regulares"
 
 #~ msgid "Set fill cols to (wrap lines at) #cols"
 #~ msgstr "Ajustar preenchimento de cols para (ajustar linhas em) #cols"

src/chars.c

@@ -514,10 +514,7 @@ int nstrncasecmp(const char *s1, const char *s2, size_t n)
 	    break;
     }
 
-    if (n > 0)
-	return tolower(*s1) - tolower(*s2);
-    else
-	return 0;
+    return (n > 0) ? tolower(*s1) - tolower(*s2) : 0;
 }
 #endif
 
@@ -1026,8 +1023,7 @@ bool is_valid_mbstring(const char *s)
 
     return 
 #ifdef ENABLE_UTF8
-	use_utf8 ?
-	(mbstowcs(NULL, s, 0) != (size_t)-1) :
+	use_utf8 ? (mbstowcs(NULL, s, 0) != (size_t)-1) :
 #endif
 	TRUE;
 }

src/cut.c

@@ -194,6 +194,10 @@ void do_cut_text(
 		cb_save->data -= cb_save_len;
 	    } else
 		copy_from_filestruct(cutbuffer, cutbottom);
+
+	    /* Set the current place we want to where the text from the
+	     * cutbuffer ends. */
+	    openfile->placewewant = xplustabs();
 	}
 
 	/* Set NO_NEWLINES back to what it was before, since we're done

src/files.c

@@ -2239,16 +2239,17 @@ char *input_tab(char *buf, bool allow_files, size_t *place, bool
 	free(match2_mb);
 
 	mzero = charalloc(lastslash_len + common_len + 1);
-	sprintf(mzero, "%.*s%.*s", lastslash_len, buf, common_len,
-		matches[0]);
+
+	strncpy(mzero, buf, lastslash_len);
+	strncpy(mzero + lastslash_len, matches[0], common_len);
 
 	common_len += lastslash_len;
+	mzero[common_len] = '\0';
 
 	assert(common_len >= *place);
 
 	if (num_matches == 1 && is_dir(mzero)) {
-	    mzero[common_len] = '/';
-	    common_len++;
+	    mzero[common_len++] = '/';
 
 	    assert(common_len > *place);
 	}
@@ -2378,6 +2379,7 @@ char *histfilename(void)
 	strcpy(nanohist, homedir);
 	strcpy(nanohist + homelen, "/.nano_history");
     }
+
     return nanohist;
 }
 

src/help.c

@@ -586,6 +586,8 @@ void parse_help_input(int *kbinput, bool *meta_key, bool *func_key)
 		break;
 	    /* Cancel is equivalent to Exit here. */
 	    case NANO_CANCEL_KEY:
+	    case 'E':
+	    case 'e':
 		*kbinput = NANO_EXIT_KEY;
 		break;
 	}