commit ed02216378a3ea58ac69f40ae42171656be8dd75
parent 55d5455abdbfb2c558b35c54a7c03bee0e4100a6
Author: Chris Allegretta <chrisa@asty.org>
Date: Thu, 3 Aug 2000 16:54:11 +0000
Added recursive loop check
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@156 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
Diffstat:
14 files changed, 29 insertions(+), 20 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -26,6 +26,7 @@ CVS code
- Added check for current line "running" off the screen.
Hopefully this will not cause any recursive lockups.
(Who am I kidding, of course it will!)
+ - Added check to stop infinite loop calling edit_update.
edit_update()
- Rewritten, hopefully this will remove a lot of the
scrolling the cursor back and forth needlessly.
diff --git a/po/de.gmo b/po/de.gmo
Binary files differ.
diff --git a/po/de.po b/po/de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: nano 0.9.14pre1\n"
-"POT-Creation-Date: 2000-07-31 08:56-0400\n"
+"POT-Creation-Date: 2000-08-01 18:28-0400\n"
"PO-Revision-Date: 2000-07-27 11:44+0200\n"
"Last-Translator: Florian König <floki@bigfoot.com>\n"
"Language-Team: German <floki@bigfoot.com>\n"
diff --git a/po/es.gmo b/po/es.gmo
Binary files differ.
diff --git a/po/es.po b/po/es.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: 0.9.13\n"
-"POT-Creation-Date: 2000-07-31 08:56-0400\n"
+"POT-Creation-Date: 2000-08-01 18:28-0400\n"
"PO-Revision-Date: 2000-07-13 04:57+0200\n"
"Last-Translator: Jordi Mallach <jordi@sindominio.net>\n"
"Language-Team: Spanish <jordi@sindominio.net>\n"
diff --git a/po/fi.gmo b/po/fi.gmo
Binary files differ.
diff --git a/po/fi.po b/po/fi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: nano 0.9.11\n"
-"POT-Creation-Date: 2000-07-31 08:56-0400\n"
+"POT-Creation-Date: 2000-08-01 18:28-0400\n"
"PO-Revision-Date: 2000-06-21 23:08+03:00\n"
"Last-Translator: Pauli Virtanen <pauli.virtanen@saunalahti.fi>\n"
"Language-Team: Finnish <fi@li.org>\n"
diff --git a/po/fr.po b/po/fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: 0.8.9\n"
-"POT-Creation-Date: 2000-07-31 08:56-0400\n"
+"POT-Creation-Date: 2000-08-01 18:28-0400\n"
"PO-Revision-Date: 2000-07-09 01:32+0100\n"
"Last-Translator: Clement Laforet <sheep.killer@free.fr>\n"
"Language-Team: French <LL@li.org>\n"
diff --git a/po/id.gmo b/po/id.gmo
Binary files differ.
diff --git a/po/id.po b/po/id.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: nano-0.9.10\n"
-"POT-Creation-Date: 2000-07-31 08:56-0400\n"
+"POT-Creation-Date: 2000-08-01 18:28-0400\n"
"PO-Revision-Date: 2000-06-08 20:56+07:00\n"
"Last-Translator: Tedi Heriyanto <tedi-h@usa.net>\n"
"Language-Team: Indonesian <id@li.org>\n"
diff --git a/po/it.gmo b/po/it.gmo
Binary files differ.
diff --git a/po/it.po b/po/it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: 0.8.7\n"
-"POT-Creation-Date: 2000-07-31 08:56-0400\n"
+"POT-Creation-Date: 2000-08-01 18:28-0400\n"
"PO-Revision-Date: 2000-03-03 04:57+0100\n"
"Last-Translator: Daniele Medri <madrid@linux.it>\n"
"MIME-Version: 1.0\n"
diff --git a/po/nano.pot b/po/nano.pot
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-31 08:56-0400\n"
+"POT-Creation-Date: 2000-08-03 12:58-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -344,7 +344,7 @@ msgid "Case Sens"
msgstr ""
#: global.c:282 global.c:301 global.c:311 global.c:327 global.c:331
-#: global.c:337 winio.c:975
+#: global.c:337 winio.c:983
msgid "Cancel"
msgstr ""
@@ -758,50 +758,50 @@ msgstr ""
msgid "Modified"
msgstr ""
-#: winio.c:891
+#: winio.c:899
#, c-format
msgid "Moved to (%d, %d) in edit buffer\n"
msgstr ""
-#: winio.c:902
+#: winio.c:910
#, c-format
msgid "current->data = \"%s\"\n"
msgstr ""
-#: winio.c:945
+#: winio.c:953
#, c-format
msgid "I got \"%s\"\n"
msgstr ""
-#: winio.c:970
+#: winio.c:978
msgid "Yes"
msgstr ""
-#: winio.c:972
+#: winio.c:980
msgid "All"
msgstr ""
-#: winio.c:974
+#: winio.c:982
msgid "No"
msgstr ""
-#: winio.c:1110
+#: winio.c:1118
#, c-format
msgid "do_cursorpos: linepct = %f, bytepct = %f\n"
msgstr ""
-#: winio.c:1114
+#: winio.c:1122
msgid "line %d of %d (%.0f%%), character %d of %d (%.0f%%)"
msgstr ""
-#: winio.c:1238
+#: winio.c:1246
msgid "Dumping file buffer to stderr...\n"
msgstr ""
-#: winio.c:1240
+#: winio.c:1248
msgid "Dumping cutbuffer to stderr...\n"
msgstr ""
-#: winio.c:1242
+#: winio.c:1250
msgid "Dumping a buffer to stderr...\n"
msgstr ""
diff --git a/winio.c b/winio.c
@@ -822,6 +822,7 @@ void center_cursor(void)
/* Refresh the screen without changing the position of lines */
void edit_refresh(void)
{
+ static int noloop = 0;
int lines = 0, i = 0, currentcheck = 0;
filestruct *temp, *hold = current;
@@ -839,8 +840,15 @@ void edit_refresh(void)
temp = temp->next;
lines++;
}
- if (!currentcheck) /* Then current has run off the screen... */
+ /* If noloop == 1, then we already did an edit_update without finishing
+ this function. So we don't run edit_update again */
+ if (!currentcheck && !noloop) /* Then current has run off the screen... */
+ {
edit_update(current, CENTER);
+ noloop = 1;
+ }
+ else if (noloop)
+ noloop = 0;
if (lines <= editwinrows - 1)
while (lines <= editwinrows - 1) {
