Dlr's revert multibuffer and view mode patch

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

ChangeLog

@@ -39,6 +39,11 @@ CVS Code -
 	  (David Benbennick).
   open_file()
 	- Fix FD leak with file load error (David Benbennick).
+  add_open_file()
+	- Revert the fix for the supposed minor logic error from before;
+	  it was keeping some updates from happening when they should,
+	  which was leading to segfaults with both multibuffer and view
+	  mode on. (DLR; found by David Benbennick)
   save_history()
 	- Fix nrealloc return value being ignored (David Benbennick).
 - nano.c:

files.c

@@ -780,10 +780,9 @@ int add_open_file(int update)
 #endif
     }
 
-    /* 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)) {
+    /* if we're not in view mode and not updating, the file contents
+       might have changed, so save the filestruct; otherwise, don't */
+    if (!(ISSET(VIEW_MODE) && !update)) {
 	/* save current file buffer */
 	open_files->fileage = fileage;
 	open_files->filebot = filebot;