From: David Lawrence Ramsey <pooka109@gmail.com>
Date: Wed, 15 Jun 2005 03:01:41 +0000 (+0000)
Subject: in open_prevnext_file(), move up a misplaced assert and rename a
X-Git-Tag: v1.3.8~138
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=d26f1ebdf1dbeadb0a2f4f23703caee6e05387ca;p=nano.git

in open_prevnext_file(), move up a misplaced assert and rename a
variable


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

diff --git a/ChangeLog b/ChangeLog
index 903c3949..e293fd56 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -103,6 +103,9 @@ CVS code -
 	- Set i to 0 when we get a filename via the file browser, so
 	  that it's read in properly when we exit the file browser.
 	  (DLR)
+  open_prevnext_file()
+	- Move up a misplaced assert. (DLR)
+	- Rename variable next to next_file, to avoid confusion. (DLR)
   write_file()
 	- Since lineswritten is a size_t, print its value as an unsigned
 	  long instead of an unsigned int. (DLR)
diff --git a/src/files.c b/src/files.c
index f343cf04..a6edfe0e 100644
--- a/src/files.c
+++ b/src/files.c
@@ -912,12 +912,12 @@ void load_open_file(void)
 }
 
 /* Open either the next or previous file buffer. */
-void open_prevnext_file(bool next)
+void open_prevnext_file(bool next_file)
 {
-    add_open_file(TRUE);
-
     assert(open_files != NULL);
 
+    add_open_file(TRUE);
+
     /* If only one file buffer is open, indicate it on the statusbar and
      * get out. */
     if (open_files == open_files->next) {
@@ -927,7 +927,7 @@ void open_prevnext_file(bool next)
 
     /* Switch to the next or previous file, depending on the value of
      * next. */
-    open_files = next ? open_files->next : open_files->prev;
+    open_files = next_file ? open_files->next : open_files->prev;
 
 #ifdef DEBUG
     fprintf(stderr, "filename is %s\n", open_files->filename);
diff --git a/src/proto.h b/src/proto.h
index bd4592b0..fdbaf8e2 100644
--- a/src/proto.h
+++ b/src/proto.h
@@ -277,7 +277,7 @@ void free_openfilestruct(openfilestruct *src);
 #endif
 void add_open_file(bool update);
 void load_open_file(void);
-void open_prevnext_file(bool next);
+void open_prevnext_file(bool next_file);
 void open_prevfile_void(void);
 void open_nextfile_void(void);
 bool close_open_file(void);